Created new data types `Filename' and `FontSpec', intended to be

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

diff --git a/unix/pterm.c b/unix/pterm.c
index 402a4e7..66b55ff 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -88,17 +88,35 @@ char *x_get_default(const char *key)
 /*
  * Default settings that are specific to pterm.
  */
-char *platform_default_s(const char *name)
+FontSpec platform_default_fontspec(const char *name)
 {
+    FontSpec ret;
     if (!strcmp(name, "Font"))
-       return "fixed";        /* COE_NORMAL works badly in an xterm */
+       strcpy(ret.name, "fixed");
+    else
+       *ret.name = '\0';
+    return ret;
+}
+
+Filename platform_default_filename(const char *name)
+{
+    Filename ret;
+    if (!strcmp(name, "LogFileName"))
+       strcpy(ret.path, "putty.log");
+    else
+       *ret.path = '\0';
+    return ret;
+}
+
+char *platform_default_s(const char *name)
+{
     return NULL;
 }
 
 int platform_default_i(const char *name, int def)
 {
     if (!strcmp(name, "CloseOnExit"))
-       return COE_ALWAYS;             /* COE_NORMAL works badly in an xterm */
+       return 2;  /* maps to FORCE_ON after painful rearrangement :-( */
     return def;
 }
 
@@ -112,7 +130,7 @@ void ldisc_update(void *frontend, int echo, int edit)
      */
 }
 
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
 {
     /*
      * Logging in an xterm-alike is liable to be something you only
@@ -151,7 +169,7 @@ int font_dimension(void *frontend, int which)/* 0 for width, 1 for height */
  * mouse or a means of faking it, and there is no need to switch
  * buttons around at all.
  */
-Mouse_Button translate_button(void *frontend, Mouse_Button button)
+static Mouse_Button translate_button(Mouse_Button button)
 {
     /* struct gui_data *inst = (struct gui_data *)frontend; */
 
@@ -937,7 +955,8 @@ gint button_event(GtkWidget *widget, GdkEventButton *event, gpointer data)
     x = (event->x - inst->cfg.window_border) / inst->font_width;
     y = (event->y - inst->cfg.window_border) / inst->font_height;
 
-    term_mouse(inst->term, button, act, x, y, shift, ctrl, alt);
+    term_mouse(inst->term, button, translate_button(button), act,
+              x, y, shift, ctrl, alt);
 
     return TRUE;
 }
@@ -964,7 +983,8 @@ gint motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer data)
     x = (event->x - inst->cfg.window_border) / inst->font_width;
     y = (event->y - inst->cfg.window_border) / inst->font_height;
 
-    term_mouse(inst->term, button, MA_DRAG, x, y, shift, ctrl, alt);
+    term_mouse(inst->term, button, translate_button(button), MA_DRAG,
+              x, y, shift, ctrl, alt);
 
     return TRUE;
 }
@@ -989,8 +1009,8 @@ void done_with_pty(struct gui_data *inst)
         * Terminate now, if the Close On Exit setting is
         * appropriate.
         */
