From 6f633eb2a6c36b0e8b8f3ed459039ac5272ef5f2 Mon Sep 17 00:00:00 2001 From: Stefano Ceccherini Date: Fri, 17 Dec 2004 08:29:08 +0000 Subject: [PATCH] Some comments on possible changes, before I forget about them. Compacted some code. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10480 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/game/WindowScreen.cpp | 47 +++++++++++----------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/src/kits/game/WindowScreen.cpp b/src/kits/game/WindowScreen.cpp index 76db7174e6..8910df0efc 100644 --- a/src/kits/game/WindowScreen.cpp +++ b/src/kits/game/WindowScreen.cpp @@ -370,6 +370,7 @@ BWindowScreen::Disconnect() } } + void BWindowScreen::WindowActivated(bool active) { @@ -378,6 +379,7 @@ BWindowScreen::WindowActivated(bool active) SetActiveState(1); } + void BWindowScreen::WorkspaceActivated(int32 ws, bool state) @@ -486,11 +488,7 @@ BWindowScreen::SetSpace(uint32 space) bool BWindowScreen::CanControlFrameBuffer() { - bool retval = false; - if (addon_state <= 1 && (card_info.flags & B_FRAME_BUFFER_CONTROL)) - retval = true; - - return retval; + return (addon_state <= 1 && (card_info.flags & B_FRAME_BUFFER_CONTROL)); } @@ -506,6 +504,7 @@ BWindowScreen::SetFrameBuffer(int32 width, int32 height) display_mode mode = highMode; // equivalent to BScreen::ProposeMode() + // TODO: So why don't we just use it instead? _BAppServerLink_ link; link.fSession->swrite_l(WS_DISPLAY_UTILS); link.fSession->swrite_l(screen_index); @@ -678,35 +677,17 @@ BWindowScreen::Suspend(char *label) status_t -BWindowScreen::Perform(perform_code d, - void *arg) +BWindowScreen::Perform(perform_code d, void *arg) { return inherited::Perform(d, arg); } -void -BWindowScreen::_ReservedWindowScreen1() -{ -} - - -void -BWindowScreen::_ReservedWindowScreen2() -{ -} - - -void -BWindowScreen::_ReservedWindowScreen3() -{ -} - - -void -BWindowScreen::_ReservedWindowScreen4() -{ -} +// Reserved for future binary compatibility +void BWindowScreen::_ReservedWindowScreen1() {} +void BWindowScreen::_ReservedWindowScreen2() {} +void BWindowScreen::_ReservedWindowScreen3() {} +void BWindowScreen::_ReservedWindowScreen4() {} /* unimplemented for protection of the user: @@ -785,8 +766,7 @@ BWindowScreen::InitData(uint32 space, uint32 attributes) GetCardInfo(); activate_sem = create_sem(0, "WindowScreen start lock"); activate_state = 0; - - + return B_OK; } @@ -1034,6 +1014,8 @@ BWindowScreen::GetModeFromSpace(uint32 space, display_mode *dmode) status_t BWindowScreen::InitClone() { + // TODO: Using BScreen::GetDeviceInfo() could do the job, I think, + // but it always returns B_ERROR on my system (Rudolf's Nvidia driver) _BAppServerLink_ link; link.fSession->swrite_l(WS_GET_ACCELERANT_NAME); link.fSession->swrite_l(screen_index); @@ -1071,7 +1053,7 @@ BWindowScreen::InitClone() free(addonName); - if(addon_image < 0) + if (addon_image < 0) return B_ERROR; // now get the symbol for GetAccelerantHook m_gah @@ -1104,6 +1086,7 @@ BWindowScreen::AssertDisplayMode(display_mode *dmode) status_t result; _BAppServerLink_ link; + // TODO: Why not BScreen::SetMode() ? link.fSession->swrite_l(WS_GET_DISPLAY_MODE); // check display_mode valid command link.fSession->swrite_l(screen_index); link.fSession->swrite(sizeof(display_mode), (void *)dmode);