*/
#include "focus_cycle.h"
+#include "focus_cycle_indicator.h"
#include "client.h"
#include "openbox.h"
#include "frame.h"
#define FOCUS_INDICATOR_WIDTH 6
-struct
+static struct
{
InternalWindow top;
InternalWindow left;
static RrAppearance *a_focus_indicator;
static RrColor *color_white;
+static gboolean visible;
static Window create_window(Window parent, gulong mask,
XSetWindowAttributes *attrib)
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)
{
XSetWindowAttributes attr;
+ visible = FALSE;
+
if (reconfig) return;
focus_indicator.top.obwin.type = Window_Internal;
stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.left));
stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right));
stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
+ g_hash_table_insert(window_map, &focus_indicator.top.win,
+ &focus_indicator.top);
+ g_hash_table_insert(window_map, &focus_indicator.left.win,
+ &focus_indicator.left);
+ g_hash_table_insert(window_map, &focus_indicator.right.win,
+ &focus_indicator.right);
+ g_hash_table_insert(window_map, &focus_indicator.bottom.win,
+ &focus_indicator.bottom);
color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff);
RrAppearanceFree(a_focus_indicator);
+ g_hash_table_remove(window_map, &focus_indicator.top.win);
+ g_hash_table_remove(window_map, &focus_indicator.left.win);
+ g_hash_table_remove(window_map, &focus_indicator.right.win);
+ g_hash_table_remove(window_map, &focus_indicator.bottom.win);
+
stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.top));
stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.left));
stacking_remove(INTERNAL_AS_WINDOW(&focus_indicator.right));
void focus_cycle_draw_indicator(ObClient *c)
{
- if (!c) {
+ if (!c && visible) {
gulong ignore_start;
/* kill enter events cause by this unmapping */
XUnmapWindow(ob_display, focus_indicator.bottom.win);
event_end_ignore_all_enters(ignore_start);
- } else {
+
+ visible = FALSE;
+ }
+ else if (c) {
/*
if (c)
frame_adjust_focus(c->frame, FALSE);
*/
gint x, y, w, h;
gint wt, wl, wr, wb;
+ gulong ignore_start;
wt = wl = wr = wb = FOCUS_INDICATOR_WIDTH;
w = c->frame->area.width;
h = wt;
+ /* kill enter events cause by this moving */
+ ignore_start = event_start_ignore_all_enters();
+
XMoveResizeWindow(ob_display, focus_indicator.top.win,
x, y, w, h);
a_focus_indicator->texture[0].data.lineart.x1 = 0;
XMapWindow(ob_display, focus_indicator.left.win);
XMapWindow(ob_display, focus_indicator.right.win);
XMapWindow(ob_display, focus_indicator.bottom.win);
+
+ event_end_ignore_all_enters(ignore_start);
+
+ visible = TRUE;
}
}