#include "screen.h"
#include "group.h"
#include "prop.h"
-#include "dispatch.h"
#include "focus.h"
#include "stacking.h"
#include "popup.h"
static ObClient *focus_cycle_target;
static Popup *focus_cycle_popup;
-void focus_startup()
+void focus_startup(gboolean reconfig)
{
-
focus_cycle_popup = popup_new(TRUE);
- /* start with nothing focused */
- focus_set_client(NULL);
+ if (!reconfig)
+ /* start with nothing focused */
+ focus_set_client(NULL);
}
-void focus_shutdown()
+void focus_shutdown(gboolean reconfig)
{
guint i;
- for (i = 0; i < screen_num_desktops; ++i)
- g_list_free(focus_order[i]);
- g_free(focus_order);
-
popup_free(focus_cycle_popup);
- /* reset focus to root */
- XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
- event_lasttime);
+ if (!reconfig) {
+ for (i = 0; i < screen_num_desktops; ++i)
+ g_list_free(focus_order[i]);
+ g_free(focus_order);
+
+ /* reset focus to root */
+ XSetInputFocus(ob_display, PointerRoot, RevertToPointerRoot,
+ event_lasttime);
+ }
}
static void push_to_top(ObClient *client)
/* in the middle of cycling..? kill it. */
if (focus_cycle_target)
- focus_cycle(TRUE, TRUE, TRUE, TRUE);
+ focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
old = focus_client;
focus_client = client;
PROP_SET32(RootWindow(ob_display, ob_screen),
net_active_window, window, active);
}
-
- if (focus_client != NULL)
- dispatch_client(Event_Client_Focus, focus_client, 0, 0);
- if (old != NULL)
- dispatch_client(Event_Client_Unfocus, old, 0, 0);
}
static gboolean focus_under_pointer()
}
}
-ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
- gboolean cancel)
+void focus_cycle(gboolean forward, gboolean linear,
+ gboolean dialog, gboolean done, gboolean cancel)
{
static ObClient *first = NULL;
static ObClient *t = NULL;
frame_adjust_focus(focus_cycle_target->frame, FALSE);
if (focus_client)
frame_adjust_focus(focus_client->frame, TRUE);
+ focus_cycle_target = NULL;
goto done_cycle;
- } else if (done) {
- if (focus_cycle_target)
- client_activate(focus_cycle_target, FALSE);
+ } else if (done && dialog) {
goto done_cycle;
}
focus_cycle_target = ft;
frame_adjust_focus(focus_cycle_target->frame, TRUE);
}
- popup_cycle(ft, config_focus_popup);
- return ft;
+ popup_cycle(ft, dialog);
+ return;
}
} while (it != start);
done_cycle:
+ if (done && focus_cycle_target)
+ client_activate(focus_cycle_target, FALSE);
+
t = NULL;
first = NULL;
focus_cycle_target = NULL;
popup_cycle(ft, FALSE);
- return NULL;
+ return;
+}
+
+void focus_directional_cycle(ObDirection dir,
+ gboolean dialog, gboolean done, gboolean cancel)
+{
+ static ObClient *first = NULL;
+ ObClient *ft;
+
+ if (cancel) {
+ if (focus_cycle_target)
+ frame_adjust_focus(focus_cycle_target->frame, FALSE);
+ if (focus_client)
+ frame_adjust_focus(focus_client->frame, TRUE);
+ focus_cycle_target = NULL;
+ goto done_cycle;
+ } else if (done && dialog) {
+ goto done_cycle;
+ }
+
+ if (!first) first = focus_client;
+ if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+ if ((ft = client_find_directional(focus_cycle_target, dir))) {
+ if (ft != focus_cycle_target) {/* prevents flicker */
+ if (focus_cycle_target)
+ frame_adjust_focus(focus_cycle_target->frame, FALSE);
+ focus_cycle_target = ft;
+ frame_adjust_focus(focus_cycle_target->frame, TRUE);
+ }
+ popup_cycle(ft, dialog);
+ }
+ if (dialog)
+ return;
+
+done_cycle:
+ if (done && focus_cycle_target)
+ client_activate(focus_cycle_target, FALSE);
+
+ first = NULL;
+ focus_cycle_target = NULL;
+
+ popup_cycle(ft, FALSE);
+
+ return;
}
void focus_order_add_new(ObClient *c)