diff --git a/LICENSE.txt b/LICENSE.txt index d3a0c5d..3bfb555 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Copyright (C) 1991-2011 by Jamie Zawinski. -Copyright (C) 2013-2015 Katayama Hirofumi MZ. +Copyright (C) 2013-2016 Katayama Hirofumi MZ. Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided diff --git a/XScreenSaverWin.iss b/XScreenSaverWin.iss index 1aad9d3..93ed981 100644 --- a/XScreenSaverWin.iss +++ b/XScreenSaverWin.iss @@ -7,7 +7,7 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{B7914227-CD94-4B6F-859C-E3823C9552DA} AppName=XScreenSaver for Windows -AppVerName=XScreenSaver for Windows v0.78 +AppVerName=XScreenSaver for Windows v0.79 AppPublisher=Katayama Hirofumi MZ AppPublisherURL=http://katahiromz.web.fc2.com/xscreensaverwin/eindex.html AppSupportURL=http://katahiromz.web.fc2.com/xscreensaverwin/eindex.html @@ -20,7 +20,7 @@ Compression=lzma SolidCompression=yes UninstallDisplayIcon={app}\xscreensaver.exe LicenseFile=LICENSE.txt -VersionInfoVersion=0.77 +VersionInfoVersion=0.79 [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" diff --git a/debughelper/debughelper.rc b/debughelper/debughelper.rc index 89aa173..7c015e8 100644 --- a/debughelper/debughelper.rc +++ b/debughelper/debughelper.rc @@ -21,8 +21,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -33,10 +33,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin debughelper\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" diff --git a/random/random.rc b/random/random.rc index f218479..07c8034 100644 --- a/random/random.rc +++ b/random/random.rc @@ -9,8 +9,8 @@ // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -21,10 +21,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin random screensaver\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" diff --git a/screenhack.c b/screenhack.c index 4eeff31..43b7109 100644 --- a/screenhack.c +++ b/screenhack.c @@ -309,11 +309,13 @@ HBITMAP GetScreenShotBitmap(VOID) HBITMAP hbm; HGDIOBJ hbmOld; BITMAPINFO bi; - INT cx, cy; + INT x, y, cx, cy; LPVOID pvBits; - cx = GetSystemMetrics(SM_CXSCREEN); - cy = GetSystemMetrics(SM_CYSCREEN); + x = GetSystemMetrics(SM_XVIRTUALSCREEN); + y = GetSystemMetrics(SM_YVIRTUALSCREEN); + cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); + cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); hwnd = GetDesktopWindow(); hdc = GetWindowDC(hwnd); @@ -329,7 +331,7 @@ HBITMAP GetScreenShotBitmap(VOID) if (hbm != NULL) { hbmOld = SelectObject(hdcMem, hbm); - BitBlt(hdcMem, 0, 0, cx, cy, hdc, 0, 0, SRCCOPY); + BitBlt(hdcMem, 0, 0, cx, cy, hdc, x, y, SRCCOPY); SelectObject(hdcMem, hbmOld); GdiFlush(); } @@ -468,6 +470,16 @@ BOOL ss_init(HWND hwnd) #undef ya_rand_init ya_rand_init(0); + // multiple monitor support + if (!fChildPreview) + { + int x = GetSystemMetrics(SM_XVIRTUALSCREEN); + int y = GetSystemMetrics(SM_YVIRTUALSCREEN); + int cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); + int cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); + MoveWindow(hwnd, x, y, cx, cy, TRUE); + } + GetClientRect(hwnd, &rc); ss.x0 = rc.left; ss.y0 = rc.top; diff --git a/screenhack.rc b/screenhack.rc index bae0d2c..efff42b 100644 --- a/screenhack.rc +++ b/screenhack.rc @@ -79,8 +79,8 @@ FONT 8, "Arial" // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -91,10 +91,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin screenhack\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" diff --git a/xlockmore.c b/xlockmore.c index 1fdff9e..fe2d884 100644 --- a/xlockmore.c +++ b/xlockmore.c @@ -309,11 +309,13 @@ HBITMAP GetScreenShotBitmap(VOID) HBITMAP hbm; HGDIOBJ hbmOld; BITMAPINFO bi; - INT cx, cy; + INT x, y, cx, cy; LPVOID pvBits; - cx = GetSystemMetrics(SM_CXSCREEN); - cy = GetSystemMetrics(SM_CYSCREEN); + x = GetSystemMetrics(SM_XVIRTUALSCREEN); + y = GetSystemMetrics(SM_YVIRTUALSCREEN); + cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); + cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); hwnd = GetDesktopWindow(); hdc = GetWindowDC(hwnd); @@ -329,7 +331,7 @@ HBITMAP GetScreenShotBitmap(VOID) if (hbm != NULL) { hbmOld = SelectObject(hdcMem, hbm); - BitBlt(hdcMem, 0, 0, cx, cy, hdc, 0, 0, SRCCOPY); + BitBlt(hdcMem, 0, 0, cx, cy, hdc, x, y, SRCCOPY); SelectObject(hdcMem, hbmOld); GdiFlush(); } @@ -439,9 +441,9 @@ Bool set_saver_name(const char *name) { LPVOID p; SECURITY_ATTRIBUTES sa; - ZeroMemory(&sa, sizeof(sa)); + ZeroMemory(&sa, sizeof(sa)); sa.nLength = sizeof(sa); - sa.bInheritHandle = TRUE; + sa.bInheritHandle = TRUE; g_hMapping = CreateFileMappingA(INVALID_HANDLE_VALUE, &sa, PAGE_READWRITE, 0, 256, "Katayama Hirofumi MZ XScreenSaverWin"); @@ -464,6 +466,16 @@ BOOL ss_init(HWND hwnd) #undef ya_rand_init ya_rand_init(0); + // multiple monitor support + if (!fChildPreview) + { + int x = GetSystemMetrics(SM_XVIRTUALSCREEN); + int y = GetSystemMetrics(SM_YVIRTUALSCREEN); + int cx = GetSystemMetrics(SM_CXVIRTUALSCREEN); + int cy = GetSystemMetrics(SM_CYVIRTUALSCREEN); + MoveWindow(hwnd, x, y, cx, cy, TRUE); + } + GetClientRect(hwnd, &rc); ss.x0 = rc.left; ss.y0 = rc.top; diff --git a/xlockmore.rc b/xlockmore.rc index c1a12d0..b6ea75c 100644 --- a/xlockmore.rc +++ b/xlockmore.rc @@ -79,8 +79,8 @@ FONT 8, "Arial" // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -91,10 +91,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin xlockmore\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" diff --git a/xscreensaver-text/xscreensaver-text.c b/xscreensaver-text/xscreensaver-text.c index 481871e..4f33ead 100644 --- a/xscreensaver-text/xscreensaver-text.c +++ b/xscreensaver-text/xscreensaver-text.c @@ -36,7 +36,7 @@ const char *saver_key = "Software\\Katayama Hirofumi MZ\\%s"; void show_version(void) { - fprintf(stderr, "XScreenSaver for Windows v0.78 text client utility\n"); + fprintf(stderr, "XScreenSaver for Windows v0.79 text client utility\n"); fprintf(stderr, "Written by Katayama Hirofumi MZ\n"); } diff --git a/xscreensaver-text/xscreensaver-text.rc b/xscreensaver-text/xscreensaver-text.rc index fd11d97..97948f1 100644 --- a/xscreensaver-text/xscreensaver-text.rc +++ b/xscreensaver-text/xscreensaver-text.rc @@ -9,8 +9,8 @@ // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -21,10 +21,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin text\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" diff --git a/xscreensaver/xscreensaver.cpp b/xscreensaver/xscreensaver.cpp index 8d83077..bfb398e 100644 --- a/xscreensaver/xscreensaver.cpp +++ b/xscreensaver/xscreensaver.cpp @@ -242,6 +242,14 @@ VOID OnInitDialog(HWND hDlg) } CenterDialog(hDlg); + + { + RECT rcPreview; + HWND hwndPreview = GetDlgItem(hDlg, ID_PREVIEW); + HDC hdcPreview = GetWindowDC(hwndPreview); + GetClientRect(hwndPreview, &rcPreview); + FillRect(hdcPreview, &rcPreview, (HBRUSH)GetStockObject(BLACK_BRUSH)); + } } INT_PTR CALLBACK DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -253,7 +261,16 @@ INT_PTR CALLBACK DialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPara OnInitDialog(hDlg); return TRUE; - + // Why doesn't it work? + //case WM_CTLCOLORSTATIC: + // if (GetDlgCtrlID((HWND)lParam) == ID_PREVIEW) { + // HDC hDC = (HDC)wParam; + // SetTextColor(hDC, 0); + // SetBkColor(hDC, 0); + // return (INT_PTR)GetStockObject(BLACK_BRUSH); + // } + // break; + case WM_COMMAND: switch (LOWORD(wParam)) { diff --git a/xscreensaver/xscreensaver.rc b/xscreensaver/xscreensaver.rc index 0f437fc..a6ee29e 100644 --- a/xscreensaver/xscreensaver.rc +++ b/xscreensaver/xscreensaver.rc @@ -16,8 +16,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Version Info VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 7, 8, 0 -PRODUCTVERSION 0, 7, 8, 0 +FILEVERSION 0, 7, 9, 0 +PRODUCTVERSION 0, 7, 9, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN @@ -28,10 +28,10 @@ BEGIN BEGIN VALUE "CompanyName", "Katayama Hirofumi MZ\0" VALUE "FileDescription", "XScreenSaverWin\0" - VALUE "FileVersion", "0.78\0" + VALUE "FileVersion", "0.79\0" VALUE "LegalCopyright", "Copyright (C) 2015 Katayama Hirofumi MZ.\0" VALUE "ProductName", "XScreenSaverWin\0" - VALUE "ProductVersion", "0.78\0" + VALUE "ProductVersion", "0.79\0" END END BLOCK "VarFileInfo" @@ -56,7 +56,7 @@ END 1 DIALOGEX 0, 0, 215, 180 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "XScreenSaver for Windows v0.78" +CAPTION "XScreenSaver for Windows v0.79" LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US FONT 9, "Arial" {