M data/rc3 → data/rc3

@@ -297,7 +297,7 @@ <mousebind button="Left" action="click">
       <action name="close"/>
     </mousebind>
   </context>
-  <context name="root">
+  <context name="desktop">
     <mousebind button="A-Up" action="click">
       <action name="desktopright"/>
     </mousebind>

M openbox/frame.c → openbox/frame.c

@@ -603,8 +603,8 @@ }
 
 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))
@@ -640,22 +640,23 @@ 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) {
-        /* conceptually, this is the root window, as far as users are
+        /* conceptually, this is the desktop, as far as users are
            concerned */
         if (client->type == OB_CLIENT_TYPE_DESKTOP)
-            return OB_FRAME_CONTEXT_ROOT;
+            return OB_FRAME_CONTEXT_DESKTOP;
         return OB_FRAME_CONTEXT_CLIENT;
     }
 
     self = client->frame;
     if (win == self->plate) {
-        /* conceptually, this is the root window, as far as users are
+        /* conceptually, this is the desktop, as far as users are
            concerned */
         if (client->type == OB_CLIENT_TYPE_DESKTOP)
-            return OB_FRAME_CONTEXT_ROOT;
+            return OB_FRAME_CONTEXT_DESKTOP;
         return OB_FRAME_CONTEXT_CLIENT;
     }
 

M openbox/frame.h → openbox/frame.h

@@ -10,7 +10,7 @@ struct _ObClient;
 
 typedef enum {
     OB_FRAME_CONTEXT_NONE,
-    OB_FRAME_CONTEXT_ROOT,
+    OB_FRAME_CONTEXT_DESKTOP,
     OB_FRAME_CONTEXT_CLIENT,
     OB_FRAME_CONTEXT_TITLEBAR,
     OB_FRAME_CONTEXT_HANDLE,

M openbox/mouse.c → openbox/mouse.c

@@ -19,7 +19,7 @@ GSList *actions[OB_MOUSE_NUM_ACTIONS]; /* lists of Action pointers */
 } ObMouseBinding;
 
 #define CLIENT_CONTEXT(co, cl) ((cl && cl->type == OB_CLIENT_TYPE_DESKTOP) ? \
-                                co == OB_FRAME_CONTEXT_ROOT : \
+                                co == OB_FRAME_CONTEXT_DESKTOP : \
                                 co == OB_FRAME_CONTEXT_CLIENT)
 
 /* Array of GSList*s of PointerBinding*s. */