X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/5789bc942237a0cb3e35df33cbb37b2f8c5a704b..6ac7f054182a91601c70c93b663c10149a766fb7:/unix/pterm.c

diff --git a/unix/pterm.c b/unix/pterm.c
index fba33980..13cd994f 100644
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -1798,15 +1798,21 @@ void free_ctx(Context ctx)
  *
  * We are allowed to fiddle with the contents of `text'.
  */
-void do_text_internal(Context ctx, int x, int y, char *text, int len,
+void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 		      unsigned long attr, int lattr)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
     struct gui_data *inst = dctx->inst;
     GdkGC *gc = dctx->gc;
-
+    int ncombining, combining;
     int nfg, nbg, t, fontid, shadow, rlen, widefactor;
 
+    if (attr & TATTR_COMBINING) {
+	ncombining = len;
+	len = 1;
+    } else
+	ncombining = 1;
+
     nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
     nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
     nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
@@ -1841,7 +1847,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	    shadow = 1;
     }
 
-    if (lattr != LATTR_NORM) {
+    if ((lattr & LATTR_MODE) != LATTR_NORM) {
 	x *= 2;
 	if (x >= inst->term->cols)
 	    return;
@@ -1874,9 +1880,9 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	wchar_t *wcs;
 	int i;
 
-	wcs = snewn(len+1, wchar_t);
-	for (i = 0; i < len; i++) {
-	    wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
+	wcs = snewn(len*ncombining+1, wchar_t);
+	for (i = 0; i < len*ncombining; i++) {
+	    wcs[i] = text[i];
 	}
 
 	if (inst->fonts[fontid] == NULL) {
@@ -1907,33 +1913,40 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 	     * FIXME: when we have a wide-char equivalent of
 	     * from_unicode, use it instead of this.
 	     */
-	    for (i = 0; i <= len; i++)
-		gwcs[i] = wcs[i];
-	    gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
-			     x*inst->font_width+inst->cfg.window_border,
-			     y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-			     gwcs, len*2);
+	    for (combining = 0; combining < ncombining; combining++) {
+		for (i = 0; i <= len; i++)
+		    gwcs[i] = wcs[i + combining];
+		gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
+				 x*inst->font_width+inst->cfg.window_border,
+				 y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+				 gwcs, len*2);
+		if (shadow)
+		    gdk_draw_text_wc(inst->pixmap, inst->fonts[fontid], gc,
+				     x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
+				     y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+				     gwcs, len*2);
+	    }
 	    sfree(gwcs);
 	} else {
 	    gcs = snewn(len+1, gchar);
-	    wc_to_mb(inst->fontinfo[fontid].charset, 0,
-		     wcs, len, gcs, len, ".", NULL, NULL);
-	    gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
-			  x*inst->font_width+inst->cfg.window_border,
-			  y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-			  gcs, len);
+	    for (combining = 0; combining < ncombining; combining++) {
+		wc_to_mb(inst->fontinfo[fontid].charset, 0,
+			 wcs + combining, len, gcs, len, ".", NULL, NULL);
+		gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
+			      x*inst->font_width+inst->cfg.window_border,
+			      y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+			      gcs, len);
+		if (shadow)
+		    gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
+				  x*inst->font_width+inst->cfg.window_border+inst->cfg.shadowboldoffset,
+				  y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
+				  gcs, len);
+	    }
 	    sfree(gcs);
 	}
 	sfree(wcs);
     }
 
-    if (shadow) {
-	gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
-		      x*inst->font_width+inst->cfg.window_border + inst->cfg.shadowboldoffset,
-		      y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
-		      text, len);
-    }
-
     if (attr & ATTR_UNDER) {
 	int uheight = inst->fonts[0]->ascent + 1;
 	if (uheight >= inst->font_height)
@@ -1944,7 +1957,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 		      y*inst->font_height + uheight + inst->cfg.window_border);
     }
 
-    if (lattr != LATTR_NORM) {
+    if ((lattr & LATTR_MODE) != LATTR_NORM) {
 	/*
 	 * I can't find any plausible StretchBlt equivalent in the
 	 * X server, so I'm going to do this the slow and painful
@@ -1960,13 +1973,13 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 			    y*inst->font_height+inst->cfg.window_border,
 			    x*inst->font_width+inst->cfg.window_border + 2*i+1,
 			    y*inst->font_height+inst->cfg.window_border,
-			    len * inst->font_width - i, inst->font_height);
+			    len * widefactor * inst->font_width - i, inst->font_height);
 	}
 	len *= 2;
-	if (lattr != LATTR_WIDE) {
+	if ((lattr & LATTR_MODE) != LATTR_WIDE) {
 	    int dt, db;
 	    /* Now stretch vertically, in the same way. */
-	    if (lattr == LATTR_BOT)
+	    if ((lattr & LATTR_MODE) == LATTR_BOT)
 		dt = 0, db = 1;
 	    else
 		dt = 1, db = 0;
@@ -1974,15 +1987,15 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 		gdk_draw_pixmap(inst->pixmap, gc, inst->pixmap,
 				x*inst->font_width+inst->cfg.window_border,
 				y*inst->font_height+inst->cfg.window_border+dt*i+db,
-				x*widefactor*inst->font_width+inst->cfg.window_border,
+				x*inst->font_width+inst->cfg.window_border,
 				y*inst->font_height+inst->cfg.window_border+dt*(i+1),
-				len * inst->font_width, inst->font_height-i-1);
+				len * widefactor * inst->font_width, inst->font_height-i-1);
 	    }
 	}
     }
 }
 
-void do_text(Context ctx, int x, int y, char *text, int len,
+void do_text(Context ctx, int x, int y, wchar_t *text, int len,
 	     unsigned long attr, int lattr)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
@@ -1998,7 +2011,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	widefactor = 1;
     }
 
-    if (lattr != LATTR_NORM) {
+    if ((lattr & LATTR_MODE) != LATTR_NORM) {
 	x *= 2;
 	if (x >= inst->term->cols)
 	    return;
@@ -2015,14 +2028,14 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 		    len*widefactor*inst->font_width, inst->font_height);
 }
 
-void do_cursor(Context ctx, int x, int y, char *text, int len,
+void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
 	       unsigned long attr, int lattr)
 {
     struct draw_ctx *dctx = (struct draw_ctx *)ctx;
     struct gui_data *inst = dctx->inst;
     GdkGC *gc = dctx->gc;
 
-    int passive, widefactor;
+    int active, passive, widefactor;
 
     if (attr & TATTR_PASCURS) {
 	attr &= ~TATTR_PASCURS;
@@ -2031,16 +2044,21 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	passive = 0;
     if ((attr & TATTR_ACTCURS) && inst->cfg.cursor_type != 0) {
 	attr &= ~TATTR_ACTCURS;
-    }
+        active = 1;
+    } else
+        active = 0;
     do_text_internal(ctx, x, y, text, len, attr, lattr);
 
+    if (attr & TATTR_COMBINING)
+	len = 1;
+
     if (attr & ATTR_WIDE) {
 	widefactor = 2;
     } else {
 	widefactor = 1;
     }
 
-    if (lattr != LATTR_NORM) {
+    if ((lattr & LATTR_MODE) != LATTR_NORM) {
 	x *= 2;
 	if (x >= inst->term->cols)
 	    return;
@@ -2060,7 +2078,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	    gdk_draw_rectangle(inst->pixmap, gc, 0,
 			       x*inst->font_width+inst->cfg.window_border,
 			       y*inst->font_height+inst->cfg.window_border,
-			       len*inst->font_width-1, inst->font_height-1);
+			       len*widefactor*inst->font_width-1, inst->font_height-1);
 	}
     } else {
 	int uheight;
@@ -2068,7 +2086,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 
 	int char_width;
 
-	if ((attr & ATTR_WIDE) || lattr != LATTR_NORM)
+	if ((attr & ATTR_WIDE) || (lattr & LATTR_MODE) != LATTR_NORM)
 	    char_width = 2*inst->font_width;
 	else
 	    char_width = inst->font_width;
@@ -2082,7 +2100,7 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 	    starty = y * inst->font_height + inst->cfg.window_border + uheight;
 	    dx = 1;
 	    dy = 0;
-	    length = len * char_width;
+	    length = len * widefactor * char_width;
 	} else {
 	    int xadjust = 0;
 	    if (attr & TATTR_RIGHTCURS)
@@ -2103,10 +2121,10 @@ void do_cursor(Context ctx, int x, int y, char *text, int len,
 		startx += dx;
 		starty += dy;
 	    }
-	} else {
+	} else if (active) {
 	    gdk_draw_line(inst->pixmap, gc, startx, starty,
 			  startx + (length-1) * dx, starty + (length-1) * dy);
-	}
+	} /* else no cursor (e.g., blinked off) */
     }
 
     gdk_draw_pixmap(inst->area->window, gc, inst->pixmap,
@@ -2719,8 +2737,8 @@ void setup_fonts_ucs(struct gui_data *inst)
     inst->font_width = gdk_char_width(inst->fonts[0], ' ');
     inst->font_height = inst->fonts[0]->ascent + inst->fonts[0]->descent;
 
-    inst->direct_to_font = init_ucs(&inst->ucsdata,
-				    inst->cfg.line_codepage, font_charset,
+    inst->direct_to_font = init_ucs(&inst->ucsdata, inst->cfg.line_codepage,
+				    inst->cfg.utf8_override, font_charset,
 				    inst->cfg.vtmode);
 }