diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2022-01-19 00:45:43 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:08:46 +0200 |
commit | 4875a15ca61358a1c95b156b2279fce092451278 (patch) | |
tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/modules/om/generic | |
parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
download | nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.gz nx-libs-4875a15ca61358a1c95b156b2279fce092451278.tar.bz2 nx-libs-4875a15ca61358a1c95b156b2279fce092451278.zip |
Update libNX_X11 to upstream's libX11-1.7.3.1-10-gd60ede78
Diffstat (limited to 'nx-X11/lib/modules/om/generic')
-rw-r--r-- | nx-X11/lib/modules/om/generic/omGeneric.c | 13 | ||||
-rw-r--r-- | nx-X11/lib/modules/om/generic/omTextEsc.c | 6 |
2 files changed, 10 insertions, 9 deletions
diff --git a/nx-X11/lib/modules/om/generic/omGeneric.c b/nx-X11/lib/modules/om/generic/omGeneric.c index ec612d379..39c4f1bf4 100644 --- a/nx-X11/lib/modules/om/generic/omGeneric.c +++ b/nx-X11/lib/modules/om/generic/omGeneric.c @@ -702,7 +702,7 @@ parse_omit_name( switch (num_fields) { case 12: - /* This is the best way to have specifed the fontset. In this + /* This is the best way to have specified the fontset. In this * case, there is no original encoding. E.g., * -*-*-*-*-*-*-14-*-*-*-*-* * To this, we'll append a dash: @@ -771,7 +771,7 @@ parse_omit_name( if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL) return True; - /* This may mot be needed anymore as XListFonts() takes care of this */ + /* This may not be needed anymore as XListFonts() takes care of this */ if (num_fields < 12) { if ((last - buf) > (XLFD_MAX_LEN - 2)) return -1; @@ -1113,7 +1113,7 @@ parse_fontname( goto err; } else if(ret == True) { /* - * We can't just loop thru fontset->font_data to + * We can't just loop through fontset->font_data to * find the first (ie. best) match: parse_fontdata * will try a substitute font if no primary one could * be matched. It returns the required information in @@ -1640,7 +1640,7 @@ close_om( for (count = gen->data_num; count-- > 0; data++) { Xfree(data->charset_list); data->charset_list = NULL; - + /* free font_data for om */ free_fontdataOM(data->font_data,data->font_data_count); Xfree(data->font_data); @@ -1908,7 +1908,8 @@ init_om( char **required_list; XOrientation *orientation; char **value, buf[BUFSIZ], *bufptr; - int count = 0, num = 0, length = 0; + int count = 0, num = 0; + unsigned int length = 0; _XlcGetResource(lcd, "XLC_FONTSET", "on_demand_loading", &value, &count); if (count > 0 && _XlcCompareISOLatin1(*value, "True") == 0) @@ -2048,7 +2049,7 @@ init_om( /* directional dependent drawing */ om->core.directional_dependent = False; - /* contexual drawing */ + /* contextual drawing */ om->core.contextual_drawing = False; /* context dependent */ diff --git a/nx-X11/lib/modules/om/generic/omTextEsc.c b/nx-X11/lib/modules/om/generic/omTextEsc.c index df1fb10c0..2aaff73db 100644 --- a/nx-X11/lib/modules/om/generic/omTextEsc.c +++ b/nx-X11/lib/modules/om/generic/omTextEsc.c @@ -169,10 +169,10 @@ TextWidthWithFontSet( * */ - if(fd == (FontData) NULL || - (font = font_set->font) == (XFontStruct *) NULL) { + if((font = font_set->font) == (XFontStruct *) NULL) { - if((font = fd->font) == (XFontStruct *) NULL) + if(fd == (FontData) NULL || + (font = fd->font) == (XFontStruct *) NULL) break; } |