callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On Win32, expand possible hex escapes in the font family (put there by

Browse Source 
1999-09-30  Tor Lillqvist  <tml@iki.fi>

* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
This commit is contained in:
Tor Lillqvist
1999-09-30 16:59:08 +00:00
committed by Tor Lillqvist
parent 41be586333
commit 74d88d870a
8 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
1999-09-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfontsel.c (gtk_font_selection_get_xlfd_field): On Win32,
expand possible hex escapes in the font family (put there by
logfont_to_xlfd if the font name isn't a legal XLFD font family,
mainly if it contains slashes). (gtk_font_selection_create_xlfd):
On Win32, add hex escapes here, too.
Wed Sep 29 19:55:35 1999 Owen Taylor <otaylor@redhat.com>
* */*.[ch]: Changed from #if GDK_WINDOWING == GDK_WINDOWING_X11

48
gtk/gtkfontsel.c
View File

@ -2666,7 +2666,8 @@ logfont_to_xlfd (const LOGFONT *lfp,
int point_size;
static int logpixelsy = 0;
gchar facename[LF_FACESIZE*3];
gchar *p, *q;
gchar *p;
const gchar *q;
if (logpixelsy == 0)
{
@ -3575,6 +3576,9 @@ gtk_font_selection_get_xlfd_field (const gchar *fontname,
{
const gchar *t1, *t2;
gint countdown, len, num_dashes;
#ifdef GDK_WINDOWING_WIN32
gchar *p;
#endif
if (!fontname)
return NULL;
@ -3605,6 +3609,23 @@ gtk_font_selection_get_xlfd_field (const gchar *fontname,
#ifdef GDK_WINDOWING_X11
/* Convert to lower case. */
g_strdown (buffer);
#elif defined (GDK_WINDOWING_WIN32)
/* Check for hex escapes in font family */
if (field_num == XLFD_FAMILY)
{
p = buffer;
while (*p)
{
if (*p == '%' && isxdigit (p[1]) && isxdigit (p[2]))
{
guint c;
sscanf (p+1, "%2x", &c);
*p = c;
strcpy (p+1, p+3);
}
p++;
}
}
#endif
}
else
@ -3630,7 +3651,11 @@ gtk_font_selection_create_xlfd (gint size,
{
gchar buffer[16];
gchar *pixel_size = "*", *point_size = "*", *fontname;
gchar *fam = family;
#ifdef GDK_WINDOWING_WIN32
gchar *p, *q;
#endif
if (size <= 0)
return NULL;
@ -3640,10 +3665,27 @@ gtk_font_selection_create_xlfd (gint size,
else
point_size = buffer;
#ifdef GDK_WINDOWING_WIN32
fam = g_malloc (strlen (family) * 3 + 1);
p = fam;
q = family;
while (*q)
{
if (*q == '-' || *q == '*' || *q == '?' || *q == '%')
p += sprintf (p, "%%%.02x", *q);
else
*p++ = *q;
q++;
}
*p = '\0';
#endif
fontname = g_strdup_printf ("-%s-%s-%s-%s-%s-*-%s-%s-*-*-%s-*-%s",
foundry, family, weight, slant,
foundry, fam, weight, slant,
set_width, pixel_size, point_size,
spacing, charset);
#ifdef GDK_WINDOWING_WIN32
g_free (fam);
#endif
return fontname;
}