]> Dogcows Code - chaz/openbox/blobdiff - openbox/event.c
new method for loading menu files etc
[chaz/openbox] / openbox / event.c
index 69c85100c9c89909ddf26a45376e5a660a6576b8..094d19fe2267ce4b0045b3c9ee06f0bcd5119f02 100644 (file)
@@ -8,6 +8,9 @@
 #include "screen.h"
 #include "frame.h"
 #include "menu.h"
+#include "menuframe.h"
+#include "keyboard.h"
+#include "mouse.h"
 #include "framerender.h"
 #include "focus.h"
 #include "moveresize.h"
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
+static void event_handle_menu(XEvent *e);
 static void event_handle_dock(ObDock *s, XEvent *e);
 static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
-static void event_handle_menu(ObClient *c, XEvent *e);
 static void fd_event_handle();
 #ifdef USE_SM
 static void ice_watch(IceConn conn, IcePointer data, Bool opening,
@@ -208,9 +211,9 @@ static Window event_get_window(XEvent *e)
     default:
 #ifdef XKB
        if (extensions_xkb && e->type == extensions_xkb_event_basep) {
-           switch (((XkbAnyEvent*)&e)->xkb_type) {
+           switch (((XkbAnyEvent*)e)->xkb_type) {
            case XkbBellNotify:
-               window = ((XkbBellNotifyEvent*)&e)->window;
+               window = ((XkbBellNotifyEvent*)e)->window;
            default:
                window = None;
            }
@@ -223,32 +226,38 @@ static Window event_get_window(XEvent *e)
 
 static void event_set_lasttime(XEvent *e)
 {
+    Time t = 0;
+
     /* grab the lasttime and hack up the state */
     switch (e->type) {
     case ButtonPress:
     case ButtonRelease:
-       event_lasttime = e->xbutton.time;
+       t = e->xbutton.time;
        break;
     case KeyPress:
-       event_lasttime = e->xkey.time;
+       t = e->xkey.time;
        break;
     case KeyRelease:
-       event_lasttime = e->xkey.time;
+       t = e->xkey.time;
        break;
     case MotionNotify:
-       event_lasttime = e->xmotion.time;
+       t = e->xmotion.time;
        break;
     case PropertyNotify:
-       event_lasttime = e->xproperty.time;
+       t = e->xproperty.time;
        break;
     case EnterNotify:
     case LeaveNotify:
-       event_lasttime = e->xcrossing.time;
+       t = e->xcrossing.time;
        break;
     default:
-        event_lasttime = CurrentTime;
+        /* if more event types are anticipated, get their timestamp
+           explicitly */
         break;
     }
+
+    if (t > event_lasttime)
+        event_lasttime = t;
 }
 
 #define STRIP_MODS(s) \
@@ -290,6 +299,7 @@ static void event_hack_mods(XEvent *e)
        break;
     case MotionNotify:
         STRIP_MODS(e->xmotion.state);
+#if 0
        /* compress events */
         {
             XEvent ce;
@@ -299,6 +309,7 @@ static void event_hack_mods(XEvent *e)
                 e->xmotion.y_root = ce.xmotion.y_root;
             }
        }
+#endif
        break;
     }
 }
@@ -453,7 +464,6 @@ static void event_process(XEvent *e)
     ObClient *client = NULL;
     ObDock *dock = NULL;
     ObDockApp *dockapp = NULL;
-    ObMenu *menu = NULL;
     ObWindow *obwin = NULL;
 
     window = event_get_window(e);
@@ -465,12 +475,10 @@ static void event_process(XEvent *e)
         case Window_DockApp:
             dockapp = WINDOW_AS_DOCKAPP(obwin);
             break;
-        case Window_Menu:
-            menu = WINDOW_AS_MENU(obwin);
-            break;
         case Window_Client:
             client = WINDOW_AS_CLIENT(obwin);
             break;
+        case Window_Menu:
         case Window_Internal:
             /* not to be used for events */
             g_assert_not_reached();
@@ -515,11 +523,11 @@ static void event_process(XEvent *e)
        xerror_set_ignore(FALSE);
     }
 
