rename the 'root' context to 'desktop'

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 4ecc7b6101e4d2971158111b5f344d626a24f5fe..2f1fae309e941b4b4d3e8ab16b7486b8829de2e6 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -8,7 +8,8 @@
 
 #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
 #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
-                         ButtonPressMask | ButtonReleaseMask)
+                         ButtonPressMask | ButtonReleaseMask | \
+                         VisibilityChangeMask)
 #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
                            ButtonMotionMask | ExposureMask | \
                            EnterWindowMask | LeaveWindowMask)
@@ -36,6 +37,7 @@ ObFrame *frame_new()
     self = g_new(ObFrame, 1);
 
     self->visible = FALSE;
+    self->obscured = TRUE;
     self->decorations = 0;
 
     /* create all of the decor windows */
@@ -601,8 +603,8 @@ static void layout_title(ObFrame *self)
 
 ObFrameContext frame_context_from_string(char *name)
 {
-    if (!g_ascii_strcasecmp("root", name))
-        return OB_FRAME_CONTEXT_ROOT;
+    if (!g_ascii_strcasecmp("desktop", name))
+        return OB_FRAME_CONTEXT_DESKTOP;
     else if (!g_ascii_strcasecmp("client", name))
         return OB_FRAME_CONTEXT_CLIENT;
     else if (!g_ascii_strcasecmp("titlebar", name))
@@ -638,13 +640,27 @@ ObFrameContext frame_context(ObClient *client, Window win)
 {
     ObFrame *self;
 
-    if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
+    if (win == RootWindow(ob_display, ob_screen))
+        return OB_FRAME_CONTEXT_DESKTOP;
     if (client == NULL) return OB_FRAME_CONTEXT_NONE;
-    if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
+    if (win == client->window) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
 
     self = client->frame;
+    if (win == self->plate) {
+        /* conceptually, this is the desktop, as far as users are
+           concerned */
+        if (client->type == OB_CLIENT_TYPE_DESKTOP)
+            return OB_FRAME_CONTEXT_DESKTOP;
+        return OB_FRAME_CONTEXT_CLIENT;
+    }
+
     if (win == self->window)   return OB_FRAME_CONTEXT_FRAME;
-    if (win == self->plate)    return OB_FRAME_CONTEXT_CLIENT;
     if (win == self->title)    return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->label)    return OB_FRAME_CONTEXT_TITLEBAR;
     if (win == self->handle)   return OB_FRAME_CONTEXT_HANDLE;