[Qemacs-commit] qemacs x11.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/05/03 06:08:16

Modified files:
        .              : x11.c 

Log message:
        x11: small improvements
        - interpret X11 geometry string as pixels, not characters
        - fix invalid UCS2 character display in x11

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/x11.c?cvsroot=qemacs&r1=1.52&r2=1.53

Patches:
Index: x11.c
===================================================================
RCS file: /sources/qemacs/qemacs/x11.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- x11.c       28 Apr 2017 21:46:01 -0000      1.52
+++ x11.c       3 May 2017 10:08:16 -0000       1.53
@@ -237,8 +237,8 @@
         xsize = w;
         ysize = h;
     } else {
-        xsize = 128;
-        ysize = 50;
+        xsize = 128 * font_xsize;
+        ysize = 50 * font_ysize;
 
         if (geometry_str) {
             p = geometry_str;
@@ -254,8 +254,6 @@
         }
     }
 
-    xsize *= font_xsize;
-    ysize *= font_ysize;
     s->width = xsize;
     s->height = ysize;
     s->charset = &charset_utf8;
@@ -983,6 +981,9 @@
             q = x11_str;
         }
         last_font = font1;
+        /* XXX: invalid conversion from UCS4 to UCS2 */
+        if (cc >= 0xFFFF)
+            cc = 0xFFFD;
         q->byte1 = (cc >> 8) & 0xff;
         q->byte2 = (cc) & 0xff;
         q++;