* 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, 6 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index 6d58f3a..2ec5025 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 dnl
-dnl $Id: configure.in,v 1.39 2003/11/03 03:17:59 sabetts Exp $
+dnl $Id: configure.in,v 1.40 2004/02/27 08:28:16 sabetts Exp $
 
 AC_INIT(src/main.c)
 AM_INIT_AUTOMAKE(ratpoison, 1.3.0-cvs)
@@ -87,6 +87,11 @@ CFLAGS="$CFLAGS $X_CFLAGS"
 AC_CHECK_LIB(X11, XOpenDisplay,,
 	AC_MSG_ERROR([*** Can't find libX11]))
 
+AC_CHECK_HEADERS([X11/extensions/Xinerama.h])
+AC_CHECK_LIB(Xext, XMissingExtension, [LIBS="-lXext $LIBS"],, $CFLAGS $LDFLAGS)
+AC_CHECK_LIB(Xinerama, XineramaQueryScreens, [LIBS="-lXinerama $LIBS"],, $CFLAGS $LDFLAGS)
+
+
 dnl Check for electric fence library
 dnl AC_CHECK_LIB(efence,malloc,,)