-    if (menu_visible)
+    if (menu_frame_visible)
         if (e->type == MotionNotify || e->type == ButtonRelease ||
             e->type == ButtonPress ||
             e->type == KeyPress || e->type == KeyRelease) {
-            event_handle_menu(client, e);
+            event_handle_menu(e);
 
             return; /* no dispatch! */
         }
@@ -531,17 +539,26 @@ static void event_process(XEvent *e)
             moveresize_event(e);
 
             return; /* no dispatch! */
-            
         }
 
     /* user input (action-bound) events */
-    /*
     if (e->type == ButtonPress || e->type == ButtonRelease ||
-        e->type == MotionNotify)
-        mouse_event(e, client);
-    else if (e->type == KeyPress || e->type == KeyRelease)
-        ;
-    */
+        e->type == MotionNotify || e->type == KeyPress ||
+        e->type == KeyRelease)
+    {
+        ObFrameContext context;
+
+        context = frame_context(client, e->xany.window);
+
+        if (!keyboard_process_interactive_grab(e, &client, &context)) {
+
+            if (e->type == ButtonPress || e->type == ButtonRelease ||
+                e->type == MotionNotify)
+                mouse_event(client, context, e);
+            else if (e->type == KeyPress)
+                keyboard_event(client, e);
+        }
+    }
 
     /* dispatch the event to registered handlers */
     dispatch_x(e, client);
@@ -600,8 +617,12 @@ static void event_handle_client(ObClient *client, XEvent *e)
     XEvent ce;
     Atom msgtype;
     int i=0;
+    ObFrameContext con;
      
     switch (e->type) {
+    case VisibilityNotify:
+        client->frame->obscured = e->xvisibility.state != VisibilityUnobscured;
+        break;
     case ButtonPress:
     case ButtonRelease:
         /* Wheel buttons don't draw because they are an instant click, so it
@@ -657,23 +678,77 @@ static void event_handle_client(ObClient *client, XEvent *e)
             client_iconify(client, TRUE, TRUE);
         frame_adjust_focus(client->frame, FALSE);
        break;
+    case LeaveNotify:
+        con = frame_context(client, e->xcrossing.window);
+        switch (con) {
+        case OB_FRAME_CONTEXT_MAXIMIZE:
+            client->frame->max_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ALLDESKTOPS:
+            client->frame->desk_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_SHADE:
+            client->frame->shade_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ICONIFY:
+            client->frame->iconify_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_CLOSE:
+            client->frame->close_hover = FALSE;
+            frame_adjust_state(client->frame);
+            break;
+        default:
+            break;
+        }
+        break;
     case EnterNotify:
-        if (client_normal(client)) {
-            if (ob_state() == OB_STATE_STARTING) {
-                /* move it to the top of the focus order */
-                guint desktop = client->desktop;
-                if (desktop == DESKTOP_ALL) desktop = screen_desktop;
-                focus_order[desktop] = g_list_remove(focus_order[desktop],
-                                                     client);
-                focus_order[desktop] = g_list_prepend(focus_order[desktop],
-                                                      client);
-            } else if (config_focus_follow) {
+        con = frame_context(client, e->xcrossing.window);
+        switch (con) {
+        case OB_FRAME_CONTEXT_MAXIMIZE:
+            client->frame->max_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ALLDESKTOPS:
+            client->frame->desk_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_SHADE:
+            client->frame->shade_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_ICONIFY:
+            client->frame->iconify_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_CLOSE:
+            client->frame->close_hover = TRUE;
+            frame_adjust_state(client->frame);
+            break;
+        case OB_FRAME_CONTEXT_FRAME:
+            if (client_normal(client)) {
+                if (ob_state() == OB_STATE_STARTING) {
+                    /* move it to the top of the focus order */
+                    guint desktop = client->desktop;
+                    if (desktop == DESKTOP_ALL) desktop = screen_desktop;
+                    focus_order[desktop] = g_list_remove(focus_order[desktop],
+                                                         client);
+                    focus_order[desktop] = g_list_prepend(focus_order[desktop],
+                                                          client);
+                } else if (config_focus_follow) {
 #ifdef DEBUG_FOCUS
-                ob_debug("EnterNotify on %lx, focusing window\n",
-                         client->window);
+                    ob_debug("EnterNotify on %lx, focusing window\n",
+                             client->window);
 #endif
-                client_focus(client);
+                    client_focus(client);
+                }
             }
+            break;
+        default:
+            break;
         }
         break;
     case ConfigureRequest:
@@ -703,15 +778,16 @@ static void event_handle_client(ObClient *client, XEvent *e)
        /* if we are iconic (or shaded (fvwm does this)) ignore the event */
        if (client->iconic || client->shaded) return;
 
-       if (e->xconfigurerequest.value_mask & CWBorderWidth)
-           client->border_width = e->xconfigurerequest.border_width;
-
        /* resize, then move, as specified in the EWMH section 7.7 */
        if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight |
-                                              CWX | CWY)) {
+                                              CWX | CWY |
+                                               CWBorderWidth)) {
            int x, y, w, h;
            ObCorner corner;
-              
+
+            if (e->xconfigurerequest.value_mask & CWBorderWidth)
+                client->border_width = e->xconfigurerequest.border_width;
+
            x = (e->xconfigurerequest.value_mask & CWX) ?
                e->xconfigurerequest.x : client->area.x;
            y = (e->xconfigurerequest.value_mask & CWY) ?
@@ -720,6 +796,21 @@ static void event_handle_client(ObClient *client, XEvent *e)
                e->xconfigurerequest.width : client->area.width;
            h = (e->xconfigurerequest.value_mask & CWHeight) ?
                e->xconfigurerequest.height : client->area.height;
+
+            {
+                int newx = x;
+                int newy = y;
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_normal(client));
+                if (e->xconfigurerequest.value_mask & CWX)
+                    x = newx;
+                if (e->xconfigurerequest.value_mask & CWY)
+                    y = newy;
+            }
               
            switch (client->gravity) {
            case NorthEastGravity:
@@ -737,7 +828,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                corner = OB_CORNER_TOPLEFT;
            }
 
