>From 2480d2d8ebebe77a4c9e656fd54576bbc0e56355 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <i...@extreme.hu>
Date: Fri, 9 Apr 2010 03:44:23 +0200
Subject: [PATCH] Kill contribs
- Patches don't apply
- RPM spec refers to stuff long dead, distros probably have better
ones anyway
---
configure.ac | 3 +-
contrib/Makefile.am | 4 -
contrib/README | 11 ----
contrib/WindowMaker.spec.in | 87 -----------------------------
contrib/workspace_flip.patch | 126 ------------------------------------------
contrib/yubn_moveres.diff | 72 ------------------------
6 files changed, 1 insertions(+), 302 deletions(-)
delete mode 100644 contrib/Makefile.am
delete mode 100644 contrib/README
delete mode 100644 contrib/WindowMaker.spec.in
delete mode 100644 contrib/workspace_flip.patch
delete mode 100644 contrib/yubn_moveres.diff
diff --git a/configure.ac b/configure.ac
index 9a63d82..7d24c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -868,8 +868,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile
util/po/Makefile \
WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
- WPrefs.app/po/Makefile \
- contrib/Makefile contrib/WindowMaker.spec )
+ WPrefs.app/po/Makefile )
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index ac23ee2..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-EXTRA_DIST = README single_click.diff WindowMaker.spec.in workspace_flip.patch
yubn_moveres.diff
-
diff --git a/contrib/README b/contrib/README
deleted file mode 100644
index 496d039..0000000
--- a/contrib/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This directory contains some patches contributed by ppl. Do NOT mail the
-wmaker developers for any problems with them.
-
-*** workspace_flip.patch
-
-Allows flipping across workspaces by putting the
-mouse in the side of the workspace.
-
-author:
-Martin Sarfy <xsa...@informatics.muni.cz>
diff --git a/contrib/WindowMaker.spec.in b/contrib/WindowMaker.spec.in
deleted file mode 100644
index bc07c24..0000000
--- a/contrib/WindowMaker.spec.in
+++ /dev/null
@@ -1,87 +0,0 @@
-%define name @PACKAGE@
-%define version @VERSION@
-%define release 1
-%define serial 2
-
-Summary: A window manager for the X Window System.
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Serial: %{serial}
-Copyright: GPL
-Group: User Interface/Desktops
-Vendor: The Window Maker Team
-Url: http://www.windowmaker.info
-Source: %{name}-%{version}.tar.gz
-Requires: wmconfig, libPropList >= 0.10.1
-Obsoletes: windowmaker, windowmaker-devel, windowmaker-libs,
WindowMaker-devel
-Provides: windowmaker
-BuildRoot: /var/tmp/%{name}-%{version}
-
-%description
-Window Maker is an X11 window manager which emulates the look
-and feel of the NeXTSTEP (TM) graphical user interface. It is
-relatively fast, feature rich and easy to configure and use.
-Window Maker is part of the official GNU project, which means that
-Window Maker can interoperate with other GNU projects, such as
-GNOME.
-
-Window Maker allows users to switch themes 'on the fly,' to place
-favorite applications on either an application dock, similar to
-AfterStep's Wharf or on a workspace dock, a 'clip' which extends
-the application dock's usefulness.
-
-You should install the WindowMaker package if you use Window
-Maker as your window manager or if you'd like to try using it.
-If you do install the WindowMaker package, you may also want
-to install the AfterStep-APPS package, which includes
-applets that will work with both AfterStep and Window Maker
-window managers.
-
-%prep
-%setup -q
-
-%build
-CFLAGS="$RPM_OPT_FLAGS";
-LINGUAS="@supported_locales@";
-NLSDIR="/usr/share/locale";
-GNUSTEP_LOCAL_ROOT='$(prefix)/X11R6/lib/GNUstep';
-export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT;
-
-./configure --prefix=/usr --exec-prefix=/usr/X11R6 \
- --sysconfdir=/etc/X11 --enable-modelock \
- --enable-usermenu
-make
-
-%install
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-
-cp -f WindowMaker/plmenu WindowMaker/Defaults/WMRootMenu
-make install DESTDIR=$RPM_BUILD_ROOT
-
-strip $RPM_BUILD_ROOT/usr/X11R6/bin/* || :
-strip $RPM_BUILD_ROOT/usr/X11R6/lib/GNUstep/Applications/WPrefs.app/WPrefs
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS BUGFORM BUGS ChangeLog NEWS FAQ* README
-%doc TODO MIRRORS README.*
-%doc AUTHORS.sk
-%config /etc/X11/WindowMaker
-/usr/X11R6/bin/*
-/usr/X11R6/lib/lib*
-/usr/X11R6/lib/GNUstep/Applications/WPrefs.app
-/usr/include/*
-/usr/share/WindowMaker
-/usr/share/locale/*/LC_MESSAGES/*
-/usr/share/WINGs
-/usr/man/*/*
-/usr/man/*/*/*
-
-%changelog
diff --git a/contrib/workspace_flip.patch b/contrib/workspace_flip.patch
deleted file mode 100644
index 46d5f2f..0000000
--- a/contrib/workspace_flip.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur WindowMaker-0.65.0/src/WindowMaker.h
wmaker-workspaceflip/src/WindowMaker.h
---- WindowMaker-0.65.0/src/WindowMaker.h Sat Apr 28 01:41:21 2001
-+++ wmaker-workspaceflip/src/WindowMaker.h Sun Aug 12 12:51:14 2001
-@@ -397,6 +397,8 @@
-
- int raise_delay; /* delay for autoraise. 0 is disabled */
-
-+ int workspace_flip_delay; /* delay for workspace flipping, 0 is
disabled */
-+
- int cmap_size; /* size of dithering colormap in colors
- * per channel */
-
-diff -Naur WindowMaker-0.65.0/src/defaults.c
wmaker-workspaceflip/src/defaults.c
---- WindowMaker-0.65.0/src/defaults.c Fri May 11 00:16:49 2001
-+++ wmaker-workspaceflip/src/defaults.c Sun Aug 12 12:51:14 2001
-@@ -420,6 +420,9 @@
- {"RaiseDelay", "0", NULL,
- &wPreferences.raise_delay, getInt, NULL
- },
-+ {"WorkspaceFlipDelay", "0", NULL,
-+ &wPreferences.workspace_flip_delay, getInt, NULL
-+ },
- {"WindozeCycling", "YES", NULL,
- &wPreferences.windows_cycling,getBool, NULL
- },
-diff -Naur WindowMaker-0.65.0/src/event.c wmaker-workspaceflip/src/event.c
---- WindowMaker-0.65.0/src/event.c Sat Apr 28 01:41:21 2001
-+++ wmaker-workspaceflip/src/event.c Sun Aug 12 12:51:14 2001
-@@ -1676,12 +1676,53 @@
- }
- }
-
-+#define DEL_TIMER(timer) { \
-+ WMDeleteTimerHandler(timer); \
-+ timer = NULL; \
-+}
-+
-+
-+
-+static void
-+flipRightWorkspace(void* data)
-+{
-+ WScreen *scr = (WScreen*)data;
-+ int x,y,tmp,last_workspace = scr->current_workspace;
-+ Window tmpw;
-+
-+ DEL_TIMER(scr->workspace_flip_right_timer);
-+
-+ XQueryPointer(dpy,scr->root_win,&tmpw,&tmpw,&x,&y,&tmp,&tmp,&tmp);
-+ if(x != scr->scr_width-1) return;
-+
-+ wWorkspaceRelativeChange(scr, 1);
-+ if(last_workspace != scr->current_workspace)
-+ XWarpPointer(dpy,None,scr->root_win,0,0,0,0,1,y);
-+}
-+
-+static void
-+flipLeftWorkspace(void* data)
-+{
-+ WScreen *scr = (WScreen*)data;
-+ int x,y,tmp,last_workspace = scr->current_workspace;
-+ Window tmpw;
-+
-+ DEL_TIMER(scr->workspace_flip_left_timer);
-+
-+ XQueryPointer(dpy,scr->root_win,&tmpw,&tmpw,&x,&y,&tmp,&tmp,&tmp);
-+ if(x != 0) return;
-+
-+ wWorkspaceRelativeChange(scr, -1);
-+ if(last_workspace != scr->current_workspace)
-+ XWarpPointer(dpy,None,scr->root_win,0,0,0,0,scr->scr_width-2,y);
-+}
-
- static void
- handleMotionNotify(XEvent *event)
- {
- WMenu *menu;
- WScreen *scr = wScreenForRootWindow(event->xmotion.root);
-+ int left,right;
-
- if (wPreferences.scrollable_menus) {
- if (scr->flags.jump_back_pending ||
-@@ -1697,6 +1738,29 @@
- wMenuScroll(menu, event);
- }
- }
-+
-+ /* workspace flipping */
-+ if(!wPreferences.workspace_flip_delay) return;
-+
-+ left = (event->xmotion.x_root == 0);
-+ right = (event->xmotion.x_root == scr->scr_width-1);
-+
-+ if(right && !scr->workspace_flip_right_timer)
-+ scr->workspace_flip_right_timer =
-+ WMAddTimerHandler(wPreferences.workspace_flip_delay,
-+
flipRightWorkspace,scr);
-+
-+ if(left && !scr->workspace_flip_left_timer)
-+ scr->workspace_flip_left_timer =
-+ WMAddTimerHandler(wPreferences.workspace_flip_delay,
-+
flipLeftWorkspace,scr);
-+
-+ if(!right && scr->workspace_flip_right_timer)
-+ DEL_TIMER(scr->workspace_flip_right_timer);
-+
-+ if(!left && scr->workspace_flip_left_timer)
-+ DEL_TIMER(scr->workspace_flip_left_timer);
-+
- #if 0
- if (event->xmotion.subwindow == None)
- return;
-diff -Naur WindowMaker-0.65.0/src/screen.h wmaker-workspaceflip/src/screen.h
---- WindowMaker-0.65.0/src/screen.h Sun Apr 15 03:23:01 2001
-+++ wmaker-workspaceflip/src/screen.h Sun Aug 12 12:51:14 2001
-@@ -273,6 +273,10 @@
- Window last_click_window;
- int last_click_button;
-
-+ /* for workspace flipping when mouse hits edge */
-+ WMHandlerID *workspace_flip_left_timer;
-+ WMHandlerID *workspace_flip_right_timer;
-+
- /* balloon help data */
- struct _WBalloon *balloon;
-
diff --git a/contrib/yubn_moveres.diff b/contrib/yubn_moveres.diff
deleted file mode 100644
index 3678991..0000000
--- a/contrib/yubn_moveres.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Tomoyasu Kihara ( h...@kmc.gr.jp )
-
-This patch is improvement of keyboard operation.
-
-- reisze/move a window diagonally. (This is very suitable for Roguelike Gamer
;))
-- decide window place/size by not only enter key but space key.
-
----8<---cut here------8<---cut here------8<---cut here---
-diff -ur WindowMaker-0.70.0/src/moveres.c WindowMaker-0.70.0-yubn/src/moveres.c
---- WindowMaker-0.70.0/src/moveres.c Tue Jul 24 18:51:06 2001
-+++ WindowMaker-0.70.0-yubn/src/moveres.c Wed Dec 19 03:20:53 2001
-@@ -1322,6 +1322,7 @@
- keysym = XLookupKeysym(&event.xkey, 0);
- switch (keysym) {
- case XK_Return:
-+ case XK_space:
- done=2;
- break;
- case XK_Escape:
-@@ -1380,6 +1381,50 @@
- moment = RIGHT;
- }
- else off_x+=kspeed;
-+ break;
-+ case XK_y:
-+ if (ctrlmode) {
-+ if (moment != (UP|LEFT))
-+ h = wh, w = ww;
-+ h -= kspeed, w -= kspeed;
-+ if (h < 1) h = 1;
-+ if (w < 1) w = 1;
-+ moment = UP|LEFT;
-+ }
-+ else
-+ off_x -= kspeed, off_y -= kspeed;
-+ break;
-+ case XK_u:
-+ if (ctrlmode) {
-+ if (moment != (UP|RIGHT))
-+ h = wh, w = ww;
-+ h -= kspeed, w += kspeed;
-+ if (h < 1) h = 1;
-+ moment = UP|RIGHT;
-+ }
-+ else
-+ off_x += kspeed, off_y -= kspeed;
-+ break;
-+ case XK_b:
-+ if (ctrlmode) {
-+ if (moment != (DOWN|LEFT))
-+ h = wh, w = ww;
-+ h += kspeed, w -= kspeed;
-+ if (w < 1) w = 1;
-+ moment = DOWN|LEFT;
-+ }
-+ else
-+ off_x -= kspeed, off_y += kspeed;
-+ break;
-+ case XK_n:
-+ if (ctrlmode) {
-+ if (moment != (DOWN|RIGHT))
-+ h = wh, w = ww;
-+ h += kspeed, w += kspeed;
-+ moment = DOWN|RIGHT;
-+ }
-+ else
-+ off_x += kspeed, off_y += kspeed;
- break;
- }
-
-
-
--
1.7.0
--
[-]
mkdir /nonexistentFrom 2480d2d8ebebe77a4c9e656fd54576bbc0e56355 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <i...@extreme.hu>
Date: Fri, 9 Apr 2010 03:44:23 +0200
Subject: [PATCH] Kill contribs
- Patches don't apply
- RPM spec refers to stuff long dead, distros probably have better
ones anyway
---
configure.ac | 3 +-
contrib/Makefile.am | 4 -
contrib/README | 11 ----
contrib/WindowMaker.spec.in | 87 -----------------------------
contrib/workspace_flip.patch | 126 ------------------------------------------
contrib/yubn_moveres.diff | 72 ------------------------
6 files changed, 1 insertions(+), 302 deletions(-)
delete mode 100644 contrib/Makefile.am
delete mode 100644 contrib/README
delete mode 100644 contrib/WindowMaker.spec.in
delete mode 100644 contrib/workspace_flip.patch
delete mode 100644 contrib/yubn_moveres.diff
diff --git a/configure.ac b/configure.ac
index 9a63d82..7d24c98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -868,8 +868,7 @@ AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile \
WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \
WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \
WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
- WPrefs.app/po/Makefile \
- contrib/Makefile contrib/WindowMaker.spec )
+ WPrefs.app/po/Makefile )
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index ac23ee2..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-EXTRA_DIST = README single_click.diff WindowMaker.spec.in workspace_flip.patch yubn_moveres.diff
-
diff --git a/contrib/README b/contrib/README
deleted file mode 100644
index 496d039..0000000
--- a/contrib/README
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This directory contains some patches contributed by ppl. Do NOT mail the
-wmaker developers for any problems with them.
-
-*** workspace_flip.patch
-
-Allows flipping across workspaces by putting the
-mouse in the side of the workspace.
-
-author:
-Martin Sarfy <xsa...@informatics.muni.cz>
diff --git a/contrib/WindowMaker.spec.in b/contrib/WindowMaker.spec.in
deleted file mode 100644
index bc07c24..0000000
--- a/contrib/WindowMaker.spec.in
+++ /dev/null
@@ -1,87 +0,0 @@
-%define name @PACKAGE@
-%define version @VERSION@
-%define release 1
-%define serial 2
-
-Summary: A window manager for the X Window System.
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Serial: %{serial}
-Copyright: GPL
-Group: User Interface/Desktops
-Vendor: The Window Maker Team
-Url: http://www.windowmaker.info
-Source: %{name}-%{version}.tar.gz
-Requires: wmconfig, libPropList >= 0.10.1
-Obsoletes: windowmaker, windowmaker-devel, windowmaker-libs, WindowMaker-devel
-Provides: windowmaker
-BuildRoot: /var/tmp/%{name}-%{version}
-
-%description
-Window Maker is an X11 window manager which emulates the look
-and feel of the NeXTSTEP (TM) graphical user interface. It is
-relatively fast, feature rich and easy to configure and use.
-Window Maker is part of the official GNU project, which means that
-Window Maker can interoperate with other GNU projects, such as
-GNOME.
-
-Window Maker allows users to switch themes 'on the fly,' to place
-favorite applications on either an application dock, similar to
-AfterStep's Wharf or on a workspace dock, a 'clip' which extends
-the application dock's usefulness.
-
-You should install the WindowMaker package if you use Window
-Maker as your window manager or if you'd like to try using it.
-If you do install the WindowMaker package, you may also want
-to install the AfterStep-APPS package, which includes
-applets that will work with both AfterStep and Window Maker
-window managers.
-
-%prep
-%setup -q
-
-%build
-CFLAGS="$RPM_OPT_FLAGS";
-LINGUAS="@supported_locales@";
-NLSDIR="/usr/share/locale";
-GNUSTEP_LOCAL_ROOT='$(prefix)/X11R6/lib/GNUstep';
-export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT;
-
-./configure --prefix=/usr --exec-prefix=/usr/X11R6 \
- --sysconfdir=/etc/X11 --enable-modelock \
- --enable-usermenu
-make
-
-%install
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-
-cp -f WindowMaker/plmenu WindowMaker/Defaults/WMRootMenu
-make install DESTDIR=$RPM_BUILD_ROOT
-
-strip $RPM_BUILD_ROOT/usr/X11R6/bin/* || :
-strip $RPM_BUILD_ROOT/usr/X11R6/lib/GNUstep/Applications/WPrefs.app/WPrefs
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%clean
-if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
-
-%files
-%defattr(-,root,root)
-%doc AUTHORS BUGFORM BUGS ChangeLog NEWS FAQ* README
-%doc TODO MIRRORS README.*
-%doc AUTHORS.sk
-%config /etc/X11/WindowMaker
-/usr/X11R6/bin/*
-/usr/X11R6/lib/lib*
-/usr/X11R6/lib/GNUstep/Applications/WPrefs.app
-/usr/include/*
-/usr/share/WindowMaker
-/usr/share/locale/*/LC_MESSAGES/*
-/usr/share/WINGs
-/usr/man/*/*
-/usr/man/*/*/*
-
-%changelog
diff --git a/contrib/workspace_flip.patch b/contrib/workspace_flip.patch
deleted file mode 100644
index 46d5f2f..0000000
--- a/contrib/workspace_flip.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur WindowMaker-0.65.0/src/WindowMaker.h wmaker-workspaceflip/src/WindowMaker.h
---- WindowMaker-0.65.0/src/WindowMaker.h Sat Apr 28 01:41:21 2001
-+++ wmaker-workspaceflip/src/WindowMaker.h Sun Aug 12 12:51:14 2001
-@@ -397,6 +397,8 @@
-
- int raise_delay; /* delay for autoraise. 0 is disabled */
-
-+ int workspace_flip_delay; /* delay for workspace flipping, 0 is disabled */
-+
- int cmap_size; /* size of dithering colormap in colors
- * per channel */
-
-diff -Naur WindowMaker-0.65.0/src/defaults.c wmaker-workspaceflip/src/defaults.c
---- WindowMaker-0.65.0/src/defaults.c Fri May 11 00:16:49 2001
-+++ wmaker-workspaceflip/src/defaults.c Sun Aug 12 12:51:14 2001
-@@ -420,6 +420,9 @@
- {"RaiseDelay", "0", NULL,
- &wPreferences.raise_delay, getInt, NULL
- },
-+ {"WorkspaceFlipDelay", "0", NULL,
-+ &wPreferences.workspace_flip_delay, getInt, NULL
-+ },
- {"WindozeCycling", "YES", NULL,
- &wPreferences.windows_cycling,getBool, NULL
- },
-diff -Naur WindowMaker-0.65.0/src/event.c wmaker-workspaceflip/src/event.c
---- WindowMaker-0.65.0/src/event.c Sat Apr 28 01:41:21 2001
-+++ wmaker-workspaceflip/src/event.c Sun Aug 12 12:51:14 2001
-@@ -1676,12 +1676,53 @@
- }
- }
-
-+#define DEL_TIMER(timer) { \
-+ WMDeleteTimerHandler(timer); \
-+ timer = NULL; \
-+}
-+
-+
-+
-+static void
-+flipRightWorkspace(void* data)
-+{
-+ WScreen *scr = (WScreen*)data;
-+ int x,y,tmp,last_workspace = scr->current_workspace;
-+ Window tmpw;
-+
-+ DEL_TIMER(scr->workspace_flip_right_timer);
-+
-+ XQueryPointer(dpy,scr->root_win,&tmpw,&tmpw,&x,&y,&tmp,&tmp,&tmp);
-+ if(x != scr->scr_width-1) return;
-+
-+ wWorkspaceRelativeChange(scr, 1);
-+ if(last_workspace != scr->current_workspace)
-+ XWarpPointer(dpy,None,scr->root_win,0,0,0,0,1,y);
-+}
-+
-+static void
-+flipLeftWorkspace(void* data)
-+{
-+ WScreen *scr = (WScreen*)data;
-+ int x,y,tmp,last_workspace = scr->current_workspace;
-+ Window tmpw;
-+
-+ DEL_TIMER(scr->workspace_flip_left_timer);
-+
-+ XQueryPointer(dpy,scr->root_win,&tmpw,&tmpw,&x,&y,&tmp,&tmp,&tmp);
-+ if(x != 0) return;
-+
-+ wWorkspaceRelativeChange(scr, -1);
-+ if(last_workspace != scr->current_workspace)
-+ XWarpPointer(dpy,None,scr->root_win,0,0,0,0,scr->scr_width-2,y);
-+}
-
- static void
- handleMotionNotify(XEvent *event)
- {
- WMenu *menu;
- WScreen *scr = wScreenForRootWindow(event->xmotion.root);
-+ int left,right;
-
- if (wPreferences.scrollable_menus) {
- if (scr->flags.jump_back_pending ||
-@@ -1697,6 +1738,29 @@
- wMenuScroll(menu, event);
- }
- }
-+
-+ /* workspace flipping */
-+ if(!wPreferences.workspace_flip_delay) return;
-+
-+ left = (event->xmotion.x_root == 0);
-+ right = (event->xmotion.x_root == scr->scr_width-1);
-+
-+ if(right && !scr->workspace_flip_right_timer)
-+ scr->workspace_flip_right_timer =
-+ WMAddTimerHandler(wPreferences.workspace_flip_delay,
-+ flipRightWorkspace,scr);
-+
-+ if(left && !scr->workspace_flip_left_timer)
-+ scr->workspace_flip_left_timer =
-+ WMAddTimerHandler(wPreferences.workspace_flip_delay,
-+ flipLeftWorkspace,scr);
-+
-+ if(!right && scr->workspace_flip_right_timer)
-+ DEL_TIMER(scr->workspace_flip_right_timer);
-+
-+ if(!left && scr->workspace_flip_left_timer)
-+ DEL_TIMER(scr->workspace_flip_left_timer);
-+
- #if 0
- if (event->xmotion.subwindow == None)
- return;
-diff -Naur WindowMaker-0.65.0/src/screen.h wmaker-workspaceflip/src/screen.h
---- WindowMaker-0.65.0/src/screen.h Sun Apr 15 03:23:01 2001
-+++ wmaker-workspaceflip/src/screen.h Sun Aug 12 12:51:14 2001
-@@ -273,6 +273,10 @@
- Window last_click_window;
- int last_click_button;
-
-+ /* for workspace flipping when mouse hits edge */
-+ WMHandlerID *workspace_flip_left_timer;
-+ WMHandlerID *workspace_flip_right_timer;
-+
- /* balloon help data */
- struct _WBalloon *balloon;
-
diff --git a/contrib/yubn_moveres.diff b/contrib/yubn_moveres.diff
deleted file mode 100644
index 3678991..0000000
--- a/contrib/yubn_moveres.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Tomoyasu Kihara ( h...@kmc.gr.jp )
-
-This patch is improvement of keyboard operation.
-
-- reisze/move a window diagonally. (This is very suitable for Roguelike Gamer ;))
-- decide window place/size by not only enter key but space key.
-
----8<---cut here------8<---cut here------8<---cut here---
-diff -ur WindowMaker-0.70.0/src/moveres.c WindowMaker-0.70.0-yubn/src/moveres.c
---- WindowMaker-0.70.0/src/moveres.c Tue Jul 24 18:51:06 2001
-+++ WindowMaker-0.70.0-yubn/src/moveres.c Wed Dec 19 03:20:53 2001
-@@ -1322,6 +1322,7 @@
- keysym = XLookupKeysym(&event.xkey, 0);
- switch (keysym) {
- case XK_Return:
-+ case XK_space:
- done=2;
- break;
- case XK_Escape:
-@@ -1380,6 +1381,50 @@
- moment = RIGHT;
- }
- else off_x+=kspeed;
-+ break;
-+ case XK_y:
-+ if (ctrlmode) {
-+ if (moment != (UP|LEFT))
-+ h = wh, w = ww;
-+ h -= kspeed, w -= kspeed;
-+ if (h < 1) h = 1;
-+ if (w < 1) w = 1;
-+ moment = UP|LEFT;
-+ }
-+ else
-+ off_x -= kspeed, off_y -= kspeed;
-+ break;
-+ case XK_u:
-+ if (ctrlmode) {
-+ if (moment != (UP|RIGHT))
-+ h = wh, w = ww;
-+ h -= kspeed, w += kspeed;
-+ if (h < 1) h = 1;
-+ moment = UP|RIGHT;
-+ }
-+ else
-+ off_x += kspeed, off_y -= kspeed;
-+ break;
-+ case XK_b:
-+ if (ctrlmode) {
-+ if (moment != (DOWN|LEFT))
-+ h = wh, w = ww;
-+ h += kspeed, w -= kspeed;
-+ if (w < 1) w = 1;
-+ moment = DOWN|LEFT;
-+ }
-+ else
-+ off_x -= kspeed, off_y += kspeed;
-+ break;
-+ case XK_n:
-+ if (ctrlmode) {
-+ if (moment != (DOWN|RIGHT))
-+ h = wh, w = ww;
-+ h += kspeed, w += kspeed;
-+ moment = DOWN|RIGHT;
-+ }
-+ else
-+ off_x += kspeed, off_y += kspeed;
- break;
- }
-
-
-
--
1.7.0
