1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00

Change bitmaps back to X11-compatible types.

This commit is contained in:
Paul Eggert 2011-04-16 01:30:05 -07:00
parent 55660072db
commit 63d2b86e5d
14 changed files with 48 additions and 43 deletions

View File

@ -1,5 +1,10 @@
2011-04-16 Paul Eggert <eggert@cs.ucla.edu>
* bitmaps: Change bitmaps from unsigned char back to the X11
compatible char. Avoid the old compiler warnings about
out-of-range initializers by using, for example, '\xab' rather
than 0xab.
* xgselect.c (xgselect_initialize): Check vs interface
even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).

View File

@ -1,6 +1,6 @@
#define cntr_ptrmsk_width 16
#define cntr_ptrmsk_height 16
static unsigned char cntr_ptrmsk_bits[] = {
0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f,
0xf8, 0x1f, 0xf8, 0x1f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xdc, 0x3b,
0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03};
static char cntr_ptrmsk_bits[] = {
'\xc0','\x03','\xc0','\x03','\xe0','\x07','\xe0','\x07','\xf0','\x0f','\xf0','\x0f',
'\xf8','\x1f','\xf8','\x1f','\xfc','\x3f','\xfc','\x3f','\xfc','\x3f','\xdc','\x3b',
'\xc0','\x03','\xc0','\x03','\xc0','\x03','\xc0','\x03'};

View File

@ -2,7 +2,7 @@
#define cntr_ptr_height 16
#define cntr_ptr_x_hot 7
#define cntr_ptr_y_hot 1
static unsigned char cntr_ptr_bits[] = {
0x00, 0x00, 0x80, 0x01, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07,
0xe0, 0x07, 0xf0, 0x0f, 0xf0, 0x0f, 0x98, 0x19, 0x88, 0x11, 0x80, 0x01,
0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x00, 0x00};
static char cntr_ptr_bits[] = {
'\x00','\x00','\x80','\x01','\x80','\x01','\xc0','\x03','\xc0','\x03','\xe0','\x07',
'\xe0','\x07','\xf0','\x0f','\xf0','\x0f','\x98','\x19','\x88','\x11','\x80','\x01',
'\x80','\x01','\x80','\x01','\x80','\x01','\x00','\x00'};

View File

@ -1,6 +1,6 @@
#define cross_weave_width 16
#define cross_weave_height 16
static unsigned char cross_weave_bits[] = {
0x55, 0x55, 0x88, 0x88, 0x55, 0x55, 0x22, 0x22, 0x55, 0x55, 0x88, 0x88,
0x55, 0x55, 0x22, 0x22, 0x55, 0x55, 0x88, 0x88, 0x55, 0x55, 0x22, 0x22,
0x55, 0x55, 0x88, 0x88, 0x55, 0x55, 0x22, 0x22};
static char cross_weave_bits[] = {
'\x55','\x55','\x88','\x88','\x55','\x55','\x22','\x22','\x55','\x55','\x88','\x88',
'\x55','\x55','\x22','\x22','\x55','\x55','\x88','\x88','\x55','\x55','\x22','\x22',
'\x55','\x55','\x88','\x88','\x55','\x55','\x22','\x22'};

View File

@ -1,6 +1,6 @@
#define dimple1_width 16
#define dimple1_height 16
static unsigned char dimple1_bits[] = {
0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00,
0x55, 0x55, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00};
static char dimple1_bits[] = {
'\x55','\x55','\x00','\x00','\x55','\x55','\x00','\x00','\x55','\x55','\x00','\x00',
'\x55','\x55','\x00','\x00','\x55','\x55','\x00','\x00','\x55','\x55','\x00','\x00',
'\x55','\x55','\x00','\x00','\x55','\x55','\x00','\x00'};

View File

@ -1,6 +1,6 @@
#define dimple3_width 16
#define dimple3_height 16
static unsigned char dimple3_bits[] = {
0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static char dimple3_bits[] = {
'\x11','\x11','\x00','\x00','\x00','\x00','\x00','\x00','\x11','\x11','\x00','\x00',
'\x00','\x00','\x00','\x00','\x11','\x11','\x00','\x00','\x00','\x00','\x00','\x00',
'\x11','\x11','\x00','\x00','\x00','\x00','\x00','\x00'};

View File

@ -1,4 +1,4 @@
#define gray_width 2
#define gray_height 2
static char gray_bits[] = {
0x01, 0x02};
'\x01','\x02'};

View File

@ -1,4 +1,4 @@
#define gray1_width 2
#define gray1_height 2
static unsigned char gray1_bits[] = {
0x01, 0x02};
static char gray1_bits[] = {
'\x01','\x02'};

