X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=92ebdfbfa4948780160dcc7e07f0e0fffc17677d;hb=de4f92ccc66c1dad1a2820a07d1f0161bd61a855;hp=7db6945dc7d11bd4cbe3efbb16981e01751ad6f1;hpb=be7c0d426a9c764d5c0eb16abeea470ddd1bd48a;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 7db6945d..92ebdfbf 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -8,13 +8,15 @@
 #include "screen.h"
 #include "frame.h"
 #include "menu.h"
+#include "menuframe.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "mainloop.h"
 #include "framerender.h"
 #include "focus.h"
 #include "moveresize.h"
 #include "stacking.h"
 #include "extensions.h"
-#include "timer.h"
-#include "dispatch.h"
 #include "event.h"
 
 #include <X11/Xlib.h>
@@ -37,18 +39,12 @@
 #include <X11/ICE/ICElib.h>
 #endif
 
-static void event_process(XEvent *e);
+static void event_process(const XEvent *e, gpointer data);
 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,
-                      IcePointer *watch_data);
-#endif
-static void find_max_fd();
 
 #define INVALID_FOCUSIN(e) ((e)->xfocus.detail == NotifyInferior || \
                             (e)->xfocus.detail == NotifyAncestor || \
@@ -73,32 +69,38 @@ static const int mask_table[] = {
 };
 static int mask_table_size;
 
-static fd_set selset, allset;
 #ifdef USE_SM
-static IceConn ice_conn;
-static int ice_fd;
-#endif
-static int max_fd, x_fd;
-static GData *fd_handler_list;
-
+static void ice_handler(int fd, gpointer conn)
+{
+    Bool b;
+    IceProcessMessages(conn, NULL, &b);
+}
 
-#ifdef USE_SM
 static void ice_watch(IceConn conn, IcePointer data, Bool opening,
                       IcePointer *watch_data)
 {
+    static gint fd = -1;
+
     if (opening) {
-        g_assert (ice_fd < 0);
-        ice_conn = conn;
-        ice_fd = IceConnectionNumber(conn);
-        FD_SET(ice_fd, &allset);
+        fd = IceConnectionNumber(conn);
+        ob_main_loop_fd_add(ob_main_loop, fd, ice_handler, conn, NULL);
     } else {
-        FD_CLR(ice_fd, &allset);
-        ice_fd = -1;
+        ob_main_loop_fd_remove(ob_main_loop, fd);
+        fd = -1;
     }
-    find_max_fd();
 }
 #endif
 
+#ifdef USE_LIBSN
+static void sn_handler(const XEvent *e, gpointer display)
+{
+    XEvent ec;
+    ec = *e;
+    sn_display_process_event(display, &ec);
+}
+#endif
+
+
 void event_startup()
 {
     mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]);
@@ -126,59 +128,20 @@ void event_startup()
 	}
     }
 
-    FD_ZERO(&allset);
-    max_fd = x_fd = ConnectionNumber(ob_display);
-    FD_SET(x_fd, &allset);
+    ob_main_loop_x_add(ob_main_loop, event_process, NULL, NULL);
 
 #ifdef USE_SM
-    ice_fd = -1;
     IceAddConnectionWatch(ice_watch, NULL);
 #endif
 
-    g_datalist_init(&fd_handler_list);
+#ifdef USE_LIBSN
+    ob_main_loop_x_add(ob_main_loop, sn_handler, ob_sn_display, NULL);
+#endif
 }
 
 void event_shutdown()
 {
     XFreeModifiermap(modmap);
-    g_datalist_clear(&fd_handler_list);
-}
-
-void event_loop()
-{
-    XEvent e;
-    struct timeval *wait;
-    gboolean had_event = FALSE;
-
-    while (XPending(ob_display)) {
-	XNextEvent(ob_display, &e);
-
-#ifdef USE_LIBSN
-        sn_display_process_event(ob_sn_display, &e);
-#endif
-
-	event_process(&e);
-        had_event = TRUE;
-    }
-
-    if (!had_event) {
-        timer_dispatch((GTimeVal**)&wait);
-        selset = allset;
-        select(max_fd + 1, &selset, NULL, NULL, wait);
-
-        /* handle the X events as soon as possible? */
-        if (FD_ISSET(x_fd, &selset))
-            return;
-
-#ifdef USE_SM
-        if (ice_fd >= 0 && FD_ISSET(ice_fd, &selset)) {
-            Bool b;
-            IceProcessMessages(ice_conn, NULL, &b);
-        }
-#endif
-
-        fd_event_handle();
-    }
 }
 
 static Window event_get_window(XEvent *e)
@@ -208,9 +171,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 +186,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 +259,7 @@ static void event_hack_mods(XEvent *e)
 	break;
     case MotionNotify:
         STRIP_MODS(e->xmotion.state);
+#if 0
 	/* compress events */
         {
             XEvent ce;
@@ -299,6 +269,7 @@ static void event_hack_mods(XEvent *e)
                 e->xmotion.y_root = ce.xmotion.y_root;
             }
 	}
+#endif
 	break;
     }
 }
