X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=45ff953fd74f7123c05c6583e9c6842bbe55d2c3;hb=e5eb4d4682dc573c4bb981ecd9cde67d579c0515;hp=46b10ba7ba08c75d15ef4d9fdaa41d089f915648;hpb=25d581e9d21f19dc297f50b1faeac1f5d60b71fe;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 46b10ba..45ff953 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -558,7 +558,7 @@ AppendColorized (Option *opt, char *s, int count)
     static GtkTextTag *fgTags[8], *bgTags[8], *font, *bold, *normal, *attr = NULL;
 
     if(!font) {
-	font = gtk_text_buffer_create_tag(opt->handle, NULL, "font", "Monospace normal", NULL);
+	font = gtk_text_buffer_create_tag(opt->handle, NULL, "font", appData.icsFont, NULL);
 	gtk_widget_modify_base(GTK_WIDGET(opt->textValue), GTK_STATE_NORMAL, &backgroundColor);
     }
 
@@ -870,6 +870,7 @@ GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
     GdkEventExpose *eevent = (GdkEventExpose *) event;
     GdkEventButton *bevent = (GdkEventButton *) event;
     GdkEventMotion *mevent = (GdkEventMotion *) event;
+    GdkEventScroll *sevent = (GdkEventScroll *) event;
     GtkAllocation a;
     cairo_t *cr;
 
@@ -926,6 +927,10 @@ GraphEventProc(GtkWidget *widget, GdkEvent *event, gpointer gdata)
 	    cairo_destroy(cr);
 	default:
 	    return;
+	case GDK_SCROLL:
+	    if(sevent->direction == GDK_SCROLL_UP) button = 4;
+	    if(sevent->direction == GDK_SCROLL_DOWN) button = 5;
+	    break;
 	case GDK_MOTION_NOTIFY:
 	    f = 0;
 	    w = mevent->x; h = mevent->y;
@@ -1344,6 +1349,11 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
                     /* no label so let textview occupy all columns */
                     Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);
                 }
+                if ( option[i].textValue != NULL ) {
+                    PangoFontDescription *pfd;
+                    pfd = pango_font_description_from_string(*(char**)option[i].textValue);
+                    gtk_widget_modify_font(textview, pfd);
+                }
                 if ( *(char**)option[i].target != NULL )
                     gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
                 else
@@ -1527,6 +1537,7 @@ if(appData.debugMode) 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]);
+            g_signal_connect (graph, "scroll-event", G_CALLBACK (GraphEventProc), (gpointer) &option[i]);
 	    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);
@@ -1549,6 +1560,9 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 	  case DropDown:
 	    top--;
 	    msg = _(option[i].name); // write name on the menu button
+#ifndef __APPLE__
+	    if(tinyLayout) { strcpy(def, msg); def[tinyLayout] = NULLCHAR; msg = def; } // clip menu text to keep menu bar small
+#endif
 //	    XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name));  j++;
 //	    XtSetArg(args[j], XtNlabel, msg);  j++;
 	    option[i].handle = (void*)