-           client_configure(client, corner, x, y, w, h, FALSE, TRUE);
+           client_configure_full(client, corner, x, y, w, h, FALSE, TRUE,
+                                  TRUE);
        }
 
        if (e->xconfigurerequest.value_mask & CWStackMode) {
@@ -850,7 +942,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
            client_close(client);
        } else if (msgtype == prop_atoms.net_active_window) {
            ob_debug("net_active_window for 0x%lx\n", client->window);
-            client_activate(client);
+            client_activate(client, FALSE);
        } else if (msgtype == prop_atoms.net_wm_moveresize) {
            ob_debug("net_wm_moveresize for 0x%lx\n", client->window);
             if ((Atom)e->xclient.data.l[2] ==
@@ -902,14 +994,31 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (e->xclient.data.l[0] & 1 << 10)
                 w = e->xclient.data.l[3];
             else
-                w = client->area.y;
+                w = client->area.width;
             if (e->xclient.data.l[0] & 1 << 11)
                 h = e->xclient.data.l[4];
             else
-                h = client->area.y;
+                h = client->area.height;
             client->gravity = tmpg;
+
+            {
+                int newx = x;
+                int newy = y;
+                int fw = w +
+                    client->frame->size.left + client->frame->size.right;
+                int fh = h +
+                    client->frame->size.top + client->frame->size.bottom;
+                client_find_onscreen(client, &newx, &newy, fw, fh,
+                                     client_normal(client));
+                if (e->xclient.data.l[0] & 1 << 8)
+                    x = newx;
+                if (e->xclient.data.l[0] & 1 << 9)
+                    y = newy;
+            }
+              
             client_configure(client, OB_CORNER_TOPLEFT,
                              x, y, w, h, FALSE, TRUE);
+
             client->gravity = oldg;
         }
        break;
@@ -954,8 +1063,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
            client_update_protocols(client);
            client_setup_decor_and_functions(client);
        }
-       else if (msgtype == prop_atoms.net_wm_strut)
+       else if (msgtype == prop_atoms.net_wm_strut) {
            client_update_strut(client);
+        }
        else if (msgtype == prop_atoms.net_wm_icon ||
                  msgtype == prop_atoms.kwm_win_icon)
            client_update_icons(client);
@@ -970,73 +1080,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
     }
 }
 
