summaryrefslogtreecommitdiff
path: root/src/split.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/split.c')
-rw-r--r--src/split.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/src/split.c b/src/split.c
index fa6e08f..480fca1 100644
--- a/src/split.c
+++ b/src/split.c
@@ -874,16 +874,10 @@ set_active_frame (rp_frame *frame, int force_indicator)
}
void
-exchange_with_frame (rp_screen *s, rp_frame *cur, rp_frame *frame)
+exchange_with_frame (rp_frame *cur, rp_frame *frame)
{
rp_window *win,*last_win;
- /* As a frame does not tell which screen it belongs to,
- * we could only make sure the frames are not on different
- * screens when xinerama is not available, if both have
- * windows in it. As this is not enough the caller will
- * have to check this. As I only plan to implement
- * exchange_{left,right,up,down}, this will be a nop...*/
if (frame == NULL || frame == cur) return;
/* Exchange the windows in the frames */
@@ -904,27 +898,7 @@ exchange_with_frame (rp_screen *s, rp_frame *cur, rp_frame *frame)
/* Make the switch */
update_last_access (frame);
- if (s->current_frame == cur->number)
- {
- s->current_frame = frame->number;
- /* mark it as active */
- show_frame_indicator(0);
- }
-
- update_bar (s);
-
-
- XSync (dpy, False);
-
- hook_run (&rp_switch_frame_hook);
-
- /* FIXME: Remaining problems:
- * - if one of the window is transient, the windows in the
- * background could cause problems.
- *
- * - how to implement correct mouse-warping?
- * (is it needed at all?)
- */
+ set_active_frame(frame, 0);
}