isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

window: Make MetaWindow keep a pointer to the popup menu

Browse Source 
Multiple windows may now have different popup menus, responding
only to the device pair that popped it up.
This commit is contained in:
Carlos Garnacho 2011-08-01 23:39:37 +02:00
parent 48a88a33ef
commit f84637d31e
5 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/core.c
View File

@ -519,6 +519,12 @@ meta_core_show_window_menu (Display *xdisplay,
{
MetaWindow *window = get_window (xdisplay, frame_xwindow);
/* There is already a menu popped up,
* most likely from another device
*/
if (window->menu)
return;
if (meta_prefs_get_raise_on_click ())
meta_window_raise (window);
meta_window_focus (window, timestamp);

28
src/core/display.c
View File

@ -522,9 +522,6 @@ meta_display_open (void)
the_display->groups_by_leader = NULL;
the_display->window_with_menu = NULL;
the_display->window_menu = NULL;
the_display->screens = NULL;
the_display->active_screen = NULL;
@ -1959,7 +1956,8 @@ event_callback (XEvent *event,
ev_root_y);
}
}
else if (n_button == meta_prefs_get_mouse_button_menu())
else if (!window->menu &&
n_button == meta_prefs_get_mouse_button_menu())
{
if (meta_prefs_get_raise_on_click ())
meta_window_raise (window);
@ -3605,6 +3603,28 @@ meta_display_begin_grab_op (MetaDisplay *display,
grab_info = meta_display_get_grab_info (display, device);
if (window && window->cur_grab &&
window->cur_grab != grab_info)
{
meta_verbose ("Attempt to perform window operation %u on window %s while"
" operation %u is already in effect on the same window for"
" the device pair %d/%d\n",
op, window->desc, window->cur_grab->grab_op,
meta_device_get_id (window->cur_grab->grab_pointer),
meta_device_get_id (window->cur_grab->grab_keyboard));
return FALSE;
}
if (window && window->menu != NULL &&
window->menu_device != device)
{
meta_verbose ("Attempt to perform window operation %u on window %s while"
" context menu is opened on that window for pointer %d\n",
op, window->desc,
meta_device_get_id (window->menu_device));
return FALSE;
}
if (grab_info != NULL &&
grab_info->grab_op != META_GRAB_OP_NONE)
{

3
src/core/keybindings.c
View File

@ -3120,7 +3120,8 @@ handle_activate_window_menu (MetaDisplay *display,
device = meta_input_event_get_device (display, event);
focus_info = meta_display_get_focus_info (display, device);
if (focus_info->focus_window)
if (focus_info->focus_window &&
!focus_info->focus_window->menu)
{
Time evtime;
int x, y;

4
src/core/window-private.h
View File

@ -107,6 +107,10 @@ struct _MetaWindow
Window xgroup_leader;
Window xclient_leader;
/* window menu if any, and the pointer that popped it up */
MetaWindowMenu *menu;
MetaDevice *menu_device;
/* Initial workspace property */
int initial_workspace;

30
src/core/window.c
View File

@ -197,6 +197,9 @@ meta_window_finalize (GObject *object)
if (window->frame_bounds)
cairo_region_destroy (window->frame_bounds);
if (window->menu)
meta_ui_window_menu_free (window->menu);
meta_icon_cache_free (&window->icon_cache);
g_free (window->sm_client_id);
@ -1497,9 +1500,9 @@ meta_window_unmanage (MetaWindow *window,
if (window->display->window_with_menu == window)
{
meta_ui_window_menu_free (window->display->window_menu);
window->display->window_menu = NULL;
window->display->window_with_menu = NULL;
meta_ui_window_menu_free (window->menu);
window->menu_device = NULL;
window->menu = NULL;
}
if (destroying_windows_disallowed > 0)
@ -8030,13 +8033,12 @@ menu_callback (MetaWindowMenu *menu,
meta_verbose ("Menu callback on nonexistent window\n");
}
if (display->window_menu == menu)
if (window && window->menu)
{
display->window_menu = NULL;
display->window_with_menu = NULL;
}
meta_ui_window_menu_free (menu);
window->menu_device = NULL;
window->menu = NULL;
}
}
void
@ -8055,11 +8057,11 @@ meta_window_show_menu (MetaWindow *window,
g_return_if_fail (!window->override_redirect);
if (window->display->window_menu)
if (window->menu)
{
meta_ui_window_menu_free (window->display->window_menu);
window->display->window_menu = NULL;
window->display->window_with_menu = NULL;
meta_ui_window_menu_free (window->menu);
window->menu_device = NULL;
window->menu = NULL;
}
ops = META_MENU_OP_NONE;
@ -8166,8 +8168,8 @@ meta_window_show_menu (MetaWindow *window,
menu_callback,
NULL);
window->display->window_menu = menu;
window->display->window_with_menu = window;
window->menu_device = device;
window->menu = menu;
meta_verbose ("Popping up window menu for %s\n", window->desc);