* 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, 14 insertions, 9 deletions

diff --git a/src/manage.c b/src/manage.c
index 2330721..e85bfe8 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -129,7 +129,7 @@ current_screen ()
 
   for (i=0; i<num_screens; i++)
     {
-      if (screens[i].screen_num == rp_current_screen)
+      if (screens[i].xine_screen_num == rp_current_screen)
 	return &screens[i];
     }
   
@@ -385,14 +385,19 @@ scanwins(rp_screen *s)
   for (i = 0; i < nwins; i++) 
     {
       XGetWindowAttributes(dpy, wins[i], &attr);
-      if (wins[i] == s->bar_window 
-	  || wins[i] == s->key_window 
-	  || wins[i] == s->input_window
-	  || wins[i] == s->frame_window
-	  || wins[i] == s->help_window
+      if (is_rp_window_for_screen(wins[i], s)
 	  || attr.override_redirect == True
 	  || unmanaged_window (wins[i])) continue;
 
+      /* FIXME - with this code, windows which are entirely off-screen
+       * when RP starts won't ever be managed when Xinerama is enabled.
+       */
+      if (rp_have_xinerama
+	  && ((attr.x > s->left + s->width)
+               || (attr.x < s->left)
+	       || (attr.y > s->top + s->height)
+	       || (attr.y < s->top))) continue;
+
       win = add_to_window_list (s, wins[i]);
 
       PRINT_DEBUG (("map_state: %s\n", 
@@ -671,7 +676,7 @@ maximize (rp_window *win)
 
 
   /* Actually do the maximizing. */
-  XMoveResizeWindow (dpy, win->w, win->x, win->y, win->width, win->height);
+  XMoveResizeWindow (dpy, win->w, win->scr->left + win->x, win->scr->top + win->y, win->width, win->height);
   XSetWindowBorderWidth (dpy, win->w, win->border);
 
   XSync (dpy, False);
@@ -696,7 +701,7 @@ force_maximize (rp_window *win)
      problem. */
   if (win->hints->flags & PResizeInc)
     {
-      XMoveResizeWindow (dpy, win->w, win->x, win->y,
+      XMoveResizeWindow (dpy, win->w, win->scr->left + win->x, win->scr->top + win->y,
 			 win->width + win->hints->width_inc, 
 			 win->height + win->hints->height_inc);
     }
@@ -708,7 +713,7 @@ force_maximize (rp_window *win)
   XSync (dpy, False);
 
   /* Resize the window to its proper maximum size. */
-  XMoveResizeWindow (dpy, win->w, win->x, win->y, win->width, win->height);
+  XMoveResizeWindow (dpy, win->w, win->scr->left + win->x, win->scr->top + win->y, win->width, win->height);
   XSetWindowBorderWidth (dpy, win->w, win->border);
 
   XSync (dpy, False);