Serial back end for Unix. Due to hardware limitations (no Linux box

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

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 9838250..920d7fe 100644 (file)
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -155,6 +155,8 @@ Filename platform_default_filename(const char *name)
 
 char *platform_default_s(const char *name)
 {
+    if (!strcmp(name, "SerialLine"))
+       return dupstr("/dev/ttyS0");
     return NULL;
 }
 
@@ -189,6 +191,22 @@ int from_backend(void *frontend, int is_stderr, const char *data, int len)
     return term_data(inst->term, is_stderr, data, len);
 }
 
+int from_backend_untrusted(void *frontend, const char *data, int len)
+{
+    struct gui_data *inst = (struct gui_data *)frontend;
+    return term_data_untrusted(inst->term, data, len);
+}
+
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+    struct gui_data *inst = (struct gui_data *)p->frontend;
+    int ret;
+    ret = cmdline_get_passwd_input(p, in, inlen);
+    if (ret == -1)
+       ret = term_get_userpass_input(inst->term, p, in, inlen);
+    return ret;
+}
+
 void logevent(void *frontend, const char *string)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
@@ -713,19 +731,21 @@ gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
        if (inst->cfg.nethack_keypad) {
            char *keys = NULL;
            switch (event->keyval) {
-             case GDK_KP_1: case GDK_KP_End: keys = "bB"; break;
-             case GDK_KP_2: case GDK_KP_Down: keys = "jJ"; break;
-             case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN"; break;
-             case GDK_KP_4: case GDK_KP_Left: keys = "hH"; break;
-             case GDK_KP_5: case GDK_KP_Begin: keys = ".."; break;
-             case GDK_KP_6: case GDK_KP_Right: keys = "lL"; break;
-             case GDK_KP_7: case GDK_KP_Home: keys = "yY"; break;
-             case GDK_KP_8: case GDK_KP_Up: keys = "kK"; break;
-             case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU"; break;
+             case GDK_KP_1: case GDK_KP_End: keys = "bB\002"; break;
+             case GDK_KP_2: case GDK_KP_Down: keys = "jJ\012"; break;
+             case GDK_KP_3: case GDK_KP_Page_Down: keys = "nN\016"; break;
+             case GDK_KP_4: case GDK_KP_Left: keys = "hH\010"; break;
+             case GDK_KP_5: case GDK_KP_Begin: keys = "..."; break;
+             case GDK_KP_6: case GDK_KP_Right: keys = "lL\014"; break;
+             case GDK_KP_7: case GDK_KP_Home: keys = "yY\031"; break;
+             case GDK_KP_8: case GDK_KP_Up: keys = "kK\013"; break;
+             case GDK_KP_9: case GDK_KP_Page_Up: keys = "uU\025"; break;
            }
            if (keys) {
                end = 2;
-               if (event->state & GDK_SHIFT_MASK)
+               if (event->state & GDK_CONTROL_MASK)
+                   output[1] = keys[2];
+               else if (event->state & GDK_SHIFT_MASK)
                    output[1] = keys[1];
                else
                    output[1] = keys[0];
@@ -1374,8 +1394,13 @@ void palette_set(void *frontend, int n, int r, int g, int b)
     if (n > NALLCOLOURS)
        return;
     real_palette_set(inst, n, r, g, b);
-    if (n == 258)
+    if (n == 258) {
+       /* Default Background changed. Ensure space between text area and
+        * window border is redrawn */
        set_window_background(inst);
+       draw_backing_rect(inst);
+       gtk_widget_queue_draw(inst->area);
+    }
 }
 
 void palette_reset(void *frontend)
@@ -1407,12 +1432,12 @@ void palette_reset(void *frontend)
     for (i = 0; i < NEXTCOLOURS; i++) {
        if (i < 216) {
            int r = i / 36, g = (i / 6) % 6, b = i % 6;
-           inst->cols[i+16].red = r * 0x3333;
-           inst->cols[i+16].green = g * 0x3333;
-           inst->cols[i+16].blue = b * 0x3333;
+           inst->cols[i+16].red = r ? r * 0x2828 + 0x3737 : 0;
+           inst->cols[i+16].green = g ? g * 0x2828 + 0x3737 : 0;
+           inst->cols[i+16].blue = b ? b + 0x2828 + 0x3737 : 0;
        } else {
            int shade = i - 216;
-           shade = (shade + 1) * 0xFFFF / (NEXTCOLOURS - 216 + 1);
+           shade = shade * 0x0a0a + 0x0808;
            inst->cols[i+16].red = inst->cols[i+16].green =
                inst->cols[i+16].blue = shade;
        }
@@ -1427,7 +1452,13 @@ void palette_reset(void *frontend)
                     inst->cfg.colours[i][1], inst->cfg.colours[i][2]);
     }
 
