AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Replace all calls to g_strcasecmp() with g_ascii_strcasecmp().

Browse Source 
2006-02-20  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkfont-win32.c: Replace all calls to g_strcasecmp()
	with g_ascii_strcasecmp().
This commit is contained in:
Tor Lillqvist 2006-02-20 08:52:19 +00:00 committed by Tor Lillqvist
parent 023435bde3
commit d9d1a36c59
3 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkfont-win32.c: Replace all calls to g_strcasecmp()
with g_ascii_strcasecmp().
2006-02-19 Matthias Clasen <mclasen@redhat.com> 2006-02-19 Matthias Clasen <mclasen@redhat.com>
Support input shapes: (#331070) Support input shapes: (#331070)

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-02-20 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkfont-win32.c: Replace all calls to g_strcasecmp()
with g_ascii_strcasecmp().
2006-02-19 Matthias Clasen <mclasen@redhat.com> 2006-02-19 Matthias Clasen <mclasen@redhat.com>
Support input shapes: (#331070) Support input shapes: (#331070)

104
gdk/win32/gdkfont-win32.c
View File

@ -844,33 +844,33 @@ gdk_font_load_logfont (LOGFONT *lfp)
/* If we fail, try some similar fonts often found on Windows. */ /* If we fail, try some similar fonts often found on Windows. */
if (tries == 0) if (tries == 0)
{ {
if (g_strcasecmp (lfp->lfFaceName, "helvetica") == 0) if (g_ascii_strcasecmp (lfp->lfFaceName, "helvetica") == 0)
strcpy (lfp->lfFaceName, "arial"); strcpy (lfp->lfFaceName, "arial");
else if (g_strcasecmp (lfp->lfFaceName, "new century schoolbook") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "new century schoolbook") == 0)
strcpy (lfp->lfFaceName, "century schoolbook"); strcpy (lfp->lfFaceName, "century schoolbook");
else if (g_strcasecmp (lfp->lfFaceName, "courier") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "courier") == 0)
strcpy (lfp->lfFaceName, "courier new"); strcpy (lfp->lfFaceName, "courier new");
else if (g_strcasecmp (lfp->lfFaceName, "lucida") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "lucida") == 0)
strcpy (lfp->lfFaceName, "lucida sans unicode"); strcpy (lfp->lfFaceName, "lucida sans unicode");
else if (g_strcasecmp (lfp->lfFaceName, "lucidatypewriter") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "lucidatypewriter") == 0)
strcpy (lfp->lfFaceName, "lucida console"); strcpy (lfp->lfFaceName, "lucida console");
else if (g_strcasecmp (lfp->lfFaceName, "times") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "times") == 0)
strcpy (lfp->lfFaceName, "times new roman"); strcpy (lfp->lfFaceName, "times new roman");
} }
else if (tries == 1) else if (tries == 1)
{ {
if (g_strcasecmp (lfp->lfFaceName, "courier") == 0) if (g_ascii_strcasecmp (lfp->lfFaceName, "courier") == 0)
{ {
strcpy (lfp->lfFaceName, ""); strcpy (lfp->lfFaceName, "");
lfp->lfPitchAndFamily |= FF_MODERN; lfp->lfPitchAndFamily |= FF_MODERN;
} }
else if (g_strcasecmp (lfp->lfFaceName, "times new roman") == 0) else if (g_ascii_strcasecmp (lfp->lfFaceName, "times new roman") == 0)
{ {
strcpy (lfp->lfFaceName, ""); strcpy (lfp->lfFaceName, "");
lfp->lfPitchAndFamily |= FF_ROMAN; lfp->lfPitchAndFamily |= FF_ROMAN;
} }
else if (g_strcasecmp (lfp->lfFaceName, "helvetica") == 0 else if (g_ascii_strcasecmp (lfp->lfFaceName, "helvetica") == 0
|| g_strcasecmp (lfp->lfFaceName, "lucida") == 0) || g_ascii_strcasecmp (lfp->lfFaceName, "lucida") == 0)
{ {
strcpy (lfp->lfFaceName, ""); strcpy (lfp->lfFaceName, "");
lfp->lfPitchAndFamily |= FF_SWISS; lfp->lfPitchAndFamily |= FF_SWISS;
@ -1024,11 +1024,11 @@ gdk_font_load_internal (const gchar *font_name)
logfont.lfEscapement = 0; logfont.lfEscapement = 0;
logfont.lfOrientation = 0; logfont.lfOrientation = 0;
if (g_strcasecmp (weight, "thin") == 0) if (g_ascii_strcasecmp (weight, "thin") == 0)
logfont.lfWeight = FW_THIN; logfont.lfWeight = FW_THIN;
else if (g_strcasecmp (weight, "extralight") == 0) else if (g_ascii_strcasecmp (weight, "extralight") == 0)
logfont.lfWeight = FW_EXTRALIGHT; logfont.lfWeight = FW_EXTRALIGHT;
else if (g_strcasecmp (weight, "ultralight") == 0) else if (g_ascii_strcasecmp (weight, "ultralight") == 0)
#ifdef FW_ULTRALIGHT #ifdef FW_ULTRALIGHT
logfont.lfWeight = FW_ULTRALIGHT; logfont.lfWeight = FW_ULTRALIGHT;
#else #else
@ -1036,35 +1036,35 @@ gdk_font_load_internal (const gchar *font_name)
* defined as FW_EXTRALIGHT anyway. * defined as FW_EXTRALIGHT anyway.
*/ */
#endif #endif
else if (g_strcasecmp (weight, "light") == 0) else if (g_ascii_strcasecmp (weight, "light") == 0)
logfont.lfWeight = FW_LIGHT; logfont.lfWeight = FW_LIGHT;
else if (g_strcasecmp (weight, "normal") == 0) else if (g_ascii_strcasecmp (weight, "normal") == 0)
logfont.lfWeight = FW_NORMAL; logfont.lfWeight = FW_NORMAL;
else if (g_strcasecmp (weight, "regular") == 0) else if (g_ascii_strcasecmp (weight, "regular") == 0)
logfont.lfWeight = FW_REGULAR; logfont.lfWeight = FW_REGULAR;
else if (g_strcasecmp (weight, "medium") == 0) else if (g_ascii_strcasecmp (weight, "medium") == 0)
logfont.lfWeight = FW_MEDIUM; logfont.lfWeight = FW_MEDIUM;
else if (g_strcasecmp (weight, "semibold") == 0) else if (g_ascii_strcasecmp (weight, "semibold") == 0)
logfont.lfWeight = FW_SEMIBOLD; logfont.lfWeight = FW_SEMIBOLD;
else if (g_strcasecmp (weight, "demibold") == 0) else if (g_ascii_strcasecmp (weight, "demibold") == 0)
#ifdef FW_DEMIBOLD #ifdef FW_DEMIBOLD
logfont.lfWeight = FW_DEMIBOLD; logfont.lfWeight = FW_DEMIBOLD;
#else #else
logfont.lfWeight = FW_SEMIBOLD; /* As above */ logfont.lfWeight = FW_SEMIBOLD; /* As above */
#endif #endif
else if (g_strcasecmp (weight, "bold") == 0) else if (g_ascii_strcasecmp (weight, "bold") == 0)
logfont.lfWeight = FW_BOLD; logfont.lfWeight = FW_BOLD;
else if (g_strcasecmp (weight, "extrabold") == 0) else if (g_ascii_strcasecmp (weight, "extrabold") == 0)
logfont.lfWeight = FW_EXTRABOLD; logfont.lfWeight = FW_EXTRABOLD;
else if (g_strcasecmp (weight, "ultrabold") == 0) else if (g_ascii_strcasecmp (weight, "ultrabold") == 0)
#ifdef FW_ULTRABOLD #ifdef FW_ULTRABOLD
logfont.lfWeight = FW_ULTRABOLD; logfont.lfWeight = FW_ULTRABOLD;
#else #else
logfont.lfWeight = FW_EXTRABOLD; /* As above */ logfont.lfWeight = FW_EXTRABOLD; /* As above */
#endif #endif
else if (g_strcasecmp (weight, "heavy") == 0) else if (g_ascii_strcasecmp (weight, "heavy") == 0)
logfont.lfWeight = FW_HEAVY; logfont.lfWeight = FW_HEAVY;
else if (g_strcasecmp (weight, "black") == 0) else if (g_ascii_strcasecmp (weight, "black") == 0)
#ifdef FW_BLACK #ifdef FW_BLACK
logfont.lfWeight = FW_BLACK; logfont.lfWeight = FW_BLACK;
#else #else
@ -1073,16 +1073,16 @@ gdk_font_load_internal (const gchar *font_name)
else else
logfont.lfWeight = FW_DONTCARE; logfont.lfWeight = FW_DONTCARE;
if (g_strcasecmp (slant, "italic") == 0 if (g_ascii_strcasecmp (slant, "italic") == 0
|| g_strcasecmp (slant, "oblique") == 0 || g_ascii_strcasecmp (slant, "oblique") == 0
|| g_strcasecmp (slant, "i") == 0 || g_ascii_strcasecmp (slant, "i") == 0
|| g_strcasecmp (slant, "o") == 0) || g_ascii_strcasecmp (slant, "o") == 0)
logfont.lfItalic = TRUE; logfont.lfItalic = TRUE;
else else
logfont.lfItalic = FALSE; logfont.lfItalic = FALSE;
logfont.lfUnderline = FALSE; logfont.lfUnderline = FALSE;
logfont.lfStrikeOut = FALSE; logfont.lfStrikeOut = FALSE;
if (g_strcasecmp (registry, "iso8859") == 0) if (g_ascii_strcasecmp (registry, "iso8859") == 0)
if (strcmp (encoding, "1") == 0) if (strcmp (encoding, "1") == 0)
logfont.lfCharSet = ANSI_CHARSET; logfont.lfCharSet = ANSI_CHARSET;
else if (strcmp (encoding, "2") == 0) else if (strcmp (encoding, "2") == 0)
@ -1095,45 +1095,45 @@ gdk_font_load_internal (const gchar *font_name)
logfont.lfCharSet = TURKISH_CHARSET; logfont.lfCharSet = TURKISH_CHARSET;
else else
logfont.lfCharSet = ANSI_CHARSET; /* XXX ??? */ logfont.lfCharSet = ANSI_CHARSET; /* XXX ??? */
else if (g_strcasecmp (registry, "jisx0208.1983") == 0) else if (g_ascii_strcasecmp (registry, "jisx0208.1983") == 0)
logfont.lfCharSet = SHIFTJIS_CHARSET; logfont.lfCharSet = SHIFTJIS_CHARSET;
else if (g_strcasecmp (registry, "ksc5601.1987") == 0) else if (g_ascii_strcasecmp (registry, "ksc5601.1987") == 0)
logfont.lfCharSet = HANGEUL_CHARSET; logfont.lfCharSet = HANGEUL_CHARSET;
else if (g_strcasecmp (registry, "gb2312.1980") == 0) else if (g_ascii_strcasecmp (registry, "gb2312.1980") == 0)
logfont.lfCharSet = GB2312_CHARSET; logfont.lfCharSet = GB2312_CHARSET;
else if (g_strcasecmp (registry, "big5") == 0) else if (g_ascii_strcasecmp (registry, "big5") == 0)
logfont.lfCharSet = CHINESEBIG5_CHARSET; logfont.lfCharSet = CHINESEBIG5_CHARSET;
else if (g_strcasecmp (registry, "windows") == 0 else if (g_ascii_strcasecmp (registry, "windows") == 0
|| g_strcasecmp (registry, "microsoft") == 0) || g_ascii_strcasecmp (registry, "microsoft") == 0)
if (g_strcasecmp (encoding, "symbol") == 0) if (g_ascii_strcasecmp (encoding, "symbol") == 0)
logfont.lfCharSet = SYMBOL_CHARSET; logfont.lfCharSet = SYMBOL_CHARSET;
else if (g_strcasecmp (encoding, "shiftjis") == 0) else if (g_ascii_strcasecmp (encoding, "shiftjis") == 0)
logfont.lfCharSet = SHIFTJIS_CHARSET; logfont.lfCharSet = SHIFTJIS_CHARSET;
else if (g_strcasecmp (encoding, "gb2312") == 0) else if (g_ascii_strcasecmp (encoding, "gb2312") == 0)
logfont.lfCharSet = GB2312_CHARSET; logfont.lfCharSet = GB2312_CHARSET;
else if (g_strcasecmp (encoding, "hangeul") == 0) else if (g_ascii_strcasecmp (encoding, "hangeul") == 0)
logfont.lfCharSet = HANGEUL_CHARSET; logfont.lfCharSet = HANGEUL_CHARSET;
else if (g_strcasecmp (encoding, "big5") == 0) else if (g_ascii_strcasecmp (encoding, "big5") == 0)
logfont.lfCharSet = CHINESEBIG5_CHARSET; logfont.lfCharSet = CHINESEBIG5_CHARSET;
else if (g_strcasecmp (encoding, "johab") == 0) else if (g_ascii_strcasecmp (encoding, "johab") == 0)
logfont.lfCharSet = JOHAB_CHARSET; logfont.lfCharSet = JOHAB_CHARSET;
else if (g_strcasecmp (encoding, "hebrew") == 0) else if (g_ascii_strcasecmp (encoding, "hebrew") == 0)
logfont.lfCharSet = HEBREW_CHARSET; logfont.lfCharSet = HEBREW_CHARSET;
else if (g_strcasecmp (encoding, "arabic") == 0) else if (g_ascii_strcasecmp (encoding, "arabic") == 0)
logfont.lfCharSet = ARABIC_CHARSET; logfont.lfCharSet = ARABIC_CHARSET;
else if (g_strcasecmp (encoding, "greek") == 0) else if (g_ascii_strcasecmp (encoding, "greek") == 0)
logfont.lfCharSet = GREEK_CHARSET; logfont.lfCharSet = GREEK_CHARSET;
else if (g_strcasecmp (encoding, "turkish") == 0) else if (g_ascii_strcasecmp (encoding, "turkish") == 0)
logfont.lfCharSet = TURKISH_CHARSET; logfont.lfCharSet = TURKISH_CHARSET;
else if (g_strcasecmp (encoding, "easteurope") == 0) else if (g_ascii_strcasecmp (encoding, "easteurope") == 0)
logfont.lfCharSet = EASTEUROPE_CHARSET; logfont.lfCharSet = EASTEUROPE_CHARSET;
else if (g_strcasecmp (encoding, "russian") == 0) else if (g_ascii_strcasecmp (encoding, "russian") == 0)
logfont.lfCharSet = RUSSIAN_CHARSET; logfont.lfCharSet = RUSSIAN_CHARSET;
else if (g_strcasecmp (encoding, "mac") == 0) else if (g_ascii_strcasecmp (encoding, "mac") == 0)
logfont.lfCharSet = MAC_CHARSET; logfont.lfCharSet = MAC_CHARSET;
else if (g_strcasecmp (encoding, "baltic") == 0) else if (g_ascii_strcasecmp (encoding, "baltic") == 0)
logfont.lfCharSet = BALTIC_CHARSET; logfont.lfCharSet = BALTIC_CHARSET;
else if (g_strcasecmp (encoding, "cp1251") == 0) else if (g_ascii_strcasecmp (encoding, "cp1251") == 0)
logfont.lfCharSet = RUSSIAN_CHARSET; logfont.lfCharSet = RUSSIAN_CHARSET;
else else
logfont.lfCharSet = ANSI_CHARSET; /* XXX ??? */ logfont.lfCharSet = ANSI_CHARSET; /* XXX ??? */
@ -1142,9 +1142,9 @@ gdk_font_load_internal (const gchar *font_name)
logfont.lfOutPrecision = OUT_TT_PRECIS; logfont.lfOutPrecision = OUT_TT_PRECIS;
logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS; logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
logfont.lfQuality = PROOF_QUALITY; logfont.lfQuality = PROOF_QUALITY;
if (g_strcasecmp (spacing, "m") == 0) if (g_ascii_strcasecmp (spacing, "m") == 0)
logfont.lfPitchAndFamily = FIXED_PITCH; logfont.lfPitchAndFamily = FIXED_PITCH;
else if (g_strcasecmp (spacing, "p") == 0) else if (g_ascii_strcasecmp (spacing, "p") == 0)
logfont.lfPitchAndFamily = VARIABLE_PITCH; logfont.lfPitchAndFamily = VARIABLE_PITCH;
else else
logfont.lfPitchAndFamily = DEFAULT_PITCH; logfont.lfPitchAndFamily = DEFAULT_PITCH;