summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn <sabetts@juicebox>2008-10-10 13:04:12 -0700
committerShawn <sabetts@juicebox.(none)>2008-10-10 13:07:47 -0700
commitcc668c2218aad54cd27d1a8611de864372156cb0 (patch)
treef613bdad0345b99f72b19936bd572f3fe83c9870
parent497fb323835bbb3cceb39874e7555b565863c7e8 (diff)
downloadratpoison-cc668c2218aad54cd27d1a8611de864372156cb0.zip
choose a better approach to setting the border color in remove_frame
* remove call to give_window_focus in remove_frame * set the border color in hide_window calling give_window_focus in remove_frame was plain incorrect. setting it in hide_window might be considered overkill but I believe it will catch this case and any others that might be lurking.
-rw-r--r--src/manage.c3
-rw-r--r--src/split.c1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/manage.c b/src/manage.c
index 8bad332..3328959 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -829,6 +829,9 @@ hide_window (rp_window *win)
XSelectInput(dpy, win->w, WIN_EVENTS&~(StructureNotifyMask));
XUnmapWindow (dpy, win->w);
XSelectInput (dpy, win->w, WIN_EVENTS);
+ /* Ensure that the window doesn't have the focused border
+ color. This is needed by remove_frame and possibly others. */
+ XSetWindowBorder (dpy, win->w, win->scr->bw_color);
set_state (win, IconicState);
}
diff --git a/src/split.c b/src/split.c
index 561e928..6a6773d 100644
--- a/src/split.c
+++ b/src/split.c
@@ -808,7 +808,6 @@ remove_frame (rp_frame *frame)
{
rp_window *new = find_window_number (cur->win_number);
maximize_all_windows_in_frame (cur);
- give_window_focus (new, win);
XRaiseWindow (dpy, new->w);
}
}