Changeset 10305 for trunk/FACT++/src/Shell.cc

Timestamp:

04/07/11 15:41:50 (13 years ago)

Author:

tbretz

Message:

Use ReadlineColor for unified look and feel.

File:

• trunk/FACT++/src/Shell.cc (modified) (2 diffs)

trunk/FACT++/src/Shell.cc

@@ -425 +425 @@
 // --------------------------------------------------------------------------
 //
-//! This wrapt the given readline function into a redirection to a file,
-//! which contents is then displayed afterwards in the input panel.
-//!
-//! For convinience the given title is printed in bold before the list.
-//!
-//! This allows to show some readline output in the panel.
-//!
-//! @param function
-//!    Takes a function of type bool(*)() as argument
-//!
-//! @param title
-//!    A title streamed in bold before the output starts
-//!
-//! @returns
-//!    The return value of the function
-//
-bool Shell::RedirectionWrapper(bool (*function)(), const char *title)
-{
-    FILE *save = SetStreamOut(tmpfile());
-    const bool rc = function();
-    FILE *file = SetStreamOut(save);
-
-    const bool empty = ftell(file)==0;
-
-    rewind(file);
-
-    win << endl;
-    win << kBold << title << endl;
-
-    if (empty)
-    {
-        win << " <empty>" << endl;
-        fclose(file);
-        return rc;
-    }
-
-    while (1)
-    {
-        const int c = getc(file);
-        if (feof(file))
-            break;
-        win << (char)c;
-    }
-    win << endl;
-
-    fclose(file);
-
-    return rc;
-}
-
-// --------------------------------------------------------------------------
-//
-//! Can be overwritten to display user defined commands when the command
-//! c is issued.
-//!
-//! @returns
-//!    always true
-//
-bool Shell::PrintCommands()
-{
-    win << endl;
-    win << " " << kUnderline << " Commands:" << endl;
-    win << "   No application specific commands defined." << endl;
-    win << endl;
-
-    return true;
-}
-
-// --------------------------------------------------------------------------
-//
-//! Displays the available ncurses attributes, like color.
-//!
-//! @returns
-//!    always true
-//
-bool Shell::PrintAttributes()
-{
-    //ostream &win = wout;
-    win << endl;
-    win << " Attributes:" << endl;
-    win << "   " << kReset      << "kReset" << endl;
-    win << "   " << kNormal     << "kNormal" << endl;
-    win << "   " << kHighlight  << "kHighlight" << endl;
-    win << "   " << kReverse    << "kReverse" << endl;
-    win << "   " << kUnderline  << "kUnderline" << endl;
-    win << "   " << kBlink      << "kBlink" << endl;
-    win << "   " << kDim        << "kDim" << endl;
-    win << "   " << kBold       << "kBold" << endl;
-    win << "   " << kProtect    << "kProtect" << endl;
-    win << "   " << kInvisible  << "kInvisible" << endl;
-    win << "   " << kAltCharset << "kAltCharset" << kReset << "  (kAltCharset)" << endl;
-    win << endl;
-    win << " Colors:" << endl;
-    win << "   " << kDefault << "kDefault  " << kBold << "+  kBold" << endl;
-    win << "   " << kRed     << "kRed      " << kBold << "+  kBold" << endl;
-    win << "   " << kGreen   << "kGreen    " << kBold << "+  kBold" << endl;
-    win << "   " << kYellow  << "kYellow   " << kBold << "+  kBold" << endl;
-    win << "   " << kBlue    << "kBlue     " << kBold << "+  kBold" << endl;
-    win << "   " << kMagenta << "kMagenta  " << kBold << "+  kBold" << endl;
-    win << "   " << kCyan    << "kCyan     " << kBold << "+  kBold" << endl;
-    win << "   " << kWhite   << "kWhite    " << kBold << "+  kBold" << endl;
-    win << "   " << endl;
-
-    return true;
-}
-
-// --------------------------------------------------------------------------
-//
-//! Displays the keybindings available due to the Shell class
-//!
-//! @returns
-//!    always true
-//!
-//! @todo
-//!    Update output
-//
-bool Shell::PrintKeyBindings()
-{
-    win << endl;
-    win << " " << kUnderline << "Key bindings:" << endl;
-    win << kBold << "   Page-up         " << kReset << "Search backward in history" << endl;
-    win << kBold << "   Page-dn         " << kReset << "Search forward in history" << endl;
-    win << kBold << "   Ctrl-left       " << kReset << "One word backward" << endl;
-    win << kBold << "   Ctrl-right      " << kReset << "One word forward" << endl;
-    win << kBold << "   Ctrl-y          " << kReset << "Delete line" << endl;
-    win << kBold << "   Alt-end/Ctrl-k  " << kReset << "Delete until the end of the line" << endl;
-    win << kBold << "   F1              " << kReset << "Toggle visibility of upper panel" << endl;
-    win << endl;
-    win << " Default key-bindings are identical with your bash." << endl;
-    win << endl;
-
-    return true;
-}
-
-// --------------------------------------------------------------------------
-//
-//! Print a general help text which also includes the commands pre-defined
-//! by the Shell class.
-//!
-//! @returns
-//!    always true
-//!
-//! @todo
-//!    Get it up-to-date
-//
-bool Shell::PrintGeneralHelp()
-{
-    win << endl;
-    win << " " << kUnderline << "General help:" << endl;
-    win << kBold << "   h,help       " << kReset << "Print this help message" << endl;
-    win << kBold << "   clear        " << kReset << "Clear history buffer" << endl;
-    win << kBold << "   lh,history   " << kReset << "Dump the history buffer to the screen" << endl;
-    win << kBold << "   v,variable   " << kReset << "Dump readline variables" << endl;
-    win << kBold << "   f,function   " << kReset << "Dump readline functions" << endl;
-    win << kBold << "   m,funmap     " << kReset << "Dump readline funmap" << endl;
-    win << kBold << "   c,command    " << kReset << "Dump available commands" << endl;
-    win << kBold << "   k,keylist    " << kReset << "Dump key bindings" << endl;
-    win << kBold << "   a,attrs      " << kReset << "Dump available stream attributes" << endl;
-    win << kBold << "   .q,quit      " << kReset << "Quit" << endl;
-    win << endl;
-    win << " The command history is automatically loaded and saves to" << endl;
-    win << " and from " << GetName() << endl;
-    win << endl;
-
-    return true;
-}
-
-
-// --------------------------------------------------------------------------
-//
 //! Processes the command provided by the Shell-class.
 //!
@@ -607 +437 @@
     //  int rl_add_defun (const char *name, rl_command_func_t *function, int key)
 
-    // ----------- Readline -----------
-
-    if (str=="lh" || str=="history")
-        return RedirectionWrapper(DumpHistory, "History:");
-
-    if (str=="v" || str=="variable")
-        return RedirectionWrapper(DumpVariables, "Variables:");
-
-    if (str=="f" || str=="function")
-        return RedirectionWrapper(DumpFunctions, "Functions:");
-
-    if (str=="m" || str=="funmap")
-        return RedirectionWrapper(DumpFunmap, "Funmap:");
+    if (ReadlineColor::Process(win, str))
+        return true;
 
     if (Readline::Process(str))
         return true;
-
-    // ------------ ReadlineWindow -------------
-
-    if (str=="a" || str=="attrs")
-        return PrintAttributes();
 
     // ----------- ReadlineNcurses -----------