Fixes (mostly from Colin Watson, a couple redone by me) to make Unix

[u/mdw/putty] / terminal.c

diff --git a/terminal.c b/terminal.c
index ba504d4..73ab393 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -1889,13 +1889,18 @@ static void check_selection(Terminal *term, pos from, pos to)
 static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
 {
     termline *line;
-    int i, seltop, olddisptop, shift;
+    int i, seltop;
+#ifdef OPTIMISE_SCROLL
+    int olddisptop, shift;
+#endif /* OPTIMISE_SCROLL */
 
     if (topline != 0 || term->alt_which != 0)
        sb = FALSE;
 
+#ifdef OPTIMISE_SCROLL
     olddisptop = term->disptop;
     shift = lines;
+#endif /* OPTIMISE_SCROLL */
     if (lines < 0) {
        while (lines < 0) {
            line = delpos234(term->screen, botline);
@@ -4770,7 +4775,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
        termchar *lchars;
        int dirty_line, dirty_run, selected;
        unsigned long attr = 0, cset = 0;
-       int updated_line = 0;
        int start = 0;
        int ccount = 0;
        int last_run_dirty = 0;
@@ -4968,8 +4972,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
                    if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
                        do_cursor(ctx, start, i, ch, ccount, attr,
                                  ldata->lattr);
-
-                   updated_line = 1;
                }
                start = j;
                ccount = 0;
@@ -5054,8 +5056,6 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
            if (attr & (TATTR_ACTCURS | TATTR_PASCURS))
                do_cursor(ctx, start, i, ch, ccount, attr,
                          ldata->lattr);
-
-           updated_line = 1;
        }
 
        unlineptr(ldata);
@@ -5251,7 +5251,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
            sprintf(cbuf, "<U+%04x>", (ldata[top.x] & 0xFFFF));
 #else
            wchar_t cbuf[16], *p;
-           int set, c;
+           int c;
            int x = top.x;
 
            if (ldata->chars[x].chr == UCSWIDE) {
@@ -5285,7 +5285,6 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
                    break;
                }
 
-               set = (uc & CSET_MASK);
                c = (uc & ~CSET_MASK);
 #ifdef PLATFORM_IS_UTF16
                if (uc > 0x10000 && uc < 0x110000) {