*/
/*
- * TODO:
- *
- * - keyboard shortcuts on list boxes and the treeview
- * + find the currently selected item and focus it?
- * + what if there are many selected items, or none?
- * + none of this is any use unless Up and Down are made to do
- * something plausibly sane anyway
- *
- * - focus stuff
- * + `last focused' for nasty sessionsaver hack
- * + set focus into a sensible control to start with
- * + perhaps we need uc->primary as the right widget to
- * forcibly focus?
- * * no, because I think the right widget to focus with
- * radio buttons is the currently selected one. Hmm.
- *
- * - dlg_error_msg
- *
- * - must return a value from the dialog box!
- * + easy, just put it in dp.
- *
- * - font selection hiccup: the default `fixed' is not
- * automatically translated into its expanded XLFD form when the
- * font selector is started. It should be.
- *
- * - cosmetics:
- * + can't we _somehow_ have less leading between radio buttons?
- * + wrapping text widgets, the horror, the horror
- * + labels and their associated edit boxes don't line up
- * properly
- * + IWBNI arrows in list boxes didn't do such a bloody silly
- * thing (moving focus without moving selection, and
- * furthermore not feeding back to the scrollbar). And arrows
- * in the treeview doubly so. Gah.
- * + don't suppose we can fix the vertical offset labels get
- * from their underlines?
- * + why the hell are the Up/Down focus movement keys sorting
- * things by _width_? (See the Logging and Features panels
- * for good examples.)
- */
-
-/*
* TODO when porting to GTK 2.0:
*
* - GtkTree is apparently deprecated and we should switch to
#include <ctype.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
#include "gtkcols.h"
#include "gtkpanel.h"
GtkWidget *menu; /* for optionmenu (==droplist) */
GtkWidget *optmenu; /* also for optionmenu */
GtkWidget *text; /* for text */
+ GtkAdjustment *adj; /* for the scrollbar in a list box */
+ guint textsig;
};
struct dlgparam {
* due to automatic processing and should not flag a user event. */
int flags;
struct Shortcuts *shortcuts;
+ GtkWidget *window, *cancelbutton, *currtreeitem, **treeitems;
+ union control *currfocus, *lastfocus;
+ int ntreeitems;
+ int retval;
};
#define FLAG_UPDATING_COMBO_LIST 1
enum { /* values for Shortcut.action */
SHORTCUT_EMPTY, /* no shortcut on this key */
+ SHORTCUT_TREE, /* focus a tree item */
SHORTCUT_FOCUS, /* focus the supplied widget */
SHORTCUT_UCTRL, /* do something sane with uctrl */
SHORTCUT_UCTRL_UP, /* uctrl is a draglist, move Up */
/*
* Forward references.
*/
+static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data);
static void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr);
-static void listitem_button(GtkWidget *item, GdkEventButton *event,
+static int listitem_single_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data);
+static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data);
+static int listitem_button(GtkWidget *item, GdkEventButton *event,
gpointer data);
static void menuitem_activate(GtkMenuItem *item, gpointer data);
static void coloursel_ok(GtkButton *button, gpointer data);
static void coloursel_cancel(GtkButton *button, gpointer data);
+static void window_destroy(GtkWidget *widget, gpointer data);
static int uctrl_cmp_byctrl(void *av, void *bv)
{
sfree(uc);
}
freetree234(dp->bywidget);
+ sfree(dp->treeitems);
}
static void dlg_add_uctrl(struct dlgparam *dp, struct uctrl *uc)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
+ /*
+ * This is an internal allocation routine, so it's allowed to
+ * use smalloc directly.
+ */
uc->privdata = smalloc(size);
uc->privdata_needs_free = FALSE;
return uc->privdata;
}
-union control *dlg_last_focused(void *dlg)
+union control *dlg_last_focused(union control *ctrl, void *dlg)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
- return NULL; /* FIXME */
+ if (dp->currfocus != ctrl)
+ return dp->currfocus;
+ else
+ return dp->lastfocus;
}
void dlg_radiobutton_set(union control *ctrl, void *dlg, int which)
void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
{
- dlg_listbox_addwithindex(ctrl, dlg, text, 0);
+ dlg_listbox_addwithid(ctrl, dlg, text, 0);
}
/*
* strings in any listbox then you MUST not assign them different
* IDs and expect to get meaningful results back.
*/
-void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
- char const *text, int id)
+void dlg_listbox_addwithid(union control *ctrl, void *dlg,
+ char const *text, int id)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
assert(ncols <=
(uc->ctrl->listbox.ncols ? uc->ctrl->listbox.ncols : 1));
- percents = smalloc(ncols * sizeof(gint));
+ percents = snewn(ncols, gint);
percents[ncols-1] = 100;
for (i = 0; i < ncols-1; i++) {
percents[i] = uc->ctrl->listbox.percentages[i];
gtk_container_add(GTK_CONTAINER(uc->list), listitem);
gtk_widget_show(listitem);
+ if (ctrl->listbox.multisel) {
+ gtk_signal_connect(GTK_OBJECT(listitem), "key_press_event",
+ GTK_SIGNAL_FUNC(listitem_multi_key), uc->adj);
+ } else {
+ gtk_signal_connect(GTK_OBJECT(listitem), "key_press_event",
+ GTK_SIGNAL_FUNC(listitem_single_key), uc->adj);
+ }
+ gtk_signal_connect(GTK_OBJECT(listitem), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
gtk_signal_connect(GTK_OBJECT(listitem), "button_press_event",
GTK_SIGNAL_FUNC(listitem_button), dp);
gtk_object_set_data(GTK_OBJECT(listitem), "user-data", (gpointer)id);
children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
uc->list));
item = GTK_OBJECT(g_list_nth_data(children, index));
+ g_list_free(children);
return (int)gtk_object_get_data(GTK_OBJECT(item), "user-data");
}
i++, children = children->next) {
if (uc->menu ? activeitem == item :
GTK_WIDGET_STATE(item) == GTK_STATE_SELECTED) {
- if (selected < 0)
+ if (selected == -1)
selected = i;
else
- return -1;
+ selected = -2;
}
}
- return selected;
+ g_list_free(children);
+ return selected < 0 ? -1 : selected;
}
int dlg_listbox_issel(union control *ctrl, void *dlg, int index)
children = gtk_container_children(GTK_CONTAINER(uc->menu ? uc->menu :
uc->list));
item = GTK_WIDGET(g_list_nth_data(children, index));
+ g_list_free(children);
if (uc->menu) {
activeitem = gtk_menu_get_active(GTK_MENU(uc->menu));
void dlg_set_focus(union control *ctrl, void *dlg)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
- /* FIXME */
+ struct uctrl *uc = dlg_find_byctrl(dp, ctrl);
+
+ switch (ctrl->generic.type) {
+ case CTRL_CHECKBOX:
+ case CTRL_BUTTON:
+ /* Check boxes and buttons get the focus _and_ get toggled. */
+ gtk_widget_grab_focus(uc->toplevel);
+ break;
+ case CTRL_FILESELECT:
+ case CTRL_FONTSELECT:
+ case CTRL_EDITBOX:
+ /* Anything containing an edit box gets that focused. */
+ gtk_widget_grab_focus(uc->entry);
+ break;
+ case CTRL_RADIO:
+ /*
+ * Radio buttons: we find the currently selected button and
+ * focus it.
+ */
+ {
+ int i;
+ for (i = 0; i < ctrl->radio.nbuttons; i++)
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON(uc->buttons[i]))) {
+ gtk_widget_grab_focus(uc->buttons[i]);
+ }
+ }
+ break;
+ case CTRL_LISTBOX:
+ /*
+ * If the list is really an option menu, we focus it.
+ * Otherwise we tell it to focus one of its children, which
+ * appears to do the Right Thing.
+ */
+ if (uc->optmenu) {
+ gtk_widget_grab_focus(uc->optmenu);
+ } else {
+ assert(uc->list != NULL);
+ gtk_container_focus(GTK_CONTAINER(uc->list), GTK_DIR_TAB_FORWARD);
+ }
+ break;
+ }
}
/*
gdk_beep();
}
+static void errmsg_button_clicked(GtkButton *button, gpointer data)
+{
+ gtk_widget_destroy(GTK_WIDGET(data));
+}
+
void dlg_error_msg(void *dlg, char *msg)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
- /* FIXME */
+ GtkWidget *window, *hbox, *text, *ok;
+
+ window = gtk_dialog_new();
+ text = gtk_label_new(msg);
+ gtk_misc_set_alignment(GTK_MISC(text), 0.0, 0.0);
+ hbox = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20);
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
+ hbox, FALSE, FALSE, 20);
+ gtk_widget_show(text);
+ gtk_widget_show(hbox);
+ gtk_window_set_title(GTK_WINDOW(window), "Error");
+ gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
+ ok = gtk_button_new_with_label("OK");
+ gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area),
+ ok, FALSE, FALSE, 0);
+ gtk_widget_show(ok);
+ GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
+ gtk_window_set_default(GTK_WINDOW(window), ok);
+ gtk_signal_connect(GTK_OBJECT(ok), "clicked",
+ GTK_SIGNAL_FUNC(errmsg_button_clicked), window);
+ gtk_signal_connect(GTK_OBJECT(window), "destroy",
+ GTK_SIGNAL_FUNC(window_destroy), NULL);
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dp->window));
+ {
+ gint x, y, w, h, dx, dy;
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_NONE);
+ gdk_window_get_origin(GTK_WIDGET(dp->window)->window, &x, &y);
+ gdk_window_get_size(GTK_WIDGET(dp->window)->window, &w, &h);
+ dx = x + w/4;
+ dy = y + h/4;
+ gtk_widget_set_uposition(GTK_WIDGET(window), dx, dy);
+ }
+ gtk_widget_show(window);
+ gtk_main();
}
/*
void dlg_end(void *dlg, int value)
{
struct dlgparam *dp = (struct dlgparam *)dlg;
- gtk_main_quit();
- /* FIXME: don't forget to faff about with returning a value */
+ dp->retval = value;
+ gtk_widget_destroy(dp->window);
}
void dlg_refresh(union control *ctrl, void *dlg)
* Signal handlers while the dialog box is active.
*/
+static gboolean widget_focus(GtkWidget *widget, GdkEventFocus *event,
+ gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ struct uctrl *uc = dlg_find_bywidget(dp, widget);
+ union control *focus;
+
+ if (uc && uc->ctrl)
+ focus = uc->ctrl;
+ else
+ focus = NULL;
+
+ if (focus != dp->currfocus) {
+ dp->lastfocus = dp->currfocus;
+ dp->currfocus = focus;
+ }
+
+ return FALSE;
+}
+
static void button_clicked(GtkButton *button, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
*/
if (event->keyval == GDK_Return && widget->parent != NULL) {
gint return_val;
- gtk_signal_emit_stop_by_name (GTK_OBJECT(widget), "key_press_event");
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
gtk_signal_emit_by_name(GTK_OBJECT(widget->parent), "key_press_event",
event, &return_val);
return return_val;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_REFRESH);
}
-static void listitem_button(GtkWidget *item, GdkEventButton *event,
+static int listitem_key(GtkWidget *item, GdkEventKey *event, gpointer data,
+ int multiple)
+{
+ GtkAdjustment *adj = GTK_ADJUSTMENT(data);
+
+ if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up ||
+ event->keyval == GDK_Down || event->keyval == GDK_KP_Down ||
+ event->keyval == GDK_Page_Up || event->keyval == GDK_KP_Page_Up ||
+ event->keyval == GDK_Page_Down || event->keyval == GDK_KP_Page_Down) {
+ /*
+ * Up, Down, PgUp or PgDn have been pressed on a ListItem
+ * in a list box. So, if the list box is single-selection:
+ *
+ * - if the list item in question isn't already selected,
+ * we simply select it.
+ * - otherwise, we find the next one (or next
+ * however-far-away) in whichever direction we're going,
+ * and select that.
+ * + in this case, we must also fiddle with the
+ * scrollbar to ensure the newly selected item is
+ * actually visible.
+ *
+ * If it's multiple-selection, we do all of the above
+ * except actually selecting anything, so we move the focus
+ * and fiddle the scrollbar to follow it.
+ */
+ GtkWidget *list = item->parent;
+
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(item), "key_press_event");
+
+ if (!multiple &&
+ GTK_WIDGET_STATE(item) != GTK_STATE_SELECTED) {
+ gtk_list_select_child(GTK_LIST(list), item);
+ } else {
+ int direction =
+ (event->keyval==GDK_Up || event->keyval==GDK_KP_Up ||
+ event->keyval==GDK_Page_Up || event->keyval==GDK_KP_Page_Up)
+ ? -1 : +1;
+ int step =
+ (event->keyval==GDK_Page_Down ||
+ event->keyval==GDK_KP_Page_Down ||
+ event->keyval==GDK_Page_Up || event->keyval==GDK_KP_Page_Up)
+ ? 2 : 1;
+ int i, n;
+ GList *children, *chead;
+
+ chead = children = gtk_container_children(GTK_CONTAINER(list));
+
+ n = g_list_length(children);
+
+ if (step == 2) {
+ /*
+ * Figure out how many list items to a screenful,
+ * and adjust the step appropriately.
+ */
+ step = 0.5 + adj->page_size * n / (adj->upper - adj->lower);
+ step--; /* go by one less than that */
+ }
+
+ i = 0;
+ while (children != NULL) {
+ if (item == children->data)
+ break;
+ children = children->next;
+ i++;
+ }
+
+ while (step > 0) {
+ if (direction < 0 && i > 0)
+ children = children->prev, i--;
+ else if (direction > 0 && i < n-1)
+ children = children->next, i++;
+ step--;
+ }
+
+ if (children && children->data) {
+ if (!multiple)
+ gtk_list_select_child(GTK_LIST(list),
+ GTK_WIDGET(children->data));
+ gtk_widget_grab_focus(GTK_WIDGET(children->data));
+ gtk_adjustment_clamp_page
+ (adj,
+ adj->lower + (adj->upper-adj->lower) * i / n,
+ adj->lower + (adj->upper-adj->lower) * (i+1) / n);
+ }
+
+ g_list_free(chead);
+ }
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static int listitem_single_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data)
+{
+ return listitem_key(item, event, data, FALSE);
+}
+
+static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data)
+{
+ return listitem_key(item, event, data, TRUE);
+}
+
+static int listitem_button(GtkWidget *item, GdkEventButton *event,
gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
event->type == GDK_3BUTTON_PRESS) {
struct uctrl *uc = dlg_find_bywidget(dp, GTK_WIDGET(item));
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_ACTION);
+ return TRUE;
}
+ return FALSE;
}
static void list_selchange(GtkList *list, gpointer data)
child = g_list_nth_data(children, index);
gtk_widget_ref(child);
gtk_list_clear_items(GTK_LIST(uc->list), index, index+1);
+ g_list_free(children);
+
children = NULL;
children = g_list_append(children, child);
gtk_list_insert_items(GTK_LIST(uc->list), children, index + direction);
static void filesel_ok(GtkButton *button, gpointer data)
{
- struct dlgparam *dp = (struct dlgparam *)data;
+ /* struct dlgparam *dp = (struct dlgparam *)data; */
gpointer filesel = gtk_object_get_data(GTK_OBJECT(button), "user-data");
struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(filesel), "user-data");
char *name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
static void fontsel_ok(GtkButton *button, gpointer data)
{
- struct dlgparam *dp = (struct dlgparam *)data;
+ /* struct dlgparam *dp = (struct dlgparam *)data; */
gpointer fontsel = gtk_object_get_data(GTK_OBJECT(button), "user-data");
struct uctrl *uc = gtk_object_get_data(GTK_OBJECT(fontsel), "user-data");
char *name = gtk_font_selection_dialog_get_font_name
if (uc->ctrl->generic.type == CTRL_FONTSELECT) {
gchar *spacings[] = { "c", "m", NULL };
+ gchar *fontname = gtk_entry_get_text(GTK_ENTRY(uc->entry));
GtkWidget *fontsel =
gtk_font_selection_dialog_new("Select a font");
gtk_window_set_modal(GTK_WINDOW(fontsel), TRUE);
(GTK_FONT_SELECTION_DIALOG(fontsel),
GTK_FONT_FILTER_BASE, GTK_FONT_ALL,
NULL, NULL, NULL, NULL, spacings, NULL);
- gtk_font_selection_dialog_set_font_name
- (GTK_FONT_SELECTION_DIALOG(fontsel),
- gtk_entry_get_text(GTK_ENTRY(uc->entry)));
+ if (!gtk_font_selection_dialog_set_font_name
+ (GTK_FONT_SELECTION_DIALOG(fontsel), fontname)) {
+ /*
+ * If the font name wasn't found as it was, try opening
+ * it and extracting its FONT property. This should
+ * have the effect of mapping short aliases into true
+ * XLFDs.
+ */
+ GdkFont *font = gdk_font_load(fontname);
+ if (font) {
+ XFontStruct *xfs = GDK_FONT_XFONT(font);
+ Display *disp = GDK_FONT_XDISPLAY(font);
+ Atom fontprop = XInternAtom(disp, "FONT", False);
+ unsigned long ret;
+ if (XGetFontProperty(xfs, fontprop, &ret)) {
+ char *name = XGetAtomName(disp, (Atom)ret);
+ if (name)
+ gtk_font_selection_dialog_set_font_name
+ (GTK_FONT_SELECTION_DIALOG(fontsel), name);
+ }
+ gdk_font_unref(font);
+ }
+ }
gtk_object_set_data
(GTK_OBJECT(GTK_FONT_SELECTION_DIALOG(fontsel)->ok_button),
"user-data", (gpointer)fontsel);
}
}
+static void label_sizealloc(GtkWidget *widget, GtkAllocation *alloc,
+ gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ struct uctrl *uc = dlg_find_bywidget(dp, widget);
+
+ gtk_widget_set_usize(uc->text, alloc->width, -1);
+ gtk_label_set_text(GTK_LABEL(uc->text), uc->ctrl->generic.label);
+ gtk_signal_disconnect(GTK_OBJECT(uc->text), uc->textsig);
+}
+
/* ----------------------------------------------------------------------
* This function does the main layout work: it reads a controlset,
* it creates the relevant GTK controls, and returns a GtkWidget
continue; /* no actual control created */
}
- uc = smalloc(sizeof(struct uctrl));
+ uc = snew(struct uctrl);
uc->ctrl = ctrl;
uc->privdata = NULL;
uc->privdata_needs_free = FALSE;
GTK_WIDGET_SET_FLAGS(w, GTK_CAN_DEFAULT);
if (ctrl->button.isdefault)
gtk_window_set_default(win, w);
+ if (ctrl->button.iscancel)
+ dp->cancelbutton = w;
}
gtk_signal_connect(GTK_OBJECT(w), "clicked",
GTK_SIGNAL_FUNC(button_clicked), dp);
+ gtk_signal_connect(GTK_OBJECT(w), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
shortcut_add(scs, GTK_BIN(w)->child, ctrl->button.shortcut,
SHORTCUT_UCTRL, uc);
break;
w = gtk_check_button_new_with_label(ctrl->generic.label);
gtk_signal_connect(GTK_OBJECT(w), "toggled",
GTK_SIGNAL_FUNC(button_toggled), dp);
+ gtk_signal_connect(GTK_OBJECT(w), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
shortcut_add(scs, GTK_BIN(w)->child, ctrl->checkbox.shortcut,
SHORTCUT_UCTRL, uc);
left = TRUE;
gint i, *percentages;
GSList *group;
- w = columns_new(1);
+ w = columns_new(0);
if (ctrl->generic.label) {
GtkWidget *label = gtk_label_new(ctrl->generic.label);
columns_add(COLUMNS(w), label, 0, 1);
group = NULL;
uc->nbuttons = ctrl->radio.nbuttons;
- uc->buttons = smalloc(uc->nbuttons * sizeof(GtkWidget *));
+ uc->buttons = snewn(uc->nbuttons, GtkWidget *);
for (i = 0; i < ctrl->radio.nbuttons; i++) {
GtkWidget *b;
gtk_widget_show(b);
gtk_signal_connect(GTK_OBJECT(b), "toggled",
GTK_SIGNAL_FUNC(button_toggled), dp);
+ gtk_signal_connect(GTK_OBJECT(b), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
if (ctrl->radio.shortcuts) {
shortcut_add(scs, GTK_BIN(b)->child,
ctrl->radio.shortcuts[i],
}
break;
case CTRL_EDITBOX:
- if (ctrl->editbox.has_list) {
- w = gtk_combo_new();
- gtk_combo_set_value_in_list(GTK_COMBO(w), FALSE, TRUE);
- uc->entry = GTK_COMBO(w)->entry;
- uc->list = GTK_COMBO(w)->list;
- } else {
- w = gtk_entry_new();
- if (ctrl->editbox.password)
- gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
- uc->entry = w;
- }
- gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
- GTK_SIGNAL_FUNC(editbox_changed), dp);
- gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
- GTK_SIGNAL_FUNC(editbox_key), dp);
- /*
- * Edit boxes, for some strange reason, have a minimum
- * width of 150 in GTK 1.2. We don't want this - we'd
- * rather the edit boxes acquired their natural width
- * from the column layout of the rest of the box.
- */
- {
+ {
GtkRequisition req;
+
+ if (ctrl->editbox.has_list) {
+ w = gtk_combo_new();
+ gtk_combo_set_value_in_list(GTK_COMBO(w), FALSE, TRUE);
+ uc->entry = GTK_COMBO(w)->entry;
+ uc->list = GTK_COMBO(w)->list;
+ } else {
+ w = gtk_entry_new();
+ if (ctrl->editbox.password)
+ gtk_entry_set_visibility(GTK_ENTRY(w), FALSE);
+ uc->entry = w;
+ }
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
+ GTK_SIGNAL_FUNC(editbox_changed), dp);
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
+ GTK_SIGNAL_FUNC(editbox_key), dp);
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
+ /*
+ * Edit boxes, for some strange reason, have a minimum
+ * width of 150 in GTK 1.2. We don't want this - we'd
+ * rather the edit boxes acquired their natural width
+ * from the column layout of the rest of the box.
+ *
+ * Also, while we're here, we'll squirrel away the
+ * edit box height so we can use that to centre its
+ * label vertically beside it.
+ */
gtk_widget_size_request(w, &req);
gtk_widget_set_usize(w, 10, req.height);
- }
- if (ctrl->generic.label) {
- GtkWidget *label, *container;
-
- label = gtk_label_new(ctrl->generic.label);
- shortcut_add(scs, label, ctrl->editbox.shortcut,
- SHORTCUT_FOCUS, uc->entry);
- container = columns_new(4);
- if (ctrl->editbox.percentwidth == 100) {
- columns_add(COLUMNS(container), label, 0, 1);
- columns_force_left_align(COLUMNS(container), label);
- columns_add(COLUMNS(container), w, 0, 1);
- } else {
- gint percentages[2];
- percentages[1] = ctrl->editbox.percentwidth;
- percentages[0] = 100 - ctrl->editbox.percentwidth;
- columns_set_cols(COLUMNS(container), 2, percentages);
- columns_add(COLUMNS(container), label, 0, 1);
- columns_force_left_align(COLUMNS(container), label);
- columns_add(COLUMNS(container), w, 1, 1);
- }
- gtk_widget_show(label);
- gtk_widget_show(w);
+ if (ctrl->generic.label) {
+ GtkWidget *label, *container;
+
+ label = gtk_label_new(ctrl->generic.label);
+
+ shortcut_add(scs, label, ctrl->editbox.shortcut,
+ SHORTCUT_FOCUS, uc->entry);
+
+ container = columns_new(4);
+ if (ctrl->editbox.percentwidth == 100) {
+ columns_add(COLUMNS(container), label, 0, 1);
+ columns_force_left_align(COLUMNS(container), label);
+ columns_add(COLUMNS(container), w, 0, 1);
+ } else {
+ gint percentages[2];
+ percentages[1] = ctrl->editbox.percentwidth;
+ percentages[0] = 100 - ctrl->editbox.percentwidth;
+ columns_set_cols(COLUMNS(container), 2, percentages);
+ columns_add(COLUMNS(container), label, 0, 1);
+ columns_force_left_align(COLUMNS(container), label);
+ columns_add(COLUMNS(container), w, 1, 1);
+ /* Centre the label vertically. */
+ gtk_widget_set_usize(label, -1, req.height);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
+ }
+ gtk_widget_show(label);
+ gtk_widget_show(w);
- w = container;
- }
- gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_out_event",
- GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
+ w = container;
+ }
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_out_event",
+ GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
+ }
break;
case CTRL_FILESELECT:
case CTRL_FONTSELECT:
GTK_SIGNAL_FUNC(editbox_key), dp);
gtk_signal_connect(GTK_OBJECT(uc->entry), "changed",
GTK_SIGNAL_FUNC(editbox_changed), dp);
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
+ gtk_signal_connect(GTK_OBJECT(uc->button), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
gtk_signal_connect(GTK_OBJECT(ww), "clicked",
GTK_SIGNAL_FUNC(filefont_clicked), dp);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(w), uc->menu);
gtk_object_set_data(GTK_OBJECT(uc->menu), "user-data",
(gpointer)uc->optmenu);
+ gtk_signal_connect(GTK_OBJECT(uc->optmenu), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
} else {
uc->list = gtk_list_new();
- gtk_list_set_selection_mode(GTK_LIST(uc->list),
- (ctrl->listbox.multisel ?
- GTK_SELECTION_MULTIPLE :
- GTK_SELECTION_SINGLE));
+ if (ctrl->listbox.multisel) {
+ gtk_list_set_selection_mode(GTK_LIST(uc->list),
+ GTK_SELECTION_MULTIPLE);
+ } else {
+ gtk_list_set_selection_mode(GTK_LIST(uc->list),
+ GTK_SELECTION_SINGLE);
+ }
w = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(w),
uc->list);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
+ uc->adj = gtk_scrolled_window_get_vadjustment
+ (GTK_SCROLLED_WINDOW(w));
+
gtk_widget_show(uc->list);
gtk_signal_connect(GTK_OBJECT(uc->list), "selection-changed",
GTK_SIGNAL_FUNC(list_selchange), dp);
+ gtk_signal_connect(GTK_OBJECT(uc->list), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
/*
* Adjust the height of the scrolled window to the
gtk_widget_show(button);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(draglist_up), dp);
+ gtk_signal_connect(GTK_OBJECT(button), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
button = gtk_button_new_with_label("Down");
columns_add(COLUMNS(cols), button, 1, 1);
gtk_widget_show(button);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(draglist_down), dp);
+ gtk_signal_connect(GTK_OBJECT(button), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), dp);
w = cols;
}
}
break;
case CTRL_TEXT:
- uc->text = w = gtk_label_new(ctrl->generic.label);
+ /*
+ * Wrapping text widgets don't sit well with the GTK
+ * layout model, in which widgets state a minimum size
+ * and the whole window then adjusts to the smallest
+ * size it can sensibly take given its contents. A
+ * wrapping text widget _has_ no clear minimum size;
+ * instead it has a range of possibilities. It can be
+ * one line deep but 2000 wide, or two lines deep and
+ * 1000 pixels, or three by 867, or four by 500 and so
+ * on. It can be as short as you like provided you
+ * don't mind it being wide, or as narrow as you like
+ * provided you don't mind it being tall.
+ *
+ * Therefore, it fits very badly into the layout model.
+ * Hence the only thing to do is pick a width and let
+ * it choose its own number of lines. To do this I'm
+ * going to cheat a little. All new wrapping text
+ * widgets will be created with a minimal text content
+ * "X"; then, after the rest of the dialog box is set
+ * up and its size calculated, the text widgets will be
+ * told their width and given their real text, which
+ * will cause the size to be recomputed in the y
+ * direction (because many of them will expand to more
+ * than one line).
+ */
+ uc->text = w = gtk_label_new("X");
+ gtk_misc_set_alignment(GTK_MISC(w), 0.0, 0.0);
gtk_label_set_line_wrap(GTK_LABEL(w), TRUE);
- /* FIXME: deal with wrapping! */
+ uc->textsig =
+ gtk_signal_connect(GTK_OBJECT(w), "size-allocate",
+ GTK_SIGNAL_FUNC(label_sizealloc), dp);
break;
}
panels_switch_to(sp->panels, sp->panel);
sp->dp->shortcuts = &sp->shortcuts;
+ sp->dp->currtreeitem = sp->treeitem;
}
-void destroy(GtkWidget *widget, gpointer data)
+static void window_destroy(GtkWidget *widget, gpointer data)
{
gtk_main_quit();
}
+static int tree_grab_focus(struct dlgparam *dp)
+{
+ int i, f;
+
+ /*
+ * See if any of the treeitems has the focus.
+ */
+ f = -1;
+ for (i = 0; i < dp->ntreeitems; i++)
+ if (GTK_WIDGET_HAS_FOCUS(dp->treeitems[i])) {
+ f = i;
+ break;
+ }
+
+ if (f >= 0)
+ return FALSE;
+ else {
+ gtk_widget_grab_focus(dp->currtreeitem);
+ return TRUE;
+ }
+}
+
+gint tree_focus(GtkContainer *container, GtkDirectionType direction,
+ gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
+ /*
+ * If there's a focused treeitem, we return FALSE to cause the
+ * focus to move on to some totally other control. If not, we
+ * focus the selected one.
+ */
+ return tree_grab_focus(dp);
+}
+
int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
- if (event->keyval == GDK_Escape) {
- gtk_main_quit();
+ if (event->keyval == GDK_Escape && dp->cancelbutton) {
+ gtk_signal_emit_by_name(GTK_OBJECT(dp->cancelbutton), "clicked");
return TRUE;
}
struct Shortcut *sc = &dp->shortcuts->sc[schr];
switch (sc->action) {
+ case SHORTCUT_TREE:
+ tree_grab_focus(dp);
+ break;
case SHORTCUT_FOCUS:
gtk_widget_grab_focus(sc->widget);
break;
break;
case CTRL_LISTBOX:
/*
- * List boxes are fun too. If the list is really an
- * option menu, we simply focus and click it.
- * Otherwise we must do something clever (FIXME).
+ * If the list is really an option menu, we focus
+ * and click it. Otherwise we tell it to focus one
+ * of its children, which appears to do the Right
+ * Thing.
*/
if (sc->uc->optmenu) {
GdkEventButton bev;
"button_press_event",
&bev, &returnval);
} else {
+ assert(sc->uc->list != NULL);
+
+ gtk_container_focus(GTK_CONTAINER(sc->uc->list),
+ GTK_DIR_TAB_FORWARD);
}
break;
}
return FALSE;
}
+int tree_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+
+ if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up ||
+ event->keyval == GDK_Down || event->keyval == GDK_KP_Down) {
+ int dir, i, j = -1;
+ for (i = 0; i < dp->ntreeitems; i++)
+ if (widget == dp->treeitems[i])
+ break;
+ if (i < dp->ntreeitems) {
+ if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up)
+ dir = -1;
+ else
+ dir = +1;
+
+ while (1) {
+ i += dir;
+ if (i < 0 || i >= dp->ntreeitems)
+ break; /* nothing in that dir to select */
+ /*
+ * Determine if this tree item is visible.
+ */
+ {
+ GtkWidget *w = dp->treeitems[i];
+ int vis = TRUE;
+ while (w && (GTK_IS_TREE_ITEM(w) || GTK_IS_TREE(w))) {
+ if (!GTK_WIDGET_VISIBLE(w)) {
+ vis = FALSE;
+ break;
+ }
+ w = w->parent;
+ }
+ if (vis) {
+ j = i; /* got one */
+ break;
+ }
+ }
+ }
+ }
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),
+ "key_press_event");
+ if (j >= 0) {
+ gtk_signal_emit_by_name(GTK_OBJECT(dp->treeitems[j]), "toggle");
+ gtk_widget_grab_focus(dp->treeitems[j]);
+ }
+ return TRUE;
+ }
+
+ /*
+ * It's nice for Left and Right to expand and collapse tree
+ * branches.
+ */
+ if (event->keyval == GDK_Left || event->keyval == GDK_KP_Left) {
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),
+ "key_press_event");
+ gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
+ return TRUE;
+ }
+ if (event->keyval == GDK_Right || event->keyval == GDK_KP_Right) {
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),
+ "key_press_event");
+ gtk_tree_item_expand(GTK_TREE_ITEM(widget));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
int chr, int action, void *ptr)
{
}
}
-void do_config_box(void)
+int do_config_box(const char *title, Config *cfg)
{
GtkWidget *window, *hbox, *vbox, *cols, *label,
*tree, *treescroll, *panels, *panelvbox;
char *path;
GtkTreeItem *treeitemlevels[8];
GtkTree *treelevels[8];
- Config cfg;
struct dlgparam dp;
struct sesslist sl;
struct Shortcuts scs;
struct selparam *selparams = NULL;
int nselparams = 0, selparamsize = 0;
- do_defaults(NULL, &cfg);
+ do_defaults(NULL, cfg);
dlg_init(&dp);
unix_setup_config_box(ctrlbox, FALSE);
window = gtk_dialog_new();
+ gtk_window_set_title(GTK_WINDOW(window), title);
hbox = gtk_hbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), hbox, TRUE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 10);
gtk_widget_show(label);
treescroll = gtk_scrolled_window_new(NULL, NULL);
tree = gtk_tree_new();
- /* FIXME: focusing treescroll doesn't help */
- shortcut_add(&scs, label, 'g', SHORTCUT_FOCUS, tree);
+ gtk_signal_connect(GTK_OBJECT(tree), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), &dp);
+ shortcut_add(&scs, label, 'g', SHORTCUT_TREE, tree);
gtk_tree_set_view_mode(GTK_TREE(tree), GTK_TREE_VIEW_ITEM);
gtk_tree_set_selection_mode(GTK_TREE(tree), GTK_SELECTION_BROWSE);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(treescroll),
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(treescroll),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
+ gtk_signal_connect(GTK_OBJECT(tree), "focus",
+ GTK_SIGNAL_FUNC(tree_focus), &dp);
gtk_widget_show(tree);
gtk_widget_show(treescroll);
gtk_box_pack_start(GTK_BOX(vbox), treescroll, TRUE, TRUE, 0);
treelevels[j] = NULL;
level = j+1;
+ gtk_signal_connect(GTK_OBJECT(treeitem), "key_press_event",
+ GTK_SIGNAL_FUNC(tree_key_press), &dp);
+ gtk_signal_connect(GTK_OBJECT(treeitem), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), &dp);
+
gtk_widget_show(treeitem);
path = s->pathname;
if (nselparams >= selparamsize) {
selparamsize += 16;
- selparams = srealloc(selparams,
- selparamsize * sizeof(*selparams));
+ selparams = sresize(selparams, selparamsize,
+ struct selparam);
}
selparams[nselparams].dp = &dp;
selparams[nselparams].panels = PANELS(panels);
}
}
+ dp.ntreeitems = nselparams;
+ dp.treeitems = snewn(dp.ntreeitems, GtkWidget *);
+
for (index = 0; index < nselparams; index++) {
gtk_signal_connect(GTK_OBJECT(selparams[index].treeitem), "select",
GTK_SIGNAL_FUNC(treeitem_sel),
&selparams[index]);
+ dp.treeitems[index] = selparams[index].treeitem;
}
- dp.data = &cfg;
+ dp.data = cfg;
dlg_refresh(NULL, &dp);
dp.shortcuts = &selparams[0].shortcuts;
+ dp.currtreeitem = dp.treeitems[0];
+ dp.lastfocus = NULL;
+ dp.retval = 0;
+ dp.window = window;
+ gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_widget_show(window);
+ /*
+ * Set focus into the first available control.
+ */
+ for (index = 0; index < ctrlbox->nctrlsets; index++) {
+ struct controlset *s = ctrlbox->ctrlsets[index];
+ int done = 0;
+ int j;
+
+ if (*s->pathname) {
+ for (j = 0; j < s->ncontrols; j++)
+ if (s->ctrls[j]->generic.type != CTRL_TABDELAY &&
+ s->ctrls[j]->generic.type != CTRL_COLUMNS &&
+ s->ctrls[j]->generic.type != CTRL_TEXT) {
+ dlg_set_focus(s->ctrls[j], &dp);
+ dp.lastfocus = s->ctrls[j];
+ done = 1;
+ break;
+ }
+ }
+ if (done)
+ break;
+ }
+
gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(destroy), NULL);
+ GTK_SIGNAL_FUNC(window_destroy), NULL);
gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
GTK_SIGNAL_FUNC(win_key_press), &dp);
dlg_cleanup(&dp);
sfree(selparams);
+
+ return dp.retval;
}
/* ======================================================================
/* Compile command for testing:
gcc -g -o gtkdlg gtk{dlg,cols,panel}.c ../{config,dialog,settings}.c \
- ../{misc,tree234,be_none}.c ux{store,misc,print,cfg}.c \
- -I. -I.. -I../charset -DTESTMODE `gtk-config --cflags --libs`
+../{misc,tree234,be_none}.c ux{store,misc,print,cfg}.c \
+-I. -I.. -I../charset -DTESTMODE `gtk-config --cflags --libs`
+
*/
void modalfatalbox(char *p, ...)
int main(int argc, char **argv)
{
+ Config cfg;
gtk_init(&argc, &argv);
- do_config_box();
+ printf("returned %d\n", do_config_box("PuTTY Configuration", &cfg));
return 0;
}
projects / u / mdw / putty / blobdiff