#include "gettext.h"
#include "draw.h"
-#ifdef __APPLE__
+#ifdef OSXAPP
# include <gtkmacintegration/gtkosxapplication.h>
// prevent pathname of positional file argument provided by OS X being be mistaken for option name
// (price is that we won't recognize Windows option format anymore).
# define SLASH '-'
+# define IMG ".png"
// redefine some defaults
# undef ICS_LOGON
# undef DATADIR
+# undef LOCALEDIR
# undef SETTINGS_FILE
# define ICS_LOGON "Library/Preferences/XboardICS.conf"
# define DATADIR dataDir
+# define LOCALEDIR localeDir
# define SETTINGS_FILE masterSettings
+# define SYNC_MENUBAR gtkosx_application_sync_menubar(theApp)
char dataDir[MSG_SIZ]; // for expanding ~~
+ char localeDir[MSG_SIZ];
char masterSettings[MSG_SIZ];
#else
# define SLASH '/'
+# define IMG ".svg"
+# define SYNC_MENUBAR
#endif
#ifdef __EMX__
void update_ics_width P(());
int CopyMemoProc P(());
static gboolean EventProc P((GtkWidget *widget, GdkEvent *event, gpointer g));
+static int FindLogo P((char *place, char *name, char *buf));
#ifdef TODO_GTK
#if ENABLE_NLS
// defer processing it until we know if it matches our board size
if(!strstr(name, "-*-") && // ignore X-fonts
size >= 0 && size<MAX_SIZE) { // for now, fixed limit
- fontTable[number][size] = name = strdup(strchr(name, ':')+1);
+ fontTable[number][size] = strdup(strchr(name, ':')+1);
fontValid[number][size] = True;
- } else return;
+ }
+ return;
}
switch(number) {
case 0: // CLOCK_FONT
void
ParseColor (int n, char *name)
{ // in XBoard, just copy the color-name string
- if(colorVariable[n]) *(char**)colorVariable[n] = strdup(name);
+ if(colorVariable[n] && *name == '#') *(char**)colorVariable[n] = strdup(name);
}
char *
ResizeBoardWindow (int w, int h, int inhibit)
{
GtkAllocation a;
+ int bw;
// if(clockKludge) return; // ignore as long as clock does not have final height
+ gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+ bw = a.width;
+ gtk_widget_get_allocation(shellWidget, &a);
+ marginW = a.width - bw;
gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
- w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
- h += marginH + a.height + 1;
+ gtk_widget_set_size_request(optList[W_BOARD].handle, w, h); // protect board widget
+// w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
+// h += marginH + a.height + 1;
gtk_window_resize(GTK_WINDOW(shellWidget), w, h);
+ DoEvents();
+ gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board again
}
int
appData.coordFont = fontTable[COORD_FONT][squareSize];
if(!fontIsSet[CONSOLE_FONT] && fontValid[CONSOLE_FONT][squareSize])
appData.icsFont = fontTable[CONSOLE_FONT][squareSize];
+ if(!fontIsSet[EDITTAGS_FONT] && fontValid[EDITTAGS_FONT][squareSize])
+ appData.tagsFont = fontTable[EDITTAGS_FONT][squareSize];
if(!fontIsSet[COMMENT_FONT] && fontValid[COMMENT_FONT][squareSize])
appData.commentFont = fontTable[COMMENT_FONT][squareSize];
+ if(!fontIsSet[MOVEHISTORY_FONT] && fontValid[MOVEHISTORY_FONT][squareSize])
+ appData.historyFont = fontTable[MOVEHISTORY_FONT][squareSize];
+ if(!fontIsSet[GAMELIST_FONT] && fontValid[GAMELIST_FONT][squareSize])
+ appData.gameListFont = fontTable[GAMELIST_FONT][squareSize];
- appData.font = InsertPxlSize(appData.font, fontPxlSize);
+ appData.font = InsertPxlSize(appData.font, coordFontPxlSize);
appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize);
appData.icsFont = InsertPxlSize(appData.icsFont, coordFontPxlSize);
gtk_window_resize(GTK_WINDOW(shells[DummyDlg]), slaveW + opt->max, slaveH + opt->value);
}
-#ifdef __APPLE__
+GdkPixbuf *
+LoadIconFile (gchar *svgFilename)
+{
+ char buf[MSG_SIZ];
+
+ snprintf(buf, MSG_SIZ, "%s/%s" IMG, svgDir, svgFilename);
+ return gdk_pixbuf_new_from_file(buf, NULL);
+}
+
+#ifdef OSXAPP
static char clickedFile[MSG_SIZ];
static int suppress;
/* set up GTK */
gtk_init (&argc, &argv);
-#ifdef __APPLE__
+#ifdef OSXAPP
{ // prepare to catch OX OpenFile signal, which will tell us the clicked file
char *path = gtkosx_application_get_bundle_path();
+#ifdef ENABLE_NLS
+ char *res_path = gtkosx_application_get_resource_path();
+ snprintf(localeDir, MSG_SIZ, "%s/share/locale", res_path); // redefine locale dir for OSX bundle
+#endif
theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
- strncpy(dataDir, path, MSG_SIZ);
snprintf(masterSettings, MSG_SIZ, "%s/Contents/Resources/etc/xboard.conf", path);
+ snprintf(dataDir, MSG_SIZ, "%s/Contents/Resources/share/xboard", path);
+ snprintf(svgDir, MSG_SIZ, "%s/themes/default", dataDir);
suppress = (argc == 1 || argc > 1 && argv[1][00] != '-'); // OSX sends signal even if name was already argv[1]!
g_signal_connect(theApp, "NSApplicationOpenFile", G_CALLBACK(StartNewXBoard), NULL);
+ g_signal_connect(theApp, "NSApplicationWillTerminate", G_CALLBACK(ExitEvent), NULL);
// we must call application ready before we can get the signal,
// and supply a (dummy) menu bar before that, to avoid problems with dual apples in it
gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(gtk_menu_bar_new()));
} else {
SizeDefaults *szd = sizeDefaults;
if (*appData.boardSize == NULLCHAR) {
- GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow)); // TODO: this does not work, as no mainwindow yet
+// GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow)); // TODO: this does not work, as no mainwindow yet
+ GdkScreen *screen = gdk_screen_get_default();
guint screenwidth = gdk_screen_get_width(screen);
guint screenheight = gdk_screen_get_height(screen);
while (screenwidth < (szd->minScreenSize*BOARD_WIDTH + 4)/8 ||
layoutName = "normalLayout";
}
+ if(appData.logoSize) appData.logoSize = boardWidth/4-3;
wpMain.width = -1; // prevent popup sizes window
optList = BoardPopUp(squareSize, lineGap, (void*)
#ifdef TODO_GTK
/*
* Create an icon. (Use two icons, to indicate whther it is white's or black's turn.)
*/
- WhiteIcon = gdk_pixbuf_new_from_file(SVGDIR "/icon_white.svg", NULL);
- BlackIcon = gdk_pixbuf_new_from_file(SVGDIR "/icon_black.svg", NULL);
+ WhiteIcon = LoadIconFile("icon_white");
+ BlackIcon = LoadIconFile("icon_black");
SetClockIcon(0); // sets white icon
marginH = h - a.height - hc; // subtract current clock height, so it can be added back dynamically
}
- CreateAnyPieces();
+ CreateAnyPieces(1);
CreateGrid();
if(appData.logoSize)
{ // locate and read user logo
- char buf[MSG_SIZ];
- snprintf(buf, MSG_SIZ, "%s/%s.png", appData.logoDir, UserName());
+ char buf[MSG_SIZ], name[MSG_SIZ];
+ snprintf(name, MSG_SIZ, "/home/%s", UserName());
+ if(!FindLogo(name, ".logo", buf))
+ FindLogo(appData.logoDir, name + 6, buf);
ASSIGN(userLogo, buf);
}
#endif
void
+MarkMenuItem (char *menuRef, int state)
+{
+ MenuItem *item = MenuNameToItem(menuRef);
+
+ if(item && item->handle) {
+ ((GtkCheckMenuItem *) (item->handle))->active = state;
+ }
+ SYNC_MENUBAR;
+}
+
+void
EnableNamedMenuItem (char *menuRef, int state)
{
MenuItem *item = MenuNameToItem(menuRef);
if(item && item->handle) gtk_widget_set_sensitive(item->handle, state);
+ SYNC_MENUBAR;
}
void
void
CoDrag (GtkWidget *sh, WindowPlacement *wp)
{
- int touch=0, fudge = 2, f = 2;
+ int touch=0, fudge = 4, f = 3;
GetActualPlacement(sh, wp);
if(abs(wpMain.x + wpMain.width + 2*frameX - f - wp->x) < fudge) touch = 1; else // right touch
- if(abs(wp->x + wp->width + 2*frameX + f - wpMain.x) < fudge) touch = 2; else // left touch
+ if(abs(wp->x + wp->width + 2*frameX - f - wpMain.x) < fudge) touch = 2; else // left touch
if(abs(wpMain.y + wpMain.height + frameX - f + frameY - wp->y) < fudge) touch = 3; else // bottom touch
- if(abs(wp->y + wp->height + frameX + frameY + f - wpMain.y) < fudge) touch = 4; // top touch
+ if(abs(wp->y + wp->height + frameX + frameY - f - wpMain.y) < fudge) touch = 4; // top touch
//printf("CoDrag: touch = %d x=%d w=%d x2=%d w2=%d fx=%d\n", touch, wpMain.x, wpMain.width, wp->x, wp->width, frameX);
if(!touch ) return; // only windows that touch co-move
if(touch < 3 && wpNew.height != wpMain.height) { // left or right and height changed
ReSize (WindowPlacement *wp)
{
GtkAllocation a;
- int sqx, sqy, w, h, hc, lg = lineGap;
- gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
- hc = a.height; // clock height can depend on single / double line clock text!
- if(clockKludge && hc != clockKludge) wp->height += hc - clockKludge, clockKludge = 0;
- wpMain.height = BOARD_HEIGHT * (squareSize + lineGap) + lineGap + marginH + hc;
- if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
- sqx = (wp->width - lg - marginW) / BOARD_WIDTH - lg;
- sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg;
+ int sqx, sqy, w, h, lg = lineGap;
+ static int first = 1;
+ if(wp->width == wpMain.width && wp->height == wpMain.height && !first) return; // not sized
+ gtk_widget_get_allocation(optList[W_DROP+1].handle, &a); // table that should contain everything
+ w = a.width; h = a.height;
+ gtk_widget_get_allocation(shellWidget, &a);
+ if(a.width < w || a.height < h) { // outer window smaller than dialog content?
+ w = a.width - w; h = a.height - h; // subtract matrgins, measured as table minus board dimensions
+ gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+ w += a.width; h += a.height;
+ } else {
+ gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+ w = a.width; h = a.height;
+ }
+ sqx = (w - lg) / BOARD_WIDTH - lg;
+ sqy = (h - lg) / BOARD_HEIGHT - lg;
if(sqy < sqx) sqx = sqy;
if(sqx < 20) return;
if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
+ int oldSqx = sqx;
lg = lineGap = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
- sqx = (wp->width - lg - marginW) / BOARD_WIDTH - lg;
- sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg;
+ sqx = (w - lg) / BOARD_WIDTH - lg;
+ sqy = (h - lg) / BOARD_HEIGHT - lg;
if(sqy < sqx) sqx = sqy;
+ lg = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
+ if(sqx == oldSqx + 1 && lg == lineGap + 1) sqx = oldSqx, squareSize = 0; // prevent oscillations, force resize by kludge
}
- if(sqx != squareSize) {
+ if(sqx != squareSize && !first) {
squareSize = sqx; // adopt new square size
CreatePNGPieces(); // make newly scaled pieces
InitDrawingSizes(0, 0); // creates grid etc.
h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
if(optList[W_BOARD].max > w) optList[W_BOARD].max = w;
if(optList[W_BOARD].value > h) optList[W_BOARD].value = h;
+ first = appData.fixedSize;
}
static guint delayedDragTag = 0;
if(busy) return;
busy = 1;
-// GetActualPlacement(shellWidget, &wpNew);
+ GetActualPlacement(shellWidget, &wpNew);
if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
wpNew.width == wpMain.width && wpNew.height == wpMain.height) { // not sized
busy = 0; return; // false alarm
buf[0]=eventkey->keyval;
buf[1]='\0';
- if (eventkey->keyval > 32 && eventkey->keyval < 256)
+ if (eventkey->keyval > 32 && eventkey->keyval < 256 || *buf == 27)
ConsoleAutoPopUp (buf);
}
void
ManProc ()
{ // called from menu
-#ifdef __APPLE__
+#ifdef OSXAPP
char buf[MSG_SIZ];
snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen);
system(buf);
GdkPixbuf *pm = *clockIcons[color];
if (mainwindowIcon != pm) {
mainwindowIcon = pm;
- gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon);
+#ifdef OSXAPP
+ gtkosx_application_set_dock_icon_pixbuf(theApp, mainwindowIcon);
+#else
+ gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon);
+#endif
}
}
#endif
+static int
+FindLogo (char *place, char *name, char *buf)
+{ // check if file exists in given place
+ FILE *f;
+ if(!place) return 0;
+ snprintf(buf, MSG_SIZ, "%s/%s.png", place, name);
+ if(*place && strcmp(place, ".") && (f = fopen(buf, "r")) ) {
+ fclose(f);
+ return 1;
+ }
+ return 0;
+}
+
static void
LoadLogo (ChessProgramState *cps, int n, Boolean ics)
{
} else if(appData.autoLogo) {
if(ics) { // [HGM] logo: in ICS mode second can be used for ICS
sprintf(buf, "%s/%s.png", appData.logoDir, appData.icsHost);
- } else if(appData.directory[n] && appData.directory[n][0]) {
- sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy);
+ } else { // engine; cascade
+ if(!FindLogo(appData.logoDir, cps->tidy, buf) && // first try user log folder
+ !FindLogo(appData.directory[n], "logo", buf) && // then engine directory
+ !FindLogo("/usr/local/share/games/plugins/logos", cps->tidy, buf) ) // then system folders
+ FindLogo("/usr/share/games/plugins/logos", cps->tidy, buf);
}
}
if(logoName[0])
char fileext[10] = "";
char *result = NULL;
char *cp;
+ char curDir[MSG_SIZ];
+
+ StartDir(filter, NULL); // change to start directory for this file type
/* make a copy of the filter string, so that strtok can work with it*/
cp = strdup(filter);
ASSIGN(*name, filename);
ScheduleDelayedEvent(DelayedLoad, 50);
}
+ StartDir(filter, filename);
g_free (filename);
- };
+ }
+ else StartDir(filter, "");
gtk_widget_destroy (dialog);
ModeHighlight();
+ if(def && *def && def[strlen(def)-1] == '/') chdir(curDir);
+
free(cp);
return;