Merge branch 'backport' into work

Conflicts:

	openbox/client.c
	openbox/screen.c

diff --cc openbox/client.c
index 67d2290ad91ae53780dab3969c715b5f4080adaf,816fa922122950c675304a0cb812ae17cdae72ac..bf1d4f9ce8173fb23276ba647d8adeb519a3269f
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -4022,10 -4145,10 +4031,10 @@@ static void detect_edge(Rect area, ObDi
              g_assert_not_reached();
      }
  
 -    ob_debug("my head %d size %d\n", my_head, my_size);
 -    ob_debug("head %d tail %d dest %d\n", head, tail, *dest);
 +    ob_debug("my head %d size %d", my_head, my_size);
-     ob_debug("head %d tail %d deest %d", head, tail, *dest);
++    ob_debug("head %d tail %d dest %d", head, tail, *dest);
      if (!skip_head) {
 -        ob_debug("using near edge %d\n", head);
 +        ob_debug("using near edge %d", head);
          *dest = head;
          *near_edge = TRUE;
      }

diff --cc openbox/client_menu.c
Simple merge

diff --cc openbox/focus_cycle.c
index dbf79c9a7d2207ef899c91402222b711a4f583c9,c7fc42ee91bf64d95f8dfa41b94bd9db3b16c761..4d79377735928a6c9f1976860939c44975d3766a
--- 1/openbox/focus_cycle.c
--- 2/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@@ -69,10 -70,9 +69,9 @@@ void focus_cycle_stop(ObClient *ifclien
  ObClient* focus_cycle(gboolean forward, gboolean all_desktops,
                        gboolean dock_windows, gboolean desktop_windows,
                        gboolean linear, gboolean interactive,
 -                      gboolean showbar, gboolean dialog,
 +                      gboolean showbar, ObFocusCyclePopupMode mode,
                        gboolean done, gboolean cancel)
  {
-     static ObClient *t = NULL;
      static GList *order = NULL;
      GList *it, *start, *list;
      ObClient *ft = NULL;

diff --cc openbox/frame.c
index e8a532cc4feaba18152f14374d072f322b49b72d,0b764a4c46617a11350858499cd634c6a5facc64..25c470489596c8b12a42d3e3d91cfd9c9c0b87df
--- 1/openbox/frame.c
--- 2/openbox/frame.c
+++ b/openbox/frame.c
@@@ -98,15 -99,16 +98,15 @@@ ObFrame *frame_new(ObClient *client
      mask = 0;
      if (visual) {
          /* client has a 32-bit visual */
-         mask |= CWColormap | CWBackPixel | CWBorderPixel;
+         mask = CWColormap | CWBackPixel | CWBorderPixel;
          /* create a colormap with the visual */
          self->colormap = attrib.colormap =
 -            XCreateColormap(ob_display,
 -                            RootWindow(ob_display, ob_screen),
 +            XCreateColormap(obt_display, obt_root(ob_screen),
                              visual, AllocNone);
 -        attrib.background_pixel = BlackPixel(ob_display, ob_screen);
 -        attrib.border_pixel = BlackPixel(ob_display, ob_screen);
 +        attrib.background_pixel = BlackPixel(obt_display, ob_screen);
 +        attrib.border_pixel = BlackPixel(obt_display, ob_screen);
      }
 -    self->window = createWindow(RootWindow(ob_display, ob_screen), visual,
 +    self->window = createWindow(obt_root(ob_screen), visual,
                                  mask, &attrib);
  
      /* create the visible decor windows */

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/screen.c
index 221e338d0dded4a154de31c83970d2d16c63671f,2e48f85c5b3f740e28c9d50dd05c8bb045be1e75..60638a83c6b18832850496b3af2c4e4aceebc9ac
--- 1/openbox/screen.c
--- 2/openbox/screen.c
+++ b/openbox/screen.c
@@@ -327,14 -337,14 +327,14 @@@ static void screen_tell_ksplash(void
         hear it anyways. perhaps it is for old ksplash. or new ksplash. or
         something. oh well. */
      e.xclient.type = ClientMessage;
 -    e.xclient.display = ob_display;
 -    e.xclient.window = RootWindow(ob_display, ob_screen);
 +    e.xclient.display = obt_display;
 +    e.xclient.window = obt_root(ob_screen);
      e.xclient.message_type =
-         XInternAtom(obt_display, "_KDE_SPLASH_PROGRESS", False );
 -        XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False);
++        XInternAtom(obt_display, "_KDE_SPLASH_PROGRESS", False);
      e.xclient.format = 8;
      strcpy(e.xclient.data.b, "wm started");
 -    XSendEvent(ob_display, RootWindow(ob_display, ob_screen),
 -               False, SubstructureNotifyMask, &e );
 +    XSendEvent(obt_display, obt_root(ob_screen),
 +               False, SubstructureNotifyMask, &e);
  }
  
  void screen_startup(gboolean reconfig)