@@ -389,7 +360,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 #endif
                             return TRUE;
                         } else {
-                            event_process(&fe);
+                            event_process(&fe, NULL);
 #ifdef DEBUG_FOCUS
                             ob_debug("focused window got an Out/In back to "
                                      "itself but focus_client was null "
@@ -401,7 +372,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 
                     /* once all the FocusOut's have been dealt with, if there
                        is a FocusIn still left and it is valid, then use it */
-                    event_process(&fe);
+                    event_process(&fe, NULL);
                     /* secret magic way of event_process telling us that no
                        client was found for the FocusIn event. ^_^ */
                     if (fe.xfocus.window != None) {
@@ -447,14 +418,18 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
     return FALSE;
 }
 
-static void event_process(XEvent *e)
+static void event_process(const XEvent *ec, gpointer data)
 {
     Window window;
     ObClient *client = NULL;
     ObDock *dock = NULL;
     ObDockApp *dockapp = NULL;
-    ObMenu *menu = NULL;
     ObWindow *obwin = NULL;
+    XEvent ee, *e;
+
+    /* make a copy we can mangle */
+    ee = *ec;
+    e = &ee;
 
     window = event_get_window(e);
     if ((obwin = g_hash_table_lookup(window_map, &window))) {
@@ -465,12 +440,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,36 +488,29 @@ static void event_process(XEvent *e)
 	xerror_set_ignore(FALSE);
     }
 
-    if (menu_visible)
-        if (e->type == MotionNotify || e->type == ButtonRelease ||
-            e->type == ButtonPress ||
-            e->type == KeyPress || e->type == KeyRelease) {
-            event_handle_menu(client, e);
-
-            return; /* no dispatch! */
-        }
-
-    if (moveresize_in_progress)
-        if (e->type == MotionNotify || e->type == ButtonRelease ||
-            e->type == ButtonPress ||
-            e->type == KeyPress || e->type == KeyRelease) {
-            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)
+    {
+        if (menu_frame_visible)
+            event_handle_menu(e);
+        else if (moveresize_in_progress)
+            moveresize_event(e);
+        else {
+            ObFrameContext context;
+
+            context = frame_context(client, e->xany.window);
 
-    /* dispatch the event to registered handlers */
-    dispatch_x(e, client);
+            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);
+            }
+        }
+    }
 }
 
 static void event_handle_root(XEvent *e)
@@ -603,6 +569,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
     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
@@ -784,7 +753,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                     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, TRUE);
+                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)
@@ -921,7 +891,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] ==
@@ -987,7 +957,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                     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, TRUE);
+                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)
@@ -1058,117 +1029,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;
-                }
-                break;
-            }
-        }
-
-        /* will call the menu_hide() for each submenu as well */
-        if (!it)
-            menu_control_keyboard_nav(ob_keycode(OB_KEY_ESCAPE));
-	
-        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);
-    max_fd = MAX(max_fd, h->fd);
-}
-
-static void find_max_fd_foreach(GQuark n, gpointer data, gpointer max)
-{
-    *((unsigned int *)max) = MAX(*((unsigned int *)max), n);
-}
-
-static void find_max_fd()
-{ 
-    int tmpmax = -1;
-    g_datalist_foreach(&fd_handler_list, find_max_fd_foreach,
-                       (gpointer)&tmpmax);
-    max_fd = MAX(x_fd, tmpmax);
-#ifdef USE_SM
-    max_fd = MAX(ice_fd, tmpmax);
-#endif
-}
-
-void event_remove_fd(int 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)
-{
-    if (FD_ISSET( (int)n, &selset)) {
-        event_fd_handler *h = (event_fd_handler *)data;
-        g_assert(h->fd == (int)n);
-        h->handler(h->fd, h->data);
-    }
-}
-
-static void fd_event_handle()
-{
-    g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL);
-}
-
 static void event_handle_dock(ObDock *s, XEvent *e)
 {
     switch (e->type) {
@@ -1208,3 +1068,71 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e)
         break;
     }
 }
+
+ObMenuFrame* find_active_menu()
+{
+    GList *it;
+    ObMenuFrame *f;
+
+    for (it = menu_frame_visible; it; it = g_list_next(it)) {
+        f = it->data;
+        if (f->selected)
+            break;
+    }
+    return it ? it->data : NULL;
+}
+
+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;
+    case KeyPress:
+        if (ev->xkey.keycode == ob_keycode(OB_KEY_ESCAPE))
+            menu_frame_hide_all();
+        else if (ev->xkey.keycode == ob_keycode(OB_KEY_RETURN)) {
+            ObMenuFrame *f;
+            if ((f = find_active_menu()))
+                menu_entry_frame_execute(f->selected,
+                                         !(ev->xkey.state & ControlMask));
+        } else if (ev->xkey.keycode == ob_keycode(OB_KEY_LEFT)) {
+            ObMenuFrame *f;
+            if ((f = find_active_menu()) && f->parent)
+                menu_frame_select(f, NULL);
+        } else if (ev->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) {
+            ObMenuFrame *f;
+            if ((f = find_active_menu()) && f->child)
+                menu_frame_select_next(f->child);
+        } else if (ev->xkey.keycode == ob_keycode(OB_KEY_UP)) {
+            ObMenuFrame *f;
+            if ((f = find_active_menu()))
+                menu_frame_select_previous(f);
+        } else if (ev->xkey.keycode == ob_keycode(OB_KEY_DOWN)) {
+            ObMenuFrame *f;
+            if ((f = find_active_menu()))
+                menu_frame_select_next(f);
+        }
+        break;
+    }
+}