sawfish r4455 - in trunk: . lisp/sawfish/wm man

From: chrisb svn gnome org
To: svn-commits-list gnome org
Subject: sawfish r4455 - in trunk: . lisp/sawfish/wm man
Date: Wed, 1 Apr 2009 13:52:28 +0000 (UTC)
Author: chrisb
Date: Wed Apr  1 13:52:28 2009
New Revision: 4455
URL: http://svn.gnome.org/viewvc/sawfish?rev=4455&view=rev

Log:
2009-03-24  Christopher Bratusek <zanghar freenet de>
        * lisp/sawfish/wm/viewport.jl
        * lisp/sawfish/wm/autoload.jl: make viewport commands appear in sawfish-ui

        * configure.in: changed appearance of ending message a bit
                        display additional infos
                        added codename field
                        re-ordered some checks
                        only display cairo version if it exists
                        put all AC_SUBST at the end of the file

        * Makedefs.in: remove nokogiridir (not beeing used)
                       first define host_type then stuff that refers to it
                       first define datarootdir then stuff that refers to it

        * man/news.texi: updated

2009-03-15  Christopher Bratusek <zanghar freenet de>
        * KEYBINDINGS: added description of several extra keys

Modified:
   trunk/ChangeLog
   trunk/KEYBINDINGS
   trunk/Makedefs.in
   trunk/Makefile.in
   trunk/config.h.in
   trunk/configure.in
   trunk/lisp/sawfish/wm/autoload.jl
   trunk/lisp/sawfish/wm/viewport.jl
   trunk/man/news.texi

Modified: trunk/KEYBINDINGS
==============================================================================
--- trunk/KEYBINDINGS	(original)
+++ trunk/KEYBINDINGS	Wed Apr  1 13:52:28 2009
@@ -28,6 +28,26 @@
 ISO_Left_Tab = Same as Shift + TAB
 ISO_Level3_Shift = Same as Mod5
 
+XF86AudioPlay = Play/Pause Key
+XF86AudioMute = Mute Key
+XF86AudioStop = Stop Key
+
+XF86AudioPrev = Previous Track Key
+XF86LowerVolume = Lower Volume Key
+XF86RaiseVolume = Raise Volme Key
+XF86AudioNext = Next Track Key
+
+XF86Back = Back Key
+XF86Forward = Next Key
+XF86Stop = Cancel Key
+XF86Reload = Reload Key
+
+XF86WWW = Browser Key
+XF86Mail = Mail Key
+X86Search = Search  Key
+XF86Favorites = Favorites Key
+XF86Standby = Sleep Key
+
 Button1 = Left Mouse Button
 Button2 = Middle Mouse Button/Scroll Wheel (Button 1 and 3 together should emulate this)
 Button3 = Right Mouse Button

Modified: trunk/Makedefs.in
==============================================================================
--- trunk/Makedefs.in	(original)
+++ trunk/Makedefs.in	Wed Apr  1 13:52:28 2009
@@ -26,6 +26,7 @@
 
 prefix= prefix@
 exec_prefix= exec_prefix@
+datarootdir= datarootdir@
 datadir= datadir@
 bindir= bindir@
 includedir= includedir@
@@ -35,14 +36,12 @@
 localstatedir= localstatedir@
 mandir= mandir@
 sharedstatedir= sharedstatedir@
-datarootdir= datarootdir@
 
 sawfishdir= sawfishdir@
 lispdir= lispdir@
-nokogiridir= nokogiridir@
 localedir= localedir@
-sawfishexecdir= sawfishexecdir@
 host_type= host@
+sawfishexecdir= sawfishexecdir@
 GNOMEDIR= GNOMEDIR@
 
 CC= CC@

Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in	(original)
+++ trunk/Makefile.in	Wed Apr  1 13:52:28 2009
@@ -58,7 +58,7 @@
 	  fi \
 	done
 	$(INSTALL_DATA) $(top_srcdir)/sawfish.pc $(DESTDIR)$(libdir)/pkgconfig/
-	$(INSTALL_DATA) $(top_srcdir)/sawfish-session.desktop $(DESTDIR)/$(datadir)/xsessions/sawfish.desktop
+	$(INSTALL_DATA) $(top_srcdir)/sawfish-session.desktop $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(sawfishdir)/$(version) \

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Wed Apr  1 13:52:28 2009
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
    */
@@ -164,17 +161,9 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
 
 /* Have x11 */
 #undef X_DISPLAY_MISSING

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Apr  1 13:52:28 2009
@@ -29,34 +29,31 @@
 dnl Release versioning info
 version="1.5.0"
 subversion=""
