kill backlight and fix init sequence for 2.2

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1097 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
knakos 2006-04-20 18:12:58 +00:00
parent 7c38e4a49b
commit a3869dd772
1 changed files with 9 additions and 7 deletions

View File

@ -8,7 +8,7 @@
// SS SS tt ee ll ll aa aa // SS SS tt ee ll ll aa aa
// SSSS ttt eeeee llll llll aaaaa // SSSS ttt eeeee llll llll aaaaa
// //
// Copyright (c) 1995-2005 by Bradford W. Mott and the Stella team // Copyright (c) 1995-2006 by Bradford W. Mott and the Stella team
// //
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
@ -43,7 +43,7 @@ HWND hWnd;
uInt16 rotkeystate = 0; uInt16 rotkeystate = 0;
int paddlespeed; int paddlespeed;
DWORD REG_bat, REG_ac, REG_disp; DWORD REG_bat, REG_ac, REG_disp, bat_timeout;
void KeyCheck(void) void KeyCheck(void)
@ -122,9 +122,9 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
case WM_ACTIVATE: case WM_ACTIVATE:
if (theOSystem) if (theOSystem)
{ {
if (theOSystem->eventHandler().doPause()) if (theOSystem->eventHandler().isPaused())
theOSystem->eventHandler().handleEvent(Event::Pause, theOSystem->eventHandler().state()); theOSystem->eventHandler().handleEvent(Event::Pause, theOSystem->eventHandler().state());
theOSystem->frameBuffer().refresh(false); theOSystem->frameBuffer().refresh();
} }
GXResume(); GXResume();
return 0; return 0;
@ -132,7 +132,7 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
case WM_KILLFOCUS: case WM_KILLFOCUS:
case WM_HIBERNATE: case WM_HIBERNATE:
if (theOSystem) if (theOSystem)
if (!theOSystem->eventHandler().doPause()) if (!theOSystem->eventHandler().isPaused())
theOSystem->eventHandler().handleEvent(Event::Pause, theOSystem->eventHandler().state()); theOSystem->eventHandler().handleEvent(Event::Pause, theOSystem->eventHandler().state());
GXSuspend(); GXSuspend();
return 0; return 0;
@ -195,6 +195,7 @@ void CleanUp(void)
GXCloseDisplay(); GXCloseDisplay();
GXCloseInput(); GXCloseInput();
backlight_xchg(); backlight_xchg();
SystemParametersInfo(SPI_SETBATTERYIDLETIMEOUT, bat_timeout, NULL, SPIF_SENDCHANGE);
} }
@ -212,6 +213,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
/* backlight */ /* backlight */
REG_bat = REG_ac = REG_disp = 2 * 60 * 60 * 1000; /* 2hrs should do it */ REG_bat = REG_ac = REG_disp = 2 * 60 * 60 * 1000; /* 2hrs should do it */
backlight_xchg(); backlight_xchg();
SystemParametersInfo(SPI_GETBATTERYIDLETIMEOUT, 0, (void *) &bat_timeout, 0);
SystemParametersInfo(SPI_SETBATTERYIDLETIMEOUT, 60 * 60 * 2, NULL, SPIF_SENDCHANGE);
// pump the messages to get the window up // pump the messages to get the window up
MSG msg; MSG msg;
@ -240,8 +243,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
theOSystem->settings().validate(); theOSystem->settings().validate();
theOSystem->create(); theOSystem->create();
EventHandler theEventHandler(theOSystem); EventHandler theEventHandler(theOSystem);
PropertiesSet propertiesSet; PropertiesSet propertiesSet(theOSystem);
propertiesSet.load(theOSystem->systemProperties(), false);
theOSystem->attach(&propertiesSet); theOSystem->attach(&propertiesSet);
if ( !GXOpenDisplay(hWnd, GX_FULLSCREEN) || !GXOpenInput() ) if ( !GXOpenDisplay(hWnd, GX_FULLSCREEN) || !GXOpenInput() )