#include <cairo/cairo.h>
#include <cairo/cairo-xlib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#include "common.h"
#include "backend.h"
}
void
-LoadListBox (Option *opt, char *emptyText, int n1, int n2)
+SetListBoxItem (GtkListStore *store, int n, char *msg)
{
-#ifdef TODO_GTK
- static char *dummyList[2];
- dummyList[0] = emptyText; // empty listboxes tend to crash X, so display user-supplied warning string instead
- XawListChange(opt->handle, *(char*)opt->target ? opt->target : dummyList, 0, 0, True);
-#endif
+ GtkTreeIter iter;
+ GtkTreePath *path = gtk_tree_path_new_from_indices(n, -1);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL (store), &iter, path);
+ gtk_tree_path_free(path);
+ gtk_list_store_set(store, &iter, 0, msg, -1);
}
-int
-ReadScroll (Option *opt, float *top, float *bottom)
-{ // retreives fractions of top and bottom of thumb
-#ifdef TODO_GTK
- Arg args[16];
- Widget w = XtParent(opt->handle); // viewport
- Widget v = XtNameToWidget(w, "vertical");
- int j=0;
- float h;
- if(!v) return FALSE; // no scroll bar
- XtSetArg(args[j], XtNshown, &h); j++;
- XtSetArg(args[j], XtNtopOfThumb, top); j++;
- XtGetValues(v, args, j);
- *bottom = *top + h;
-#endif
- return TRUE;
+void
+LoadListBox (Option *opt, char *emptyText, int n1, int n2)
+{
+ char **data = (char **) (opt->target);
+ GtkWidget *list = (GtkWidget *) (opt->handle);
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+ GtkListStore *store = GTK_LIST_STORE(model);
+ GtkTreeIter iter;
+
+ if(n1 >= 0 && n2 >= 0) {
+ SetListBoxItem(store, n1, data[n1]);
+ SetListBoxItem(store, n2, data[n2]);
+ return;
+ }
+
+ if (gtk_tree_model_get_iter_first(model, &iter))
+ gtk_list_store_clear(store);
+
+ while(*data) { // add elements to listbox one by one
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter, 0, *data++, -1); // 0 = first column
+ }
}
void
-SetScroll (Option *opt, float f)
-{ // sets top of thumb to given fraction
-#ifdef TODO_GTK
- static char *params[3] = { "", "Continuous", "Proportional" };
- static XEvent event;
- Widget w = XtParent(opt->handle); // viewport
- Widget v = XtNameToWidget(w, "vertical");
- if(!v) return; // no scroll bar
- XtCallActionProc(v, "StartScroll", &event, params+1, 1);
- XawScrollbarSetThumb(v, f, -1.0);
- XtCallActionProc(v, "NotifyThumb", &event, params, 0);
-// XtCallActionProc(v, "NotifyScroll", &event, params+2, 1);
- XtCallActionProc(v, "EndScroll", &event, params, 0);
-#endif
+HighlightItem (Option *opt, int index, int scroll)
+{
+ char *value, **data = (char **) (opt->target);
+ GtkWidget *list = (GtkWidget *) (opt->handle);
+ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list));
+ GtkListStore *store = GTK_LIST_STORE(model);
+ GtkTreePath *path = gtk_tree_path_new_from_indices(index, -1);
+ GtkTreeIter iter;
+ gtk_tree_selection_select_path(selection, path);
+ if(scroll) gtk_tree_view_scroll_to_cell(list, path, NULL, 0, 0, 0);
+ gtk_tree_path_free(path);
}
void
-HighlightListBoxItem (Option *opt, int nr)
+HighlightListBoxItem (Option *opt, int index)
{
-#ifdef TODO_GTK
- XawListHighlight(opt->handle, nr);
-#endif
+ HighlightItem (opt, index, FALSE);
}
void
-HighlightWithScroll (Option *opt, int sel, int max)
+HighlightWithScroll (Option *opt, int index, int max)
{
-#ifdef TODO_GTK
- float top, bottom, f, g;
- HighlightListBoxItem(opt, sel);
- if(!ReadScroll(opt, &top, &bottom)) return; // no scroll bar
- bottom = bottom*max - 1.f;
- f = g = top;
- top *= max;
- if(sel > (top + 3*bottom)/4) f = (sel - 0.75f*(bottom-top))/max; else
- if(sel < (3*top + bottom)/4) f = (sel - 0.25f*(bottom-top))/max;
- if(f < 0.f) f = 0.; if(f + 1.f/max > 1.f) f = 1. - 1./max;
- if(f != g) SetScroll(opt, f);
-#endif
+ HighlightItem (opt, index, TRUE); // ignore max
}
int
SelectedListBoxItem (Option *opt)
{
-#ifdef TODO_GTK
- XawListReturnStruct *rs;
- rs = XawListShowCurrent(opt->handle);
- return rs->list_index;
-#else
- return 0;
-#endif
+ int i;
+ char *value, **data = (char **) (opt->target);
+ GtkWidget *list = (GtkWidget *) (opt->handle);
+ GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(selection), &model, &iter)) return -1;
+ gtk_tree_model_get(model, &iter, 0, &value, -1);
+ for(i=0; data[i]; i++) if(!strcmp(data[i], value)) return i;
+ g_free(value);
+ return -1;
}
void
#endif
}
-#ifdef TODO_GTK
-static void
-CheckCallback (Widget ww, XtPointer client_data, XEvent *event, Boolean *b)
-{
- int s, data = (intptr_t) client_data;
- Option *opt = dialogOptions[data >> 8] + (data & 255);
-
- if(opt->type == Label) { ((ButtonCallback*) opt->target)(data&255); return; }
-
- GetWidgetState(opt, &s);
- SetWidgetState(opt, !s);
-}
-#endif
-
-#ifdef TODO_GTK
-static void
-SpinCallback (Widget w, XtPointer client_data, XtPointer call_data)
-{
- String name, val;
- Arg args[16];
- char buf[MSG_SIZ], *p;
- int j = 0; // Initialisation is necessary because the text value may be non-numeric causing the scanf conversion to fail
- int data = (intptr_t) client_data;
- Option *opt = dialogOptions[data >> 8] + (data & 255);
-
- XtSetArg(args[0], XtNlabel, &name);
- XtGetValues(w, args, 1);
-
- GetWidgetText(opt, &val);
- sscanf(val, "%d", &j);
- if (strcmp(name, _("browse")) == 0) {
- char *q=val, *r;
- for(r = ""; *q; q++) if(*q == '.') r = q; else if(*q == '/') r = ""; // last dot after last slash
- if(!strcmp(r, "") && !currentCps && opt->type == FileName && opt->textValue)
- r = opt->textValue;
- Browse(data>>8, opt->name, NULL, r, opt->type == PathName, "", &p, (FILE**) opt);
- return;
- } else
- if (strcmp(name, "+") == 0) {
- if(++j > opt->max) return;
- } else
- if (strcmp(name, "-") == 0) {
- if(--j < opt->min) return;
- } else return;
- snprintf(buf, MSG_SIZ, "%d", j);
- SetWidgetText(opt, buf, TransientDlg);
-}
-#endif
-
void ComboSelect(GtkWidget *widget, gpointer addr)
{
Option *opt = dialogOptions[((intptr_t)addr)>>8]; // applicable option list
}
#endif
-#ifdef TODO_GTK
-static Widget
-CreateComboPopup (Widget parent, Option *opt, int n, int fromList, int def)
-{ // fromList determines if the item texts are taken from a list of strings, or from a menu table
- int i;
- Widget menu, entry;
- Arg arg;
- MenuItem *mb = (MenuItem *) opt->choice;
- char **list = (char **) opt->choice;
-
- if(list[0] == NULL) return NULL; // avoid empty menus, as they cause crash
- menu = XtCreatePopupShell(opt->name, simpleMenuWidgetClass, parent, NULL, 0);
-
- for (i=0; 1; i++)
- {
- char *msg = fromList ? list[i] : mb[i].string;
- if(!msg) break;
- entry = CreateMenuItem(menu, opt->min & NO_GETTEXT ? msg : _(msg), (XtCallbackProc) ComboSelect, (n<<16)+i);
- if(!fromList) mb[i].handle = (void*) entry; // save item ID, for enabling / checkmarking
- if(i==def) {
- XtSetArg(arg, XtNpopupOnEntry, entry);
- XtSetValues(menu, &arg, 1);
- }
- }
- return menu;
-}
-#else
static void
MenuSelect (gpointer addr) // callback for all combo items
{
}
return menu;
}
-#endif
char moveTypeInTranslations[] =
"<Key>Return: TypeInProc(1) \n"
filterTranslations, gameListTranslations, memoTranslations
};
+static gboolean
+ICSKeyEvent(GtkWidget *widget, GdkEventKey *event)
+{
+ switch(event->keyval) {
+ case GDK_Return: IcsKey(0); return TRUE;
+ case GDK_Up: IcsKey(1); return TRUE;
+ case GDK_Down: IcsKey(-1); return TRUE;
+ default: return FALSE;
+ }
+}
+
+int shiftState, controlState;
+
+static gboolean
+TypeInProc (GtkWidget *widget, GdkEventKey *event, gpointer gdata)
+{ // This callback catches key presses on text-entries, and uses <Enter> and <Esc> as synonyms for dialog OK or Cancel
+ // *** kludge alert *** If a dialog does want some other action, like sending the line typed in the text-entry to an ICS,
+ // it should define an OK handler that does so, and returns FALSE to suppress the popdown.
+ int n = (intptr_t) gdata;
+ int dlg = n >> 16;
+ Option *opt;
+ n &= 0xFFFF;
+ opt = &dialogOptions[dlg][n];
+
+ if(opt == icsBox) return ICSKeyEvent(event->keyval); // Intercept ICS Input Box, which needs special treatment
+
+ shiftState = event->state & GDK_SHIFT_MASK;
+ controlState = event->state & GDK_CONTROL_MASK;
+ switch(event->keyval) {
+ case GDK_Return:
+ if(GenericReadout(dialogOptions[dlg], -1)) PopDown(dlg);
+ break;
+ case GDK_Escape:
+ PopDown(dlg);
+ break;
+ default:
+ return FALSE;
+ }
+ return TRUE;
+}
+
void
-AddHandler (Option *opt, int nr)
+HighlightText (Option *opt, int from, int to, Boolean highlight)
+{
+# define INIT 0x8000
+ static GtkTextIter start, end;
+
+ if(!(opt->min & INIT)) {
+ opt->min |= INIT; // each memo its own init flag!
+ gtk_text_buffer_create_tag(opt->handle, "highlight", "background", "yellow", NULL);
+ gtk_text_buffer_create_tag(opt->handle, "normal", "background", "white", NULL);
+ }
+ gtk_text_buffer_get_iter_at_offset(opt->handle, &start, from);
+ gtk_text_buffer_get_iter_at_offset(opt->handle, &end, to);
+ gtk_text_buffer_apply_tag_by_name(opt->handle, highlight ? "highlight" : "normal", &start, &end);
+}
+
+int
+ShiftKeys ()
+{ // bassic primitive for determining if modifier keys are pressed
+ return 3*(shiftState != 0) + 0xC*(controlState != 0); // rely on what last mouse button press left us
+}
+
+static gboolean
+GameListEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
+{
+ int n = (int) gdata;
+
+ if(n == 4) {
+ if(((GdkEventKey *) event)->keyval != GDK_Return) return FALSE;
+ SetFilter();
+ return TRUE;
+ }
+
+ if(event->type == GDK_KEY_PRESS) {
+ int ctrl = (((GdkEventKey *) event)->state & GDK_CONTROL_MASK) != 0;
+ switch(((GdkEventKey *) event)->keyval) {
+ case GDK_Up: GameListClicks(-1 - 2*ctrl); return TRUE;
+ case GDK_Left: GameListClicks(-1); return TRUE;
+ case GDK_Down: GameListClicks(1 + 2*ctrl); return TRUE;
+ case GDK_Right: GameListClicks(1); return TRUE;
+ case GDK_Prior: GameListClicks(-4); return TRUE;
+ case GDK_Next: GameListClicks(4); return TRUE;
+ case GDK_Home: GameListClicks(-2); return TRUE;
+ case GDK_End: GameListClicks(2); return TRUE;
+ case GDK_Return: GameListClicks(0); return TRUE;
+ default: return FALSE;
+ }
+ }
+ if(event->type != GDK_2BUTTON_PRESS || ((GdkEventButton *) event)->button != 1) return FALSE;
+ GameListClicks(0);
+ return TRUE;
+}
+
+static gboolean
+MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
+{ // handle mouse clicks on text widgets that need it
+ int w, h;
+ int button=10, f=1;
+ Option *opt, *memo = (Option *) gdata;
+ MemoCallback *userHandler = (MemoCallback *) memo->choice;
+ GdkEventButton *bevent = (GdkEventButton *) event;
+ GdkEventMotion *mevent = (GdkEventMotion *) event;
+ GtkTextIter start, end;
+ String val = NULL;
+ gboolean res;
+ gint index, x, y;
+
+ if(memo->type == Label) { ((ButtonCallback*) memo->target)(memo->value); return TRUE; } // only clock widgets use this
+
+ switch(event->type) { // figure out what's up
+ case GDK_MOTION_NOTIFY:
+ f = 0;
+ w = mevent->x; h = mevent->y;
+ break;
+ case GDK_BUTTON_RELEASE:
+ f = -1; // release indicated by negative button numbers
+ w = bevent->x; h = bevent->y;
+ button = bevent->button;
+ break;
+ case GDK_BUTTON_PRESS:
+ w = bevent->x; h = bevent->y;
+ button = bevent->button;
+ shiftState = bevent->state & GDK_SHIFT_MASK;
+ controlState = bevent->state & GDK_CONTROL_MASK;
+// GTK_TODO: is this really the most efficient way to get the character at the mouse cursor???
+ gtk_text_view_window_to_buffer_coords(widget, GTK_TEXT_WINDOW_WIDGET, w, h, &x, &y);
+ gtk_text_view_get_iter_at_location(widget, &start, x, y);
+ gtk_text_buffer_place_cursor(memo->handle, &start);
+ /* get cursor position into index */
+ g_object_get(memo->handle, "cursor-position", &index, NULL);
+ /* get text from textbuffer */
+ gtk_text_buffer_get_start_iter (memo->handle, &start);
+ gtk_text_buffer_get_end_iter (memo->handle, &end);
+ val = gtk_text_buffer_get_text (memo->handle, &start, &end, FALSE);
+ break;
+ default:
+ return FALSE; // should not happen
+ }
+ button *= f;
+ // hand click parameters as well as text & location to user
+ res = (userHandler) (memo, button, w, h, val, index);
+ if(val) g_free(val);
+ return res;
+}
+
+void
+AddHandler (Option *opt, DialogClass dlg, int nr)
{
-#ifdef TODO_GTK
switch(nr) {
- case
+ case 0:
+ case 1:
+ case 2: break;
+ case 3: // input box
+ g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (ICSKeyEvent), NULL); break; // Input Box
+ case 5: // game list
+ g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
+ case 4: // game-list filter
+ g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (GameListEvent), (gpointer) nr );
+ break;
+ case 6:
+ break;
}
- XtOverrideTranslations(opt->handle, XtParseTranslationTable(translationTable[nr]));
-#endif
}
//----------------------------Generic dialog --------------------------------------------
xev.xclient.data.l[1] = CurrentTime;
XSendEvent (xDisplay,
- root, False,
+ root, False,static gboolean
+MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata)
+
SubstructureRedirectMask | SubstructureNotifyMask,
&xev);
gtk_widget_hide(shells[n]);
shellUp[n]--; // count rather than clear
+
if(n == 0 || n >= PromoDlg) {
gtk_widget_destroy(shells[n]);
shells[n] = NULL;
- }
+ }
if(marked[n]) {
MarkMenuItem(marked[n], False);
return 1;
}
-gboolean GenericPopDown(w, event, gdata)
+/* GTK callback used when OK/cancel clicked in genericpopup for non-modal dialog */
+gboolean GenericPopDown(w, resptype, gdata)
GtkWidget *w;
- GdkEvent *event;
- gpointer gdata;
+ GtkResponseType resptype;
+ gpointer gdata;
{
- int dlg = (intptr_t) gdata; /* dialog number dlgnr */
-
+ DialogClass dlg = (intptr_t) gdata; /* dialog number dlgnr */
+ GtkWidget *sh = shells[dlg];
+
+ currentOption = dialogOptions[dlg];
+
#ifdef TODO_GTK
// I guess BrowserDlg will be abandoned, as GTK has a better browser of its own
- if(shellUp[BrowserDlg] && dlg != BrowserDlg || dialogError) return; // prevent closing dialog when it has an open file-browse daughter
+ if(shellUp[BrowserDlg] && dlg != BrowserDlg || dialogError) return True; // prevent closing dialog when it has an open file-browse daughter
#else
- if(browserUp || dialogError && dlg != FatalDlg) return True; // prevent closing dialog when it has an open file-browse daughter
+ if(browserUp || dialogError && dlg != FatalDlg) return True; // prevent closing dialog when it has an open file-browse or error-popup daughter
#endif
- GtkWidget *sh = shells[dlg];
-printf("popdown %d\n", dlg);
shells[dlg] = w; // make sure we pop down the right one in case of multiple instances
- PopDown(dlg);
+
+ /* OK pressed */
+ if (resptype == GTK_RESPONSE_ACCEPT) {
+ if (GenericReadout(currentOption, -1)) PopDown(dlg);
+ return TRUE;
+ } else
+ /* cancel pressed */
+ {
+ if(dlg == BoardWindow) ExitEvent(0);
+ PopDown(dlg);
+ }
shells[dlg] = sh; // restore
- if(dlg == BoardWindow) ExitEvent(0);
- return True; /* don't propagate to default handler */
+ return TRUE;
}
int AppendText(Option *opt, char *s)
case GDK_BUTTON_PRESS:
w = bevent->x; h = bevent->y;
button = bevent->button;
+ shiftState = bevent->state & GDK_SHIFT_MASK;
+ controlState = bevent->state & GDK_CONTROL_MASK;
}
button *= f;
void
GraphExpose (Option *opt, int x, int y, int w, int h)
{
+#if 0
+ GdkRectangle r;
+ r.x = x; r.y = y; r.width = w; r.height = h;
+ gdk_window_invalidate_rect(((GtkWidget *)(opt->handle))->window, &r, FALSE);
+#endif
GdkEventExpose e;
if(!opt->handle) return;
e.area.x = x; e.area.y = y; e.area.width = w; e.area.height = h; e.count = -1; e.type = GDK_EXPOSE; // count = -1: kludge to suppress sizing
- GraphEventProc(opt->handle, (GdkEvent// gtk_check_menu_item_set_active((GtkCheckMenuItem *) item->handle, state);
- *) &e, (gpointer) opt); // fake expose event
-}
-
-/* GTK callback used when OK/cancel clicked in genericpopup for non-modal dialog */
-void GenericPopUpCallback(w, resptype, gdata)
- GtkWidget *w;
- GtkResponseType resptype;
- gpointer gdata;
-{
- int data = (intptr_t) gdata; /* dialog number dlgnr */
- DialogClass dlg;
-
- currentOption = dialogOptions[dlg=data>>16]; data &= 0xFFFF;
-
- /* OK pressed */
- if (resptype == GTK_RESPONSE_ACCEPT) {
- if (GenericReadout(currentOption, -1)) PopDown(data);
- return;
- }
-
- /* cancel pressed */
- PopDown(dlg);
+ GraphEventProc(opt->handle, (GdkEvent *) &e, (gpointer) opt); // fake expose event
}
void GenericCallback(GtkWidget *widget, gpointer gdata)
sh = shells[dlg]; // make following line a no-op, as we haven't found out what the real shell is yet (breaks multiple popups of same type!)
#endif
oldSh = shells[dlg]; shells[dlg] = sh; // bow to reality
-
-#ifdef TODO_GTK
+
if (data == 30000) { // cancel
PopDown(dlg);
} else
if (data == 30001) { // save buttons imply OK
if(GenericReadout(currentOption, -1)) PopDown(dlg); // calls OK-proc after full readout, but no popdown if it returns false
} else
-#endif
if(currentCps) {
name = gtk_button_get_label (GTK_BUTTON(widget));
dialog = NULL;
}
-#ifdef TODO_GTK
-void
-TabProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
-{ // for transfering focus to the next text-edit
- Option *opt;
- for(opt = currentOption; opt->type != EndMark; opt++) {
- if(opt->handle == w) {
- while(++opt) {
- if(opt->type == EndMark) opt = currentOption; // wrap
- if(opt->handle == w) return; // full circle
- if(opt->type == TextBox || opt->type == Spin || opt->type == Fractional || opt->type == FileName || opt->type == PathName) {
- SetFocus(opt->handle, XtParent(XtParent(XtParent(w))), NULL, 0);
- return;
- }
- }
- }
- }
-}
-#endif
-
-#ifdef TODO_GTK
-void
-WheelProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
-{ // for scrolling a widget seen through a viewport with the mouse wheel (ListBox!)
- int j=0, n = atoi(prms[0]);
- static char *params[3] = { "", "Continuous", "Proportional" };
- Arg args[16];
- float h, top;
- Widget v;
- if(!n) { // transient dialogs also use this for list-selection callback
- n = prms[1][0]-'0';
- Option *opt=dialogOptions[prms[2][0]-'A'] + n;
- if(opt->textValue) ((ListBoxCallback*) opt->textValue)(n, SelectedListBoxItem(opt));
- return;
- }
- v = XtNameToWidget(XtParent(w), "vertical");
- if(!v) return;
- XtSetArg(args[j], XtNshown, &h); j++;
- XtSetArg(args[j], XtNtopOfThumb, &top); j++;
- XtGetValues(v, args, j);
- top += 0.1f*h*n; if(top < 0.f) top = 0.;
- XtCallActionProc(v, "StartScroll", event, params+1, 1);
- XawScrollbarSetThumb(v, top, -1.0);
- XtCallActionProc(v, "NotifyThumb", event, params, 0);
-// XtCallActionProc(w, "NotifyScroll", event, params+2, 1);
- XtCallActionProc(v, "EndScroll", event, params, 0);
-}
-#endif
-
static char *oneLiner =
"<Key>Return: redraw-display() \n \
<Key>Tab: TabProc() \n ";
int i, j, arraysize, left, top, height=999, width=1, boxStart;
char def[MSG_SIZ], *msg, engineDlg = (currentCps != NULL && dlgNr != BrowserDlg);
-
+
if(dlgNr < PromoDlg && shellUp[dlgNr]) return 0; // already up
if(dlgNr && dlgNr < PromoDlg && shells[dlgNr]) { // reusable, and used before (but popped down)
else
gtk_text_buffer_set_text (textbuffer, "", -1);
option[i].handle = (void*)textbuffer;
+ option[i].textValue = (char*)textview;
+ if(option[i].choice) { // textviews can request a handler for mouse events in the choice field
+ g_signal_connect(textview, "button-press-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
+ g_signal_connect(textview, "button-release-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
+ g_signal_connect(textview, "motion-notify-event", G_CALLBACK (MemoEvent), (gpointer) &option[i] );
+ }
break;
}
gtk_container_add(GTK_CONTAINER(frame), label);
label = frame;
}
- Pack(hbox, table, label, left, left+3, top);
+ Pack(hbox, table, label, left, left+3, top);
+ if(option[i].target) { // allow user to specify event handler for button presses
+ gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK);
+ g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
+ }
break;
case SaveButton:
case Button:
sw = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(sw), list);
- gtk_widget_set_size_request(GTK_WIDGET(sw), w, 300);
+ gtk_widget_set_size_request(GTK_WIDGET(sw), option[i].max ? option[i].max : -1, option[i].value ? option[i].value : -1);
/* never has label, so let listbox occupy all columns */
Pack(hbox, table, sw, left, left+3, top);
}
g_signal_connect (dialog, "response",
- G_CALLBACK (GenericPopUpCallback),
- (gpointer)(intptr_t) (dlgNr<<16 | i));
+ G_CALLBACK (GenericPopDown),
+ (gpointer)(intptr_t) dlgNr);
g_signal_connect (dialog, "delete-event",
G_CALLBACK (GenericPopDown),
(gpointer)(intptr_t) dlgNr);
projects / xboard.git / blobdiff