X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=cb8babf078d2a059de071a728e0d53c8ccfd654b;hb=eea43e64883fc0c988b916db99bc5b45ccffc432;hp=6c4df78045c7621299b3500473fec93ad452658a;hpb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index 6c4df780..cb8babf0 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1,5 +1,5 @@ #include "openbox.h" -#include "slit.h" +#include "dock.h" #include "client.h" #include "xerror.h" #include "prop.h" @@ -21,18 +21,36 @@ #include #include +#ifdef USE_LIBSN +# include +#endif + #ifdef HAVE_SYS_SELECT_H # include #endif +#ifdef HAVE_SIGNAL_H +# include +#endif + +#ifdef USE_SM +#include +#endif static void event_process(XEvent *e); static void event_handle_root(XEvent *e); -static void event_handle_slit(Slit *s, XEvent *e); -static void event_handle_slitapp(SlitApp *app, XEvent *e); -static void event_handle_client(Client *c, XEvent *e); -static void event_handle_menu(Menu *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 || \ (e)->xfocus.detail > NotifyNonlinearVirtual) #define INVALID_FOCUSOUT(e) ((e)->xfocus.mode == NotifyGrab || \ (e)->xfocus.detail == NotifyInferior || \ @@ -55,10 +73,30 @@ 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; -void fd_event_handle(); + +#ifdef USE_SM +static void ice_watch(IceConn conn, IcePointer data, Bool opening, + IcePointer *watch_data) +{ + if (opening) { + g_assert (ice_fd < 0); + ice_conn = conn; + ice_fd = IceConnectionNumber(conn); + FD_SET(ice_fd, &allset); + } else { + FD_CLR(ice_fd, &allset); + ice_fd = -1; + } + find_max_fd(); +} +#endif void event_startup() { @@ -90,6 +128,12 @@ void event_startup() FD_ZERO(&allset); max_fd = x_fd = ConnectionNumber(ob_display); FD_SET(x_fd, &allset); + +#ifdef USE_SM + ice_fd = -1; + IceAddConnectionWatch(ice_watch, NULL); +#endif + g_datalist_init(&fd_handler_list); } @@ -105,30 +149,13 @@ void event_loop() struct timeval *wait; gboolean had_event = FALSE; - while (TRUE) { - /* - There are slightly different event retrieval semantics here for - local (or high bandwidth) versus remote (or low bandwidth) - connections to the display/Xserver. - */ - if (ob_remote) { - if (!XPending(ob_display)) - break; - } else { - /* - This XSync allows for far more compression of events, which - makes things like Motion events perform far far better. Since - it also means network traffic for every event instead of every - X events (where X is the number retrieved at a time), it - probably should not be used for setups where Openbox is - running on a remote/low bandwidth display/Xserver. - */ - XSync(ob_display, FALSE); - if (!XEventsQueued(ob_display, QueuedAlready)) - break; - } + 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; } @@ -142,6 +169,13 @@ void event_loop() 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(); } } @@ -265,7 +299,7 @@ static void event_hack_mods(XEvent *e) } } -static gboolean event_ignore(XEvent *e, Client *client) +static gboolean event_ignore(XEvent *e, ObClient *client) { switch(e->type) { case FocusIn: @@ -332,14 +366,33 @@ static gboolean event_ignore(XEvent *e, Client *client) g_message("found pending FocusIn"); #endif /* is the focused window getting a FocusOut/In back to - itself? */ + itself? + */ if (fe.xfocus.window == e->xfocus.window && !event_ignore(&fe, client)) { + /* + if focus_client is not set, then we can't do + this. we need the FocusIn. This happens in the + case when the set_focus_client(NULL) in the + focus_fallback function fires and then + focus_fallback picks the currently focused + window (such as on a SendToDesktop-esque action. + */ + if (focus_client) { +#ifdef DEBUG_FOCUS + g_message("focused window got an Out/In back to " + "itself IGNORED both"); +#endif + return TRUE; + } else { + event_process(&fe); #ifdef DEBUG_FOCUS - g_message("focused window got an Out/In back to " - "itself IGNORED both"); + g_message("focused window got an Out/In back to " + "itself but focus_client was null " + "IGNORED just the Out"); #endif - return TRUE; + return TRUE; + } } /* once all the FocusOut's have been dealt with, if there @@ -358,7 +411,7 @@ static gboolean event_ignore(XEvent *e, Client *client) g_message("no valid FocusIn and no FocusOut events found, " "falling back"); #endif - focus_fallback(Fallback_NoFocus); + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } } break; @@ -393,16 +446,33 @@ static gboolean event_ignore(XEvent *e, Client *client) static void event_process(XEvent *e) { Window window; - Client *client = NULL; - Slit *slit = NULL; - SlitApp *slitapp = NULL; + ObClient *client = NULL; + ObDock *dock = NULL; + ObDockApp *dockapp = NULL; Menu *menu = NULL; + ObWindow *obwin = NULL; window = event_get_window(e); - if (!(client = g_hash_table_lookup(client_map, &window))) - if (!(slitapp = g_hash_table_lookup(slit_app_map, &window))) - if (!(slit = g_hash_table_lookup(slit_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); @@ -410,15 +480,12 @@ static void event_process(XEvent *e) return; /* deal with it in the kernel */ - if (menu) { - event_handle_menu(menu, e); - return; - } else if (client) + if (client) event_handle_client(client, e); - else if (slitapp) - event_handle_slitapp(slitapp, e); - else if (slit) - event_handle_slit(slit, 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) @@ -444,6 +511,15 @@ 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 || @@ -498,9 +574,7 @@ static void event_handle_root(XEvent *e) #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); + screen_resize(); break; default: ; @@ -512,7 +586,7 @@ static void event_handle_root(XEvent *e) } } -static void event_handle_client(Client *client, XEvent *e) +static void event_handle_client(ObClient *client, XEvent *e) { XEvent ce; Atom msgtype; @@ -521,38 +595,44 @@ 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 OB_FRAME_CONTEXT_MAXIMIZE: + client->frame->max_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_CLOSE: + client->frame->close_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_ICONIFY: + client->frame->iconify_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_CONTEXT_ALLDESKTOPS: + client->frame->desk_press = (e->type == ButtonPress); + framerender_frame(client->frame); + break; + case OB_FRAME_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); + if (client != focus_client) { + focus_set_client(client); + frame_adjust_focus(client->frame, TRUE); + } break; case FocusOut: #ifdef DEBUG_FOCUS @@ -561,7 +641,7 @@ static void event_handle_client(Client *client, XEvent *e) /* 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 && + if (client->layer == OB_STACKING_LAYER_FULLSCREEN && !client->iconic && !client_search_focus_tree_full(client)) /* iconify fullscreen windows when they and their transients aren't focused */ @@ -570,7 +650,7 @@ static void event_handle_client(Client *client, XEvent *e) break; case EnterNotify: if (client_normal(client)) { - if (ob_state == State_Starting) { + 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; @@ -621,7 +701,7 @@ static void event_handle_client(Client *client, XEvent *e) if (e->xconfigurerequest.value_mask & (CWWidth | CWHeight | CWX | CWY)) { int x, y, w, h; - Corner corner; + ObCorner corner; x = (e->xconfigurerequest.value_mask & CWX) ? e->xconfigurerequest.x : client->area.x; @@ -635,20 +715,20 @@ static void event_handle_client(Client *client, XEvent *e) switch (client->gravity) { case NorthEastGravity: case EastGravity: - corner = Corner_TopRight; + corner = OB_CORNER_TOPRIGHT; break; case SouthWestGravity: case SouthGravity: - corner = Corner_BottomLeft; + corner = OB_CORNER_BOTTOMLEFT; break; case SouthEastGravity: - corner = Corner_BottomRight; + corner = OB_CORNER_BOTTOMRIGHT; break; default: /* NorthWest, Static, etc */ - corner = Corner_TopLeft; + corner = OB_CORNER_TOPLEFT; } - client_configure(client, corner, x, y, w, h, FALSE, FALSE); + client_configure(client, corner, x, y, w, h, FALSE, TRUE); } if (e->xconfigurerequest.value_mask & CWStackMode) { @@ -819,7 +899,8 @@ static void event_handle_client(Client *client, XEvent *e) else h = client->area.y; client->gravity = tmpg; - client_configure(client, Corner_TopLeft, x, y, w, h, TRUE, TRUE); + client_configure(client, OB_CORNER_TOPLEFT, + x, y, w, h, FALSE, TRUE); client->gravity = oldg; } break; @@ -866,10 +947,9 @@ static void event_handle_client(Client *client, XEvent *e) } else if (msgtype == prop_atoms.net_wm_strut) client_update_strut(client); - else if (msgtype == prop_atoms.net_wm_icon) + else if (msgtype == prop_atoms.net_wm_icon || + msgtype == prop_atoms.kwm_win_icon) client_update_icons(client); - else if (msgtype == prop_atoms.kwm_win_icon) - client_update_kwm_icon(client); default: ; #ifdef SHAPE @@ -881,95 +961,156 @@ static void event_handle_client(Client *client, XEvent *e) } } -static void event_handle_menu(Menu *menu, XEvent *e) +static void event_handle_menu(ObClient *client, XEvent *e) { + static MenuEntry *over = NULL; MenuEntry *entry; + Menu *top; + GSList *it; + + top = g_slist_nth_data(menu_visible, 0); g_message("EVENT %d", e->type); switch (e->type) { + case KeyPress: + if (over) { + if (over->parent->mouseover) + over->parent->mouseover(over, FALSE); + else + menu_control_mouseover(over, FALSE); + menu_entry_render(over); + over = NULL; + } +/* + if (top->hide) + top->hide(top); + else +*/ + menu_hide(top); + break; case ButtonPress: + if (e->xbutton.button > 3) break; + 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: + if (e->xbutton.button > 3) break; + g_message("BUTTON RELEASED"); - if (!menu->shown) break; - -/* grab_pointer_window(FALSE, None, menu->frame);*/ - - entry = menu_find_entry(menu, e->xbutton.window); - if (entry) { - int junk; - Window wjunk; - guint ujunk, b, w, h; - XGetGeometry(ob_display, e->xbutton.window, - &wjunk, &junk, &junk, &w, &h, &b, &ujunk); - if (e->xbutton.x >= (signed)-b && - e->xbutton.y >= (signed)-b && - e->xbutton.x < (signed)(w+b) && - e->xbutton.y < (signed)(h+b)) { - menu_entry_fire(entry); + + for (it = menu_visible; it; it = g_slist_next(it)) { + Menu *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))) { + if (over) { + if (over->parent->mouseover) + over->parent->mouseover(over, FALSE); + else + menu_control_mouseover(over, FALSE); + menu_entry_render(over); + over = NULL; + /* this hides the menu */ + menu_entry_fire(entry); + } + } + break; } } - - break; - case EnterNotify: - case LeaveNotify: - g_message("enter/leave"); - entry = menu_find_entry(menu, e->xcrossing.window); - if (entry) { - if (menu->mouseover) - menu->mouseover(entry, e->type == EnterNotify); + if (!it) { + if (over) { + if (over->parent->mouseover) + over->parent->mouseover(over, FALSE); + else + menu_control_mouseover(over, FALSE); + menu_entry_render(over); + over = NULL; + } +/* + if (top->hide) + top->hide(top); else - menu_control_mouseover(entry, e->type == EnterNotify); - - menu_entry_render(entry); +*/ + menu_hide(top); } + break; - } -} + case MotionNotify: + g_message("motion"); + for (it = menu_visible; it; it = g_slist_next(it)) { + Menu *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 (over && entry != over) { + if (over->parent->mouseover) + over->parent->mouseover(over, FALSE); + else + menu_control_mouseover(over, FALSE); + menu_entry_render(over); + } -static void event_handle_slit(Slit *s, XEvent *e) -{ - switch (e->type) { - case ButtonPress: - stacking_raise(SLIT_AS_WINDOW(s)); - case EnterNotify: - slit_hide(s, FALSE); - break; - case LeaveNotify: - slit_hide(s, TRUE); + over = entry; + if (over->parent->mouseover) + over->parent->mouseover(over, TRUE); + else + menu_control_mouseover(over, TRUE); + menu_entry_render(over); + break; + } + } + if (!it && over) { + if (over->parent->mouseover) + over->parent->mouseover(over, FALSE); + else + menu_control_mouseover(over, FALSE); + menu_entry_render(over); + over = NULL; + } 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); + 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) +static void find_max_fd_foreach(GQuark n, gpointer data, gpointer max) { - *((unsigned int *)max) = MAX(*((unsigned int *)max), n); + *((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) { - 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); + FD_CLR(n, &allset); + g_datalist_id_remove_data(&fd_handler_list, (GQuark)n); + find_max_fd(); } -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; @@ -978,32 +1119,47 @@ void fd_event_handle_foreach(GQuark n, gpointer data, gpointer user_data) } } -void fd_event_handle() +static void fd_event_handle() { g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL); } -static void event_handle_slitapp(SlitApp *app, XEvent *e) +static void event_handle_dock(ObDock *s, XEvent *e) +{ + switch (e->type) { + case ButtonPress: + stacking_raise(DOCK_AS_WINDOW(s)); + break; + case EnterNotify: + dock_hide(FALSE); + break; + case LeaveNotify: + dock_hide(TRUE); + break; + } +} + +static void event_handle_dockapp(ObDockApp *app, XEvent *e) { switch (e->type) { case MotionNotify: - slit_app_drag(app, &e->xmotion); + dock_app_drag(app, &e->xmotion); break; case UnmapNotify: if (app->ignore_unmaps) { app->ignore_unmaps--; break; } - slit_remove(app, TRUE); + dock_remove(app, TRUE); break; case DestroyNotify: - slit_remove(app, FALSE); + dock_remove(app, FALSE); break; case ReparentNotify: - slit_remove(app, FALSE); + dock_remove(app, FALSE); break; case ConfigureNotify: - slit_app_configure(app, e->xconfigure.width, e->xconfigure.height); + dock_app_configure(app, e->xconfigure.width, e->xconfigure.height); break; } }