1 files changed, 94 insertions, 5 deletions

diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 88cdfaeff..bf8c92c8f 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -56,9 +56,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+
 #include <X11/Xlib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
 
 static void
 report_failed_grab (GtkWidget *parent_window, const char *what)
@@ -85,6 +87,67 @@ ok_dialog(GtkWidget *entry, gpointer dialog)
         gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 }
 
+static gboolean
+check_none(GtkWidget *widget, GdkEventKey *event, gpointer dialog)
+{
+        switch (event->keyval) {
+        case GDK_KEY_Escape:
+                /* esc -> close dialog */
+                gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
+                return TRUE;
+        case GDK_KEY_Tab:
+                /* tab -> focus close button */
+                gtk_widget_grab_focus(gtk_dialog_get_widget_for_response(
+                    dialog, GTK_RESPONSE_CLOSE));
+                return TRUE;
+        default:
+                /* eat all other key events */
+                return TRUE;
+        }
+}
+
+static int
+parse_env_hex_color(const char *env, GdkColor *c)
+{
+        const char *s;
+        unsigned long ul;
+        char *ep;
+        size_t n;
+
+        if ((s = getenv(env)) == NULL)
+                return 0;
+
+        memset(c, 0, sizeof(*c));
+
+        /* Permit hex rgb or rrggbb optionally prefixed by '#' or '0x' */
+        if (*s == '#')
+                s++;
+        else if (strncmp(s, "0x", 2) == 0)
+                s += 2;
+        n = strlen(s);
+        if (n != 3 && n != 6)
+                goto bad;
+        ul = strtoul(s, &ep, 16);
+        if (*ep != '\0' || ul > 0xffffff) {
+ bad:
+                fprintf(stderr, "Invalid $%s - invalid hex color code\n", env);
+                return 0;
+        }
+        /* Valid hex sequence; expand into a GdkColor */
+        if (n == 3) {
+                /* 4-bit RGB */
+                c->red = ((ul >> 8) & 0xf) << 12;
+                c->green = ((ul >> 4) & 0xf) << 12;
+                c->blue = (ul & 0xf) << 12;
+        } else {
+                /* 8-bit RGB */
+                c->red = ((ul >> 16) & 0xff) << 8;
+                c->green = ((ul >> 8) & 0xff) << 8;
+                c->blue = (ul & 0xff) << 8;
+        }
+        return 1;
+}
+
 static int
 passphrase_dialog(char *message, int prompt_type)
 {
@@ -94,11 +157,16 @@ passphrase_dialog(char *message, int prompt_type)
         int buttons, default_response;
         GtkWidget *parent_window, *dialog, *entry;
         GdkGrabStatus status;
+        GdkColor fg, bg;
+        int fg_set = 0, bg_set = 0;
 
         grab_server = (getenv("GNOME_SSH_ASKPASS_GRAB_SERVER") != NULL);
         grab_pointer = (getenv("GNOME_SSH_ASKPASS_GRAB_POINTER") != NULL);
         grab_tries = 0;
 
+        fg_set = parse_env_hex_color("GNOME_SSH_ASKPASS_FG_COLOR", &fg);
+        bg_set = parse_env_hex_color("GNOME_SSH_ASKPASS_BG_COLOR", &bg);
+
         /* Create an invisible parent window so that GtkDialog doesn't
          * complain.  */
         parent_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -127,17 +195,38 @@ passphrase_dialog(char *message, int prompt_type)
         gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_response);
         gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
 
-        if (prompt_type == PROMPT_ENTRY) {
+        if (fg_set)
+                gtk_widget_modify_fg(dialog, GTK_STATE_NORMAL, &fg);
+        if (bg_set)
+                gtk_widget_modify_bg(dialog, GTK_STATE_NORMAL, &bg);
+
+        if (prompt_type == PROMPT_ENTRY || prompt_type == PROMPT_NONE) {
                 entry = gtk_entry_new();
+                if (fg_set)
+                        gtk_widget_modify_fg(entry, GTK_STATE_NORMAL, &fg);
+                if (bg_set)
+                        gtk_widget_modify_bg(entry, GTK_STATE_NORMAL, &bg);
                 gtk_box_pack_start(
                     GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
                     entry, FALSE, FALSE, 0);
                 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
                 gtk_widget_grab_focus(entry);
-                gtk_widget_show(entry);
-                /* Make <enter> close dialog */
-                g_signal_connect(G_OBJECT(entry), "activate",
-                                 G_CALLBACK(ok_dialog), dialog);
+                if (prompt_type == PROMPT_ENTRY) {
+                        gtk_widget_show(entry);
+                        /* Make <enter> close dialog */
+                        g_signal_connect(G_OBJECT(entry), "activate",
+                                         G_CALLBACK(ok_dialog), dialog);
+                } else {
+                        /*
+                         * Ensure the 'close' button is not focused by default
+                         * but is still reachable via tab. This is a bit of a
+                         * hack - it uses a hidden entry that responds to a
+                         * couple of keypress events (escape and tab only).
+                         */
+                        gtk_widget_realize(entry);
+                        g_signal_connect(G_OBJECT(entry), "key_press_event",
+                                         G_CALLBACK(check_none), dialog);
+                }
         }
 
         /* Grab focus */