diff options
| author | Jeff Abrahamson <jeff@purple.com> | 2014-07-07 19:59:05 +0200 |
|---|---|---|
| committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-12-30 13:37:02 +0100 |
| commit | 4f550327eb60d2f32b00d9576c1f4cc068684390 (patch) | |
| tree | deec269e9e6eb09ac48125a912b4acc943c5e09c | |
| parent | ee2e66be259b59f0cbe80586262513288897afce (diff) | |
| download | ratpoison-4f550327eb60d2f32b00d9576c1f4cc068684390.zip | |
Refactor duplicate branches of if() into a single block with leading ?:.
| -rw-r--r-- | src/window.c | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/src/window.c b/src/window.c index de9032a..9d784ea 100644 --- a/src/window.c +++ b/src/window.c @@ -467,34 +467,18 @@ set_active_window_body (rp_window *win, int force) /* With Xinerama, we can move a window over to the current screen; otherwise * we have to switch to the screen that the window belongs to. */ - if (rp_have_xinerama) + rp_screen *screen = (rp_have_xinerama ? current_screen() : win->scr); + /* use the intended frame if we can. */ + if (win->intended_frame_number >= 0) { - /* use the intended frame if we can. */ - if (win->intended_frame_number >= 0) - { - frame = screen_get_frame (current_screen(), win->intended_frame_number); - win->intended_frame_number = -1; - if (frame != current_frame()) - last_frame = current_frame(); - } - - if (!frame) - frame = screen_get_frame (current_screen(), current_screen()->current_frame); + frame = screen_get_frame (screen, win->intended_frame_number); + win->intended_frame_number = -1; + if (frame != current_frame()) + last_frame = current_frame(); } - else - { - /* use the intended frame if we can. */ - if (win->intended_frame_number >= 0) - { - frame = screen_get_frame (win->scr, win->intended_frame_number); - win->intended_frame_number = -1; - if (frame != current_frame()) - last_frame = current_frame(); - } - if (!frame) - frame = screen_get_frame (win->scr, win->scr->current_frame); - } + if (!frame) + frame = screen_get_frame (screen, screen->current_frame); if (frame->dedicated && !force) { |