X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=26e7d02e49802aa8649d7c9419a2f688b7310b3d;hb=3f60740a4a470b07a8b1b9a2bced28bf32ff05d5;hp=d33dd7fcccd409df17e940983f5b5a8a8cb8d818;hpb=e7de571f4c62c122a3cbf9299722c69930aa6967;p=xboard.git diff --git a/xoptions.c b/xoptions.c index d33dd7f..26e7d02 100644 --- a/xoptions.c +++ b/xoptions.c @@ -139,13 +139,9 @@ MarkMenuItem (char *menuRef, int state) { 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) @@ -153,6 +149,9 @@ 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); @@ -184,16 +183,16 @@ GetWidgetText (Option *opt, char **buf) } } -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 @@ -202,11 +201,13 @@ void SetSpinValue(Option *opt, int val, int n) 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 @@ -217,7 +218,7 @@ SetWidgetText (Option *opt, char *buf, int n) 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); } @@ -250,21 +251,13 @@ SetWidgetState (Option *opt, int state) 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 @@ -597,30 +590,6 @@ RaiseWindow (DialogClass dlg) #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) { @@ -649,15 +618,12 @@ PopDown (DialogClass n) 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 @@ -678,7 +644,7 @@ gboolean GenericPopDown(w, event, gdata) // 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 #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 daughter #endif GtkWidget *sh = shells[dlg]; printf("popdown %d\n", dlg); @@ -707,23 +673,11 @@ 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 @@ -737,7 +691,7 @@ ColorChanged (Widget w, XtPointer data, XEvent *event, Boolean *b) #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; @@ -745,7 +699,7 @@ GraphEventProc(GtkWidget *widget, GdkEventExpose *event, gpointer gdata) 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; @@ -819,7 +773,8 @@ GraphExpose (Option *opt, int x, int y, int w, int h) 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 + 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 */ @@ -880,6 +835,64 @@ void GenericCallback(GtkWidget *widget, gpointer gdata) 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) @@ -1000,6 +1013,19 @@ SetPositionAndSize (Arg *args, Widget leftNeigbor, Widget topNeigbor, int b, int } #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) { @@ -1009,7 +1035,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent GtkWidget *box; GtkWidget *checkbutton; GtkWidget *entry; - GtkWidget *hbox; + GtkWidget *hbox = NULL; GtkWidget *button; GtkWidget *table; GtkWidget *spinner; @@ -1050,9 +1076,8 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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 @@ -1061,7 +1086,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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, @@ -1090,6 +1115,17 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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); @@ -1110,12 +1146,18 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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); @@ -1124,11 +1166,11 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent /* 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); @@ -1164,17 +1206,11 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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; @@ -1186,10 +1222,15 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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: @@ -1209,18 +1250,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent || 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; @@ -1234,14 +1264,14 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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) @@ -1253,12 +1283,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent //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; @@ -1288,7 +1313,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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: @@ -1301,7 +1326,6 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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, @@ -1362,7 +1386,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent 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);