X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=ecdbd30c22b3976244773e426dd4a3783714f846;hb=1c03d229073e56dda9e5856db5adaae51576a3bb;hp=877bf02d563d942bef98ec5c01b3a3870f47fbf1;hpb=8a302da3e84a2d054af33b6e329684ebb3510b69;p=xboard.git diff --git a/gtk/xoptions.c b/gtk/xoptions.c index 877bf02..ecdbd30 100644 --- a/gtk/xoptions.c +++ b/gtk/xoptions.c @@ -1,7 +1,7 @@ /* * xoptions.c -- Move list window, part of X front end for XBoard * - * Copyright 2000, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * Copyright 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -50,7 +50,7 @@ extern char *getenv(); #include #include #include -#include +#include #include "common.h" #include "backend.h" @@ -146,9 +146,9 @@ MarkMenuItem (char *menuRef, int state) } void GetWidgetTextGTK(GtkWidget *w, char **buf) -{ +{ GtkTextIter start; - GtkTextIter end; + GtkTextIter end; if (GTK_IS_ENTRY(w)) { *buf = (char *) gtk_entry_get_text(GTK_ENTRY (w)); @@ -160,7 +160,7 @@ void GetWidgetTextGTK(GtkWidget *w, char **buf) } else { printf("error in GetWidgetText, invalid widget\n"); - *buf = NULL; + *buf = NULL; } } @@ -175,7 +175,7 @@ GetWidgetText (Option *opt, char **buf) case PathName: case TextBox: GetWidgetTextGTK((GtkWidget *) opt->handle, buf); break; case Spin: - x = gtk_spin_button_get_value (GTK_SPIN_BUTTON(opt->handle)); + x = gtk_spin_button_get_value (GTK_SPIN_BUTTON(opt->handle)); snprintf(val, 12, "%d", x); *buf = val; break; default: @@ -185,19 +185,19 @@ GetWidgetText (Option *opt, char **buf) } void SetSpinValue(Option *opt, char *val, int n) -{ +{ if (opt->type == Spin) { if (!strcmp(val, _("Unused"))) gtk_widget_set_sensitive(opt->handle, FALSE); else { - gtk_widget_set_sensitive(opt->handle, TRUE); + gtk_widget_set_sensitive(opt->handle, TRUE); gtk_spin_button_set_value(opt->handle, atoi(val)); } } else - printf("error in SetSpinValue, unknown type %d\n", opt->type); + printf("error in SetSpinValue, unknown type %d\n", opt->type); } void SetWidgetTextGTK(GtkWidget *w, char *text) @@ -244,7 +244,10 @@ SetWidgetState (Option *opt, int state) void SetWidgetLabel (Option *opt, char *buf) { - gtk_label_set_text(opt->handle, buf); + if(opt->type == Button) // Chat window uses this routine for changing button labels + gtk_button_set_label(opt->handle, buf); + else + gtk_label_set_text(opt->handle, buf); } void @@ -271,14 +274,14 @@ LoadListBox (Option *opt, char *emptyText, int n1, int n2) 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)) + if (gtk_tree_model_get_iter_first(model, &iter)) gtk_list_store_clear(store); while(*data) { // add elements to listbox one by one @@ -363,7 +366,7 @@ void ComboSelect(GtkWidget *widget, gpointer addr) gint i = ((intptr_t)addr) & 255; // option number gint g; - g = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + g = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); values[i] = g; // store in temporary, for transfer at OK #if TODO_GTK @@ -413,11 +416,11 @@ CreateMenuPopup (Option *opt, int n, int def) menu = gtk_menu_new(); // menu = XtCreatePopupShell(opt->name, simpleMenuWidgetClass, parent, NULL, 0); - for (i=0; 1; i++) + for (i=0; 1; i++) { char *msg = mb[i].string; if(!msg) break; - if(strcmp(msg, "----")) { // + if(strcmp(msg, "----")) { // if(!(opt->min & NO_GETTEXT)) msg = _(msg); if(mb[i].handle) { entry = gtk_check_menu_item_new_with_label(msg); // should be used for items that can be checkmarked @@ -438,7 +441,7 @@ CreateMenuPopup (Option *opt, int n, int def) return menu; } -Option *typeIn; // kludge to distinguish type-in callback from input-box callback +Option *icsBox; // kludge to distinguish type-in callback from input-box callback void CursorAtEnd (Option *opt) @@ -447,21 +450,9 @@ CursorAtEnd (Option *opt) } static gboolean -ICSKeyEvent(GtkWidget *widget, GdkEventKey *event, gpointer g) -{ - Option *opt = (Option *) g; - if(opt == typeIn) { - if(event->keyval == GDK_Return) { - char *val; - GetWidgetText(opt, &val); - TypeInDoneEvent(val); - PopDown(TransientDlg); - return TRUE; - } - return FALSE; - } - - switch(event->keyval) { +ICSKeyEvent (int keyval) +{ // TODO_GTK: arrow-handling should really be integrated in type-in proc, and this should be a backe-end OK handler + switch(keyval) { case GDK_Return: IcsKey(0); return TRUE; case GDK_Up: IcsKey(1); return TRUE; case GDK_Down: IcsKey(-1); return TRUE; @@ -566,8 +557,6 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata) 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; @@ -583,6 +572,10 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata) button = bevent->button; shiftState = bevent->state & GDK_SHIFT_MASK; controlState = bevent->state & GDK_CONTROL_MASK; + if(memo->type == Label) { // only clock widgets use this + ((ButtonCallback*) memo->target)(button == 1 ? memo->value : -memo->value); + return TRUE; + } // GTK_TODO: is this really the most efficient way to get the character at the mouse cursor??? gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_WIDGET, w, h, &x, &y); gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &start, x, y); @@ -592,7 +585,7 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata) /* 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); + val = gtk_text_buffer_get_text (memo->handle, &start, &end, FALSE); break; default: return FALSE; // should not happen @@ -611,10 +604,10 @@ AddHandler (Option *opt, DialogClass dlg, int nr) case 0: // history (now uses generic textview callback) case 1: // comment (likewise) break; - case 2: // move type-in - typeIn = opt; case 3: // input box - g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (ICSKeyEvent), (gpointer) opt); + icsBox = opt; + case 2: // move type-in + g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (TypeInProc), (gpointer) (dlg<<16 | (opt - dialogOptions[dlg]))); break; case 5: // game list g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 ); @@ -634,7 +627,7 @@ GtkWidget *shells[NrOfDialogs]; DialogClass parents[NrOfDialogs]; WindowPlacement *wp[NrOfDialogs] = { // Beware! Order must correspond to DialogClass enum NULL, &wpComment, &wpTags, NULL, NULL, NULL, NULL, &wpMoveHistory, &wpGameList, &wpEngineOutput, &wpEvalGraph, - NULL, NULL, NULL, NULL, /*&wpMain*/ NULL + NULL, NULL, NULL, NULL, &wpMain }; int @@ -668,7 +661,7 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata) SubstructureRedirectMask | SubstructureNotifyMask, &xev); - XFlush(xDisplay); + XFlush(xDisplay); XSync(xDisplay, False); #endif } @@ -676,25 +669,13 @@ MemoEvent(GtkWidget *widget, GdkEvent *event, gpointer gdata) int PopDown (DialogClass n) { - //Arg args[10]; - - if (!shellUp[n] || !shells[n]) return 0; -#ifdef TODO_GTK -// Not sure this is still used + //Arg args[10]; + + if (!shellUp[n] || !shells[n]) return 0; if(n && wp[n]) { // remember position - j = 0; - XtSetArg(args[j], XtNx, &windowX); j++; - XtSetArg(args[j], XtNy, &windowY); j++; - XtSetArg(args[j], XtNheight, &windowH); j++; - XtSetArg(args[j], XtNwidth, &windowW); j++; - XtGetValues(shells[n], args, j); - wp[n]->x = windowX; - wp[n]->x = windowY; - wp[n]->width = windowW; - wp[n]->height = windowH; + GetActualPlacement(shells[n], wp[n]); } -#endif - + gtk_widget_hide(shells[n]); shellUp[n]--; // count rather than clear @@ -736,7 +717,7 @@ gboolean GenericPopDown(w, resptype, gdata) #endif shells[dlg] = w; // make sure we pop down the right one in case of multiple instances - /* OK pressed */ + /* OK pressed */ if (resptype == GTK_RESPONSE_ACCEPT) { if (GenericReadout(currentOption, -1)) PopDown(dlg); return TRUE; @@ -751,11 +732,11 @@ gboolean GenericPopDown(w, resptype, gdata) } int AppendText(Option *opt, char *s) -{ +{ char *v; int len; - GtkTextIter end; - + GtkTextIter end; + GetWidgetTextGTK(opt->handle, &v); len = strlen(v); g_free(v); @@ -886,8 +867,8 @@ GraphExpose (Option *opt, int x, int y, int w, int h) void GenericCallback(GtkWidget *widget, gpointer gdata) { const gchar *name; - char buf[MSG_SIZ]; - int data = (intptr_t) gdata; + char buf[MSG_SIZ]; + int data = (intptr_t) gdata; DialogClass dlg; #ifdef TODO_GTK GtkWidget *sh = XtParent(XtParent(XtParent(w))), *oldSh; @@ -902,18 +883,18 @@ void GenericCallback(GtkWidget *widget, gpointer gdata) oldSh = shells[dlg]; shells[dlg] = sh; // bow to reality if (data == 30000) { // cancel - PopDown(dlg); + 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 if(currentCps) { - name = gtk_button_get_label (GTK_BUTTON(widget)); + name = gtk_button_get_label (GTK_BUTTON(widget)); if(currentOption[data].type == SaveButton) GenericReadout(currentOption, -1); snprintf(buf, MSG_SIZ, "option %s\n", name); SendToProgram(buf, currentCps); - } else ((ButtonCallback*) currentOption[data].target)(data); + } else ((ButtonCallback*) currentOption[data].target)(data); shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now) } @@ -926,7 +907,7 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata) GtkFileFilter *gtkfilter_all; int opt_i = (intptr_t) gdata; GtkFileChooserAction fc_action; - + gtkfilter = gtk_file_filter_new(); gtkfilter_all = gtk_file_filter_new(); @@ -949,11 +930,11 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata) 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); + 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); @@ -961,14 +942,14 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata) gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter); } else - gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(dialog),gtkfilter_all); + 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)); + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); entry = currentOption[opt_i].handle; - gtk_entry_set_text (GTK_ENTRY (entry), filename); + gtk_entry_set_text (GTK_ENTRY (entry), filename); g_free (filename); } @@ -1070,7 +1051,7 @@ static int SameRow (Option *opt) { return (opt->min & SAME_ROW && (opt->type == Button || opt->type == SaveButton || opt->type == Label - || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon)); + || opt->type == ListBox || opt->type == BoxBegin || opt->type == Icon || opt->type == Graph)); } static void @@ -1083,32 +1064,32 @@ Pack (GtkWidget *hbox, GtkWidget *table, GtkWidget *entry, int left, int right, int GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int topLevel) -{ +{ GtkWidget *dialog = NULL; gint w; GtkWidget *label; GtkWidget *box; GtkWidget *checkbutton; GtkWidget *entry; - GtkWidget *oldHbox, *hbox = NULL; + GtkWidget *oldHbox, *hbox = NULL; GtkWidget *pane = NULL; GtkWidget *button; GtkWidget *table; - GtkWidget *spinner; + GtkWidget *spinner; GtkAdjustment *spinner_adj; GtkWidget *combobox; GtkWidget *textview; - GtkTextBuffer *textbuffer; - GdkColor color; + GtkTextBuffer *textbuffer; + GdkColor color; GtkWidget *actionarea; - GtkWidget *sw; - GtkWidget *list; - GtkWidget *graph; - GtkWidget *menuButton; - GtkWidget *menuBar; - GtkWidget *menu; - - int i, j, arraysize, left, top, height=999, width=1, boxStart, breakType = 0, r; + GtkWidget *sw; + GtkWidget *list; + GtkWidget *graph; + GtkWidget *menuButton; + GtkWidget *menuBar; + GtkWidget *menu; + + int i, j, arraysize, left, top, height=999, width=1, boxStart, breakType = 0, r; char def[MSG_SIZ], *msg, engineDlg = (currentCps != NULL && dlgNr != BrowserDlg); if(dlgNr < PromoDlg && shellUp[dlgNr]) return 0; // already up @@ -1132,7 +1113,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent printf("n=%d, h=%d, w=%d\n",n,height,width); // if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line currentOption[n].type = EndMark; currentOption[n].target = NULL; // delimit list by callback-less end mark - } + } parents[dlgNr] = parent; #ifdef TODO_GTK @@ -1149,20 +1130,20 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); (modal ? GTK_DIALOG_MODAL : 0), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - NULL ); + NULL ); shells[dlgNr] = dialog; box = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) ); -// gtk_box_set_spacing(GTK_BOX(box), 5); +// gtk_box_set_spacing(GTK_BOX(box), 5); arraysize = 0; for (i=0;option[i].type != EndMark;i++) { - arraysize++; + arraysize++; } table = gtk_table_new(arraysize, r=TableWidth(option), FALSE); left = 0; - top = -1; + top = -1; for (i=0;option[i].type != EndMark;i++) { if(option[i].type == -1) continue; @@ -1181,12 +1162,12 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); gtk_box_pack_start (GTK_BOX (pane), table, TRUE, TRUE, 0); table = gtk_table_new(arraysize - i, r=TableWidth(option + i), FALSE); top = 0; - } + } if(!SameRow(&option[i])) { if(SameRow(&option[i+1])) { GtkAttachOptions x = GTK_FILL; // 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); + hbox = gtk_hbox_new (option[i].type == Button && option[i].textValue || option[i].type == Graph, 0); if(!currentCps && option[i].value > 80) x |= GTK_EXPAND; // only vertically extended widgets should size vertically if (strcmp(option[i].name, "") == 0 || option[i].type == Label || option[i].type == Button) // for Label and Button name is contained inside option @@ -1196,7 +1177,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); } else hbox = NULL; //and also make sure no hbox exists if only singl option on row } else top--; switch(option[i].type) { - case Fractional: + case Fractional: snprintf(def, MSG_SIZ, "%.2f", *(float*)option[i].target); option[i].value = *(float*)option[i].target; goto tBox; @@ -1204,7 +1185,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); if(!currentCps) option[i].value = *(int*)option[i].target; snprintf(def, MSG_SIZ, "%d", option[i].value); case TextBox: - case FileName: + case FileName: case PathName: tBox: label = gtk_label_new(option[i].name); @@ -1215,8 +1196,8 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); 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].value > 80){ - textview = gtk_text_view_new(); + if (option[i].type==TextBox && option[i].value > 80){ + textview = gtk_text_view_new(); 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++; } @@ -1229,9 +1210,10 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); 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); - - textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); - /* check if label is empty */ + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT); + + textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); + /* check if label is empty */ if (strcmp(option[i].name,"") != 0) { gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1); Pack(hbox, table, sw, left+1, left+r, top, 0); @@ -1239,11 +1221,11 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); else { /* no label so let textview occupy all columns */ Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND); - } + } 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); + 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 @@ -1251,7 +1233,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); 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; + break; } entry = gtk_entry_new(); @@ -1261,7 +1243,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); else if (currentCps) gtk_entry_set_text (GTK_ENTRY (entry), option[i].textValue); else if ( *(char**)option[i].target != NULL ) - gtk_entry_set_text (GTK_ENTRY (entry), *(char**)option[i].target); + gtk_entry_set_text (GTK_ENTRY (entry), *(char**)option[i].target); //gtk_entry_set_width_chars (GTK_ENTRY (entry), 18); gtk_entry_set_max_length (GTK_ENTRY (entry), w); @@ -1270,7 +1252,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); if (strcmp(option[i].name, "") != 0) gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // leading names do not expand - if (option[i].type == Spin) { + if (option[i].type == Spin) { spinner_adj = (GtkAdjustment *) gtk_adjustment_new (option[i].value, option[i].min, option[i].max, 1.0, 0.0, 0.0); spinner = gtk_spin_button_new (spinner_adj, 1.0, 0); gtk_table_attach(GTK_TABLE(table), spinner, left+1, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1); @@ -1281,26 +1263,26 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); button = gtk_button_new_with_label ("Browse"); gtk_table_attach(GTK_TABLE(table), button, left+2, left+r, top, top+1, GTK_FILL, GTK_FILL, 2, 1); // Browse button does not expand g_signal_connect (button, "clicked", G_CALLBACK (BrowseGTK), (gpointer)(intptr_t) i); - option[i].handle = (void*)entry; + option[i].handle = (void*)entry; } else { Pack(hbox, table, entry, left + (strcmp(option[i].name, "") != 0), left+r, top, 0); option[i].handle = (void*)entry; - } + } break; case CheckBox: - checkbutton = gtk_check_button_new_with_label(option[i].name); + checkbutton = gtk_check_button_new_with_label(option[i].name); if(!currentCps) option[i].value = *(Boolean*)option[i].target; gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbutton), option[i].value); gtk_table_attach(GTK_TABLE(table), checkbutton, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 0); - option[i].handle = (void *)checkbutton; - break; - case Icon: + option[i].handle = (void *)checkbutton; + break; + case Icon: option[i].handle = (void *) (label = gtk_image_new_from_pixbuf(NULL)); gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1); Pack(hbox, table, label, left, left+2, top, 0); - break; - case Label: + break; + case Label: option[i].handle = (void *) (label = gtk_label_new(option[i].name)); /* Left Justify */ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -1310,11 +1292,15 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); label = frame; } gtk_widget_set_size_request(label, option[i].max ? option[i].max : -1, -1); - Pack(hbox, table, label, left, left+2, top, 0); if(option[i].target) { // allow user to specify event handler for button presses + button = gtk_event_box_new(); + gtk_container_add(GTK_CONTAINER(button), label); + label = button; gtk_widget_add_events(GTK_WIDGET(label), GDK_BUTTON_PRESS_MASK); g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]); + gtk_widget_set_sensitive(label, TRUE); } + Pack(hbox, table, label, left, left+2, top, 0); break; case SaveButton: case Button: @@ -1331,47 +1317,47 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); gdk_color_parse( option[i].textValue, &color ); gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color ); gtk_widget_set_sensitive(button, appData.noChessProgram || option[i].value < 0 - || strstr(first.variants, VariantName(option[i].value))); + || strstr(first.variants, VariantName(option[i].value))); } - + Pack(hbox, table, button, left, left+1, top, 0); - g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16)); - option[i].handle = (void*)button; - break; + g_signal_connect (button, "clicked", G_CALLBACK (GenericCallback), (gpointer)(intptr_t) i + (dlgNr<<16)); + option[i].handle = (void*)button; + break; case ComboBox: label = gtk_label_new(option[i].name); /* Left Justify */ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_table_attach(GTK_TABLE(table), label, left, left+1, top, top+1, GTK_FILL, GTK_FILL, 2, 1); - combobox = gtk_combo_box_new_text(); + combobox = gtk_combo_box_new_text(); for(j=0;;j++) { if ( ((char **) option[i].textValue)[j] == NULL) break; - gtk_combo_box_append_text(GTK_COMBO_BOX(combobox), ((char **) option[i].choice)[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 { - for(j=0; option[i].choice[j]; j++) { + for(j=0; option[i].choice[j]; j++) { 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 = 0; - else + else option[i].value = j; } - //option[i].value = j + (option[i].choice[j] == NULL); - gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value); - + //option[i].value = j + (option[i].choice[j] == NULL); + gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), option[i].value); + Pack(hbox, table, combobox, left+1, left+r, top, 0); g_signal_connect(G_OBJECT(combobox), "changed", G_CALLBACK(ComboSelect), (gpointer) (intptr_t) (i + 256*dlgNr)); option[i].handle = (void*)combobox; - values[i] = option[i].value; + values[i] = option[i].value; break; case ListBox: { @@ -1395,7 +1381,8 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); 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), option[i].max ? option[i].max : -1, option[i].value ? option[i].value : -1); - + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_OUT); + if(option[i].textValue) // generic callback for double-clicking listbox item g_signal_connect(list, "button-press-event", G_CALLBACK(ListCallback), (gpointer) (dlgNr<<16 | i) ); @@ -1415,9 +1402,9 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); 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]); - if(0) { - GtkWidget *frame = gtk_aspect_frame_new(NULL, 0, 0, 1, FALSE); -// gtk_frame_set_shadow_type(frame, GTK_SHADOW_NONE); + if(option[i].min & FIX_H) { // logo + GtkWidget *frame = gtk_aspect_frame_new(NULL, 0.5, 0.5, option[i].max/(float)option[i].value, FALSE); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); gtk_container_add(GTK_CONTAINER(frame), graph); graph = frame; } @@ -1462,7 +1449,7 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); case BarEnd: top--; gtk_table_attach(GTK_TABLE(table), menuBar, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1); - + if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions break; case BoxEnd: @@ -1474,15 +1461,15 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); case Break: breakType = option[i].min & SAME_ROW; top = height; // force next option to start in a new table - break; + break; case PopUp: top--; - break; + break; default: printf("GenericPopUp: unexpected case in switch. i=%d type=%d name=%s.\n", i, option[i].type, option[i].name); break; - } + } } if(pane) @@ -1493,13 +1480,17 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); option[i].handle = (void *) table; // remember last table in EndMark handle (for hiding Engine-Output pane). + gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_NONE); /* Show dialog */ - gtk_widget_show_all( dialog ); + gtk_widget_show_all( dialog ); /* hide OK/cancel buttons */ - if((option[i].min & 2)) { + if((option[i].min & NO_OK)) { actionarea = gtk_dialog_get_action_area(GTK_DIALOG(dialog)); gtk_widget_hide(actionarea); + } else if((option[i].min & NO_CANCEL)) { + button = gtk_dialog_get_widget_for_response(GTK_DIALOG(dialog), GTK_RESPONSE_REJECT); + gtk_widget_hide(button); } g_signal_connect (dialog, "response", @@ -1510,6 +1501,13 @@ printf("n=%d, h=%d, w=%d\n",n,height,width); (gpointer)(intptr_t) dlgNr); shellUp[dlgNr]++; + if(dlgNr && wp[dlgNr] && wp[dlgNr]->width > 0) { // if persistent window-info available, reposition + gtk_window_move(GTK_WINDOW(dialog), wp[dlgNr]->x, wp[dlgNr]->y); +//printf("moved %d to (%d,%d)\n", dlgNr, wp[dlgNr]->x, wp[dlgNr]->y); + gtk_window_resize(GTK_WINDOW(dialog), wp[dlgNr]->width, wp[dlgNr]->height); +//printf("resized %d to %dx%d\n", dlgNr, wp[dlgNr]->width, wp[dlgNr]->height); + } + return 1; // tells caller he must do initialization (e.g. add specific event handlers) } @@ -1561,9 +1559,5 @@ SetInsertPos (Option *opt, int pos) void HardSetFocus (Option *opt) { -#ifdef TODO_GTK - XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime); -#endif + FocusOnWidget(opt, 0); // second arg not used in GDK } - -