tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

focus improvement for gnome-ssh-askpass[23] 

When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
then <enter> doesn't immediately close the dialog. Instead, require an
explicit <tab> to reach the close button, or <esc>.
This commit is contained in:
Damien Miller 2020-09-18 14:50:38 +10:00
parent d6f507f37e
commit 9d3d36bdb1
1 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
contrib/gnome-ssh-askpass2.c
View File

@ -59,6 +59,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
static void static void
report_failed_grab (GtkWidget *parent_window, const char *what) report_failed_grab (GtkWidget *parent_window, const char *what)
@ -85,6 +86,25 @@ ok_dialog(GtkWidget *entry, gpointer dialog)
gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK); 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 static int
passphrase_dialog(char *message, int prompt_type) passphrase_dialog(char *message, int prompt_type)
{ {
@ -127,17 +147,29 @@ passphrase_dialog(char *message, int prompt_type)
gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_response); gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_response);
gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE); gtk_window_set_keep_above(GTK_WINDOW(dialog), TRUE);
if (prompt_type == PROMPT_ENTRY) { if (prompt_type == PROMPT_ENTRY || prompt_type == PROMPT_NONE) {
entry = gtk_entry_new(); entry = gtk_entry_new();
gtk_box_pack_start( gtk_box_pack_start(
GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
entry, FALSE, FALSE, 0); entry, FALSE, FALSE, 0);
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
gtk_widget_grab_focus(entry); gtk_widget_grab_focus(entry);
gtk_widget_show(entry); if (prompt_type == PROMPT_ENTRY) {
/* Make <enter> close dialog */ gtk_widget_show(entry);
g_signal_connect(G_OBJECT(entry), "activate", /* Make <enter> close dialog */
G_CALLBACK(ok_dialog), 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 */ /* Grab focus */