Move MarkMenuItem to xoptions.c

[xboard.git] / xoptions.c

diff --git a/xoptions.c b/xoptions.c
index 2446fb0..cd18a57 100644 (file)
--- a/xoptions.c
+++ b/xoptions.c
@@ -143,6 +143,18 @@ static Arg formArgs[] = {
 };
 
 void
+MarkMenuItem (char *menuRef, int state)
+{
+    MenuItem *item = MenuNameToItem(menuRef);
+
+    if(item) {
+       Arg args[2];
+       XtSetArg(args[0], XtNleftBitmap, state ? xMarkPixmap : None);
+       XtSetValues(item->handle, args, 1);
+    }
+}
+
+void
 GetWidgetText (Option *opt, char **buf)
 {
     Arg arg;
@@ -541,7 +553,6 @@ GraphEventProc(Widget widget, caddr_t client_data, XEvent *event)
     int j, button=10, f=1, sizing=0;
     Option *opt, *graph = (Option *) client_data;
     PointerCallback *userHandler = graph->target;
-    cairo_t *cr;
 
     if (!XtIsRealized(widget)) return;
 
@@ -552,26 +563,30 @@ GraphEventProc(Widget widget, caddr_t client_data, XEvent *event)
            XtSetArg(args[j], XtNwidth, &w); j++;
            XtSetArg(args[j], XtNheight, &h); j++;
            XtGetValues(widget, args, j);
-           sizing = ((w != graph->max || h != graph->value) && ((XExposeEvent*)event)->count >= 0);
-           graph->max = w; graph->value = h;
+
+           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 befor first expose event
+                        // 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;
            }
-           cr = cairo_create((cairo_surface_t *) graph->textValue);
-           cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0);
-           cairo_rectangle(cr, ((XExposeEvent*)event)->x, ((XExposeEvent*)event)->y, ((XExposeEvent*)event)->width, ((XExposeEvent*)event)->height);
-           cairo_fill(cr);
-           cairo_destroy(cr);
+           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;
@@ -778,7 +793,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