+    /* Since Default Background may have changed, ensure that space
+     * between text area and window border is refreshed. */
     set_window_background(inst);
+    if (inst->area) {
+       draw_backing_rect(inst);
+       gtk_widget_queue_draw(inst->area);
+    }
 }
 
 /* Ensure that all the cut buffers exist - according to the ICCCM, we must
@@ -1475,7 +1506,7 @@ char * retrieve_cutbuffer(int * nbytes)
     return ptr;
 }
 
-void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t * data, int *attr, int len, int must_deselect)
 {
     struct gui_data *inst = (struct gui_data *)frontend;
     if (inst->pasteout_data)
@@ -1832,7 +1863,7 @@ void sys_cursor(void *frontend, int x, int y)
  * may want to perform additional actions on any kind of bell (for
  * example, taskbar flashing in Windows).
  */
-void beep(void *frontend, int mode)
+void do_beep(void *frontend, int mode)
 {
     if (mode != BELL_VISUAL)
        gdk_beep();
@@ -1885,6 +1916,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     GdkGC *gc = dctx->gc;
     int ncombining, combining;
     int nfg, nbg, t, fontid, shadow, rlen, widefactor;
+    int monochrome = gtk_widget_get_visual(inst->area)->depth == 1;
 
     if (attr & TATTR_COMBINING) {
        ncombining = len;
@@ -1892,9 +1924,9 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
     } else
        ncombining = 1;
 
-    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
-    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
-    if (attr & ATTR_REVERSE) {
+    nfg = ((monochrome ? ATTR_DEFFG : (attr & ATTR_FGMASK)) >> ATTR_FGSHIFT);
+    nbg = ((monochrome ? ATTR_DEFBG : (attr & ATTR_BGMASK)) >> ATTR_BGSHIFT);
+    if (!!(attr & ATTR_REVERSE) ^ (monochrome && (attr & TATTR_ACTCURS))) {
        t = nfg;
        nfg = nbg;
        nbg = t;
@@ -1907,7 +1939,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
        if (nbg < 16) nbg |= 8;
        else if (nbg >= 256) nbg |= 1;
     }
-    if (attr & TATTR_ACTCURS) {
+    if ((attr & TATTR_ACTCURS) && !monochrome) {
        nfg = 260;
        nbg = 261;
     }
@@ -2841,7 +2873,7 @@ void clear_scrollback_menuitem(GtkMenuItem *item, gpointer data)
 void reset_terminal_menuitem(GtkMenuItem *item, gpointer data)
 {
     struct gui_data *inst = (struct gui_data *)data;
-    term_pwron(inst->term);
+    term_pwron(inst->term, TRUE);
     if (inst->ldisc)
        ldisc_send(inst->ldisc, NULL, 0, 0);
 }
@@ -3212,6 +3244,7 @@ void restart_session_menuitem(GtkMenuItem *item, gpointer data)
 
     if (!inst->back) {
        logevent(inst, "----- Session restarted -----");
+       term_pwron(inst->term, FALSE);
        start_backend(inst);
        inst->exited = FALSE;
     }
@@ -3355,6 +3388,8 @@ static void start_backend(struct gui_data *inst)
        set_icon(inst, title);
        sfree(title);
     }
+    sfree(realhost);
+
     inst->back->provide_logctx(inst->backhandle, inst->logctx);
 
     term_provide_resize_fn(inst->term, inst->back->size, inst->backhandle);
@@ -3411,7 +3446,7 @@ int pt_main(int argc, char **argv)
 
        cmdline_run_saved(&inst->cfg);
 
-       if (!*inst->cfg.host && !cfgbox(&inst->cfg))
+       if (!cfg_launchable(&inst->cfg) && !cfgbox(&inst->cfg))
            exit(0);                   /* config box hit Cancel */
     }