From dd09f54329385afee4fd93c1e5fd01bf4e77cdb2 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Mon, 22 Jul 2024 09:27:12 +0900 Subject: [PATCH] mouse: Use system cursor if possible --- src/bitmaps/curbm0.xbm | 12 ---------- src/bitmaps/curbm1.xbm | 12 ---------- src/bitmaps/curbm2.xbm | 12 ---------- src/bitmaps/curbm3.xbm | 12 ---------- src/bitmaps/curbm4.xbm | 12 ---------- src/bitmaps/curbm5.xbm | 12 ---------- src/bitmaps/curbm6.xbm | 12 ---------- src/bitmaps/cursor_arrow.xpm | 43 ----------------------------------- src/bitmaps/cursor_busy.xpm | 42 ---------------------------------- src/bitmaps/cursor_cross.xpm | 43 ----------------------------------- src/bitmaps/cursor_ibeam.xpm | 43 ----------------------------------- src/bitmaps/cursor_move.xpm | 42 ---------------------------------- src/bitmaps/cursor_no.xpm | 42 ---------------------------------- src/bitmaps/cursor_size_h.xpm | 42 ---------------------------------- src/bitmaps/cursor_size_l.xpm | 42 ---------------------------------- src/bitmaps/cursor_size_r.xpm | 42 ---------------------------------- src/bitmaps/cursor_size_v.xpm | 42 ---------------------------------- src/bitmaps/maskbm0.xbm | 12 ---------- src/bitmaps/maskbm1.xbm | 12 ---------- src/bitmaps/maskbm2.xbm | 12 ---------- src/bitmaps/maskbm3.xbm | 12 ---------- src/bitmaps/maskbm4.xbm | 12 ---------- src/bitmaps/maskbm5.xbm | 12 ---------- src/bitmaps/maskbm6.xbm | 12 ---------- src/sdl_cursor.c | 34 ++++++++++----------------- 25 files changed, 12 insertions(+), 613 deletions(-) delete mode 100644 src/bitmaps/curbm0.xbm delete mode 100644 src/bitmaps/curbm1.xbm delete mode 100644 src/bitmaps/curbm2.xbm delete mode 100644 src/bitmaps/curbm3.xbm delete mode 100644 src/bitmaps/curbm4.xbm delete mode 100644 src/bitmaps/curbm5.xbm delete mode 100644 src/bitmaps/curbm6.xbm delete mode 100644 src/bitmaps/cursor_arrow.xpm delete mode 100644 src/bitmaps/cursor_busy.xpm delete mode 100644 src/bitmaps/cursor_cross.xpm delete mode 100644 src/bitmaps/cursor_ibeam.xpm delete mode 100644 src/bitmaps/cursor_move.xpm delete mode 100644 src/bitmaps/cursor_no.xpm delete mode 100644 src/bitmaps/cursor_size_h.xpm delete mode 100644 src/bitmaps/cursor_size_l.xpm delete mode 100644 src/bitmaps/cursor_size_r.xpm delete mode 100644 src/bitmaps/cursor_size_v.xpm delete mode 100644 src/bitmaps/maskbm0.xbm delete mode 100644 src/bitmaps/maskbm1.xbm delete mode 100644 src/bitmaps/maskbm2.xbm delete mode 100644 src/bitmaps/maskbm3.xbm delete mode 100644 src/bitmaps/maskbm4.xbm delete mode 100644 src/bitmaps/maskbm5.xbm delete mode 100644 src/bitmaps/maskbm6.xbm diff --git a/src/bitmaps/curbm0.xbm b/src/bitmaps/curbm0.xbm deleted file mode 100644 index 4d8873d..0000000 --- a/src/bitmaps/curbm0.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm0_width 32 -#define curbm0_height 32 -static char curbm0_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,0x08, - 0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x28,0x00,0x00,0x00,0x48,0x00,0x00,0x00, - 0x88,0x00,0x00,0x00,0x08,0x01,0x00,0x00,0x08,0x02,0x00,0x00,0x08,0x04,0x00, - 0x00,0x08,0x08,0x00,0x00,0x08,0x10,0x00,0x00,0x08,0x3e,0x00,0x00,0x48,0x02, - 0x00,0x00,0xa8,0x04,0x00,0x00,0x98,0x04,0x00,0x00,0x08,0x09,0x00,0x00,0x00, - 0x09,0x00,0x00,0x00,0x12,0x00,0x00,0x00,0x12,0x00,0x00,0x00,0x0c,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/src/bitmaps/curbm1.xbm b/src/bitmaps/curbm1.xbm deleted file mode 100644 index 12f5989..0000000 --- a/src/bitmaps/curbm1.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm1_width 32 -#define curbm1_height 32 -static char curbm1_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xf3,0x9f,0xff,0xff,0xf5,0x5f,0xff,0xff,0xf6,0xdf,0xfe, - 0x7f,0x07,0xc0,0xfd,0xbf,0xff,0xff,0xfb,0x7f,0x07,0xc0,0xfd,0xff,0xf6,0xdf, - 0xfe,0xff,0xf5,0x5f,0xff,0xff,0xf3,0x9f,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/curbm2.xbm b/src/bitmaps/curbm2.xbm deleted file mode 100644 index ffc6721..0000000 --- a/src/bitmaps/curbm2.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm2_width 32 -#define curbm2_height 32 -static char curbm2_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x7f, - 0xff,0xff,0xff,0xbf,0xfe,0xff,0xff,0xdf,0xfd,0xff,0xff,0xef,0xfb,0xff,0xff, - 0xf7,0xf7,0xff,0xff,0x87,0xf0,0xff,0xff,0xbf,0xfe,0xff,0xff,0xbf,0xfe,0xff, - 0xff,0xbf,0xfe,0xff,0xff,0xbf,0xfe,0xff,0xff,0xbf,0xfe,0xff,0xff,0xbf,0xfe, - 0xff,0xff,0xbf,0xfe,0xff,0xff,0xbf,0xfe,0xff,0xff,0x87,0xf0,0xff,0xff,0xf7, - 0xf7,0xff,0xff,0xef,0xfb,0xff,0xff,0xdf,0xfd,0xff,0xff,0xbf,0xfe,0xff,0xff, - 0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/curbm3.xbm b/src/bitmaps/curbm3.xbm deleted file mode 100644 index 6aad135..0000000 --- a/src/bitmaps/curbm3.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm3_width 32 -#define curbm3_height 32 -static char curbm3_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0x7d,0xff,0xff,0xff, - 0xbd,0xff,0xff,0xff,0xdd,0xff,0xff,0xff,0xad,0xff,0xff,0xff,0x55,0xff,0xff, - 0xff,0xb9,0xfe,0xff,0xff,0x7f,0xfd,0xff,0xff,0xff,0x3a,0xff,0xff,0xff,0x55, - 0xff,0xff,0xff,0x6b,0xff,0xff,0xff,0x77,0xff,0xff,0xff,0x7b,0xff,0xff,0xff, - 0x7d,0xff,0xff,0xff,0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/curbm4.xbm b/src/bitmaps/curbm4.xbm deleted file mode 100644 index 393a051..0000000 --- a/src/bitmaps/curbm4.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm4_width 32 -#define curbm4_height 32 -static char curbm4_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x80,0xff,0xff,0xff,0xbe,0xff,0xff, - 0xff,0xbd,0xff,0xff,0xff,0xbb,0xff,0xff,0xff,0xb5,0xff,0xff,0xff,0xaa,0xff, - 0xff,0x7f,0x9d,0xff,0xff,0xbf,0xfe,0xff,0xff,0x5c,0xff,0xff,0xff,0xaa,0xff, - 0xff,0xff,0xd6,0xff,0xff,0xff,0xee,0xff,0xff,0xff,0xde,0xff,0xff,0xff,0xbe, - 0xff,0xff,0xff,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/curbm5.xbm b/src/bitmaps/curbm5.xbm deleted file mode 100644 index 75153c3..0000000 --- a/src/bitmaps/curbm5.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm5_width 32 -#define curbm5_height 32 -static char curbm5_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0x00,0x80,0xff,0xff,0xfe,0xbf,0xff,0xff,0x06,0xb0,0xff,0xff,0xfe, - 0xbf,0xff,0xff,0x05,0xd0,0xff,0xff,0x05,0xd0,0xff,0xff,0xa5,0xd2,0xff,0xff, - 0x45,0xd1,0xff,0xff,0x8d,0xd8,0xff,0xff,0x1b,0xec,0xff,0xff,0xb7,0xf6,0xff, - 0xff,0x6f,0xfb,0xff,0xff,0x6f,0xfb,0xff,0xff,0x37,0xf6,0xff,0xff,0x9b,0xec, - 0xff,0xff,0x0d,0xd8,0xff,0xff,0x85,0xd0,0xff,0xff,0x45,0xd1,0xff,0xff,0xa5, - 0xd2,0xff,0xff,0x55,0xd5,0xff,0xff,0xfe,0xbf,0xff,0xff,0x06,0xb0,0xff,0xff, - 0xfe,0xbf,0xff,0xff,0x00,0x80,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/curbm6.xbm b/src/bitmaps/curbm6.xbm deleted file mode 100644 index 4436108..0000000 --- a/src/bitmaps/curbm6.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define curbm6_width 32 -#define curbm6_height 32 -static char curbm6_bits[] = { - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xfe,0xff,0xff,0x7f,0xfd,0xff,0xff,0xbf,0xfb,0xff,0xff,0xdf, - 0xf7,0xff,0xff,0xef,0xef,0xff,0xff,0x0f,0xe0,0xff,0xff,0x7f,0xfd,0xff,0xff, - 0x7f,0xfd,0xff,0xff,0x7c,0x7d,0xfe,0x7f,0x7d,0x7d,0xfd,0xbf,0x7d,0x7d,0xfb, - 0xdf,0x01,0x01,0xf7,0xef,0xfd,0x7f,0xef,0xdf,0x01,0x01,0xf7,0xbf,0x7d,0x7d, - 0xfb,0x7f,0x7d,0x7d,0xfd,0xff,0x7c,0x7d,0xfe,0xff,0x7f,0xfd,0xff,0xff,0x7f, - 0xfd,0xff,0xff,0x0f,0xe0,0xff,0xff,0xef,0xef,0xff,0xff,0xdf,0xf7,0xff,0xff, - 0xbf,0xfb,0xff,0xff,0x7f,0xfd,0xff,0xff,0xff,0xfe,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; diff --git a/src/bitmaps/cursor_arrow.xpm b/src/bitmaps/cursor_arrow.xpm deleted file mode 100644 index 4214865..0000000 --- a/src/bitmaps/cursor_arrow.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *cursor_arrow[] = { - /* width height num_colors chars_per_pixel */ - " 32 32 3 1", - /* colors */ - "X c #000000", - ". c #ffffff", - " c None", - /* pixels */ - "X ", - "XX ", - "X.X ", - "X..X ", - "X...X ", - "X....X ", - "X.....X ", - "X......X ", - "X.......X ", - "X........X ", - "X.....XXXXX ", - "X..X..X ", - "X.X X..X ", - "XX X..X ", - "X X..X ", - " X..X ", - " X..X ", - " X..X ", - " XX ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "0,0" -}; diff --git a/src/bitmaps/cursor_busy.xpm b/src/bitmaps/cursor_busy.xpm deleted file mode 100644 index 3d07f58..0000000 --- a/src/bitmaps/cursor_busy.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_busy[] = { - /* columns rows colors chars-per-pixel */ - "32 32 3 1", - "X c #ffffff", - ". c #000000", - " c None", - /* pixels */ -" ", -" ", -" ", -" XXXXXXXXXXXXXXXXX ", -" X...............X ", -" X.XXXXXXXXXXXXX.X ", -" X.XX.........XX.X ", -" X.XXXXXXXXXXXXX.X ", -" X.X.........X.X ", -" X.X.........X.X ", -" X.X..X.X.X..X.X ", -" X.X...X.X...X.X ", -" X.XX...X...XX.X ", -" X.XX.....XX.X ", -" X.XX.X.XX.X ", -" X.XX.XX.X ", -" X.XX.XX.X ", -" X.XX...XX.X ", -" X.XX..X..XX.X ", -" X.XX.......XX.X ", -" X.X....X....X.X ", -" X.X...X.X...X.X ", -" X.X..X.X.X..X.X ", -" X.X.X.X.X.X.X.X ", -" X.XXXXXXXXXXXXX.X ", -" X.XX.........XX.X ", -" X.XXXXXXXXXXXXX.X ", -" X...............X ", -" XXXXXXXXXXXXXXXXX ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/cursor_cross.xpm b/src/bitmaps/cursor_cross.xpm deleted file mode 100644 index c509e1f..0000000 --- a/src/bitmaps/cursor_cross.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *cursor_cross[] = { - /* width height num_colors chars_per_pixel */ - " 32 32 3 1", - /* colors */ - "X c #000000", - ". c #ffffff", - " c None", - /* pixels */ - " ", - " ", - " ", - " ", - " ", - " XXXX ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " XXXXXXXXX..XXXXXXXXX ", - " X..................X ", - " X..................X ", - " XXXXXXXXX..XXXXXXXXX ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " X..X ", - " XXXX ", - " ", - " ", - " ", - " ", - " ", - " ", - " ", - "15,15" -}; diff --git a/src/bitmaps/cursor_ibeam.xpm b/src/bitmaps/cursor_ibeam.xpm deleted file mode 100644 index 191132b..0000000 --- a/src/bitmaps/cursor_ibeam.xpm +++ /dev/null @@ -1,43 +0,0 @@ -/* XPM */ -static const char *cursor_ibeam[] = { - /* width height num_colors chars_per_pixel */ - " 32 32 3 1", - /* colors */ - ". c #000000", - "X c #ffffff", - " c None", - /* pixels */ - " XXX XXX ", - " XXX ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " X.X ", - " XXX ", - " XXX XXX ", - " ", - "15,15" -}; diff --git a/src/bitmaps/cursor_move.xpm b/src/bitmaps/cursor_move.xpm deleted file mode 100644 index ce237e3..0000000 --- a/src/bitmaps/cursor_move.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_move[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -"X c #ffffff", -". c #000000", -" c None", -/* pixels */ -" ", -" ", -" ", -" ", -" X ", -" X.X ", -" X...X ", -" X.....X ", -" X.......X ", -" XXXXXXXXX ", -" X.X ", -" X.X ", -" XX X.X XX ", -" X.X X.X X.X ", -" X..X X.X X..X ", -" X...XXXXXXX.XXXXXXX...X ", -" X....X.............X....X ", -" X...XXXXXXX.XXXXXXX...X ", -" X..X X.X X..X ", -" X.X X.X X.X ", -" XX X.X XX ", -" X.X ", -" X.X ", -" XXXXXXXXX ", -" X.......X ", -" X.....X ", -" X...X ", -" X.X ", -" X ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/cursor_no.xpm b/src/bitmaps/cursor_no.xpm deleted file mode 100644 index d238340..0000000 --- a/src/bitmaps/cursor_no.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_no[] = { -/* columns rows colors chars-per-pixel */ - "32 32 3 1", - "X c #ffffff", - ". c #000000", - " c None", - /* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ...... ", -" ..XXXXXX.. ", -" .XXXXXXXXX . ", -" .XXXX....XXX . ", -" .XXX.. ..XXX. ", -" .XXXXX. .XXX. ", -" .XX.XXX. .XX. ", -" .XXX..XXX. .XXX. ", -" .XX. .XXX. .XX. ", -" .XX. .XXX. .XX. ", -" .XX. .XXX. .XX. ", -" .XX. .XXX. .XX. ", -" .XXX. .XXX..XXX. ", -" .XX . .XX.XX. ", -" .XXX. .XXXXX. ", -" .XXX.. ..XXX. ", -" .XXXX....XXXX. ", -" .XXXXXXXXXX. ", -" ..XXXXXX.. ", -" ...... ", -" ", -" ", -" ", -" ", -" ", -" ", -"16,16" -}; diff --git a/src/bitmaps/cursor_size_h.xpm b/src/bitmaps/cursor_size_h.xpm deleted file mode 100644 index d49a1f8..0000000 --- a/src/bitmaps/cursor_size_h.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_size_h[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -". c #000000", -"X c #ffffff", -" c None", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XX XX ", -" X.X X.X ", -" X..X X..X ", -" X...XXXXXXXXXXX...X ", -" X...................X ", -" X...XXXXXXXXXXX...X ", -" X..X X..X ", -" X.X X.X ", -" XX XX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/cursor_size_l.xpm b/src/bitmaps/cursor_size_l.xpm deleted file mode 100644 index ffcd9e7..0000000 --- a/src/bitmaps/cursor_size_l.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_size_l[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -". c #000000", -"X c #ffffff", -" c None", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX ", -" X.....X ", -" X....X ", -" X...X ", -" X..X.X ", -" X.X X.X ", -" XX X.X ", -" X.X ", -" X.X XX ", -" X.X X.X ", -" X.X..X ", -" X...X ", -" X....X ", -" X.... X ", -" XXXXXXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/cursor_size_r.xpm b/src/bitmaps/cursor_size_r.xpm deleted file mode 100644 index 0757224..0000000 --- a/src/bitmaps/cursor_size_r.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_size_r[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -". c #000000", -"X c #ffffff", -" c None", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" XXXXXXX ", -" X.....X ", -" X....X ", -" X...X ", -" X.X..X ", -" X.X X.X ", -" X.X XX ", -" X.X ", -" XX X.X ", -" X.X X.X ", -" X..X.X ", -" X...X ", -" X....X ", -" X.....X ", -" XXXXXXX ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/cursor_size_v.xpm b/src/bitmaps/cursor_size_v.xpm deleted file mode 100644 index a68d255..0000000 --- a/src/bitmaps/cursor_size_v.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *cursor_size_v[] = { -/* columns rows colors chars-per-pixel */ -"32 32 3 1", -". c #000000", -"X c #ffffff", -" c None", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" X ", -" X.X ", -" X...X ", -" X.....X ", -" X.......X ", -" XXXX.XXXX ", -" X.X ", -" X.X ", -" X.X ", -" X.X ", -" X.X ", -" X.X ", -" X.X ", -" X.X ", -" XXXX XXXX ", -" X.......X ", -" X.....X ", -" X...X ", -" X/X ", -" X ", -" ", -" ", -" ", -" ", -" ", -"15,15" -}; diff --git a/src/bitmaps/maskbm0.xbm b/src/bitmaps/maskbm0.xbm deleted file mode 100644 index 2ac8368..0000000 --- a/src/bitmaps/maskbm0.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm0_width 32 -#define maskbm0_height 32 -static char maskbm0_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,0x08, - 0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x38,0x00,0x00,0x00,0x78,0x00,0x00,0x00, - 0xf8,0x00,0x00,0x00,0xf8,0x01,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,0x07,0x00, - 0x00,0xf8,0x0f,0x00,0x00,0xf8,0x1f,0x00,0x00,0xf8,0x3f,0x00,0x00,0xf8,0x03, - 0x00,0x00,0xb8,0x07,0x00,0x00,0x98,0x07,0x00,0x00,0x08,0x0f,0x00,0x00,0x00, - 0x0f,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x0c,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/src/bitmaps/maskbm1.xbm b/src/bitmaps/maskbm1.xbm deleted file mode 100644 index 003d62f..0000000 --- a/src/bitmaps/maskbm1.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm1_width 32 -#define maskbm1_height 32 -static char maskbm1_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,0x0c,0x60,0x00,0x00,0x0e,0xe0,0x00,0x00,0x0f,0xe0,0x01, - 0x80,0xff,0xff,0x03,0xc0,0xff,0xff,0x07,0x80,0xff,0xff,0x03,0x00,0x0f,0xe0, - 0x01,0x00,0x0e,0xe0,0x00,0x00,0x0c,0x60,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/src/bitmaps/maskbm2.xbm b/src/bitmaps/maskbm2.xbm deleted file mode 100644 index 7592b14..0000000 --- a/src/bitmaps/maskbm2.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm2_width 32 -#define maskbm2_height 32 -static char maskbm2_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,0x80, - 0x00,0x00,0x00,0xc0,0x01,0x00,0x00,0xe0,0x03,0x00,0x00,0xf0,0x07,0x00,0x00, - 0xf8,0x0f,0x00,0x00,0xf8,0x0f,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00, - 0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01, - 0x00,0x00,0xc0,0x01,0x00,0x00,0xc0,0x01,0x00,0x00,0xf8,0x0f,0x00,0x00,0xf8, - 0x0f,0x00,0x00,0xf0,0x07,0x00,0x00,0xe0,0x03,0x00,0x00,0xc0,0x01,0x00,0x00, - 0x80,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/src/bitmaps/maskbm3.xbm b/src/bitmaps/maskbm3.xbm deleted file mode 100644 index 711c7f4..0000000 --- a/src/bitmaps/maskbm3.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm3_width 32 -#define maskbm3_height 32 -static char maskbm3_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,0xfe,0x00,0x00,0x00,0xfe,0x00,0x00,0x00, - 0x7e,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0xee,0x00,0x00, - 0x00,0xc6,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0xc7,0x00,0x00,0x00,0xee, - 0x00,0x00,0x00,0xfc,0x00,0x00,0x00,0xf8,0x00,0x00,0x00,0xfc,0x00,0x00,0x00, - 0xfe,0x00,0x00,0x00,0xfe,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/src/bitmaps/maskbm4.xbm b/src/bitmaps/maskbm4.xbm deleted file mode 100644 index d785afe..0000000 --- a/src/bitmaps/maskbm4.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm4_width 32 -#define maskbm4_height 32 -static char maskbm4_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,0x7f,0x00,0x00,0x00,0x7f,0x00,0x00, - 0x00,0x7e,0x00,0x00,0x00,0x7c,0x00,0x00,0x00,0x7e,0x00,0x00,0x00,0x77,0x00, - 0x00,0x80,0x63,0x00,0x00,0xc0,0x01,0x00,0x00,0xe3,0x00,0x00,0x00,0x77,0x00, - 0x00,0x00,0x3f,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,0x3f,0x00,0x00,0x00,0x7f, - 0x00,0x00,0x00,0x7f,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/src/bitmaps/maskbm5.xbm b/src/bitmaps/maskbm5.xbm deleted file mode 100644 index 6b67ffe..0000000 --- a/src/bitmaps/maskbm5.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm5_width 32 -#define maskbm5_height 32 -static char maskbm5_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff, - 0x7f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00, - 0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfc,0x1f,0x00,0x00,0xf8,0x0f,0x00, - 0x00,0xf0,0x07,0x00,0x00,0xf0,0x07,0x00,0x00,0xf8,0x0f,0x00,0x00,0xfc,0x1f, - 0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xfe, - 0x3f,0x00,0x00,0xfe,0x3f,0x00,0x00,0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00, - 0xff,0x7f,0x00,0x00,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; diff --git a/src/bitmaps/maskbm6.xbm b/src/bitmaps/maskbm6.xbm deleted file mode 100644 index c632eb9..0000000 --- a/src/bitmaps/maskbm6.xbm +++ /dev/null @@ -1,12 +0,0 @@ -#define maskbm6_width 32 -#define maskbm6_height 32 -static char maskbm6_bits[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x01,0x00,0x00,0x80,0x03,0x00,0x00,0xc0,0x07,0x00,0x00,0xe0, - 0x0f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0,0x1f,0x00,0x00,0x80,0x03,0x00,0x00, - 0x80,0x03,0x00,0x00,0x83,0x83,0x01,0x80,0x83,0x83,0x03,0xc0,0x83,0x83,0x07, - 0xe0,0xff,0xff,0x0f,0xf0,0xff,0xff,0x1f,0xe0,0xff,0xff,0x0f,0xc0,0x83,0x83, - 0x07,0x80,0x83,0x83,0x03,0x00,0x83,0x83,0x01,0x00,0x80,0x03,0x00,0x00,0x80, - 0x03,0x00,0x00,0xf0,0x1f,0x00,0x00,0xf0,0x1f,0x00,0x00,0xe0,0x0f,0x00,0x00, - 0xc0,0x07,0x00,0x00,0x80,0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; diff --git a/src/sdl_cursor.c b/src/sdl_cursor.c index c498c7e..db5eb26 100644 --- a/src/sdl_cursor.c +++ b/src/sdl_cursor.c @@ -30,17 +30,7 @@ #include "sdl_private.h" /* マウスカーソルフォントイメージ*/ -#include "bitmaps/cursor_arrow.xpm" -#include "bitmaps/cursor_busy.xpm" -#include "bitmaps/cursor_no.xpm" -#include "bitmaps/cursor_move.xpm" -#include "bitmaps/cursor_cross.xpm" -#include "bitmaps/cursor_size_h.xpm" -#include "bitmaps/cursor_size_l.xpm" -#include "bitmaps/cursor_size_r.xpm" -#include "bitmaps/cursor_size_v.xpm" #include "bitmaps/cursor_uparrow.xpm" -#include "bitmaps/cursor_ibeam.xpm" static SDL_Cursor *cursor[256]; @@ -80,20 +70,20 @@ static SDL_Cursor *init_system_cursor(const char *image[]) { return SDL_CreateCursor(data, mask, 32, 32, hot_x, hot_y); } -/* mouse cursur の初期化 */ void sdl_cursor_init(void) { - cursor[CURSOR_ARROW] = init_system_cursor(cursor_arrow); - cursor[CURSOR_CROSS] = init_system_cursor(cursor_cross); - cursor[CURSOR_IBEAM] = init_system_cursor(cursor_ibeam); - cursor[CURSOR_NO] = init_system_cursor(cursor_no); - cursor[CURSOR_SIZE] = init_system_cursor(cursor_move); - cursor[CURSOR_SIZEALL] = init_system_cursor(cursor_move); - cursor[CURSOR_SIZENESW] = init_system_cursor(cursor_size_r); - cursor[CURSOR_SIZENS] = init_system_cursor(cursor_size_v); - cursor[CURSOR_SIZENWSE] = init_system_cursor(cursor_size_l); - cursor[CURSOR_SIZEWE] = init_system_cursor(cursor_size_h); + cursor[CURSOR_ARROW] = SDL_GetDefaultCursor(); + cursor[CURSOR_CROSS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_CROSSHAIR); + cursor[CURSOR_IBEAM] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM); + cursor[CURSOR_ICON] = SDL_GetDefaultCursor(); + cursor[CURSOR_NO] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_NO); + cursor[CURSOR_SIZE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL); + cursor[CURSOR_SIZEALL] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL); + cursor[CURSOR_SIZENESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW); + cursor[CURSOR_SIZENS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS); + cursor[CURSOR_SIZENWSE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENWSE); + cursor[CURSOR_SIZEWE] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE); cursor[CURSOR_UPARROW] = init_system_cursor(cursor_uparrow); - cursor[CURSOR_WAIT] = init_system_cursor(cursor_busy); + cursor[CURSOR_WAIT] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_WAIT); } boolean sdl_cursorNew(uint8_t* data, int no, CursorImage *cursorImage, TCursorDirEntry *cursordirentry) {