-       if (inst->cfg.close_on_exit == COE_ALWAYS ||
-           (inst->cfg.close_on_exit == COE_NORMAL && clean))
+       if (inst->cfg.close_on_exit == FORCE_ON ||
+           (inst->cfg.close_on_exit == AUTO && clean))
            exit(0);
 
        /*
@@ -1540,17 +1560,19 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
 
     int nfg, nbg, t, fontid, shadow, rlen, widefactor;
 
-    nfg = 2 * ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
-    nbg = 2 * ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nfg = ((attr & ATTR_FGMASK) >> ATTR_FGSHIFT);
+    nfg = 2 * (nfg & 0xF) + (nfg & 0x10 ? 1 : 0);
+    nbg = ((attr & ATTR_BGMASK) >> ATTR_BGSHIFT);
+    nbg = 2 * (nbg & 0xF) + (nbg & 0x10 ? 1 : 0);
     if (attr & ATTR_REVERSE) {
        t = nfg;
        nfg = nbg;
        nbg = t;
     }
     if (inst->cfg.bold_colour && (attr & ATTR_BOLD))
-       nfg++;
+       nfg |= 1;
     if (inst->cfg.bold_colour && (attr & ATTR_BLINK))
-       nbg++;
+       nbg |= 1;
     if (attr & TATTR_ACTCURS) {
        nfg = NCOLOURS-2;
        nbg = NCOLOURS-1;
@@ -2018,26 +2040,26 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
        if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(cfg->font, val, sizeof(cfg->font));
-           cfg->font[sizeof(cfg->font)-1] = '\0';
+           strncpy(cfg->font.name, val, sizeof(cfg->font.name));
+           cfg->font.name[sizeof(cfg->font.name)-1] = '\0';
 
        } else if (!strcmp(p, "-fb")) {
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(cfg->boldfont, val, sizeof(cfg->boldfont));
-           cfg->boldfont[sizeof(cfg->boldfont)-1] = '\0';
+           strncpy(cfg->boldfont.name, val, sizeof(cfg->boldfont.name));
+           cfg->boldfont.name[sizeof(cfg->boldfont.name)-1] = '\0';
 
        } else if (!strcmp(p, "-fw")) {
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(cfg->widefont, val, sizeof(cfg->widefont));
-           cfg->widefont[sizeof(cfg->widefont)-1] = '\0';
+           strncpy(cfg->widefont.name, val, sizeof(cfg->widefont.name));
+           cfg->widefont.name[sizeof(cfg->widefont.name)-1] = '\0';
 
        } else if (!strcmp(p, "-fwb")) {
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(cfg->wideboldfont, val, sizeof(cfg->wideboldfont));
-           cfg->wideboldfont[sizeof(cfg->wideboldfont)-1] = '\0';
+           strncpy(cfg->wideboldfont.name, val, sizeof(cfg->wideboldfont.name));
+           cfg->wideboldfont.name[sizeof(cfg->wideboldfont.name)-1] = '\0';
 
        } else if (!strcmp(p, "-cs")) {
            EXPECTS_ARG;
@@ -2118,8 +2140,8 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
        } else if (!strcmp(p, "-log")) {
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(cfg->logfilename, val, sizeof(cfg->logfilename));
-           cfg->logfilename[sizeof(cfg->logfilename)-1] = '\0';
+           strncpy(cfg->logfilename.path, val, sizeof(cfg->logfilename.path));
+           cfg->logfilename.path[sizeof(cfg->logfilename.path)-1] = '\0';
            cfg->logtype = LGTYP_DEBUG;
 
        } else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
@@ -2274,37 +2296,38 @@ int main(int argc, char **argv)
     if (do_cmdline(argc, argv, 1, &inst->cfg))
        exit(1);                       /* post-defaults, do everything */
 
-    inst->fonts[0] = gdk_font_load(inst->cfg.font);
+    inst->fonts[0] = gdk_font_load(inst->cfg.font.name);
     if (!inst->fonts[0]) {
-       fprintf(stderr, "pterm: unable to load font \"%s\"\n", inst->cfg.font);
+       fprintf(stderr, "pterm: unable to load font \"%s\"\n",
+               inst->cfg.font.name);
        exit(1);
     }
     font_charset = set_font_info(inst, 0);
-    if (inst->cfg.boldfont[0]) {
-       inst->fonts[1] = gdk_font_load(inst->cfg.boldfont);
+    if (inst->cfg.boldfont.name[0]) {
+       inst->fonts[1] = gdk_font_load(inst->cfg.boldfont.name);
        if (!inst->fonts[1]) {
            fprintf(stderr, "pterm: unable to load bold font \"%s\"\n",
-                   inst->cfg.boldfont);
+                   inst->cfg.boldfont.name);
            exit(1);
        }
        set_font_info(inst, 1);
     } else
        inst->fonts[1] = NULL;
-    if (inst->cfg.widefont[0]) {
-       inst->fonts[2] = gdk_font_load(inst->cfg.widefont);
+    if (inst->cfg.widefont.name[0]) {
+       inst->fonts[2] = gdk_font_load(inst->cfg.widefont.name);
        if (!inst->fonts[2]) {
            fprintf(stderr, "pterm: unable to load wide font \"%s\"\n",
-                   inst->cfg.boldfont);
+                   inst->cfg.widefont.name);
            exit(1);
        }
        set_font_info(inst, 2);
     } else
        inst->fonts[2] = NULL;
-    if (inst->cfg.wideboldfont[0]) {
-       inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont);
+    if (inst->cfg.wideboldfont.name[0]) {
+       inst->fonts[3] = gdk_font_load(inst->cfg.wideboldfont.name);
        if (!inst->fonts[3]) {
            fprintf(stderr, "pterm: unable to load wide/bold font \"%s\"\n",
-                   inst->cfg.boldfont);
+                   inst->cfg.wideboldfont.name);
            exit(1);
        }
        set_font_info(inst, 3);