Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanups. Shouldn't include any functional changes, except maybe

Browse Source 
better cleanup on exiting.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32147 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2009-08-05 21:30:39 +00:00
parent 804f3b726b
commit 9a95658ce0
2 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/game/WindowScreen.h
View File

@ -83,7 +83,9 @@ class BWindowScreen : public BWindow {
status_t _Activate(); status_t _Activate();
status_t _Deactivate(); status_t _Deactivate();
status_t _SetupAccelerantHooks(bool enable); status_t _SetupAccelerantHooks();
void _ResetAccelerantHooks();
status_t _GetCardInfo(); status_t _GetCardInfo();
void _Suspend(); void _Suspend();
void _Resume(); void _Resume();

181
src/kits/game/WindowScreen.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008, Haiku. All Rights Reserved. * Copyright 2002-2009, Haiku. All Rights Reserved.
* Copyright 2002-2005, * Copyright 2002-2005,
* Marcus Overhagen, * Marcus Overhagen,
* Stefano Ceccherini (stefano.ceccherini@gmail.com), * Stefano Ceccherini (stefano.ceccherini@gmail.com),
@ -32,7 +32,7 @@
using BPrivate::AppServerLink; using BPrivate::AppServerLink;
//#define TRACE_WINDOWSCREEN 1 #define TRACE_WINDOWSCREEN 1
#if TRACE_WINDOWSCREEN #if TRACE_WINDOWSCREEN
# define CALLED() printf("%s\n", __PRETTY_FUNCTION__); # define CALLED() printf("%s\n", __PRETTY_FUNCTION__);
#else #else
@ -321,44 +321,45 @@ BWindowScreen::SetColorList(rgb_color *list, int32 firstIndex, int32 lastIndex)
if (firstIndex < 0 || lastIndex > 255 || firstIndex > lastIndex) if (firstIndex < 0 || lastIndex > 255 || firstIndex > lastIndex)
return; return;
if (Lock()) { if (!Lock())
if (!fActivateState) { return;
// If we aren't active, we just change our local palette
for (int32 x = firstIndex; x <= lastIndex; x++) { if (!fActivateState) {
fPalette[x] = list[x]; // If we aren't active, we just change our local palette
} for (int32 x = firstIndex; x <= lastIndex; x++) {
} else { fPalette[x] = list[x];
uint8 colors[3 * 256]; }
// the color table has 3 bytes per color } else {
int32 j = 0; uint8 colors[3 * 256];
// the color table has 3 bytes per color
int32 j = 0;
for (int32 x = firstIndex; x <= lastIndex; x++) { for (int32 x = firstIndex; x <= lastIndex; x++) {
fPalette[x] = list[x]; fPalette[x] = list[x];
// update our local palette as well // update our local palette as well
colors[j++] = list[x].red; colors[j++] = list[x].red;
colors[j++] = list[x].green; colors[j++] = list[x].green;
colors[j++] = list[x].blue; colors[j++] = list[x].blue;
}
if (fAddonImage >= 0) {
set_indexed_colors setIndexedColors =
(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
NULL);
if (setIndexedColors != NULL) {
setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
colors, 0);
}
}
// TODO: Tell the app_server about our changes
BScreen screen(this);
screen.WaitForRetrace();
} }
Unlock(); if (fAddonImage >= 0) {
set_indexed_colors setIndexedColors =
(set_indexed_colors)fGetAccelerantHook(B_SET_INDEXED_COLORS,
NULL);
if (setIndexedColors != NULL) {
setIndexedColors(lastIndex - firstIndex + 1, firstIndex,
colors, 0);
}
}
// TODO: Tell the app_server about our changes
BScreen screen(this);
screen.WaitForRetrace();
} }
Unlock();
} }
@ -683,11 +684,12 @@ BWindowScreen::_DisposeData()
status_t status_t
BWindowScreen::_Activate() BWindowScreen::_Activate()
{ {
CALLED();
status_t status = _AssertDisplayMode(fDisplayMode); status_t status = _AssertDisplayMode(fDisplayMode);
if (status < B_OK) if (status < B_OK)
return status; return status;
status = _SetupAccelerantHooks(true); status = _SetupAccelerantHooks();
if (status < B_OK) if (status < B_OK)
return status; return status;
@ -716,6 +718,7 @@ BWindowScreen::_Activate()
status_t status_t
BWindowScreen::_Deactivate() BWindowScreen::_Deactivate()
{ {
CALLED();
_AssertDisplayMode(fOriginalDisplayMode); _AssertDisplayMode(fOriginalDisplayMode);
if (fDebugState && !fDebugFirst) { if (fDebugState && !fDebugFirst) {
@ -724,76 +727,72 @@ BWindowScreen::_Deactivate()
} else } else
ScreenConnected(false); ScreenConnected(false);
status_t status = _SetupAccelerantHooks(false); _ResetAccelerantHooks();
if (status == B_OK) {
be_app->ShowCursor(); be_app->ShowCursor();
if (fActivateState) { if (fActivateState) {
// TODO: reset palette BScreen screen(this);
} SetColorList((rgb_color *)screen.ColorMap()->color_list);
} }
return status; return B_OK;
} }
status_t status_t
BWindowScreen::_SetupAccelerantHooks(bool enable) BWindowScreen::_SetupAccelerantHooks()
{ {
CALLED(); CALLED();
if (fAddonImage >= 0) {
fWaitEngineIdle();
sFillRectHook = NULL;
sBlitRectHook = NULL;
sTransparentBlitHook = NULL;
sScaledFilteredBlitHook = NULL;
sWaitIdleHook = NULL;
sEngineToken = NULL;
sAcquireEngineHook = NULL;
sReleaseEngineHook = NULL;
}
fLockState = enable ? 1 : 0;
status_t status = B_OK; status_t status = B_OK;
if (enable) { if (fAddonImage < 0)
acquire_engine aquireEngine = NULL; status = _InitClone();
release_engine releaseEngine = NULL; else {
fill_rectangle fillRectangle = NULL; if (fWaitEngineIdle)
screen_to_screen_blit blit = NULL;
screen_to_screen_transparent_blit transparentBlit = NULL;
screen_to_screen_scaled_filtered_blit scaledFilteredBlit = NULL;
if (fAddonImage < 0) {
status = _InitClone();
if (status == B_OK) {
fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
releaseEngine = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL);
aquireEngine = (acquire_engine)fGetAccelerantHook(B_ACQUIRE_ENGINE, NULL);
fillRectangle = (fill_rectangle)fGetAccelerantHook(B_FILL_RECTANGLE, NULL);
blit = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL);
transparentBlit = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL);
scaledFilteredBlit = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL);
}
}
if (status == B_OK) {
sFillRectHook = fillRectangle;
sBlitRectHook = blit;
sTransparentBlitHook = transparentBlit;
sScaledFilteredBlitHook = scaledFilteredBlit;
sWaitIdleHook = fWaitEngineIdle;
sAcquireEngineHook = aquireEngine;
sReleaseEngineHook = releaseEngine;
fWaitEngineIdle(); fWaitEngineIdle();
}
_ResetAccelerantHooks();
} }
if (status == B_OK) {
sWaitIdleHook = fWaitEngineIdle = (wait_engine_idle)fGetAccelerantHook(B_WAIT_ENGINE_IDLE, NULL);
sReleaseEngineHook = (release_engine)fGetAccelerantHook(B_RELEASE_ENGINE, NULL);
sAcquireEngineHook = (acquire_engine)fGetAccelerantHook(B_ACQUIRE_ENGINE, NULL);
sFillRectHook = (fill_rectangle)fGetAccelerantHook(B_FILL_RECTANGLE, NULL);
sBlitRectHook = (screen_to_screen_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_BLIT, NULL);
sTransparentBlitHook = (screen_to_screen_transparent_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_TRANSPARENT_BLIT, NULL);
sScaledFilteredBlitHook = (screen_to_screen_scaled_filtered_blit)fGetAccelerantHook(B_SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT, NULL);
if (fWaitEngineIdle)
fWaitEngineIdle();
fLockState = 1;
}
return status; return status;
} }
void
BWindowScreen::_ResetAccelerantHooks()
{
CALLED();
sFillRectHook = NULL;
sBlitRectHook = NULL;
sTransparentBlitHook = NULL;
sScaledFilteredBlitHook = NULL;
sWaitIdleHook = NULL;
sEngineToken = NULL;
sAcquireEngineHook = NULL;
sReleaseEngineHook = NULL;
fWaitEngineIdle = NULL;
fLockState = 0;
}
status_t status_t
BWindowScreen::_GetCardInfo() BWindowScreen::_GetCardInfo()
{ {