X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=b771b4d1d187958bcbfdd4db2117f16d5051d3d2;hb=0a3919ff10a347a8d840f75fd2c816efe52e5098;hp=08e18a0afb6d487e4fde2b10436e04050a9f39cb;hpb=96ff56c42122f376e9e6a1324c168dc949c3dc33;p=xboard.git diff --git a/xoptions.c b/xoptions.c index 08e18a0..b771b4d 100644 --- a/xoptions.c +++ b/xoptions.c @@ -47,30 +47,14 @@ extern char *getenv(); #endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include "common.h" #include "backend.h" #include "xboard.h" +#include "xboard2.h" #include "dialogs.h" #include "menus.h" #include "gettext.h" @@ -85,12 +69,16 @@ extern char *getenv(); // [HGM] the following code for makng menu popups was cloned from the FileNamePopUp routines +#ifdef TODO_GTK static Widget previous = NULL; +#endif static Option *currentOption; +static Boolean browserUp; void UnCaret () { +#ifdef TODO_GTK Arg args[2]; if(previous) { @@ -98,8 +86,10 @@ UnCaret () XtSetValues(previous, args, 1); } previous = NULL; +#endif } +#ifdef TODO_GTK void SetFocus (Widget w, XtPointer data, XEvent *event, Boolean *b) { @@ -117,11 +107,14 @@ SetFocus (Widget w, XtPointer data, XEvent *event, Boolean *b) XtSetKeyboardFocus((Widget) data, w); previous = w; } +#endif void BoardFocus () { +#ifdef TODO_GTK XtSetKeyboardFocus(shellWidget, formWidget); +#endif } //--------------------------- Engine-specific options menu ---------------------------------- @@ -129,6 +122,7 @@ BoardFocus () int dialogError; Option *dialogOptions[NrOfDialogs]; +#ifdef TODO_GTK static Arg layoutArgs[] = { { XtNborderWidth, 0 }, { XtNdefaultDistance, 0 }, @@ -138,67 +132,155 @@ static Arg formArgs[] = { { XtNborderWidth, 0 }, { XtNresizable, (XtArgVal) True }, }; +#endif + +void +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); + } +#endif +} + +void GetWidgetTextGTK(GtkWidget *w, char **buf) +{ + GtkTextIter start; + GtkTextIter end; + + 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); + *buf = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(w), &start, &end, FALSE); + } + else { + printf("error in GetWidgetText, invalid widget\n"); + *buf = NULL; + } +} void GetWidgetText (Option *opt, char **buf) { - Arg arg; - XtSetArg(arg, XtNstring, buf); - XtGetValues(opt->handle, &arg, 1); + int x; + static char val[12]; + switch(opt->type) { + case Fractional: + case FileName: + case PathName: + case TextBox: GetWidgetTextGTK((GtkWidget *) opt->handle, buf); break; + case Spin: + x = gtk_spin_button_get_value (GTK_SPIN_BUTTON(opt->handle)); + snprintf(val, 12, "%d", x); *buf = val; + break; + default: + printf("unexpected case (%d) in GetWidgetText\n", opt->type); + *buf = NULL; + } +} + +void SetSpinValue(Option *opt, int val, int n) +{ + if (opt->type == Spin) + { + if (val == -1) + gtk_widget_set_sensitive(opt->handle, FALSE); + else + { + gtk_widget_set_sensitive(opt->handle, TRUE); + gtk_spin_button_set_value(opt->handle, val); + } + } + else + printf("error in SetSpinValue, unknown type %d\n", opt->type); +} + +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); } void SetWidgetText (Option *opt, char *buf, int n) { - Arg arg; - XtSetArg(arg, XtNstring, buf); - XtSetValues(opt->handle, &arg, 1); + switch(opt->type) { + case Fractional: + case FileName: + case PathName: + case TextBox: SetWidgetTextGTK((GtkWidget *) opt->handle, buf); break; + case Spin: SetSpinValue(opt, atoi(buf), n); break; + default: + printf("unexpected case (%d) in GetWidgetText\n", opt->type); + } +#ifdef TODO_GTK +// focus is automatic in GTK? if(n >= 0) SetFocus(opt->handle, shells[n], NULL, False); +#endif } void GetWidgetState (Option *opt, int *state) { +#ifdef TODO_GTK Arg arg; XtSetArg(arg, XtNstate, state); XtGetValues(opt->handle, &arg, 1); +#endif } void SetWidgetState (Option *opt, int state) { +#ifdef TODO_GTK Arg arg; XtSetArg(arg, XtNstate, state); XtSetValues(opt->handle, &arg, 1); +#endif } void SetWidgetLabel (Option *opt, char *buf) { +#ifdef TODO_GTK Arg arg; XtSetArg(arg, XtNlabel, (XtArgVal) buf); XtSetValues(opt->handle, &arg, 1); +#endif } void SetDialogTitle (DialogClass dlg, char *title) { +#ifdef TODO_GTK Arg args[16]; XtSetArg(args[0], XtNtitle, title); XtSetValues(shells[dlg], args, 1); +#endif } void -LoadListBox (Option *opt, char *emptyText) +LoadListBox (Option *opt, char *emptyText, int n1, int n2) { +#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 } 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"); @@ -209,12 +291,14 @@ ReadScroll (Option *opt, float *top, float *bottom) XtSetArg(args[j], XtNtopOfThumb, top); j++; XtGetValues(v, args, j); *bottom = *top + h; +#endif return TRUE; } 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 @@ -225,17 +309,21 @@ SetScroll (Option *opt, float f) XtCallActionProc(v, "NotifyThumb", &event, params, 0); // XtCallActionProc(v, "NotifyScroll", &event, params+2, 1); XtCallActionProc(v, "EndScroll", &event, params, 0); +#endif } void HighlightListBoxItem (Option *opt, int nr) { +#ifdef TODO_GTK XawListHighlight(opt->handle, nr); +#endif } void HighlightWithScroll (Option *opt, int sel, int max) { +#ifdef TODO_GTK float top, bottom, f, g; HighlightListBoxItem(opt, sel); if(!ReadScroll(opt, &top, &bottom)) return; // no scroll bar @@ -246,33 +334,43 @@ HighlightWithScroll (Option *opt, int sel, int max) 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 } int SelectedListBoxItem (Option *opt) { +#ifdef TODO_GTK XawListReturnStruct *rs; rs = XawListShowCurrent(opt->handle); return rs->list_index; +#else + return 0; +#endif } void FocusOnWidget (Option *opt, DialogClass dlg) { UnCaret(); +#ifdef TODO_GTK XtSetKeyboardFocus(shells[dlg], opt->handle); +#endif } void SetIconName (DialogClass dlg, char *name) { +#ifdef TODO_GTK Arg args[16]; int j = 0; XtSetArg(args[j], XtNiconName, (XtArgVal) name); j++; // XtSetArg(args[j], XtNtitle, (XtArgVal) name); j++; XtSetValues(shells[dlg], args, j); +#endif } +#ifdef TODO_GTK static void CheckCallback (Widget ww, XtPointer client_data, XEvent *event, Boolean *b) { @@ -284,7 +382,9 @@ CheckCallback (Widget ww, XtPointer client_data, XEvent *event, Boolean *b) GetWidgetState(opt, &s); SetWidgetState(opt, !s); } +#endif +#ifdef TODO_GTK static void SpinCallback (Widget w, XtPointer client_data, XtPointer call_data) { @@ -317,30 +417,28 @@ SpinCallback (Widget w, XtPointer client_data, XtPointer call_data) snprintf(buf, MSG_SIZ, "%d", j); SetWidgetText(opt, buf, TransientDlg); } +#endif -static void -ComboSelect (Widget w, caddr_t addr, caddr_t index) // callback for all combo items +void ComboSelect(GtkWidget *widget, gpointer addr) { - Arg args[16]; - Option *opt = dialogOptions[((intptr_t)addr)>>24]; // applicable option list - int i = ((intptr_t)addr)>>16 & 255; // option number - int j = 0xFFFF & (intptr_t) addr; + Option *opt = dialogOptions[((intptr_t)addr)>>8]; // applicable option list + gint i = ((intptr_t)addr) & 255; // option number + gint g; - values[i] = j; // store selected value in Option struct, for retrieval at OK + g = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + values[i] = g; // store in temporary, for transfer at OK +#if TODO_GTK +// Note: setting text on button is probably automatic +// Is this still needed? Could be all comboboxes that needed a callbak are now listboxes! +#endif if(opt[i].type == Graph || opt[i].min & COMBO_CALLBACK && (!currentCps || shellUp[BrowserDlg])) { ((ButtonCallback*) opt[i].target)(i); return; } - - if(opt[i].min & NO_GETTEXT) - XtSetArg(args[0], XtNlabel, ((char**)opt[i].choice)[j]); - else - XtSetArg(args[0], XtNlabel, _(((char**)opt[i].choice)[j])); - - XtSetValues(opt[i].handle, args, 1); } +#ifdef TODO_GTK Widget CreateMenuItem (Widget menu, char *msg, XtCallbackProc CB, int n) { @@ -355,7 +453,9 @@ CreateMenuItem (Widget menu, char *msg, XtCallbackProc CB, int n) XtAddCallback(entry, XtNcallback, CB, (caddr_t)(intptr_t) n); return entry; } +#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 @@ -381,6 +481,52 @@ CreateComboPopup (Widget parent, Option *opt, int n, int fromList, int def) } return menu; } +#else +static void +MenuSelect (gpointer addr) // callback for all combo items +{ + Option *opt = dialogOptions[((intptr_t)addr)>>24]; // applicable option list + int i = ((intptr_t)addr)>>16 & 255; // option number + int j = 0xFFFF & (intptr_t) addr; + + values[i] = j; // store selected value in Option struct, for retrieval at OK + ((ButtonCallback*) opt[i].target)(i); +} + +static GtkWidget * +CreateMenuPopup (Option *opt, int n, int def) +{ // fromList determines if the item texts are taken from a list of strings, or from a menu table + int i; + GtkWidget *menu, *entry; + MenuItem *mb = (MenuItem *) opt->choice; + + menu = gtk_menu_new(); +// menu = XtCreatePopupShell(opt->name, simpleMenuWidgetClass, parent, NULL, 0); + for (i=0; 1; i++) + { + char *msg = mb[i].string; + if(!msg) break; + 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 + if(mb[i].handle == RADIO) gtk_check_menu_item_set_draw_as_radio(entry, True); + } else + entry = gtk_menu_item_new_with_label(msg); + gtk_signal_connect_object (GTK_OBJECT (entry), "activate", GTK_SIGNAL_FUNC(MenuSelect), (gpointer) (n<<16)+i); + gtk_widget_show(entry); + } else entry = gtk_separator_menu_item_new(); + gtk_menu_append(GTK_MENU (menu), entry); +//CreateMenuItem(menu, opt->min & NO_GETTEXT ? msg : _(msg), (XtCallbackProc) ComboSelect, (n<<16)+i); + mb[i].handle = (void*) entry; // save item ID, for enabling / checkmarking +// if(i==def) { +// XtSetArg(arg, XtNpopupOnEntry, entry); +// XtSetValues(menu, &arg, 1); +// } + } + return menu; +} +#endif char moveTypeInTranslations[] = "Return: TypeInProc(1) \n" @@ -398,18 +544,20 @@ char *translationTable[] = { // beware: order is essential! void AddHandler (Option *opt, int nr) { +#ifdef TODO_GTK XtOverrideTranslations(opt->handle, XtParseTranslationTable(translationTable[nr])); +#endif } //----------------------------Generic dialog -------------------------------------------- // cloned from Engine Settings dialog (and later merged with it) -Widget shells[NrOfDialogs]; +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, /*&wpMain*/ NULL }; int @@ -421,6 +569,7 @@ DialogExists (DialogClass n) void RaiseWindow (DialogClass dlg) { +#ifdef TODO_GTK static XEvent xev; Window root = RootWindow(xDisplay, DefaultScreen(xDisplay)); Atom atom = XInternAtom (xDisplay, "_NET_ACTIVE_WINDOW", False); @@ -442,15 +591,41 @@ RaiseWindow (DialogClass dlg) XFlush(xDisplay); XSync(xDisplay, False); +#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) -{ // pops down any dialog created by GenericPopUp (or returns False if it wasn't up), unmarks any associated marked menu - int j; - Arg args[10]; - Dimension windowH, windowW; Position windowX, windowY; - if (!shellUp[n] || !shells[n]) return 0; +{ + //Arg args[10]; + + if (!shellUp[n] || !shells[n]) return 0; +#ifdef TODO_GTK +// Not sure this is still used if(n && wp[n]) { // remember position j = 0; XtSetArg(args[j], XtNx, &windowX); j++; @@ -463,48 +638,73 @@ PopDown (DialogClass n) wp[n]->width = windowW; wp[n]->height = windowH; } - previous = NULL; - XtPopdown(shells[n]); +#endif + + gtk_widget_hide(shells[n]); shellUp[n]--; // count rather than clear - if(n == 0 || n >= PromoDlg) XtDestroyWidget(shells[n]), shells[n] = NULL; + 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; } - if(!n && n != BrowserDlg) currentCps = NULL; // if an Engine Settings dialog was up, we must be popping it down now +#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) - RaiseWindow(parents[n]); - if(parents[n] == BoardWindow) XtSetKeyboardFocus(shellWidget, formWidget); +#ifdef TODO_GTK + RaiseWindow(parents[n]); // automatic in GTK? + if(parents[n] == BoardWindow) XtSetKeyboardFocus(shellWidget, formWidget); // also automatic??? +#endif return 1; } -void -GenericPopDown (Widget w, XEvent *event, String *prms, Cardinal *nprms) -{ // to cause popdown through a translation (Delete Window button!) - int dlg = atoi(prms[0]); - Widget sh = shells[dlg]; +gboolean GenericPopDown(w, event, gdata) + GtkWidget *w; + GdkEvent *event; + gpointer gdata; +{ + int dlg = (intptr_t) gdata; /* dialog number dlgnr */ + +#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 - shells[dlg] = w; +#else + if(browserUp || dialogError) return True; // prevent closing dialog when it has an open file-browse 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); shells[dlg] = sh; // restore + if(dlg == BoardWindow) ExitEvent(0); + return True; /* don't propagate to default handler */ } -int -AppendText (Option *opt, char *s) -{ - XawTextBlock t; +int AppendText(Option *opt, char *s) +{ char *v; int len; - GetWidgetText(opt, &v); + GtkTextIter end; + + GetWidgetTextGTK(opt->handle, &v); len = strlen(v); - t.ptr = s; t.firstPos = 0; t.length = strlen(s); t.format = XawFmt8Bit; - XawTextReplace(opt->handle, len, len, &t); + g_free(v); + gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(opt->handle), &end); + gtk_text_buffer_insert(opt->handle, &end, s, -1); + return len; } void SetColor (char *colorName, Option *box) { // sets the color of a widget +#ifdef TODO_GTK Arg args[5]; Pixel buttonColor; XrmValue vFrom, vTo; @@ -520,8 +720,10 @@ SetColor (char *colorName, Option *box) } else buttonColor = timerBackgroundPixel; XtSetArg(args[0], XtNbackground, buttonColor);; XtSetValues(box->handle, args, 1); +#endif } +#ifdef TODO_GTK void ColorChanged (Widget w, XtPointer data, XEvent *event, Boolean *b) { // for detecting a typed change in color @@ -529,25 +731,52 @@ ColorChanged (Widget w, XtPointer data, XEvent *event, Boolean *b) if ( (XLookupString(&(event->xkey), buf, 2, NULL, NULL) == 1) && *buf == '\r' ) RefreshColor((int)(intptr_t) data, 0); } +#endif +#ifdef TODO_GTK static void GraphEventProc(Widget widget, caddr_t client_data, XEvent *event) { // handle expose and mouse events on Graph widget Dimension w, h; Arg args[16]; - int j, button=10, f=1; - Option *opt; + int j, button=10, f=1, sizing=0; + Option *opt, *graph = (Option *) client_data; + PointerCallback *userHandler = graph->target; + if (!XtIsRealized(widget)) return; switch(event->type) { - case Expose: - if (((XExposeEvent*)event)->count > 0) return; // don't bother if further exposure is pending - /* Get client area */ + case Expose: // make handling of expose events generic, just copying from memory buffer (->choice) to display (->textValue) + /* Get window size */ j = 0; XtSetArg(args[j], XtNwidth, &w); j++; XtSetArg(args[j], XtNheight, &h); j++; XtGetValues(widget, args, j); - break; + + if(w < graph->max || w > graph->max + 1 || h != graph->value) { // use width fudge of 1 pixel + if(((XExposeEvent*)event)->count >= 0) { // suppress sizing on expose for ordered redraw in response to sizing. + sizing = 1; + graph->max = w; graph->value = h; // note: old values are kept if we we don't exceed width fudge + } + } else w = graph->max; + + if(sizing && ((XExposeEvent*)event)->count > 0) { graph->max = 0; return; } // don't bother if further exposure is pending during resize + if(!graph->textValue || sizing) { // create surfaces of new size for display widget + if(graph->textValue) cairo_surface_destroy((cairo_surface_t *)graph->textValue); + graph->textValue = (char*) cairo_xlib_surface_create(xDisplay, XtWindow(widget), DefaultVisual(xDisplay, 0), w, h); + } + if(sizing) { // the memory buffer was already created in GenericPopup(), + // to give drawing routines opportunity to use it before first expose event + // (which are only processed when main gets to the event loop, so after all init!) + // so only change when size is no longer good + if(graph->choice) cairo_surface_destroy((cairo_surface_t *) graph->choice); + graph->choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, w, h); + break; + } + w = ((XExposeEvent*)event)->width; + if(((XExposeEvent*)event)->x + w > graph->max) w--; // cut off fudge pixel + if(w) ExposeRedraw(graph, ((XExposeEvent*)event)->x, ((XExposeEvent*)event)->y, w, ((XExposeEvent*)event)->height); + return; case MotionNotify: f = 0; w = ((XButtonEvent*)event)->x; h = ((XButtonEvent*)event)->y; @@ -565,7 +794,7 @@ GraphEventProc(Widget widget, caddr_t client_data, XEvent *event) } } button *= f; - opt = ((PointerCallback*) client_data)(button, w, h); + opt = userHandler(button, w, h); if(opt) { // user callback specifies a context menu; pop it up XUngrabPointer(xDisplay, CurrentTime); XtCallActionProc(widget, "XawPositionSimpleMenu", event, &(opt->name), 1); @@ -573,37 +802,78 @@ GraphEventProc(Widget widget, caddr_t client_data, XEvent *event) } XSync(xDisplay, False); } +#endif -static void -GenericCallback (Widget w, XtPointer client_data, XtPointer call_data) -{ // all Buttons in a dialog (including OK, cancel) invoke this - String name; - Arg args[16]; - char buf[MSG_SIZ]; - int data = (intptr_t) client_data; +void +GraphExpose (Option *opt, int x, int y, int w, int h) +{ +#ifdef TODO_GTK + XExposeEvent e; + if(!opt->handle) return; + e.x = x; e.y = y; e.width = w; e.height = h; e.count = -1; e.type = Expose; // count = -1: kludge to suppress sizing + GraphEventProc(opt->handle, (caddr_t) opt, (XEvent *) &e); // fake expose event +#endif +} + +/* 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; - Widget sh = XtParent(XtParent(XtParent(w))), oldSh; 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); +} + +void GenericCallback(GtkWidget *widget, gpointer gdata) +{ + const gchar *name; + char buf[MSG_SIZ]; + int data = (intptr_t) gdata; + DialogClass dlg; +#ifdef TODO_GTK + GtkWidget *sh = XtParent(XtParent(XtParent(w))), *oldSh; +#else + GtkWidget *sh, *oldSh; +#endif + + currentOption = dialogOptions[dlg=data>>16]; data &= 0xFFFF; +#ifndef TODO_GTK + 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 && dlg != BrowserDlg) { - XtSetArg(args[0], XtNlabel, &name); - XtGetValues(w, args, 1); + if(currentCps) { + 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); + snprintf(buf, MSG_SIZ, "option %s\n", name); + SendToProgram(buf, currentCps); + } else ((ButtonCallback*) currentOption[data].target)(data); shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now) } +#ifdef TODO_GTK void TabProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { // for transfering focus to the next text-edit @@ -621,7 +891,9 @@ TabProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) } } } +#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!) @@ -648,6 +920,7 @@ WheelProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) // XtCallActionProc(w, "NotifyScroll", event, params+2, 1); XtCallActionProc(v, "EndScroll", event, params, 0); } +#endif static char *oneLiner = "Return: redraw-display() \n \ @@ -660,6 +933,7 @@ static char scrollTranslations[] = static void SqueezeIntoBox (Option *opt, int nr, int width) { // size buttons in bar to fit, clipping button names where necessary +#ifdef TODO_GTK int i, wtot = 0; Dimension widths[20], oldWidths[20]; Arg arg; @@ -681,8 +955,10 @@ SqueezeIntoBox (Option *opt, int nr, int width) XtSetValues(opt[i].handle, &arg, 1); } opt->min = wtot; +#endif } +#ifdef TODO_GTK int SetPositionAndSize (Arg *args, Widget leftNeigbor, Widget topNeigbor, int b, int w, int h, int chaining) { // sizing and positioning most widgets have in common @@ -709,16 +985,398 @@ SetPositionAndSize (Arg *args, Widget leftNeigbor, Widget topNeigbor, int b, int if(!appData.monoMode) { if(!b && appData.dialogColor[0]) XtSetArg(args[j], XtNbackground, dialogColor), j++; if(b == 3 && appData.buttonColor[0]) XtSetArg(args[j], XtNbackground, buttonColor), j++; - if(b == 3) b = 1; } + if(b == 3) b = 1; // border XtSetArg(args[j], XtNborderWidth, b); j++; return j; } +#endif int -GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent, int modal, int top) -{ +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 *hbox; + GtkWidget *button; + GtkWidget *table; + GtkWidget *spinner; + GtkAdjustment *spinner_adj; + GtkWidget *combobox; + GtkWidget *textview; + 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; + 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) + gtk_widget_show(shells[dlgNr]); + shellUp[dlgNr] = True; + return 0; + } + + dialogOptions[dlgNr] = option; // make available to callback + // post currentOption globally, so Spin and Combo callbacks can already use it + // WARNING: this kludge does not work for persistent dialogs, so that these cannot have spin or combo controls! + currentOption = option; + + if(engineDlg) { // Settings popup for engine: format through heuristic + int n = currentCps->nrOptions; + if(n > 50) width = 4; else if(n>24) width = 2; else width = 1; + height = n / width + 1; +// 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 + } + +#ifdef TODO_GTK + i = 0; + XtSetArg(args[i], XtNresizable, True); i++; + shells[BoardWindow] = shellWidget; parents[dlgNr] = parent; + + if(dlgNr == BoardWindow) dialog = shellWidget; else + dialog = + XtCreatePopupShell(title, !top || !appData.topLevel ? transientShellWidgetClass : topLevelShellWidgetClass, + shells[parent], args, i); +#endif + dialog = gtk_dialog_new_with_buttons( title, + NULL, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR | + (modal ? GTK_DIALOG_MODAL : 0), + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, + NULL ); + + shells[dlgNr] = dialog; + box = gtk_dialog_get_content_area( GTK_DIALOG( dialog ) ); + gtk_box_set_spacing(GTK_BOX(box), 5); + + arraysize = 0; + for (i=0;option[i].type != EndMark;i++) { + arraysize++; + } + + table = gtk_table_new(arraysize, 3, FALSE); + gtk_table_set_col_spacings(GTK_TABLE(table), 20); + left = 0; + top = -1; + + for (i=0;option[i].type != EndMark;i++) { + if(option[i].type == -1) continue; + top++; + if (top >= height) { + top = 0; + left = left + 3; + gtk_table_resize(GTK_TABLE(table), height, left + 3); + } + switch(option[i].type) { + case Fractional: + snprintf(def, MSG_SIZ, "%.2f", *(float*)option[i].target); + option[i].value = *(float*)option[i].target; + goto tBox; + case Spin: + if(!currentCps) option[i].value = *(int*)option[i].target; + snprintf(def, MSG_SIZ, "%d", option[i].value); + case TextBox: + case FileName: + case PathName: + tBox: + label = gtk_label_new(option[i].name); + /* Left Justify */ + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + + /* 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].min > 80){ + textview = gtk_text_view_new(); + gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD); + /* 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_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)); + gtk_widget_set_size_request(textview, -1, option[i].min); + /* 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); + } + else { + /* no label so let textview occupy all columns */ + gtk_table_attach_defaults(GTK_TABLE(table), sw, left, left+3, top, top+1); + } + 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; + break; + } + + entry = gtk_entry_new(); + + if (option[i].type==Spin || option[i].type==Fractional) + gtk_entry_set_text (GTK_ENTRY (entry), def); + 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_width_chars (GTK_ENTRY (entry), 18); + gtk_entry_set_max_length (GTK_ENTRY (entry), w); + + // left, right, top, bottom + 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), entry, 1, 2, i, i+1); + + 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_defaults(GTK_TABLE(table), spinner, left+1, left+3, top, top+1); + option[i].handle = (void*)spinner; + } + else if (option[i].type == FileName || option[i].type == PathName) { + 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); + 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); + option[i].handle = (void*)entry; + } + break; + case CheckBox: + 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_defaults(GTK_TABLE(table), checkbutton, left, left+3, top, top+1); + option[i].handle = (void *)checkbutton; + break; + case Label: + 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); + break; + case SaveButton: + case Button: + button = gtk_button_new_with_label (option[i].name); + + /* set button color on view board dialog */ + if(option[i].choice && ((char*)option[i].choice)[0] == '#' && !currentCps) { + gdk_color_parse( *(char**) option[i-1].target, &color ); + gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color ); + } + + /* set button color on new variant dialog */ + if(option[i].textValue) { + 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))); + } + + 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); + 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_defaults(GTK_TABLE(table), label, left, left+1, top, top+1); + + 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].textValue)[j]); + } + + if(currentCps) + option[i].choice = (char**) option[i].textValue; + 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 choice is NULL set to first */ + if (option[i].choice[j] == NULL) + option[i].value = 0; + 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); + + + 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); + + 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; + break; + case ListBox: + { + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + GtkListStore *store; + + option[i].handle = (void *) (list = gtk_tree_view_new()); + gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE); + renderer = gtk_cell_renderer_text_new(); + column = gtk_tree_view_column_new_with_attributes("List Items", renderer, "text", 0, NULL); + gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); + store = gtk_list_store_new(1, G_TYPE_STRING); // 1 column of text + gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store)); + g_object_unref(store); + LoadListBox(&option[i], "?", -1, -1); + HighlightListBoxItem(&option[i], 0); + + /* add listbox 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_AUTOMATIC); + gtk_container_add(GTK_CONTAINER(sw), list); + 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); + } + break; + case Graph: + option[i].handle = (void*) (graph = gtk_drawing_area_new()); + gtk_widget_set_size_request(graph, option[i].max, option[i].value); + gtk_table_attach_defaults(GTK_TABLE(table), graph, left, left+3, top, top+1); + +#ifdef TODO_GTK + XtAddEventHandler(last, ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, False, + (XtEventHandler) GraphEventProc, &option[i]); // mandatory user-supplied expose handler + if(option[i].min & SAME_ROW) last = forelast, forelast = lastrow; +#endif + option[i].choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, option[i].max, option[i].value); // image buffer + break; +#ifdef TODO_GTK + case Graph: + j = SetPositionAndSize(args, last, lastrow, 0 /* border */, + option[i].max /* w */, option[i].value /* h */, option[i].min /* chain */); + option[i].handle = (void*) + (last = XtCreateManagedWidget("graph", widgetClass, form, args, j)); + XtAddEventHandler(last, ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, False, + (XtEventHandler) GraphEventProc, &option[i]); // mandatory user-supplied expose handler + if(option[i].min & SAME_ROW) last = forelast, forelast = lastrow; + option[i].choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, option[i].max, option[i].value); // image buffer + break; + case PopUp: // note: used only after Graph, so 'last' refers to the Graph widget + option[i].handle = (void*) CreateComboPopup(last, option + i, i + 256*dlgNr, TRUE, option[i].value); + break; + case BoxBegin: + if(option[i].min & SAME_ROW) forelast = lastrow; + j = SetPositionAndSize(args, last, lastrow, 0 /* border */, + 0 /* w */, 0 /* h */, option[i].min /* chain */); + XtSetArg(args[j], XtNorientation, XtorientHorizontal); j++; + XtSetArg(args[j], XtNvSpace, 0); j++; + option[box=i].handle = (void*) + (last = XtCreateWidget("box", boxWidgetClass, form, args, j)); + oldForm = form; form = last; oldLastRow = lastrow; oldForeLast = forelast; + lastrow = NULL; last = NULL; + break; +#endif + case DropDown: + msg = _(option[i].name); // write name on the menu button +// XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name)); j++; +// XtSetArg(args[j], XtNlabel, msg); j++; + option[i].handle = (void*) + (menuButton = gtk_menu_item_new_with_label(msg)); + gtk_widget_show(menuButton); + option[i].textValue = (char*) (menu = CreateMenuPopup(option + i, i + 256*dlgNr, -1)); + gtk_menu_item_set_submenu(GTK_MENU_ITEM (menuButton), menu); + gtk_menu_bar_append (GTK_MENU_BAR (menuBar), menuButton); + + break; + case BarBegin: + menuBar = gtk_menu_bar_new (); + gtk_widget_show (menuBar); + case BoxBegin: + boxStart = i; + break; + case BarEnd: + gtk_table_attach_defaults(GTK_TABLE(table), menuBar, left, left+1, top, top+1); + case BoxEnd: +// XtManageChildren(&form, 1); +// SqueezeIntoBox(&option[boxStart], i-boxStart, option[boxStart].max); + 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 + break; + default: + printf("GenericPopUp: unexpected case in switch. i=%d type=%d name=%s.\n", i, option[i].type, option[i].name); + break; + } + } + + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + table, TRUE, TRUE, 0); + + /* Show dialog */ + gtk_widget_show_all( dialog ); + + /* hide OK/cancel buttons */ + if((option[i].min & 2)) { + actionarea = gtk_dialog_get_action_area(GTK_DIALOG(dialog)); + gtk_widget_hide(actionarea); + } + + g_signal_connect (dialog, "response", + G_CALLBACK (GenericPopUpCallback), + (gpointer)(intptr_t) (dlgNr<<16 | i)); + g_signal_connect (dialog, "delete-event", + G_CALLBACK (GenericPopDown), + (gpointer)(intptr_t) dlgNr); + shellUp[dlgNr]++; + +#ifdef TODO_GTK Arg args[24]; Widget popup, layout, dialog=NULL, edit=NULL, form, last, b_ok, b_cancel, previousPane = NULL, textField = NULL, oldForm, oldLastRow, oldForeLast; Window root, child; @@ -744,7 +1402,6 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent if(engineDlg) { // Settings popup for engine: format through heuristic int n = currentCps->nrOptions; - if(!n) { DisplayNote(_("Engine has no options")); currentCps = NULL; return 0; } if(n > 50) width = 4; else if(n>24) width = 2; else width = 1; height = n / width + 1; if(n && (currentOption[n-1].type == Button || currentOption[n-1].type == SaveButton)) currentOption[n].min = SAME_ROW; // OK on same line @@ -965,8 +1622,9 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent option[i].handle = (void*) (last = XtCreateManagedWidget("graph", widgetClass, form, args, j)); XtAddEventHandler(last, ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask, False, - (XtEventHandler) GraphEventProc, option[i].target); // mandatory user-supplied expose handler + (XtEventHandler) GraphEventProc, &option[i]); // mandatory user-supplied expose handler if(option[i].min & SAME_ROW) last = forelast, forelast = lastrow; + option[i].choice = (char**) cairo_image_surface_create (CAIRO_FORMAT_ARGB32, option[i].max, option[i].value); // image buffer break; case PopUp: // note: used only after Graph, so 'last' refers to the Graph widget option[i].handle = (void*) CreateComboPopup(last, option + i, i + 256*dlgNr, TRUE, option[i].value); @@ -1113,11 +1771,12 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent XtSetValues(popup, args, j); } RaiseWindow(dlgNr); +#endif return 1; // tells caller he must do initialization (e.g. add specific event handlers) } - /* function called when the data to Paste is ready */ +#ifdef TODO_GTK static void SendTextCB (Widget w, XtPointer client_data, Atom *selection, Atom *type, XtPointer value, unsigned long *len, int *format) @@ -1131,10 +1790,12 @@ SendTextCB (Widget w, XtPointer client_data, Atom *selection, SendString(buf); XtFree(value); } +#endif void SendText (int n) { +#ifdef TODO_GTK char *p = (char*) textOptions[n].choice; if(strstr(p, "$name")) { XtGetSelectionValue(menuBarWidget, @@ -1144,18 +1805,22 @@ SendText (int n) CurrentTime ); } else SendString(p); +#endif } void SetInsertPos (Option *opt, int pos) { +#ifdef TODO_GTK Arg args[16]; XtSetArg(args[0], XtNinsertPosition, pos); XtSetValues(opt->handle, args, 1); // SetFocus(opt->handle, shells[InputBoxDlg], NULL, False); // No idea why this does not work, and the following is needed: // XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime); +#endif } +#ifdef TODO_GTK void TypeInProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { // can be used as handler for any text edit in any dialog (from GenericPopUp, that is) @@ -1168,11 +1833,14 @@ TypeInProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) GenericCallback (w, (XtPointer)(intptr_t) (30000 + n + (dlgNr<<16)), NULL); } } +#endif void HardSetFocus (Option *opt) { +#ifdef TODO_GTK XSetInputFocus(xDisplay, XtWindow(opt->handle), RevertToPointerRoot, CurrentTime); +#endif }