make keeping windows on screen much more clever

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 78768a62235d3a5eb1fb882781a5545968e58a20..6b7f4c532c77eff1f624e8a7f69429b2715abe0f 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -886,7 +886,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             h = (e->xconfigurerequest.value_mask & CWHeight) ?
                 e->xconfigurerequest.height : client->area.height;
 
-            client_find_onscreen(client, &x, &y, w, h, client_normal(client));
+            client_find_onscreen(client, &x, &y, w, h, FALSE);
             client_configure_full(client, x, y, w, h, FALSE, TRUE, TRUE);
         }
 
@@ -1074,7 +1074,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 h = client->area.height;
 
             client_convert_gravity(client, grav, &x, &y, w, h);
-            client_find_onscreen(client, &x, &y, w, h, client_normal(client));
+            client_find_onscreen(client, &x, &y, w, h, FALSE);
             client_configure(client, x, y, w, h, FALSE, TRUE);
         }
         break;
@@ -1249,6 +1249,9 @@ static void event_handle_menu_shortcut(XEvent *ev)
         const char *key;
         if ((key = translate_keycode(ev->xkey.keycode)) == NULL)
             return;
+        /* don't accept keys that aren't a single letter, like "space" */
+        if (key[1] != '\0')
+            return;
         unikey = g_utf8_get_char_validated(key, -1);
         if (unikey == (gunichar)-1 || unikey == (gunichar)-2 || unikey == 0)
             return;