From f6af0857849e235f49be1c0db585660ec0348c04 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 20 Jul 2010 23:06:54 +0200 Subject: [PATCH] Move static byte arrays to xcb.c (fixes compilation warnings) --- cursors.h | 27 ++++----------------------- xcb.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/cursors.h b/cursors.h index 23fd30f..45a6ff2 100644 --- a/cursors.h +++ b/cursors.h @@ -1,27 +1,8 @@ +#ifndef _CURSORS_H +#define _CURSORS_H + #define CURS_NONE 0 #define CURS_WIN 1 #define CURS_DEFAULT 2 -#define curs_invisible_width 8 -#define curs_invisible_height 8 - -static unsigned char curs_invisible_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - -#define curs_windows_width 11 -#define curs_windows_height 19 - -static unsigned char curs_windows_bits[] = { - 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, - 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, - 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, - 0x7f, 0x06 }; - -#define mask_windows_width 11 -#define mask_windows_height 19 - -static unsigned char mask_windows_bits[] = { - 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, - 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, - 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, - 0x80, 0x01 }; +#endif diff --git a/xcb.c b/xcb.c index 70f1374..bf9f994 100644 --- a/xcb.c +++ b/xcb.c @@ -20,6 +20,30 @@ #include "cursors.h" +#define curs_invisible_width 8 +#define curs_invisible_height 8 + +static unsigned char curs_invisible_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + +#define curs_windows_width 11 +#define curs_windows_height 19 + +static unsigned char curs_windows_bits[] = { + 0xfe, 0x07, 0xfc, 0x07, 0xfa, 0x07, 0xf6, 0x07, 0xee, 0x07, 0xde, 0x07, + 0xbe, 0x07, 0x7e, 0x07, 0xfe, 0x06, 0xfe, 0x05, 0x3e, 0x00, 0xb6, 0x07, + 0x6a, 0x07, 0x6c, 0x07, 0xde, 0x06, 0xdf, 0x06, 0xbf, 0x05, 0xbf, 0x05, + 0x7f, 0x06 }; + +#define mask_windows_width 11 +#define mask_windows_height 19 + +static unsigned char mask_windows_bits[] = { + 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x1f, 0x00, 0x3f, 0x00, + 0x7f, 0x00, 0xff, 0x00, 0xff, 0x01, 0xff, 0x03, 0xff, 0x07, 0x7f, 0x00, + 0xf7, 0x00, 0xf3, 0x00, 0xe1, 0x01, 0xe0, 0x01, 0xc0, 0x03, 0xc0, 0x03, + 0x80, 0x01 }; + static uint32_t get_colorpixel(char *hex) { char strgroups[3][3] = {{hex[0], hex[1], '\0'}, {hex[2], hex[3], '\0'}, -- 2.39.2