Fix x11font_has_glyph so it doesn't get caught out by signed chars.

[u/mdw/putty] / unix / gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 3f6f94b..c9455a5 100644 (file)
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -210,6 +210,11 @@ int from_backend_untrusted(void *frontend, const char *data, int len)
     return term_data_untrusted(inst->term, data, len);
 }
 
+int from_backend_eof(void *frontend)
+{
+    return TRUE;   /* do respond to incoming EOF with outgoing */
+}
+
 int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
 {
     struct gui_data *inst = (struct gui_data *)p->frontend;
@@ -685,7 +690,8 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
         */
        output_charset = CS_UTF8;
        {
-           wchar_t widedata[32], *wp;
+           wchar_t widedata[32];
+            const wchar_t *wp;
            int wlen;
            int ulen;
 
@@ -1633,7 +1639,7 @@ void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_des
      * if we aren't in direct-to-font mode using the D800 hack.
      */
     if (!inst->direct_to_font) {
-       wchar_t *tmp = data;
+       const wchar_t *tmp = data;
        int tmplen = len;
        XTextProperty tp;
        char *list[1];
@@ -2132,28 +2138,12 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
                       rlen*widefactor*inst->font_width, inst->font_height);
 
     gdk_gc_set_foreground(gc, &inst->cols[nfg]);
-    {
-       gchar *gcs;
-
-       /*
-        * FIXME: this length is hardwired on the assumption that
-        * conversions from wide to multibyte characters will
-        * never generate more than 10 bytes for a single wide
-        * character.
-        */
-       gcs = snewn(len*10+1, gchar);
-
-       for (combining = 0; combining < ncombining; combining++) {
-           int mblen = wc_to_mb(inst->fonts[fontid]->real_charset, 0,
-                                text + combining, len, gcs, len*10+1, ".",
-                                NULL, NULL);
-           unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid],
-                             x*inst->font_width+inst->window_border,
-                             y*inst->font_height+inst->window_border+inst->fonts[0]->ascent,
-                             gcs, mblen, widefactor > 1, bold, inst->font_width);
-       }
-
-       sfree(gcs);
+    for (combining = 0; combining < ncombining; combining++) {
+        unifont_draw_text(inst->pixmap, gc, inst->fonts[fontid],
+                          x*inst->font_width+inst->window_border,
+                          y*inst->font_height+inst->window_border+inst->fonts[0]->ascent,
+                          text + combining, len, widefactor > 1,
+                          bold, inst->font_width);
     }
 
     if (attr & ATTR_UNDER) {
@@ -2755,8 +2745,8 @@ void setup_fonts_ucs(struct gui_data *inst)
         unifont_destroy(inst->fonts[3]);
 
     fs = conf_get_fontspec(inst->conf, CONF_font);
-    inst->fonts[0] = unifont_create(inst->area, fs->name, FALSE, FALSE,
-                                   shadowboldoffset, shadowbold);
+    inst->fonts[0] = multifont_create(inst->area, fs->name, FALSE, FALSE,
+                                      shadowboldoffset, shadowbold);
     if (!inst->fonts[0]) {
        fprintf(stderr, "%s: unable to load font \"%s\"\n", appname,
                fs->name);
@@ -2767,8 +2757,8 @@ void setup_fonts_ucs(struct gui_data *inst)
     if (shadowbold || !fs->name[0]) {
        inst->fonts[1] = NULL;
     } else {
-       inst->fonts[1] = unifont_create(inst->area, fs->name, FALSE, TRUE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[1] = multifont_create(inst->area, fs->name, FALSE, TRUE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[1]) {
            fprintf(stderr, "%s: unable to load bold font \"%s\"\n", appname,
                    fs->name);
@@ -2778,8 +2768,8 @@ void setup_fonts_ucs(struct gui_data *inst)
 
     fs = conf_get_fontspec(inst->conf, CONF_widefont);
     if (fs->name[0]) {
-       inst->fonts[2] = unifont_create(inst->area, fs->name, TRUE, FALSE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[2] = multifont_create(inst->area, fs->name, TRUE, FALSE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[2]) {
            fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname,
                    fs->name);
@@ -2793,8 +2783,8 @@ void setup_fonts_ucs(struct gui_data *inst)
     if (shadowbold || !fs->name[0]) {
        inst->fonts[3] = NULL;
     } else {
-       inst->fonts[3] = unifont_create(inst->area, fs->name, TRUE, TRUE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[3] = multifont_create(inst->area, fs->name, TRUE, TRUE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[3]) {
            fprintf(stderr, "%s: unable to load wide bold font \"%s\"\n", appname,
                    fs->name);