X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=fc45060c45b3366c9a94e284a666c359049246f4;hb=615cbd96075905d75533f9b615c4ee6a75f4f9a4;hp=b5e15a3c894fdaf6cdf8ec392040e671bdbd98fc;hpb=cb49f853c9b62c4403eb562d39f52c51da292c4f;p=chaz%2Fopenbox diff --git a/openbox/event.c b/openbox/event.c index b5e15a3c..fc45060c 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -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" @@ -39,10 +42,10 @@ 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; } @@ -296,6 +299,7 @@ static void event_hack_mods(XEvent *e) break; case MotionNotify: STRIP_MODS(e->xmotion.state); +#if 0 /* compress events */ { XEvent ce; @@ -305,6 +309,7 @@ static void event_hack_mods(XEvent *e) e->xmotion.y_root = ce.xmotion.y_root; } } +#endif break; } } @@ -459,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); @@ -471,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(); @@ -521,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! */ } @@ -537,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); @@ -609,6 +620,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 @@ -790,7 +804,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) @@ -927,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] == @@ -993,7 +1008,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) @@ -1064,74 +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; - } - 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); @@ -1214,3 +1162,31 @@ 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->xmotion.x_root, + ev->xmotion.y_root))) + menu_frame_hide_all(); + else { + if ((e = menu_entry_frame_under(ev->xmotion.x_root, + ev->xmotion.y_root))) + menu_entry_frame_execute(e); + } + 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; + } +}