Remove all bitmap & pixmap drawing

[xboard.git] / dialogs.c

diff --git a/dialogs.c b/dialogs.c
index fa55008..61085f7 100644 (file)
--- a/dialogs.c
+++ b/dialogs.c
@@ -756,7 +756,6 @@ static int
 BoardOptionsOK (int n)
 {
     if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
-    useImages = useImageSqs = 0;
     InitDrawingParams();
     InitDrawingSizes(-1, 0);
     DrawPosition(True, NULL);
@@ -811,8 +810,7 @@ static Option boardOptions[] = {
 { 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
 { 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".xpm", NULL, FileName, N_("Light-Squares Texture File:") },
 { 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".xpm", NULL, FileName, N_("Dark-Squares Texture File:") },
-{ 0, 0, 0, NULL, (void*) &appData.bitmapDirectory, "", NULL, PathName, N_("Directory with Bitmap Pieces:") },
-{ 0, 0, 0, NULL, (void*) &appData.pixmapDirectory, "", NULL, PathName, N_("Directory with Pixmap Pieces:") },
+{ 0, 0, 0, NULL, (void*) &appData.pngDirectory, "", NULL, PathName, N_("Directory with PNG Pieces:") },
 { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
 };
 
@@ -892,6 +890,7 @@ IcsTextProc ()
    if((p = icsTextMenuString) == NULL) return;
    do {
        q = r = p; while(*p && *p != ';') p++;
+       if(textOptions[i].name == NULL) textOptions[i].name = (char*) malloc(MSG_SIZ);
        for(j=0; j<p-q; j++) textOptions[i].name[j] = *r++;
        textOptions[i].name[j++] = 0;
        if(!*p) break;
@@ -2095,7 +2094,7 @@ BoardPopUp (int squareSize, int lineGap, void *clockFontThingy)
     mainOptions[W_BOARD].max = mainOptions[W_SMALL].max = size; // board size
     mainOptions[W_SMALL].max = size - 2; // board title (subtract border!)
     mainOptions[W_BLACK].max = mainOptions[W_WHITE].max = size/2-3; // clock width
-    mainOptions[W_MESSG].max = appData.showButtonBar ? size-130 : size-2; // message
+    mainOptions[W_MESSG].max = appData.showButtonBar ? size-135 : size-2; // message
     mainOptions[W_MENU].max = size-40; // menu bar
     mainOptions[W_TITLE].type = appData.titleInWindow ? Label : -1 ;
     if(logo && logo <= size/4) { // Activate logos
@@ -2294,7 +2293,10 @@ BrowseOK (int n)
        }
        if(!fileName[0]) return FALSE; // refuse OK when no file
        if(!savMode[0]) { // browsing for name only (dialog Browse button)
-               snprintf(title, MSG_SIZ, "%s/%s", curDir, fileName);
+               if(fileName[0] == '/') // We already had a path name
+                   snprintf(title, MSG_SIZ, "%s", fileName);
+               else
+                   snprintf(title, MSG_SIZ, "%s/%s", curDir, fileName);
                SetWidgetText((Option*) savFP, title, TransientDlg);
                currentCps = savCps; // could return to Engine Settings dialog!
                return TRUE;