? autom4te.cache
? depcomp
? j1.patch
? src/.actions.c.swp
? src/cscope.out
? src/stamp-h1
Index: src/data.h
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/data.h,v
retrieving revision 1.55
diff -u -r1.55 data.h
--- src/data.h	27 May 2003 07:51:07 -0000	1.55
+++ src/data.h	13 Jul 2003 15:52:12 -0000
@@ -139,7 +139,7 @@
   XWindowAttributes root_attr;
   Window root, bar_window, key_window, input_window, frame_window, help_window;
   int bar_is_raised;
-  int screen_num;		/* Our screen number as dictated my X */
+  int screen_num;		/* Our screen number as dictated by X */
   Colormap def_cmap;
   Cursor rat;
   unsigned long fg_color, bg_color; /* The pixel color. */
Index: src/group.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/group.c,v
retrieving revision 1.6
diff -u -r1.6 group.c
--- src/group.c	2 Jun 2003 22:49:36 -0000	1.6
+++ src/group.c	13 Jul 2003 15:52:14 -0000
@@ -324,12 +324,15 @@
   int last_access = 0;
   rp_window_elem *most_recent = NULL;
   rp_window_elem *cur;
+  rp_screen *s = current_screen();
 
   list_for_each_entry (cur, &g->mapped_windows, node)
     {
       if (cur->win->last_access >= last_access 
 	  && cur->win != current_window()
-	  && !find_windows_frame (cur->win))
+	  && !find_windows_frame (cur->win)
+          && cur->win->scr == s)
+
 	{
 	  most_recent = cur;
 	  last_access = cur->win->last_access;
@@ -363,7 +366,7 @@
        cur != we; 
        cur = list_next_entry (cur, &g->mapped_windows, node))
     {
-      if (!find_windows_frame (cur->win))
+      if (!find_windows_frame (cur->win) && cur->win->scr == current_screen())
 	{
 	  return cur->win;
 	}
@@ -393,7 +396,7 @@
        cur != we; 
        cur = list_prev_entry (cur, &g->mapped_windows, node))
     {
-      if (!find_windows_frame (cur->win))
+      if (!find_windows_frame (cur->win) && cur->win->scr == current_screen())
 	{
 	  return cur->win;
 	}
Index: src/split.c
===================================================================
RCS file: /cvsroot/ratpoison/ratpoison/src/split.c,v
retrieving revision 1.45
diff -u -r1.45 split.c
--- src/split.c	25 May 2003 10:56:20 -0000	1.45
+++ src/split.c	13 Jul 2003 15:52:14 -0000
@@ -384,7 +384,7 @@
   /* Hide all the windows not in the current frame. */
   list_for_each_entry (win, &rp_mapped_window, node)
     {
-      if (win->frame_number != s->current_frame)
+      if (win->frame_number != s->current_frame && win->scr == s)
 	hide_window (win);
     }