Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

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

diff --git a/unix/pterm.c b/unix/pterm.c
index 2c8d9e1..b1cd7d0 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -386,7 +386,7 @@ static void show_mouseptr(struct gui_data *inst, int show)
 void draw_backing_rect(struct gui_data *inst)
 {
     GdkGC *gc = gdk_gc_new(inst->area->window);
-    gdk_gc_set_foreground(gc, &inst->cols[18]);   /* default background */
+    gdk_gc_set_foreground(gc, &inst->cols[258]);    /* default background */
     gdk_draw_rectangle(inst->pixmap, gc, 1, 0, 0,
                       inst->cfg.width * inst->font_width + 2*inst->cfg.window_border,
                       inst->cfg.height * inst->font_height + 2*inst->cfg.window_border);
@@ -2163,7 +2163,7 @@ void do_cursor(Context ctx, int x, int y, wchar_t *text, int len,
            length = inst->font_height;
        }
 
-       gdk_gc_set_foreground(gc, &inst->cols[NCFGCOLOURS-1]);
+       gdk_gc_set_foreground(gc, &inst->cols[261]);
        if (passive) {
            for (i = 0; i < length; i++) {
                if (i % 2 == 0) {
@@ -2551,17 +2551,6 @@ int do_cmdline(int argc, char **argv, int do_everything,
     return err;
 }
 
-static void block_signal(int sig, int block_it) {
-  sigset_t ss;
-
-  sigemptyset(&ss);
-  sigaddset(&ss, sig);
-  if(sigprocmask(block_it ? SIG_BLOCK : SIG_UNBLOCK, &ss, 0) < 0) {
-    perror("sigprocmask");
-    exit(1);
-  }
-}
-
 /*
  * This function retrieves the character set encoding of a font. It
  * returns the character set without the X11 hack (in case the user
@@ -2868,7 +2857,8 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
 
     cfg2 = inst->cfg;                  /* structure copy */
 
-    if (do_config_box(title, &cfg2, 1)) {
+    if (do_config_box(title, &cfg2, 1,
+                     inst->back?inst->back->cfg_info(inst->backhandle):0)) {
 
         oldcfg = inst->cfg;            /* structure copy */
         inst->cfg = cfg2;              /* structure copy */