hiro/spectrwm
1
0
Fork 0
mirror of https://github.com/vale981/spectrwm synced 2025-03-06 02:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix fucking phantom windows for real this time.

Browse source
This commit is contained in:
Marco Peereboom 2009-01-17 19:57:48 +00:00
parent eb06e426f5
commit 1ebdff4405
1 changed files with 52 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
scrotwm.c
View file

@ -101,6 +101,7 @@ u_int32_t swm_debug = 0
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
char **start_argv; char **start_argv;
Atom astate;
int (*xerrorxlib)(Display *, XErrorEvent *); int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm; int other_wm;
int screen; int screen;
@ -1148,6 +1149,17 @@ buttonpress(XEvent *e)
#endif #endif
} }
void
set_win_state(struct ws_win *win, long state)
{
long data[] = {state, None};
DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id);
XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace,
(unsigned char *)data, 2);
}
struct ws_win * struct ws_win *
manage_window(Window id) manage_window(Window id)
{ {
@ -1192,6 +1204,8 @@ manage_window(Window id)
XSelectInput(display, id, ButtonPressMask | EnterWindowMask | XSelectInput(display, id, ButtonPressMask | EnterWindowMask |
FocusChangeMask | ExposureMask); FocusChangeMask | ExposureMask);
set_win_state(win, NormalState);
return (win); return (win);
} }
@ -1256,6 +1270,7 @@ destroynotify(XEvent *e)
ws[current_ws].focus = NULL; ws[current_ws].focus = NULL;
TAILQ_REMOVE(&ws[current_ws].winlist, win, entry); TAILQ_REMOVE(&ws[current_ws].winlist, win, entry);
set_win_state(win, WithdrawnState);
free(win); free(win);
break; break;
} }
@ -1386,8 +1401,7 @@ xerror_start(Display *d, XErrorEvent *ee)
int int
xerror(Display *d, XErrorEvent *ee) xerror(Display *d, XErrorEvent *ee)
{ {
fprintf(stderr, "error: %p %p\n", display, ee); /* fprintf(stderr, "error: %p %p\n", display, ee); */
return (-1); return (-1);
} }
@ -1409,6 +1423,26 @@ active_wm(void)
return (0); return (0);
} }
long
getstate(Window w)
{
int format, status;
long result = -1;
unsigned char *p = NULL;
unsigned long n, extra;
Atom real;
astate = XInternAtom(display, "WM_STATE", False);
status = XGetWindowProperty(display, w, astate, 0L, 2L, False, astate,
&real, &format, &n, &extra, (unsigned char **)&p);
if(status != Success)
return (-1);
if(n != 0)
result = *p;
XFree(p);
return (result);
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
@ -1433,6 +1467,7 @@ main(int argc, char *argv[])
screen = DefaultScreen(display); screen = DefaultScreen(display);
root = RootWindow(display, screen); root = RootWindow(display, screen);
astate = XInternAtom(display, "WM_STATE", False);
/* look for local and global conf file */ /* look for local and global conf file */
pwd = getpwuid(getuid()); pwd = getpwuid(getuid());
@ -1475,11 +1510,22 @@ main(int argc, char *argv[])
/* grab existing windows */ /* grab existing windows */
if (XQueryTree(display, root, &d1, &d2, &wins, &num)) { if (XQueryTree(display, root, &d1, &d2, &wins, &num)) {
/* normal windows */
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
if (!XGetWindowAttributes(display, wins[i], &wa) XGetWindowAttributes(display, wins[i], &wa);
|| wa.override_redirect if (!XGetWindowAttributes(display, wins[i], &wa) ||
|| wa.map_state != IsViewable) wa.override_redirect || XGetTransientForHint(display, wins[i], &d1))
continue; continue;
if (wa.map_state == IsViewable || getstate(wins[i]) == NormalState)
manage_window(wins[i]);
}
/* transient windows */
for (i = 0; i < num; i++) {
if(!XGetWindowAttributes(display, wins[i], &wa))
continue;
if (XGetTransientForHint(display, wins[i], &d1) &&
(wa.map_state == IsViewable || getstate(wins[i]) ==
NormalState))
manage_window(wins[i]); manage_window(wins[i]);
} }
if(wins) if(wins)