X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenuframe.c;h=99b7dceebc0436c21e7f3c6155316b841bf303dd;hb=666a466b7e2ea3be315b7adb435fc15350804e69;hp=5184f835906570ada62ed73d1cd320fbdf1c1457;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 5184f835..99b7dcee 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -1,6 +1,7 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- menuframe.c for the Openbox window manager + Copyright (c) 2004 Mikael Magnusson Copyright (c) 2003 Ben Jansens This program is free software; you can redistribute it and/or modify @@ -22,6 +23,7 @@ #include "screen.h" #include "grab.h" #include "openbox.h" +#include "config.h" #include "render/theme.h" #define PADDING 2 @@ -29,7 +31,7 @@ #define MAX_MENU_WIDTH 400 #define FRAME_EVENTMASK (ButtonPressMask |ButtonMotionMask | EnterWindowMask |\ - LeaveWindowMask) + LeaveWindowMask) #define TITLE_EVENTMASK (ButtonPressMask | ButtonMotionMask) #define ENTRY_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ ButtonPressMask | ButtonReleaseMask) @@ -41,12 +43,13 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry, static void menu_entry_frame_free(ObMenuEntryFrame *self); static void menu_frame_render(ObMenuFrame *self); static void menu_frame_update(ObMenuFrame *self); +static gboolean menu_entry_frame_submenu_timeout(gpointer data); -static Window createWindow(Window parent, unsigned long mask, - XSetWindowAttributes *attrib) +static Window createWindow(Window parent, gulong mask, + XSetWindowAttributes *attrib) { return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - RrDepth(ob_rr_inst), InputOutput, + RrDepth(ob_rr_inst), InputOutput, RrVisual(ob_rr_inst), mask, attrib); } @@ -63,8 +66,9 @@ ObMenuFrame* menu_frame_new(ObMenu *menu, ObClient *client) self->client = client; attr.event_mask = FRAME_EVENTMASK; + attr.save_under = True; self->window = createWindow(RootWindow(ob_display, ob_screen), - CWEventMask, &attr); + CWEventMask | CWSaveUnder, &attr); attr.event_mask = TITLE_EVENTMASK; self->title = createWindow(self->window, CWEventMask, &attr); self->items = createWindow(self->window, 0, NULL); @@ -184,17 +188,12 @@ void menu_frame_move(ObMenuFrame *self, gint x, gint y) void menu_frame_move_on_screen(ObMenuFrame *self) { - Rect *a; + Rect *a = NULL; guint i; gint dx = 0, dy = 0; gint pos, half; - for (i = 0; i < screen_num_monitors; ++i) { - a = screen_physical_area_monitor(i); - if (RECT_INTERSECTS_RECT(*a, self->area)) - break; - } - if (!a) a = screen_physical_area_monitor(0); + a = screen_physical_area_monitor(self->monitor); half = g_list_length(self->entries) / 2; pos = g_list_index(self->entries, self->selected); @@ -217,11 +216,17 @@ void menu_frame_move_on_screen(ObMenuFrame *self) if (dx || dy) { ObMenuFrame *f; - for (f = self; f; f = f->parent) + /* move the current menu frame to fit, but dont touch parents yet */ + menu_frame_move(self, self->area.x + dx, self->area.y + dy); + if (!config_menu_xorstyle) + dy = 0; /* if we want to be like xor, move parents in y- * + * and x-direction, otherwise just in x-dir */ + for (f = self->parent; f; f = f->parent) menu_frame_move(f, f->area.x + dx, f->area.y + dy); for (f = self->child; f; f = f->child) menu_frame_move(f, f->area.x + dx, f->area.y + dy); - XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy); + if (config_menu_warppointer) + XWarpPointer(ob_display, None, None, 0, 0, 0, 0, dx, dy); } } @@ -584,26 +589,31 @@ static void menu_frame_update(ObMenuFrame *self) menu_frame_render(self); } -void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) +gboolean menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) { GList *it; if (g_list_find(menu_frame_visible, self)) - return; + return TRUE; + + if (menu_frame_visible == NULL) { + /* no menus shown yet */ + if (!grab_pointer(TRUE, OB_CURSOR_NONE)) + return FALSE; + if (!grab_keyboard(TRUE)) { + grab_pointer(FALSE, OB_CURSOR_NONE); + return FALSE; + } + } if (parent) { + self->monitor = parent->monitor; if (parent->child) menu_frame_hide(parent->child); parent->child = self; } self->parent = parent; - if (menu_frame_visible == NULL) { - /* no menus shown yet */ - grab_pointer(TRUE, OB_CURSOR_NONE); - grab_keyboard(TRUE); - } - /* determine if the underlying menu is already visible */ for (it = menu_frame_visible; it; it = g_list_next(it)) { ObMenuFrame *f = it->data; @@ -622,6 +632,8 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent) menu_frame_move_on_screen(self); XMapWindow(ob_display, self->window); + + return TRUE; } void menu_frame_hide(ObMenuFrame *self) @@ -653,6 +665,11 @@ void menu_frame_hide(ObMenuFrame *self) void menu_frame_hide_all() { + if (config_submenu_show_delay) { + /* remove any submenu open requests */ + ob_main_loop_timeout_remove(ob_main_loop, + menu_entry_frame_submenu_timeout); + } GList *it = g_list_last(menu_frame_visible); if (it) menu_frame_hide(it->data); @@ -707,6 +724,12 @@ ObMenuEntryFrame* menu_entry_frame_under(gint x, gint y) return ret; } +static gboolean menu_entry_frame_submenu_timeout(gpointer data) +{ + menu_entry_frame_show_submenu((ObMenuEntryFrame*)data); + return FALSE; +} + void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry) { ObMenuEntryFrame *old = self->selected; @@ -716,6 +739,12 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry) entry = old; if (old == entry) return; + + if (config_submenu_show_delay) { + /* remove any submenu open requests */ + ob_main_loop_timeout_remove(ob_main_loop, + menu_entry_frame_submenu_timeout); + } self->selected = entry; @@ -727,8 +756,18 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry) if (self->selected) { menu_entry_frame_render(self->selected); - if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) - menu_entry_frame_show_submenu(self->selected); + if (self->selected->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU) { + if (config_submenu_show_delay) { + /* initiate a new submenu open request */ + ob_main_loop_timeout_add(ob_main_loop, + config_submenu_show_delay * 1000, + menu_entry_frame_submenu_timeout, + self->selected, + NULL); + } else { + menu_entry_frame_show_submenu(self->selected); + } + } } } @@ -767,12 +806,8 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state) if (func) func(entry, state, data); - else { - GSList *it; - - for (it = acts; it; it = g_slist_next(it)) - action_run(it->data, client, state); - } + else + action_run(acts, client, state); } }