move the keyboard and mouse plugins into the kernel for mucho sexiness.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 2b88c876f4fa50a0bde3a234c4687f2e7c3520e5..9949dea3a68fb337ad79a025e75b5985450d45ed 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "event.h"
 #include "openbox.h"
 #include "grab.h"
@@ -17,33 +18,16 @@
 #include <glib.h>
 #include <assert.h>
 
-ObClient *focus_client = NULL;
-GList **focus_order = NULL; /* these lists are created when screen_startup
-                               sets the number of desktops */
+ObClient *focus_client;
+GList **focus_order; /* these lists are created when screen_startup
+                        sets the number of desktops */
 
-Window focus_backup = None;
-
-static ObClient *focus_cycle_target = NULL;
-static Popup *focus_cycle_popup = NULL;
+static ObClient *focus_cycle_target;
+static Popup *focus_cycle_popup;
 
 void focus_startup()
 {
-    /* create the window which gets focus when no clients get it. Have to
-       make it override-redirect so we don't try manage it, since it is
-       mapped. */
-    XSetWindowAttributes attrib;
-
-    focus_client = NULL;
-
-    attrib.override_redirect = TRUE;
-    focus_backup = XCreateWindow(ob_display, ob_root,
-                                -100, -100, 1, 1, 0,
-                                 CopyFromParent, InputOutput, CopyFromParent,
-                                 CWOverrideRedirect, &attrib);
-    XMapRaised(ob_display, focus_backup);
-
-    /* do this *after* focus_backup is created, since it is used for
-       stacking */
+
     focus_cycle_popup = popup_new(TRUE);
 
     /* start with nothing focused */
@@ -57,12 +41,8 @@ void focus_shutdown()
     for (i = 0; i < screen_num_desktops; ++i)
         g_list_free(focus_order[i]);
     g_free(focus_order);
-    focus_order = NULL;
 
     popup_free(focus_cycle_popup);
-    focus_cycle_popup = NULL;
-
-    XDestroyWindow(ob_display, focus_backup);
 
     /* reset focus to root */
     XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
@@ -85,7 +65,7 @@ void focus_set_client(ObClient *client)
     ObClient *old;
 
 #ifdef DEBUG_FOCUS
-    g_message("focus_set_client 0x%lx", client ? client->window : 0);
+    ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0);
 #endif
 
     /* uninstall the old colormap, and install the new one */
@@ -94,7 +74,7 @@ void focus_set_client(ObClient *client)
 
     if (client == NULL) {
        /* when nothing will be focused, send focus to the backup target */
-       XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
+       XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
                        event_lasttime);
         XSync(ob_display, FALSE);
     }
@@ -111,9 +91,10 @@ void focus_set_client(ObClient *client)
         push_to_top(client);
 
     /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
-    if (ob_state != OB_STATE_EXITING) {
+    if (ob_state() != OB_STATE_EXITING) {
         active = client ? client->window : None;
-        PROP_SET32(ob_root, net_active_window, window, active);
+        PROP_SET32(RootWindow(ob_display, ob_screen),
+                   net_active_window, window, active);
     }
 
     if (focus_client != NULL)
@@ -127,7 +108,7 @@ static gboolean focus_under_pointer()
     int x, y;
     GList *it;
 
-    if (ob_pointer_pos(&x, &y)) {
+    if (screen_pointer_pos(&x, &y)) {
         for (it = stacking_list; it != NULL; it = it->next) {
             if (WINDOW_IS_CLIENT(it->data)) {
                 ObClient *c = WINDOW_AS_CLIENT(it->data);
@@ -172,7 +153,7 @@ static gboolean focus_fallback_transient(ObClient *top, ObClient *old)
     return client_focus(target);
 }
 
-void focus_fallback(FallbackType type)
+void focus_fallback(ObFocusFallbackType type)
 {
     GList *it;
     ObClient *old = NULL;
@@ -185,16 +166,16 @@ void focus_fallback(FallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == Fallback_Desktop ?
+    if (!(type == OB_FOCUS_FALLBACK_DESKTOP ?
           config_focus_last_on_desktop : config_focus_last)) {
         if (config_focus_follow) focus_under_pointer();
         return;
     }
 
-    if (type == Fallback_Unfocusing && old) {
+    if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */
         if (old->transient_for) {
-            if (old->transient_for == TRAN_GROUP) {
+            if (old->transient_for == OB_TRAN_GROUP) {
                 for (it = focus_order[screen_desktop]; it; it = it->next) {
                     GSList *sit;
 
@@ -226,7 +207,7 @@ void focus_fallback(FallbackType type)
     }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
-        if (type != Fallback_Unfocusing || it->data != old)
+        if (type != OB_FOCUS_FALLBACK_UNFOCUSING || it->data != old)
             if (client_normal(it->data) &&
                 /* dont fall back to 'anonymous' fullscreen windows. theres no
                    checks for this is in transient/group fallbacks, so they can
@@ -259,10 +240,10 @@ static void popup_cycle(ObClient *c, gboolean show)
 */
         /* XXX the size and the font extents need to be related on some level
          */
-        popup_size(focus_cycle_popup, 320, 48);
+        popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
 
         /* use the transient's parent's title/icon */
-        while (p->transient_for && p->transient_for != TRAN_GROUP)
+        while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
             p = p->transient_for;
 
         if (p == c)
@@ -281,7 +262,7 @@ static void popup_cycle(ObClient *c, gboolean show)
 }
 
 ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                    gboolean cancel)
+                      gboolean cancel)
 {
     static ObClient *first = NULL;
     static ObClient *t = NULL;
@@ -300,8 +281,6 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
             client_activate(focus_cycle_target);
         goto done_cycle;
     }
-    if (!first)
-        grab_pointer(TRUE, None);
 
     if (!first) first = focus_client;
     if (!focus_cycle_target) focus_cycle_target = focus_client;
@@ -350,7 +329,6 @@ done_cycle:
     order = NULL;
 
     popup_cycle(ft, FALSE);
-    grab_pointer(FALSE, None);
 
     return NULL;
 }