nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 12:03:03 -05:00
Code Issues Projects Releases Wiki Activity

Make some static text in GTK dialogs selectable.

Browse Source 
I've made the licence text, the About box, and the host key dialog
into GTK selectable edit controls. (The former because it contains a
lot of text; the About box because pasting version numbers into bug
reports is obviously useful; the host key because of the fingerprint.)

(cherry picked from commit 21101c7397e460933635a7bfed813864fc4f88fe)

Conflicts:
	unix/gtkdlg.c
	unix/unix.h

(cherry-picker's notes: not a trivial resolution, since I had to apply
the equivalent changes in the pre-GTK3-port version of the code)
This commit is contained in:
Simon Tatham 2016-02-25 20:39:22 +00:00
parent a5634e0ccb
commit 7a5d434e34
3 changed files with 59 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
unix/gtkdlg.c
View File

@ -3138,12 +3138,13 @@ static void messagebox_handler(union control *ctrl, void *dlg,
if (event == EVENT_ACTION) if (event == EVENT_ACTION)
dlg_end(dlg, ctrl->generic.context.i); dlg_end(dlg, ctrl->generic.context.i);
} }
int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...) int messagebox(GtkWidget *parentwin, char *title, char *msg,
int minwid, int selectable, ...)
{ {
GtkWidget *window, *w0, *w1; GtkWidget *window, *w0, *w1;
struct controlbox *ctrlbox; struct controlbox *ctrlbox;
struct controlset *s0, *s1; struct controlset *s0, *s1;
union control *c; union control *c, *textctrl;
struct dlgparam dp; struct dlgparam dp;
struct Shortcuts scs; struct Shortcuts scs;
int index, ncols; int index, ncols;
@ -3158,7 +3159,7 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...)
ctrlbox = ctrl_new_box(); ctrlbox = ctrl_new_box();
ncols = 0; ncols = 0;
va_start(ap, minwid); va_start(ap, selectable);
while (va_arg(ap, char *) != NULL) { while (va_arg(ap, char *) != NULL) {
ncols++; ncols++;
(void) va_arg(ap, int); /* shortcut */ (void) va_arg(ap, int); /* shortcut */
@ -3173,7 +3174,7 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...)
c->columns.percentages = sresize(c->columns.percentages, ncols, int); c->columns.percentages = sresize(c->columns.percentages, ncols, int);
for (index = 0; index < ncols; index++) for (index = 0; index < ncols; index++)
c->columns.percentages[index] = (index+1)*100/ncols - index*100/ncols; c->columns.percentages[index] = (index+1)*100/ncols - index*100/ncols;
va_start(ap, minwid); va_start(ap, selectable);
index = 0; index = 0;
while (1) { while (1) {
char *title = va_arg(ap, char *); char *title = va_arg(ap, char *);
@ -3194,7 +3195,7 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...)
va_end(ap); va_end(ap);
s1 = ctrl_getset(ctrlbox, "x", "", ""); s1 = ctrl_getset(ctrlbox, "x", "", "");
ctrl_text(s1, msg, HELPCTX(no_help)); textctrl = ctrl_text(s1, msg, HELPCTX(no_help));
window = gtk_dialog_new(); window = gtk_dialog_new();
gtk_window_set_title(GTK_WINDOW(window), title); gtk_window_set_title(GTK_WINDOW(window), title);
@ -3213,6 +3214,26 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...)
dp.retval = 0; dp.retval = 0;
dp.window = window; dp.window = window;
if (selectable) {
#if GTK_CHECK_VERSION(2,0,0)
struct uctrl *uc = dlg_find_byctrl(&dp, textctrl);
gtk_label_set_selectable(GTK_LABEL(uc->text), TRUE);
/*
* GTK selectable labels have a habit of selecting their
* entire contents when they gain focus. It's ugly to have
* text in a message box start up all selected, so we suppress
* this by manually selecting none of it - but we must do this
* when the widget _already has_ focus, otherwise our work
* will be undone when it gains it shortly.
*/
gtk_widget_grab_focus(uc->text);
gtk_label_select_region(GTK_LABEL(uc->text), 0, 0);
#else
(void)textctrl; /* placate warning */
#endif
}
gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_modal(GTK_WINDOW(window), TRUE);
if (parentwin) { if (parentwin) {
set_transient_window_pos(parentwin, window); set_transient_window_pos(parentwin, window);
@ -3220,7 +3241,9 @@ int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...)
GTK_WINDOW(parentwin)); GTK_WINDOW(parentwin));
} else } else
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_container_set_focus_child(GTK_CONTAINER(window), NULL);
gtk_widget_show(window); gtk_widget_show(window);
gtk_window_set_focus(GTK_WINDOW(window), NULL);
gtk_signal_connect(GTK_OBJECT(window), "destroy", gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(window_destroy), NULL); GTK_SIGNAL_FUNC(window_destroy), NULL);
@ -3250,6 +3273,7 @@ int reallyclose(void *frontend)
int ret = messagebox(GTK_WIDGET(get_window(frontend)), int ret = messagebox(GTK_WIDGET(get_window(frontend)),
title, "Are you sure you want to close this session?", title, "Are you sure you want to close this session?",
string_width("Most of the width of the above text"), string_width("Most of the width of the above text"),
FALSE,
"Yes", 'y', +1, 1, "Yes", 'y', +1, 1,
"No", 'n', -1, 0, "No", 'n', -1, 0,
NULL); NULL);
@ -3303,6 +3327,7 @@ int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
ret = messagebox(GTK_WIDGET(get_window(frontend)), ret = messagebox(GTK_WIDGET(get_window(frontend)),
"PuTTY Security Alert", text, "PuTTY Security Alert", text,
string_width(fingerprint), string_width(fingerprint),
TRUE,
"Accept", 'a', 0, 2, "Accept", 'a', 0, 2,
"Connect Once", 'o', 0, 1, "Connect Once", 'o', 0, 1,
"Cancel", 'c', -1, 0, "Cancel", 'c', -1, 0,
@ -3336,6 +3361,7 @@ int askalg(void *frontend, const char *algtype, const char *algname,
ret = messagebox(GTK_WIDGET(get_window(frontend)), ret = messagebox(GTK_WIDGET(get_window(frontend)),
"PuTTY Security Alert", text, "PuTTY Security Alert", text,
string_width("Continue with connection?"), string_width("Continue with connection?"),
FALSE,
"Yes", 'y', 0, 1, "Yes", 'y', 0, 1,
"No", 'n', 0, 0, "No", 'n', 0, 0,
NULL); NULL);
@ -3359,14 +3385,14 @@ void fatal_message_box(void *window, char *msg)
{ {
messagebox(window, "PuTTY Fatal Error", msg, messagebox(window, "PuTTY Fatal Error", msg,
string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"), string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
"OK", 'o', 1, 1, NULL); FALSE, "OK", 'o', 1, 1, NULL);
} }
void nonfatal_message_box(void *window, char *msg) void nonfatal_message_box(void *window, char *msg)
{ {
messagebox(window, "PuTTY Error", msg, messagebox(window, "PuTTY Error", msg,
string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"), string_width("REASONABLY LONG LINE OF TEXT FOR BASIC SANITY"),
"OK", 'o', 1, 1, NULL); FALSE, "OK", 'o', 1, 1, NULL);
} }
void fatalbox(char *p, ...) void fatalbox(char *p, ...)
@ -3439,7 +3465,7 @@ static void licence_clicked(GtkButton *button, gpointer data)
messagebox(aboutbox, title, licence, messagebox(aboutbox, title, licence,
string_width("LONGISH LINE OF TEXT SO THE LICENCE" string_width("LONGISH LINE OF TEXT SO THE LICENCE"
" BOX ISN'T EXCESSIVELY TALL AND THIN"), " BOX ISN'T EXCESSIVELY TALL AND THIN"),
"OK", 'o', 1, 1, NULL); TRUE, "OK", 'o', 1, 1, NULL);
sfree(title); sfree(title);
} }
@ -3476,25 +3502,35 @@ void about_box(void *window)
GTK_SIGNAL_FUNC(licence_clicked), NULL); GTK_SIGNAL_FUNC(licence_clicked), NULL);
gtk_widget_show(w); gtk_widget_show(w);
w = gtk_label_new(appname); {
char *label_text = dupprintf
("%s\n\n%s\n\n%s",
appname, ver,
"Copyright 1997-2015 Simon Tatham. All rights reserved");
w = gtk_label_new(label_text);
gtk_label_set_justify(GTK_LABEL(w), GTK_JUSTIFY_CENTER);
#if GTK_CHECK_VERSION(2,0,0)
gtk_label_set_selectable(GTK_LABEL(w), TRUE);
#endif
sfree(label_text);
}
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox), gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
w, FALSE, FALSE, 0); w, FALSE, FALSE, 0);
gtk_widget_show(w); #if GTK_CHECK_VERSION(2,0,0)
/*
w = gtk_label_new(ver); * Same precautions against initial select-all as in messagebox().
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox), */
w, FALSE, FALSE, 5); gtk_widget_grab_focus(w);
gtk_widget_show(w); gtk_label_select_region(GTK_LABEL(w), 0, 0);
#endif
w = gtk_label_new("Copyright 1997-2015 Simon Tatham. All rights reserved");
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(aboutbox)->vbox),
w, FALSE, FALSE, 5);
gtk_widget_show(w); gtk_widget_show(w);
set_transient_window_pos(GTK_WIDGET(window), aboutbox); set_transient_window_pos(GTK_WIDGET(window), aboutbox);
gtk_window_set_transient_for(GTK_WINDOW(aboutbox), gtk_window_set_transient_for(GTK_WINDOW(aboutbox),
GTK_WINDOW(window)); GTK_WINDOW(window));
gtk_container_set_focus_child(GTK_CONTAINER(aboutbox), NULL);
gtk_widget_show(aboutbox); gtk_widget_show(aboutbox);
gtk_window_set_focus(GTK_WINDOW(aboutbox), NULL);
} }
struct eventlog_stuff { struct eventlog_stuff {
@ -3757,6 +3793,7 @@ int askappend(void *frontend, Filename *filename,
mbret = messagebox(get_window(frontend), mbtitle, message, mbret = messagebox(get_window(frontend), mbtitle, message,
string_width("LINE OF TEXT SUITABLE FOR THE" string_width("LINE OF TEXT SUITABLE FOR THE"
" ASKAPPEND WIDTH"), " ASKAPPEND WIDTH"),
FALSE,
"Overwrite", 'o', 1, 2, "Overwrite", 'o', 1, 2,
"Append", 'a', 0, 1, "Append", 'a', 0, 1,
"Disable", 'd', -1, 0, "Disable", 'd', -1, 0,

2
unix/gtkwin.c
View File

@ -3191,7 +3191,7 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
errmsg); errmsg);
messagebox(inst->window, "Font setup error", msgboxtext, messagebox(inst->window, "Font setup error", msgboxtext,
string_width("Could not change fonts in terminal window:"), string_width("Could not change fonts in terminal window:"),
"OK", 'o', +1, 1, FALSE, "OK", 'o', +1, 1,
NULL); NULL);
sfree(msgboxtext); sfree(msgboxtext);
sfree(errmsg); sfree(errmsg);

3
unix/unix.h
View File

@ -93,7 +93,8 @@ void showeventlog(void *estuff, void *parentwin);
void logevent_dlg(void *estuff, const char *string); void logevent_dlg(void *estuff, const char *string);
int reallyclose(void *frontend); int reallyclose(void *frontend);
#ifdef MAY_REFER_TO_GTK_IN_HEADERS #ifdef MAY_REFER_TO_GTK_IN_HEADERS
int messagebox(GtkWidget *parentwin, char *title, char *msg, int minwid, ...); int messagebox(GtkWidget *parentwin, char *title,
char *msg, int minwid, int selectable, ...);
int string_width(char *text); int string_width(char *text);
#endif #endif