More focus simplicfication

[spectrwm.git] / scrotwm.c

diff --git a/scrotwm.c b/scrotwm.c
index 621942e..b5e2ffb 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -182,7 +182,7 @@ struct ws_win {
        TAILQ_ENTRY(ws_win)     entry;
        Window                  id;
        struct swm_geometry     g;
-       int                     focus;
+       int                     got_focus;
        int                     floating;
        int                     transient;
        struct workspace        *ws;    /* always valid */
@@ -712,36 +712,43 @@ spawn(struct swm_region *r, union arg *args)
 }
 
 void
-unfocus_win(struct ws_win *win)
+unfocus_all(void)
 {
-       DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id);
-       if (win->ws->r && win->focus)
-               XSetWindowBorder(display, win->id,
-                   win->ws->r->s->color_unfocus);
-       win->focus = 0;
-       if (win->ws->focus == win)
-               win->ws->focus = NULL;
-       if (cur_focus == win)
-               cur_focus = NULL;
-}
+       struct ws_win           *win;
+       int                     i, j;
+
+       DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n");
 
+       for (i = 0; i < ScreenCount(display); i++)
+               for (j = 0; j < SWM_WS_MAX; j++)
+                       TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) {
+                               if (win->ws->r == NULL)
+                                       continue;
+                               XSetWindowBorder(display, win->id,
+                                   win->ws->r->s->color_unfocus);
+                               win->got_focus = 0;
+                               win->ws->focus = NULL;
+                               cur_focus = NULL;
+                       }
+}
 
 void
 focus_win(struct ws_win *win)
 {
-       DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id);
+       DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0);
 
-       rootclick = 0;
+       if (win == NULL)
+               return;
 
+       rootclick = 0;
+       unfocus_all();
        win->ws->focus = win;
        if (win->ws->r != NULL) {
-               if (cur_focus && cur_focus != win)
-                       unfocus_win(cur_focus);
                cur_focus = win;
-               if (!win->focus)
+               if (!win->got_focus)
                        XSetWindowBorder(display, win->id,
                            win->ws->r->s->color_focus);
-               win->focus = 1;
+               win->got_focus = 1;
                XSetInputFocus(display, win->id,
                    RevertToPointerRoot, CurrentTime);
        }
@@ -1346,6 +1353,21 @@ struct key {
        { MODKEY | ShiftMask,   XK_Tab,         focus,          {.id = SWM_ARG_ID_FOCUSPREV} },
 };
 
+#if 0
+/* mouse */
+enum { client_click, root_click };
+struct button {
+       unsigned int            click;
+       unsigned int            mask;
+       unsigned int            button;
+       void                    (*func)(struct swm_region *r, union arg *);
+       union arg               args;
+} buttons[] = {
+         /* action             key             mouse button    func            args */
+       { client_click,         MODKEY,         Button2,        NULL, {0} },
+};
+#endif
+
 void
 updatenumlockmask(void)
 {
@@ -1585,11 +1607,12 @@ destroynotify(XEvent *e)
 {
        struct ws_win           *win;
        XDestroyWindowEvent     *ev = &e->xdestroywindow;
+       struct workspace        *ws;
 
        DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
        if ((win = find_window(ev->window)) != NULL) {
-               struct workspace *ws = win->ws;
+               ws = win->ws;
                /* find a window to focus */
                if (ws->focus == win)
                        ws->focus = TAILQ_PREV(win, ws_win_list, entry);
@@ -1597,12 +1620,8 @@ destroynotify(XEvent *e)
                        ws->focus = TAILQ_FIRST(&ws->winlist);
                if (ws->focus == win)
                        ws->focus = NULL;
-               if (cur_focus == win) {
-                       if (ws->focus == NULL) 
-                               unfocus_win(win); /* XXX focus another ws? */
-                       else
-                               focus_win(ws->focus);
-               }
+               if (cur_focus == win)
+                       focus_win(ws->focus);
 
                TAILQ_REMOVE(&ws->winlist, win, entry);
                set_win_state(win, WithdrawnState);
@@ -1616,27 +1635,17 @@ enternotify(XEvent *e)
 {
        XCrossingEvent          *ev = &e->xcrossing;
        struct ws_win           *win;
-       int                     i, j;
 
        DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window);
 
-       if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
-           ev->window != ev->root)
-               return;
        if (ignore_enter) {
                /* eat event(r) to prevent autofocus */
                ignore_enter--;
                return;
        }
-       /* brute force for now */
-       for (i = 0; i < ScreenCount(display); i++) {
-               for (j = 0; j < SWM_WS_MAX; j++) {
-                       TAILQ_FOREACH(win, &screens[i].ws[j].winlist , entry) {
-                               if (win->id == ev->window)
-                                       focus_win(win);
-                       }
-               }
-       }
+
+       if ((win = find_window(ev->window)) != NULL)
+               focus_win(win);
 }
 
 void
@@ -1838,7 +1847,7 @@ setup_screens(void)
                screens[i].root = RootWindow(display, i);
                XGetWindowAttributes(display, screens[i].root, &wa);
                XSelectInput(display, screens[i].root,
-                   ButtonPressMask | wa.your_event_mask);
+                   EnterWindowMask | ButtonPressMask | wa.your_event_mask);
 
                /* set default colors */
                screens[i].color_focus = name_to_color("red");