draw faceplate instead of loading png

src/x49gpng/bitmaps.h

@@ -11,11 +11,4 @@
 #include "bitmaps/ann_busy.xbm"
 #include "bitmaps/ann_io.xbm"
 
-#include "bitmaps/button_tiny.xbm"
-#include "bitmaps/button_small.xbm"
-#include "bitmaps/button_normal.xbm"
-#include "bitmaps/button_large.xbm"
-#include "bitmaps/button_round.xbm"
-#include "bitmaps/button_round.pix"
-
 #endif /* !(_X49GP_BITMAPS_H) */

src/x49gpng/bitmaps/button_large.xbm

@@ -1,19 +0,0 @@
-#define button_large_width 46
-#define button_large_height 32
-static unsigned char button_large_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x07,
-   0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x01,
-   0x00, 0xfe, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

src/x49gpng/bitmaps/button_normal.xbm

@@ -1,17 +0,0 @@
-#define button_normal_width 46
-#define button_normal_height 28
-static unsigned char button_normal_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x07,
-   0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
-   0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x01,
-   0x00, 0xfe, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

src/x49gpng/bitmaps/button_round.pix

@@ -1,157 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump */
-
-#ifdef __SUNPRO_C
-#pragma align 4 (button_round)
-#endif
-#ifdef __GNUC__
-static const guint8 button_round[] __attribute__ ((__aligned__ (4))) = 
-#else
-static const guint8 button_round[] = 
-#endif
-{ ""
-  /* Pixbuf magic (0x47646b50) */
-  "GdkP"
-  /* length: header (24) + pixel_data (4356) */
-  "\0\0\21\34"
-  /* pixdata_type (0x1010002) */
-  "\1\1\0\2"
-  /* rowstride (132) */
-  "\0\0\0\204"
-  /* width (33) */
-  "\0\0\0!"
-  /* height (33) */
-  "\0\0\0!"
-  /* pixel_data: */
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\255\0\0\0\244\0\0\0\232\0\0\0\232"
-  "\0\0\0\232\0\0\0\244\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\247\0\0\0\215\0\0\0|\0\0\0o\0\0\0_\0\0\0Z\0\0\0Z\0\0"
-  "\0_\0\0\0f\0\0\0o\0\0\0\201\0\0\0\225\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0"
-  "\0\211\0\0\0h\0\0\0W\0\0\0D\0\0\0:\0\0\0""1\0\0\0/\0\0\0,\0\0\0/\0\0"
-  "\0""4\0\0\0:\0\0\0H\0\0\0Z\0\0\0r\0\0\0\215\0\0\0\255\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0o\0\0\0R\0\0\0:\0"
-  "\0\0*\0\0\0!\0\0\0\34\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0\26\0\0\0\27\0"
-  "\0\0\35\0\0\0#\0\0\0/\0\0\0A\0\0\0W\0\0\0|\0\0\0\244\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\261\0\0\0\215\0\0\0_\0\0\0D\0\0\0,\0\0\0\35\0\0\0"
-  "\26\0\0\0\21\0\0\0\16\0\0\0\15\0\0\0\13\0\0\0\13\0\0\0\13\0\0\0\15\0"
-  "\0\0\16\0\0\0\22\0\0\0\27\0\0\0\37\0\0\0""1\0\0\0K\0\0\0h\0\0\0\225\0"
-  "\0\0\273\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\211\0\0\0_\0\0\0:\0\0\0#\0\0\0\27\0\0\0\20"
-  "\0\0\0\14\0\0\0\10\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\6\0\0\0\6\0"
-  "\0\0\7\0\0\0\11\0\0\0\15\0\0\0\22\0\0\0\31\0\0\0(\0\0\0D\0\0\0h\0\0\0"
-  "\225\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\222\0\0\0_\0\0\0:\0\0\0!\0\0\0\24\0\0\0\15\0\0\0\11\0"
-  "\0\0\6\0\0\0\5\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0"
-  "\4\0\0\0\5\0\0\0\6\0\0\0\11\0\0\0\17\0\0\0\27\0\0\0&\0\0\0D\0\0\0o\0"
-  "\0\0\244\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\244\0\0\0o\0\0\0A\0\0\0#\0\0\0\24\0\0\0\15\0\0\0\10\0\0\0\5\0\0\0"
-  "\4\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0"
-  "\0\0\3\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\16\0\0\0\27\0\0\0*\0\0\0K\0\0\0"
-  "|\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\211"
-  "\0\0\0O\0\0\0*\0\0\0\27\0\0\0\15\0\0\0\10\0\0\0\5\0\0\0\4\0\0\0\3\0\0"
-  "\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2"
-  "\0\0\0\3\0\0\0\4\0\0\0\5\0\0\0\10\0\0\0\17\0\0\0\32\0\0\0""1\0\0\0_\0"
-  "\0\0\222\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\244\0\0\0f\0\0"
-  "\0:\0\0\0\35\0\0\0\20\0\0\0\10\0\0\0\5\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0"
-  "\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0"
-  "\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\12\0\0\0\22\0\0\0!\0\0\0A\0\0\0"
-  "r\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\211\0\0\0R\0\0\0(\0"
-  "\0\0\24\0\0\0\13\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
-  "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2"
-  "\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\7\0\0\0\15\0\0\0\31\0\0\0""1\0\0\0_\0"
-  "\0\0\225\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0y\0\0\0A\0\0\0\37\0\0\0"
-  "\20\0\0\0\10\0\0\0\5\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1"
-  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
-  "\0\2\0\0\0\2\0\0\0\3\0\0\0\5\0\0\0\12\0\0\0\23\0\0\0&\0\0\0O\0\0\0\211"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0\0f\0\0\0""4\0\0\0\31\0\0\0\15"
-  "\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
-  "\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2"
-  "\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\10\0\0\0\17\0\0\0\37\0\0\0A\0\0\0y\0\0"
-  "\0\261\0\0\0\0\0\0\0\0\0\0\0\232\0\0\0_\0\0\0/\0\0\0\27\0\0\0\14\0\0"
-  "\0\6\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
-  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
-  "\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\32\0\0\0""7\0\0\0h\0\0\0"
-  "\255\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0W\0\0\0*\0\0\0\24\0\0\0\12\0\0\0"
-  "\5\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
-  "\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0"
-  "\2\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0f\0\0\0\244"
-  "\0\0\0\0\0\0\0\0\0\0\0\222\0\0\0R\0\0\0(\0\0\0\23\0\0\0\11\0\0\0\5\0"
-  "\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0"
-  "\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0"
-  "\0\0\2\0\0\0\4\0\0\0\6\0\0\0\14\0\0\0\27\0\0\0""1\0\0\0_\0\0\0\244\0"
-  "\0\0\0\0\0\0\0\0\0\0\225\0\0\0W\0\0\0*\0\0\0\24\0\0\0\12\0\0\0\5\0\0"
-  "\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
-  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
-  "\0\2\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0f\0\0\0\244\0\0"
-  "\0\0\0\0\0\0\0\0\0\232\0\0\0_\0\0\0/\0\0\0\26\0\0\0\13\0\0\0\6\0\0\0"
-  "\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
-  "\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
-  "\3\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\32\0\0\0""7\0\0\0h\0\0\0\255\0\0\0"
-  "\0\0\0\0\0\0\0\0\244\0\0\0f\0\0\0""4\0\0\0\31\0\0\0\15\0\0\0\6\0\0\0"
-  "\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
-  "\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
-  "\3\0\0\0\4\0\0\0\10\0\0\0\17\0\0\0\37\0\0\0A\0\0\0r\0\0\0\261\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0y\0\0\0A\0\0\0\37\0\0\0\20\0\0\0\10\0\0\0\5\0\0"
-  "\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
-  "\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0"
-  "\0\5\0\0\0\12\0\0\0\23\0\0\0&\0\0\0O\0\0\0\211\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\211\0\0\0R\0\0\0(\0\0\0\24\0\0\0\13\0\0\0\6\0\0\0\4"
-  "\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
-  "\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\7"
-  "\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0_\0\0\0\225\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\244\0\0\0f\0\0\0""7\0\0\0\35\0\0\0\20\0\0\0\10\0\0\0\5"
-  "\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0"
-  "\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\12"
-  "\0\0\0\23\0\0\0!\0\0\0D\0\0\0r\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\211\0\0\0O\0\0\0*\0\0\0\27\0\0\0\15\0\0\0\10\0\0\0"
-  "\5\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
-  "\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\5\0\0\0\10\0\0\0\17\0\0"
-  "\0\32\0\0\0""1\0\0\0_\0\0\0\222\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\244\0\0\0o\0\0\0D\0\0\0#\0\0\0\24\0\0\0\15\0\0\0\7\0"
-  "\0\0\5\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0"
-  "\2\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\16\0\0\0\27\0\0\0*"
-  "\0\0\0K\0\0\0|\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\222\0\0\0_\0\0\0:\0\0\0!\0\0\0\24\0\0\0\15\0\0\0\11"
-  "\0\0\0\6\0\0\0\5\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\4\0\0"
-  "\0\4\0\0\0\5\0\0\0\6\0\0\0\12\0\0\0\17\0\0\0\27\0\0\0&\0\0\0D\0\0\0h"
-  "\0\0\0\244\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\215\0\0\0_\0\0\0>\0\0\0#\0\0\0\27\0\0\0\20\0\0\0"
-  "\14\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\6\0\0\0\6\0\0\0\7"
-  "\0\0\0\11\0\0\0\15\0\0\0\22\0\0\0\32\0\0\0*\0\0\0D\0\0\0h\0\0\0\225\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\261\0\0\0\215\0\0\0_\0\0\0D\0\0\0*\0\0\0\35\0\0\0\26"
-  "\0\0\0\21\0\0\0\15\0\0\0\14\0\0\0\13\0\0\0\12\0\0\0\13\0\0\0\15\0\0\0"
-  "\17\0\0\0\22\0\0\0\27\0\0\0\37\0\0\0""1\0\0\0K\0\0\0o\0\0\0\225\0\0\0"
-  "\273\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0r\0\0\0R\0\0\0:\0\0\0"
-  "*\0\0\0\37\0\0\0\32\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0\27\0\0\0\31\0\0"
-  "\0\35\0\0\0#\0\0\0/\0\0\0A\0\0\0Z\0\0\0y\0\0\0\244\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0\0\211\0\0\0h\0\0\0R"
-  "\0\0\0D\0\0\0:\0\0\0""1\0\0\0/\0\0\0,\0\0\0/\0\0\0""4\0\0\0:\0\0\0H\0"
-  "\0\0Z\0\0\0r\0\0\0\215\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0\0\215\0\0\0|\0"
-  "\0\0o\0\0\0f\0\0\0_\0\0\0_\0\0\0_\0\0\0f\0\0\0o\0\0\0\201\0\0\0\225\0"
-  "\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\255\0"
-  "\0\0\244\0\0\0\232\0\0\0\232\0\0\0\232\0\0\0\244\0\0\0\255\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-  "\0\0\0\0\0\0\0\0\0"};
-
-

src/x49gpng/bitmaps/button_round.xbm

@@ -1,17 +0,0 @@
-#define button_round_width 33
-#define button_round_height 33
-static unsigned char button_round_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0xfc,
-   0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x80, 0xff, 0xff, 0x03,
-   0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0xf0,
-   0xff, 0xff, 0x1f, 0x00, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff,
-   0x3f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00,
-   0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff,
-   0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff,
-   0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe,
-   0xff, 0xff, 0xff, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfc, 0xff, 0xff,
-   0x7f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xf8, 0xff, 0xff, 0x3f, 0x00,
-   0xf8, 0xff, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0xff, 0x1f, 0x00, 0xe0, 0xff,
-   0xff, 0x0f, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0x80, 0xff, 0xff, 0x03,
-   0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00,
-   0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

src/x49gpng/bitmaps/button_small.xbm

@@ -1,15 +0,0 @@
-#define button_small_width 36
-#define button_small_height 28
-static unsigned char button_small_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0x01, 0xfc, 0xff, 0xff, 0xff,
-   0x03, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
-   0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
-   0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07,
-   0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff,
-   0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff,
-   0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
-   0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
-   0xff, 0x07, 0xfc, 0xff, 0xff, 0xff, 0x03, 0xf0, 0xff, 0xff, 0xff, 0x00,
-   0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

src/x49gpng/bitmaps/button_tiny.xbm

@@ -1,13 +0,0 @@
-#define button_tiny_width 36
-#define button_tiny_height 22
-static unsigned char button_tiny_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
-   0xff, 0xff, 0x01, 0xfc, 0xff, 0xff, 0xff, 0x03, 0xfe, 0xff, 0xff, 0xff,
-   0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
-   0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
-   0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07,
-   0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff,
-   0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff,
-   0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfc,
-   0xff, 0xff, 0xff, 0x03, 0xf8, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
-   0x00, 0x00};

