diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
| commit | 70ac75f4ab184c21d11b9840a47362610aaef481 (patch) | |
| tree | 183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/lib/X11/omXChar.c | |
| parent | 6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff) | |
| parent | 70e9d346fe34af127d2c827c3678e53d0f4312ae (diff) | |
| download | nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2 nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip | |
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/lib/X11/omXChar.c')
| -rw-r--r-- | nx-X11/lib/X11/omXChar.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/omXChar.c b/nx-X11/lib/X11/omXChar.c index 85d2f15b7..c9bbb8e88 100644 --- a/nx-X11/lib/X11/omXChar.c +++ b/nx-X11/lib/X11/omXChar.c @@ -317,7 +317,7 @@ _XomConvert( XlcCharSet charset; int length, cs_left, ret; FontSet font_set; - + cs = *to; cs_left = *to_left; lc_args[0] = (XPointer) &charset; @@ -335,20 +335,18 @@ _XomConvert( length = *to_left - cs_left; - { - if (font_set->side != charset->side) { - if (font_set->side == XlcGL) - shift_to_gl(*to, length); - else if (font_set->side == XlcGR) - shift_to_gr(*to, length); - } - - if (font_set->is_xchar2b) - length >>= 1; - *to = cs; - *to_left -= length; + if (font_set->side != charset->side) { + if (font_set->side == XlcGL) + shift_to_gl(*to, length); + else if (font_set->side == XlcGR) + shift_to_gr(*to, length); } + if (font_set->is_xchar2b) + length >>= 1; + *to = cs; + *to_left -= length; + *((XFontStruct **) args[0]) = font_set->font; *((Bool *) args[1]) = font_set->is_xchar2b; if(num_args >= 3){ |