Github messages for voidlinux
 help / color / mirror / Atom feed
From: wael444 <wael444@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: oneko-1.2.5
Date: Tue, 12 Apr 2022 00:36:59 +0200	[thread overview]
Message-ID: <20220411223659.K1h_xEqhL6BI5QI-Yt9EBc7RBBGK0cu9uncl9leCQT4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36622@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

There is an updated pull request by wael444 against master on the void-packages repository

https://github.com/wael444/void-packages oneko
https://github.com/void-linux/void-packages/pull/36622

New package: oneko-1.2.5
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

~~it's cute tho.~~

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/36622.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-oneko-36622.patch --]
[-- Type: text/x-diff, Size: 105365 bytes --]

From 78acecd68d2bf11cc50e1622174d03ffab49563d Mon Sep 17 00:00:00 2001
From: wael <40663@protonmail.com>
Date: Sun, 10 Apr 2022 22:56:44 +0300
Subject: [PATCH] New package: oneko-1.2.5

---
 srcpkgs/oneko/patches/cursorrecover.diff    |   73 +
 srcpkgs/oneko/patches/fix-warnings.diff     |   43 +
 srcpkgs/oneko/patches/remove_bsd.diff       | 1694 +++++++++++++++++++
 srcpkgs/oneko/patches/rmshape_fixtypos.diff |   69 +
 srcpkgs/oneko/template                      |   22 +
 5 files changed, 1901 insertions(+)
 create mode 100644 srcpkgs/oneko/patches/cursorrecover.diff
 create mode 100644 srcpkgs/oneko/patches/fix-warnings.diff
 create mode 100644 srcpkgs/oneko/patches/remove_bsd.diff
 create mode 100644 srcpkgs/oneko/patches/rmshape_fixtypos.diff
 create mode 100644 srcpkgs/oneko/template

