window: Make MetaWindow keep a pointer to the popup menu

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

View File

@@ -518,7 +518,13 @@ meta_core_show_window_menu (Display *xdisplay,
guint32 timestamp)
{
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);