X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=361695702ae3f25e1574a957750b781b18e9000f;hb=961180c518bc7939a4b35dcb9f651176a6141e48;hp=e6dec36947a31929ef632db20a96cefecd7a95e4;hpb=3a75b74c7fc03b543993c90f4a9ebdea9f03b759;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e6dec36..3616957 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1030,6 +1030,7 @@ InitTextures()
   backTextureSquareSize = 0; // kludge to force recalculation of texturemode
   
   if( appData.liteBackTextureFile && appData.liteBackTextureFile[0] != NULLCHAR && appData.liteBackTextureFile[0] != '*' ) {
+      if(liteBackTexture) DeleteObject(liteBackTexture);
       liteBackTexture = LoadImage( 0, appData.liteBackTextureFile, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
       liteBackTextureMode = appData.liteBackTextureMode;
 
@@ -1039,6 +1040,7 @@ InitTextures()
   }
   
   if( appData.darkBackTextureFile && appData.darkBackTextureFile[0] != NULLCHAR && appData.darkBackTextureFile[0] != '*' ) {
+      if(darkBackTexture) DeleteObject(darkBackTexture);
       darkBackTexture = LoadImage( 0, appData.darkBackTextureFile, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
       darkBackTextureMode = appData.darkBackTextureMode;
 
@@ -3349,7 +3351,7 @@ DrawBackgroundOnDC(HDC hdc)
   HDC tmphdc;
   HBITMAP hbm;
   static char oldBorder[MSG_SIZ];
-  int w = 600, h = 600;
+  int w = 600, h = 600, mode;
 
   if(strcmp(appData.border, oldBorder)) { // load new one when old one no longer valid
     strncpy(oldBorder, appData.border, MSG_SIZ-1);
@@ -3365,8 +3367,10 @@ DrawBackgroundOnDC(HDC hdc)
             w = bi.bmWidth;
             h = bi.bmHeight;
   }
+  mode = SetStretchBltMode(hdc, COLORONCOLOR);
   StretchBlt(hdc, boardRect.left, boardRect.top, boardRect.right - boardRect.left, 
                   boardRect.bottom - boardRect.top, tmphdc, 0, 0, w, h, SRCCOPY);
+  SetStretchBltMode(hdc, mode);
   SelectObject(tmphdc, hbm);
   DeleteDC(tmphdc);
 }
@@ -4865,6 +4869,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       }
       break;
 
+    case IDM_CreateBook:
+      CreateBookEvent();
+      break;
+
     case IDM_CopyGame:
       CopyGameToClipboard();
       break;
@@ -5203,6 +5211,10 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       BoardOptionsPopup(hwnd);
       break;
 
+    case IDM_ThemeOptions:
+      ThemeOptionsPopup(hwnd);
+      break;
+
     case IDM_EnginePlayOptions:
       EnginePlayOptionsPopup(hwnd);
       break;
@@ -9758,7 +9770,7 @@ CmailSigHandlerCallBack(InputSourceRef isr, VOIDSTAR closure,
 /* see wedittags.c for Edit Tags functions */
 
 
-VOID
+int
 ICSInitScript()
 {
   FILE *f;
@@ -9770,8 +9782,10 @@ ICSInitScript()
     if (f != NULL) {
       ProcessICSInitScript(f);
       fclose(f);
+      return TRUE;
     }
   }
+  return FALSE;
 }
 
 
@@ -9999,3 +10013,24 @@ int flock(int fid, int code)
     }
     return 0;
 }
+
+char *
+Col2Text (int n)
+{
+    static int i=0;
+    static char col[8][20];
+    COLORREF color = *(COLORREF *) colorVariable[n];
+    i = i+1 & 7;
+    snprintf(col[i], 20, "#%02lx%02lx%02lx", color&0xff, (color>>8)&0xff, (color>>16)&0xff);
+    return col[i];
+}
+
+void
+ActivateTheme (int new)
+{   // Redo initialization of features depending on options that can occur in themes
+   InitTextures();
+   if(new) InitDrawingColors();
+   fontBitmapSquareSize = 0; // request creation of new font pieces
+   InitDrawingSizes(-2, 0);
+   InvalidateRect(hwndMain, NULL, TRUE);
+}