diff --git a/srcpkgs/oneko/patches/cursorrecover.diff b/srcpkgs/oneko/patches/cursorrecover.diff
new file mode 100644
index 000000000000..f19497812f32
--- /dev/null
+++ b/srcpkgs/oneko/patches/cursorrecover.diff
@@ -0,0 +1,73 @@
+diff --git a/oneko.c b/oneko.c
+index d2b81fe..8c0d965 100644
+--- a/oneko.c
++++ b/oneko.c
+@@ -8,6 +8,10 @@ static char rcsid[] = "$Header: /home/sun/unix/kato/xsam/oneko/oneko.c,v 1.5 90/
+ 
+ #include "oneko.h"
+ #include "patchlevel.h"
++
++#include <X11/cursorfont.h>
++int restoredCursor = 0; 
++
+ /*
+  *	^[$@%0%m!<%P%kJQ?t^[(J
+  */
+@@ -716,7 +720,14 @@ RestoreCursor()
+   XSetWindowAttributes	theWindowAttributes;
+   BitmapGCData *BitmapGCDataTablePtr;
+ 
+-  theWindowAttributes.cursor = None;
++  Cursor font_cursor;
++  if(restoredCursor >= XC_X_cursor && restoredCursor <  XC_X_cursor + XC_num_glyphs)
++     font_cursor=XCreateFontCursor(theDisplay, restoredCursor );
++  if(font_cursor)
++     theWindowAttributes.cursor = font_cursor;
++  else
++     theWindowAttributes.cursor = None;
++
+   XChangeWindowAttributes(theDisplay, theRoot, CWCursor,
+ 			  &theWindowAttributes);
+   for (BitmapGCDataTablePtr = BitmapGCDataTable;
+@@ -1376,6 +1387,7 @@ char	*message[] = {
+ "-tofocus      		: Neko runs on top of focus window",
+ "-rv			: Reverse video. (effects monochrome display only)",
+ "-position <geometry>   : adjust position relative to mouse pointer.",
++"-cursor <cursornumber> : cursor number to set when quitting.",
+ "-debug                 : puts you in synchronous mode.",
+ "-patchlevel            : print out your current patchlevel.",
+ NULL };
+@@ -1504,6 +1516,10 @@ GetArguments(argc, argv, theDisplayName)
+       ArgCounter++;
+       result=XParseGeometry(argv[ArgCounter],&XOffset,&YOffset,&foo,&bar);
+     }
++	else if (strcmp(argv[ArgCounter], "-cursor") == 0) {
++		ArgCounter++;
++		restoredCursor=atoi(argv[ArgCounter]);
++	}
+     else if (strcmp(argv[ArgCounter], "-debug") ==0) {
+       Synchronous = True;
+     }
+diff --git a/oneko.man b/oneko.man
+index d6d2b40..333388a 100644
+--- a/oneko.man
++++ b/oneko.man
+@@ -9,7 +9,7 @@ The program oneko creates a cute cat chasing around your mouse cursor.
+ [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP]
+ [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP]
+ [\fB-tofocus\fP]
+-[\fB-position\fP \fIgeometry\fP]
++[\fB-position\fP \fIgeometry\fP] [\fB-cursor\fP]
+ [\fB-rv\fP] [\fB-noshape\fP] [\fB-fg\fP] [\fB-bg\fP]
+ .SH DESCRIPTION
+ .I oneko
+@@ -88,6 +88,9 @@ When focus window is not in sight, cat chases mouse as usually.
+ Specify X and Y offsets in pixels to adjust position of cat relative
+ to mouse pointer.
+ .TP
++.BI \-cursor " cursornumber"
++Specify a cursor number to set when quitting. For example, 132 is the
++default root cursor.
+ .B -rv
+ Reverse background color and foreground color.
+ .TP
diff --git a/srcpkgs/oneko/patches/fix-warnings.diff b/srcpkgs/oneko/patches/fix-warnings.diff
new file mode 100644
index 000000000000..7e2593ba8357
--- /dev/null
+++ b/srcpkgs/oneko/patches/fix-warnings.diff
@@ -0,0 +1,43 @@
+diff --git a/oneko.c b/oneko.c
+index d569eb5..926c1cd 100644
+--- a/oneko.c
++++ b/oneko.c
+@@ -335,7 +335,7 @@ char	*resource;
+  *	^[$@%j%=!<%9!&%G!<%?%Y!<%9$+$i%*%W%7%g%s$r@_Dj^[(J
+  */
+ 
+-GetResources()
++void GetResources()
+ {
+   char	*resource;
+   int		num;
+@@ -434,7 +434,7 @@ GetResources()
+  *	^[$@$M$:$_7?%+!<%=%k$r:n$k^[(J
+  */
+ 
+-MakeMouseCursor()
++void MakeMouseCursor()
+ {
+     Pixmap			theCursorSource;
+     Pixmap			theCursorMask;
+@@ -463,7 +463,7 @@ MakeMouseCursor()
+  *	^[$@?'$r=i4|@_Dj$9$k^[(J
+  */
+ 
+-SetupColors()
++void SetupColors()
+ {
+     XColor	theExactColor;
+     Colormap	theColormap;
+diff --git a/oneko.h b/oneko.h
+index 414e12f..225d975 100644
+--- a/oneko.h
++++ b/oneko.h
+@@ -19,6 +19,7 @@
+ #include <signal.h>
+ #include <math.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ 
+ 
+ /*
diff --git a/srcpkgs/oneko/patches/remove_bsd.diff b/srcpkgs/oneko/patches/remove_bsd.diff
new file mode 100644
index 000000000000..43a63cc7d7b1
--- /dev/null
+++ b/srcpkgs/oneko/patches/remove_bsd.diff
@@ -0,0 +1,1694 @@
+diff --git a/bitmaps/bsd/COPYRIGHT b/bitmaps/bsd/COPYRIGHT
+deleted file mode 100644
+index b8b3a41..0000000
+--- a/bitmaps/bsd/COPYRIGHT
++++ /dev/null
+@@ -1 +0,0 @@
+-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved.
+diff --git a/bitmaps/bsd/awake_bsd.xbm b/bitmaps/bsd/awake_bsd.xbm
+deleted file mode 100644
+index a0b3e32..0000000
+--- a/bitmaps/bsd/awake_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define awake_bsd_width 32
+-#define awake_bsd_height 32
+-static unsigned char awake_bsd_bits[] = {
+-   0x00, 0x86, 0x30, 0x00, 0x08, 0x85, 0x50, 0x10, 0x90, 0x02, 0xa0, 0x08,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x30, 0x06, 0x01, 0x4c, 0x48, 0x09, 0x31, 0x80, 0x88, 0x88, 0x00,
+-   0x80, 0xc4, 0x91, 0x00, 0x00, 0xe5, 0x53, 0x00, 0x00, 0xe5, 0x53, 0x00,
+-   0x00, 0x45, 0x51, 0x08, 0x90, 0x38, 0x8e, 0x10, 0x88, 0xc0, 0x81, 0x00,
+-   0x80, 0x04, 0x90, 0x00, 0x00, 0x19, 0x4c, 0x00, 0x08, 0xe2, 0x23, 0x00,
+-   0x12, 0x0c, 0x18, 0x00, 0x14, 0x1c, 0x18, 0x00, 0x09, 0x02, 0x20, 0x00,
+-   0x16, 0x01, 0x40, 0x00, 0xa0, 0x00, 0x80, 0x00, 0x40, 0x08, 0x08, 0x01,
+-   0xc0, 0x04, 0x10, 0x01, 0x40, 0x06, 0x30, 0x01, 0x80, 0x07, 0xd0, 0x00,
+-   0x00, 0x04, 0x10, 0x00, 0x80, 0x87, 0xf0, 0x10, 0x40, 0x40, 0x01, 0x23,
+-   0x40, 0x40, 0x01, 0x7d, 0x80, 0x3f, 0xfe, 0x20};
+diff --git a/bitmaps/bsd/bsd.include b/bitmaps/bsd/bsd.include
+deleted file mode 100644
+index 8f0298b..0000000
+--- a/bitmaps/bsd/bsd.include
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#include "awake_bsd.xbm"
+-#include "down1_bsd.xbm"
+-#include "down2_bsd.xbm"
+-#include "dtogi1_bsd.xbm"
+-#include "dtogi2_bsd.xbm"
+-#include "dwleft1_bsd.xbm"
+-#include "dwleft2_bsd.xbm"
+-#include "dwright1_bsd.xbm"
+-#include "dwright2_bsd.xbm"
+-#include "jare2_bsd.xbm"
+-#include "kaki1_bsd.xbm"
+-#include "kaki2_bsd.xbm"
+-#include "left1_bsd.xbm"
+-#include "left2_bsd.xbm"
+-#include "ltogi1_bsd.xbm"
+-#include "ltogi2_bsd.xbm"
+-#include "mati2_bsd.xbm"
+-#include "mati3_bsd.xbm"
+-#include "right1_bsd.xbm"
+-#include "right2_bsd.xbm"
+-#include "rtogi1_bsd.xbm"
+-#include "rtogi2_bsd.xbm"
+-#include "sleep1_bsd.xbm"
+-#include "sleep2_bsd.xbm"
+-#include "up1_bsd.xbm"
+-#include "up2_bsd.xbm"
+-#include "upleft1_bsd.xbm"
+-#include "upleft2_bsd.xbm"
+-#include "upright1_bsd.xbm"
+-#include "upright2_bsd.xbm"
+-#include "utogi1_bsd.xbm"
+-#include "utogi2_bsd.xbm"
+diff --git a/bitmaps/bsd/down1_bsd.xbm b/bitmaps/bsd/down1_bsd.xbm
+deleted file mode 100644
+index 0d8bc19..0000000
+--- a/bitmaps/bsd/down1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define down1_bsd_width 32
+-#define down1_bsd_height 32
+-static unsigned char down1_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x30, 0x06, 0x01, 0x80, 0x48, 0x89, 0x00,
+-   0x80, 0x88, 0x88, 0x00, 0x00, 0x85, 0x50, 0x00, 0x00, 0xe5, 0x53, 0x00,
+-   0x00, 0xe5, 0x53, 0x00, 0x00, 0x65, 0x53, 0x00, 0x80, 0x38, 0x8e, 0x00,
+-   0x80, 0xc4, 0x91, 0x00, 0x00, 0x19, 0x4c, 0x00, 0x00, 0xe2, 0x23, 0x00,
+-   0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x80, 0x00, 0x40, 0x00, 0x40, 0x08, 0x80, 0x00, 0x40, 0x0c, 0x80, 0x00,
+-   0x80, 0x07, 0x90, 0x00, 0x58, 0x04, 0x88, 0x00, 0x24, 0x04, 0x88, 0x00,
+-   0x50, 0x04, 0x70, 0x00, 0x48, 0x84, 0x23, 0x00, 0x20, 0x42, 0x1c, 0x00,
+-   0x00, 0x42, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00};
+diff --git a/bitmaps/bsd/down2_bsd.xbm b/bitmaps/bsd/down2_bsd.xbm
+deleted file mode 100644
+index d945130..0000000
+--- a/bitmaps/bsd/down2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define down2_bsd_width 32
+-#define down2_bsd_height 32
+-static unsigned char down2_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x30, 0x06, 0x01, 0x80, 0x48, 0x89, 0x00,
+-   0x80, 0x88, 0x88, 0x00, 0x00, 0x85, 0x50, 0x00, 0x00, 0xe5, 0x53, 0x00,
+-   0x00, 0xe5, 0x53, 0x00, 0x00, 0x65, 0x53, 0x00, 0x80, 0x38, 0x8e, 0x00,
+-   0x80, 0xc4, 0x91, 0x00, 0x00, 0x19, 0x4c, 0x00, 0x00, 0xe2, 0x23, 0x00,
+-   0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x11, 0x40, 0x00,
+-   0x00, 0x49, 0x80, 0x00, 0x80, 0x28, 0x08, 0x01, 0x80, 0x90, 0x18, 0x01,
+-   0x80, 0x68, 0xf0, 0x00, 0x80, 0x04, 0x10, 0x00, 0x80, 0x08, 0x10, 0x00,
+-   0x00, 0x07, 0x10, 0x00, 0x80, 0xe2, 0x10, 0x00, 0x40, 0x1c, 0x21, 0x00,
+-   0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x1e, 0x00};
+diff --git a/bitmaps/bsd/dtogi1_bsd.xbm b/bitmaps/bsd/dtogi1_bsd.xbm
+deleted file mode 100644
+index f7d150d..0000000
+--- a/bitmaps/bsd/dtogi1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define dtogi1_bsd_width 32
+-#define dtogi1_bsd_height 32
+-static unsigned char dtogi1_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x30, 0x06, 0x01, 0x80, 0x48, 0x89, 0x00,
+-   0x80, 0x88, 0x88, 0x00, 0x00, 0x85, 0x50, 0x00, 0x00, 0xe5, 0x53, 0x00,
+-   0x00, 0xe5, 0x53, 0x00, 0x00, 0x65, 0x53, 0x00, 0x80, 0x38, 0x8e, 0x00,
+-   0x80, 0xc4, 0x91, 0x00, 0x00, 0x19, 0x4c, 0x00, 0x00, 0xe2, 0x23, 0x00,
+-   0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x80, 0x00, 0x40, 0x00, 0x40, 0x08, 0x80, 0x00, 0x40, 0x0c, 0x80, 0x00,
+-   0x80, 0x07, 0x90, 0x00, 0x58, 0x04, 0x88, 0x00, 0x24, 0x04, 0x88, 0x00,
+-   0x50, 0x04, 0x70, 0x00, 0x48, 0x84, 0x23, 0x00, 0x20, 0x42, 0x1c, 0x00,
+-   0x00, 0x42, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00};
+diff --git a/bitmaps/bsd/dtogi2_bsd.xbm b/bitmaps/bsd/dtogi2_bsd.xbm
+deleted file mode 100644
+index cf1814f..0000000
+--- a/bitmaps/bsd/dtogi2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define dtogi2_bsd_width 32
+-#define dtogi2_bsd_height 32
+-static unsigned char dtogi2_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x30, 0x06, 0x01, 0x80, 0x48, 0x89, 0x00,
+-   0x80, 0x88, 0x88, 0x00, 0x00, 0x85, 0x50, 0x00, 0x00, 0xe5, 0x53, 0x00,
+-   0x00, 0xe5, 0x53, 0x00, 0x00, 0x65, 0x53, 0x00, 0x80, 0x38, 0x8e, 0x00,
+-   0x80, 0xc4, 0x91, 0x00, 0x00, 0x19, 0x4c, 0x00, 0x00, 0xe2, 0x23, 0x00,
+-   0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00, 0x00, 0x11, 0x40, 0x00,
+-   0x00, 0x49, 0x80, 0x00, 0x80, 0x28, 0x08, 0x01, 0x80, 0x90, 0x18, 0x01,
+-   0x80, 0x68, 0xf0, 0x00, 0x80, 0x04, 0x10, 0x00, 0x80, 0x08, 0x10, 0x00,
+-   0x00, 0x07, 0x10, 0x00, 0x80, 0xe2, 0x10, 0x00, 0x40, 0x1c, 0x21, 0x00,
+-   0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x1e, 0x00};
+diff --git a/bitmaps/bsd/dwleft1_bsd.xbm b/bitmaps/bsd/dwleft1_bsd.xbm
+deleted file mode 100644
+index da97c20..0000000
+--- a/bitmaps/bsd/dwleft1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define dwleft1_bsd_width 32
+-#define dwleft1_bsd_height 32
+-static unsigned char dwleft1_bsd_bits[] = {
+-   0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 0x14, 0x40, 0x01,
+-   0x00, 0x12, 0x80, 0x02, 0x00, 0xe2, 0x8f, 0x04, 0x00, 0x02, 0xb0, 0x04,
+-   0x00, 0xd9, 0x60, 0x04, 0x00, 0x26, 0x01, 0x04, 0x00, 0x22, 0x02, 0x04,
+-   0x00, 0x12, 0x02, 0x02, 0x00, 0x39, 0x02, 0x01, 0x00, 0x3d, 0x82, 0x00,
+-   0x80, 0x32, 0x81, 0x00, 0x80, 0xe2, 0x80, 0x00, 0x90, 0x1c, 0x40, 0x00,
+-   0x24, 0x01, 0x41, 0x00, 0x28, 0xfa, 0x20, 0x00, 0x12, 0x04, 0x10, 0x00,
+-   0x2c, 0x78, 0x08, 0x00, 0x40, 0x10, 0x08, 0x00, 0x80, 0x08, 0x10, 0x00,
+-   0x00, 0x0f, 0x20, 0x00, 0x80, 0x04, 0x40, 0x08, 0x80, 0x04, 0x80, 0x10,
+-   0x00, 0x07, 0x08, 0x3d, 0x00, 0x04, 0x10, 0x13, 0x00, 0x04, 0x90, 0x08,
+-   0x00, 0x44, 0x60, 0x00, 0x00, 0x48, 0x10, 0x00, 0x00, 0x28, 0x10, 0x00,
+-   0x00, 0x30, 0x08, 0x00, 0x00, 0xe0, 0x07, 0x00};
+diff --git a/bitmaps/bsd/dwleft2_bsd.xbm b/bitmaps/bsd/dwleft2_bsd.xbm
+deleted file mode 100644
+index e3a90d0..0000000
+--- a/bitmaps/bsd/dwleft2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define dwleft2_bsd_width 32
+-#define dwleft2_bsd_height 32
+-static unsigned char dwleft2_bsd_bits[] = {
+-   0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 0x14, 0x40, 0x01,
+-   0x00, 0x12, 0x80, 0x02, 0x00, 0xe2, 0x8f, 0x04, 0x00, 0x02, 0xb0, 0x04,
+-   0x00, 0xd9, 0x60, 0x04, 0x00, 0x26, 0x01, 0x04, 0x00, 0x22, 0x02, 0x04,
+-   0x00, 0x12, 0x02, 0x02, 0x00, 0x39, 0x02, 0x01, 0x00, 0x3d, 0x82, 0x00,
+-   0x80, 0x32, 0x81, 0x00, 0x80, 0xe2, 0x80, 0x00, 0x80, 0x1c, 0x40, 0x00,
+-   0x00, 0x01, 0x41, 0x00, 0x00, 0xfa, 0x20, 0x00, 0x00, 0x04, 0x10, 0x00,
+-   0x00, 0x78, 0x08, 0x00, 0x00, 0x10, 0x08, 0x1c, 0x00, 0x08, 0x10, 0x18,
+-   0x00, 0x04, 0x20, 0x14, 0x00, 0x04, 0x44, 0x04, 0x18, 0x04, 0x43, 0x02,
+-   0x20, 0x87, 0xe0, 0x01, 0xfc, 0x84, 0xd0, 0x00, 0x20, 0x82, 0x48, 0x00,
+-   0x18, 0x02, 0x47, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x81, 0x43, 0x00,
+-   0x00, 0x61, 0x3c, 0x00, 0x00, 0x1e, 0x00, 0x00};
+diff --git a/bitmaps/bsd/dwright1_bsd.xbm b/bitmaps/bsd/dwright1_bsd.xbm
+deleted file mode 100644
+index 49ec478..0000000
+--- a/bitmaps/bsd/dwright1_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwright1_bsd_width 32
+-#define dwright1_bsd_height 32
+-static char dwright1_bsd_bits[] = {
+- 0x00,0x00,0x0c,0x00,0x00,0x03,0x18,0x00,0x80,0x02,0x28,0x00,0x40,0x01,0x48,
+- 0x00,0x20,0xf1,0x47,0x00,0x20,0x0d,0x40,0x00,0x20,0x06,0x9b,0x00,0x20,0x80,
+- 0x64,0x00,0x20,0x40,0x44,0x00,0x40,0x40,0x48,0x00,0x80,0x40,0x9c,0x00,0x00,
+- 0x41,0xbc,0x00,0x00,0x81,0x4c,0x01,0x00,0x01,0x47,0x01,0x00,0x02,0x38,0x09,
+- 0x00,0x82,0x80,0x24,0x00,0x04,0x5f,0x14,0x00,0x08,0x20,0x48,0x00,0x10,0x1e,
+- 0x34,0x00,0x10,0x08,0x02,0x00,0x08,0x10,0x01,0x00,0x04,0xf0,0x00,0x10,0x02,
+- 0x20,0x01,0x08,0x01,0x20,0x01,0xbc,0x10,0xe0,0x00,0xc8,0x08,0x20,0x00,0x10,
+- 0x09,0x20,0x00,0x00,0x06,0x22,0x00,0x00,0x08,0x12,0x00,0x00,0x08,0x14,0x00,
+- 0x00,0x10,0x0c,0x00,0x00,0xe0,0x07,0x00};
+diff --git a/bitmaps/bsd/dwright2_bsd.xbm b/bitmaps/bsd/dwright2_bsd.xbm
+deleted file mode 100644
+index b6c8941..0000000
+--- a/bitmaps/bsd/dwright2_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwright2_bsd_width 32
+-#define dwright2_bsd_height 32
+-static char dwright2_bsd_bits[] = {
+- 0x00,0x00,0x0c,0x00,0x00,0x03,0x18,0x00,0x80,0x02,0x28,0x00,0x40,0x01,0x48,
+- 0x00,0x20,0xf1,0x47,0x00,0x20,0x0d,0x40,0x00,0x20,0x06,0x9b,0x00,0x20,0x80,
+- 0x64,0x00,0x20,0x40,0x44,0x00,0x40,0x40,0x48,0x00,0x80,0x40,0x9c,0x00,0x00,
+- 0x41,0xbc,0x00,0x00,0x81,0x4c,0x01,0x00,0x01,0x47,0x01,0x00,0x02,0x38,0x01,
+- 0x00,0x82,0x80,0x00,0x00,0x04,0x5f,0x00,0x00,0x08,0x20,0x00,0x00,0x10,0x1e,
+- 0x00,0x38,0x10,0x08,0x00,0x18,0x08,0x10,0x00,0x28,0x04,0x20,0x00,0x20,0x22,
+- 0x20,0x00,0x40,0xc2,0x20,0x18,0x80,0x07,0xe1,0x04,0x00,0x0b,0x21,0x3f,0x00,
+- 0x12,0x41,0x04,0x00,0xe2,0x40,0x18,0x00,0x02,0x80,0x00,0x00,0xc2,0x81,0x00,
+- 0x00,0x3c,0x86,0x00,0x00,0x00,0x78,0x00};
+diff --git a/bitmaps/bsd/jare2_bsd.xbm b/bitmaps/bsd/jare2_bsd.xbm
+deleted file mode 100644
+index 3cf6bae..0000000
+--- a/bitmaps/bsd/jare2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define jare2_bsd_width 32
+-#define jare2_bsd_height 32
+-static unsigned char jare2_bsd_bits[] = {
+-   0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 0x14, 0x40, 0x01,
+-   0x00, 0x12, 0x80, 0x02, 0x00, 0xe2, 0x8f, 0x04, 0x00, 0x02, 0x90, 0x04,
+-   0x00, 0xd9, 0x60, 0x04, 0x00, 0x26, 0x01, 0x04, 0x00, 0x22, 0x02, 0x04,
+-   0x00, 0x12, 0x02, 0x02, 0x00, 0x39, 0x02, 0x01, 0x00, 0x3d, 0x82, 0x00,
+-   0x80, 0x32, 0x82, 0x00, 0x80, 0xe2, 0x81, 0x00, 0x80, 0x1c, 0x80, 0x00,
+-   0x00, 0x01, 0x41, 0x00, 0x00, 0xfa, 0x20, 0x00, 0x00, 0x04, 0x10, 0x00,
+-   0x80, 0x38, 0x08, 0x00, 0x20, 0x21, 0x10, 0x00, 0x40, 0x11, 0x20, 0x00,
+-   0x90, 0x0c, 0x20, 0x10, 0x60, 0x03, 0x20, 0x38, 0x00, 0x8d, 0x21, 0x54,
+-   0x00, 0x71, 0x30, 0x10, 0x00, 0x3e, 0x28, 0x10, 0x00, 0x48, 0x64, 0x10,
+-   0x00, 0xc8, 0xe3, 0x10, 0x00, 0x86, 0xa0, 0x09, 0x00, 0x41, 0x40, 0x07,
+-   0x00, 0x41, 0x40, 0x00, 0x00, 0xbe, 0x3f, 0x00};
+diff --git a/bitmaps/bsd/kaki1_bsd.xbm b/bitmaps/bsd/kaki1_bsd.xbm
+deleted file mode 100644
+index 987a7ad..0000000
+--- a/bitmaps/bsd/kaki1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define kaki1_bsd_width 32
+-#define kaki1_bsd_height 32
+-static unsigned char kaki1_bsd_bits[] = {
+-   0x00, 0x80, 0xe3, 0x00, 0x00, 0x40, 0x42, 0x01, 0x00, 0x20, 0x41, 0x02,
+-   0x00, 0x20, 0x41, 0x04, 0x00, 0x90, 0x3f, 0x04, 0x00, 0x10, 0x10, 0x04,
+-   0x00, 0xd0, 0x00, 0x02, 0x00, 0x28, 0x01, 0x02, 0x00, 0x28, 0x02, 0x05,
+-   0x00, 0x28, 0x02, 0x04, 0x00, 0x78, 0x02, 0x04, 0x00, 0x7c, 0x02, 0x04,
+-   0x00, 0x62, 0x02, 0x04, 0x10, 0xe2, 0x01, 0x04, 0x28, 0x1c, 0x00, 0x02,
+-   0x44, 0x04, 0x02, 0x02, 0x22, 0xf8, 0x01, 0x01, 0x11, 0x10, 0x80, 0x00,
+-   0x4a, 0xe1, 0x41, 0x00, 0x84, 0x02, 0x41, 0x00, 0x50, 0x82, 0x40, 0x00,
+-   0x20, 0x62, 0x80, 0x00, 0x10, 0x59, 0x82, 0x00, 0xe0, 0xc6, 0xa1, 0x00,
+-   0x00, 0x46, 0x90, 0x00, 0x00, 0x7a, 0x88, 0x00, 0x00, 0xc2, 0x87, 0x00,
+-   0x00, 0x82, 0x80, 0x01, 0x00, 0xe1, 0x83, 0x03, 0x80, 0x50, 0x40, 0x22,
+-   0x60, 0x50, 0x40, 0x64, 0x18, 0xe0, 0x7f, 0xf8};
+diff --git a/bitmaps/bsd/kaki2_bsd.xbm b/bitmaps/bsd/kaki2_bsd.xbm
+deleted file mode 100644
+index d2ec387..0000000
+--- a/bitmaps/bsd/kaki2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define kaki2_bsd_width 32
+-#define kaki2_bsd_height 32
+-static unsigned char kaki2_bsd_bits[] = {
+-   0x00, 0x80, 0xe3, 0x00, 0x00, 0x40, 0x42, 0x01, 0x00, 0x20, 0x41, 0x02,
+-   0x00, 0x20, 0x41, 0x04, 0x00, 0x90, 0x3f, 0x04, 0x00, 0x10, 0x10, 0x04,
+-   0x00, 0xd0, 0x00, 0x02, 0x00, 0x28, 0x01, 0x02, 0x00, 0x28, 0x02, 0x05,
+-   0x00, 0x28, 0x02, 0x04, 0x00, 0x78, 0x02, 0x04, 0x00, 0x7c, 0x02, 0x04,
+-   0x00, 0x62, 0x02, 0x04, 0x10, 0xe2, 0x01, 0x04, 0x28, 0x1c, 0x00, 0x02,
+-   0x44, 0x04, 0x02, 0x02, 0xa2, 0xf8, 0x01, 0x01, 0x91, 0x10, 0x80, 0x00,
+-   0x8a, 0xe0, 0x41, 0x00, 0x44, 0x0c, 0x41, 0x00, 0xb8, 0xf2, 0x40, 0x00,
+-   0x00, 0x43, 0x80, 0x00, 0x00, 0x43, 0xa2, 0x00, 0x00, 0xcd, 0xa1, 0x00,
+-   0x00, 0x71, 0xa0, 0x00, 0x00, 0x41, 0x90, 0x00, 0x80, 0xc0, 0x8f, 0x00,
+-   0x80, 0x80, 0x80, 0x01, 0x40, 0xe0, 0x83, 0x03, 0x20, 0x50, 0x40, 0x22,
+-   0x10, 0x50, 0x40, 0x64, 0x08, 0xe0, 0x7f, 0xf8};
+diff --git a/bitmaps/bsd/left1_bsd.xbm b/bitmaps/bsd/left1_bsd.xbm
+deleted file mode 100644
+index 50bc50b..0000000
+--- a/bitmaps/bsd/left1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define left1_bsd_width 32
+-#define left1_bsd_height 32
+-static unsigned char left1_bsd_bits[] = {
+-   0x00, 0x60, 0x0c, 0x00, 0x00, 0x50, 0x14, 0x00, 0x00, 0x48, 0x12, 0x00,
+-   0x00, 0xf8, 0x11, 0x00, 0x00, 0x84, 0x10, 0x00, 0x00, 0x02, 0x10, 0x00,
+-   0x00, 0x07, 0x18, 0x00, 0x00, 0x05, 0x28, 0x00, 0x80, 0x08, 0x44, 0x00,
+-   0x80, 0x08, 0x40, 0x00, 0x80, 0x0b, 0x40, 0x00, 0xc0, 0x0b, 0x40, 0x00,
+-   0x20, 0x0b, 0x40, 0x00, 0x20, 0x06, 0x20, 0x00, 0xc0, 0x01, 0x20, 0x00,
+-   0x40, 0x10, 0x10, 0x00, 0x88, 0x0f, 0x08, 0x00, 0x12, 0x01, 0x04, 0x00,
+-   0x14, 0x3e, 0x04, 0x00, 0x09, 0x20, 0x04, 0x00, 0x16, 0x10, 0x08, 0x00,
+-   0x20, 0x0f, 0x08, 0x00, 0xc0, 0x08, 0x08, 0x00, 0x80, 0x84, 0x10, 0x00,
+-   0x80, 0x84, 0x10, 0x00, 0x00, 0x07, 0x11, 0x00, 0x00, 0x04, 0x31, 0x00,
+-   0x00, 0x02, 0xf9, 0x20, 0xc0, 0x01, 0xde, 0x43, 0x20, 0x80, 0x23, 0xfe,
+-   0x20, 0xc0, 0x20, 0x40, 0xc0, 0x3f, 0x1f, 0x20};
+diff --git a/bitmaps/bsd/left2_bsd.xbm b/bitmaps/bsd/left2_bsd.xbm
+deleted file mode 100644
+index 49983b7..0000000
+--- a/bitmaps/bsd/left2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define left2_bsd_width 32
+-#define left2_bsd_height 32
+-static unsigned char left2_bsd_bits[] = {
+-   0x00, 0x70, 0x1c, 0x00, 0x00, 0x48, 0x28, 0x00, 0x00, 0x24, 0x48, 0x00,
+-   0x00, 0x24, 0x88, 0x00, 0x00, 0xf2, 0x87, 0x00, 0x00, 0x02, 0x82, 0x00,
+-   0x00, 0x1a, 0x40, 0x00, 0x00, 0x25, 0x40, 0x00, 0x00, 0x45, 0xa0, 0x00,
+-   0x00, 0x45, 0x80, 0x00, 0x00, 0x4f, 0x80, 0x00, 0x80, 0x4f, 0x80, 0x00,
+-   0x40, 0x4c, 0x80, 0x00, 0x40, 0x3c, 0x80, 0x00, 0x80, 0x03, 0x40, 0x00,
+-   0x80, 0x40, 0x40, 0x00, 0x00, 0x3f, 0x20, 0x00, 0x00, 0x02, 0x10, 0x00,
+-   0x00, 0x3c, 0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x10, 0x08, 0x70,
+-   0x00, 0x10, 0x10, 0x60, 0x30, 0x08, 0x10, 0x50, 0x40, 0x48, 0x10, 0x08,
+-   0xf8, 0x3f, 0x20, 0x06, 0x40, 0x04, 0xe4, 0x03, 0x30, 0x04, 0xe2, 0x01,
+-   0x80, 0xcf, 0x41, 0x00, 0x40, 0x30, 0x40, 0x00, 0x40, 0xc0, 0x43, 0x00,
+-   0x80, 0x7f, 0x20, 0x00, 0x00, 0x80, 0x1f, 0x00};
+diff --git a/bitmaps/bsd/ltogi1_bsd.xbm b/bitmaps/bsd/ltogi1_bsd.xbm
+deleted file mode 100644
+index f1188a5..0000000
+--- a/bitmaps/bsd/ltogi1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define ltogi1_bsd_width 32
+-#define ltogi1_bsd_height 32
+-static unsigned char ltogi1_bsd_bits[] = {
+-   0x00, 0x60, 0x0c, 0x00, 0x00, 0x50, 0x14, 0x00, 0x00, 0x48, 0x12, 0x00,
+-   0x00, 0xf8, 0x11, 0x00, 0x00, 0x84, 0x10, 0x00, 0x00, 0x02, 0x10, 0x00,
+-   0x00, 0x07, 0x18, 0x00, 0x00, 0x05, 0x28, 0x00, 0x80, 0x08, 0x44, 0x00,
+-   0x80, 0x08, 0x40, 0x00, 0x80, 0x0b, 0x40, 0x00, 0xc0, 0x0b, 0x40, 0x00,
+-   0x20, 0x0b, 0x40, 0x00, 0x20, 0x06, 0x20, 0x00, 0xc0, 0x01, 0x20, 0x00,
+-   0x40, 0x10, 0x10, 0x00, 0x88, 0x0f, 0x08, 0x00, 0x12, 0x01, 0x04, 0x00,
+-   0x14, 0x3e, 0x04, 0x00, 0x09, 0x20, 0x04, 0x00, 0x16, 0x10, 0x08, 0x00,
+-   0x20, 0x0f, 0x08, 0x00, 0xc0, 0x08, 0x08, 0x00, 0x80, 0x84, 0x10, 0x00,
+-   0x80, 0x84, 0x10, 0x00, 0x00, 0x07, 0x11, 0x00, 0x00, 0x04, 0x31, 0x00,
+-   0x00, 0x02, 0xf9, 0x20, 0xc0, 0x01, 0xde, 0x43, 0x20, 0x80, 0x23, 0xfe,
+-   0x20, 0xc0, 0x20, 0x40, 0xc0, 0x3f, 0x1f, 0x20};
+diff --git a/bitmaps/bsd/ltogi2_bsd.xbm b/bitmaps/bsd/ltogi2_bsd.xbm
+deleted file mode 100644
+index d49f8e5..0000000
+--- a/bitmaps/bsd/ltogi2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define ltogi2_bsd_width 32
+-#define ltogi2_bsd_height 32
+-static unsigned char ltogi2_bsd_bits[] = {
+-   0x00, 0x70, 0x1c, 0x00, 0x00, 0x48, 0x28, 0x00, 0x00, 0x24, 0x48, 0x00,
+-   0x00, 0x24, 0x88, 0x00, 0x00, 0xf2, 0x87, 0x00, 0x00, 0x02, 0x82, 0x00,
+-   0x00, 0x1a, 0x40, 0x00, 0x00, 0x25, 0x40, 0x00, 0x00, 0x45, 0xa0, 0x00,
+-   0x00, 0x45, 0x80, 0x00, 0x00, 0x4f, 0x80, 0x00, 0x80, 0x4f, 0x80, 0x00,
+-   0x40, 0x4c, 0x80, 0x00, 0x40, 0x3c, 0x80, 0x00, 0x80, 0x03, 0x40, 0x00,
+-   0x80, 0x40, 0x40, 0x00, 0x00, 0x3f, 0x20, 0x00, 0x00, 0x02, 0x10, 0x00,
+-   0x00, 0x3c, 0x08, 0x00, 0x00, 0x20, 0x08, 0x00, 0x00, 0x10, 0x08, 0x70,
+-   0x00, 0x10, 0x10, 0x60, 0x30, 0x08, 0x10, 0x50, 0x40, 0x48, 0x10, 0x08,
+-   0xf8, 0x3f, 0x20, 0x06, 0x40, 0x04, 0xe4, 0x03, 0x30, 0x04, 0xe2, 0x01,
+-   0x80, 0xcf, 0x41, 0x00, 0x40, 0x30, 0x40, 0x00, 0x40, 0xc0, 0x43, 0x00,
+-   0x80, 0x7f, 0x20, 0x00, 0x00, 0x80, 0x1f, 0x00};
+diff --git a/bitmaps/bsd/mati2_bsd.xbm b/bitmaps/bsd/mati2_bsd.xbm
+deleted file mode 100644
+index 02a833f..0000000
+--- a/bitmaps/bsd/mati2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define mati2_bsd_width 32
+-#define mati2_bsd_height 32
+-static unsigned char mati2_bsd_bits[] = {
+-   0x00, 0x30, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 0x14, 0x40, 0x01,
+-   0x00, 0x12, 0x80, 0x02, 0x00, 0xe2, 0x8f, 0x04, 0x00, 0x02, 0x90, 0x04,
+-   0x00, 0xd9, 0x60, 0x04, 0x00, 0x26, 0x01, 0x04, 0x00, 0x22, 0x02, 0x04,
+-   0x00, 0x12, 0x02, 0x02, 0x00, 0x39, 0x02, 0x01, 0x00, 0x3d, 0x82, 0x00,
+-   0x80, 0x32, 0x82, 0x00, 0x80, 0xe2, 0x81, 0x00, 0x90, 0x1c, 0x80, 0x00,
+-   0x24, 0x01, 0x41, 0x00, 0x28, 0xfa, 0x20, 0x00, 0x12, 0x04, 0x10, 0x00,
+-   0x2c, 0x38, 0x08, 0x00, 0x40, 0x23, 0x10, 0x00, 0x80, 0x14, 0x20, 0x00,
+-   0x40, 0x78, 0x22, 0x00, 0x40, 0x84, 0x21, 0x00, 0x80, 0x07, 0x20, 0x00,
+-   0x00, 0x0c, 0x20, 0x00, 0x00, 0xf4, 0x27, 0x00, 0x00, 0x08, 0x20, 0x00,
+-   0x00, 0x08, 0x60, 0xe0, 0x00, 0x86, 0x61, 0xc0, 0x00, 0x41, 0xc0, 0xa0,
+-   0x00, 0x41, 0x40, 0x11, 0x00, 0xbe, 0x3f, 0x0e};
+diff --git a/bitmaps/bsd/mati3_bsd.xbm b/bitmaps/bsd/mati3_bsd.xbm
+deleted file mode 100644
+index f6753ab..0000000
+--- a/bitmaps/bsd/mati3_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define mati3_bsd_width 32
+-#define mati3_bsd_height 32
+-static unsigned char mati3_bsd_bits[] = {
+-   0x08, 0x30, 0x00, 0x00, 0x08, 0x18, 0xe0, 0x00, 0x10, 0x14, 0x40, 0x01,
+-   0x21, 0xe2, 0x4f, 0x02, 0x22, 0x02, 0x30, 0x04, 0x12, 0x02, 0x00, 0x04,
+-   0x09, 0x06, 0x00, 0x02, 0x09, 0x09, 0x07, 0x01, 0x12, 0x9d, 0x80, 0x00,
+-   0xa0, 0x22, 0x80, 0x00, 0x80, 0xfe, 0x81, 0x00, 0x80, 0x83, 0x82, 0x00,
+-   0x80, 0x00, 0x84, 0x00, 0x00, 0x01, 0x44, 0x00, 0x00, 0x7a, 0x44, 0x00,
+-   0x00, 0x86, 0x22, 0x00, 0xc0, 0x05, 0x91, 0x03, 0x20, 0xfa, 0x70, 0x04,
+-   0x20, 0x00, 0x00, 0x04, 0x40, 0x00, 0x00, 0x04, 0xa0, 0x01, 0x00, 0x03,
+-   0x10, 0x02, 0x80, 0x00, 0x08, 0x02, 0x40, 0x00, 0x04, 0x02, 0x20, 0x00,
+-   0x00, 0x02, 0x20, 0x00, 0x00, 0x02, 0x60, 0x00, 0x00, 0x02, 0xe0, 0x00,
+-   0x00, 0x02, 0x20, 0x03, 0x00, 0x82, 0x20, 0x4c, 0x00, 0x42, 0x21, 0xf0,
+-   0x00, 0x22, 0x11, 0xe0, 0x00, 0x1c, 0x0e, 0x00};
+diff --git a/bitmaps/bsd/right1_bsd.xbm b/bitmaps/bsd/right1_bsd.xbm
+deleted file mode 100644
+index b6b0899..0000000
+--- a/bitmaps/bsd/right1_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define right1_bsd_width 32
+-#define right1_bsd_height 32
+-static char right1_bsd_bits[] = {
+- 0x00,0x30,0x06,0x00,0x00,0x28,0x0a,0x00,0x00,0x48,0x12,0x00,0x00,0x88,0x1f,
+- 0x00,0x00,0x08,0x21,0x00,0x00,0x08,0x40,0x00,0x00,0x18,0xe0,0x00,0x00,0x14,
+- 0xa0,0x00,0x00,0x22,0x10,0x01,0x00,0x02,0x10,0x01,0x00,0x02,0xd0,0x01,0x00,
+- 0x02,0xd0,0x03,0x00,0x02,0xd0,0x04,0x00,0x04,0x60,0x04,0x00,0x04,0x80,0x03,
+- 0x00,0x08,0x08,0x02,0x00,0x10,0xf0,0x11,0x00,0x20,0x80,0x48,0x00,0x20,0x7c,
+- 0x28,0x00,0x20,0x04,0x90,0x00,0x10,0x08,0x68,0x00,0x10,0xf0,0x04,0x00,0x10,
+- 0x10,0x03,0x00,0x08,0x21,0x01,0x00,0x08,0x21,0x01,0x00,0x88,0xe0,0x00,0x00,
+- 0x8c,0x20,0x00,0x04,0x9f,0x40,0x00,0xc2,0x7b,0x80,0x03,0x7f,0xc4,0x01,0x04,
+- 0x02,0x04,0x03,0x04,0x04,0xf8,0xfc,0x03};
+diff --git a/bitmaps/bsd/right2_bsd.xbm b/bitmaps/bsd/right2_bsd.xbm
+deleted file mode 100644
+index c1dbb53..0000000
+--- a/bitmaps/bsd/right2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define right2_bsd_width 32
+-#define right2_bsd_height 32
+-static unsigned char right2_bsd_bits[] = {
+-   0x00, 0x38, 0x0e, 0x00, 0x00, 0x14, 0x12, 0x00, 0x00, 0x12, 0x24, 0x00,
+-   0x00, 0x11, 0x24, 0x00, 0x00, 0xe1, 0x4f, 0x00, 0x00, 0x41, 0x40, 0x00,
+-   0x00, 0x02, 0x58, 0x00, 0x00, 0x02, 0xa4, 0x00, 0x00, 0x05, 0xa2, 0x00,
+-   0x00, 0x01, 0xa2, 0x00, 0x00, 0x01, 0xf2, 0x00, 0x00, 0x01, 0xf2, 0x01,
+-   0x00, 0x01, 0x32, 0x02, 0x00, 0x01, 0x3c, 0x02, 0x00, 0x02, 0xc0, 0x01,
+-   0x00, 0x02, 0x02, 0x01, 0x00, 0x04, 0xfc, 0x00, 0x00, 0x08, 0x40, 0x00,
+-   0x00, 0x10, 0x3c, 0x00, 0x00, 0x10, 0x04, 0x00, 0x0e, 0x10, 0x08, 0x00,
+-   0x06, 0x08, 0x08, 0x00, 0x0a, 0x08, 0x10, 0x0c, 0x10, 0x08, 0x12, 0x02,
+-   0x60, 0x04, 0xfc, 0x1f, 0xc0, 0x27, 0x20, 0x02, 0x80, 0x47, 0x20, 0x0c,
+-   0x00, 0x82, 0xf3, 0x01, 0x00, 0x02, 0x0c, 0x02, 0x00, 0xc2, 0x03, 0x02,
+-   0x00, 0x04, 0xfe, 0x01, 0x00, 0xf8, 0x01, 0x00};
+diff --git a/bitmaps/bsd/rtogi1_bsd.xbm b/bitmaps/bsd/rtogi1_bsd.xbm
+deleted file mode 100644
+index a8100b8..0000000
+--- a/bitmaps/bsd/rtogi1_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define rtogi1_bsd_width 32
+-#define rtogi1_bsd_height 32
+-static char rtogi1_bsd_bits[] = {
+- 0x00,0x30,0x06,0x00,0x00,0x28,0x0a,0x00,0x00,0x48,0x12,0x00,0x00,0x88,0x1f,
+- 0x00,0x00,0x08,0x21,0x00,0x00,0x08,0x40,0x00,0x00,0x18,0xe0,0x00,0x00,0x14,
+- 0xa0,0x00,0x00,0x22,0x10,0x01,0x00,0x02,0x10,0x01,0x00,0x02,0xd0,0x01,0x00,
+- 0x02,0xd0,0x03,0x00,0x02,0xd0,0x04,0x00,0x04,0x60,0x04,0x00,0x04,0x80,0x03,
+- 0x00,0x08,0x08,0x02,0x00,0x10,0xf0,0x11,0x00,0x20,0x80,0x48,0x00,0x20,0x7c,
+- 0x28,0x00,0x20,0x04,0x90,0x00,0x10,0x08,0x68,0x00,0x10,0xf0,0x04,0x00,0x10,
+- 0x10,0x03,0x00,0x08,0x21,0x01,0x00,0x08,0x21,0x01,0x00,0x88,0xe0,0x00,0x00,
+- 0x8c,0x20,0x00,0x04,0x9f,0x40,0x00,0xc2,0x7b,0x80,0x03,0x7f,0xc4,0x01,0x04,
+- 0x02,0x04,0x03,0x04,0x04,0xf8,0xfc,0x03};
+diff --git a/bitmaps/bsd/rtogi2_bsd.xbm b/bitmaps/bsd/rtogi2_bsd.xbm
+deleted file mode 100644
+index 03ffc42..0000000
+--- a/bitmaps/bsd/rtogi2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define rtogi2_bsd_width 32
+-#define rtogi2_bsd_height 32
+-static unsigned char rtogi2_bsd_bits[] = {
+-   0x00, 0x38, 0x0e, 0x00, 0x00, 0x14, 0x12, 0x00, 0x00, 0x12, 0x24, 0x00,
+-   0x00, 0x11, 0x24, 0x00, 0x00, 0xe1, 0x4f, 0x00, 0x00, 0x41, 0x40, 0x00,
+-   0x00, 0x02, 0x58, 0x00, 0x00, 0x02, 0xa4, 0x00, 0x00, 0x05, 0xa2, 0x00,
+-   0x00, 0x01, 0xa2, 0x00, 0x00, 0x01, 0xf2, 0x00, 0x00, 0x01, 0xf2, 0x01,
+-   0x00, 0x01, 0x32, 0x02, 0x00, 0x01, 0x3c, 0x02, 0x00, 0x02, 0xc0, 0x01,
+-   0x00, 0x02, 0x02, 0x01, 0x00, 0x04, 0xfc, 0x00, 0x00, 0x08, 0x40, 0x00,
+-   0x00, 0x10, 0x3c, 0x00, 0x00, 0x10, 0x04, 0x00, 0x0e, 0x10, 0x08, 0x00,
+-   0x06, 0x08, 0x08, 0x00, 0x0a, 0x08, 0x10, 0x0c, 0x10, 0x08, 0x12, 0x02,
+-   0x60, 0x04, 0xfc, 0x1f, 0xc0, 0x27, 0x20, 0x02, 0x80, 0x47, 0x20, 0x0c,
+-   0x00, 0x82, 0xf3, 0x01, 0x00, 0x02, 0x0c, 0x02, 0x00, 0xc2, 0x03, 0x02,
+-   0x00, 0x04, 0xfe, 0x01, 0x00, 0xf8, 0x01, 0x00};
+diff --git a/bitmaps/bsd/sleep1_bsd.xbm b/bitmaps/bsd/sleep1_bsd.xbm
+deleted file mode 100644
+index 2a8da17..0000000
+--- a/bitmaps/bsd/sleep1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define sleep1_bsd_width 32
+-#define sleep1_bsd_height 32
+-static unsigned char sleep1_bsd_bits[] = {
+-   0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x28,
+-   0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x3e, 0x28, 0x00, 0x00, 0x10, 0x04,
+-   0x00, 0x00, 0x08, 0xfe, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00,
+-   0x00, 0x00, 0x13, 0x00, 0x00, 0x80, 0xf2, 0x00, 0x00, 0xc0, 0x1a, 0x03,
+-   0xe0, 0xa1, 0x14, 0x06, 0x1e, 0xa6, 0x14, 0x0b, 0x09, 0xa8, 0xf8, 0x30,
+-   0x09, 0x30, 0x01, 0x50, 0x01, 0x20, 0x00, 0x90, 0x01, 0x00, 0x00, 0xf0,
+-   0x81, 0x01, 0x00, 0x18, 0x61, 0x00, 0x00, 0x10, 0x11, 0x00, 0x00, 0x20,
+-   0x11, 0x70, 0x80, 0xc0, 0x1e, 0x8e, 0x00, 0x83, 0xe0, 0x01, 0x01, 0x7e,
+-   0x00, 0x00, 0x06, 0x01, 0x00, 0x00, 0xf8, 0x00};
+diff --git a/bitmaps/bsd/sleep2_bsd.xbm b/bitmaps/bsd/sleep2_bsd.xbm
+deleted file mode 100644
+index d8c7b43..0000000
+--- a/bitmaps/bsd/sleep2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define sleep2_bsd_width 32
+-#define sleep2_bsd_height 32
+-static unsigned char sleep2_bsd_bits[] = {
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x00, 0x00, 0x00, 0x08,
+-   0x00, 0x00, 0x1e, 0x06, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x84, 0x1f,
+-   0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00,
+-   0x00, 0x00, 0x13, 0x00, 0x00, 0x80, 0xf2, 0x00, 0x00, 0xc0, 0x1a, 0x03,
+-   0x00, 0xa0, 0x14, 0x06, 0x06, 0xa0, 0x14, 0x0b, 0xe9, 0xa3, 0xf8, 0x30,
+-   0x19, 0x2c, 0x01, 0xd0, 0x09, 0x30, 0x00, 0x90, 0x01, 0x00, 0x00, 0x70,
+-   0x81, 0x01, 0x00, 0x18, 0x61, 0x00, 0x00, 0x10, 0x11, 0x00, 0x00, 0xa0,
+-   0x11, 0x00, 0x80, 0xc0, 0x1e, 0x7e, 0x00, 0x63, 0xe0, 0x81, 0x01, 0x1e,
+-   0x00, 0x00, 0x06, 0x03, 0x00, 0x00, 0xf8, 0x00};
+diff --git a/bitmaps/bsd/space_bsd.xbm b/bitmaps/bsd/space_bsd.xbm
+deleted file mode 100644
+index 6ff4ab1..0000000
+--- a/bitmaps/bsd/space_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define space_bsd_width 32
+-#define space_bsd_height 32
+-static char space_bsd_bits[] = {
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+diff --git a/bitmaps/bsd/up1_bsd.xbm b/bitmaps/bsd/up1_bsd.xbm
+deleted file mode 100644
+index e7759c4..0000000
+--- a/bitmaps/bsd/up1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define up1_bsd_width 32
+-#define up1_bsd_height 32
+-static unsigned char up1_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x80, 0x00,
+-   0x80, 0x00, 0x80, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x04, 0x10, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x80, 0x00, 0x50, 0x00,
+-   0x80, 0x00, 0xa0, 0x00, 0x80, 0x04, 0x20, 0x01, 0x00, 0x07, 0x20, 0x02,
+-   0x00, 0x84, 0x20, 0x00, 0x00, 0xc4, 0x20, 0x00, 0x00, 0xf8, 0x41, 0x00,
+-   0x00, 0x40, 0x41, 0x00, 0x00, 0x40, 0x3e, 0x00, 0x00, 0x28, 0x00, 0x00,
+-   0x00, 0x18, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00};
+diff --git a/bitmaps/bsd/up2_bsd.xbm b/bitmaps/bsd/up2_bsd.xbm
+deleted file mode 100644
+index 10cbf1e..0000000
+--- a/bitmaps/bsd/up2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define up2_bsd_width 32
+-#define up2_bsd_height 32
+-static unsigned char up2_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x80, 0x00,
+-   0x80, 0x00, 0x80, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x04, 0x10, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x60, 0x00, 0x00, 0x05, 0xa0, 0x00,
+-   0x00, 0x02, 0xa0, 0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x02, 0x70, 0x00,
+-   0x00, 0x82, 0x10, 0x00, 0x00, 0x82, 0x11, 0x00, 0x00, 0xc1, 0x1f, 0x00,
+-   0x00, 0x41, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00,
+-   0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00};
+diff --git a/bitmaps/bsd/upleft1_bsd.xbm b/bitmaps/bsd/upleft1_bsd.xbm
+deleted file mode 100644
+index 7ad2604..0000000
+--- a/bitmaps/bsd/upleft1_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upleft1_bsd_width 32
+-#define upleft1_bsd_height 32
+-static char upleft1_bsd_bits[] = {
+- 0x00,0x00,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x05,0x50,0x00,0x80,0x02,0x90,
+- 0x00,0x40,0xe2,0x8f,0x00,0x40,0x1a,0x90,0x00,0x40,0x0c,0x20,0x01,0x40,0x00,
+- 0xc0,0x00,0x40,0x00,0xc0,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x00,
+- 0x01,0x80,0x00,0x00,0x01,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x40,0x00,
+- 0x80,0x00,0x40,0x00,0x00,0x01,0x20,0x00,0x00,0x02,0x10,0x00,0x00,0x0c,0x08,
+- 0x00,0x20,0x10,0x08,0x00,0x48,0x08,0x30,0x00,0x50,0x04,0x50,0x00,0x24,0x02,
+- 0x90,0x00,0x58,0x01,0xa0,0x00,0x80,0x10,0x60,0x00,0x80,0x08,0x20,0x20,0x00,
+- 0x05,0x20,0x40,0x00,0x06,0x28,0xf0,0x00,0x08,0x38,0x4f,0x00,0x08,0xf4,0x20,
+- 0x00,0x10,0x0c,0x00,0x00,0xe0,0x03,0x00};
+diff --git a/bitmaps/bsd/upleft2_bsd.xbm b/bitmaps/bsd/upleft2_bsd.xbm
+deleted file mode 100644
+index d609aac..0000000
+--- a/bitmaps/bsd/upleft2_bsd.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upleft2_bsd_width 32
+-#define upleft2_bsd_height 32
+-static char upleft2_bsd_bits[] = {
+- 0x00,0x00,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x05,0x50,0x00,0x80,0x02,0x90,
+- 0x00,0x40,0xe2,0x8f,0x00,0x40,0x1a,0x90,0x00,0x40,0x0c,0x20,0x01,0x40,0x00,
+- 0xc0,0x00,0x40,0x00,0xc0,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x00,
+- 0x01,0x80,0x00,0x00,0x01,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x40,0x00,
+- 0x80,0x00,0x40,0x00,0x00,0x01,0x20,0x00,0x00,0x02,0x10,0x00,0x00,0x0c,0x08,
+- 0x00,0x00,0x10,0x08,0x00,0x00,0x08,0x10,0x00,0x00,0x04,0x10,0x00,0x00,0x04,
+- 0x10,0x00,0x60,0x44,0x20,0x00,0x80,0x44,0x20,0x00,0xf0,0xe7,0x20,0x00,0x80,
+- 0x44,0x20,0x00,0x60,0x3a,0x44,0x00,0x00,0x01,0x4c,0x38,0x00,0xc2,0x53,0x30,
+- 0x00,0x3c,0x22,0x28,0x00,0x00,0xdc,0x07};
+diff --git a/bitmaps/bsd/upright1_bsd.xbm b/bitmaps/bsd/upright1_bsd.xbm
+deleted file mode 100644
+index ac2b199..0000000
+--- a/bitmaps/bsd/upright1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define upright1_bsd_width 32
+-#define upright1_bsd_height 32
+-static unsigned char upright1_bsd_bits[] = {
+-   0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x60, 0x00, 0x00, 0x0a, 0xa0, 0x00,
+-   0x00, 0x09, 0x40, 0x01, 0x00, 0xf1, 0x47, 0x02, 0x00, 0x09, 0x58, 0x02,
+-   0x80, 0x04, 0x30, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02,
+-   0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x00,
+-   0x00, 0x01, 0x80, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01,
+-   0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x80, 0x00, 0x00, 0x08, 0x40, 0x00,
+-   0x00, 0x10, 0x30, 0x00, 0x00, 0x10, 0x08, 0x04, 0x00, 0x0c, 0x10, 0x12,
+-   0x00, 0x0a, 0x20, 0x0a, 0x00, 0x09, 0x40, 0x24, 0x00, 0x05, 0x80, 0x1a,
+-   0x00, 0x06, 0x08, 0x01, 0x04, 0x04, 0x10, 0x01, 0x02, 0x04, 0xa0, 0x00,
+-   0x0f, 0x14, 0x60, 0x00, 0xf2, 0x1c, 0x10, 0x00, 0x04, 0x2f, 0x10, 0x00,
+-   0x00, 0x30, 0x08, 0x00, 0x00, 0xc0, 0x07, 0x00};
+diff --git a/bitmaps/bsd/upright2_bsd.xbm b/bitmaps/bsd/upright2_bsd.xbm
+deleted file mode 100644
+index e6a10d2..0000000
+--- a/bitmaps/bsd/upright2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define upright2_bsd_width 32
+-#define upright2_bsd_height 32
+-static unsigned char upright2_bsd_bits[] = {
+-   0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x60, 0x00, 0x00, 0x0a, 0xa0, 0x00,
+-   0x00, 0x09, 0x40, 0x01, 0x00, 0xf1, 0x47, 0x02, 0x00, 0x09, 0x58, 0x02,
+-   0x80, 0x04, 0x30, 0x02, 0x00, 0x03, 0x00, 0x02, 0x00, 0x03, 0x00, 0x02,
+-   0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x80, 0x00,
+-   0x00, 0x01, 0x80, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01,
+-   0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x80, 0x00, 0x00, 0x08, 0x40, 0x00,
+-   0x00, 0x10, 0x30, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x08, 0x10, 0x00,
+-   0x00, 0x08, 0x20, 0x00, 0x00, 0x08, 0x20, 0x00, 0x00, 0x04, 0x22, 0x06,
+-   0x00, 0x04, 0x22, 0x01, 0x00, 0x04, 0xe7, 0x0f, 0x00, 0x04, 0x22, 0x01,
+-   0x00, 0x22, 0x5c, 0x06, 0x1c, 0x32, 0x80, 0x00, 0x0c, 0xca, 0x43, 0x00,
+-   0x14, 0x44, 0x3c, 0x00, 0xe0, 0x3b, 0x00, 0x00};
+diff --git a/bitmaps/bsd/utogi1_bsd.xbm b/bitmaps/bsd/utogi1_bsd.xbm
+deleted file mode 100644
+index 0cf1616..0000000
+--- a/bitmaps/bsd/utogi1_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define utogi1_bsd_width 32
+-#define utogi1_bsd_height 32
+-static unsigned char utogi1_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x80, 0x00,
+-   0x80, 0x00, 0x80, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x04, 0x10, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x80, 0x00, 0x50, 0x00,
+-   0x80, 0x00, 0xa0, 0x00, 0x80, 0x04, 0x20, 0x01, 0x00, 0x07, 0x20, 0x02,
+-   0x00, 0x84, 0x20, 0x00, 0x00, 0xc4, 0x20, 0x00, 0x00, 0xf8, 0x41, 0x00,
+-   0x00, 0x40, 0x41, 0x00, 0x00, 0x40, 0x3e, 0x00, 0x00, 0x28, 0x00, 0x00,
+-   0x00, 0x18, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00};
+diff --git a/bitmaps/bsd/utogi2_bsd.xbm b/bitmaps/bsd/utogi2_bsd.xbm
+deleted file mode 100644
+index 0faf6f7..0000000
+--- a/bitmaps/bsd/utogi2_bsd.xbm
++++ /dev/null
+@@ -1,14 +0,0 @@
+-#define utogi2_bsd_width 32
+-#define utogi2_bsd_height 32
+-static unsigned char utogi2_bsd_bits[] = {
+-   0x00, 0x06, 0x30, 0x00, 0x00, 0x05, 0x50, 0x00, 0x80, 0x02, 0xa0, 0x00,
+-   0x40, 0x02, 0x20, 0x01, 0x40, 0xfa, 0x2f, 0x01, 0x40, 0x04, 0x10, 0x01,
+-   0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x80, 0x00, 0x80, 0x00,
+-   0x80, 0x00, 0x80, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x04, 0x10, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 0x02, 0x20, 0x00,
+-   0x00, 0x01, 0x40, 0x00, 0x00, 0x01, 0x60, 0x00, 0x00, 0x05, 0xa0, 0x00,
+-   0x00, 0x02, 0xa0, 0x00, 0x00, 0x02, 0x90, 0x00, 0x00, 0x02, 0x70, 0x00,
+-   0x00, 0x82, 0x10, 0x00, 0x00, 0x82, 0x11, 0x00, 0x00, 0xc1, 0x1f, 0x00,
+-   0x00, 0x41, 0x01, 0x00, 0x00, 0x3e, 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00,
+-   0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00};
+diff --git a/bitmasks/bsd/COPYRIGHT b/bitmasks/bsd/COPYRIGHT
+deleted file mode 100644
+index b8b3a41..0000000
+--- a/bitmasks/bsd/COPYRIGHT
++++ /dev/null
+@@ -1 +0,0 @@
+-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved.
+diff --git a/bitmasks/bsd/Makemask b/bitmasks/bsd/Makemask
+deleted file mode 100755
+index e5ed661..0000000
+--- a/bitmasks/bsd/Makemask
++++ /dev/null
+@@ -1,9 +0,0 @@
+-#!/bin/sh
+-rm -f *.xbm
+-cp -f ../../bitmaps/bsd/* .
+-ls *.xbm | sed 's/\(.*\)\.xbm/mv -f & \1_mask.xbm/' | sh
+-for i in *.xbm ; do
+-	f=`basename $i .xbm`
+-	sed 's/unsigned *//' $i | xbmtopbm | pbmmask | pbmtoxbm | sed "s/noname/$f/" > t
+-	mv -f t $i
+-done
+diff --git a/bitmasks/bsd/awake_bsd_mask.xbm b/bitmasks/bsd/awake_bsd_mask.xbm
+deleted file mode 100644
+index b85b6d8..0000000
+--- a/bitmasks/bsd/awake_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define awake_bsd_mask_width 32
+-#define awake_bsd_mask_height 32
+-static char awake_bsd_mask_bits[] = {
+- 0x00,0x86,0x30,0x00,0x08,0x87,0x70,0x10,0x90,0x03,0xe0,0x08,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xcc,0xff,
+- 0xff,0x31,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x08,0x90,0xff,0xff,0x10,0x88,0xff,0xff,0x00,
+- 0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x08,0xfe,0x3f,0x00,0x12,0xfc,0x1f,
+- 0x00,0x14,0xfc,0x1f,0x00,0x09,0xfe,0x3f,0x00,0x16,0xff,0x7f,0x00,0xa0,0xff,
+- 0xff,0x00,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0x80,
+- 0xff,0xdf,0x00,0x00,0xfc,0x1f,0x00,0x80,0xff,0xff,0x10,0xc0,0x7f,0xff,0x23,
+- 0xc0,0x7f,0xff,0x7d,0x80,0x3f,0xfe,0x20};
+diff --git a/bitmasks/bsd/bsd.include b/bitmasks/bsd/bsd.include
+deleted file mode 100644
+index 8f0298b..0000000
+--- a/bitmasks/bsd/bsd.include
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#include "awake_bsd.xbm"
+-#include "down1_bsd.xbm"
+-#include "down2_bsd.xbm"
+-#include "dtogi1_bsd.xbm"
+-#include "dtogi2_bsd.xbm"
+-#include "dwleft1_bsd.xbm"
+-#include "dwleft2_bsd.xbm"
+-#include "dwright1_bsd.xbm"
+-#include "dwright2_bsd.xbm"
+-#include "jare2_bsd.xbm"
+-#include "kaki1_bsd.xbm"
+-#include "kaki2_bsd.xbm"
+-#include "left1_bsd.xbm"
+-#include "left2_bsd.xbm"
+-#include "ltogi1_bsd.xbm"
+-#include "ltogi2_bsd.xbm"
+-#include "mati2_bsd.xbm"
+-#include "mati3_bsd.xbm"
+-#include "right1_bsd.xbm"
+-#include "right2_bsd.xbm"
+-#include "rtogi1_bsd.xbm"
+-#include "rtogi2_bsd.xbm"
+-#include "sleep1_bsd.xbm"
+-#include "sleep2_bsd.xbm"
+-#include "up1_bsd.xbm"
+-#include "up2_bsd.xbm"
+-#include "upleft1_bsd.xbm"
+-#include "upleft2_bsd.xbm"
+-#include "upright1_bsd.xbm"
+-#include "upright2_bsd.xbm"
+-#include "utogi1_bsd.xbm"
+-#include "utogi2_bsd.xbm"
+diff --git a/bitmasks/bsd/bsd.mask.include b/bitmasks/bsd/bsd.mask.include
+deleted file mode 100644
+index e7a56e7..0000000
+--- a/bitmasks/bsd/bsd.mask.include
++++ /dev/null
+@@ -1,32 +0,0 @@
+-#include "awake_bsd_mask.xbm"
+-#include "down1_bsd_mask.xbm"
+-#include "down2_bsd_mask.xbm"
+-#include "dtogi1_bsd_mask.xbm"
+-#include "dtogi2_bsd_mask.xbm"
+-#include "dwleft1_bsd_mask.xbm"
+-#include "dwleft2_bsd_mask.xbm"
+-#include "dwright1_bsd_mask.xbm"
+-#include "dwright2_bsd_mask.xbm"
+-#include "jare2_bsd_mask.xbm"
+-#include "kaki1_bsd_mask.xbm"
+-#include "kaki2_bsd_mask.xbm"
+-#include "left1_bsd_mask.xbm"
+-#include "left2_bsd_mask.xbm"
+-#include "ltogi1_bsd_mask.xbm"
+-#include "ltogi2_bsd_mask.xbm"
+-#include "mati2_bsd_mask.xbm"
+-#include "mati3_bsd_mask.xbm"
+-#include "right1_bsd_mask.xbm"
+-#include "right2_bsd_mask.xbm"
+-#include "rtogi1_bsd_mask.xbm"
+-#include "rtogi2_bsd_mask.xbm"
+-#include "sleep1_bsd_mask.xbm"
+-#include "sleep2_bsd_mask.xbm"
+-#include "up1_bsd_mask.xbm"
+-#include "up2_bsd_mask.xbm"
+-#include "upleft1_bsd_mask.xbm"
+-#include "upleft2_bsd_mask.xbm"
+-#include "upright1_bsd_mask.xbm"
+-#include "upright2_bsd_mask.xbm"
+-#include "utogi1_bsd_mask.xbm"
+-#include "utogi2_bsd_mask.xbm"
+diff --git a/bitmasks/bsd/down1_bsd_mask.xbm b/bitmasks/bsd/down1_bsd_mask.xbm
+deleted file mode 100644
+index baaa04f..0000000
+--- a/bitmasks/bsd/down1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define down1_bsd_mask_width 32
+-#define down1_bsd_mask_height 32
+-static char down1_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,
+- 0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,
+- 0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0xc0,0xff,
+- 0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x58,0xfc,0xff,0x00,0x24,
+- 0xfc,0xff,0x00,0x50,0xfc,0x7f,0x00,0x48,0xfc,0x3f,0x00,0x20,0x7e,0x1c,0x00,
+- 0x00,0x7e,0x00,0x00,0x00,0x3c,0x00,0x00};
+diff --git a/bitmasks/bsd/down2_bsd_mask.xbm b/bitmasks/bsd/down2_bsd_mask.xbm
+deleted file mode 100644
+index 81332e4..0000000
+--- a/bitmasks/bsd/down2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define down2_bsd_mask_width 32
+-#define down2_bsd_mask_height 32
+-static char down2_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,
+- 0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,
+- 0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0xff,0x00,0x80,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0x1f,0x00,0x80,
+- 0xff,0x1f,0x00,0x00,0xff,0x1f,0x00,0x80,0xfe,0x1f,0x00,0x40,0x1c,0x3f,0x00,
+- 0x00,0x00,0x3f,0x00,0x00,0x00,0x1e,0x00};
+diff --git a/bitmasks/bsd/dtogi1_bsd_mask.xbm b/bitmasks/bsd/dtogi1_bsd_mask.xbm
+deleted file mode 100644
+index 3e78e51..0000000
+--- a/bitmasks/bsd/dtogi1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dtogi1_bsd_mask_width 32
+-#define dtogi1_bsd_mask_height 32
+-static char dtogi1_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,
+- 0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,
+- 0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0xc0,0xff,
+- 0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x58,0xfc,0xff,0x00,0x24,
+- 0xfc,0xff,0x00,0x50,0xfc,0x7f,0x00,0x48,0xfc,0x3f,0x00,0x20,0x7e,0x1c,0x00,
+- 0x00,0x7e,0x00,0x00,0x00,0x3c,0x00,0x00};
+diff --git a/bitmasks/bsd/dtogi2_bsd_mask.xbm b/bitmasks/bsd/dtogi2_bsd_mask.xbm
+deleted file mode 100644
+index 9849208..0000000
+--- a/bitmasks/bsd/dtogi2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dtogi2_bsd_mask_width 32
+-#define dtogi2_bsd_mask_height 32
+-static char dtogi2_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,
+- 0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,
+- 0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0xff,0x00,0x80,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0x1f,0x00,0x80,
+- 0xff,0x1f,0x00,0x00,0xff,0x1f,0x00,0x80,0xfe,0x1f,0x00,0x40,0x1c,0x3f,0x00,
+- 0x00,0x00,0x3f,0x00,0x00,0x00,0x1e,0x00};
+diff --git a/bitmasks/bsd/dwleft1_bsd_mask.xbm b/bitmasks/bsd/dwleft1_bsd_mask.xbm
+deleted file mode 100644
+index 74f4fb6..0000000
+--- a/bitmasks/bsd/dwleft1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwleft1_bsd_mask_width 32
+-#define dwleft1_bsd_mask_height 32
+-static char dwleft1_bsd_mask_bits[] = {
+- 0x00,0x30,0x00,0x00,0x00,0x18,0xc0,0x00,0x00,0x1c,0xc0,0x01,0x00,0x1e,0x80,
+- 0x03,0x00,0xfe,0x8f,0x07,0x00,0xfe,0xbf,0x07,0x00,0xff,0xff,0x07,0x00,0xfe,
+- 0xff,0x07,0x00,0xfe,0xff,0x07,0x00,0xfe,0xff,0x03,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x90,0xff,0x7f,0x00,
+- 0x24,0xff,0x7f,0x00,0x28,0xfe,0x3f,0x00,0x12,0xfc,0x1f,0x00,0x2c,0xf8,0x0f,
+- 0x00,0x40,0xf0,0x0f,0x00,0x80,0xf8,0x1f,0x00,0x00,0xff,0x3f,0x00,0x80,0xff,
+- 0x7f,0x08,0x80,0xff,0xff,0x10,0x00,0xff,0xff,0x3d,0x00,0xfc,0xff,0x13,0x00,
+- 0xfc,0xff,0x08,0x00,0xfc,0x7f,0x00,0x00,0xf8,0x1f,0x00,0x00,0xf8,0x1f,0x00,
+- 0x00,0xf0,0x0f,0x00,0x00,0xe0,0x07,0x00};
+diff --git a/bitmasks/bsd/dwleft2_bsd_mask.xbm b/bitmasks/bsd/dwleft2_bsd_mask.xbm
+deleted file mode 100644
+index 931d4c7..0000000
+--- a/bitmasks/bsd/dwleft2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwleft2_bsd_mask_width 32
+-#define dwleft2_bsd_mask_height 32
+-static char dwleft2_bsd_mask_bits[] = {
+- 0x00,0x30,0x00,0x00,0x00,0x18,0xc0,0x00,0x00,0x1c,0xc0,0x01,0x00,0x1e,0x80,
+- 0x03,0x00,0xfe,0x8f,0x07,0x00,0xfe,0xbf,0x07,0x00,0xff,0xff,0x07,0x00,0xfe,
+- 0xff,0x07,0x00,0xfe,0xff,0x07,0x00,0xfe,0xff,0x03,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,
+- 0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xf8,0x0f,
+- 0x00,0x00,0xf0,0x0f,0x1c,0x00,0xf8,0x1f,0x18,0x00,0xfc,0x3f,0x14,0x00,0xfc,
+- 0x7f,0x04,0x18,0xfc,0x7f,0x02,0x20,0xff,0xff,0x01,0xfc,0xfc,0xff,0x00,0x20,
+- 0xfe,0x7f,0x00,0x18,0xfe,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,
+- 0x00,0x7f,0x3c,0x00,0x00,0x1e,0x00,0x00};
+diff --git a/bitmasks/bsd/dwright1_bsd_mask.xbm b/bitmasks/bsd/dwright1_bsd_mask.xbm
+deleted file mode 100644
+index daa0a65..0000000
+--- a/bitmasks/bsd/dwright1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwright1_bsd_mask_width 32
+-#define dwright1_bsd_mask_height 32
+-static char dwright1_bsd_mask_bits[] = {
+- 0x00,0x00,0x0c,0x00,0x00,0x03,0x18,0x00,0x80,0x03,0x38,0x00,0xc0,0x01,0x78,
+- 0x00,0xe0,0xf1,0x7f,0x00,0xe0,0xfd,0x7f,0x00,0xe0,0xff,0xff,0x00,0xe0,0xff,
+- 0x7f,0x00,0xe0,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x01,0x00,0xff,0xff,0x01,0x00,0xfe,0xff,0x09,
+- 0x00,0xfe,0xff,0x24,0x00,0xfc,0x7f,0x14,0x00,0xf8,0x3f,0x48,0x00,0xf0,0x1f,
+- 0x34,0x00,0xf0,0x0f,0x02,0x00,0xf8,0x1f,0x01,0x00,0xfc,0xff,0x00,0x10,0xfe,
+- 0xff,0x01,0x08,0xff,0xff,0x01,0xbc,0xff,0xff,0x00,0xc8,0xff,0x3f,0x00,0x10,
+- 0xff,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xf8,0x1f,0x00,0x00,0xf8,0x1f,0x00,
+- 0x00,0xf0,0x0f,0x00,0x00,0xe0,0x07,0x00};
+diff --git a/bitmasks/bsd/dwright2_bsd_mask.xbm b/bitmasks/bsd/dwright2_bsd_mask.xbm
+deleted file mode 100644
+index dc1b774..0000000
+--- a/bitmasks/bsd/dwright2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define dwright2_bsd_mask_width 32
+-#define dwright2_bsd_mask_height 32
+-static char dwright2_bsd_mask_bits[] = {
+- 0x00,0x00,0x0c,0x00,0x00,0x03,0x18,0x00,0x80,0x03,0x38,0x00,0xc0,0x01,0x78,
+- 0x00,0xe0,0xf1,0x7f,0x00,0xe0,0xfd,0x7f,0x00,0xe0,0xff,0xff,0x00,0xe0,0xff,
+- 0x7f,0x00,0xe0,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,0x80,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x01,0x00,0xff,0xff,0x01,0x00,0xfe,0xff,0x01,
+- 0x00,0xfe,0xff,0x00,0x00,0xfc,0x7f,0x00,0x00,0xf8,0x3f,0x00,0x00,0xf0,0x1f,
+- 0x00,0x38,0xf0,0x0f,0x00,0x18,0xf8,0x1f,0x00,0x28,0xfc,0x3f,0x00,0x20,0xfe,
+- 0x3f,0x00,0x40,0xfe,0x3f,0x18,0x80,0xff,0xff,0x04,0x00,0xff,0x3f,0x3f,0x00,
+- 0xfe,0x7f,0x04,0x00,0xfe,0x7f,0x18,0x00,0xfe,0xff,0x00,0x00,0xfe,0xff,0x00,
+- 0x00,0x3c,0xfe,0x00,0x00,0x00,0x78,0x00};
+diff --git a/bitmasks/bsd/jare2_bsd_mask.xbm b/bitmasks/bsd/jare2_bsd_mask.xbm
+deleted file mode 100644
+index e00cd9c..0000000
+--- a/bitmasks/bsd/jare2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define jare2_bsd_mask_width 32
+-#define jare2_bsd_mask_height 32
+-static char jare2_bsd_mask_bits[] = {
+- 0x00,0x30,0x00,0x00,0x00,0x18,0xc0,0x00,0x00,0x1c,0xc0,0x01,0x00,0x1e,0x80,
+- 0x03,0x00,0xfe,0x8f,0x07,0x00,0xfe,0x9f,0x07,0x00,0xff,0xff,0x07,0x00,0xfe,
+- 0xff,0x07,0x00,0xfe,0xff,0x07,0x00,0xfe,0xff,0x03,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,
+- 0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,0x00,0x80,0xf8,0x0f,
+- 0x00,0x20,0xe1,0x1f,0x00,0x40,0xf1,0x3f,0x00,0x90,0xfc,0x3f,0x10,0x60,0xff,
+- 0x3f,0x38,0x00,0xff,0x3f,0x54,0x00,0xff,0x3f,0x10,0x00,0xfe,0x3f,0x10,0x00,
+- 0xf8,0x7f,0x10,0x00,0xf8,0xff,0x10,0x00,0xfe,0xff,0x09,0x00,0xff,0x7f,0x07,
+- 0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00};
+diff --git a/bitmasks/bsd/kaki1_bsd_mask.xbm b/bitmasks/bsd/kaki1_bsd_mask.xbm
+deleted file mode 100644
+index 9c63483..0000000
+--- a/bitmasks/bsd/kaki1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define kaki1_bsd_mask_width 32
+-#define kaki1_bsd_mask_height 32
+-static char kaki1_bsd_mask_bits[] = {
+- 0x00,0x80,0xe3,0x00,0x00,0xc0,0xc3,0x01,0x00,0xe0,0xc1,0x03,0x00,0xe0,0xc1,
+- 0x07,0x00,0xf0,0xff,0x07,0x00,0xf0,0xff,0x07,0x00,0xf0,0xff,0x03,0x00,0xf8,
+- 0xff,0x03,0x00,0xf8,0xff,0x07,0x00,0xf8,0xff,0x07,0x00,0xf8,0xff,0x07,0x00,
+- 0xfc,0xff,0x07,0x00,0xfe,0xff,0x07,0x10,0xfe,0xff,0x07,0x38,0xfc,0xff,0x03,
+- 0x7c,0xfc,0xff,0x03,0x3e,0xf8,0xff,0x01,0x1f,0xf0,0xff,0x00,0x4e,0xe1,0x7f,
+- 0x00,0x84,0x03,0x7f,0x00,0xd0,0x83,0x7f,0x00,0xe0,0xe3,0xff,0x00,0xf0,0xf9,
+- 0xff,0x00,0xe0,0xfe,0xff,0x00,0x00,0xfe,0xff,0x00,0x00,0xfa,0xff,0x00,0x00,
+- 0xc2,0xff,0x00,0x00,0x82,0xff,0x01,0x00,0xe1,0xff,0x03,0x80,0xf0,0x7f,0x22,
+- 0x60,0xf0,0x7f,0x64,0x18,0xe0,0x7f,0xf8};
+diff --git a/bitmasks/bsd/kaki2_bsd_mask.xbm b/bitmasks/bsd/kaki2_bsd_mask.xbm
+deleted file mode 100644
+index 3f76210..0000000
+--- a/bitmasks/bsd/kaki2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define kaki2_bsd_mask_width 32
+-#define kaki2_bsd_mask_height 32
+-static char kaki2_bsd_mask_bits[] = {
+- 0x00,0x80,0xe3,0x00,0x00,0xc0,0xc3,0x01,0x00,0xe0,0xc1,0x03,0x00,0xe0,0xc1,
+- 0x07,0x00,0xf0,0xff,0x07,0x00,0xf0,0xff,0x07,0x00,0xf0,0xff,0x03,0x00,0xf8,
+- 0xff,0x03,0x00,0xf8,0xff,0x07,0x00,0xf8,0xff,0x07,0x00,0xf8,0xff,0x07,0x00,
+- 0xfc,0xff,0x07,0x00,0xfe,0xff,0x07,0x10,0xfe,0xff,0x07,0x38,0xfc,0xff,0x03,
+- 0x7c,0xfc,0xff,0x03,0xfe,0xf8,0xff,0x01,0xff,0xf0,0xff,0x00,0xfe,0xe0,0x7f,
+- 0x00,0x7c,0x0c,0x7f,0x00,0xb8,0xfe,0x7f,0x00,0x00,0xff,0xff,0x00,0x00,0xff,
+- 0xff,0x00,0x00,0xfd,0xff,0x00,0x00,0xf1,0xff,0x00,0x00,0xc1,0xff,0x00,0x80,
+- 0xc0,0xff,0x00,0x80,0x80,0xff,0x01,0x40,0xe0,0xff,0x03,0x20,0xf0,0x7f,0x22,
+- 0x10,0xf0,0x7f,0x64,0x08,0xe0,0x7f,0xf8};
+diff --git a/bitmasks/bsd/left1_bsd_mask.xbm b/bitmasks/bsd/left1_bsd_mask.xbm
+deleted file mode 100644
+index 21ba130..0000000
+--- a/bitmasks/bsd/left1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define left1_bsd_mask_width 32
+-#define left1_bsd_mask_height 32
+-static char left1_bsd_mask_bits[] = {
+- 0x00,0x60,0x0c,0x00,0x00,0x70,0x1c,0x00,0x00,0x78,0x1e,0x00,0x00,0xf8,0x1f,
+- 0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xff,0x1f,0x00,0x00,0xff,
+- 0x3f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0xc0,
+- 0xff,0x7f,0x00,0xe0,0xff,0x7f,0x00,0xe0,0xff,0x3f,0x00,0xc0,0xff,0x3f,0x00,
+- 0xc0,0xff,0x1f,0x00,0x88,0xff,0x0f,0x00,0x12,0xff,0x07,0x00,0x14,0xfe,0x07,
+- 0x00,0x09,0xe0,0x07,0x00,0x16,0xf0,0x0f,0x00,0x20,0xff,0x0f,0x00,0xc0,0xff,
+- 0x0f,0x00,0x80,0xff,0x1f,0x00,0x80,0xff,0x1f,0x00,0x00,0xff,0x1f,0x00,0x00,
+- 0xfc,0x3f,0x00,0x00,0xfe,0xff,0x20,0xc0,0xff,0xff,0x43,0xe0,0xff,0x3f,0xfe,
+- 0xe0,0xff,0x3f,0x40,0xc0,0x3f,0x1f,0x20};
+diff --git a/bitmasks/bsd/left2_bsd_mask.xbm b/bitmasks/bsd/left2_bsd_mask.xbm
+deleted file mode 100644
+index 3fb4cca..0000000
+--- a/bitmasks/bsd/left2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define left2_bsd_mask_width 32
+-#define left2_bsd_mask_height 32
+-static char left2_bsd_mask_bits[] = {
+- 0x00,0x70,0x1c,0x00,0x00,0x78,0x38,0x00,0x00,0x3c,0x78,0x00,0x00,0x3c,0xf8,
+- 0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,0x7f,0x00,0x00,0xff,
+- 0x7f,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x80,
+- 0xff,0xff,0x00,0xc0,0xff,0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,
+- 0x80,0xff,0x7f,0x00,0x00,0xff,0x3f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfc,0x0f,
+- 0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x0f,0x70,0x00,0xf0,0x1f,0x60,0x30,0xf8,
+- 0x1f,0x50,0x40,0xf8,0x1f,0x08,0xf8,0xff,0x3f,0x06,0x40,0xfc,0xff,0x03,0x30,
+- 0xfc,0xff,0x01,0x80,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,
+- 0x80,0xff,0x3f,0x00,0x00,0x80,0x1f,0x00};
+diff --git a/bitmasks/bsd/ltogi1_bsd_mask.xbm b/bitmasks/bsd/ltogi1_bsd_mask.xbm
+deleted file mode 100644
+index 68deffc..0000000
+--- a/bitmasks/bsd/ltogi1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define ltogi1_bsd_mask_width 32
+-#define ltogi1_bsd_mask_height 32
+-static char ltogi1_bsd_mask_bits[] = {
+- 0x00,0x60,0x0c,0x00,0x00,0x70,0x1c,0x00,0x00,0x78,0x1e,0x00,0x00,0xf8,0x1f,
+- 0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xff,0x1f,0x00,0x00,0xff,
+- 0x3f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0xc0,
+- 0xff,0x7f,0x00,0xe0,0xff,0x7f,0x00,0xe0,0xff,0x3f,0x00,0xc0,0xff,0x3f,0x00,
+- 0xc0,0xff,0x1f,0x00,0x88,0xff,0x0f,0x00,0x12,0xff,0x07,0x00,0x14,0xfe,0x07,
+- 0x00,0x09,0xe0,0x07,0x00,0x16,0xf0,0x0f,0x00,0x20,0xff,0x0f,0x00,0xc0,0xff,
+- 0x0f,0x00,0x80,0xff,0x1f,0x00,0x80,0xff,0x1f,0x00,0x00,0xff,0x1f,0x00,0x00,
+- 0xfc,0x3f,0x00,0x00,0xfe,0xff,0x20,0xc0,0xff,0xff,0x43,0xe0,0xff,0x3f,0xfe,
+- 0xe0,0xff,0x3f,0x40,0xc0,0x3f,0x1f,0x20};
+diff --git a/bitmasks/bsd/ltogi2_bsd_mask.xbm b/bitmasks/bsd/ltogi2_bsd_mask.xbm
+deleted file mode 100644
+index beafc69..0000000
+--- a/bitmasks/bsd/ltogi2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define ltogi2_bsd_mask_width 32
+-#define ltogi2_bsd_mask_height 32
+-static char ltogi2_bsd_mask_bits[] = {
+- 0x00,0x70,0x1c,0x00,0x00,0x78,0x38,0x00,0x00,0x3c,0x78,0x00,0x00,0x3c,0xf8,
+- 0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,0x7f,0x00,0x00,0xff,
+- 0x7f,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x80,
+- 0xff,0xff,0x00,0xc0,0xff,0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,
+- 0x80,0xff,0x7f,0x00,0x00,0xff,0x3f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfc,0x0f,
+- 0x00,0x00,0xe0,0x0f,0x00,0x00,0xf0,0x0f,0x70,0x00,0xf0,0x1f,0x60,0x30,0xf8,
+- 0x1f,0x50,0x40,0xf8,0x1f,0x08,0xf8,0xff,0x3f,0x06,0x40,0xfc,0xff,0x03,0x30,
+- 0xfc,0xff,0x01,0x80,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,0xc0,0xff,0x7f,0x00,
+- 0x80,0xff,0x3f,0x00,0x00,0x80,0x1f,0x00};
+diff --git a/bitmasks/bsd/mati2_bsd_mask.xbm b/bitmasks/bsd/mati2_bsd_mask.xbm
+deleted file mode 100644
+index cadb8e5..0000000
+--- a/bitmasks/bsd/mati2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define mati2_bsd_mask_width 32
+-#define mati2_bsd_mask_height 32
+-static char mati2_bsd_mask_bits[] = {
+- 0x00,0x30,0x00,0x00,0x00,0x18,0xc0,0x00,0x00,0x1c,0xc0,0x01,0x00,0x1e,0x80,
+- 0x03,0x00,0xfe,0x8f,0x07,0x00,0xfe,0x9f,0x07,0x00,0xff,0xff,0x07,0x00,0xfe,
+- 0xff,0x07,0x00,0xfe,0xff,0x07,0x00,0xfe,0xff,0x03,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x90,0xff,0xff,0x00,
+- 0x24,0xff,0x7f,0x00,0x28,0xfe,0x3f,0x00,0x12,0xfc,0x1f,0x00,0x2c,0xf8,0x0f,
+- 0x00,0x40,0xe3,0x1f,0x00,0x80,0xf7,0x3f,0x00,0xc0,0xff,0x3f,0x00,0xc0,0xff,
+- 0x3f,0x00,0x80,0xff,0x3f,0x00,0x00,0xfc,0x3f,0x00,0x00,0xfc,0x3f,0x00,0x00,
+- 0xf8,0x3f,0x00,0x00,0xf8,0x7f,0xe0,0x00,0xfe,0x7f,0xc0,0x00,0xff,0xff,0xa0,
+- 0x00,0xff,0x7f,0x11,0x00,0xfe,0x3f,0x0e};
+diff --git a/bitmasks/bsd/mati3_bsd_mask.xbm b/bitmasks/bsd/mati3_bsd_mask.xbm
+deleted file mode 100644
+index 3d04145..0000000
+--- a/bitmasks/bsd/mati3_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define mati3_bsd_mask_width 32
+-#define mati3_bsd_mask_height 32
+-static char mati3_bsd_mask_bits[] = {
+- 0x08,0x30,0x00,0x00,0x08,0x18,0xe0,0x00,0x10,0x1c,0xc0,0x01,0x21,0xfe,0xcf,
+- 0x03,0x22,0xfe,0xff,0x07,0x12,0xfe,0xff,0x07,0x09,0xfe,0xff,0x03,0x09,0xff,
+- 0xff,0x01,0x12,0xff,0xff,0x00,0xa0,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,
+- 0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x7f,0x00,
+- 0x00,0xfe,0x3f,0x00,0xc0,0xff,0x9f,0x03,0xe0,0xff,0xff,0x07,0xe0,0xff,0xff,
+- 0x07,0xc0,0xff,0xff,0x07,0xa0,0xff,0xff,0x03,0x10,0xfe,0xff,0x00,0x08,0xfe,
+- 0x7f,0x00,0x04,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x7f,0x00,0x00,
+- 0xfe,0xff,0x00,0x00,0xfe,0x3f,0x03,0x00,0xfe,0x3f,0x4c,0x00,0x7e,0x3f,0xf0,
+- 0x00,0x3e,0x1f,0xe0,0x00,0x1c,0x0e,0x00};
+diff --git a/bitmasks/bsd/right1_bsd_mask.xbm b/bitmasks/bsd/right1_bsd_mask.xbm
+deleted file mode 100644
+index 4d67fe3..0000000
+--- a/bitmasks/bsd/right1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define right1_bsd_mask_width 32
+-#define right1_bsd_mask_height 32
+-static char right1_bsd_mask_bits[] = {
+- 0x00,0x30,0x06,0x00,0x00,0x38,0x0e,0x00,0x00,0x78,0x1e,0x00,0x00,0xf8,0x1f,
+- 0x00,0x00,0xf8,0x3f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0xff,0x00,0x00,0xfc,
+- 0xff,0x00,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x01,0x00,
+- 0xfe,0xff,0x03,0x00,0xfe,0xff,0x07,0x00,0xfc,0xff,0x07,0x00,0xfc,0xff,0x03,
+- 0x00,0xf8,0xff,0x03,0x00,0xf0,0xff,0x11,0x00,0xe0,0xff,0x48,0x00,0xe0,0x7f,
+- 0x28,0x00,0xe0,0x07,0x90,0x00,0xf0,0x0f,0x68,0x00,0xf0,0xff,0x04,0x00,0xf0,
+- 0xff,0x03,0x00,0xf8,0xff,0x01,0x00,0xf8,0xff,0x01,0x00,0xf8,0xff,0x00,0x00,
+- 0xfc,0x3f,0x00,0x04,0xff,0x7f,0x00,0xc2,0xff,0xff,0x03,0x7f,0xfc,0xff,0x07,
+- 0x02,0xfc,0xff,0x07,0x04,0xf8,0xfc,0x03};
+diff --git a/bitmasks/bsd/right2_bsd_mask.xbm b/bitmasks/bsd/right2_bsd_mask.xbm
+deleted file mode 100644
+index 36fc281..0000000
+--- a/bitmasks/bsd/right2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define right2_bsd_mask_width 32
+-#define right2_bsd_mask_height 32
+-static char right2_bsd_mask_bits[] = {
+- 0x00,0x38,0x0e,0x00,0x00,0x1c,0x1e,0x00,0x00,0x1e,0x3c,0x00,0x00,0x1f,0x3c,
+- 0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x7f,0x00,0x00,0xfe,
+- 0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x01,0x00,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x00,0xfe,0xff,0x01,
+- 0x00,0xfe,0xff,0x01,0x00,0xfc,0xff,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf0,0x3f,
+- 0x00,0x00,0xf0,0x07,0x00,0x0e,0xf0,0x0f,0x00,0x06,0xf8,0x0f,0x00,0x0a,0xf8,
+- 0x1f,0x0c,0x10,0xf8,0x1f,0x02,0x60,0xfc,0xff,0x1f,0xc0,0xff,0x3f,0x02,0x80,
+- 0xff,0x3f,0x0c,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x03,0x00,0xfe,0xff,0x03,
+- 0x00,0xfc,0xff,0x01,0x00,0xf8,0x01,0x00};
+diff --git a/bitmasks/bsd/rtogi1_bsd_mask.xbm b/bitmasks/bsd/rtogi1_bsd_mask.xbm
+deleted file mode 100644
+index 5349810..0000000
+--- a/bitmasks/bsd/rtogi1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define rtogi1_bsd_mask_width 32
+-#define rtogi1_bsd_mask_height 32
+-static char rtogi1_bsd_mask_bits[] = {
+- 0x00,0x30,0x06,0x00,0x00,0x38,0x0e,0x00,0x00,0x78,0x1e,0x00,0x00,0xf8,0x1f,
+- 0x00,0x00,0xf8,0x3f,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf8,0xff,0x00,0x00,0xfc,
+- 0xff,0x00,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x01,0x00,
+- 0xfe,0xff,0x03,0x00,0xfe,0xff,0x07,0x00,0xfc,0xff,0x07,0x00,0xfc,0xff,0x03,
+- 0x00,0xf8,0xff,0x03,0x00,0xf0,0xff,0x11,0x00,0xe0,0xff,0x48,0x00,0xe0,0x7f,
+- 0x28,0x00,0xe0,0x07,0x90,0x00,0xf0,0x0f,0x68,0x00,0xf0,0xff,0x04,0x00,0xf0,
+- 0xff,0x03,0x00,0xf8,0xff,0x01,0x00,0xf8,0xff,0x01,0x00,0xf8,0xff,0x00,0x00,
+- 0xfc,0x3f,0x00,0x04,0xff,0x7f,0x00,0xc2,0xff,0xff,0x03,0x7f,0xfc,0xff,0x07,
+- 0x02,0xfc,0xff,0x07,0x04,0xf8,0xfc,0x03};
+diff --git a/bitmasks/bsd/rtogi2_bsd_mask.xbm b/bitmasks/bsd/rtogi2_bsd_mask.xbm
+deleted file mode 100644
+index 0a8d781..0000000
+--- a/bitmasks/bsd/rtogi2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define rtogi2_bsd_mask_width 32
+-#define rtogi2_bsd_mask_height 32
+-static char rtogi2_bsd_mask_bits[] = {
+- 0x00,0x38,0x0e,0x00,0x00,0x1c,0x1e,0x00,0x00,0x1e,0x3c,0x00,0x00,0x1f,0x3c,
+- 0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x7f,0x00,0x00,0xfe,
+- 0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x01,0x00,0xff,0xff,0x03,0x00,0xff,0xff,0x03,0x00,0xfe,0xff,0x01,
+- 0x00,0xfe,0xff,0x01,0x00,0xfc,0xff,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf0,0x3f,
+- 0x00,0x00,0xf0,0x07,0x00,0x0e,0xf0,0x0f,0x00,0x06,0xf8,0x0f,0x00,0x0a,0xf8,
+- 0x1f,0x0c,0x10,0xf8,0x1f,0x02,0x60,0xfc,0xff,0x1f,0xc0,0xff,0x3f,0x02,0x80,
+- 0xff,0x3f,0x0c,0x00,0xfe,0xff,0x01,0x00,0xfe,0xff,0x03,0x00,0xfe,0xff,0x03,
+- 0x00,0xfc,0xff,0x01,0x00,0xf8,0x01,0x00};
+diff --git a/bitmasks/bsd/sleep1_bsd_mask.xbm b/bitmasks/bsd/sleep1_bsd_mask.xbm
+deleted file mode 100644
+index 92ba92d..0000000
+--- a/bitmasks/bsd/sleep1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define sleep1_bsd_mask_width 32
+-#define sleep1_bsd_mask_height 32
+-static char sleep1_bsd_mask_bits[] = {
+- 0x00,0x00,0x00,0xfe,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x28,0x00,0x00,0x00,
+- 0x10,0x00,0x00,0x3e,0x28,0x00,0x00,0x10,0x04,0x00,0x00,0x08,0xfe,0x00,0x00,
+- 0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,
+- 0x00,0x00,0x1f,0x00,0x00,0x80,0xff,0x00,0x00,0xc0,0xff,0x03,0xe0,0xe1,0xff,
+- 0x07,0xfe,0xe7,0xff,0x0f,0xff,0xef,0xff,0x3f,0xff,0xff,0xff,0x7f,0xff,0xff,
+- 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1f,0xff,0xff,0xff,0x1f,0xff,
+- 0xff,0xff,0x3f,0xff,0xff,0xff,0xff,0xfe,0x8f,0xff,0xff,0xe0,0x01,0xff,0x7f,
+- 0x00,0x00,0xfe,0x01,0x00,0x00,0xf8,0x00};
+diff --git a/bitmasks/bsd/sleep2_bsd_mask.xbm b/bitmasks/bsd/sleep2_bsd_mask.xbm
+deleted file mode 100644
+index aed44c9..0000000
+--- a/bitmasks/bsd/sleep2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define sleep2_bsd_mask_width 32
+-#define sleep2_bsd_mask_height 32
+-static char sleep2_bsd_mask_bits[] = {
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x80,0x1f,0x00,0x00,0x00,0x08,0x00,0x00,0x1e,0x06,0x00,0x00,0x08,0x02,0x00,
+- 0x00,0x84,0x1f,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0c,0x00,
+- 0x00,0x00,0x1f,0x00,0x00,0x80,0xff,0x00,0x00,0xc0,0xff,0x03,0x00,0xe0,0xff,
+- 0x07,0x06,0xe0,0xff,0x0f,0xef,0xe3,0xff,0x3f,0xff,0xef,0xff,0xff,0xff,0xff,
+- 0xff,0xff,0xff,0xff,0xff,0x7f,0xff,0xff,0xff,0x1f,0xff,0xff,0xff,0x1f,0xff,
+- 0xff,0xff,0xbf,0xff,0xff,0xff,0xff,0xfe,0xff,0xff,0x7f,0xe0,0x81,0xff,0x1f,
+- 0x00,0x00,0xfe,0x03,0x00,0x00,0xf8,0x00};
+diff --git a/bitmasks/bsd/space_bsd_mask.xbm b/bitmasks/bsd/space_bsd_mask.xbm
+deleted file mode 100644
+index 523f155..0000000
+--- a/bitmasks/bsd/space_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define space_bsd_mask_width 32
+-#define space_bsd_mask_height 32
+-static char space_bsd_mask_bits[] = {
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+diff --git a/bitmasks/bsd/up1_bsd_mask.xbm b/bitmasks/bsd/up1_bsd_mask.xbm
+deleted file mode 100644
+index b0491ab..0000000
+--- a/bitmasks/bsd/up1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define up1_bsd_mask_width 32
+-#define up1_bsd_mask_height 32
+-static char up1_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,
+- 0x00,0xfc,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,
+- 0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0xbf,0x00,0x80,0xff,
+- 0x3f,0x01,0x00,0xff,0x3f,0x02,0x00,0xfc,0x3f,0x00,0x00,0xfc,0x3f,0x00,0x00,
+- 0xf8,0x7f,0x00,0x00,0x40,0x7f,0x00,0x00,0x40,0x3e,0x00,0x00,0x28,0x00,0x00,
+- 0x00,0x18,0x00,0x00,0x00,0x38,0x00,0x00};
+diff --git a/bitmasks/bsd/up2_bsd_mask.xbm b/bitmasks/bsd/up2_bsd_mask.xbm
+deleted file mode 100644
+index 9ae24a8..0000000
+--- a/bitmasks/bsd/up2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define up2_bsd_mask_width 32
+-#define up2_bsd_mask_height 32
+-static char up2_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,
+- 0x00,0xfc,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,
+- 0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0xff,0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,
+- 0xff,0x00,0x00,0xfe,0x7f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfe,0x1f,0x00,0x00,
+- 0xff,0x1f,0x00,0x00,0x7f,0x01,0x00,0x00,0x3e,0x01,0x00,0x00,0x00,0x0a,0x00,
+- 0x00,0x00,0x0c,0x00,0x00,0x00,0x0e,0x00};
+diff --git a/bitmasks/bsd/upleft1_bsd_mask.xbm b/bitmasks/bsd/upleft1_bsd_mask.xbm
+deleted file mode 100644
+index 4c65941..0000000
+--- a/bitmasks/bsd/upleft1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upleft1_bsd_mask_width 32
+-#define upleft1_bsd_mask_height 32
+-static char upleft1_bsd_mask_bits[] = {
+- 0x00,0x00,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xf0,
+- 0x00,0xc0,0xe3,0xff,0x00,0xc0,0xfb,0xff,0x00,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,
+- 0x80,0xff,0x7f,0x00,0x00,0xff,0x3f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfc,0x0f,
+- 0x00,0x20,0xf0,0x0f,0x00,0x48,0xf8,0x3f,0x00,0x50,0xfc,0x7f,0x00,0x24,0xfe,
+- 0xff,0x00,0x58,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0x3f,0x20,0x00,
+- 0xff,0x3f,0x40,0x00,0xfe,0x3f,0xf0,0x00,0xf8,0x3f,0x4f,0x00,0xf8,0xff,0x20,
+- 0x00,0xf0,0x0f,0x00,0x00,0xe0,0x03,0x00};
+diff --git a/bitmasks/bsd/upleft2_bsd_mask.xbm b/bitmasks/bsd/upleft2_bsd_mask.xbm
+deleted file mode 100644
+index fbea158..0000000
+--- a/bitmasks/bsd/upleft2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upleft2_bsd_mask_width 32
+-#define upleft2_bsd_mask_height 32
+-static char upleft2_bsd_mask_bits[] = {
+- 0x00,0x00,0x18,0x00,0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xf0,
+- 0x00,0xc0,0xe3,0xff,0x00,0xc0,0xfb,0xff,0x00,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x00,0xc0,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x80,0xff,0x7f,0x00,
+- 0x80,0xff,0x7f,0x00,0x00,0xff,0x3f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfc,0x0f,
+- 0x00,0x00,0xf0,0x0f,0x00,0x00,0xf8,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfc,
+- 0x1f,0x00,0x60,0xfc,0x3f,0x00,0x80,0xfc,0x3f,0x00,0xf0,0xff,0x3f,0x00,0x80,
+- 0xfc,0x3f,0x00,0x60,0xfe,0x7f,0x00,0x00,0xff,0x7f,0x38,0x00,0xfe,0x7f,0x30,
+- 0x00,0x3c,0x3e,0x28,0x00,0x00,0xdc,0x07};
+diff --git a/bitmasks/bsd/upright1_bsd_mask.xbm b/bitmasks/bsd/upright1_bsd_mask.xbm
+deleted file mode 100644
+index 44993ae..0000000
+--- a/bitmasks/bsd/upright1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upright1_bsd_mask_width 32
+-#define upright1_bsd_mask_height 32
+-static char upright1_bsd_mask_bits[] = {
+- 0x00,0x18,0x00,0x00,0x00,0x0c,0x60,0x00,0x00,0x0e,0xe0,0x00,0x00,0x0f,0xc0,
+- 0x01,0x00,0xff,0xc7,0x03,0x00,0xff,0xdf,0x03,0x80,0xff,0xff,0x03,0x00,0xff,
+- 0xff,0x03,0x00,0xff,0xff,0x03,0x00,0xff,0xff,0x01,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x01,0x00,0xfe,0xff,0x01,
+- 0x00,0xfe,0xff,0x01,0x00,0xfc,0xff,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf0,0x3f,
+- 0x00,0x00,0xf0,0x0f,0x04,0x00,0xfc,0x1f,0x12,0x00,0xfe,0x3f,0x0a,0x00,0xff,
+- 0x7f,0x24,0x00,0xff,0xff,0x1a,0x00,0xfe,0xff,0x01,0x04,0xfc,0xff,0x01,0x02,
+- 0xfc,0xff,0x00,0x0f,0xfc,0x7f,0x00,0xf2,0xfc,0x1f,0x00,0x04,0xff,0x1f,0x00,
+- 0x00,0xf0,0x0f,0x00,0x00,0xc0,0x07,0x00};
+diff --git a/bitmasks/bsd/upright2_bsd_mask.xbm b/bitmasks/bsd/upright2_bsd_mask.xbm
+deleted file mode 100644
+index c1582df..0000000
+--- a/bitmasks/bsd/upright2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define upright2_bsd_mask_width 32
+-#define upright2_bsd_mask_height 32
+-static char upright2_bsd_mask_bits[] = {
+- 0x00,0x18,0x00,0x00,0x00,0x0c,0x60,0x00,0x00,0x0e,0xe0,0x00,0x00,0x0f,0xc0,
+- 0x01,0x00,0xff,0xc7,0x03,0x00,0xff,0xdf,0x03,0x80,0xff,0xff,0x03,0x00,0xff,
+- 0xff,0x03,0x00,0xff,0xff,0x03,0x00,0xff,0xff,0x01,0x00,0xff,0xff,0x01,0x00,
+- 0xff,0xff,0x00,0x00,0xff,0xff,0x00,0x00,0xff,0xff,0x01,0x00,0xfe,0xff,0x01,
+- 0x00,0xfe,0xff,0x01,0x00,0xfc,0xff,0x00,0x00,0xf8,0x7f,0x00,0x00,0xf0,0x3f,
+- 0x00,0x00,0xf0,0x0f,0x00,0x00,0xf8,0x1f,0x00,0x00,0xf8,0x3f,0x00,0x00,0xf8,
+- 0x3f,0x00,0x00,0xfc,0x3f,0x06,0x00,0xfc,0x3f,0x01,0x00,0xfc,0xff,0x0f,0x00,
+- 0xfc,0x3f,0x01,0x00,0xfe,0x7f,0x06,0x1c,0xfe,0xff,0x00,0x0c,0xfe,0x7f,0x00,
+- 0x14,0x7c,0x3c,0x00,0xe0,0x3f,0x00,0x00};
+diff --git a/bitmasks/bsd/utogi1_bsd_mask.xbm b/bitmasks/bsd/utogi1_bsd_mask.xbm
+deleted file mode 100644
+index cbd8d26..0000000
+--- a/bitmasks/bsd/utogi1_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define utogi1_bsd_mask_width 32
+-#define utogi1_bsd_mask_height 32
+-static char utogi1_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,
+- 0x00,0xfc,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,
+- 0x00,0x00,0xff,0x7f,0x00,0x80,0xff,0x7f,0x00,0x80,0xff,0xbf,0x00,0x80,0xff,
+- 0x3f,0x01,0x00,0xff,0x3f,0x02,0x00,0xfc,0x3f,0x00,0x00,0xfc,0x3f,0x00,0x00,
+- 0xf8,0x7f,0x00,0x00,0x40,0x7f,0x00,0x00,0x40,0x3e,0x00,0x00,0x28,0x00,0x00,
+- 0x00,0x18,0x00,0x00,0x00,0x38,0x00,0x00};
+diff --git a/bitmasks/bsd/utogi2_bsd_mask.xbm b/bitmasks/bsd/utogi2_bsd_mask.xbm
+deleted file mode 100644
+index ef30aba..0000000
+--- a/bitmasks/bsd/utogi2_bsd_mask.xbm
++++ /dev/null
+@@ -1,12 +0,0 @@
+-#define utogi2_bsd_mask_width 32
+-#define utogi2_bsd_mask_height 32
+-static char utogi2_bsd_mask_bits[] = {
+- 0x00,0x06,0x30,0x00,0x00,0x07,0x70,0x00,0x80,0x03,0xe0,0x00,0xc0,0x03,0xe0,
+- 0x01,0xc0,0xfb,0xef,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,0xff,0x01,0xc0,0xff,
+- 0xff,0x01,0x80,0xff,0xff,0x00,0x80,0xff,0xff,0x00,0x00,0xff,0x7f,0x00,0x00,
+- 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xfe,0x3f,0x00,
+- 0x00,0xfc,0x1f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,
+- 0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0xff,0x00,0x00,0xfe,0xff,0x00,0x00,0xfe,
+- 0xff,0x00,0x00,0xfe,0x7f,0x00,0x00,0xfe,0x1f,0x00,0x00,0xfe,0x1f,0x00,0x00,
+- 0xff,0x1f,0x00,0x00,0x7f,0x01,0x00,0x00,0x3e,0x01,0x00,0x00,0x00,0x0a,0x00,
+- 0x00,0x00,0x0c,0x00,0x00,0x00,0x0e,0x00};
+diff --git a/cursors/bsd_cursor.xbm b/cursors/bsd_cursor.xbm
+deleted file mode 100644
+index 51bf06e..0000000
+--- a/cursors/bsd_cursor.xbm
++++ /dev/null
+@@ -1,8 +0,0 @@
+-#define bsd_cursor_width 17
+-#define bsd_cursor_height 12
+-#define bsd_cursor_x_hot 8
+-#define bsd_cursor_y_hot 6
+-static unsigned char bsd_cursor_bits[] = {
+-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x63, 0xc4, 0xff,
+-   0x5b, 0xb7, 0xfe, 0x63, 0xb4, 0xfe, 0xdb, 0xb5, 0xfe, 0x63, 0xc4, 0xfe,
+-   0xfd, 0x7f, 0xff, 0xf3, 0x8f, 0xff, 0x07, 0xc0, 0xff, 0x1f, 0xf0, 0xff};
+diff --git a/cursors/bsd_cursor_mask.xbm b/cursors/bsd_cursor_mask.xbm
+deleted file mode 100644
+index 0a6dcdd..0000000
+--- a/cursors/bsd_cursor_mask.xbm
++++ /dev/null
+@@ -1,6 +0,0 @@
+-#define bsd_cursor_mask_width 17
+-#define bsd_cursor_mask_height 12
+-static unsigned char bsd_cursor_mask_bits[] = {
+-   0xe0, 0x0f, 0x00, 0xf8, 0x3f, 0x00, 0xfc, 0x7f, 0x00, 0xfe, 0xff, 0x00,
+-   0xff, 0xff, 0x01, 0xff, 0xff, 0x01, 0xff, 0xff, 0x01, 0xff, 0xff, 0x01,
+-   0xfe, 0xff, 0x00, 0xfc, 0x7f, 0x00, 0xf8, 0x3f, 0x00, 0xe0, 0x0f, 0x00};
+diff --git a/cursors/cursor.include b/cursors/cursor.include
+index ef96d72..93e230b 100644
+--- a/cursors/cursor.include
++++ b/cursors/cursor.include
+@@ -2,8 +2,6 @@
+ #include "mouse_cursor_mask.xbm"
+ #include "bone_cursor.xbm"
+ #include "bone_cursor_mask.xbm"
+-#include "bsd_cursor.xbm"
+-#include "bsd_cursor_mask.xbm"
+ #include "card_cursor.xbm"
+ #include "card_cursor_mask.xbm"
+ #include "petal_cursor.xbm"
+diff --git a/oneko.c b/oneko.c
+index d2b81fe..1617028 100644
+--- a/oneko.c
++++ b/oneko.c
+@@ -33,7 +33,7 @@ XColor	theBackgroundColor;		/* ^[$@?'^[(J (^[$@%P%C%/%0%i%&%s%I^[(J) */
+ 
+ int Synchronous = False;
+ /* Types of animals */
+-#define BITMAPTYPES 6
++#define BITMAPTYPES 5
+ typedef struct _AnimalDefaults {
+   char *name;
+   int speed, idle, bitmap_width, bitmap_height;
+@@ -49,13 +49,11 @@ AnimalDefaultsData AnimalDefaultsDataTable[] =
+       mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot },
+   { "tora", 16, 6, 32, 32, 125000L, 0, 0, mouse_cursor_bits,mouse_cursor_mask_bits,
+       mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot },
+-  { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits,
++  { "dog", 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits,
+       bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot },
+-  { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits,
+-      bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot },
+-  { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits,
++  { "sakura", 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits,
+       card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot },
+-  { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits,
++  { "tomoyo", 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits,
+       petal_cursor_width,petal_cursor_height, petal_cursor_x_hot,petal_cursor_y_hot },
+ };
+ 
+@@ -154,70 +152,70 @@ typedef struct {
+ 
+ BitmapGCData	BitmapGCDataTable[] =
+ {
+-    { &Mati2GC, &Mati2Xbm,  mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits,
+-      &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits },
+-    { &Jare2GC, &Jare2Xbm,  jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits,
+-      &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits },
+-    { &Kaki1GC, &Kaki1Xbm,  kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits,
+-      &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits },
+-    { &Kaki2GC, &Kaki2Xbm,  kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits,
+-      &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits },
+-    { &Mati3GC, &Mati3Xbm,  mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits,
+-      &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits },
+-    { &Sleep1GC, &Sleep1Xbm,  sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits,
+-      &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits },
+-    { &Sleep2GC, &Sleep2Xbm,  sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits,
+-      &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits },
+-    { &AwakeGC, &AwakeXbm,  awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits,
+-      &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits },
+-    { &Up1GC, &Up1Xbm,  up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits,
+-      &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits },
+-    { &Up2GC, &Up2Xbm,  up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits,
+-      &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits },
+-    { &Down1GC, &Down1Xbm,  down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits,
+-      &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits },
+-    { &Down2GC, &Down2Xbm,  down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits,
+-      &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits },
+-    { &Left1GC, &Left1Xbm,  left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits,
+-      &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits },
+-    { &Left2GC, &Left2Xbm,  left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits,
+-      &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits },
+-    { &Right1GC, &Right1Xbm,  right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits,
+-      &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits },
+-    { &Right2GC, &Right2Xbm,  right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits,
+-      &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits },
+-    { &UpLeft1GC, &UpLeft1Xbm,  upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits,
+-      &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits },
+-    { &UpLeft2GC, &UpLeft2Xbm,  upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits,
+-      &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits },
+-    { &UpRight1GC, &UpRight1Xbm,  upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits,
+-      &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits },
+-    { &UpRight2GC, &UpRight2Xbm,  upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits,
+-      &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits },
+-    { &DownLeft1GC, &DownLeft1Xbm,  dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits,
+-      &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits },
+-    { &DownLeft2GC, &DownLeft2Xbm,  dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits,
+-      &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits },
+-    { &DownRight1GC, &DownRight1Xbm,  dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits,
+-      &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits },
+-    { &DownRight2GC, &DownRight2Xbm,  dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits,
+-      &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits },
+-    { &UpTogi1GC, &UpTogi1Xbm,  utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits,
+-      &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits },
+-    { &UpTogi2GC, &UpTogi2Xbm,  utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits,
+-      &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits },
+-    { &DownTogi1GC, &DownTogi1Xbm,  dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits,
+-      &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits },
+-    { &DownTogi2GC, &DownTogi2Xbm,  dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits,
+-      &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits },
+-    { &LeftTogi1GC, &LeftTogi1Xbm,  ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits,
+-      &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits },
+-    { &LeftTogi2GC, &LeftTogi2Xbm,  ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits,
+-      &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits },
+-    { &RightTogi1GC, &RightTogi1Xbm,  rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits,
+-      &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits },
+-    { &RightTogi2GC, &RightTogi2Xbm,  rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits,
+-      &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits },
++    { &Mati2GC, &Mati2Xbm,  mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_sakura_bits, mati2_tomoyo_bits,
++      &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits },
++    { &Jare2GC, &Jare2Xbm,  jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_sakura_bits, jare2_tomoyo_bits,
++      &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits },
++    { &Kaki1GC, &Kaki1Xbm,  kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_sakura_bits, kaki1_tomoyo_bits,
++      &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits },
++    { &Kaki2GC, &Kaki2Xbm,  kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_sakura_bits, kaki2_tomoyo_bits,
++      &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits },
++    { &Mati3GC, &Mati3Xbm,  mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_sakura_bits, mati3_tomoyo_bits,
++      &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits },
++    { &Sleep1GC, &Sleep1Xbm,  sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_sakura_bits, sleep1_tomoyo_bits,
++      &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits },
++    { &Sleep2GC, &Sleep2Xbm,  sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_sakura_bits, sleep2_tomoyo_bits,
++      &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits },
++    { &AwakeGC, &AwakeXbm,  awake_bits, awake_tora_bits, awake_dog_bits, awake_sakura_bits, awake_tomoyo_bits,
++      &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits },
++    { &Up1GC, &Up1Xbm,  up1_bits, up1_tora_bits, up1_dog_bits, up1_sakura_bits, up1_tomoyo_bits,
++      &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits },
++    { &Up2GC, &Up2Xbm,  up2_bits, up2_tora_bits, up2_dog_bits, up2_sakura_bits, up2_tomoyo_bits,
++      &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits },
++    { &Down1GC, &Down1Xbm,  down1_bits, down1_tora_bits, down1_dog_bits, down1_sakura_bits, down1_tomoyo_bits,
++      &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits },
++    { &Down2GC, &Down2Xbm,  down2_bits, down2_tora_bits, down2_dog_bits, down2_sakura_bits, down2_tomoyo_bits,
++      &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits },
++    { &Left1GC, &Left1Xbm,  left1_bits, left1_tora_bits, left1_dog_bits, left1_sakura_bits, left1_tomoyo_bits,
++      &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits },
++    { &Left2GC, &Left2Xbm,  left2_bits, left2_tora_bits, left2_dog_bits, left2_sakura_bits, left2_tomoyo_bits,
++      &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits },
++    { &Right1GC, &Right1Xbm,  right1_bits, right1_tora_bits, right1_dog_bits, right1_sakura_bits, right1_tomoyo_bits,
++      &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits },
++    { &Right2GC, &Right2Xbm,  right2_bits, right2_tora_bits, right2_dog_bits, right2_sakura_bits, right2_tomoyo_bits,
++      &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits },
++    { &UpLeft1GC, &UpLeft1Xbm,  upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_sakura_bits, upleft1_tomoyo_bits,
++      &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits },
++    { &UpLeft2GC, &UpLeft2Xbm,  upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_sakura_bits, upleft2_tomoyo_bits,
++      &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits },
++    { &UpRight1GC, &UpRight1Xbm,  upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_sakura_bits, upright1_tomoyo_bits,
++      &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits },
++    { &UpRight2GC, &UpRight2Xbm,  upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_sakura_bits, upright2_tomoyo_bits,
++      &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits },
++    { &DownLeft1GC, &DownLeft1Xbm,  dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits,
++      &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits },
++    { &DownLeft2GC, &DownLeft2Xbm,  dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits,
++      &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits },
++    { &DownRight1GC, &DownRight1Xbm,  dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_sakura_bits, dwright1_tomoyo_bits,
++      &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits },
++    { &DownRight2GC, &DownRight2Xbm,  dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_sakura_bits, dwright2_tomoyo_bits,
++      &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits },
++    { &UpTogi1GC, &UpTogi1Xbm,  utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_sakura_bits, utogi1_tomoyo_bits,
++      &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits },
++    { &UpTogi2GC, &UpTogi2Xbm,  utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_sakura_bits, utogi2_tomoyo_bits,
++      &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits },
++    { &DownTogi1GC, &DownTogi1Xbm,  dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits,
++      &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits },
++    { &DownTogi2GC, &DownTogi2Xbm,  dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits,
++      &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits },
++    { &LeftTogi1GC, &LeftTogi1Xbm,  ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits,
++      &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits },
++    { &LeftTogi2GC, &LeftTogi2Xbm,  ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits,
++      &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits },
++    { &RightTogi1GC, &RightTogi1Xbm,  rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits,
++      &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits },
++    { &RightTogi2GC, &RightTogi2Xbm,  rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits,
++      &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits },
+     { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+ };
+ 
+@@ -1512,8 +1510,6 @@ GetArguments(argc, argv, theDisplayName)
+     }
+     else {
+       char *av = argv[ArgCounter] + 1;
+-      if (strcmp(av, "bsd") == 0)
+-	av = "bsd_daemon";
+       for (loop=0;loop<BITMAPTYPES;loop++) {
+ 	if (strcmp(av,AnimalDefaultsDataTable[loop].name)==0)
+ 	  {NekoMoyou = loop;found=1;}
+diff --git a/oneko.h b/oneko.h
+index 414e12f..04d7996 100644
+--- a/oneko.h
++++ b/oneko.h
+@@ -36,7 +36,6 @@
+ #include "bitmaps/neko/neko.include"
+ #include "bitmaps/tora/tora.include"
+ #include "bitmaps/dog/dog.include"
+-#include "bitmaps/bsd/bsd.include"
+ #include "bitmaps/sakura/sakura.include"
+ #include "bitmaps/tomoyo/tomoyo.include"
+ 
+@@ -44,7 +43,6 @@
+ 
+ #include "bitmasks/neko/neko.mask.include"
+ #include "bitmasks/dog/dog.mask.include"
+-#include "bitmasks/bsd/bsd.mask.include"
+ #include "bitmasks/sakura/sakura.mask.include"
+ #include "bitmasks/tomoyo/tomoyo.mask.include"
+ 
+diff --git a/oneko.man b/oneko.man
+index d6d2b40..2c0ca91 100644
+--- a/oneko.man
++++ b/oneko.man
+@@ -4,8 +4,7 @@ The program oneko creates a cute cat chasing around your mouse cursor.
+ .SH SYNOPSIS
+ .B oneko
+ [\fB-help\fP] [\fB-tora\fP]
+-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP]
+-[\fB-sakura\fP] [\fB-tomoyo\fP]
++[\fB-dog\fP] [\fB-sakura\fP] [\fB-tomoyo\fP]
+ [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP]
+ [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP]
+ [\fB-tofocus\fP]
+@@ -28,13 +27,6 @@ I don't know how to say it in English.
+ .B -dog
+ Runs a dog instead of a cat.
+ .TP
+-.B -bsd_daemon
+-Runs a 4.3BSD daemon instead of a cat.
+-.TP
+-.B -bsd
+-Same as
+-.B -bsd_daemon.
+-.TP
+ .B -sakura
+ Runs Sakura Kinomoto instead of a cat.
+ .TP
+@@ -130,8 +122,6 @@ While this program uses XGetDefault, be sure to use "neko.resouce" form.
+ If you run this program as "tora", by hard of soft link, the \fB-tora\fP
+ option is enabled by default.
+ .PP
+-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved.
+-.PP
+ Sakura Kinomoto and Tomoyo Daidouji are characters in a comic strip
+ "CARDCAPTOR SAKURA" (CLAMP, Kodansha), with the sanction indicated in
+ CLAMP SCHOOL WEB CAMPUS (http://www.clamp.f-2.co.jp/).
+diff --git a/oneko.man.jp b/oneko.man.jp
+index 96f9e3a..ea79c9e 100644
+--- a/oneko.man.jp
++++ b/oneko.man.jp
+@@ -4,8 +4,7 @@
+ .SH ^[$@=q<0^[(J
+ .B oneko
+ [\fB-help\fP] [\fB-tora\fP]
+-[\fB-dog\fP] [\fB-bsd_daemon\fP] [\fB-bsd\fP]
+-[\fB-sakura\fP] [\fB-tomoyo\fP]
++[\fB-dog\fP] [\fB-sakura\fP] [\fB-tomoyo\fP]
+ [\fB-time\fP \fIn\fP] [\fB-speed\fP \fIn\fP] [\fB-idle\fP \fIn\fP]
+ [\fB-name\fP \fIname\fP] [\fB-towindow\fP] [\fB-toname\fP \fIname\fP]
+ [\fB-tofocus\fP]
+@@ -27,13 +26,6 @@
+ .B -dog
+ ^[$@G-$KBe$o$j8$$,Av$j$^$9!#^[(J
+ .TP
+-.B -bsd_daemon
+-^[$@G-$KBe$o$j^[(J 4.3BSD ^[$@%G!<%b%s$,Av$j$^$9!#^[(J
+-.TP
+-.B -bsd
+-.B -bsd_daemon
+-^[$@$KF1$8!#^[(J
+-.TP
+ .B -sakura
+ ^[$@G-$KBe$o$jLZG7K\:y$,Av$j$^$9!#^[(J
+ .TP
+@@ -128,10 +120,6 @@ SHAPE extension ^[$@$r;H$$$?$/$J$$>l9g^[(J True ^[$@$H$7$^$9!#^[(J
+ ^[$@%O!<%I%j%s%/$"$k$$$O%=%U%H%j%s%/$K$h$C$F!"$3$N%W%m%0%i%`$r^[(J tora ^[$@$H$7$F^[(J
+ ^[$@5/F0$7$?>l9g$K$O!"%G%U%)%k%H$G^[(J \fB-tora\fP ^[$@%*%W%7%g%s$,M-8z$H$J$j$^$9!#^[(J
+ .PP
+-BSD ^[$@%G!<%b%s$O^[(J  Marshall Kirk McKusick ^[$@;a$NCx:nJ*$G$9!#$9$Y$F$N8"Mx$O^[(J
+-^[$@J];}$5$l$F$$$^$9!#^[(J
+-BSD Daemon Copyright 1988 by Marshall Kirk McKusick. All Rights Reserved.
+-.PP
+ ^[$@LZG7K\:y$*$h$SBgF;;{CN@$$OL!2h!X%+!<%I%-%c%W%?!<$5$/$i!Y!J^[(JCLAMP, ^[$@9VCL^[(J
+ ^[$@<R!K$N%-%c%i%/%?!<$G$"$j!"^[(JCLAMP ^[$@3X1`EE;RJ,9;^[(J
+ ^[$@!J^[(Jhttp://www.clamp.f-2.co.jp/^[$@!K$K<($5$l$F$$$kMFG'$N$b$H$KMxMQ$5$l$F$$^[(J
diff --git a/srcpkgs/oneko/patches/rmshape_fixtypos.diff b/srcpkgs/oneko/patches/rmshape_fixtypos.diff
new file mode 100644
index 000000000000..4a5a96c88b83
--- /dev/null
+++ b/srcpkgs/oneko/patches/rmshape_fixtypos.diff
@@ -0,0 +1,69 @@
+diff --git a/oneko.c b/oneko.c
+index d2b81fe..39b8b1d 100644
+--- a/oneko.c
++++ b/oneko.c
+@@ -618,13 +618,11 @@ InitScreen(DisplayName)
+     XSynchronize(theDisplay,True);
+   }
+ 
+-#ifdef SHAPE
+   if (!NoShape && XShapeQueryExtension(theDisplay,
+ 				       &event_base, &error_base) == False) {
+-    fprintf(stderr, "Display not suported shape extension.\n");
++    fprintf(stderr, "Display does not support shape extension.\n");
+     NoShape = True;
+ 				       }
+-#endif SHAPE
+ 
+   theScreen = DefaultScreen(theDisplay);
+   theDepth = DefaultDepth(theDisplay, theScreen);
+@@ -803,13 +801,11 @@ DrawNeko(x, y, DrawAnime)
+       theChanges.x = x;
+       theChanges.y = y;
+       XConfigureWindow(theDisplay, theWindow, CWX | CWY, &theChanges);
+-#ifdef SHAPE
+       if (NoShape == False) {
+ 	XShapeCombineMask(theDisplay, theWindow, ShapeBounding,
+ 			  0, 0, DrawMask, ShapeSet);
+ 
+       }
+-#endif SHAPE
+       if (DontMapped) {
+ 	XMapWindow(theDisplay, theWindow);
+ 	DontMapped = 0;
+diff --git a/oneko.man b/oneko.man
+index d6d2b40..f24f19c 100644
+--- a/oneko.man
++++ b/oneko.man
+@@ -1,6 +1,6 @@
+ .TH ONEKO 6
+-.SH NAME oneko
+-The program oneko creates a cute cat chasing around your mouse cursor.
++.SH NAME
++oneko \- Creates a cute cat chasing around your mouse cursor.
+ .SH SYNOPSIS
+ .B oneko
+ [\fB-help\fP] [\fB-tora\fP]
+@@ -22,8 +22,7 @@ start sleeping.
+ Prints help message on usage.
+ .TP
+ .B -tora
+-Make cat into "tora-neko".  "Tora-neko" means cat wite tiger-like stripe.
+-I don't know how to say it in English.
++Make cat into "tora-neko", a cat with a tiger-like stripe.
+ .TP
+ .B -dog
+ Runs a dog instead of a cat.
+diff --git a/oneko.man.jp b/oneko.man.jp
+index 96f9e3a..ed795bf 100644
+--- a/oneko.man.jp
++++ b/oneko.man.jp
+@@ -1,6 +1,6 @@
+ .TH ONEKO 6
+-.SH ^[$@L>>N^[(J oneko
+-^[$@$+$o$$$$G-$,%^%&%9%+!<%=%k$rDI$$$+$1$k%W%m%0%i%`^[(J
++.SH ^[$@L>>N^[(J
++oneko \- ^[$@$+$o$$$$G-$,%^%&%9%+!<%=%k$rDI$$$+$1$k%W%m%0%i%`^[(J
+ .SH ^[$@=q<0^[(J
+ .B oneko
+ [\fB-help\fP] [\fB-tora\fP]
diff --git a/srcpkgs/oneko/template b/srcpkgs/oneko/template
new file mode 100644
index 000000000000..3d45f449ae62
--- /dev/null
+++ b/srcpkgs/oneko/template
@@ -0,0 +1,22 @@
+# Template file for 'oneko'
+pkgname=oneko
+version=1.2.sakura.5
+revision=1
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXext-devel"
+short_desc="Cat that chases around your cursor"
+maintainer="wael <40663@protonmail.com>"
+license="Public Domain"
+homepage="http://www.daidouji.com/oneko"
+distfiles="http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"
+checksum=2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f
+
+do_build() {
+	${CC} ${CFLAGS} -DSHAPE oneko.c -o oneko $(pkg-config --libs xext x11) -lm
+}
+
+do_install() {
+	vbin oneko
+	vman oneko.man oneko.1
+	vman oneko.man.jp oneko.jp.1
+}

  parent reply	other threads:[~2022-04-11 22:36 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-10 20:23 [PR PATCH] " wael444
2022-04-11  0:01 ` [PR REVIEW] " tibequadorian
2022-04-11  4:41 ` classabbyamp
2022-04-11  4:41 ` classabbyamp
2022-04-11  4:41 ` classabbyamp
2022-04-11 10:54 ` wael444
2022-04-11 10:54 ` wael444
2022-04-11 10:55 ` wael444
2022-04-11 10:58 ` wael444
2022-04-11 10:59 ` [PR PATCH] [Updated] " wael444
2022-04-11 11:01 ` [PR REVIEW] " wael444
2022-04-11 11:19 ` tibequadorian
2022-04-11 11:21 ` wael444
2022-04-11 11:22 ` [PR PATCH] [Updated] " wael444
2022-04-11 12:29 ` [PR REVIEW] " classabbyamp
2022-04-11 12:30 ` wael444
2022-04-11 12:47 ` [PR PATCH] [Updated] " wael444
2022-04-11 13:11 ` [PR REVIEW] " classabbyamp
2022-04-11 13:46 ` paper42
2022-04-11 13:46 ` paper42
2022-04-11 13:46 ` paper42
2022-04-11 13:47 ` paper42
2022-04-11 13:48 ` paper42
2022-04-11 13:55 ` wael444
2022-04-11 13:57 ` [PR PATCH] [Updated] " wael444
2022-04-11 14:04 ` [PR REVIEW] " paper42
2022-04-11 15:16 ` wael444
2022-04-11 15:17 ` [PR PATCH] [Updated] " wael444
2022-04-11 15:21 ` [PR REVIEW] " classabbyamp
2022-04-11 15:31 ` wael444
2022-04-11 16:38 ` wael444
2022-04-11 18:31 ` 0x5c
2022-04-11 18:34 ` 0x5c
2022-04-11 18:41 ` wael444
2022-04-11 19:08 ` 0x5c
2022-04-11 20:36 ` [PR PATCH] [Updated] " wael444
2022-04-11 20:44 ` wael444
2022-04-11 22:31 ` [PR REVIEW] " 0x5c
2022-04-11 22:34 ` wael444
2022-04-11 22:36 ` wael444 [this message]
2022-04-11 23:26 ` classabbyamp
2022-04-11 23:29 ` wael444
2022-05-07  4:04 ` wael444
2022-05-07  4:24 ` 0x5c
2022-05-07  4:49 ` wael444
2022-05-07  7:32 ` 0x5c
2022-05-11 16:47 ` [PR PATCH] [Updated] " wael444
2022-05-11 16:51 ` wael444
2022-05-11 19:38 ` 0x5c
2022-05-20  5:46 ` [PR PATCH] [Updated] " wael444
2022-05-26  9:20 ` wael444
2022-05-28 21:16 ` [PR PATCH] [Merged]: " leahneukirchen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220411223659.K1h_xEqhL6BI5QI-Yt9EBc7RBBGK0cu9uncl9leCQT4@z \
    --to=wael444@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).