+codename="The Hardstyle Factory"
 
-SUBDIRS="src lisp scripts themes sounds man po"
-AC_SUBST(SUBDIRS)
-
-AC_SUBST(datarootdir)
+install_sh=../install-sh
 
-dnl Remove trailing slash in $prefix if necessary
-dnl /usr// is the same than /usr/ ... so why would we need this?
-case "${prefix}" in
-  */)
-    prefix=`echo ${prefix} | sed -e 's/^\(.*\)\/$/\1/'`
-    ;;
-esac
+SUBDIRS="src lisp scripts themes sounds man po"
 
 sawfishdir='${datadir}/sawfish'
 lispdir='${sawfishdir}/${version}/lisp'
 localedir='${datadir}/locale'
 sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
 
-dnl Checks for libraries.
+dnl Several checks
+AC_C_CONST
+AC_C_INLINE
+AC_C_BIGENDIAN
+AC_TYPE_SIZE_T
+AC_FUNC_ALLOCA
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(gethostname socket snprintf getpagesize)
+AC_PROG_INSTALL
 AC_CHECK_LIB(nsl, xdr_void)
 AC_CHECK_LIB(socket, bind)
-
-dnl Checks for headers
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 AC_CHECK_HEADERS(fcntl.h sys/time.h sys/utsname.h)
-
 AC_PATH_PROG(PKG_CONFIG, [pkg-config], [no])
 
 dnl Check for X headers, etc
@@ -299,18 +296,6 @@
 fi
 AC_MSG_RESULT([$with_gnome_prefix])
 GNOMEDIR=$with_gnome_prefix
-AC_SUBST(GNOMEDIR)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_ALLOCA
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(gethostname socket snprintf getpagesize)
 
 dnl Custom tests
 
@@ -333,7 +318,6 @@
       ;;
   esac
 fi
-AC_SUBST(MAKEDEP)
 
 dnl If using GCC and it doesn't look as though the cflags have been
 dnl set explicitly, add some warning options. Turn off implicit-int
@@ -342,14 +326,6 @@
   CFLAGS="${CFLAGS} -Wall -Wmissing-prototypes -Wno-implicit-int"
 fi
 
