Author: janderwald
Date: Fri Aug 24 00:25:20 2007
New Revision: 28492
URL:
http://svn.reactos.org/svn/reactos?rev=28492&view=rev
Log:
- turn back cursor on screensaver exit
- display fullscreen instead of maximized
- patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us
See issue #2583 for more details.
Modified:
trunk/reactos/base/applications/screensavers/logon/logon.c
trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c
trunk/reactos/base/applications/screensavers/starfield/screensaver.c
Modified: trunk/reactos/base/applications/screensavers/logon/logon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa…
==============================================================================
--- trunk/reactos/base/applications/screensavers/logon/logon.c (original)
+++ trunk/reactos/base/applications/screensavers/logon/logon.c Fri Aug 24 00:25:20 2007
@@ -155,6 +155,7 @@
{
KillTimer (hwnd, APP_TIMER);
DeleteObject(bitmap);
+ ShowCursor(TRUE);
PostQuitMessage(0);
break;
}
@@ -223,14 +224,20 @@
else
{
HWND hwnd;
- hwnd = CreateWindow(APPNAME, APPNAME,
- WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
- 0, 0,
- GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
- HWND_DESKTOP, 0,
- hInstance, NULL);
- ShowWindow(hwnd, SW_SHOWMAXIMIZED);
- ShowCursor(FALSE);
+ hwnd = CreateWindowEx(WS_EX_TOPMOST,
+ APPNAME,
+ APPNAME,
+ WS_VISIBLE | WS_POPUP,
+ 0, 0,
+ GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+ HWND_DESKTOP, 0,
+ hInstance, NULL);
+
+ SetWindowPos(hwnd,
+ 0, 0, 0, 0, 0,
+ SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
+
+ ShowCursor(FALSE);
fullscreen = TRUE;
}
}
Modified: trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa…
==============================================================================
--- trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c (original)
+++ trunk/reactos/base/applications/screensavers/scrnsave/scrnsave.c Fri Aug 24 00:25:20
2007
@@ -37,6 +37,7 @@
switch (msg)
{
case WM_DESTROY:
+ ShowCursor(TRUE);
PostQuitMessage(0);
break;
@@ -104,13 +105,19 @@
else
{
HWND hwnd;
- hwnd = CreateWindow(APPNAME, APPNAME,
- WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
- 0, 0,
- GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
- HWND_DESKTOP, 0,
- hInstance, NULL);
- ShowWindow(hwnd, SW_SHOWMAXIMIZED);
+ hwnd = CreateWindowEx(WS_EX_TOPMOST,
+ APPNAME,
+ APPNAME,
+ WS_VISIBLE | WS_POPUP,
+ 0, 0,
+ GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+ HWND_DESKTOP, 0,
+ hInstance, NULL);
+
+ SetWindowPos(hwnd,
+ 0, 0, 0, 0, 0,
+ SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
+
ShowCursor(FALSE);
fullscreen = TRUE;
}
Modified: trunk/reactos/base/applications/screensavers/starfield/screensaver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa…
==============================================================================
--- trunk/reactos/base/applications/screensavers/starfield/screensaver.c (original)
+++ trunk/reactos/base/applications/screensavers/starfield/screensaver.c Fri Aug 24
00:25:20 2007
@@ -192,6 +192,7 @@
{
KillTimer (hwnd, APP_TIMER);
free(stars);
+ ShowCursor(TRUE);
PostQuitMessage (0);
return 0;
}
@@ -266,13 +267,19 @@
else
{
HWND hwnd;
- hwnd = CreateWindow(APPNAME, APPNAME,
- WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
- 0, 0,
- GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
- HWND_DESKTOP, 0,
- hInstance, NULL);
- ShowWindow(hwnd, SW_SHOWMAXIMIZED);
+ hwnd = CreateWindowEx(WS_EX_TOPMOST,
+ APPNAME,
+ APPNAME,
+ WS_VISIBLE | WS_POPUP,
+ 0, 0,
+ GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+ HWND_DESKTOP, 0,
+ hInstance, NULL);
+
+ SetWindowPos(hwnd,
+ 0, 0, 0, 0, 0,
+ SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
+
ShowCursor(FALSE);
fullscreen = TRUE;
}