Merge branch 'backport' into work

Conflicts:

	openbox/grab.c
	openbox/keyboard.c

diff --cc openbox/event.c
Simple merge

diff --cc openbox/grab.c
index 522fbf96b812cfd213e3cca276b325190a95ca06,214666e58de9909df8bd15470772fca2d3253972..e797e44ce9ad62e88ab2edc49ed128725bb72019
--- 1/openbox/grab.c
--- 2/openbox/grab.c
+++ b/openbox/grab.c
@@@ -221,8 -222,8 +221,8 @@@ void ungrab_passive_key(void
  {
      /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/
      if (passive_count) {
-         /* kill out passive grab */
+         /* kill our passive grab */
 -        XUngrabKeyboard(ob_display, event_curtime);
 +        XUngrabKeyboard(obt_display, event_curtime);
          passive_count = 0;
      }
  }

diff --cc openbox/keyboard.c
index 02ae6a304642ef4ce7a735ca0a55c827393f6e34,c318a4cf14b0f0b31dbf5ed8f5c638811c80d191..5ac423639c35628036133ece70dc9279ac94770a
--- 1/openbox/keyboard.c
--- 2/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@@ -50,14 -52,14 +50,14 @@@ static void grab_keys(gboolean grab
          p = curpos ? curpos->first_child : keyboard_firstnode;
          while (p) {
              if (p->key)
 -                grab_key(p->key, p->state, RootWindow(ob_display, ob_screen),
 +                grab_key(p->key, p->state, obt_root(ob_screen),
-                          GrabModeAsync);
+                          GrabModeSync);
              p = p->next_sibling;
          }
          if (curpos)
              grab_key(config_keyboard_reset_keycode,
                       config_keyboard_reset_state,
-                      obt_root(ob_screen), GrabModeAsync);
 -                     RootWindow(ob_display, ob_screen), GrabModeSync);
++                     obt_root(ob_screen), GrabModeSync);
      }
  }
  
@@@ -261,6 -263,8 +261,8 @@@ void keyboard_event(ObClient *client, c
          }
          p = p->next_sibling;
      }
 -    XAllowEvents(ob_display, AsyncKeyboard, event_curtime);
+ 
++    XAllowEvents(obt_display, AsyncKeyboard, event_curtime);
  }
  
  static void node_rebind(KeyBindingTree *node)

diff --cc openbox/prompt.c
Simple merge

diff --cc openbox/screen.c
index 90f8b27c76cbd13c29c74c07e78ab79cf9bfd8e9,730b4c241b6ba8fd46b88e8b992723f7a48a2172..773cb75f38c07d0d160ca426b1ea1a2f57efbb90
--- 1/openbox/screen.c
--- 2/openbox/screen.c
+++ b/openbox/screen.c
@@@ -390,10 -401,14 +390,14 @@@ void screen_startup(gboolean reconfig
         this will also set the default names from the config file up for
         desktops that don't have names yet */
      screen_num_desktops = 0;
 -    if (PROP_GET32(RootWindow(ob_display, ob_screen),
 -                   net_number_of_desktops, cardinal, &d))
 +    if (OBT_PROP_GET32(obt_root(ob_screen),
 +                       NET_NUMBER_OF_DESKTOPS, CARDINAL, &d))
      {
          if (d != config_desktops_num) {
+             /* TRANSLATORS: If you need to specify a different order of the
+                arguments, you can use %1$d for the first one and %2$d for the
+                second one. For example,
+                "The current session has %2$d desktops, but Openbox is configured for %1$d ..." */
              g_warning(_("Openbox is configured for %d desktops, but the current session has %d.  Overriding the Openbox configuration."),
                        config_desktops_num, d);
          }

diff --cc render/theme.c
Simple merge