Merge branch 'backport' into work

diff --cc openbox/focus_cycle_indicator.c
index 495a723,670f48e..5d7ecb3
--- 1/openbox/focus_cycle_indicator.c
--- 2/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@@ -127,12 -127,18 +127,18 @@@ void focus_cycle_indicator_shutdown(gbo
      stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.right));
      stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
  
 -    XDestroyWindow(ob_display, focus_indicator.top.window);
 -    XDestroyWindow(ob_display, focus_indicator.left.window);
 -    XDestroyWindow(ob_display, focus_indicator.right.window);
 -    XDestroyWindow(ob_display, focus_indicator.bottom.window);
 +    XDestroyWindow(obt_display, focus_indicator.top.window);
 +    XDestroyWindow(obt_display, focus_indicator.left.window);
 +    XDestroyWindow(obt_display, focus_indicator.right.window);
 +    XDestroyWindow(obt_display, focus_indicator.bottom.window);
  }
  
+ void focus_cycle_update_indicator(ObClient *c)
+ {
+         if (visible)
+             focus_cycle_draw_indicator(c);
+ }
+ 
  void focus_cycle_draw_indicator(ObClient *c)
  {
      if (!c && visible) {

diff --cc openbox/frame.c
index 8a7b1ae,704560b..30630fb
--- 1/openbox/frame.c
--- 2/openbox/frame.c
+++ b/openbox/frame.c
@@@ -850,10 -851,10 +850,10 @@@ void frame_adjust_area(ObFrame *self, g
          /* if this occurs while we are focus cycling, the indicator needs to
             match the changes */
          if (focus_cycle_target == self->client)
-             focus_cycle_draw_indicator(self->client);
+             focus_cycle_update_indicator(self->client);
      }
      if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
 -        XResizeWindow(ob_display, self->label, self->label_width,
 +        XResizeWindow(obt_display, self->label, self->label_width,
                        ob_rr_theme->label_height);
  
  }