Remove all `enum'-typed variables from the Config structure.

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

diff --git a/unix/pterm.c b/unix/pterm.c
index 69538f7..db8f3a8 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -67,6 +67,7 @@ struct gui_data {
     void *backhandle;
     Terminal *term;
     void *logctx;
+    struct unicode_data ucsdata;
     Config cfg;
 };
 
@@ -79,7 +80,7 @@ static int send_raw_mouse;
 
 static char *app_name = "pterm";
 
-char *x_get_default(char *key)
+char *x_get_default(const char *key)
 {
     return XGetDefault(GDK_DISPLAY(), app_name, key);
 }
@@ -87,17 +88,17 @@ char *x_get_default(char *key)
 /*
  * Default settings that are specific to pterm.
  */
-char *platform_default_s(char *name)
+char *platform_default_s(const char *name)
 {
     if (!strcmp(name, "Font"))
-       return "fixed";        /* COE_NORMAL works badly in an xterm */
+       return "fixed";
     return NULL;
 }
 
-int platform_default_i(char *name, int def)
+int platform_default_i(const char *name, int def)
 {
     if (!strcmp(name, "CloseOnExit"))
-       return COE_ALWAYS;             /* COE_NORMAL works badly in an xterm */
+       return FORCE_ON;               /* AUTO works badly in an xterm */
     return def;
 }
 
@@ -150,7 +151,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; */
 
@@ -936,7 +937,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;
 }
@@ -963,7 +965,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;
 }
@@ -988,8 +991,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);
 
        /*
@@ -1283,9 +1286,10 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 
     inst->pasteout_data = smalloc(len*6);
     inst->pasteout_data_len = len*6;
-    inst->pasteout_data_len = wc_to_mb(line_codepage, 0, data, len,
-                                      inst->pasteout_data,
-                                      inst->pasteout_data_len, NULL, NULL);
+    inst->pasteout_data_len = wc_to_mb(inst->ucsdata.line_codepage, 0,
+                                      data, len, inst->pasteout_data,
+                                      inst->pasteout_data_len,
+                                      NULL, NULL, NULL);
     if (inst->pasteout_data_len == 0) {
        sfree(inst->pasteout_data);
        inst->pasteout_data = NULL;
@@ -1396,7 +1400,7 @@ void selection_received(GtkWidget *widget, GtkSelectionData *seldata,
     inst->pastein_data_len = seldata->length;
     inst->pastein_data_len =
        mb_to_wc((seldata->type == inst->utf8_string_atom ?
-                 CS_UTF8 : line_codepage),
+                 CS_UTF8 : inst->ucsdata.line_codepage),
                 0, seldata->data, seldata->length,
                 inst->pastein_data, inst->pastein_data_len);
 
@@ -1646,7 +1650,7 @@ void do_text_internal(Context ctx, int x, int y, char *text, int len,
        } else {
            gcs = smalloc(sizeof(GdkWChar) * (len+1));
            wc_to_mb(inst->fontinfo[fontid].charset, 0,
-                    wcs, len, gcs, len, ".", NULL);
+                    wcs, len, gcs, len, ".", NULL, NULL);
            gdk_draw_text(inst->pixmap, inst->fonts[fontid], gc,
                          x*inst->font_width+inst->cfg.window_border,
                          y*inst->font_height+inst->cfg.window_border+inst->fonts[0]->ascent,
@@ -2315,7 +2319,8 @@ int main(int argc, char **argv)
     inst->compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", FALSE);
     inst->utf8_string_atom = gdk_atom_intern("UTF8_STRING", FALSE);
 
-    inst->direct_to_font = init_ucs(inst->cfg.line_codepage, font_charset);
+    inst->direct_to_font = init_ucs(&inst->ucsdata,
+                                   inst->cfg.line_codepage, font_charset);
 
     inst->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
@@ -2415,7 +2420,7 @@ int main(int argc, char **argv)
     inst->currcursor = inst->textcursor;
     show_mouseptr(inst, 1);
 
-    inst->term = term_init(&inst->cfg, inst);
+    inst->term = term_init(&inst->cfg, &inst->ucsdata, inst);
     inst->logctx = log_init(inst, &inst->cfg);
     term_provide_logctx(inst->term, inst->logctx);