make popup dialogs appear on the active monitor with xinerama

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 84ae2a38e2d25f7eac85b6c4f74644502b2c1641..06cd7525bf9fd5c4d6de32eb8be94b462a0e7e51 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -78,15 +78,16 @@ static gboolean chain_timeout(gpointer data)
 
 static void set_curpos(KeyBindingTree *newpos)
 {
-    if (curpos != newpos) {
-        grab_keys(FALSE);
-        curpos = newpos;
-        grab_keys(TRUE);
-    }
+    if (curpos == newpos) return;
+
+    grab_keys(FALSE);
+    curpos = newpos;
+    grab_keys(TRUE);
 
     if (curpos != NULL) {
         gchar *text = NULL;
         GList *it;
+        Rect *a;
 
         for (it = curpos->keylist; it; it = g_list_next(it)) {
             gchar *oldtext = text;
@@ -97,7 +98,8 @@ static void set_curpos(KeyBindingTree *newpos)
             g_free(oldtext);
         }
 
-        popup_position(popup, NorthWestGravity, 10, 10);
+        a = screen_physical_area_monitor_active();
+        popup_position(popup, NorthWestGravity, a->x + 10, a->y + 10);
         /* 1 second delay for the popup to show */
         popup_delay_show(popup, G_USEC_PER_SEC, text);
         g_free(text);
@@ -197,13 +199,15 @@ static void keyboard_interactive_end(guint state, gboolean cancel, Time time,
 
     /* ungrab first so they won't be NotifyWhileGrabbed */
     if (ungrab)
-        grab_keyboard(FALSE);
+        ungrab_keyboard();
+
+    /* set this before running the actions so they know the keyboard is not
+       grabbed */
+    istate.active = FALSE;
 
     alist = g_slist_append(NULL, istate.action);
     action_run_interactive(alist, istate.client, state, time, cancel, TRUE);
     g_slist_free(alist);
-
-    istate.active = FALSE;
 }
 
 static void keyboard_interactive_end_client(ObClient *client, gpointer data)
@@ -212,16 +216,22 @@ static void keyboard_interactive_end_client(ObClient *client, gpointer data)
         istate.client = NULL;
 }
 
+
+void keyboard_interactive_cancel()
+{
+    keyboard_interactive_end(0, TRUE, event_curtime, TRUE);
+}
+
 gboolean keyboard_interactive_grab(guint state, ObClient *client,
                                    ObAction *action)
 {
     g_assert(action->data.any.interactive);
 
     if (!istate.active) {
-        if (!grab_keyboard(TRUE))
+        if (!grab_keyboard())
             return FALSE;
     } else if (action->func != istate.action->func) {
-        keyboard_interactive_end(state, FALSE, action->data.any.time, FALSE);
+        keyboard_interactive_end(state, TRUE, action->data.any.time, FALSE);
     }
 
     istate.active = TRUE;
@@ -322,18 +332,19 @@ void keyboard_startup(gboolean reconfig)
 {
     grab_keys(TRUE);
     popup = popup_new(FALSE);
+    popup_set_text_align(popup, RR_JUSTIFY_CENTER);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client, NULL);
+        client_add_destroy_notify(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)
 {
     if (!reconfig)
-        client_remove_destructor(keyboard_interactive_end_client);
+        client_remove_destroy_notify(keyboard_interactive_end_client);
 
     if (istate.active)
-        keyboard_interactive_end(0, TRUE, 0, TRUE);
+        keyboard_interactive_cancel();
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);