-AC_PROG_INSTALL
-
-GETTEXT_PACKAGE=sawfish
-PACKAGE=sawfish
-VERSION=$version
-
-install_sh=../install-sh
-
 AC_MSG_CHECKING(for languages to install)
 AC_ARG_ENABLE(linguas,
 	      [  --enable-linguas=LANGS... Install language catalogs for language codes LANGS],
@@ -376,6 +352,10 @@
 AC_SUBST(lispdir)
 AC_SUBST(localedir)
 AC_SUBST(install_sh)
+AC_SUBST(datarootdir)
+AC_SUBST(MAKEDEP)
+AC_SUBST(GNOMEDIR)
+AC_SUBST(SUBDIRS)
 AC_SUBST(HAVE_X11)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(CFLAGS)
@@ -441,18 +421,22 @@
 mv sawfish.ebuild sawfish-$version.ebuild
 
 chmod +x build-info
-./build-info
+$PWD/build-info
 
 REP_VERSION="`pkg-config --modversion librep`"
 REP_GTK_VERSION="`pkg-config --modversion rep-gtk`"
 GLIB_VERSION="`pkg-config --modversion glib-2.0`"
-CAIRO_VERSION="`pkg-config --modversion cairo`"
+
+if $PKG_CONFIG --exists cairo; then
+	CAIRO_VERSION="`pkg-config --modversion cairo`"
+fi
+
 GTK_VERSION="`pkg-config --modversion gtk+-2.0`"
 
 echo "
   == == == == == == == == == == == == ==
 
-  sawfish:	$version
+  sawfish:	$version '$codename'
 
   == == == == == == == == == == == == ==
 
@@ -465,14 +449,21 @@
 
   compiler:	$CC
   cflags:	$CFLAGS $DEVELOPMENT_CFLAGS
+  preprocessor:	$CPP
+  cppflags:	$CPPFLAGS
+  ldflags:	$LDFLAGS
+  makeflags:	$MAKEFLAGS
 
   == == == == == == == == == == == == ==
 
   rep:		$REP_VERSION
   rep-gtk:	$REP_GTK_VERSION
-  glib:		$GLIB_VERSION
-  cairo:	$CAIRO_VERSION
-  gtk+:		$GTK_VERSION"
+  glib:		$GLIB_VERSION"
+
+if $PKG_CONFIG --exists cairo; then
+	echo "  cairo:	$CAIRO_VERSION"
+fi
+echo "  gtk+:		$GTK_VERSION"
 
 if test "$with_gdk_pixbuf" = "no"; then
 echo "  imlib1:	$IMLIB_VERSION"
@@ -488,15 +479,11 @@
   image loader:	$IMAGE_LOADER
 
   == == == == == == == == == == == == ==
-  "
 
-echo "  ***** ***** ***** ***** ***** ***** *****
+  Please read README.IMPORTANT
 
-  Please read 
-  
-  README.IMPORTANT 
-  
-  ***** ***** ***** ***** ***** ***** *****"
+  == == == == == == == == == == == == ==
+  "
 
 dnl If it doesn't look like GNU Make is being used, give a friendly warning
 tem=`make --version -f /dev/null 2>&1 | grep GNU`

Modified: trunk/lisp/sawfish/wm/autoload.jl
==============================================================================
--- trunk/lisp/sawfish/wm/autoload.jl	(original)
+++ trunk/lisp/sawfish/wm/autoload.jl	Wed Apr  1 13:52:28 2009
@@ -40,12 +40,12 @@
 (autoload-command (quote previous-workspace-window) (quote sawfish.wm.commands.cycle))
 (autoload-command (quote next-window) (quote sawfish.wm.commands.cycle))
 (autoload-command (quote previous-window) (quote sawfish.wm.commands.cycle))
-(autoload-command (quote describe-symbol) (quote sawfish.wm.commands.describe) #:class 'default)
-(autoload-command (quote describe-symbol-to-screen) (quote sawfish.wm.commands.describe) #:class 'default)
-(autoload-command (quote apropos-function) (quote sawfish.wm.commands.describe) #:class 'default)
-(autoload-command (quote apropos-function-to-screen) (quote sawfish.wm.commands.describe) #:class 'default)
-(autoload-command (quote apropos-variable) (quote sawfish.wm.commands.describe) #:class 'default)
-(autoload-command (quote apropos-variable-to-screen) (quote sawfish.wm.commands.describe) #:class 'default)
+(autoload-command (quote describe-symbol) (quote sawfish.wm.commands.describe))
+(autoload-command (quote describe-symbol-to-screen) (quote sawfish.wm.commands.describe))
+(autoload-command (quote apropos-function) (quote sawfish.wm.commands.describe))
+(autoload-command (quote apropos-function-to-screen) (quote sawfish.wm.commands.describe))
+(autoload-command (quote apropos-variable) (quote sawfish.wm.commands.describe))
+(autoload-command (quote apropos-variable-to-screen) (quote sawfish.wm.commands.describe))
 (autoload-command (quote gnome-toggle-skip-winlist) (quote sawfish.wm.commands.gnome))
 (autoload-command (quote gnome-set-skip-winlist) (quote sawfish.wm.commands.gnome))
 (autoload-command (quote gnome-clear-skip-winlist) (quote sawfish.wm.commands.gnome))
@@ -63,13 +63,13 @@
 (autoload-command (quote send-group-to-next-workspace) (quote sawfish.wm.commands.groups))
 (autoload-command (quote send-group-to-previous-workspace) (quote sawfish.wm.commands.groups))
 (autoload-command (quote move-group-to-current-viewport) (quote sawfish.wm.commands.groups))
-(autoload-command (quote move-group-left) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote move-group-right) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote move-group-up) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote move-group-down) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote raise-group) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote lower-group) (quote sawfish.wm.commands.groups) #:class 'default)
-(autoload-command (quote raise-lower-group) (quote sawfish.wm.commands.groups) #:class 'default)
+(autoload-command (quote move-group-left) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-right) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-up) (quote sawfish.wm.commands.groups))
+(autoload-command (quote move-group-down) (quote sawfish.wm.commands.groups))
+(autoload-command (quote raise-group) (quote sawfish.wm.commands.groups))
+(autoload-command (quote lower-group) (quote sawfish.wm.commands.groups))
+(autoload-command (quote raise-lower-group) (quote sawfish.wm.commands.groups))
 (autoload-command (quote raise-group-depth) (quote sawfish.wm.commands.groups))
 (autoload-command (quote lower-group-depth) (quote sawfish.wm.commands.groups))
 (autoload-command (quote delete-group) (quote sawfish.wm.commands.groups))
@@ -101,9 +101,9 @@
 (autoload-command (quote raise-and-pass-through-click) (quote sawfish.wm.commands.raise-commands))
 (autoload-command (quote raise-and-pass-through-click-if-focused) (quote sawfish.wm.commands.raise-commands))
 (autoload-command (quote raise-or-pass-through-click) (quote sawfish.wm.commands.raise-commands))
-(autoload-command (quote raise-window-and-pass-through-click) (quote sawfish.wm.commands.raise-commands) #:class 'default)
-(autoload-command (quote raise-group-and-pass-through-click) (quote sawfish.wm.commands.raise-commands) #:class 'default)
-(autoload-command (quote raise-transients-and-pass-through-click) (quote sawfish.wm.commands.raise-commands) #:class 'default)
+(autoload-command (quote raise-window-and-pass-through-click) (quote sawfish.wm.commands.raise-commands))
+(autoload-command (quote raise-group-and-pass-through-click) (quote sawfish.wm.commands.raise-commands))
+(autoload-command (quote raise-transients-and-pass-through-click) (quote sawfish.wm.commands.raise-commands))
 (autoload-command (quote size-window-add-row) (quote sawfish.wm.commands.size-window))
 (autoload-command (quote size-window-subtract-row) (quote sawfish.wm.commands.size-window))
 (autoload-command (quote size-window-add-column) (quote sawfish.wm.commands.size-window))
@@ -128,7 +128,7 @@
 (autoload-command 'cycle-dock 'sawfish.wm.commands.x-cycle)
 (autoload-command 'cycle-dock-backwards 'sawfish.wm.commands.x-cycle)
 (autoload-command (quote xterm) (quote sawfish.wm.commands.xterm))
-(autoload-command (quote 3d-hack) (quote sawfish.wm.ext.3d-hack) #:class 'default)
+(autoload-command (quote 3d-hack) (quote sawfish.wm.ext.3d-hack))
 (defgroup audio "Sound" :require sawfish.wm.ext.audio-events)
 (defgroup match-window "Matched Windows" :layout single :require sawfish.wm.ext.match-window)
 (defgroup tooltips "Tooltips" :group appearance :require sawfish.wm.ext.tooltips)
@@ -155,30 +155,38 @@
 (autoload-placement-mode 'top-left 'sawfish.wm.placement.top-left #:for-normal t)
 (autoload-placement-mode 'stagger 'sawfish.wm.placement.stagger #:for-normal t)
 (autoload-placement-mode 'off-center 'sawfish.wm.placement.off-center #:for-normal t)
-(autoload-command (quote set-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))) #:class 'default)
-(autoload-command (quote set-window-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))) #:class 'default)
-(autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear #:class 'default)
-(autoload-command (quote move-viewport-next) (quote sawfish.wm.commands.viewport-extras) #:class 'default)
-(autoload-command (quote move-viewport-previous) (quote sawfish.wm.commands.viewport-extras) #:class 'default)
-(autoload-command (quote move-window-previous) (quote sawfish.wm.commands.viewport-extras) #:class 'default)
-(autoload-command (quote move-window-next) (quote sawfish.wm.commands.viewport-extras) #:class 'default)
+(autoload-command (quote set-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))))
+(autoload-command (quote set-window-viewport-linear) (quote "viewport-linear") #:type (backquote (and (labelled (backquote-unquote (_ "Index:")) (number 0)))))
+(autoload-command 'set-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:1 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:2 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:3 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:4 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:5 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:6 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:7 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:8 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-viewport-linear:9 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'set-window-viewport-linear:9 'sawfish.wm.commands.viewport-linear)
+(autoload-command 'move-viewport-right 'sawfish.wm.viewport)
+(autoload-command 'move-viewport-up 'sawfish.wm.viewport)
+(autoload-command 'move-viewport-down 'sawfish.wm.viewport)
+(autoload-command 'move-viewport-left 'sawfish.wm.viewport)
+(autoload-command 'move-window-right 'sawfish.wm.viewport)
+(autoload-command 'move-window-up 'sawfish.wm.viewport)
+(autoload-command 'move-window-down 'sawfish.wm.viewport)
+(autoload-command 'move-window-left 'sawfish.wm.viewport)
+(autoload-command (quote move-viewport-next) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-viewport-previous) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-window-previous) (quote sawfish.wm.commands.viewport-extras))
+(autoload-command (quote move-window-next) (quote sawfish.wm.commands.viewport-extras))
 (autoload-command (quote workspace-down) (quote sawfish.wm.ext.workspace-grid))
 (autoload-command (quote workspace-up) (quote sawfish.wm.ext.workspace-grid))
 (autoload-command (quote workspace-left) (quote sawfish.wm.ext.workspace-grid))

Modified: trunk/lisp/sawfish/wm/viewport.jl
==============================================================================
--- trunk/lisp/sawfish/wm/viewport.jl	(original)
+++ trunk/lisp/sawfish/wm/viewport.jl	Wed Apr  1 13:52:28 2009
@@ -48,7 +48,7 @@
 
   ;; Virtual workspaces are implemented by moving windows in and out of
   ;; the screen dimensions. E.g. moving to the left moves all windows one
-  ;; screen-width to the right. 
+  ;; screen-width to the right.
 
   (defgroup viewport "Viewport" :group workspace)
 
@@ -146,7 +146,7 @@
   (define (select-workspace-and-viewport space col row)
     (select-workspace space nil (lambda ()
 				  (set-screen-viewport col row))))
-  
+
   ;; returns t if it actually moved the viewport
   (define (move-viewport right down)
     (let ((port (screen-viewport)))
@@ -243,7 +243,7 @@
     #:spec "NX:\nNY:"
     #:type `(and (labelled ,(_ "Column:") (number 1))
 		 (labelled ,(_ "Row:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (activate-viewport-column x)
     "Select the specified viewport column."
@@ -252,7 +252,7 @@
   (define-command 'activate-viewport-column activate-viewport-column
     #:spec "NX:"
     #:type `(and (labelled ,(_ "Column:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (activate-viewport-row y)
     "Select the specified viewport row."
@@ -261,7 +261,7 @@
   (define-command 'activate-viewport-row activate-viewport-row
     #:spec "NY:"
     #:type `(and (labelled ,(_ "Row:") (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (move-window-to-viewport x y)
     "Move the current window to the specified viewport."
@@ -270,7 +270,7 @@
   (define-command 'move-window-to-viewport move-window-to-viewport
     #:spec "NX:\nNY:"
     #:type '(and (labelled "X:" (number 1)) (labelled "Y:" (number 1)))
-    #:class 'viewport)
+    #:class 'default)
 
   (define (move-viewport-right)
     "Move the viewport one screen to the right."
@@ -317,14 +317,14 @@
     "Move the window to the viewport above, and switch to that viewport."
     (move-window-to-viewport-and-move-viewport w 0 -1))
 
-  (define-command 'move-viewport-right move-viewport-right #:class 'viewport)
-  (define-command 'move-viewport-left move-viewport-left #:class 'viewport)
-  (define-command 'move-viewport-up move-viewport-up #:class 'viewport)
-  (define-command 'move-viewport-down move-viewport-down #:class 'viewport)
-  (define-command 'move-window-right move-window-right #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-left move-window-left #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-up move-window-up #:spec "%W" #:class 'viewport)
-  (define-command 'move-window-down move-window-down #:spec "%W" #:class 'viewport)
+  (define-command 'move-viewport-right move-viewport-right #:class 'default)
+  (define-command 'move-viewport-left move-viewport-left #:class 'default)
+  (define-command 'move-viewport-up move-viewport-up #:class 'default)
+  (define-command 'move-viewport-down move-viewport-down #:class 'default)
+  (define-command 'move-window-right move-window-right #:spec "%W" #:class 'default)
+  (define-command 'move-window-left move-window-left #:spec "%W" #:class 'default)
+  (define-command 'move-window-up move-window-up #:spec "%W" #:class 'default)
+  (define-command 'move-window-down move-window-down #:spec "%W" #:class 'default)
 
 ;;; session management, config
 
@@ -351,7 +351,7 @@
 	  (when (window-outside-workspace-p w)
 	    (move-window-to-current-viewport w)))
 	(window-put w 'placed t))))
-			     
+
   (sm-add-saved-properties 'sticky-viewport)
   (add-hook 'sm-window-save-functions viewport-saved-state)
   (add-hook 'sm-restore-window-hook viewport-load-state)

Modified: trunk/man/news.texi
==============================================================================
--- trunk/man/news.texi	(original)
+++ trunk/man/news.texi	Wed Apr  1 13:52:28 2009
@@ -56,6 +56,8 @@
 @item Shrinking/Yanking Support [Timo Korvola]
 
 @item Infinite Desktop Feature (make the virtual desktop bigger than the physical) [David T. McWherter]
+
+ item Make Viewport commands appear in Sawfish-UI [Christopher Bratusek]
 @end itemize
 
 @item Other changes:
@@ -105,6 +107,8 @@
 @item Add KEYBINDINGS file, containing a list of all default keybindings [Christopher Bratusek]
 
 @item Updated OPTIONS for all new options [Christopher Bratusek]
+
+ item Cleaned Up Makedefs.in [Christopher Bratusek]
 @end itemize
 @end itemize
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]