Use -gameListFont in Game List

[xboard.git] / gtk / xoptions.c

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index c089c9e..564b865 100644 (file)
--- 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);
     }
 
@@ -693,6 +693,7 @@ printf("*** selected\n");
 void
 AddHandler (Option *opt, DialogClass dlg, int nr)
 {
+    PangoFontDescription *pfd;
     switch(nr) {
       case 0: // history (now uses generic textview callback)
       case 1: // comment (likewise)
@@ -703,6 +704,8 @@ AddHandler (Option *opt, DialogClass dlg, int nr)
        g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (TypeInProc), (gpointer) (dlg<<16 | (opt - dialogOptions[dlg])));
        break;
       case 5: // game list
+        pfd = pango_font_description_from_string(appData.gameListFont);
+        gtk_widget_modify_font(opt->handle, pfd);
        g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
       case 4: // game-list filter
        g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (GameListEvent), (gpointer) (intptr_t) nr );
@@ -870,6 +873,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 +930,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 +1352,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 +1540,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,7 +1563,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
-           if(tinyLayout) { strncpy(def, msg, 1); msg = def; }
+#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*)