* 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

1 files changed, 20 insertions, 3 deletions

diff --git a/src/events.c b/src/events.c
index 97de6af..2498be2 100644
--- a/src/events.c
+++ b/src/events.c
@@ -50,9 +50,22 @@ new_window (XCreateWindowEvent *e)
   if (e->override_redirect)
     return;
 
-  s = find_screen (e->parent);
   win = find_window (e->window);
 
+  /* In Xinerama mode, all windows have the same root, so check
+   * all Xinerama screens
+   */
+  if (rp_have_xinerama)
+    {
+      /* New windows belong to the current screen */
+      s = &screens[rp_current_screen];
+    }
+  else
+    {
+      s = find_screen (e->parent);
+    }
+  if (is_rp_window_for_screen(e->window, s)) return;
+
   if (s && win == NULL
       && e->window != s->key_window 
       && e->window != s->bar_window 
@@ -376,10 +389,13 @@ key_press (XEvent *ev)
   unsigned int modifier;
   KeySym ks;
 
-  s = find_screen (ev->xkey.root);
+  if (rp_have_xinerama)
+    s = current_screen();
+  else
+    s = find_screen (ev->xkey.root);
 
 #ifdef HIDE_MOUSE
-  XWarpPointer (dpy, None, s->root, 0, 0, 0, 0, s->root_attr.width - 2, s->root_attr.height - 2); 
+  XWarpPointer (dpy, None, s->root, 0, 0, 0, 0, s->left + s->width - 2, s->top + s->height - 2); 
 #endif
 
   if (!s) return;
@@ -825,3 +841,4 @@ listen_for_events ()
 	}
     }
 }
+