-static void event_handle_menu(ObClient *client, XEvent *e)
-{
-    ObMenuEntry *entry;
-    ObMenu *top;
-    GList *it = NULL;
-
-    top = g_list_nth_data(menu_visible, 0);
-
-    ob_debug("EVENT %d\n", e->type);
-    switch (e->type) {
-    case KeyPress:
-        menu_control_keyboard_nav(e->xkey.keycode);
-        break;
-    case ButtonPress:
-       ob_debug("BUTTON PRESS\n");
-
-        break;
-    case ButtonRelease:
-       ob_debug("BUTTON RELEASED\n");
-
-        for (it = menu_visible; it; it = g_list_next(it)) {
-            ObMenu *m = it->data;
-            if (e->xbutton.x_root >= m->location.x - ob_rr_theme->bwidth &&
-                e->xbutton.y_root >= m->location.y - ob_rr_theme->bwidth &&
-                e->xbutton.x_root < m->location.x + m->size.width +
-                ob_rr_theme->bwidth &&
-                e->xbutton.y_root < m->location.y + m->size.height +
-                ob_rr_theme->bwidth) {
-                if ((entry = menu_find_entry_by_pos(it->data,
-                                                    e->xbutton.x_root -
-                                                    m->location.x,
-                                                    e->xbutton.y_root -
-                                                    m->location.y))) {
-                    m->selected(entry, e->xbutton.button,
-                                e->xbutton.x_root,
-                                e->xbutton.y_root);
-                    break;
-                }
-            }
-        }
-
-        /* will call the menu_hide() for each submenu as well */
-        if (!it)
-            menu_hide(menu_visible->data);
-       
-        break;
-    case MotionNotify:
-        ob_debug("motion\n");
-        for (it = menu_visible; it; it = g_list_next(it)) {
-            ObMenu *m = it->data;
-            if ((entry = menu_find_entry_by_pos(it->data,
-                                                e->xmotion.x_root -
-                                                m->location.x,
-                                                e->xmotion.y_root -
-                                                m->location.y))) {
-                if (m->over && m->over->data != entry)
-                    m->mouseover(m->over->data, FALSE);
-
-                m->mouseover(entry, TRUE);
-                break;
-            }
-        }
-
-        break;
-    }
-}
-
 void event_add_fd_handler(event_fd_handler *h) {
     g_datalist_id_set_data(&fd_handler_list, h->fd, h);
     FD_SET(h->fd, &allset);
@@ -1055,18 +1098,19 @@ static void find_max_fd()
                        (gpointer)&tmpmax);
     max_fd = MAX(x_fd, tmpmax);
 #ifdef USE_SM
-    max_fd = MAX(ice_fd, tmpmax);
+    max_fd = MAX(ice_fd, max_fd);
 #endif
 }
 
-void event_remove_fd(int n)
+void event_remove_fd(gint n)
 {
     FD_CLR(n, &allset);
     g_datalist_id_remove_data(&fd_handler_list, (GQuark)n);
     find_max_fd();
 }
 
-static void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data)
+static void fd_event_handle_foreach(GQuark n,
+                                    gpointer data, gpointer user_data)
 {
     if (FD_ISSET( (int)n, &selset)) {
         event_fd_handler *h = (event_fd_handler *)data;
@@ -1119,3 +1163,32 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e)
         break;
     }
 }
+
+static void event_handle_menu(XEvent *ev)
+{
+    ObMenuFrame *f;
+    ObMenuEntryFrame *e;
+
+    switch (ev->type) {
+    case ButtonRelease:
+        if (!(f = menu_frame_under(ev->xbutton.x_root,
+                                   ev->xbutton.y_root)))
+            menu_frame_hide_all();
+        else {
+            if ((e = menu_entry_frame_under(ev->xbutton.x_root,
+                                            ev->xbutton.y_root)))
+                menu_entry_frame_execute(e,
+                                         !(ev->xbutton.state & ControlMask));
+        }
+        break;
+    case MotionNotify:
+        if ((f = menu_frame_under(ev->xmotion.x_root,
+                                  ev->xmotion.y_root))) {
+            menu_frame_move_on_screen(f);
+            if ((e = menu_entry_frame_under(ev->xmotion.x_root,
+                                            ev->xmotion.y_root)))
+                menu_frame_select(f, e);
+        }
+        break;
+    }
+}
This page took 0.0336920000000001 seconds and 4 git commands to generate.