#include "event.h"
#include "openbox.h"
#include "client.h"
+#include "config.h"
#include "frame.h"
#include "screen.h"
#include "group.h"
#include "dispatch.h"
#include "focus.h"
#include "parse.h"
-#include "engine.h"
+#include "stacking.h"
#include <X11/Xlib.h>
#include <glib.h>
sets the number of desktops */
Window focus_backup = None;
-gboolean focus_new = TRUE;
-gboolean focus_follow = FALSE;
-static gboolean focus_last = TRUE;
-static gboolean focus_last_on_desktop = TRUE;
static gboolean noreorder = 0;
-static void parse_assign(char *name, ParseToken *value)
-{
- if (!g_ascii_strcasecmp(name, "focusnew")) {
- if (value->type != TOKEN_BOOL)
- yyerror("invalid value");
- else {
- focus_new = value->data.bool;
- }
- } else if (!g_ascii_strcasecmp(name, "followmouse")) {
- if (value->type != TOKEN_BOOL)
- yyerror("invalid value");
- else {
- focus_follow = value->data.bool;
- }
- } else if (!g_ascii_strcasecmp(name, "focuslast")) {
- if (value->type != TOKEN_BOOL)
- yyerror("invalid value");
- else {
- focus_last = value->data.bool;
- }
- } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
- if (value->type != TOKEN_BOOL)
- yyerror("invalid value");
- else {
- focus_last_on_desktop = value->data.bool;
- }
- } else
- yyerror("invalid option");
- parse_free_token(value);
-}
-
void focus_startup()
{
/* create the window which gets focus when no clients get it. Have to
XSetWindowAttributes attrib;
focus_client = NULL;
- focus_new = TRUE;
- focus_follow = FALSE;
- focus_last = TRUE;
- focus_last_on_desktop = TRUE;
attrib.override_redirect = TRUE;
focus_backup = XCreateWindow(ob_display, ob_root,
-100, -100, 1, 1, 0,
CopyFromParent, InputOutput, CopyFromParent,
CWOverrideRedirect, &attrib);
- XMapRaised(ob_display, focus_backup);
+ XMapWindow(ob_display, focus_backup);
+ stacking_raise_internal(focus_backup);
/* start with nothing focused */
focus_set_client(NULL);
-
- parse_reg_section("focus", NULL, parse_assign);
}
void focus_shutdown()
return FALSE;
}
-void focus_fallback(gboolean switching_desks)
+void focus_fallback(FallbackType type)
{
GList *it;
Client *old = NULL;
*/
focus_set_client(NULL);
- if (switching_desks) {
- /* don't skip any windows when switching desktops */
- old = NULL;
- }
-
- if (!(switching_desks ? focus_last_on_desktop : focus_last)) {
- if (focus_follow) focus_under_pointer();
+ if (!(type == Fallback_Desktop ?
+ config_focus_last_on_desktop : config_focus_last)) {
+ if (config_focus_follow) focus_under_pointer();
return;
}
- if (old && old->transient_for) {
+ if (type == Fallback_Unfocusing && old && old->transient_for) {
if (old->transient_for == TRAN_GROUP) {
for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
GSList *sit;
return;
}
} else {
- if (client_focus(old->transient_for))
- return;
+ if (client_normal(old->transient_for))
+ if (client_focus(old->transient_for))
+ return;
}
}
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
- if (it->data != old && client_normal(it->data))
- if (client_focus(it->data))
+ if (type != Fallback_Unfocusing || it->data != old)
+ if (client_normal(it->data) && client_focus(it->data))
return;
/* nothing to focus */
if (it == NULL) it = g_list_last(list);
}
ft = client_focus_target(it->data);
- if (ft == it->data && focus_client != ft && client_focusable(ft)) {
- if (client_focus(ft)) {
- noreorder++; /* avoid reordering the focus_order */
- return ft;
- }
+ if (ft == it->data && focus_client != ft && client_normal(ft) &&
+ client_focus(ft)) {
+ noreorder++; /* avoid reordering the focus_order */
+ return ft;
}
} while (it != start);
return NULL;