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

Reindent unix/dialog.c.

Browse Source 
Large chunks of the GTK setup code had a 2-space indent for some
reason, in place of the usual 4-space in this code base. I've been
meaning to sort it out for ages, because it makes it hard to have a
single set of editor settings suitable for the whole code base.
This commit is contained in:
Simon Tatham 2022-06-23 18:44:07 +01:00
parent bc61acc53d
commit 3bef6b63f0
1 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
unix/dialog.c
View File

@ -313,7 +313,7 @@ void dlg_editbox_set(dlgcontrol *ctrl, dlgparam *dp, char const *text)
entry = gtk_bin_get_child(GTK_BIN(uc->combo)); entry = gtk_bin_get_child(GTK_BIN(uc->combo));
else else
#endif #endif
entry = uc->entry; entry = uc->entry;
assert(entry != NULL); assert(entry != NULL);
@ -586,7 +586,7 @@ void dlg_listbox_addwithid(dlgcontrol *ctrl, dlgparam *dp,
} }
#endif #endif
unreachable("bad control type in listbox_addwithid"); unreachable("bad control type in listbox_addwithid");
done: done:
dp->flags &= ~FLAG_UPDATING_COMBO_LIST; dp->flags &= ~FLAG_UPDATING_COMBO_LIST;
} }
@ -985,7 +985,7 @@ void dlg_set_focus(dlgcontrol *ctrl, dlgparam *dp)
for (int i = 0; i < ctrl->radio.nbuttons; i++) for (int i = 0; i < ctrl->radio.nbuttons; i++)
if (gtk_toggle_button_get_active if (gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(uc->buttons[i]))) { (GTK_TOGGLE_BUTTON(uc->buttons[i]))) {
gtk_widget_grab_focus(uc->buttons[i]); gtk_widget_grab_focus(uc->buttons[i]);
} }
break; break;
case CTRL_LISTBOX: case CTRL_LISTBOX:
@ -1098,7 +1098,7 @@ void dlg_refresh(dlgcontrol *ctrl, dlgparam *dp)
assert(uc->ctrl != NULL); assert(uc->ctrl != NULL);
if (uc->ctrl->handler != NULL) if (uc->ctrl->handler != NULL)
uc->ctrl->handler(uc->ctrl, dp, uc->ctrl->handler(uc->ctrl, dp,
dp->data, EVENT_REFRESH); dp->data, EVENT_REFRESH);
} }
} }
} }
@ -1171,9 +1171,9 @@ void dlg_coloursel_start(dlgcontrol *ctrl, dlgparam *dp, int r, int g, int b)
cancelbutton = ccs->cancel_button; cancelbutton = ccs->cancel_button;
#endif #endif
g_object_set_data(G_OBJECT(okbutton), "user-data", g_object_set_data(G_OBJECT(okbutton), "user-data",
(gpointer)coloursel); (gpointer)coloursel);
g_object_set_data(G_OBJECT(cancelbutton), "user-data", g_object_set_data(G_OBJECT(cancelbutton), "user-data",
(gpointer)coloursel); (gpointer)coloursel);
g_signal_connect(G_OBJECT(okbutton), "clicked", g_signal_connect(G_OBJECT(okbutton), "clicked",
G_CALLBACK(coloursel_ok), (gpointer)dp); G_CALLBACK(coloursel_ok), (gpointer)dp);
g_signal_connect(G_OBJECT(cancelbutton), "clicked", g_signal_connect(G_OBJECT(cancelbutton), "clicked",
@ -1317,7 +1317,7 @@ static gboolean listitem_key(GtkWidget *item, GdkEventKey *event,
if (!multiple && if (!multiple &&
GTK_WIDGET_STATE(item) != GTK_STATE_SELECTED) { GTK_WIDGET_STATE(item) != GTK_STATE_SELECTED) {
gtk_list_select_child(GTK_LIST(list), item); gtk_list_select_child(GTK_LIST(list), item);
} else { } else {
int direction = int direction =
(event->keyval==GDK_Up || event->keyval==GDK_KP_Up || (event->keyval==GDK_Up || event->keyval==GDK_KP_Up ||
@ -1397,10 +1397,10 @@ static gboolean listitem_button_press(GtkWidget *item, GdkEventButton *event,
struct dlgparam *dp = (struct dlgparam *)data; struct dlgparam *dp = (struct dlgparam *)data;
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item)); struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
switch (event->type) { switch (event->type) {
default: default:
case GDK_BUTTON_PRESS: uc->nclicks = 1; break; case GDK_BUTTON_PRESS: uc->nclicks = 1; break;
case GDK_2BUTTON_PRESS: uc->nclicks = 2; break; case GDK_2BUTTON_PRESS: uc->nclicks = 2; break;
case GDK_3BUTTON_PRESS: uc->nclicks = 3; break; case GDK_3BUTTON_PRESS: uc->nclicks = 3; break;
} }
return false; return false;
} }
@ -1500,7 +1500,7 @@ static gboolean draglist_valchange(gpointer data)
(struct draglist_valchange_ctx *)data; (struct draglist_valchange_ctx *)data;
ctx->uc->ctrl->handler(ctx->uc->ctrl, ctx->dp, ctx->uc->ctrl->handler(ctx->uc->ctrl, ctx->dp,
ctx->dp->data, EVENT_VALCHANGE); ctx->dp->data, EVENT_VALCHANGE);
sfree(ctx); sfree(ctx);
@ -1781,7 +1781,7 @@ static void filefont_clicked(GtkButton *button, gpointer data)
char *name = XGetAtomName(disp, (Atom)ret); char *name = XGetAtomName(disp, (Atom)ret);
if (name) if (name)
gtk_font_selection_dialog_set_font_name gtk_font_selection_dialog_set_font_name
(GTK_FONT_SELECTION_DIALOG(fontsel), name); (GTK_FONT_SELECTION_DIALOG(fontsel), name);
} }
gdk_font_unref(font); gdk_font_unref(font);
} }
@ -1972,19 +1972,19 @@ GtkWidget *layout_ctrls(
w = columns_new(0); w = columns_new(0);
if (ctrl->label) { if (ctrl->label) {
GtkWidget *label = gtk_label_new(ctrl->label); GtkWidget *label = gtk_label_new(ctrl->label);
columns_add(COLUMNS(w), label, 0, 1); columns_add(COLUMNS(w), label, 0, 1);
columns_force_left_align(COLUMNS(w), label); columns_force_left_align(COLUMNS(w), label);
gtk_widget_show(label); gtk_widget_show(label);
shortcut_add(scs, label, ctrl->radio.shortcut, shortcut_add(scs, label, ctrl->radio.shortcut,
SHORTCUT_UCTRL, uc); SHORTCUT_UCTRL, uc);
uc->label = label; uc->label = label;
} }
percentages = g_new(gint, ctrl->radio.ncolumns); percentages = g_new(gint, ctrl->radio.ncolumns);
for (i = 0; i < ctrl->radio.ncolumns; i++) { for (i = 0; i < ctrl->radio.ncolumns; i++) {
percentages[i] = percentages[i] =
((100 * (i+1) / ctrl->radio.ncolumns) - ((100 * (i+1) / ctrl->radio.ncolumns) -
100 * i / ctrl->radio.ncolumns); 100 * i / ctrl->radio.ncolumns);
} }
columns_set_cols(COLUMNS(w), ctrl->radio.ncolumns, columns_set_cols(COLUMNS(w), ctrl->radio.ncolumns,
percentages); percentages);
@ -1995,28 +1995,28 @@ GtkWidget *layout_ctrls(
uc->buttons = snewn(uc->nbuttons, GtkWidget *); uc->buttons = snewn(uc->nbuttons, GtkWidget *);
for (i = 0; i < ctrl->radio.nbuttons; i++) { for (i = 0; i < ctrl->radio.nbuttons; i++) {
GtkWidget *b; GtkWidget *b;
gint colstart; gint colstart;
b = (gtk_radio_button_new_with_label b = (gtk_radio_button_new_with_label
(group, ctrl->radio.buttons[i])); (group, ctrl->radio.buttons[i]));
uc->buttons[i] = b; uc->buttons[i] = b;
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(b)); group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(b));
colstart = i % ctrl->radio.ncolumns; colstart = i % ctrl->radio.ncolumns;
columns_add(COLUMNS(w), b, colstart, columns_add(COLUMNS(w), b, colstart,
(i == ctrl->radio.nbuttons-1 ? (i == ctrl->radio.nbuttons-1 ?
ctrl->radio.ncolumns - colstart : 1)); ctrl->radio.ncolumns - colstart : 1));
columns_force_left_align(COLUMNS(w), b); columns_force_left_align(COLUMNS(w), b);
gtk_widget_show(b); gtk_widget_show(b);
g_signal_connect(G_OBJECT(b), "toggled", g_signal_connect(G_OBJECT(b), "toggled",
G_CALLBACK(button_toggled), dp); G_CALLBACK(button_toggled), dp);
g_signal_connect(G_OBJECT(b), "focus_in_event", g_signal_connect(G_OBJECT(b), "focus_in_event",
G_CALLBACK(widget_focus), dp); G_CALLBACK(widget_focus), dp);
if (ctrl->radio.shortcuts) { if (ctrl->radio.shortcuts) {
shortcut_add(scs, gtk_bin_get_child(GTK_BIN(b)), shortcut_add(scs, gtk_bin_get_child(GTK_BIN(b)),
ctrl->radio.shortcuts[i], ctrl->radio.shortcuts[i],
SHORTCUT_UCTRL, uc); SHORTCUT_UCTRL, uc);
} }
} }
break; break;
} }
@ -2025,35 +2025,35 @@ GtkWidget *layout_ctrls(
if (ctrl->editbox.has_list) { if (ctrl->editbox.has_list) {
#if !GTK_CHECK_VERSION(2,4,0) #if !GTK_CHECK_VERSION(2,4,0)
/* /*
* GTK 1 combo box. * GTK 1 combo box.
*/ */
w = gtk_combo_new(); w = gtk_combo_new();
gtk_combo_set_value_in_list(GTK_COMBO(w), false, true); gtk_combo_set_value_in_list(GTK_COMBO(w), false, true);
uc->entry = GTK_COMBO(w)->entry; uc->entry = GTK_COMBO(w)->entry;
uc->list = GTK_COMBO(w)->list; uc->list = GTK_COMBO(w)->list;
signalobject = uc->entry; signalobject = uc->entry;
#else #else
/* /*
* GTK 2 combo box. * GTK 2 combo box.
*/ */
uc->listmodel = gtk_list_store_new(2, G_TYPE_INT, uc->listmodel = gtk_list_store_new(2, G_TYPE_INT,
G_TYPE_STRING); G_TYPE_STRING);
w = gtk_combo_box_new_with_model_and_entry w = gtk_combo_box_new_with_model_and_entry
(GTK_TREE_MODEL(uc->listmodel)); (GTK_TREE_MODEL(uc->listmodel));
g_object_set(G_OBJECT(w), "entry-text-column", 1, g_object_set(G_OBJECT(w), "entry-text-column", 1,
(const char *)NULL); (const char *)NULL);
/* We cannot support password combo boxes. */ /* We cannot support password combo boxes. */
assert(!ctrl->editbox.password); assert(!ctrl->editbox.password);
uc->combo = w; uc->combo = w;
signalobject = uc->combo; signalobject = uc->combo;
#endif #endif
} else { } else {
w = gtk_entry_new(); w = gtk_entry_new();
if (ctrl->editbox.password) if (ctrl->editbox.password)
gtk_entry_set_visibility(GTK_ENTRY(w), false); gtk_entry_set_visibility(GTK_ENTRY(w), false);
uc->entry = w; uc->entry = w;
signalobject = w; signalobject = w;
} }
uc->entrysig = uc->entrysig =
g_signal_connect(G_OBJECT(signalobject), "changed", g_signal_connect(G_OBJECT(signalobject), "changed",
@ -2075,9 +2075,9 @@ GtkWidget *layout_ctrls(
* from the column layout of the rest of the box. * from the column layout of the rest of the box.
*/ */
{ {
GtkRequisition req; GtkRequisition req;
gtk_widget_size_request(w, &req); gtk_widget_size_request(w, &req);
gtk_widget_set_size_request(w, 10, req.height); gtk_widget_set_size_request(w, 10, req.height);
} }
#else #else
/* /*
@ -2089,34 +2089,34 @@ GtkWidget *layout_ctrls(
#endif #endif
if (ctrl->label) { if (ctrl->label) {
GtkWidget *label; GtkWidget *label;
label = gtk_label_new(ctrl->label); label = gtk_label_new(ctrl->label);
shortcut_add(scs, label, ctrl->editbox.shortcut, shortcut_add(scs, label, ctrl->editbox.shortcut,
SHORTCUT_FOCUS, uc->entry); SHORTCUT_FOCUS, uc->entry);
if (ctrl->editbox.percentwidth == 100) { if (ctrl->editbox.percentwidth == 100) {
columns_add(cols, label, columns_add(cols, label,
COLUMN_START(ctrl->column), COLUMN_START(ctrl->column),
COLUMN_SPAN(ctrl->column)); COLUMN_SPAN(ctrl->column));
columns_force_left_align(cols, label); columns_force_left_align(cols, label);
} else { } else {
GtkWidget *container = columns_new(4); GtkWidget *container = columns_new(4);
gint percentages[2]; gint percentages[2];
percentages[1] = ctrl->editbox.percentwidth; percentages[1] = ctrl->editbox.percentwidth;
percentages[0] = 100 - ctrl->editbox.percentwidth; percentages[0] = 100 - ctrl->editbox.percentwidth;
columns_set_cols(COLUMNS(container), 2, percentages); columns_set_cols(COLUMNS(container), 2, percentages);
columns_add(COLUMNS(container), label, 0, 1); columns_add(COLUMNS(container), label, 0, 1);
columns_force_left_align(COLUMNS(container), label); columns_force_left_align(COLUMNS(container), label);
columns_add(COLUMNS(container), w, 1, 1); columns_add(COLUMNS(container), w, 1, 1);
columns_align_next_to(COLUMNS(container), label, w); columns_align_next_to(COLUMNS(container), label, w);
gtk_widget_show(w); gtk_widget_show(w);
w = container; w = container;
} }
gtk_widget_show(label); gtk_widget_show(label);
uc->label = label; uc->label = label;
} }
break; break;
} }
@ -2312,9 +2312,9 @@ GtkWidget *layout_ctrls(
{ {
int edge; int edge;
edge = GTK_WIDGET(uc->list)->style->klass->ythickness; edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
gtk_widget_set_size_request(w, 10, gtk_widget_set_size_request(
2*edge + (ctrl->listbox.height * w, 10, 2*edge + (ctrl->listbox.height *
get_listitemheight(w))); get_listitemheight(w)));
} }
if (ctrl->listbox.draglist) { if (ctrl->listbox.draglist) {