draw the bevel stuff in the pixel data buffer so parent-relative stuff can use it.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index b64d3e0071e4332feeff8b3fa25e4c83e04bd5a8..a04e4d401e64a4e6e12c1f6db7cb282447467fc8 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -17,33 +17,16 @@
 #include <glib.h>
 #include <assert.h>
 
-ObClient *focus_client = NULL;
+ObClient *focus_client;
 GList **focus_order = NULL; /* 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;
 
 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 +40,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,
@@ -94,7 +73,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 +90,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 +107,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 +152,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,13 +165,13 @@ 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 == OB_TRAN_GROUP) {
@@ -226,7 +206,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