diff options
| author | sabetts <sabetts> | 2004-02-27 08:28:16 +0000 |
|---|---|---|
| committer | sabetts <sabetts> | 2004-02-27 08:28:16 +0000 |
| commit | fab11adc940f3258dc53c823903f242d9c65da91 (patch) | |
| tree | b1057b031c67173189c0c60dbf93fe2b2f8c1210 /src/group.c | |
| parent | a5c30aed8f3d73ac39e997a11068d12b82eab42e (diff) | |
| download | ratpoison-fab11adc940f3258dc53c823903f242d9c65da91.zip | |
* src/window.c (give_window_focus): save the mouse position before
checking if win is NULL.
(give_window_focus): set rp_current_screen to xine_screen_num of
the window's screen.
(set_active_window): when using xinerama get the frame from the
current screen.
* src/split.c (set_frames_window): update the window's scr
attribute to point to the frame's screen.
(find_window_for_frame): when xinerama is being used search all
windows.
(set_active_frame): update rp_current_screen to point to the
frame's screen.
* src/screen.h (init_screens): new prototype
(is_rp_window_for_screen): likewise
* src/screen.c: include string.h and X11/cursorfont.h
(init_screens): new function
(is_rp_window_for_screen): new function.
(init_screen): fill in xine_screen_num when using xinerama.
* src/ratpoison.h: include xinerama.h
* src/manage.c (current_screen): use xine_screen_num to find the
current screen.
(scanwins): use is_rp_window_for_screen to skip over ratpoison windows.
(scanwins): when using xinerama only manage windows inside the viewable area.
* src/main.c (main): call init_xinerama and init_screens. Move
screen initing code to these functions.
(init_rat_cursor): move to screen.c
(init_screen): likewise
(find_screen): likewise
(clean_up): call free_xinerama
* src/group.c (group_last_window): only check windows in the
current screen, unless xinerama is being used in which case all
windows are accessible.
(group_next_window): likewise
(group_prev_window): likewise
* src/globals.h: new globals rp_have_xinerama, xine_screen_num.
* src/events.c (new_window): when using xinerama, the new window's
screen is the current screen.
(key_press): when using xinerama, use the current screen.
* src/data.h (struct rp_screen): remove root_attr and add left,
top, width, height. All dependant code updated. Add xine_screen_num.
* src/actions.c (cmd_remove): show the frame indicator in the new
current frame after removing the frame.
* src/Makefile.am (ratpoison_SOURCES): add xinerama.c and xinerama.h
Diffstat (limited to 'src/group.c')
| -rw-r--r-- | src/group.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/group.c b/src/group.c index c4815ec..3e637aa 100644 --- a/src/group.c +++ b/src/group.c @@ -331,7 +331,7 @@ group_last_window (rp_group *g) if (cur->win->last_access >= last_access && cur->win != current_window() && !find_windows_frame (cur->win) - && cur->win->scr == s) + && (cur->win->scr == s || rp_have_xinerama)) { most_recent = cur; last_access = cur->win->last_access; @@ -365,7 +365,7 @@ group_next_window (rp_group *g, rp_window *win) cur != we; cur = list_next_entry (cur, &g->mapped_windows, node)) { - if (!find_windows_frame (cur->win) && cur->win->scr == current_screen()) + if (!find_windows_frame (cur->win) && (cur->win->scr == current_screen() || rp_have_xinerama)) { return cur->win; } @@ -395,7 +395,7 @@ group_prev_window (rp_group *g, rp_window *win) cur != we; cur = list_prev_entry (cur, &g->mapped_windows, node)) { - if (!find_windows_frame (cur->win) && cur->win->scr == current_screen()) + if (!find_windows_frame (cur->win) && (cur->win->scr == current_screen() || rp_have_xinerama)) { return cur->win; } |