View File

@ -1,4 +1,4 @@
#define gray3_width 4
#define gray3_height 4
static unsigned char gray3_bits[] = {
0x01, 0x00, 0x04, 0x00};
static char gray3_bits[] = {
'\x01','\x00','\x04','\x00'};

View File

@ -1,6 +1,6 @@
#define left_ptrmsk_width 16
#define left_ptrmsk_height 16
static unsigned char left_ptrmsk_bits[] = {
0x0c, 0x00, 0x1c, 0x00, 0x3c, 0x00, 0x7c, 0x00, 0xfc, 0x00, 0xfc, 0x01,
0xfc, 0x03, 0xfc, 0x07, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x01, 0xdc, 0x03,
0xcc, 0x03, 0x80, 0x07, 0x80, 0x07, 0x00, 0x03};
static char left_ptrmsk_bits[] = {
'\x0c','\x00','\x1c','\x00','\x3c','\x00','\x7c','\x00','\xfc','\x00','\xfc','\x01',
'\xfc','\x03','\xfc','\x07','\xfc','\x0f','\xfc','\x0f','\xfc','\x01','\xdc','\x03',
'\xcc','\x03','\x80','\x07','\x80','\x07','\x00','\x03'};

View File

@ -2,7 +2,7 @@
#define left_ptr_height 16
#define left_ptr_x_hot 3
#define left_ptr_y_hot 1
static unsigned char left_ptr_bits[] = {
0x00, 0x00, 0x08, 0x00, 0x18, 0x00, 0x38, 0x00, 0x78, 0x00, 0xf8, 0x00,
0xf8, 0x01, 0xf8, 0x03, 0xf8, 0x07, 0xf8, 0x00, 0xd8, 0x00, 0x88, 0x01,
0x80, 0x01, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00};
static char left_ptr_bits[] = {
'\x00','\x00','\x08','\x00','\x18','\x00','\x38','\x00','\x78','\x00','\xf8','\x00',
'\xf8','\x01','\xf8','\x03','\xf8','\x07','\xf8','\x00','\xd8','\x00','\x88','\x01',
'\x80','\x01','\x00','\x03','\x00','\x03','\x00','\x00'};

View File

@ -1,6 +1,6 @@
#define right_ptrmsk_width 16
#define right_ptrmsk_height 16
static unsigned char right_ptrmsk_bits[] = {
0x00, 0x30, 0x00, 0x38, 0x00, 0x3c, 0x00, 0x3e, 0x00, 0x3f, 0x80, 0x3f,
0xc0, 0x3f, 0xe0, 0x3f, 0xf0, 0x3f, 0xf0, 0x3f, 0x80, 0x3f, 0xc0, 0x3b,
0xc0, 0x33, 0xe0, 0x01, 0xe0, 0x01, 0xc0, 0x00};
static char right_ptrmsk_bits[] = {
'\x00','\x30','\x00','\x38','\x00','\x3c','\x00','\x3e','\x00','\x3f','\x80','\x3f',
'\xc0','\x3f','\xe0','\x3f','\xf0','\x3f','\xf0','\x3f','\x80','\x3f','\xc0','\x3b',
'\xc0','\x33','\xe0','\x01','\xe0','\x01','\xc0','\x00'};

View File

@ -2,7 +2,7 @@
#define right_ptr_height 16
#define right_ptr_x_hot 12
#define right_ptr_y_hot 1
static unsigned char right_ptr_bits[] = {
0x00, 0x00, 0x00, 0x10, 0x00, 0x18, 0x00, 0x1c, 0x00, 0x1e, 0x00, 0x1f,
0x80, 0x1f, 0xc0, 0x1f, 0xe0, 0x1f, 0x00, 0x1f, 0x00, 0x1b, 0x80, 0x11,
0x80, 0x01, 0xc0, 0x00, 0xc0, 0x00, 0x00, 0x00};
static char right_ptr_bits[] = {
'\x00','\x00','\x00','\x10','\x00','\x18','\x00','\x1c','\x00','\x1e','\x00','\x1f',
'\x80','\x1f','\xc0','\x1f','\xe0','\x1f','\x00','\x1f','\x00','\x1b','\x80','\x11',
'\x80','\x01','\xc0','\x00','\xc0','\x00','\x00','\x00'};

View File

@ -1,4 +1,4 @@
#define stipple_width 16
#define stipple_height 4
static unsigned char stipple_bits[] = {
0x55, 0x55, 0xee, 0xee, 0x55, 0x55, 0xba, 0xbb};
static char stipple_bits[] = {
'\x55','\x55','\xee','\xee','\x55','\x55','\xba','\xbb'};