diff options
| author | Bernhard R. Link <brlink@debian.org> | 2009-01-03 16:21:34 +0100 |
|---|---|---|
| committer | Shawn <sabetts@juicebox.(none)> | 2009-01-16 15:57:40 -0800 |
| commit | ffae4bf9413bec7efd5d4821e030b63a700fab69 (patch) | |
| tree | a571f33a5043d162db60c4d190bb9949a20105c7 /src/actions.c | |
| parent | 9888fccffbc7d9f5680512b03ace6dd5fc325094 (diff) | |
| download | ratpoison-ffae4bf9413bec7efd5d4821e030b63a700fab69.zip | |
Move screen activation code to new (de)activate_screen functions,
making sure _NET atoms are reset after tmpwm and deleted when exiting.
Diffstat (limited to 'src/actions.c')
| -rw-r--r-- | src/actions.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/actions.c b/src/actions.c index ab5162e..731e343 100644 --- a/src/actions.c +++ b/src/actions.c @@ -4628,8 +4628,7 @@ cmd_tmpwm (int interactive, struct cmdarg **args) for (i=0; i<num_screens; i++) { XSelectInput(dpy, RootWindow (dpy, screens[i].screen_num), 0); - /* Unmap its key window */ - XUnmapWindow (dpy, screens[i].key_window); + deactivate_screen(&screens[i]); } /* Ungrab all our keys. */ @@ -4683,9 +4682,8 @@ cmd_tmpwm (int interactive, struct cmdarg **args) } while (tmpwm_error_raised); XSetErrorHandler (old_handler); - /* Map the key windows. */ for (i=0; i<num_screens; i++) - XMapWindow (dpy, screens[i].key_window); + activate_screen (&screens[i]); /* Sort through all the windows in each group and pick out the ones that are unmapped or destroyed. */ |