Introduced wrapper macros snew(), snewn() and sresize() for the

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

diff --git a/unix/pterm.c b/unix/pterm.c
index 5a48dd0..6d6a9a5 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -88,10 +88,28 @@ 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";
+       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;
 }
 
@@ -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
@@ -1265,7 +1283,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
        wchar_t *tmp = data;
        int tmplen = len;
 
-       inst->pasteout_data_utf8 = smalloc(len*6);
+       inst->pasteout_data_utf8 = snewn(len*6, char);
        inst->pasteout_data_utf8_len = len*6;
        inst->pasteout_data_utf8_len =
            charset_from_unicode(&tmp, &tmplen, inst->pasteout_data_utf8,
@@ -1276,15 +1294,15 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
            inst->pasteout_data_utf8 = NULL;
        } else {
            inst->pasteout_data_utf8 =
-               srealloc(inst->pasteout_data_utf8,
-                        inst->pasteout_data_utf8_len);
+               sresize(inst->pasteout_data_utf8,
+                       inst->pasteout_data_utf8_len, char);
        }
     } else {
        inst->pasteout_data_utf8 = NULL;
        inst->pasteout_data_utf8_len = 0;
     }
 
-    inst->pasteout_data = smalloc(len*6);
+    inst->pasteout_data = snewn(len*6, char);
     inst->pasteout_data_len = len*6;
     inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
                                       data, len, inst->pasteout_data,
@@ -1295,7 +1313,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
        inst->pasteout_data = NULL;
     } else {
        inst->pasteout_data =
-           srealloc(inst->pasteout_data, inst->pasteout_data_len);
+           sresize(inst->pasteout_data, inst->pasteout_data_len, char);
     }
 
     if (gtk_selection_owner_set(inst->area, GDK_SELECTION_PRIMARY,
@@ -1396,7 +1414,7 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
     if (inst->pastein_data)
        sfree(inst->pastein_data);
 
-    inst->pastein_data = smalloc(seldata->length * sizeof(wchar_t));
+    inst->pastein_data = snewn(seldata->length, wchar_t);
     inst->pastein_data_len = seldata->length;
     inst->pastein_data_len =
        mb_to_wc((seldata->type == inst->utf8_string_atom ?
@@ -1512,7 +1530,7 @@ Context get_ctx(void *frontend)
     if (!inst->area->window)
        return NULL;
 
-    dctx = smalloc(sizeof(*dctx));
+    dctx = snew(struct draw_ctx);
     dctx->inst = inst;
     dctx->gc = gdk_gc_new(inst->area->window);
     return dctx;
@@ -1609,7 +1627,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
        wchar_t *wcs;
        int i;
 
-       wcs = smalloc(sizeof(wchar_t) * (len+1));
+       wcs = snewn(len+1, wchar_t);
        for (i = 0; i < len; i++) {
            wcs[i] = (wchar_t) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
        }
@@ -1636,7 +1654,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
             * and (c) the clip rectangle should prevent it causing
             * trouble anyway.
             */
-           gwcs = smalloc(sizeof(GdkWChar) * (len*2+1));
+           gwcs = snewn(len*2+1, GdkWChar);
            memset(gwcs, 0, sizeof(GdkWChar) * (len*2+1));
            /*
             * FIXME: when we have a wide-char equivalent of
@@ -1650,7 +1668,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
                             gwcs, len*2);
            sfree(gwcs);
        } else {
-           gcs = smalloc(sizeof(GdkWChar) * (len+1));
+           gcs = snewn(len+1, gchar);
            wc_to_mb(inst->fontinfo[fontid].charset, 0,
                     wcs, len, gcs, len, ".", NULL, NULL);
            gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
@@ -1960,6 +1978,13 @@ char *get_x_display(void *frontend)
     return gdk_get_display();
 }
 
+long get_windowid(void *frontend)
+{
+    Terminal *term = (Terminal *)frontend;
+    struct gui_data *inst = (struct gui_data *)(term->frontend);
+    return (long)GDK_WINDOW_XWINDOW(inst->area->window);
+}
+
 static void help(FILE *fp) {
     if(fprintf(fp,
 "pterm option summary:\n"
@@ -2022,26 +2047,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;
@@ -2104,7 +2129,7 @@ int do_cmdline(int argc, char **argv, int do_everything, Config *cfg)
 
            if (--argc > 0) {
                int i;
-               pty_argv = smalloc((argc+1) * sizeof(char *));
+               pty_argv = snewn(argc+1, char *);
                ++argv;
                for (i = 0; i < argc; i++)
                    pty_argv[i] = argv[i];
@@ -2122,8 +2147,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")) {
@@ -2268,7 +2293,7 @@ int main(int argc, char **argv)
     /*
      * Create an instance structure and initialise to zeroes
      */
-    inst = smalloc(sizeof(*inst));
+    inst = snew(struct gui_data);
     memset(inst, 0, sizeof(*inst));
     inst->alt_keycode = -1;            /* this one needs _not_ to be zero */
 
@@ -2278,37 +2303,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);