src/x49gpng/symbol.c

@@ -12,23 +12,19 @@
 static const cairo_path_data_t symbol_square_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.100 ), SYMBOL_LINE_TO( 0.500, 0.000 ),
                                                              SYMBOL_LINE_TO( 0.000, 0.500 ), SYMBOL_LINE_TO( -0.500, 0.000 ),
                                                              SYMBOL_CLOSE_PATH() };
-
 SYMBOL( square, 0.7, 0.0, 0.1, 0.1, 0.6, 0.6 );
 
 static const cairo_path_data_t symbol_triangleup_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.000 ), SYMBOL_LINE_TO( 0.800, 0.000 ),
                                                                  SYMBOL_LINE_TO( -0.400, 0.693 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( triangleup, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
 
 static const cairo_path_data_t symbol_triangleright_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.000 ), SYMBOL_LINE_TO( 0.000, 0.800 ),
                                                                     SYMBOL_LINE_TO( 0.693, -0.400 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( triangleright, 0.893, 0.0, 0.1, 0.0, 0.793, 0.8 );
 
 static const cairo_path_data_t symbol_arrowleftdblfull_path_data[] = {
     SYMBOL_MOVE_TO( 0.100, 0.370 ),  SYMBOL_LINE_TO( 0.652, 0.500 ),  SYMBOL_LINE_TO( 0.000, -0.250 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
     SYMBOL_LINE_TO( 0.000, -0.500 ), SYMBOL_LINE_TO( -1.000, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.250 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( arrowleftdblfull, 1.852, 0.0, 0.1, -0.13, 1.752, 0.87 );
 
 static const cairo_path_data_t symbol_uparrowleft_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.500 ),  SYMBOL_LINE_TO( 0.600, 0.200 ),
@@ -36,7 +32,6 @@ static const cairo_path_data_t symbol_uparrowleft_path_data[] = { SYMBOL_MOVE_TO
                                                                   SYMBOL_LINE_TO( 0.000, -0.550 ), SYMBOL_LINE_TO( -0.100, 0.000 ),
                                                                   SYMBOL_LINE_TO( 0.000, 0.450 ),  SYMBOL_LINE_TO( -0.400, 0.000 ),
                                                                   SYMBOL_LINE_TO( 0.000, -0.150 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( uparrowleft, 1.3, 0.0, 0.1, 0.0, 1.2, 0.7 );
 
 static const cairo_path_data_t symbol_uparrowright_path_data[] = { SYMBOL_MOVE_TO( 1.200, 0.500 ),  SYMBOL_LINE_TO( -0.600, 0.200 ),
@@ -44,13 +39,11 @@ static const cairo_path_data_t symbol_uparrowright_path_data[] = { SYMBOL_MOVE_T
                                                                    SYMBOL_LINE_TO( 0.000, -0.550 ), SYMBOL_LINE_TO( 0.100, 0.000 ),
                                                                    SYMBOL_LINE_TO( 0.000, 0.450 ),  SYMBOL_LINE_TO( 0.400, 0.000 ),
                                                                    SYMBOL_LINE_TO( 0.000, -0.150 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( uparrowright, 1.3, 0.0, 0.1, 0.0, 1.2, 0.7 );
 
 static const cairo_path_data_t symbol_tick_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.400 ), SYMBOL_LINE_TO( 0.000, 0.450 ),
                                                            SYMBOL_LINE_TO( 0.150, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.450 ),
                                                            SYMBOL_CLOSE_PATH() };
-
 SYMBOL( tick, 0.35, 0.0, 0.1, 0.4, 0.25, 0.85 );
 
 static const cairo_path_data_t symbol_radical_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.500 ),   SYMBOL_LINE_TO( 0.214, 0.100 ),
@@ -58,19 +51,16 @@ static const cairo_path_data_t symbol_radical_path_data[] = { SYMBOL_MOVE_TO( 0.
                                                               SYMBOL_LINE_TO( 0.077, 0.000 ),   SYMBOL_LINE_TO( 0.000, -0.100 ),
                                                               SYMBOL_LINE_TO( -0.281, -1.050 ), SYMBOL_LINE_TO( -0.287, 0.616 ),
                                                               SYMBOL_LINE_TO( -0.123, -0.057 ), SYMBOL_CLOSE_PATH() };
-
 SYMBOL( radical, 0.733, 0.0, 0.0, -0.15, 0.733, 1.0 );
 
 static const cairo_path_data_t symbol_overscore_path_data[] = { SYMBOL_MOVE_TO( 0.000, 1.000 ), SYMBOL_LINE_TO( 0.900, 0.000 ),
                                                                 SYMBOL_LINE_TO( 0.000, -0.100 ), SYMBOL_LINE_TO( -0.900, 0.000 ),
                                                                 SYMBOL_CLOSE_PATH() };
-
 SYMBOL( overscore, 0.8, 0.0, 0.0, 0.9, 0.9, 1.0 );
 
 static const cairo_path_data_t symbol_minus_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.312 ), SYMBOL_LINE_TO( 0.000, 0.118 ),
                                                             SYMBOL_LINE_TO( 0.500, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.118 ),
                                                             SYMBOL_CLOSE_PATH() };
-
 SYMBOL( minus, 0.6, 0.0, 0.05, 0.312, 0.55, 0.430 );
 
 static const cairo_path_data_t symbol_divide_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.312 ),
@@ -88,15 +78,29 @@ static const cairo_path_data_t symbol_divide_path_data[] = { SYMBOL_MOVE_TO( 0.0
                                                              SYMBOL_LINE_TO( 0.135, 0.000 ),
                                                              SYMBOL_LINE_TO( 0.000, -0.135 ),
                                                              SYMBOL_CLOSE_PATH() };
-
 SYMBOL( divide, 0.6, 0.0, 0.05, 0.069, 0.55, 0.673 );
 
 static const cairo_path_data_t symbol_divisionslash_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.000 ), SYMBOL_LINE_TO( 0.345, 0.739 ),
                                                                     SYMBOL_LINE_TO( 0.130, 0.000 ), SYMBOL_LINE_TO( -0.345, -0.739 ),
                                                                     SYMBOL_CLOSE_PATH() };
-
 SYMBOL( divisionslash, 0.575, 0.000, 0.050, 0.000, 0.525, 0.739 );
 
+static const cairo_path_data_t symbol_arrowup_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.000 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
+                                                              SYMBOL_LINE_TO( -0.500, 1.000 ), SYMBOL_CLOSE_PATH() };
+SYMBOL( arrowup, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
+
+static const cairo_path_data_t symbol_arrowdown_path_data[] = { SYMBOL_MOVE_TO( 0.000, 1.000 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
+                                                                SYMBOL_LINE_TO( -0.500, -1.000 ), SYMBOL_CLOSE_PATH() };
+SYMBOL( arrowdown, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
+
+static const cairo_path_data_t symbol_arrowleft_path_data[] = { SYMBOL_MOVE_TO( 1.000, 0.000 ), SYMBOL_LINE_TO( 0.000, 1.000 ),
+                                                                SYMBOL_LINE_TO( -1.000, -0.500 ), SYMBOL_CLOSE_PATH() };
+SYMBOL( arrowleft, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
+
+static const cairo_path_data_t symbol_arrowright_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.000 ), SYMBOL_LINE_TO( 0.000, 1.000 ),
+                                                                 SYMBOL_LINE_TO( 1.000, -0.500 ), SYMBOL_CLOSE_PATH() };
+SYMBOL( arrowright, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
+
 CONTROL( beginsuperscript, 0.0, 0.5, 1.0, 0.8 );
 CONTROL( endsuperscript, 0.0, 0.5, 1.25, 1.0 );
 
@@ -140,6 +144,11 @@ static const symbol_name_t symbol_names[] = {
     {"kern-7",           &symbol_kern_m7         },
     {"kern-8",           &symbol_kern_m8         },
     {"kern-9",           &symbol_kern_m9         },
+    {"arrowup",          &symbol_arrowup         },
+    {"arrowdown",        &symbol_arrowdown       },
+    {"arrowleft",        &symbol_arrowleft       },
+    {"arrowright",       &symbol_arrowright      },
+
     {NULL,               NULL                    }
 };
 #define NR_SYMBOLS ( sizeof( symbol_names ) / sizeof( symbol_names[ 0 ] ) - 1 )

src/x49gpng/x49gp_ui.h

@@ -40,15 +40,6 @@ typedef enum {
     UI_COLOR_MAX
 } x49gp_ui_color_t;
 
-typedef enum {
-    UI_SHAPE_BUTTON_TINY = 0,
-    UI_SHAPE_BUTTON_SMALL,
-    UI_SHAPE_BUTTON_NORMAL,
-    UI_SHAPE_BUTTON_LARGE,
-    UI_SHAPE_BUTTON_ROUND,
-    UI_SHAPE_MAX
-} x49gp_ui_shape_t;
-
 typedef enum { UI_LAYOUT_LEFT = 0, UI_LAYOUT_LEFT_NO_SPACE, UI_LAYOUT_BELOW, UI_LAYOUT_MAX } x49gp_ui_layout_t;
 
 typedef enum {
@@ -67,7 +58,6 @@ typedef struct {
     x49gp_ui_color_t color;
     double font_size;
     cairo_font_weight_t font_weight;
-    x49gp_ui_shape_t shape;
     double letter_size;
     x49gp_ui_layout_t layout;
     int x;
@@ -105,7 +95,6 @@ struct __x49gp_ui_s__ {
     GtkWidget* background;
 
     GdkColor colors[ UI_COLOR_MAX ];
-    GdkBitmap* shapes[ UI_SHAPE_MAX ];
 
     x49gp_ui_calculator_t calculator;