X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=cf057fc88d0c49be1082c24ea2746e9b7e2ddd4e;hb=5d4cbbc67444c3955f705b3aeddf29be1c731866;hp=bbde397e7789c90efbb157e3ac9e5630a1525f37;hpb=f7eb47dba4b091b67a28404ce461b15dffcb4298;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index bbde397e..cf057fc8 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -11,13 +11,12 @@ #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 @@ -40,18 +39,12 @@ #include #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 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 || \ @@ -76,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]); @@ -129,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) @@ -299,7 +259,6 @@ static void event_hack_mods(XEvent *e) break; case MotionNotify: STRIP_MODS(e->xmotion.state); -#if 0 /* compress events */ { XEvent ce; @@ -309,7 +268,6 @@ static void event_hack_mods(XEvent *e) e->xmotion.y_root = ce.xmotion.y_root; } } -#endif break; } } @@ -400,7 +358,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 " @@ -412,7 +370,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) { @@ -458,13 +416,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; ObWindow *obwin = NULL; + XEvent ee, *e; + + /* make a copy we can mangle */ + ee = *ec; + e = ⅇ window = event_get_window(e); if ((obwin = g_hash_table_lookup(window_map, &window))) { @@ -523,45 +486,29 @@ static void event_process(XEvent *e) xerror_set_ignore(FALSE); } - if (menu_frame_visible) - if (e->type == MotionNotify || e->type == ButtonRelease || - e->type == ButtonPress || - e->type == KeyPress || e->type == KeyRelease) { - event_handle_menu(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 || e->type == KeyPress || e->type == KeyRelease) { - ObFrameContext context; - - context = frame_context(client, e->xany.window); + if (menu_frame_visible) + event_handle_menu(e); + else if (moveresize_in_progress) + moveresize_event(e); + else { + ObFrameContext context; - if (!keyboard_process_interactive_grab(e, &client, &context)) { + context = frame_context(client, e->xany.window); - if (e->type == ButtonPress || e->type == ButtonRelease || - e->type == MotionNotify) - mouse_event(client, context, e); - else if (e->type == KeyPress) - keyboard_event(client, e); + 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); } static void event_handle_root(XEvent *e) @@ -1080,49 +1027,6 @@ static void event_handle_client(ObClient *client, XEvent *e) } } -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, max_fd); -#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) { @@ -1163,6 +1067,19 @@ static void event_handle_dockapp(ObDockApp *app, XEvent *e) } } +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; @@ -1189,5 +1106,31 @@ static void event_handle_menu(XEvent *ev) 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; } }