X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/093a75b8a54d97147cceb00084bd11ec47d4b905..e63ae276e98f0b99468fc34c3671cd3c69701ecf:/terminal.c

diff --git a/terminal.c b/terminal.c
index eb5d9074..d57218a7 100644
--- a/terminal.c
+++ b/terminal.c
@@ -1373,12 +1373,12 @@ void term_out(Terminal *term)
 		     * Perform an actual beep if we're not overloaded.
 		     */
 		    if (!cfg.bellovl || !term->beep_overloaded) {
+			beep(term->frontend, cfg.beep);
 			if (cfg.beep == BELL_VISUAL) {
 			    term->in_vbell = TRUE;
 			    term->vbell_startpoint = ticks;
 			    term_update(term);
-			} else
-			    beep(term->frontend, cfg.beep);
+			}
 		    }
 		    term->disptop = 0;
 		}
@@ -2983,7 +2983,7 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
 	     */
 	    if ((tchar | tattr) != (term->disptext[idx]& ~ATTR_NARROW)) {
 		if ((tattr & ATTR_WIDE) == 0 && 
-		    CharWidth(ctx, (tchar | tattr) & 0xFFFF) == 2)
+		    char_width(ctx, (tchar | tattr) & 0xFFFF) == 2)
 		    tattr |= ATTR_NARROW;
 	    } else if (term->disptext[idx]&ATTR_NARROW)
 		tattr |= ATTR_NARROW;
@@ -3251,12 +3251,12 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect)
 
 	    if (DIRECT_FONT(uc)) {
 		if (c >= ' ' && c != 0x7F) {
-		    unsigned char buf[4];
+		    char buf[4];
 		    WCHAR wbuf[4];
 		    int rv;
 		    if (is_dbcs_leadbyte(font_codepage, (BYTE) c)) {
 			buf[0] = c;
-			buf[1] = (unsigned char) ldata[top.x + 1];
+			buf[1] = ldata[top.x + 1];
 			rv = mb_to_wc(font_codepage, 0, buf, 2, wbuf, 4);
 			top.x++;
 		    } else {