7 files changed, 60 insertions, 96 deletions

diff --git a/src/FbTk/EventHandler.hh b/src/FbTk/EventHandler.hh
index 39ea294..b78e344 100644
--- a/src/FbTk/EventHandler.hh
+++ b/src/FbTk/EventHandler.hh
@@ -56,7 +56,6 @@ public:
     virtual void leaveNotifyEvent(XCrossingEvent &) { }
     virtual void enterNotifyEvent(XCrossingEvent &) { }
 
-    virtual void notifyUngrabKeyboard() { }
     virtual void grabButtons() { }
 };
 
diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc
index 31d0293..ae52908 100644
--- a/src/FbTk/EventManager.cc
+++ b/src/FbTk/EventManager.cc
@@ -65,25 +65,14 @@ EventHandler *EventManager::find(Window win) {
     return m_eventhandlers[win];
 }
 
-bool EventManager::grabKeyboard(EventHandler &ev, Window win) {
-    if (m_grabbing_keyboard)
-        ungrabKeyboard();
-
+bool EventManager::grabKeyboard(Window win) {
     int ret = XGrabKeyboard(App::instance()->display(), win, False,
                             GrabModeAsync, GrabModeAsync, CurrentTime);
-
-    if (ret == Success) {
-        m_grabbing_keyboard = &ev;
-        return true;
-    }
-    return false;
+    return (ret == Success);
 }
 
 void EventManager::ungrabKeyboard() {
     XUngrabKeyboard(App::instance()->display(), CurrentTime);
-    if (m_grabbing_keyboard)
-        m_grabbing_keyboard->notifyUngrabKeyboard();
-    m_grabbing_keyboard = 0;
 }
 
 Window EventManager::getEventWindow(XEvent &ev) {
@@ -190,10 +179,14 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) {
         evhand->exposeEvent(ev.xexpose);
     break;
     case EnterNotify:
-        evhand->enterNotifyEvent(ev.xcrossing);
+        if (ev.xcrossing.mode != NotifyGrab &&
+            ev.xcrossing.mode != NotifyUngrab)
+            evhand->enterNotifyEvent(ev.xcrossing);
     break;
     case LeaveNotify:
-        evhand->leaveNotifyEvent(ev.xcrossing);
+        if (ev.xcrossing.mode != NotifyGrab &&
+            ev.xcrossing.mode != NotifyUngrab)
+            evhand->leaveNotifyEvent(ev.xcrossing);
     break;
     default:
         evhand->handleEvent(ev);
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index 79a25ce..fdcfe9c 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -42,9 +42,8 @@ public:
     void add(EventHandler &ev, Window win) { registerEventHandler(ev, win); }
     void remove(Window win) { unregisterEventHandler(win); }
 
-    bool grabKeyboard(EventHandler &ev, Window win);
+    bool grabKeyboard(Window win);
     void ungrabKeyboard();
-    EventHandler *grabbingKeyboard() { return m_grabbing_keyboard; }
 
     EventHandler *find(Window win);
 
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 7d50302..7cb5599 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -219,6 +219,8 @@ int Menu::insert(MenuItem *item, int pos) {
     } else {
         menuitems.insert(menuitems.begin() + pos, item);
         fixMenuItemIndices();
+        if (m_active_index >= pos)
+            m_active_index++;
     }
     m_need_update = true; // we need to redraw the menu
     return menuitems.size();
@@ -233,7 +235,7 @@ int Menu::remove(unsigned int index) {
     if (index >= menuitems.size()) {
 #ifdef DEBUG
         cout << "Bad index (" << index << ") given to Menu::remove()"
-                  << " -- should be between 0 and " << menuitems.size()
+                  << " -- should be between 0 and " << menuitems.size()-1
                   << " inclusive." << endl;
 #endif // DEBUG
         return -1;
@@ -271,6 +273,9 @@ int Menu::remove(unsigned int index) {
     else if (static_cast<unsigned int>(m_which_sub) > index)
         m_which_sub--;
 
+    if (static_cast<unsigned int>(m_active_index) > index)
+        m_active_index--;
+
     m_need_update = true; // we need to redraw the menu
 
     return menuitems.size();
@@ -366,7 +371,7 @@ void Menu::enableTitle() {
     setTitleVisibility(true);
 }
 
-void Menu::updateMenu(int active_index) {
+void Menu::updateMenu() {
     if (m_title_vis) {
         menu.item_w = theme()->titleFont().textWidth(menu.label,
                                                     menu.label.size());
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index ee57a23..519a78b 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -109,7 +109,7 @@ public:
     void setLabel(const FbString &labelstr);
     /// move menu to x,y
     virtual void move(int x, int y);
-    virtual void updateMenu(int active_index = -1);
+    virtual void updateMenu();
     void setItemSelected(unsigned int index, bool val);
     void setItemEnabled(unsigned int index, bool val);
     void setMinimumSublevels(int m) { menu.minsub = m; }
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 6cc46f8..7c14832 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -56,9 +56,9 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
     Display *disp = App::instance()->display();
 
     const size_t data_size = 8 * 8;
-    // we use calloc here so we get consistent C alloc/free with XDestroyImage
+    // we use malloc here so we get consistent C alloc/free with XDestroyImage
     // and no warnings in valgrind :)
-    char *data = (char *)calloc(data_size, sizeof (char));
+    char *data = (char *)malloc(data_size * sizeof (char));
     if (data == 0)
         return 0;
 
@@ -141,6 +141,9 @@ Shape::~Shape() {
 }
 
 void Shape::initCorners(int screen_num) {
+    if (!m_win->window())
+        return;
+
     if (s_corners.size() == 0)
         s_corners.resize(ScreenCount(App::instance()->display()));
 
diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc
index b8cdcde..87ad609 100644
--- a/src/FbTk/TextBox.cc
+++ b/src/FbTk/TextBox.cc
@@ -230,31 +230,6 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
         if ((event.state & ControlMask) == ControlMask) {
 
             switch (ks) {
-            case XK_b:
-                cursorBackward();
-                break;
-            case XK_f:
-                cursorForward();
-                break;
-            case XK_a:
-                cursorHome();
-                break;
-            case XK_e:
-                cursorEnd();
-                break;
-            case XK_d:
-                deleteForward();
-                break;
-            case XK_k:
-                killToEnd();
-                break;
-            case XK_c:
-                cursorHome();
-                m_text = "";
-                m_start_pos = 0;
-                m_cursor_pos = 0;
-                m_end_pos = 0;
-                break;
             case XK_Left: {
                 unsigned int pos = findEmptySpaceLeft();
                 if (pos < m_start_pos){
@@ -311,13 +286,6 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
                 }
                 break;
             }
-        } else if ((event.state & ShiftMask)== ShiftMask || 
-                   (event.state & 0x80) == 0x80) { // shif and altgr
-            if (isprint(keychar[0])) {
-                std::string val;
-                val += keychar[0];
-                insertText(val);
-            }
         }
 
     } else { // no state
@@ -341,49 +309,46 @@ void TextBox::keyPressEvent(XKeyEvent &event) {
         case XK_Delete:
             deleteForward();
             break;
-        default:
-            switch (ks) {
-            case XK_KP_Insert:
-                keychar[0] = '0';
-                break;
-            case XK_KP_End:
-                keychar[0] = '1';
-                break;
-            case XK_KP_Down:
-                keychar[0] = '2';
-                break;
-            case XK_KP_Page_Down:
-                keychar[0] = '3';
-                break;
-            case XK_KP_Left:
-                keychar[0] = '4';
-                break;
-            case XK_KP_Begin:
-                keychar[0] = '5';
-                break;
-            case XK_KP_Right:
-                keychar[0] = '6';
-                break;
-            case XK_KP_Home:
-                keychar[0] = '7';
-                break;
-            case XK_KP_Up:
-                keychar[0] = '8';
-                break;
-            case XK_KP_Page_Up:
-                keychar[0] = '9';
-                break;
-            case XK_KP_Delete:
-                keychar[0] = ',';
-                break;
-            };
-            if (isprint(keychar[0])) {
-                std::string val;
-                val += keychar[0];
-                insertText(val);
-            }
+        case XK_KP_Insert:
+            keychar[0] = '0';
+            break;
+        case XK_KP_End:
+            keychar[0] = '1';
+            break;
+        case XK_KP_Down:
+            keychar[0] = '2';
+            break;
+        case XK_KP_Page_Down:
+            keychar[0] = '3';
+            break;
+        case XK_KP_Left:
+            keychar[0] = '4';
+            break;
+        case XK_KP_Begin:
+            keychar[0] = '5';
+            break;
+        case XK_KP_Right:
+            keychar[0] = '6';
+            break;
+        case XK_KP_Home:
+            keychar[0] = '7';
+            break;
+        case XK_KP_Up:
+            keychar[0] = '8';
+            break;
+        case XK_KP_Page_Up:
+            keychar[0] = '9';
+            break;
+        case XK_KP_Delete:
+            keychar[0] = ',';
+            break;
         }
     }
+    if (isprint(keychar[0])) {
+        std::string val;
+        val += keychar[0];
+        insertText(val);
+    }
     clear();
 }