#include <cairo/cairo.h>
#include <cairo/cairo-xlib.h>
#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
#include "common.h"
#include "backend.h"
{
MenuItem *item = MenuNameToItem(menuRef);
-#ifdef TODO_GTK
if(item) {
- Arg args[2];
- XtSetArg(args[0], XtNleftBitmap, state ? xMarkPixmap : None);
- XtSetValues(item->handle, args, 1);
+ ((GtkCheckMenuItem *) (item->handle))->active = state;
}
-#endif
}
void GetWidgetTextGTK(GtkWidget *w, char **buf)
GtkTextIter start;
GtkTextIter end;
+ if (GTK_IS_ENTRY(w)) {
+ *buf = gtk_entry_get_text(GTK_ENTRY (w));
+ } else
if (GTK_IS_TEXT_BUFFER(w)) {
gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(w), &start);
gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(w), &end);
}
}
-void SetSpinValue(Option *opt, int val, int n)
+void SetSpinValue(Option *opt, char *val, int n)
{
if (opt->type == Spin)
{
- if (val == -1)
+ if (!strcmp(val, _("Unused")))
gtk_widget_set_sensitive(opt->handle, FALSE);
else
{
gtk_widget_set_sensitive(opt->handle, TRUE);
- gtk_spin_button_set_value(opt->handle, val);
+ gtk_spin_button_set_value(opt->handle, atoi(val));
}
}
else
void SetWidgetTextGTK(GtkWidget *w, char *text)
{
- if (!GTK_IS_TEXT_BUFFER(w)) {
- printf("error: SetWidgetTextGTK arg is not a GtkTextBuffer\n");
- return;
- }
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(w), text, -1);
+ if (GTK_IS_ENTRY(w)) {
+ gtk_entry_set_text (GTK_ENTRY (w), text);
+ } else
+ if (GTK_IS_TEXT_BUFFER(w)) {
+ gtk_text_buffer_set_text(GTK_TEXT_BUFFER(w), text, -1);
+ } else
+ printf("error: SetWidgetTextGTK arg is neitherGtkEntry nor GtkTextBuffer\n");
}
void
case FileName:
case PathName:
case TextBox: SetWidgetTextGTK((GtkWidget *) opt->handle, buf); break;
- case Spin: SetSpinValue(opt, atoi(buf), n); break;
+ case Spin: SetSpinValue(opt, buf, n); break;
default:
printf("unexpected case (%d) in GetWidgetText\n", opt->type);
}
void
SetWidgetLabel (Option *opt, char *buf)
{
-#ifdef TODO_GTK
- Arg arg;
- XtSetArg(arg, XtNlabel, (XtArgVal) buf);
- XtSetValues(opt->handle, &arg, 1);
-#endif
+ gtk_label_set_text(opt->handle, buf);
}
void
SetDialogTitle (DialogClass dlg, char *title)
{
-#ifdef TODO_GTK
- Arg args[16];
- XtSetArg(args[0], XtNtitle, title);
- XtSetValues(shells[dlg], args, 1);
-#endif
+ gtk_window_set_title(GTK_WINDOW(shells[dlg]), title);
}
void
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;
+ }
+}
+
+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;
+
+ 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;
+ break;
+ case GDK_BUTTON_PRESS:
+ w = bevent->x; h = bevent->y;
+ button = bevent->button;
+// 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, int nr)
{
-#ifdef TODO_GTK
switch(nr) {
- case
+ case 0:
+ case 1:
+ case 2: break;
+ case 3: g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (ICSKeyEvent), NULL); break; // Input Box
+ case 4:
+ case 5:
+ case 6: break;
}
+#ifdef TODO_GTK
XtOverrideTranslations(opt->handle, XtParseTranslationTable(translationTable[nr]));
#endif
}
#endif
}
-/* Sets a check box on (True) or off (False) in the menu */
-void SetCheckMenuItemActive(gchar *name, int menuDlgNr, gboolean active)
-{
-#ifdef TODO_GTK
-// This doesn't work anymore, as we don't use builder
- gchar menuItemName[50];
-
- if (name != NULL)
- strcpy(menuItemName, name);
- else
- GetMenuItemName(menuDlgNr, menuItemName);
-
- if (strcmp(menuItemName, "") == 0) return;
-
- GtkCheckMenuItem *chk;
- chk = GTK_CHECK_MENU_ITEM(gtk_builder_get_object(GTK_BUILDER(builder), menuItemName));
- if (chk == NULL) {
- printf("Error: failed to get check menu item %s from builder\n", menuItemName);
- return;
- }
- chk->active = active; // set the check box without emitting any signals
-#endif
-}
-
int
PopDown (DialogClass n)
{
gtk_widget_hide(shells[n]);
shellUp[n]--; // count rather than clear
+
if(n == 0 || n >= PromoDlg) {
gtk_widget_destroy(shells[n]);
shells[n] = NULL;
- }
-#ifdef TODO_GTK
+ }
+
if(marked[n]) {
MarkMenuItem(marked[n], False);
marked[n] = NULL;
}
-#else
- // when popping down uncheck the check box of the menu item
- SetCheckMenuItemActive(NULL, n, False);
-#endif
+
if(!n) currentCps = NULL; // if an Engine Settings dialog was up, we must be popping it down now
currentOption = dialogOptions[TransientDlg]; // just in case a transient dialog was up (to allow its check and combo callbacks to work)
#ifdef TODO_GTK
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) 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)
void
SetColor (char *colorName, Option *box)
{ // sets the color of a widget
-#ifdef TODO_GTK
- Arg args[5];
- Pixel buttonColor;
- XrmValue vFrom, vTo;
- if (!appData.monoMode) {
- vFrom.addr = (caddr_t) colorName;
- vFrom.size = strlen(colorName);
- XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
- if (vTo.addr == NULL) {
- buttonColor = (Pixel) -1;
- } else {
- buttonColor = *(Pixel *) vTo.addr;
- }
- } else buttonColor = timerBackgroundPixel;
- XtSetArg(args[0], XtNbackground, buttonColor);;
- XtSetValues(box->handle, args, 1);
-#endif
+ GdkColor color;
+
+ /* set the colour of the colour button to the colour that will be used */
+ gdk_color_parse( colorName, &color );
+ gtk_widget_modify_bg ( GTK_WIDGET(box->handle), GTK_STATE_NORMAL, &color );
}
#ifdef TODO_GTK
#endif
static void
-GraphEventProc(GtkWidget *widget, GdkEventExpose *event, gpointer gdata)
+GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
{ // handle expose and mouse events on Graph widget
int w, h;
int j, button=10, f=1, sizing=0;
PointerCallback *userHandler = graph->target;
GdkEventExpose *eevent = (GdkEventExpose *) event;
GdkEventButton *bevent = (GdkEventButton *) event;
- GdkEventMotion *mevent = (GdkEventButton *) event;
+ GdkEventMotion *mevent = (GdkEventMotion *) event;
cairo_t *cr;
// if (!XtIsRealized(widget)) return;
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 *) &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// gtk_check_menu_item_set_active((GtkCheckMenuItem *) item->handle, state);
+ *) &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));
shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now)
}
+void BrowseGTK(GtkWidget *widget, gpointer gdata)
+{
+ GtkWidget *entry;
+ GtkWidget *dialog;
+ GtkFileFilter *gtkfilter;
+ GtkFileFilter *gtkfilter_all;
+ int opt_i = (intptr_t) gdata;
+ GtkFileChooserAction fc_action;
+
+ gtkfilter = gtk_file_filter_new();
+ gtkfilter_all = gtk_file_filter_new();
+
+ char fileext[10] = "*";
+
+ /* select file or folder depending on option_type */
+ if (currentOption[opt_i].type == PathName)
+ fc_action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+ else
+ fc_action = GTK_FILE_CHOOSER_ACTION_OPEN;
+
+ dialog = gtk_file_chooser_dialog_new ("Open File",
+ NULL,
+ fc_action,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ /* one filter to show everything */
+ gtk_file_filter_add_pattern(gtkfilter_all, "*");
+ gtk_file_filter_set_name (gtkfilter_all, "All Files");
+ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),gtkfilter_all);
+
+ /* filter for specific filetypes e.g. pgn or fen */
+ if (currentOption[opt_i].textValue != NULL && (strcmp(currentOption[opt_i].textValue, "") != 0) )
+ {
+ strcat(fileext, currentOption[opt_i].textValue);
+ gtk_file_filter_add_pattern(gtkfilter, fileext);
+ gtk_file_filter_set_name (gtkfilter, currentOption[opt_i].textValue);
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);
+ /* activate filter */
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter);
+ }
+ else
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter_all);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+ {
+ char *filename;
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+ entry = currentOption[opt_i].handle;
+ gtk_entry_set_text (GTK_ENTRY (entry), filename);
+ g_free (filename);
+
+ }
+ gtk_widget_destroy (dialog);
+ dialog = NULL;
+}
+
#ifdef TODO_GTK
void
TabProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
}
#endif
+static int
+SameRow (Option *opt)
+{
+ return (opt->min & SAME_ROW && (opt->type == Button || opt->type == SaveButton || opt->type == Label || opt->type == ListBox));
+}
+
+static void
+Pack (GtkWidget *hbox, GtkWidget *table, GtkWidget *entry, int left, int right, int top)
+{
+ if(hbox) gtk_box_pack_start(GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ else gtk_table_attach_defaults(GTK_TABLE(table), entry, left, right, top, top+1);
+}
+
int
GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel)
{
GtkWidget *box;
GtkWidget *checkbutton;
GtkWidget *entry;
- GtkWidget *hbox;
+ GtkWidget *hbox = NULL;
GtkWidget *button;
GtkWidget *table;
GtkWidget *spinner;
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)
currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark
}
+ parents[dlgNr] = parent;
#ifdef TODO_GTK
- i = 0;
- XtSetArg(args[i], XtNresizable, True); i++;
shells[BoardWindow] = shellWidget; parents[dlgNr] = parent;
if(dlgNr == BoardWindow) dialog = shellWidget; else
shells[parent], args, i);
#endif
dialog = gtk_dialog_new_with_buttons( title,
- NULL,
+ GTK_WINDOW(shells[parent]),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR |
(modal ? GTK_DIALOG_MODAL : 0),
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
left = left + 3;
gtk_table_resize(GTK_TABLE(table), height, left + 3);
}
+ if(!SameRow(&option[i])) {
+ if(SameRow(&option[i+1])) {
+ // make sure hbox is always available when we have more options on same row
+ hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue, 0);
+ if (strcmp(option[i].name, "") == 0 || option[i].type == Label || option[i].type == Button)
+ // for Label and Button name is contained inside option
+ gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
+ else
+ gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
+ } else hbox = NULL; //and also make sure no hbox exists if only singl option on row
+ }
switch(option[i].type) {
case Fractional:
snprintf(def, MSG_SIZ, "%.2f", *(float*)option[i].target);
w = option[i].type == Spin || option[i].type == Fractional ? 70 : option[i].max ? option[i].max : 205;
if(option[i].type == FileName || option[i].type == PathName) w -= 55;
- if (option[i].type==TextBox && option[i].min > 80){
+ if (option[i].type==TextBox && option[i].value > 80){
textview = gtk_text_view_new();
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), option[i].min & T_WRAP ? GTK_WRAP_WORD : GTK_WRAP_NONE);
+#ifdef TODO_GTK
+ if(option[i].min & T_FILL) { XtSetArg(args[j], XtNautoFill, True); j++; }
+ if(option[i].min & T_TOP) { XtSetArg(args[j], XtNtop, XtChainTop); j++;
+#endif
/* add textview to scrolled window so we have vertical scroll bar */
sw = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+ option[i].min & T_HSCRL ? GTK_POLICY_ALWAYS : GTK_POLICY_AUTOMATIC,
+ option[i].min & T_VSCRL ? GTK_POLICY_ALWAYS : GTK_POLICY_NEVER);
gtk_container_add(GTK_CONTAINER(sw), textview);
gtk_widget_set_size_request(GTK_WIDGET(sw), w, -1);
/* check if label is empty */
if (strcmp(option[i].name,"") != 0) {
gtk_table_attach_defaults(GTK_TABLE(table), label, left, left+1, top, top+1);
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left+1, left+3, top, top+1);
+ Pack(hbox, table, sw, left+1, left+3, top);
}
else {
/* no label so let textview occupy all columns */
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left, left+3, top, top+1);
+ Pack(hbox, table, sw, left, left+3, top);
}
if ( *(char**)option[i].target != NULL )
gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
else
gtk_text_buffer_set_text (textbuffer, "", -1);
option[i].handle = (void*)textbuffer;
+ 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_table_attach_defaults(GTK_TABLE(table), entry, left+1, left+2, top, top+1);
button = gtk_button_new_with_label ("Browse");
gtk_table_attach_defaults(GTK_TABLE(table), button, left+2, left+3, top, top+1);
- g_signal_connect (button, "clicked", G_CALLBACK (Browse), (gpointer)(intptr_t) i);
+ g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i);
option[i].handle = (void*)entry;
}
else {
- hbox = gtk_hbox_new (FALSE, 0);
- if (strcmp(option[i].name, "") == 0)
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
- else
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
- //gtk_table_attach_defaults(GTK_TABLE(table), entry, left+1, left+3, top, top+1);
+ Pack(hbox, table, entry, left + (strcmp(option[i].name, "") != 0), left+3, top);
option[i].handle = (void*)entry;
}
break;
option[i].handle = (void *)checkbutton;
break;
case Label:
- label = gtk_label_new(option[i].name);
+ option[i].handle = (void *) (label = gtk_label_new(option[i].name));
/* Left Justify */
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_table_attach_defaults(GTK_TABLE(table), label, left, left+3, top, top+1);
+ if(option[i].min & BORDER) {
+ GtkWidget *frame = gtk_frame_new(NULL);
+ gtk_container_add(GTK_CONTAINER(frame), label);
+ label = frame;
+ }
+ Pack(hbox, table, label, left, left+3, top);
break;
case SaveButton:
case Button:
|| strstr(first.variants, VariantName(option[i].value)));
}
- if (!(option[i].min & 1)) {
- if(option[i].textValue) // for new variant dialog give buttons equal space so they line up nicely
- hbox = gtk_hbox_new (TRUE, 0);
- else
- hbox = gtk_hbox_new (FALSE, 0);
- // if only 1 button then put it in 1st column of table only
- if ( (arraysize >= (i+1)) && option[i+1].type != Button )
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+1, top, top+1);
- else
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left, left+3, top, top+1);
- }
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ Pack(hbox, table, button, left, left+1, top);
g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16));
option[i].handle = (void*)button;
break;
for(j=0;;j++) {
if ( ((char **) option[i].textValue)[j] == NULL) break;
- gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), ((char **) option[i].textValue)[j]);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), ((char **) option[i].choice)[j]);
}
if(currentCps)
option[i].choice = (char**) option[i].textValue;
- else {
+ else {
for(j=0; option[i].choice[j]; j++) {
- if(*(char**)option[i].target && !strcmp(*(char**)option[i].target, option[i].choice[j])) break;
+ if(*(char**)option[i].target && !strcmp(*(char**)option[i].target, ((char**)(option[i].textValue))[j])) break;
}
/* If choice is NULL set to first */
if (option[i].choice[j] == NULL)
//option[i].value = j + (option[i].choice[j] == NULL);
gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_table_attach_defaults(GTK_TABLE(table), hbox, left+1, left+3, top, top+1);
- gtk_box_pack_start (GTK_BOX (hbox), combobox, TRUE, TRUE, 0);
- //gtk_table_attach_defaults(GTK_TABLE(table), combobox, 1, 2, i, i+1);
-
+ Pack(hbox, table, combobox, left+1, left+3, top);
g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(ComboSelect), (gpointer) (intptr_t) (i + 256*dlgNr));
option[i].handle = (void*)combobox;
gtk_widget_set_size_request(GTK_WIDGET(sw), w, 300);
/* never has label, so let listbox occupy all columns */
- gtk_table_attach_defaults(GTK_TABLE(table), sw, left, left+3, top, top+1);
+ Pack(hbox, table, sw, left, left+3, top);
}
break;
case Graph:
g_signal_connect (graph, "button-press-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "button-release-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
g_signal_connect (graph, "motion-notify-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
-// g_signal_connect (graph, "motion-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
#ifdef TODO_GTK
XtAddEventHandler(last, ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, False,
if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions
break;
case Break:
- top = height; // force next option to start in a new column
+ if(option[i].min & SAME_ROW) top = height; // force next option to start in a new column
break;
default:
printf("GenericPopUp: unexpected case in switch. i=%d type=%d name=%s.\n", i, option[i].type, option[i].name);
}
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