Merge branch 'backport' into work

Conflicts:

	Makefile.am
	openbox/actions/focus.c
	openbox/config.c
	openbox/event.c
	openbox/menuframe.c

1 files changed, 8 insertions, 1 deletions

diff --git a/tools/obxprop/obxprop.c b/tools/obxprop/obxprop.c
index 26851544..6ea8a4d3 100644
--- a/tools/obxprop/obxprop.c
+++ b/tools/obxprop/obxprop.c
@@ -16,7 +16,8 @@ gint fail(const gchar *s) {
              "Options:\n"
              "    --help              Display this help and exit\n"
              "    --display DISPLAY   Connect to this X display\n"
-             "    --id ID             Show the properties for this window\n");
+             "    --id ID             Show the properties for this window\n"
+             "    --root              Show the properties for the root window\n");
     return 1;
 }
 
@@ -256,11 +257,14 @@ int main(int argc, char **argv)
     Window id, userid = None;
     int i;
     char *dname = NULL;
+    gboolean root = FALSE;
 
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--help")) {
             return fail(0);
         }
+        else if (!strcmp(argv[i], "--root"))
+            root = TRUE;
         else if (!strcmp(argv[i], "--id")) {
             if (++i == argc)
                 return fail(0);
@@ -287,6 +291,9 @@ int main(int argc, char **argv)
                     "Ensure you have permission to connect to the display.");
     }
 
+    if (root)
+        userid = RootWindow(d, DefaultScreen(d));
+
     if (userid == None) {
         i = XGrabPointer(d, RootWindow(d, DefaultScreen(d)),
                          False, ButtonPressMask,