forked from AuroraMiddleware/gtk
New file. Downloaded from freedesktop.org's webcvs. Slighly edited cursors
2007-01-06 Tor Lillqvist <tml@novell.com> * gdk/win32/cursor.bdf: New file. Downloaded from freedesktop.org's webcvs. Slighly edited cursors "crosshair", "diamond_cross", "draft_large", "gobbler" and "target" to fix #392504. It is possible that the same end result could have been achieved by tweaking bdfcursor.c instead. * gdk/win32/bdfcursor.c: Add optional debugging output. * gdk/win32/xcursors.h: Regenerated. svn path=/trunk/; revision=17096
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
a9f990f519
commit
8d601fbde3
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
||||
2007-01-06 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gdk/win32/cursor.bdf: New file. Downloaded from
|
||||
freedesktop.org's webcvs. Slighly edited cursors "crosshair",
|
||||
"diamond_cross", "draft_large", "gobbler" and "target" to fix
|
||||
#392504. It is possible that the same end result could have been
|
||||
achieved by tweaking bdfcursor.c instead.
|
||||
|
||||
* gdk/win32/bdfcursor.c: Add optional debugging output.
|
||||
|
||||
* gdk/win32/xcursors.h: Regenerated.
|
||||
|
||||
2007-01-05 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtknotebook.c (gtk_notebook_set_menu_label_text): Left-align
|
||||
|
||||
@ -47,7 +47,9 @@ typedef struct {
|
||||
static GSList *fonts = NULL;
|
||||
static GSList *cursors = NULL;
|
||||
|
||||
gint dw,dh;
|
||||
static gint dw,dh;
|
||||
|
||||
static gboolean debug = FALSE;
|
||||
|
||||
#define HEX(c) (((c) >= '0' && (c) <= '9') ? \
|
||||
((c) - '0') : (toupper(c) - 'A' + 10))
|
||||
@ -74,10 +76,11 @@ cursor_info_t *ci;
|
||||
|
||||
for (y = 0; y < ci->height; y++)
|
||||
{
|
||||
printf("/* ");
|
||||
for (x = 0; x < ci->width; x++)
|
||||
{
|
||||
if (ci->hotx == x && ci->hoty == y)
|
||||
printf ("o");
|
||||
printf("o");
|
||||
else
|
||||
switch (ci->data[y*ci->width+x])
|
||||
{
|
||||
@ -92,7 +95,7 @@ cursor_info_t *ci;
|
||||
break;
|
||||
}
|
||||
}
|
||||
printf("\n");
|
||||
printf(" */\n");
|
||||
}
|
||||
}
|
||||
|
||||
@ -144,6 +147,8 @@ gchar *fname;
|
||||
{
|
||||
font_info_t *nfi;
|
||||
|
||||
if (debug)
|
||||
printf(" %*s*/\n", dw, "");
|
||||
startchar = FALSE;
|
||||
startbitmap = FALSE;
|
||||
|
||||
@ -171,13 +176,19 @@ gchar *fname;
|
||||
bitmap[px+cx] =
|
||||
(mask & HEX(line[cx/4])) != 0;
|
||||
|
||||
/*printf(bitmap[px+cx] ? "X" : " ");*/
|
||||
if (debug)
|
||||
printf(bitmap[px+cx] ? "X" : " ");
|
||||
}
|
||||
py++;
|
||||
/*printf("\n");*/
|
||||
if (debug)
|
||||
printf(" %*s*/\n/* %*s", dw-w, "", dw+dx, "");
|
||||
}
|
||||
else if (!strncasecmp("BBX ", line, 4))
|
||||
{
|
||||
sscanf(p+4, "%d %d %d %d", &w, &h, &x, &y);
|
||||
if (debug)
|
||||
printf("/* %s: */\n/* %*s", charname, dw+dx, "");
|
||||
}
|
||||
else if (!strncasecmp("ENCODING ", line, 9))
|
||||
{
|
||||
if (sscanf(p+9, "%d %d", &tmp, &id) != 2)
|
||||
@ -346,7 +357,8 @@ static int dump_cursors()
|
||||
|
||||
for (ptr = cursors; ptr; ptr = ptr->next)
|
||||
{
|
||||
/* print_cursor(ptr->data); */
|
||||
if (debug)
|
||||
print_cursor(ptr->data);
|
||||
fprintf(f, "%s, \n", dump_cursor(ptr->data));
|
||||
}
|
||||
|
||||
@ -366,6 +378,9 @@ gchar **argv;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (g_getenv ("BDFCURSOR_DEBUG") != NULL)
|
||||
debug = TRUE;
|
||||
|
||||
if (read_bdf_font(argv[1]) || !fonts)
|
||||
{
|
||||
printf("Error reading font\n");
|
||||
|
||||
3290
gdk/win32/cursor.bdf
Normal file
3290
gdk/win32/cursor.bdf
Normal file
File diff suppressed because it is too large
Load Diff
@ -67,26 +67,26 @@ static const struct { const gchar *name; gint type; guchar width; guchar height;
|
||||
"\145\252\251\131\245\125\125\131\245\125\125\131\145\125\125\131"
|
||||
"\045\125\125\131\046\226\126\231\151\231\231\231\251\232\231\231"
|
||||
"\246\231\226\231\145\125\125\131\045\125\125\131\012\252\252\240" },
|
||||
{ "cross", 30, 16, 16, 7, 7,
|
||||
"\000\025\120\000\000\031\220\000\000\031\220\000\000\031\220\000"
|
||||
"\000\031\220\000\125\131\225\125\125\131\225\125\252\251\252\252"
|
||||
"\125\125\125\125\252\251\252\252\000\031\220\000\000\031\220\000"
|
||||
"\000\031\220\000\000\031\220\000\000\031\220\000\000\031\220\000" },
|
||||
{ "cross", 30, 16, 15, 7, 7,
|
||||
"\000\031\220\000\000\031\220\000\000\031\220\000\000\031\220\000"
|
||||
"\000\031\220\000\125\131\225\125\252\251\252\252\125\125\125\125"
|
||||
"\252\251\252\252\125\131\225\125\000\031\220\000\000\031\220\000"
|
||||
"\000\031\220\000\000\031\220\000\000\031\220\000" },
|
||||
{ "cross_reverse", 32, 16, 15, 7, 7,
|
||||
"\044\030\220\140\211\030\221\211\142\130\226\044\030\230\230\220"
|
||||
"\006\050\242\100\125\210\211\125\252\240\052\252\000\001\000\000"
|
||||
"\252\240\052\252\125\210\211\125\006\050\242\100\030\230\230\220"
|
||||
"\142\130\226\044\211\030\221\211\044\030\220\140" },
|
||||
{ "crosshair", 34, 16, 16, 7, 7,
|
||||
"\000\005\100\000\000\006\100\000\000\006\100\000\000\006\100\000"
|
||||
"\000\006\100\000\000\006\100\000\125\126\125\125\125\126\125\125"
|
||||
"\252\251\252\252\000\006\100\000\000\006\100\000\000\006\100\000"
|
||||
"\000\006\100\000\000\006\100\000\000\006\100\000\000\006\100\000" },
|
||||
{ "diamond_cross", 36, 16, 16, 7, 7,
|
||||
"\000\025\120\000\000\131\224\000\001\151\245\000\005\211\211\100"
|
||||
"\026\011\202\120\130\011\200\224\145\131\225\145\252\250\252\251"
|
||||
"\125\125\125\125\250\011\200\250\045\011\201\140\011\111\205\200"
|
||||
"\002\131\226\000\000\231\230\000\000\051\240\000\000\011\200\000" },
|
||||
{ "crosshair", 34, 16, 15, 7, 7,
|
||||
"\000\006\100\000\000\006\100\000\000\006\100\000\000\006\100\000"
|
||||
"\000\006\100\000\000\006\100\000\125\126\125\125\252\251\252\252"
|
||||
"\125\126\125\125\000\006\100\000\000\006\100\000\000\006\100\000"
|
||||
"\000\006\100\000\000\006\100\000\000\006\100\000" },
|
||||
{ "diamond_cross", 36, 15, 15, 7, 7,
|
||||
"\000\031\220\000\001\246\220\000\031\231\220\001\222\141\220\031"
|
||||
"\011\201\221\220\046\001\232\252\232\252\225\125\025\125\252\251"
|
||||
"\252\251\220\046\001\221\220\230\031\001\222\141\220\001\231\231"
|
||||
"\000\001\246\220\000\001\231\000\000" },
|
||||
{ "dot", 38, 12, 12, 6, 6,
|
||||
"\001\125\100\025\252\124\032\252\244\132\252\245\152\252\251\152"
|
||||
"\252\251\152\252\251\152\252\251\132\252\245\032\252\244\025\252"
|
||||
@ -100,11 +100,11 @@ static const struct { const gchar *name; gint type; guchar width; guchar height;
|
||||
"\000\125\000\001\151\100\005\252\120\026\252\224\132\151\245\151"
|
||||
"\151\151\125\151\125\000\151\000\000\151\000\125\151\125\151\151"
|
||||
"\151\132\151\245\026\252\224\005\252\120\001\151\100\000\125\000" },
|
||||
{ "draft_large", 44, 15, 16, 14, 0,
|
||||
"\000\000\000\024\000\000\005\140\000\001\132\100\000\126\250\000"
|
||||
"\025\252\200\005\152\252\001\132\252\240\006\252\252\200\000\026"
|
||||
"\250\000\001\146\240\000\026\032\000\001\140\150\000\026\001\200"
|
||||
"\001\140\006\000\006\000\000\000\040\000\000\000" },
|
||||
{ "draft_large", 44, 15, 15, 14, 0,
|
||||
"\000\000\000\030\000\000\006\220\000\001\252\100\000\152\244\000"
|
||||
"\032\252\200\006\252\251\001\252\252\240\005\125\252\100\000\031"
|
||||
"\250\000\001\226\220\000\031\032\000\001\220\144\000\031\001\200"
|
||||
"\001\220\005\000\011\000\000\000\000" },
|
||||
{ "draft_small", 46, 15, 15, 14, 0,
|
||||
"\000\000\000\030\000\000\006\220\000\001\252\000\000\152\244\000"
|
||||
"\032\252\200\000\125\251\000\000\031\240\000\001\226\100\000\031"
|
||||
@ -125,11 +125,11 @@ static const struct { const gchar *name; gint type; guchar width; guchar height;
|
||||
"\001\026\224\100\006\106\221\220\132\126\225\245\152\252\252\251"
|
||||
"\152\252\252\251\132\126\225\245\006\106\221\220\001\026\224\100"
|
||||
"\000\152\251\000\000\032\244\000\000\006\220\000\000\005\120\000" },
|
||||
{ "gobbler", 54, 16, 16, 14, 3,
|
||||
"\000\000\152\220\000\000\152\120\220\000\132\132\226\252\232\125"
|
||||
"\252\252\252\125\252\251\132\120\252\245\132\120\151\125\132\220"
|
||||
"\125\125\252\120\126\252\251\120\025\225\125\100\001\225\125\000"
|
||||
"\001\220\000\000\001\220\000\000\006\251\000\000\005\125\000\000" },
|
||||
{ "gobbler", 54, 16, 16, 14, 2,
|
||||
"\000\000\125\120\000\000\152\220\120\000\152\125\225\125\132\132"
|
||||
"\226\252\232\125\252\252\252\120\252\251\132\120\252\245\132\120"
|
||||
"\151\125\132\220\125\125\252\120\026\252\251\100\001\225\125\000"
|
||||
"\001\220\000\000\001\220\000\000\005\225\000\000\006\251\000\000" },
|
||||
{ "gumby", 56, 16, 16, 2, 0,
|
||||
"\012\252\000\000\122\125\200\000\244\225\140\000\251\231\230\000"
|
||||
"\244\225\130\000\244\232\231\120\252\225\132\244\132\225\132\252"
|
||||
@ -295,11 +295,11 @@ static const struct { const gchar *name; gint type; guchar width; guchar height;
|
||||
"\000\044\140\000\000\140\044\000\001\140\045\100\132\202\012\224"
|
||||
"\240\000\000\051\132\200\012\224\005\202\011\100\006\011\202\100"
|
||||
"\030\044\140\220\030\220\030\220\032\100\006\220\031\000\001\220" },
|
||||
{ "target", 128, 16, 14, 7, 7,
|
||||
"\000\032\220\000\000\252\250\000\002\245\152\000\012\120\026\200"
|
||||
"\051\000\001\240\244\002\000\150\240\011\200\051\240\024\120\051"
|
||||
"\140\005\100\045\130\001\000\224\026\000\002\120\005\240\051\100"
|
||||
"\001\132\225\000\000\025\120\000" },
|
||||
{ "target", 128, 16, 15, 7, 7,
|
||||
"\000\025\120\000\000\132\224\000\001\252\251\000\006\240\052\100"
|
||||
"\032\000\002\220\150\001\000\244\240\006\100\051\240\030\220\051"
|
||||
"\240\006\100\051\150\001\000\244\032\000\002\220\006\240\052\100"
|
||||
"\001\252\251\000\000\132\224\000\000\025\120\000" },
|
||||
{ "tcross", 130, 15, 15, 7, 7,
|
||||
"\000\005\100\000\000\031\000\000\000\144\000\000\001\220\000\000"
|
||||
"\006\100\000\000\031\000\005\125\145\125\132\252\252\251\125\126"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user