/*
* TODO:
*
- * - keyboard stuff
- * + accelerators
- * + default button
- *
- * - 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?
- *
- * - dlg_error_msg
- *
- * - must return a value from the dialog box!
- *
- * - font selection hiccup: the default `fixed' is not
- * automatically translated into its expanded XLFD form when the
- * font selector is started. It should be.
+ * - colour selection woe: what to do about GTK's colour selector
+ * not allowing us full resolution in our own colour selections?
+ * Perhaps making the colour resolution per-platform, at least
+ * at the config level, is actually the least unpleasant
+ * alternative.
*
* - 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
+ * + don't suppose we can fix the vertical offset labels get
+ * from their underlines?
+ * + apparently Left/Right on the treeview should be expanding
+ * and collapsing branches.
+ * + why the hell are the Up/Down focus movement keys sorting
+ * things by _width_? (See the Logging and Features panels
+ * for good examples.)
+ * + window title.
+ */
+
+/*
+ * TODO when porting to GTK 2.0:
+ *
+ * - GtkTree is apparently deprecated and we should switch to
+ * GtkTreeView instead.
+ * - GtkLabel has a built-in mnemonic scheme, so we should at
+ * least consider switching to that from the current adhockery.
*/
#include <assert.h>
+#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"
#include "dialog.h"
#include "tree234.h"
+struct Shortcut {
+ GtkWidget *widget;
+ struct uctrl *uc;
+ int action;
+};
+
+struct Shortcuts {
+ struct Shortcut sc[128];
+};
+
struct uctrl {
union control *ctrl;
GtkWidget *toplevel;
int privdata_needs_free;
GtkWidget **buttons; int nbuttons; /* for radio buttons */
GtkWidget *entry; /* for editbox, combobox, filesel, fontsel */
+ GtkWidget *button; /* for filesel, fontsel */
GtkWidget *list; /* for combobox, listbox */
GtkWidget *menu; /* for optionmenu (==droplist) */
GtkWidget *optmenu; /* also for optionmenu */
GtkWidget *text; /* for text */
+ GtkAdjustment *adj; /* for the scrollbar in a list box */
};
struct dlgparam {
/* `flags' are set to indicate when a GTK signal handler is being called
* 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_FOCUS, /* focus the supplied widget */
+ SHORTCUT_UCTRL, /* do something sane with uctrl */
+ SHORTCUT_UCTRL_UP, /* uctrl is a draglist, move Up */
+ SHORTCUT_UCTRL_DOWN, /* uctrl is a draglist, move Down */
+};
+
/*
* Forward references.
*/
-static void listitem_button(GtkWidget *item, GdkEventButton *event,
+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 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)
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)
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;
+ dp->retval = value;
gtk_main_quit();
- /* FIXME: don't forget to faff about with returning a value */
}
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;
uc->ctrl->generic.handler(uc->ctrl, dp, dp->data, EVENT_VALCHANGE);
}
+static int editbox_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ /*
+ * GtkEntry has a nasty habit of eating the Return key, which
+ * is unhelpful since it doesn't actually _do_ anything with it
+ * (it calls gtk_widget_activate, but our edit boxes never need
+ * activating). So I catch Return before GtkEntry sees it, and
+ * pass it straight on to the parent widget. Effect: hitting
+ * Return in an edit box will now activate the default button
+ * in the dialog just like it will everywhere else.
+ */
+ 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_by_name(GTK_OBJECT(widget->parent), "key_press_event",
+ event, &return_val);
+ return return_val;
+ }
+ return FALSE;
+}
+
static void editbox_changed(GtkEditable *ed, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
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;
+ GtkWidget *thisitem;
+ 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)
+{
+ listitem_key(item, event, data, FALSE);
+}
+
+static int listitem_multi_key(GtkWidget *item, GdkEventKey *event,
+ gpointer data)
+{
+ 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);
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);
* might be a GtkFrame containing a Columns; whatever it is, it's
* definitely a GtkWidget and should probably be added to a
* GtkVbox.)
+ *
+ * `listitemheight' is used to calculate a usize for list boxes: it
+ * should be the height from the size request of a GtkListItem.
+ *
+ * `win' is required for setting the default button. If it is
+ * non-NULL, all buttons created will be default-capable (so they
+ * have extra space round them for the default highlight).
*/
-GtkWidget *layout_ctrls(struct dlgparam *dp, struct controlset *s,
- int listitemheight)
+GtkWidget *layout_ctrls(struct dlgparam *dp, struct Shortcuts *scs,
+ struct controlset *s, int listitemheight,
+ GtkWindow *win)
{
Columns *cols;
GtkWidget *ret;
*/
for (i = 0; i < s->ncontrols; i++) {
union control *ctrl = s->ctrls[i];
- struct uctrl uc;
+ struct uctrl *uc;
+ int left = FALSE;
GtkWidget *w = NULL;
- uc.ctrl = ctrl;
- uc.privdata = NULL;
- uc.privdata_needs_free = FALSE;
- uc.buttons = NULL;
- uc.entry = uc.list = uc.menu = uc.optmenu = uc.text = NULL;
-
switch (ctrl->generic.type) {
case CTRL_COLUMNS:
{
columns_taborder_last(cols, uc->toplevel);
}
continue; /* no actual control created */
+ }
+
+ uc = smalloc(sizeof(struct uctrl));
+ uc->ctrl = ctrl;
+ uc->privdata = NULL;
+ uc->privdata_needs_free = FALSE;
+ uc->buttons = NULL;
+ uc->entry = uc->list = uc->menu = NULL;
+ uc->button = uc->optmenu = uc->text = NULL;
+
+ switch (ctrl->generic.type) {
case CTRL_BUTTON:
w = gtk_button_new_with_label(ctrl->generic.label);
+ if (win) {
+ 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;
case CTRL_CHECKBOX:
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;
break;
case CTRL_RADIO:
/*
columns_add(COLUMNS(w), label, 0, 1);
columns_force_left_align(COLUMNS(w), label);
gtk_widget_show(label);
+ shortcut_add(scs, label, ctrl->radio.shortcut,
+ SHORTCUT_UCTRL, uc);
}
percentages = g_new(gint, ctrl->radio.ncolumns);
for (i = 0; i < ctrl->radio.ncolumns; i++) {
g_free(percentages);
group = NULL;
- uc.nbuttons = ctrl->radio.nbuttons;
- uc.buttons = smalloc(uc.nbuttons * sizeof(GtkWidget *));
+ uc->nbuttons = ctrl->radio.nbuttons;
+ uc->buttons = smalloc(uc->nbuttons * sizeof(GtkWidget *));
for (i = 0; i < ctrl->radio.nbuttons; i++) {
GtkWidget *b;
b = (gtk_radio_button_new_with_label
(group, ctrl->radio.buttons[i]));
- uc.buttons[i] = b;
+ uc->buttons[i] = b;
group = gtk_radio_button_group(GTK_RADIO_BUTTON(b));
colstart = i % ctrl->radio.ncolumns;
columns_add(COLUMNS(w), b, colstart,
(i == ctrl->radio.nbuttons-1 ?
ctrl->radio.ncolumns - colstart : 1));
+ columns_force_left_align(COLUMNS(w), 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],
+ SHORTCUT_UCTRL, uc);
+ }
}
}
break;
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;
+ 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;
+ uc->entry = w;
}
- gtk_signal_connect(GTK_OBJECT(uc.entry), "changed",
+ 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
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) {
w = container;
}
- gtk_signal_connect(GTK_OBJECT(uc.entry), "focus_out_event",
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "focus_out_event",
GTK_SIGNAL_FUNC(editbox_lostfocus), dp);
break;
case CTRL_FILESELECT:
columns_add(COLUMNS(w), ww, 0, 2);
columns_force_left_align(COLUMNS(w), ww);
gtk_widget_show(ww);
+ shortcut_add(scs, ww,
+ (ctrl->generic.type == CTRL_FILESELECT ?
+ ctrl->fileselect.shortcut :
+ ctrl->fontselect.shortcut),
+ SHORTCUT_UCTRL, uc);
}
- uc.entry = ww = gtk_entry_new();
+ uc->entry = ww = gtk_entry_new();
gtk_widget_size_request(ww, &req);
gtk_widget_set_usize(ww, 10, req.height);
columns_add(COLUMNS(w), ww, 0, 1);
gtk_widget_show(ww);
- ww = gtk_button_new_with_label(browsebtn);
+ uc->button = ww = gtk_button_new_with_label(browsebtn);
columns_add(COLUMNS(w), ww, 1, 1);
gtk_widget_show(ww);
- gtk_signal_connect(GTK_OBJECT(uc.entry), "changed",
+ gtk_signal_connect(GTK_OBJECT(uc->entry), "key_press_event",
+ 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);
}
break;
case CTRL_LISTBOX:
if (ctrl->listbox.height == 0) {
- uc.optmenu = w = gtk_option_menu_new();
- uc.menu = gtk_menu_new();
- gtk_option_menu_set_menu(GTK_OPTION_MENU(w), uc.menu);
- gtk_object_set_data(GTK_OBJECT(uc.menu), "user-data",
- (gpointer)uc.optmenu);
+ uc->optmenu = w = gtk_option_menu_new();
+ uc->menu = gtk_menu_new();
+ 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));
+ uc->list = gtk_list_new();
+ 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);
+ uc->list);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(w),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_widget_show(uc.list);
- gtk_signal_connect(GTK_OBJECT(uc.list), "selection-changed",
+ 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
* upgrades, I'd be grateful.
*/
{
- int edge = GTK_WIDGET(uc.list)->style->klass->ythickness;
+ int edge = GTK_WIDGET(uc->list)->style->klass->ythickness;
gtk_widget_set_usize(w, 10,
2*edge + (ctrl->listbox.height *
listitemheight));
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;
}
}
gtk_widget_show(label);
gtk_widget_show(w);
-
+ shortcut_add(scs, label, ctrl->listbox.shortcut,
+ SHORTCUT_UCTRL, uc);
w = container;
}
break;
case CTRL_TEXT:
- uc.text = w = gtk_label_new(ctrl->generic.label);
+ uc->text = w = gtk_label_new(ctrl->generic.label);
+ gtk_misc_set_alignment(GTK_MISC(w), 0.0, 0.0);
gtk_label_set_line_wrap(GTK_LABEL(w), TRUE);
/* FIXME: deal with wrapping! */
break;
}
- if (w) {
- struct uctrl *ucptr;
- columns_add(cols, w,
- COLUMN_START(ctrl->generic.column),
- COLUMN_SPAN(ctrl->generic.column));
- gtk_widget_show(w);
+ assert(w != NULL);
- ucptr = smalloc(sizeof(struct uctrl));
- *ucptr = uc; /* structure copy */
- ucptr->toplevel = w;
- dlg_add_uctrl(dp, ucptr);
- }
+ columns_add(cols, w,
+ COLUMN_START(ctrl->generic.column),
+ COLUMN_SPAN(ctrl->generic.column));
+ if (left)
+ columns_force_left_align(cols, w);
+ gtk_widget_show(w);
+
+ uc->toplevel = w;
+ dlg_add_uctrl(dp, uc);
}
return ret;
}
struct selparam {
+ struct dlgparam *dp;
Panels *panels;
GtkWidget *panel, *treeitem;
+ struct Shortcuts shortcuts;
};
static void treeitem_sel(GtkItem *item, gpointer data)
struct selparam *sp = (struct selparam *)data;
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();
}
-void do_config_box(void)
+int win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+
+ if (event->keyval == GDK_Escape && dp->cancelbutton) {
+ gtk_signal_emit_by_name(GTK_OBJECT(dp->cancelbutton), "clicked");
+ return TRUE;
+ }
+
+ if ((event->state & GDK_MOD1_MASK) &&
+ (unsigned char)event->string[0] > 0 &&
+ (unsigned char)event->string[0] <= 127) {
+ int schr = (unsigned char)event->string[0];
+ struct Shortcut *sc = &dp->shortcuts->sc[schr];
+
+ switch (sc->action) {
+ case SHORTCUT_FOCUS:
+ gtk_widget_grab_focus(sc->widget);
+ break;
+ case SHORTCUT_UCTRL:
+ /*
+ * We must do something sensible with a uctrl.
+ * Precisely what this is depends on the type of
+ * control.
+ */
+ switch (sc->uc->ctrl->generic.type) {
+ case CTRL_CHECKBOX:
+ case CTRL_BUTTON:
+ /* Check boxes and buttons get the focus _and_ get toggled. */
+ gtk_widget_grab_focus(sc->uc->toplevel);
+ gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->toplevel),
+ "clicked");
+ break;
+ case CTRL_FILESELECT:
+ case CTRL_FONTSELECT:
+ /* File/font selectors have their buttons pressed (ooer),
+ * and focus transferred to the edit box. */
+ gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->button),
+ "clicked");
+ gtk_widget_grab_focus(sc->uc->entry);
+ break;
+ case CTRL_RADIO:
+ /*
+ * Radio buttons are fun, because they have
+ * multiple shortcuts. We must find whether the
+ * activated shortcut is the shortcut for the whole
+ * group, or for a particular button. In the former
+ * case, we find the currently selected button and
+ * focus it; in the latter, we focus-and-click the
+ * button whose shortcut was pressed.
+ */
+ if (schr == sc->uc->ctrl->radio.shortcut) {
+ int i;
+ for (i = 0; i < sc->uc->ctrl->radio.nbuttons; i++)
+ if (gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON(sc->uc->buttons[i]))) {
+ gtk_widget_grab_focus(sc->uc->buttons[i]);
+ }
+ } else if (sc->uc->ctrl->radio.shortcuts) {
+ int i;
+ for (i = 0; i < sc->uc->ctrl->radio.nbuttons; i++)
+ if (schr == sc->uc->ctrl->radio.shortcuts[i]) {
+ gtk_widget_grab_focus(sc->uc->buttons[i]);
+ gtk_signal_emit_by_name
+ (GTK_OBJECT(sc->uc->buttons[i]), "clicked");
+ }
+ }
+ break;
+ case CTRL_LISTBOX:
+ /*
+ * 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;
+ gint returnval;
+
+ gtk_widget_grab_focus(sc->uc->optmenu);
+ /* Option menus don't work using the "clicked" signal.
+ * We need to manufacture a button press event :-/ */
+ bev.type = GDK_BUTTON_PRESS;
+ bev.button = 1;
+ gtk_signal_emit_by_name(GTK_OBJECT(sc->uc->optmenu),
+ "button_press_event",
+ &bev, &returnval);
+ } else {
+ assert(sc->uc->list != NULL);
+
+ gtk_container_focus(GTK_CONTAINER(sc->uc->list),
+ GTK_DIR_TAB_FORWARD);
+ }
+ break;
+ }
+ 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 i, j = -1;
+ for (i = 0; i < dp->ntreeitems; i++)
+ if (widget == dp->treeitems[i]) {
+ if (event->keyval == GDK_Up || event->keyval == GDK_KP_Up) {
+ if (i > 0)
+ j = i-1;
+ } else {
+ if (i < dp->ntreeitems-1)
+ j = i+1;
+ }
+ break;
+ }
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget),
+ "key_press_event");
+ if (j >= 0) {
+ gint return_val;
+ gtk_signal_emit_by_name(GTK_OBJECT(dp->treeitems[j]), "toggle");
+ gtk_widget_grab_focus(dp->treeitems[j]);
+ }
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+gint tree_focus(GtkContainer *container, GtkDirectionType direction,
+ gpointer data)
+{
+ struct dlgparam *dp = (struct dlgparam *)data;
+ int i, f, dir;
+
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
+ dir = (direction == GTK_DIR_UP || direction == GTK_DIR_LEFT ||
+ direction == GTK_DIR_TAB_BACKWARD) ? -1 : +1;
+
+ /*
+ * 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 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.
+ */
+ if (f >= 0)
+ return FALSE;
+ else {
+ gtk_widget_grab_focus(dp->currtreeitem);
+ return TRUE;
+ }
+}
+
+void shortcut_add(struct Shortcuts *scs, GtkWidget *labelw,
+ int chr, int action, void *ptr)
+{
+ GtkLabel *label = GTK_LABEL(labelw);
+ gchar *currstr, *pattern;
+ int i;
+
+ if (chr == NO_SHORTCUT)
+ return;
+
+ chr = tolower((unsigned char)chr);
+
+ assert(scs->sc[chr].action == SHORTCUT_EMPTY);
+
+ scs->sc[chr].action = action;
+
+ if (action == SHORTCUT_FOCUS) {
+ scs->sc[chr].uc = NULL;
+ scs->sc[chr].widget = (GtkWidget *)ptr;
+ } else {
+ scs->sc[chr].widget = NULL;
+ scs->sc[chr].uc = (struct uctrl *)ptr;
+ }
+
+ gtk_label_get(label, &currstr);
+ for (i = 0; currstr[i]; i++)
+ if (tolower((unsigned char)currstr[i]) == chr) {
+ GtkRequisition req;
+
+ pattern = dupprintf("%*s_", i, "");
+
+ gtk_widget_size_request(GTK_WIDGET(label), &req);
+ gtk_label_set_pattern(label, pattern);
+ gtk_widget_set_usize(GTK_WIDGET(label), -1, req.height);
+
+ sfree(pattern);
+ break;
+ }
+}
+
+int do_config_box(void)
{
GtkWidget *window, *hbox, *vbox, *cols, *label,
*tree, *treescroll, *panels, *panelvbox;
Config cfg;
struct dlgparam dp;
struct sesslist sl;
+ struct Shortcuts scs;
struct selparam *selparams = NULL;
int nselparams = 0, selparamsize = 0;
sl.nsessions = 0;
+ for (index = 0; index < lenof(scs.sc); index++) {
+ scs.sc[index].action = SHORTCUT_EMPTY;
+ }
+
ctrlbox = ctrl_new_box();
setup_config_box(ctrlbox, &sl, FALSE, 0);
unix_setup_config_box(ctrlbox, FALSE);
gtk_widget_show(label);
treescroll = gtk_scrolled_window_new(NULL, NULL);
tree = gtk_tree_new();
+ gtk_signal_connect(GTK_OBJECT(tree), "focus_in_event",
+ GTK_SIGNAL_FUNC(widget_focus), &dp);
+ shortcut_add(&scs, label, 'g', SHORTCUT_FOCUS, 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);
level = 0;
for (index = 0; index < ctrlbox->nctrlsets; index++) {
struct controlset *s = ctrlbox->ctrlsets[index];
- GtkWidget *w = layout_ctrls(&dp, s, listitemheight);
+ GtkWidget *w;
if (!*s->pathname) {
+ w = layout_ctrls(&dp, &scs, s, listitemheight, GTK_WINDOW(window));
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->action_area),
w, TRUE, TRUE, 0);
} else {
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;
selparams = srealloc(selparams,
selparamsize * sizeof(*selparams));
}
+ selparams[nselparams].dp = &dp;
selparams[nselparams].panels = PANELS(panels);
selparams[nselparams].panel = panelvbox;
+ selparams[nselparams].shortcuts = scs; /* structure copy */
selparams[nselparams].treeitem = treeitem;
nselparams++;
}
+ w = layout_ctrls(&dp,
+ &selparams[nselparams-1].shortcuts,
+ s, listitemheight, NULL);
gtk_box_pack_start(GTK_BOX(panelvbox), w, FALSE, FALSE, 0);
gtk_widget_show(w);
}
}
+ dp.ntreeitems = nselparams;
+ dp.treeitems = smalloc(dp.ntreeitems * sizeof(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;
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);
gtk_main();
dlg_cleanup(&dp);
sfree(selparams);
+
+ return dp.retval;
}
/* ======================================================================
int main(int argc, char **argv)
{
gtk_init(&argc, &argv);
- do_config_box();
+ printf("returned %d\n", do_config_box());
return 0;
}