#include "screen.h"
#include "group.h"
#include "prop.h"
+#include "keyboard.h"
#include "focus.h"
#include "stacking.h"
#include "popup.h"
gboolean all_desktops,
gboolean dock_windows,
gboolean desktop_windows);
-static void focus_cycle_destructor(ObClient *client, gpointer data);
+static void focus_cycle_destroy_notify(ObClient *client, gpointer data);
static Window createWindow(Window parent, gulong mask,
XSetWindowAttributes *attrib)
if (!reconfig) {
XSetWindowAttributes attr;
- client_add_destructor(focus_cycle_destructor, NULL);
+ client_add_destroy_notify(focus_cycle_destroy_notify, NULL);
/* start with nothing focused */
focus_nothing();
icon_popup_free(focus_cycle_popup);
if (!reconfig) {
- client_remove_destructor(focus_cycle_destructor);
+ client_remove_destroy_notify(focus_cycle_destroy_notify);
/* reset focus to root */
XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
}
}
-ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
{
GList *it;
ObClient *target = NULL;
ObClient* focus_fallback(gboolean allow_refocus)
{
ObClient *new;
- ObClient *old = focus_client;
+ ObClient *old;
+
+ old = focus_client;
+ new = focus_fallback_target(allow_refocus, focus_client);
/* unfocus any focused clients.. they can be focused by Pointer events
- and such, and then when I try focus them, I won't get a FocusIn event
- at all for them.
- */
+ and such, and then when we try focus them, we won't get a FocusIn
+ event at all for them. */
focus_nothing();
- if ((new = focus_fallback_target(allow_refocus, old))) {
+ if (new)
client_focus(new);
- return new;
- } else
- return NULL;
+
+ return new;
}
void focus_nothing()
screen_install_colormap(NULL, TRUE);
}
+ /* Don't set focus_client to NULL here. It will be set to NULL when the
+ FocusOut event comes. Otherwise, if we focus nothing and then focus the
+ same window again, The focus code says nothing changed, but focus_client
+ ends up being NULL anyways.
focus_client = NULL;
+ */
+
+ /* if there is a grab going on, then we need to cancel it. if we move
+ focus during the grab, applications will get NotifyWhileGrabbed events
+ and ignore them !
+
+ actions should not rely on being able to move focus during an
+ interactive grab.
+ */
+ if (keyboard_interactively_grabbed())
+ keyboard_interactive_cancel();
/* when nothing will be focused, send focus to the backup target */
XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
g_free(showtext);
}
-static void focus_cycle_destructor(ObClient *client, gpointer data)
+static void focus_cycle_destroy_notify(ObClient *client, gpointer data)
{
/* end cycling if the target disappears. CurrentTime is fine, time won't
be used
/* it's not set to skip the taskbar (unless it is a type that would be
expected to set this hint */
ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
+ ft->type == OB_CLIENT_TYPE_DESKTOP ||
ft->type == OB_CLIENT_TYPE_TOOLBAR ||
ft->type == OB_CLIENT_TYPE_MENU ||
ft->type == OB_CLIENT_TYPE_UTILITY) ||
/* the currently selected window isn't interesting */
if(cur == c)
continue;
- if (!dock_windows && !desktop_windows && !client_normal(cur))
+ if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows)
+ continue;
+ if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows)
continue;
- if (!(dock_windows && cur->type == OB_CLIENT_TYPE_DOCK) ||
- (desktop_windows && cur->type == OB_CLIENT_TYPE_DESKTOP))
+ if (!client_normal(cur) &&
+ cur->type != OB_CLIENT_TYPE_DOCK &&
+ cur->type != OB_CLIENT_TYPE_DESKTOP)
continue;
/* using c->desktop instead of screen_desktop doesn't work if the
* current window was omnipresent, hope this doesn't have any other