X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=a2604bcfb58c10e5b6164cd0bcd9d60ae7f9b329;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=b052fe1a17d6abf0c0923c946a9f39a3bcea76d3;hpb=540f547babe3d3aa27aac9b28dc03a8acb325edf;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index b052fe1a..a2604bcf 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,4 +1,5 @@ #include "openbox.h" +#include "dock.h" #include "client.h" #include "xerror.h" #include "prop.h" @@ -13,16 +14,25 @@ #include "extensions.h" #include "timer.h" #include "dispatch.h" +#include "event.h" #include #include #include +#include + +#ifdef USE_LIBSN +# include +#endif + #ifdef HAVE_SYS_SELECT_H # include #endif static void event_process(XEvent *e); static void event_handle_root(XEvent *e); +static void event_handle_dock(Dock *s, XEvent *e); +static void event_handle_dockapp(DockApp *app, XEvent *e); static void event_handle_client(Client *c, XEvent *e); static void event_handle_menu(Menu *menu, XEvent *e); @@ -48,6 +58,12 @@ static const int mask_table[] = { }; static int mask_table_size; +static fd_set selset, allset; +static int max_fd, x_fd; +static GData *fd_handler_list; + +void fd_event_handle(); + void event_startup() { mask_table_size = sizeof(mask_table) / sizeof(mask_table[0]); @@ -74,18 +90,22 @@ void event_startup() ScrollLockMask = mask_table[cnt / modmap->max_keypermod]; } } + + FD_ZERO(&allset); + max_fd = x_fd = ConnectionNumber(ob_display); + FD_SET(x_fd, &allset); + g_datalist_init(&fd_handler_list); } void event_shutdown() { XFreeModifiermap(modmap); + g_datalist_clear(&fd_handler_list); } void event_loop() { - fd_set selset; XEvent e; - int x_fd; struct timeval *wait; gboolean had_event = FALSE; @@ -113,16 +133,24 @@ void event_loop() } 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); - x_fd = ConnectionNumber(ob_display); - FD_ZERO(&selset); - FD_SET(x_fd, &selset); - select(x_fd + 1, &selset, NULL, NULL, 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; + + fd_event_handle(); } } @@ -144,6 +172,9 @@ static Window event_get_window(XEvent *e) case ConfigureRequest: window = e->xconfigurerequest.window; break; + case ConfigureNotify: + window = e->xconfigure.window; + break; default: #ifdef XKB if (extensions_xkb && e->type == extensions_xkb_event_basep) { @@ -284,8 +315,6 @@ static gboolean event_ignore(XEvent *e, Client *client) e->xfocus.window, e->xfocus.mode, e->xfocus.detail); #endif - /* Try process a FocusIn first, and if a legit one isn't found, then - do the fallback shiznit. */ { XEvent fe; gboolean fallback = TRUE; @@ -310,6 +339,17 @@ static gboolean event_ignore(XEvent *e, Client *client) #ifdef DEBUG_FOCUS g_message("found pending FocusIn"); #endif + /* is the focused window getting a FocusOut/In back to + itself? */ + if (fe.xfocus.window == e->xfocus.window && + !event_ignore(&fe, client)) { +#ifdef DEBUG_FOCUS + g_message("focused window got an Out/In back to " + "itself IGNORED both"); +#endif + return TRUE; + } + /* 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); @@ -361,12 +401,34 @@ static gboolean event_ignore(XEvent *e, Client *client) static void event_process(XEvent *e) { Window window; - Client *client; + Client *client = NULL; + Dock *dock = NULL; + DockApp *dockapp = NULL; Menu *menu = NULL; + ObWindow *obwin = NULL; window = event_get_window(e); - if (!(client = g_hash_table_lookup(client_map, &window))) - menu = g_hash_table_lookup(menu_map, &window); + if ((obwin = g_hash_table_lookup(window_map, &window))) { + switch (obwin->type) { + case Window_Dock: + dock = WINDOW_AS_DOCK(obwin); + break; + 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_Internal: + /* not to be used for events */ + g_assert_not_reached(); + break; + } + } + event_set_lasttime(e); event_hack_mods(e); if (event_ignore(e, client)) @@ -378,6 +440,10 @@ static void event_process(XEvent *e) return; } else if (client) event_handle_client(client, e); + else if (dockapp) + event_handle_dockapp(dockapp, e); + else if (dock) + event_handle_dock(dock, e); else if (window == ob_root) event_handle_root(e); else if (e->type == MapRequest) @@ -453,6 +519,21 @@ static void event_handle_root(XEvent *e) else if (e->xproperty.atom == prop_atoms.net_desktop_layout) screen_update_layout(); break; + case ConfigureNotify: +#ifdef XRANDR + XRRUpdateConfiguration(e); +#endif + if (e->xconfigure.width != screen_physical_size.width || + e->xconfigure.height != screen_physical_size.height) + screen_resize(e->xconfigure.width, e->xconfigure.height); + break; + default: + ; +#ifdef VIDMODE + if (extensions_vidmode && e->type == extensions_vidmode_event_basep) { + g_message("VIDMODE EVENT"); + } +#endif } } @@ -465,42 +546,56 @@ static void event_handle_client(Client *client, XEvent *e) switch (e->type) { case ButtonPress: case ButtonRelease: - switch (frame_context(client, e->xbutton.window)) { - case Context_Maximize: - client->frame->max_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - case Context_Close: - client->frame->close_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - case Context_Iconify: - client->frame->iconify_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - case Context_AllDesktops: - client->frame->desk_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - case Context_Shade: - client->frame->shade_press = (e->type == ButtonPress); - framerender_frame(client->frame); - break; - default: - /* nothing changes with clicks for any other contexts */ - break; + /* Wheel buttons don't draw because they are an instant click, so it + is a waste of resources to go drawing it. */ + if (!(e->xbutton.button == 4 || e->xbutton.button == 5)) { + switch (frame_context(client, e->xbutton.window)) { + case Context_Maximize: + client->frame->max_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case Context_Close: + client->frame->close_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case Context_Iconify: + client->frame->iconify_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case Context_AllDesktops: + client->frame->desk_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case Context_Shade: + client->frame->shade_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + default: + /* nothing changes with clicks for any other contexts */ + break; + } } break; case FocusIn: +#ifdef DEBUG_FOCUS + g_message("FocusIn on client for %lx", client->window); +#endif focus_set_client(client); + frame_adjust_focus(client->frame, TRUE); + break; case FocusOut: #ifdef DEBUG_FOCUS - g_message("Focus%s on client for %lx", (e->type==FocusIn?"In":"Out"), - client->window); + g_message("FocusOut on client for %lx", client->window); #endif - /* focus state can affect the stacking layer */ - client_calc_layer(client); - frame_adjust_focus(client->frame); + /* are we a fullscreen window or a transient of one? (checks layer) + if we are then we need to be iconified since we are losing focus + */ + if (client->layer == Layer_Fullscreen && !client->iconic && + !client_search_focus_tree_full(client)) + /* iconify fullscreen windows when they and their transients + aren't focused */ + client_iconify(client, TRUE, TRUE); + frame_adjust_focus(client->frame, FALSE); break; case EnterNotify: if (client_normal(client)) { @@ -589,13 +684,13 @@ static void event_handle_client(Client *client, XEvent *e) switch (e->xconfigurerequest.detail) { case Below: case BottomIf: - stacking_lower(client); + stacking_lower(CLIENT_AS_WINDOW(client)); break; case Above: case TopIf: default: - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; } } @@ -640,7 +735,7 @@ static void event_handle_client(Client *client, XEvent *e) if (client->shaded) client_shade(client, FALSE); client_focus(client); - stacking_raise(client); + stacking_raise(CLIENT_AS_WINDOW(client)); break; case ClientMessage: /* validate cuz we query stuff off the client here */ @@ -695,18 +790,7 @@ static void event_handle_client(Client *client, XEvent *e) client_close(client); } else if (msgtype == prop_atoms.net_active_window) { g_message("net_active_window for 0x%lx", client->window); - if (screen_showing_desktop) - screen_show_desktop(FALSE); - if (client->iconic) - client_iconify(client, FALSE, TRUE); - else if (!client->frame->visible) - /* if its not visible for other reasons, then don't mess - with it */ - break; - if (client->shaded) - client_shade(client, FALSE); - client_focus(client); - stacking_raise(client); + client_activate(client); } else if (msgtype == prop_atoms.net_wm_moveresize) { g_message("net_wm_moveresize for 0x%lx", client->window); if ((Atom)e->xclient.data.l[2] == @@ -799,11 +883,10 @@ static void event_handle_client(Client *client, XEvent *e) client_setup_decor_and_functions(client); } else if (msgtype == prop_atoms.net_wm_name || - msgtype == prop_atoms.wm_name) - client_update_title(client); - else if (msgtype == prop_atoms.net_wm_icon_name || + msgtype == prop_atoms.wm_name || + msgtype == prop_atoms.net_wm_icon_name || msgtype == prop_atoms.wm_icon_name) - client_update_icon_title(client); + client_update_title(client); else if (msgtype == prop_atoms.wm_class) client_update_class(client); else if (msgtype == prop_atoms.wm_protocols) { @@ -834,10 +917,17 @@ static void event_handle_menu(Menu *menu, XEvent *e) g_message("EVENT %d", e->type); switch (e->type) { case ButtonPress: + g_message("BUTTON PRESS"); if (e->xbutton.button == 3) menu_hide(menu); + else if (e->xbutton.button == 1) { + entry = menu_find_entry(menu, e->xbutton.window); + if (!entry) + stacking_raise(MENU_AS_WINDOW(menu)); + } break; case ButtonRelease: + g_message("BUTTON RELEASED"); if (!menu->shown) break; /* grab_pointer_window(FALSE, None, menu->frame);*/ @@ -856,15 +946,93 @@ static void event_handle_menu(Menu *menu, XEvent *e) menu_entry_fire(entry); } } + break; case EnterNotify: case LeaveNotify: g_message("enter/leave"); entry = menu_find_entry(menu, e->xcrossing.window); if (entry) { - entry->hilite = e->type == EnterNotify; + if (menu->mouseover) + menu->mouseover(entry, e->type == EnterNotify); + else + menu_control_mouseover(entry, e->type == EnterNotify); + menu_entry_render(entry); } 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); +} + +void find_max_fd_foreach(GQuark n, gpointer data, gpointer max) +{ + *((unsigned int *)max) = MAX(*((unsigned int *)max), n); +} + +void event_remove_fd(int n) +{ + int tmpmax = 0; + FD_CLR(n, &allset); + g_datalist_id_remove_data(&fd_handler_list, (GQuark)n); + g_datalist_foreach(&fd_handler_list, find_max_fd_foreach, (gpointer)&tmpmax); + max_fd = MAX(x_fd, tmpmax); +} + +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); + } +} + +void fd_event_handle() +{ + g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); +} + +static void event_handle_dock(Dock *s, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + stacking_raise(DOCK_AS_WINDOW(s)); + case EnterNotify: + dock_hide(FALSE); + break; + case LeaveNotify: + dock_hide(TRUE); + break; + } +} + +static void event_handle_dockapp(DockApp *app, XEvent *e) +{ + switch (e->type) { + case MotionNotify: + dock_app_drag(app, &e->xmotion); + break; + case UnmapNotify: + if (app->ignore_unmaps) { + app->ignore_unmaps--; + break; + } + dock_remove(app, TRUE); + break; + case DestroyNotify: + dock_remove(app, FALSE); + break; + case ReparentNotify: + dock_remove(app, FALSE); + break; + case ConfigureNotify: + dock_app_configure(app, e->xconfigure.width, e->xconfigure.height); + break; + } +}