Try also /home/<user>/.logo.pgn for user logo

[xboard.git] / gtk / xoptions.c

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 6c77841..5c35c8e 100644 (file)
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -138,16 +138,6 @@ static Arg formArgs[] = {
 };
 #endif
 
-void
-MarkMenuItem (char *menuRef, int state)
-{
-    MenuItem *item = MenuNameToItem(menuRef);
-
-    if(item && item->handle) {
-        ((GtkCheckMenuItem *) (item->handle))->active = state;
-    }
-}
-
 void GetWidgetTextGTK(GtkWidget *w, char **buf)
 {
     GtkTextIter start;
@@ -260,6 +250,15 @@ SetDialogTitle (DialogClass dlg, char *title)
 }
 
 void
+SetWidgetFont (GtkWidget *w, char **s)
+{
+    PangoFontDescription *pfd;
+    if (!s || !*s || !**s) return; // uses no font, no font spec or empty font spec
+    pfd = pango_font_description_from_string(*s);
+    gtk_widget_modify_font(w, pfd);
+}
+
+void
 SetListBoxItem (GtkListStore *store, int n, char *msg)
 {
     GtkTreeIter iter;
@@ -558,7 +557,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 +869,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 +926,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 +1348,7 @@ 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);
                 }
+                SetWidgetFont(textview, option[i].font);
                 if ( *(char**)option[i].target != NULL )
                     gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
                 else
@@ -1410,6 +1415,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
             option[i].handle = (void *) (label = gtk_label_new(option[i].name));
             /* Left Justify */
             gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
+            SetWidgetFont(label, option[i].font);
            if(option[i].min & BORDER) {
                GtkWidget *frame = gtk_frame_new(NULL);
                 gtk_container_add(GTK_CONTAINER(frame), label);
@@ -1429,6 +1435,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
           case SaveButton:
           case Button:
             button = gtk_button_new_with_label (option[i].name);
+            SetWidgetFont(gtk_bin_get_child(GTK_BIN(button)), option[i].font);
 
             /* set button color on view board dialog */
             if(option[i].choice && ((char*)option[i].choice)[0] == '#' && !currentCps) {
@@ -1438,10 +1445,14 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 
             /* set button color on new variant dialog */
             if(option[i].textValue) {
+                static char *b = "Bold";
                 gdk_color_parse( option[i].textValue, &color );
                 gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color );
                 gtk_widget_set_sensitive(button, option[i].value >= 0 && (appData.noChessProgram
                                         || strstr(first.variants, VariantName(option[i].value))));
+                if(engineVariant[100] ? !strcmp(engineVariant+100, option[i].name) : 
+                   gameInfo.variant ? option[i].value == gameInfo.variant : !strcmp(option[i].name, "Normal"))
+                    SetWidgetFont(gtk_bin_get_child(GTK_BIN(button)), &b);
             }
 
             Pack(hbox, table, button, left, left+1, top, 0);
@@ -1490,6 +1501,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
                 GtkListStore *store;
 
                 option[i].handle = (void *) (list = gtk_tree_view_new());
+                SetWidgetFont(option[i].handle, option[i].font);
                 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);
@@ -1527,6 +1539,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);