1 files changed, 20 insertions, 168 deletions

diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc
index 5e7aa7d..bef8a63 100644
--- a/src/CommandDialog.cc
+++ b/src/CommandDialog.cc
@@ -22,24 +22,16 @@
 
 #include "CommandDialog.hh"
 
-#include "Screen.hh"
-#include "FbWinFrameTheme.hh"
-#include "WinClient.hh"
 #include "FbTk/CommandParser.hh"
-#include "FocusControl.hh"
-#include "fluxbox.hh"
-
-#include "FbTk/ImageControl.hh"
-#include "FbTk/EventManager.hh"
 #include "FbTk/StringUtil.hh"
-#include "FbTk/KeyUtil.hh"
 #include "FbTk/App.hh"
 
-#include <X11/keysym.h>
 #include <X11/Xutil.h>
 
+#include <algorithm>
 #include <memory>
 #include <stdexcept>
+#include <vector>
 
 using std::string;
 using std::vector;
@@ -47,115 +39,31 @@ using std::auto_ptr;
 using std::less;
 using std::out_of_range;
 
-CommandDialog::CommandDialog(BScreen &screen,
-        const string &title, const string precommand) :
-    FbTk::FbWindow(screen.rootWindow().screenNumber(), 0, 0, 200, 1, ExposureMask),
-    m_textbox(*this, screen.focusedWinFrameTheme()->font(), ""),
-    m_label(*this, screen.focusedWinFrameTheme()->font(), title),
-    m_gc(m_textbox),
-    m_screen(screen),
-    m_move_x(0),
-    m_move_y(0),
-    m_pixmap(0),
-    m_precommand(precommand) {
-    init();
-
-}
-
-CommandDialog::~CommandDialog() {
-    FbTk::EventManager::instance()->remove(*this);
-    hide();
-    if (m_pixmap != 0)
-        m_screen.imageControl().removeImage(m_pixmap);
-}
-
-void CommandDialog::setText(const string &text) {
-    m_textbox.setText(text);
-}
-
-void CommandDialog::show() {
-    FbTk::FbWindow::show();
-    m_textbox.setInputFocus();
-    m_label.clear();
-    Fluxbox::instance()->setShowingDialog(true);
-    // resize to correct width, which should be the width of label text
-    // no need to truncate label text in this dialog
-    // but if label text size < 200 we set 200
-    if (m_label.textWidth() < 200)
-        return;
-    else {
-        resize(m_label.textWidth(), height());
-        updateSizes();
-        render();
-    }
-}
-
-void CommandDialog::hide() {
-    FbTk::FbWindow::hide();
-    Fluxbox::instance()->setShowingDialog(false);
-}
-
-void CommandDialog::exposeEvent(XExposeEvent &event) {
-    if (event.window == window())
-        clearArea(event.x, event.y, event.width, event.height);
-}
-
-void CommandDialog::buttonPressEvent(XButtonEvent &event) {
-    m_textbox.setInputFocus();
-    m_move_x = event.x_root - x();
-    m_move_y = event.y_root - y();
-}
-
-void CommandDialog::handleEvent(XEvent &event) {
-    if (event.type == ConfigureNotify && event.xconfigure.window != window()) {
-        moveResize(event.xconfigure.x, event.xconfigure.y,
-                   event.xconfigure.width, event.xconfigure.height);
-    } else if (event.type == DestroyNotify)
-        delete this;
-}
-
-void CommandDialog::motionNotifyEvent(XMotionEvent &event) {
-    int new_x = event.x_root - m_move_x;
-    int new_y = event.y_root - m_move_y;
-    move(new_x, new_y);
-}
-
-void CommandDialog::keyPressEvent(XKeyEvent &event) {
-    unsigned int state = FbTk::KeyUtil::instance().isolateModifierMask(event.state);
-    if (state)
-        return;
-
-    KeySym ks;
-    char keychar;
-    XLookupString(&event, &keychar, 1, &ks, 0);
-
-    if (ks == XK_Return) {
-        // create Command<void> from line
-        auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + m_textbox.text()));
-        if (cmd.get())
-            cmd->execute();
-        // post execute
-        if (*m_postcommand != 0)
-            m_postcommand->execute();
-
-        delete this; // end this
-    } else if (ks == XK_Escape)
-        delete this; // end this
-    else if (ks == XK_Tab) {
-        // try to expand a command
-        tabComplete();
-    }
+CommandDialog::CommandDialog(BScreen &screen, const string &title,
+                             const string precommand) : 
+    TextDialog(screen, title),
+    m_precommand(precommand) { }
+
+void CommandDialog::exec(const std::string &text){
+        
+    // create Command<void> from line
+    auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + text));
+    if (cmd.get())
+        cmd->execute();
+    // post execute
+    if (*m_postcommand != 0)
+        m_postcommand->execute();
 }
 
 void CommandDialog::tabComplete() {
     try {
         string::size_type first = m_textbox.text().find_last_not_of("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                                                    "abcdefghijklmnopqrstuvwxyz"
-                                                                    "0123456789",
-                                                                    m_textbox.cursorPosition());
+                                  "abcdefghijklmnopqrstuvwxyz"
+                                  "0123456789", m_textbox.cursorPosition());
         if (first == string::npos)
             first = 0;
-        string prefix = FbTk::StringUtil::toLower(m_textbox.text().substr(first, m_textbox.cursorPosition()));
+        string prefix = FbTk::StringUtil::toLower(m_textbox.text().substr(first,
+                                                   m_textbox.cursorPosition()));
         if (prefix.empty()) {
             XBell(FbTk::App::instance()->display(), 0);
             return;
@@ -181,59 +89,3 @@ void CommandDialog::tabComplete() {
         XBell(FbTk::App::instance()->display(), 0);
     }
 }
-
-void CommandDialog::render() {
-    Pixmap tmp = m_pixmap;
-    if (!m_screen.focusedWinFrameTheme()->iconbarTheme().texture().usePixmap()) {
-        m_label.setBackgroundColor(m_screen.focusedWinFrameTheme()->iconbarTheme().texture().color());
-        m_pixmap = 0;
-    } else {
-        m_pixmap = m_screen.imageControl().renderImage(m_label.width(), m_label.height(),
-                                                       m_screen.focusedWinFrameTheme()->iconbarTheme().texture());
-        m_label.setBackgroundPixmap(m_pixmap);
-    }
-
-    if (tmp)
-        m_screen.imageControl().removeImage(tmp);
-
-}
-
-void CommandDialog::init() {
-
-
-    // setup label
-    // we listen to motion notify too
-    m_label.setEventMask(m_label.eventMask() | ButtonPressMask | ButtonMotionMask);
-    m_label.setGC(m_screen.focusedWinFrameTheme()->iconbarTheme().text().textGC());
-    m_label.show();
-
-    // setup text box
-    FbTk::Color white("white", m_textbox.screenNumber());
-    m_textbox.setBackgroundColor(white);
-    FbTk::Color black("black", m_textbox.screenNumber());
-    m_gc.setForeground(black);
-    m_textbox.setGC(m_gc.gc());
-    m_textbox.show();
-
-    // setup this window
-    setBorderWidth(1);
-    setBackgroundColor(white);
-    // move to center of the screen
-    move((m_screen.width() - width())/2, (m_screen.height() - height())/2);
-
-    updateSizes();
-    resize(width(), m_textbox.height() + m_label.height());
-
-    render();
-
-    // we need ConfigureNotify from children
-    FbTk::EventManager::instance()->addParent(*this, *this);
-}
-
-void CommandDialog::updateSizes() {
-    m_label.moveResize(0, 0,
-                       width(), m_textbox.font().height() + 2);
-
-    m_textbox.moveResize(2, m_label.height(),
-                         width() - 4, m_textbox.font().height() + 2);
-}