Get rid of all the MSVC warnings.
[u/mdw/putty] / terminal.c
index 311df18..92c3f03 100644 (file)
@@ -1,3 +1,7 @@
+/*
+ * Terminal emulator.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -61,6 +65,8 @@
 
 #define has_compat(x) ( ((CL_##x)&term->compatibility_level) != 0 )
 
+char *EMPTY_WINDOW_TITLE = "";
+
 const char sco2ansicolour[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
 
 #define sel_nl_sz  (sizeof(sel_nl)/sizeof(wchar_t))
@@ -94,10 +100,12 @@ static termline *lineptr(Terminal *, int, int, int);
 static void unlineptr(termline *);
 static void do_paint(Terminal *, Context, int);
 static void erase_lots(Terminal *, int, int, int);
+static int find_last_nonempty_line(Terminal *, tree234 *);
 static void swap_screen(Terminal *, int, int, int);
 static void update_sbar(Terminal *);
 static void deselect(Terminal *);
 static void term_print_finish(Terminal *);
+static void scroll(Terminal *, int, int, int, int);
 #ifdef OPTIMISE_SCROLL
 static void scroll_display(Terminal *, int, int, int);
 #endif /* OPTIMISE_SCROLL */
@@ -1170,12 +1178,15 @@ static void term_schedule_vbell(Terminal *term, int already_started,
 
 /*
  * Set up power-on settings for the terminal.
+ * If 'clear' is false, don't actually clear the primary screen, and
+ * position the cursor below the last non-blank line (scrolling if
+ * necessary).
  */
-static void power_on(Terminal *term)
+static void power_on(Terminal *term, int clear)
 {
-    term->curs.x = term->curs.y = 0;
     term->alt_x = term->alt_y = 0;
     term->savecurs.x = term->savecurs.y = 0;
+    term->alt_savecurs.x = term->alt_savecurs.y = 0;
     term->alt_t = term->marg_t = 0;
     if (term->rows != -1)
        term->alt_b = term->marg_b = term->rows - 1;
@@ -1188,18 +1199,22 @@ static void power_on(Terminal *term)
     }
     term->alt_om = term->dec_om = term->cfg.dec_om;
     term->alt_ins = term->insert = FALSE;
-    term->alt_wnext = term->wrapnext = term->save_wnext = FALSE;
+    term->alt_wnext = term->wrapnext =
+        term->save_wnext = term->alt_save_wnext = FALSE;
     term->alt_wrap = term->wrap = term->cfg.wrap_mode;
-    term->alt_cset = term->cset = term->save_cset = 0;
-    term->alt_utf = term->utf = term->save_utf = 0;
+    term->alt_cset = term->cset = term->save_cset = term->alt_save_cset = 0;
+    term->alt_utf = term->utf = term->save_utf = term->alt_save_utf = 0;
     term->utf_state = 0;
-    term->alt_sco_acs = term->sco_acs = term->save_sco_acs = 0;
-    term->cset_attr[0] = term->cset_attr[1] = term->save_csattr = CSET_ASCII;
+    term->alt_sco_acs = term->sco_acs =
+        term->save_sco_acs = term->alt_save_sco_acs = 0;
+    term->cset_attr[0] = term->cset_attr[1] =
+        term->save_csattr = term->alt_save_csattr = CSET_ASCII;
     term->rvideo = 0;
     term->in_vbell = FALSE;
     term->cursor_on = 1;
     term->big_cursor = 0;
-    term->default_attr = term->save_attr = term->curr_attr = ATTR_DEFAULT;
+    term->default_attr = term->save_attr =
+       term->alt_save_attr = term->curr_attr = ATTR_DEFAULT;
     term->term_editing = term->term_echoing = FALSE;
     term->app_cursor_keys = term->cfg.app_cursor;
     term->app_keypad_keys = term->cfg.app_keypad;
@@ -1217,8 +1232,17 @@ static void power_on(Terminal *term)
        swap_screen(term, 1, FALSE, FALSE);
        erase_lots(term, FALSE, TRUE, TRUE);
        swap_screen(term, 0, FALSE, FALSE);
-       erase_lots(term, FALSE, TRUE, TRUE);
+       if (clear)
+           erase_lots(term, FALSE, TRUE, TRUE);
+       term->curs.y = find_last_nonempty_line(term, term->screen) + 1;
+       if (term->curs.y == term->rows) {
+           term->curs.y--;
+           scroll(term, 0, term->rows - 1, 1, TRUE);
+       }
+    } else {
+       term->curs.y = 0;
     }
