X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=eda9f72fc63ab64a31f967725ea8fb71219c0f32;hb=2a69629d9bbb9d93bf0dc26709b0b27a8bccfc77;hp=95dbb6c6b7c77b1510d43ccc9693ff51d50f7d2e;hpb=bb734b7ce79ee86a6735ddffcedb3089663d0ad4;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 95dbb6c..eda9f72 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "1.0" +#define SWM_VERSION "0.9.12" #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,16 @@ 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 */ @@ -938,6 +941,7 @@ set_win_state(struct ws_win *win, long state) long data[] = {state, None}; XEvent ev; XWindowAttributes wa; + int putback; DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id); @@ -954,8 +958,11 @@ set_win_state(struct ws_win *win, long state) (unsigned char *)data, 2); /* wait for completion of XChangeProperty */ + putback = 0; while (XCheckIfEvent(display, &ev, set_win_notify_cb, (char *)win)) - ; + putback = 1; + if (putback) + XPutBackEvent(display, &ev); } long @@ -994,6 +1001,9 @@ client_msg(struct ws_win *win, Atom a) { XClientMessageEvent cm; + if (win == NULL) + return; + bzero(&cm, sizeof cm); cm.type = ClientMessage; cm.window = win->id; @@ -1011,6 +1021,10 @@ config_win(struct ws_win *win) DNPRINTF(SWM_D_MISC, "config_win: win %lu x %d y %d w %d h %d\n", win->id, win->g.x, win->g.y, win->g.w, win->g.h); + + if (win == NULL) + return; + ce.type = ConfigureNotify; ce.display = display; ce.event = win->id; @@ -1030,21 +1044,6 @@ count_win(struct workspace *ws, int count_transient) { struct ws_win *win; int count = 0; - int state; - - /* - * Under stress conditions windows sometimes do not get removed from - * the managed list quickly enough. Use a very large hammer to get rid - * of them. A smaller hammer would be nice. - */ - TAILQ_FOREACH(win, &ws->winlist, entry) { - state = getstate(win->id); - if (state == -1) { - DNPRINTF(SWM_D_MISC, "count_win:removing: %lu\n", - win->id); - unmanage_window(win); - } - } TAILQ_FOREACH(win, &ws->winlist, entry) { if (count_transient == 0 && win->floating) @@ -1080,6 +1079,7 @@ unmap_window(struct ws_win *win) { XEvent ev; XWindowAttributes wa; + int putback; if (win == NULL) return; @@ -1099,8 +1099,11 @@ unmap_window(struct ws_win *win) XUnmapWindow(display, win->id); /* make sure we wait for XUnmapWindow completion */ + putback = 0; while (XCheckIfEvent(display, &ev, unmap_window_cb, (char *)win)) - ; + putback = 1; + if (putback) + XPutBackEvent(display, &ev); } void @@ -1120,6 +1123,9 @@ fake_keypress(struct ws_win *win, int keysym, int modifiers) { XKeyEvent event; + if (win == NULL) + return; + event.display = display; /* Ignored, but what the hell */ event.window = win->id; event.root = win->s->root; @@ -1258,7 +1264,8 @@ unfocus_win(struct ws_win *win) { if (win == NULL) return; - + if (win->ws == NULL) + return; if (win->ws->r == NULL) return; @@ -1293,6 +1300,8 @@ focus_win(struct ws_win *win) if (win == NULL) return; + if (win->ws == NULL) + return; /* use big hammer to make sure it works under all use cases */ unfocus_all(); @@ -1304,8 +1313,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); } } @@ -1317,6 +1327,15 @@ 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)) { + fprintf(stderr, "r && r->s failed\n"); + abort(); + } + if (wsid < 0 || wsid > SWM_WS_MAX) { + fprintf(stderr, "illegal wsid\n"); + abort(); + } + this_r = r; old_ws = this_r->ws; new_ws = &this_r->s->ws[wsid]; @@ -1325,6 +1344,11 @@ 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 == NULL || old_ws == NULL) { + fprintf(stderr, "new_ws = %p old_ws = %p\n", new_ws, old_ws); + abort(); + } + if (new_ws == old_ws) return; @@ -1514,6 +1538,8 @@ swapwin(struct swm_region *r, union arg *args) else return; } + if (target == NULL || source == NULL) + return; source->ws->focus_prev = target; TAILQ_REMOVE(wl, target, entry); TAILQ_INSERT_BEFORE(source, target, entry); @@ -1634,6 +1660,10 @@ stack(void) { "(screen %d, region %d)\n", r->ws->idx, i, j++); /* start with screen geometry, adjust for bar */ + if (r == NULL) { + fprintf(stderr, "illegal r\n"); + abort(); + } g = r->g; g.w -= 2; g.h -= 2; @@ -1641,8 +1671,19 @@ stack(void) { g.y += bar_height; g.h -= bar_height; } - + if (r->ws == NULL) { + fprintf(stderr, "illegal ws\n"); + abort(); + } + if (r->ws->cur_layout == NULL) { + fprintf(stderr, "illegal cur_layout\n"); + abort(); + } r->ws->restack = 0; + if (r->ws->cur_layout->l_stack == NULL) { + fprintf(stderr, "illegal l_stack\n"); + abort(); + } r->ws->cur_layout->l_stack(r->ws, &g); } } @@ -3324,7 +3365,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; @@ -3351,14 +3392,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); } @@ -3482,12 +3529,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) @@ -3498,6 +3555,37 @@ 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); + } +} + +Bool +destroy_notify_cb(Display *d, XEvent *e, char *arg) +{ + struct ws_win *win = (struct ws_win *)arg; + if (win && win->id == e->xany.window && e->xany.type == DestroyNotify) + return (True); + return (False); +} + +void expose(XEvent *e) { DNPRINTF(SWM_D_EVENT, "expose: window: %lu\n", e->xexpose.window); @@ -3544,10 +3632,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 && @@ -3638,10 +3725,11 @@ configurenotify(XEvent *e) void destroynotify(XEvent *e) { - struct ws_win *win, *winfocus = NULL; + struct ws_win *win, *w, *winfocus = NULL; struct workspace *ws; struct ws_win_list *wl; XDestroyWindowEvent *ev = &e->xdestroywindow; + XEvent de; DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window); @@ -3677,6 +3765,26 @@ destroynotify(XEvent *e) } unmanage_window(win); + /* + * Under stress conditions windows sometimes do not get removed + * from the managed list. Use a very large hammer to get rid + * of them. A smaller hammer would be nice. + */ + TAILQ_FOREACH(w, &ws->winlist, entry) { + if (win == w) + continue; /* can't happen but oh well */ + + if (getstate(w->id) != -1) + continue; + + /* see if we have a destroy event */ + if (XCheckIfEvent(display, &de, destroy_notify_cb, + (char *)w) == False) + unmanage_window(w); /* no event, help it */ + else + XPutBackEvent(display, &de); /* oops */ + } + ignore_enter = 1; stack(); if (winfocus) @@ -3705,11 +3813,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 @@ -4144,7 +4251,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)) @@ -4157,7 +4263,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]); @@ -4215,6 +4322,7 @@ main(int argc, char *argv[]) struct passwd *pwd; struct swm_region *r, *rr; struct ws_win *winfocus = NULL; + struct timeval tv; char conf[PATH_MAX], *cfile = NULL; struct stat sb; XEvent e; @@ -4243,6 +4351,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()); @@ -4327,7 +4436,9 @@ main(int argc, char *argv[]) FD_ZERO(&rd); FD_SET(xfd, &rd); - if (select(xfd + 1, &rd, NULL, NULL, NULL) == -1) + tv.tv_sec = 1; + tv.tv_usec = 0; + if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1) if (errno != EINTR) DNPRINTF(SWM_D_MISC, "select failed"); if (running == 0)