X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=ef35f2a0794a769c18c2d213d885de27544c052e;hb=dd94bfa89dd6dd1238c3f7063e532ab3ed2d0858;hp=0d04c5b5742593be80da2f8a41e4b2c81d186de6;hpb=c980334f5f262361b64aad63665eebe40b31ca5d;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 0d04c5b..ef35f2a 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -167,7 +167,7 @@ extern char *getenv(); #include "gettext.h" #include "draw.h" -#ifdef __APPLE__ +#ifdef OSXAPP # include // 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). @@ -176,12 +176,15 @@ extern char *getenv(); // 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 '/' @@ -223,6 +226,7 @@ void DisplayMove P((int moveNumber)); 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 @@ -639,11 +643,19 @@ void 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 @@ -819,7 +831,7 @@ LoadIconFile (gchar *svgFilename) return gdk_pixbuf_new_from_file(buf, NULL); } -#ifdef __APPLE__ +#ifdef OSXAPP static char clickedFile[MSG_SIZ]; static int suppress; @@ -865,15 +877,20 @@ main (int argc, char **argv) /* 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(svgDir, MSG_SIZ, "%s/Contents/Resources/share/xboard/themes/default", 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())); @@ -1099,6 +1116,7 @@ main (int argc, char **argv) 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 @@ -1188,8 +1206,10 @@ main (int argc, char **argv) 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); } @@ -1636,23 +1656,34 @@ void 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. @@ -1661,6 +1692,7 @@ ReSize (WindowPlacement *wp) 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; @@ -1672,7 +1704,7 @@ DragProc () 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 @@ -1932,7 +1964,7 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) void ManProc () { // called from menu -#ifdef __APPLE__ +#ifdef OSXAPP char buf[MSG_SIZ]; snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen); system(buf); @@ -2045,7 +2077,7 @@ SetClockIcon (int color) GdkPixbuf *pm = *clockIcons[color]; if (mainwindowIcon != pm) { mainwindowIcon = pm; -#ifdef __APPLE__ +#ifdef OSXAPP gtkosx_application_set_dock_icon_pixbuf(theApp, mainwindowIcon); #else gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon); @@ -2225,24 +2257,33 @@ FrameDelay (int time) #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) { char buf[MSG_SIZ], *logoName = buf; - FILE *f; if(appData.logo[n][0]) { logoName = appData.logo[n]; } 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 { // engine; look in engine-dir (if any) first - snprintf(buf, MSG_SIZ, "%s/logo.png", appData.directory[n]); - if(appData.directory[n] && appData.directory[n][0] - && strcmp(appData.directory[n], ".") && (f = fopen(buf, "r")) ) - fclose(f); - else // no engine dir or no logo.png in it: look in logo dir - if(appData.logoDir && appData.logoDir[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]) @@ -2276,6 +2317,12 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp char fileext[10] = ""; char *result = NULL; char *cp; + char curDir[MSG_SIZ]; + + if(def && *def && def[strlen(def)-1] == '/') { + getcwd(curDir, MSG_SIZ); + chdir(def); + } /* make a copy of the filter string, so that strtok can work with it*/ cp = strdup(filter); @@ -2355,6 +2402,8 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp gtk_widget_destroy (dialog); ModeHighlight(); + if(def && *def && def[strlen(def)-1] == '/') chdir(curDir); + free(cp); return;