+    term->curs.x = 0;
     term_schedule_tblink(term);
     term_schedule_cblink(term);
 }
@@ -1283,9 +1307,9 @@ void term_seen_key_event(Terminal *term)
 /*
  * Same as power_on(), but an external function.
  */
-void term_pwron(Terminal *term)
+void term_pwron(Terminal *term, int clear)
 {
-    power_on(term);
+    power_on(term, clear);
     if (term->ldisc)                  /* cause ldisc to notice changes */
        ldisc_send(term->ldisc, NULL, 0, 0);
     term->disptop = 0;
@@ -1384,7 +1408,7 @@ void term_reconfig(Terminal *term, Config *cfg)
  */
 void term_clrsb(Terminal *term)
 {
-    termline *line;
+    unsigned char *line;
     term->disptop = 0;
     while ((line = delpos234(term->scrollback, 0)) != NULL) {
        sfree(line);            /* this is compressed data, not a termline */
@@ -1442,7 +1466,7 @@ Terminal *term_init(Config *mycfg, struct unicode_data *ucsdata,
     term->tabs = NULL;
     deselect(term);
     term->rows = term->cols = -1;
-    power_on(term);
+    power_on(term, TRUE);
     term->beephead = term->beeptail = NULL;
 #ifdef OPTIMISE_SCROLL
     term->scrollhead = term->scrolltail = NULL;
@@ -1730,6 +1754,7 @@ static int find_last_nonempty_line(Terminal * term, tree234 * screen)
 static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
 {
     int t;
+    pos tp;
     tree234 *ttr;
 
     if (!which)
@@ -1777,6 +1802,35 @@ static void swap_screen(Terminal *term, int which, int reset, int keep_cur_pos)
        t = term->sco_acs;
        if (!reset) term->sco_acs = term->alt_sco_acs;
        term->alt_sco_acs = t;
+
+       tp = term->savecurs;
+       if (!reset && !keep_cur_pos)
+           term->savecurs = term->alt_savecurs;
+       term->alt_savecurs = tp;
+        t = term->save_cset;
+        if (!reset && !keep_cur_pos)
+            term->save_cset = term->alt_save_cset;
+        term->alt_save_cset = t;
+        t = term->save_csattr;
+        if (!reset && !keep_cur_pos)
+            term->save_csattr = term->alt_save_csattr;
+        term->alt_save_csattr = t;
+        t = term->save_attr;
+        if (!reset && !keep_cur_pos)
+            term->save_attr = term->alt_save_attr;
+        term->alt_save_attr = t;
+        t = term->save_utf;
+        if (!reset && !keep_cur_pos)
+            term->save_utf = term->alt_save_utf;
+        term->alt_save_utf = t;
+        t = term->save_wnext;
+        if (!reset && !keep_cur_pos)
+            term->save_wnext = term->alt_save_wnext;
+        term->alt_save_wnext = t;
+        t = term->save_sco_acs;
+        if (!reset && !keep_cur_pos)
+            term->save_sco_acs = term->alt_save_sco_acs;
+        term->alt_save_sco_acs = t;
     }
 
     if (reset && term->screen) {
@@ -3076,7 +3130,7 @@ static void term_out(Terminal *term)
                    break;
                  case 'c':            /* RIS: restore power-on settings */
                    compatibility(VT100);
-                   power_on(term);
+                   power_on(term, TRUE);
                    if (term->ldisc)   /* cause ldisc to notice changes */
                        ldisc_send(term->ldisc, NULL, 0, 0);
                    if (term->reset_132) {
@@ -3294,10 +3348,17 @@ static void term_out(Terminal *term)
                        break;
                      case 'J':       /* ED: erase screen or parts of it */
                        {
-                           unsigned int i = def(term->esc_args[0], 0) + 1;
-                           if (i > 3)
-                               i = 0;
-                           erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
+                           unsigned int i = def(term->esc_args[0], 0);
+                           if (i == 3) {
+                               /* Erase Saved Lines (xterm)
+                                * This follows Thomas Dickey's xterm. */
+                               term_clrsb(term);
+                           } else {
+                               i++;
+                               if (i > 3)
+                                   i = 0;
+                               erase_lots(term, FALSE, !!(i & 2), !!(i & 1));
+                           }
                        }
                        term->disptop = 0;
                        seen_disp_event(term);
@@ -3732,8 +3793,11 @@ static void term_out(Terminal *term)
                                break;
                              case 20:
                                if (term->ldisc &&
-                                   !term->cfg.no_remote_qtitle) {
-                                   p = get_window_title(term->frontend, TRUE);
+                                   term->cfg.remote_qtitle_action != TITLE_NONE) {
+                                   if(term->cfg.remote_qtitle_action == TITLE_REAL)
+                                       p = get_window_title(term->frontend, TRUE);
+                                   else
+                                       p = EMPTY_WINDOW_TITLE;
                                    len = strlen(p);
                                    ldisc_send(term->ldisc, "\033]L", 3, 0);
                                    ldisc_send(term->ldisc, p, len, 0);
@@ -3742,8 +3806,11 @@ static void term_out(Terminal *term)
                                break;
                              case 21:
                                if (term->ldisc &&
-                                   !term->cfg.no_remote_qtitle) {
-                                   p = get_window_title(term->frontend,FALSE);
+                                   term->cfg.remote_qtitle_action != TITLE_NONE) {
+                                   if(term->cfg.remote_qtitle_action == TITLE_REAL)
+                                       p = get_window_title(term->frontend, FALSE);
+                                   else
+                                       p = EMPTY_WINDOW_TITLE;
                                    len = strlen(p);
                                    ldisc_send(term->ldisc, "\033]l", 3, 0);
                                    ldisc_send(term->ldisc, p, len, 0);
@@ -4080,7 +4147,7 @@ static void term_out(Terminal *term)
                break;
              case SEEN_OSC_P:
                {
-                   int max = (term->osc_strlen == 0 ? 21 : 16);
+                   int max = (term->osc_strlen == 0 ? 21 : 15);
                    int val;
                    if ((int)c >= '0' && (int)c <= '9')
                        val = c - '0';
@@ -4809,10 +4876,12 @@ static void do_paint(Terminal *term, Context ctx, int may_optimise)
                != newline[j].attr) {
                int k;
 
-               for (k = laststart; k < j; k++)
-                   term->disptext[i]->chars[k].attr |= ATTR_INVALID;
+               if (!dirtyrect) {
+                   for (k = laststart; k < j; k++)
+                       term->disptext[i]->chars[k].attr |= ATTR_INVALID;
 
-               dirtyrect = TRUE;
+                   dirtyrect = TRUE;
+               }
            }
 
            if (dirtyrect)
@@ -5040,17 +5109,43 @@ void term_scroll(Terminal *term, int rel, int where)
     term_update(term);
 }
 
+/*
+ * Helper routine for clipme(): growing buffer.
+ */
+typedef struct {
+    int buflen;                    /* amount of allocated space in textbuf/attrbuf */
+    int bufpos;                    /* amount of actual data */
+    wchar_t *textbuf;      /* buffer for copied text */
+    wchar_t *textptr;      /* = textbuf + bufpos (current insertion point) */
+    int *attrbuf;          /* buffer for copied attributes */
+    int *attrptr;          /* = attrbuf + bufpos */
+} clip_workbuf;
+
+static void clip_addchar(clip_workbuf *b, wchar_t chr, int attr)
+{
+    if (b->bufpos >= b->buflen) {
+       b->buflen += 128;
+       b->textbuf = sresize(b->textbuf, b->buflen, wchar_t);
+       b->textptr = b->textbuf + b->bufpos;
+       b->attrbuf = sresize(b->attrbuf, b->buflen, int);
+       b->attrptr = b->attrbuf + b->bufpos;
+    }
+    *b->textptr++ = chr;
+    *b->attrptr++ = attr;
+    b->bufpos++;
+}
+
 static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 {
-    wchar_t *workbuf;
-    wchar_t *wbptr;                   /* where next char goes within workbuf */
+    clip_workbuf buf;
     int old_top_x;
-    int wblen = 0;                    /* workbuf len */
-    int buflen;                               /* amount of memory allocated to workbuf */
+    int attr;
+
+    buf.buflen = 5120;                 
+    buf.bufpos = 0;
+    buf.textptr = buf.textbuf = snewn(buf.buflen, wchar_t);
+    buf.attrptr = buf.attrbuf = snewn(buf.buflen, int);
 
-    buflen = 5120;                    /* Default size */
-    workbuf = snewn(buflen, wchar_t);
-    wbptr = workbuf;                  /* start filling here */
     old_top_x = top.x;                /* needed for rect==1 */
 
     while (poslt(top, bottom)) {
@@ -5073,7 +5168,8 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
         * newline at the end)...
         */
        if (!(ldata->lattr & LATTR_WRAPPED)) {
-           while (IS_SPACE_CHR(ldata->chars[nlpos.x - 1].chr) &&
+           while (nlpos.x &&
+                  IS_SPACE_CHR(ldata->chars[nlpos.x - 1].chr) &&
                   !ldata->chars[nlpos.x - 1].cc_next &&
                   poslt(top, nlpos))
                decpos(nlpos);
@@ -5113,6 +5209,7 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
 
            while (1) {
                int uc = ldata->chars[x].chr;
+                attr = ldata->chars[x].attr;
 
                switch (uc & CSET_MASK) {
                  case CSET_LINEDRW:
@@ -5164,16 +5261,8 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
                }
 #endif
 
-               for (p = cbuf; *p; p++) {
-                   /* Enough overhead for trailing NL and nul */
-                   if (wblen >= buflen - 16) {
-                       buflen += 100;
-                       workbuf = sresize(workbuf, buflen, wchar_t);
-                       wbptr = workbuf + wblen;
-                   }
-                   wblen++;
-                   *wbptr++ = *p;
-               }
+               for (p = cbuf; *p; p++)
+                   clip_addchar(&buf, *p, attr);
 
                if (ldata->chars[x].cc_next)
                    x += ldata->chars[x].cc_next;
@@ -5184,10 +5273,8 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
        }
        if (nl) {
            int i;
-           for (i = 0; i < sel_nl_sz; i++) {
-               wblen++;
-               *wbptr++ = sel_nl[i];
-           }
+           for (i = 0; i < sel_nl_sz; i++)
+               clip_addchar(&buf, sel_nl[i], 0);
        }
        top.y++;
        top.x = rect ? old_top_x : 0;
@@ -5195,12 +5282,12 @@ static void clipme(Terminal *term, pos top, pos bottom, int rect, int desel)
        unlineptr(ldata);
     }
 #if SELECTION_NUL_TERMINATED
-    wblen++;
-    *wbptr++ = 0;
+    clip_addchar(&buf, 0, 0);
 #endif
-    write_clip(term->frontend, workbuf, wblen, desel); /* transfer to clipbd */
-    if (buflen > 0)                   /* indicates we allocated this buffer */
-       sfree(workbuf);
+    /* Finally, transfer all that to the clipboard. */
+    write_clip(term->frontend, buf.textbuf, buf.attrbuf, buf.bufpos, desel);
+    sfree(buf.textbuf);
+    sfree(buf.attrbuf);
 }
 
 void term_copyall(Terminal *term)
@@ -5541,7 +5628,16 @@ void term_mouse(Terminal *term, Mouse_Button braw, Mouse_Button bcooked,
     selpoint.x = x;
     unlineptr(ldata);
 
-    if (raw_mouse) {
+    /*
+     * If we're in the middle of a selection operation, we ignore raw
+     * mouse mode until it's done (we must have been not in raw mouse
+     * mode when it started).
+     * This makes use of Shift for selection reliable, and avoids the
+     * host seeing mouse releases for which they never saw corresponding
+     * presses.
+     */
+    if (raw_mouse &&
+       (term->selstate != ABOUT_TO) && (term->selstate != DRAGGING)) {
        int encstate = 0, r, c;
        char abuf[16];
 
@@ -6345,7 +6441,7 @@ int term_get_userpass_input(Terminal *term, prompts_t *p,
         */
        {
            int i;
-           for (i = 0; i < p->n_prompts; i++)
+           for (i = 0; i < (int)p->n_prompts; i++)
                memset(p->prompts[i]->result, 0, p->prompts[i]->result_len);
        }
     }