X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=52927256bc94e257c85a4810abee9c771b8c4852;hb=db031f1cc5b0329becb5ffd12eeadc429dc08495;hp=b33ad408ccef4a76011f126656479eff18f22c11;hpb=eeb1159872f3b891e006e9815c21b12d621c8ce4;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index b33ad40..5292725 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.10" +#define SWM_VERSION "1.0" #include #include @@ -157,6 +157,7 @@ char **start_argv; Atom astate; Atom aprot; Atom adelete; +Atom takefocus; volatile sig_atomic_t running = 1; int outputs = 0; int (*xerrorxlib)(Display *, XErrorEvent *); @@ -232,14 +233,17 @@ TAILQ_HEAD(swm_region_list, swm_region); struct ws_win { TAILQ_ENTRY(ws_win) entry; Window id; + Window transient; + struct ws_win *child_trans; /* transient child window */ struct swm_geometry g; int floating; - int transient; int manual; int font_size_boundary[SWM_MAX_FONT_STEPS]; int font_steps; int last_inc; int can_delete; + int take_focus; + int java; unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ @@ -940,6 +944,8 @@ set_win_state(struct ws_win *win, long state) DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id); + if (win == NULL) + return; /* make sure we drain everything */ XSync(display, True); @@ -1089,7 +1095,10 @@ unmap_window(struct ws_win *win) if (wa.map_state == IsUnmapped && getstate(win->id) == IconicState) return; - set_win_state(win, IconicState); + /* java shits itself when windows are set to iconic state */ + if (win->java == 0) + set_win_state(win, IconicState); + XUnmapWindow(display, win->id); /* make sure we wait for XUnmapWindow completion */ @@ -1298,8 +1307,9 @@ focus_win(struct ws_win *win) grabbuttons(win, 1); if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS) XMapRaised(display, win->id); - XSetInputFocus(display, win->id, - RevertToPointerRoot, CurrentTime); + if (win->java == 0) + XSetInputFocus(display, win->id, + RevertToPointerRoot, CurrentTime); } } @@ -1311,6 +1321,9 @@ switchws(struct swm_region *r, union arg *args) struct ws_win *win, *winfocus = NULL, *parent = NULL; struct workspace *new_ws, *old_ws; + if (!(r && r->s)) + return; + this_r = r; old_ws = this_r->ws; new_ws = &this_r->s->ws[wsid]; @@ -1319,7 +1332,7 @@ switchws(struct swm_region *r, union arg *args) "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), old_ws->idx, wsid); - if (new_ws == old_ws) + if (new_ws == NULL || old_ws == NULL || new_ws == old_ws) return; /* get focus window */ @@ -3318,7 +3331,7 @@ manage_window(Window id) { Window trans = 0; struct workspace *ws; - struct ws_win *win, *ww; + struct ws_win *win, *ww, *parent; int format, i, ws_idx, n, border_me = 0; unsigned long nitems, bytes; Atom ws_idx_atom = 0, type; @@ -3345,14 +3358,20 @@ manage_window(Window id) XGetTransientForHint(display, id, &trans); if (trans) { win->transient = trans; + parent = find_window(win->transient); + if (parent) + parent->child_trans = win; DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n", (unsigned)win->id, win->transient); } /* get supported protocols */ if (XGetWMProtocols(display, id, &prot, &n)) { - for (i = 0, pp = prot; i < n; i++, pp++) + for (i = 0, pp = prot; i < n; i++, pp++) { + if (*pp == takefocus) + win->take_focus = 1; if (*pp == adelete) win->can_delete = 1; + } if (prot) XFree(prot); } @@ -3411,6 +3430,11 @@ manage_window(Window id) if (XGetClassHint(display, win->id, &win->ch)) { DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n", win->ch.res_class, win->ch.res_name); + + /* java is retarded so treat it special */ + if (strstr(win->ch.res_name, "sun-awt")) + win->java = 1; + for (i = 0; i < quirks_length; i++){ if (!strcmp(win->ch.res_class, quirks[i].class) && !strcmp(win->ch.res_name, quirks[i].name)) { @@ -3471,12 +3495,22 @@ void unmanage_window(struct ws_win *win) { struct workspace *ws; + struct ws_win *parent; if (win == NULL) return; DNPRINTF(SWM_D_MISC, "unmanage_window: %lu\n", win->id); + /* needed for restart wm */ + set_win_state(win, WithdrawnState); + + if (win->transient) { + parent = find_window(win->transient); + if (parent) + parent->child_trans = NULL; + } + ws = win->ws; TAILQ_REMOVE(&win->ws->winlist, win, entry); if (win->ch.res_class) @@ -3487,6 +3521,28 @@ unmanage_window(struct ws_win *win) } void +focus_magic(struct ws_win *win) +{ + if (win->child_trans) { + /* win = parent & has a transient so focus on that */ + if (win->java) { + focus_win(win->child_trans); + if (win->child_trans->take_focus) + client_msg(win, takefocus); + } else { + focus_win(win->child_trans); + if (win->child_trans->take_focus) + client_msg(win->child_trans, takefocus); + } + } else { + /* regular focus */ + focus_win(win); + if (win->take_focus) + client_msg(win, takefocus); + } +} + +void expose(XEvent *e) { DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window); @@ -3533,10 +3589,9 @@ buttonpress(XEvent *e) action = root_click; if ((win = find_window(ev->window)) == NULL) return; - else { - focus_win(win); - action = client_click; - } + + focus_magic(win); + action = client_click; for (i = 0; i < LENGTH(buttons); i++) if (action == buttons[i].action && buttons[i].func && @@ -3644,9 +3699,12 @@ destroynotify(XEvent *e) winfocus = find_window(win->transient); else if (ws->focus == win) { /* if in max_stack try harder */ - if (ws->cur_layout->flags & SWM_L_FOCUSPREV) - if (win != ws->focus && win != ws->focus_prev) + if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { + if (win != ws->focus_prev) winfocus = ws->focus_prev; + else if (win != ws->focus) + winfocus = ws->focus; + } /* fallback and normal handling */ if (winfocus == NULL) { @@ -3691,11 +3749,10 @@ enternotify(XEvent *e) if (QLength(display)) return; - if ((win = find_window(ev->window)) != NULL) { - if (win->ws->focus == win) - return; - focus_win(win); - } + if ((win = find_window(ev->window)) == NULL) + return; + + focus_magic(win); } void @@ -3812,6 +3869,10 @@ unmapnotify(XEvent *e) if (win == NULL) return; + /* java can not deal with this heuristic */ + if (win->java) + return; + if (getstate(e->xunmap.window) == NormalState) { /* * this window does not have a destroy event but but it is no @@ -3822,8 +3883,10 @@ unmapnotify(XEvent *e) if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { if (win->transient) winfocus = find_window(win->transient); - else if (win != ws->focus && win != ws->focus_prev) + else if (win != ws->focus_prev) winfocus = ws->focus_prev; + else if (win != ws->focus) + winfocus = ws->focus; } /* normal and fallback if haven't found anything to focus on */ @@ -4124,7 +4187,6 @@ setup_screens(void) /* attach windows to a region */ /* normal windows */ for (j = 0; j < no; j++) { - XGetWindowAttributes(display, wins[j], &wa); if (!XGetWindowAttributes(display, wins[j], &wa) || wa.override_redirect || XGetTransientForHint(display, wins[j], &d1)) @@ -4137,7 +4199,8 @@ setup_screens(void) } /* transient windows */ for (j = 0; j < no; j++) { - if (!XGetWindowAttributes(display, wins[j], &wa)) + if (!XGetWindowAttributes(display, wins[j], &wa) || + wa.override_redirect) continue; state = getstate(wins[j]); @@ -4223,6 +4286,7 @@ main(int argc, char *argv[]) astate = XInternAtom(display, "WM_STATE", False); aprot = XInternAtom(display, "WM_PROTOCOLS", False); adelete = XInternAtom(display, "WM_DELETE_WINDOW", False); + takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False); /* look for local and global conf file */ pwd = getpwuid(getuid());