/*
* xoptions.c -- Move list window, part of X front end for XBoard
*
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
* ------------------------------------------------------------------------
*
* GNU XBoard is free software: you can redistribute it and/or modify
#include <stdint.h>
#include <cairo/cairo.h>
-#include <cairo/cairo-xlib.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#ifdef __APPLE__
+#ifdef OSXAPP
# include <gtkmacintegration/gtkosxapplication.h>
#endif
};
#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;
}
void
+SetComboChoice (Option *opt, int n)
+{
+ gtk_combo_box_set_active(opt->handle, n);
+}
+
+void
SetDialogTitle (DialogClass dlg, char *title)
{
gtk_window_set_title(GTK_WINDOW(shells[dlg]), 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;
{
char *msg = mb[i].string;
if(!msg) break;
-#ifdef __APPLE__
+#ifdef OSXAPP
if(!strcmp(msg, "Quit ")) continue; // Quit item will appear automatically in App menu
if(!strcmp(msg, "About XBoard")) msg = "About"; // 'XBoard' will be appended automatically when moved to App menu 1st item
#endif
GdkModifierType accelerator_mods;
gtk_accelerator_parse(mb[i].accel, &accelerator_key, &accelerator_mods);
-#ifdef __APPLE__
- if(accelerator_mods & GDK_CONTROL_MASK) { // in OSX use Meta where Linux uses Ctrl
- accelerator_mods &= ~GDK_CONTROL_MASK; // clear Ctrl flag
- accelerator_mods |= GDK_META_MASK; // set Meta flag
- }
+#ifdef OSXAPP
+ if(accelerator_mods & GDK_CONTROL_MASK &&
+ accelerator_key != 'v' && // don't use Cmd+V as this is a OS text edit command
+ accelerator_key != 'c' && // and Cmd+C
+ accelerator_key != 'x' && // and CMD+X
+ accelerator_key != 'a' // and CMD+A
+ ) { // in OSX use Meta (Cmd) where Linux uses Ctrl
+ accelerator_mods &= ~GDK_CONTROL_MASK; // clear Ctrl flag
+ accelerator_mods |= GDK_META_MASK; // set Meta flag
+ } else if (accelerator_mods & GDK_CONTROL_MASK &&
+ accelerator_key == 'v' ||
+ accelerator_key == 'c' ||
+ accelerator_key == 'x' ||
+ accelerator_key == 'a'
+ ) { // For these conflicting commands, lets make them alt-cmd
+ accelerator_mods &= ~GDK_CONTROL_MASK; // clear Ctrl flag
+ accelerator_mods |= GDK_META_MASK;
+ accelerator_mods |= GDK_MOD1_MASK;
+ }
#endif
gtk_widget_add_accelerator (GTK_WIDGET(entry), "activate",GtkAccelerators,
accelerator_key, accelerator_mods, GTK_ACCEL_VISIBLE);
shiftState = event->state & GDK_SHIFT_MASK;
controlState = event->state & GDK_CONTROL_MASK;
switch(event->keyval) {
+ case 'e': return (controlState && IcsHist( 5, opt, dlg));
+ case 'h': return (controlState && IcsHist( 8, opt, dlg));
case 'n': return (controlState && IcsHist(14, opt, dlg));
case 'o': return (controlState && IcsHist(15, opt, dlg));
case GDK_Tab: IcsHist(10, opt, dlg); break;
if(!(opt->min & INIT)) {
opt->min |= INIT; // each memo its own init flag!
gtk_text_buffer_create_tag(opt->handle, "highlight", "background", "yellow", NULL);
- gtk_text_buffer_create_tag(opt->handle, "normal", "background", "white", NULL);
}
gtk_text_buffer_get_iter_at_offset(opt->handle, &start, from);
gtk_text_buffer_get_iter_at_offset(opt->handle, &end, to);
- gtk_text_buffer_apply_tag_by_name(opt->handle, highlight ? "highlight" : "normal", &start, &end);
+ if(highlight) gtk_text_buffer_apply_tag_by_name(opt->handle, "highlight", &start, &end);
+ else gtk_text_buffer_remove_tag_by_name(opt->handle, "highlight", &start, &end);
}
static char **names;
void
AddHandler (Option *opt, DialogClass dlg, int nr)
{
- PangoFontDescription *pfd;
switch(nr) {
case 0: // history (now uses generic textview callback)
case 1: // comment (likewise)
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 );
gtkfilter = gtk_file_filter_new();
gtkfilter_all = gtk_file_filter_new();
- char fileext[MSG_SIZ];
+ char fileext[MSG_SIZ], *filter = currentOption[opt_i].textValue;
+
+ StartDir(filter, NULL); // change to start directory for this file type
/* select file or folder depending on option_type */
if (currentOption[opt_i].type == PathName)
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
entry = currentOption[opt_i].handle;
gtk_entry_set_text (GTK_ENTRY (entry), filename);
+ StartDir(filter, filename); // back to original, and remember this one
g_free (filename);
-
}
+ else StartDir(filter, ""); // change back to original directory
gtk_widget_destroy (dialog);
dialog = NULL;
}
/* 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);
- }
+ SetWidgetFont(textview, option[i].font);
if ( *(char**)option[i].target != NULL )
gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
else
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);
g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
gtk_widget_set_sensitive(label, TRUE);
}
- Pack(hbox, table, label, left, left+2, top, 0);
+ Pack(hbox, table, label, left, left+r, top, 0);
break;
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) {
/* set button color on new variant dialog */
if(option[i].textValue) {
+ static char *b = "Bold";
+ char *v, *p = NULL, n = option[i].value;
+ if(n >= 0) v = VariantName(n), p = strstr(first.variants, v);
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))));
+ || p && (!*v || strlen(p) == strlen(v) || p[strlen(v)] == ',')));
+ 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);
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);
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_widget_set_size_request(graph, option[i].max, option[i].value);
if(0){ GtkAllocation a;
a.x = 0; a.y = 0; a.width = option[i].max, a.height = option[i].value;
gtk_widget_set_allocation(graph, &a);
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
+#ifndef OSXAPP
+ if(tinyLayout) { // clip menu text to keep menu bar small
+ int clip = tinyLayout + 1;
+ strcpy(def, msg + (msg[clip-1] == '_'));
+ def[clip] = NULLCHAR; msg = def;
+ }
#endif
// 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));
+ (menuButton = gtk_menu_item_new_with_mnemonic(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);
break;
case BarEnd:
top--;
-#ifndef __APPLE__
+#ifndef OSXAPP
gtk_table_attach(GTK_TABLE(table), menuBar, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions
}
gtk_table_resize(GTK_TABLE(table), top+1, r);
+ if(dlgNr == BoardWindow && appData.fixedSize) { // inhibit sizing
+ GtkWidget *h = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (h), table, TRUE, FALSE, 2);
+ table = h;
+ }
if(pane)
gtk_box_pack_start (GTK_BOX (pane), table, expandable, TRUE, 0);
else
gtk_window_resize(GTK_WINDOW(dialog), wp[dlgNr]->width, wp[dlgNr]->height);
}
+ for(i=0; option[i].type != EndMark; i++) if(option[i].type == Graph)
+ gtk_widget_set_size_request(option[i].handle, -1, -1); // remove size requests after realization, so user can shrink
+
return 1; // tells caller he must do initialization (e.g. add specific event handlers)
}
projects / xboard.git / blobdiff