X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_indicator.c;h=790713145d09a540e5c4f9a94b40e2593f06dd25;hb=b6b9124ad09d05dfd25ea31cf4607edd45541254;hp=0af8ab12fb97c9a53a097c1de652e911f7be3e42;hpb=209d8df0b15702b523862f1717e055350a34c812;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 0af8ab12..79071314 100644
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -46,7 +46,7 @@ static Window create_window(Window parent, gulong mask,
     return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attrib);
-                       
+
 }
 
 void focus_cycle_indicator_startup(gboolean reconfig)
@@ -119,13 +119,17 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
 void focus_cycle_draw_indicator(ObClient *c)
 {
     if (!c) {
+        gulong ignore_start;
+
+        /* kill enter events cause by this unmapping */
+        ignore_start = event_start_ignore_all_enters();
+
         XUnmapWindow(ob_display, focus_indicator.top.win);
         XUnmapWindow(ob_display, focus_indicator.left.win);
         XUnmapWindow(ob_display, focus_indicator.right.win);
         XUnmapWindow(ob_display, focus_indicator.bottom.win);
 
-        /* kill enter events cause by this unmapping */
-        event_ignore_all_queued_enters();
+        event_end_ignore_all_enters(ignore_start);
     } else {
         /*
           if (c)
@@ -163,7 +167,7 @@ void focus_cycle_draw_indicator(ObClient *c)
         RrPaint(a_focus_indicator, focus_indicator.top.win,
                 w, h);
 
-        x = c->area.x;
+        x = c->frame->area.x;
         y = c->frame->area.y;
         w = wl;
         h = c->frame->area.height;