i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some comments on possible changes, before I forget about them. Compacted some code.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10480 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-12-17 08:29:08 +00:00
parent 74661a6096
commit 6f633eb2a6
1 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/WindowScreen.cpp
+15 -32
View File
@@ -370,6 +370,7 @@ BWindowScreen::Disconnect()
} }
} }
void void
BWindowScreen::WindowActivated(bool active) BWindowScreen::WindowActivated(bool active)
{ {
@@ -378,6 +379,7 @@ BWindowScreen::WindowActivated(bool active)
SetActiveState(1); SetActiveState(1);
} }
void void
BWindowScreen::WorkspaceActivated(int32 ws, BWindowScreen::WorkspaceActivated(int32 ws,
bool state) bool state)
@@ -486,11 +488,7 @@ BWindowScreen::SetSpace(uint32 space)
bool bool
BWindowScreen::CanControlFrameBuffer() BWindowScreen::CanControlFrameBuffer()
{ {
bool retval = false; return (addon_state <= 1 && (card_info.flags & B_FRAME_BUFFER_CONTROL));
if (addon_state <= 1 && (card_info.flags & B_FRAME_BUFFER_CONTROL))
retval = true;
return retval;
} }
@@ -506,6 +504,7 @@ BWindowScreen::SetFrameBuffer(int32 width, int32 height)
display_mode mode = highMode; display_mode mode = highMode;
// equivalent to BScreen::ProposeMode() // equivalent to BScreen::ProposeMode()
// TODO: So why don't we just use it instead?
_BAppServerLink_ link; _BAppServerLink_ link;
link.fSession->swrite_l(WS_DISPLAY_UTILS); link.fSession->swrite_l(WS_DISPLAY_UTILS);
link.fSession->swrite_l(screen_index); link.fSession->swrite_l(screen_index);
@@ -678,35 +677,17 @@ BWindowScreen::Suspend(char *label)
status_t status_t
BWindowScreen::Perform(perform_code d, BWindowScreen::Perform(perform_code d, void *arg)
void *arg)
{ {
return inherited::Perform(d, arg); return inherited::Perform(d, arg);
} }
void // Reserved for future binary compatibility
BWindowScreen::_ReservedWindowScreen1() void BWindowScreen::_ReservedWindowScreen1() {}
{ void BWindowScreen::_ReservedWindowScreen2() {}
} void BWindowScreen::_ReservedWindowScreen3() {}
void BWindowScreen::_ReservedWindowScreen4() {}
void
BWindowScreen::_ReservedWindowScreen2()
{
}
void
BWindowScreen::_ReservedWindowScreen3()
{
}
void
BWindowScreen::_ReservedWindowScreen4()
{
}
/* unimplemented for protection of the user: /* unimplemented for protection of the user:
@@ -785,8 +766,7 @@ BWindowScreen::InitData(uint32 space, uint32 attributes)
GetCardInfo(); GetCardInfo();
activate_sem = create_sem(0, "WindowScreen start lock"); activate_sem = create_sem(0, "WindowScreen start lock");
activate_state = 0; activate_state = 0;
return B_OK; return B_OK;
} }
@@ -1034,6 +1014,8 @@ BWindowScreen::GetModeFromSpace(uint32 space, display_mode *dmode)
status_t status_t
BWindowScreen::InitClone() 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; _BAppServerLink_ link;
link.fSession->swrite_l(WS_GET_ACCELERANT_NAME); link.fSession->swrite_l(WS_GET_ACCELERANT_NAME);
link.fSession->swrite_l(screen_index); link.fSession->swrite_l(screen_index);
@@ -1071,7 +1053,7 @@ BWindowScreen::InitClone()
free(addonName); free(addonName);
if(addon_image < 0) if (addon_image < 0)
return B_ERROR; return B_ERROR;
// now get the symbol for GetAccelerantHook m_gah // now get the symbol for GetAccelerantHook m_gah
@@ -1104,6 +1086,7 @@ BWindowScreen::AssertDisplayMode(display_mode *dmode)
status_t result; status_t result;
_BAppServerLink_ link; _BAppServerLink_ link;
// TODO: Why not BScreen::SetMode() ?
link.fSession->swrite_l(WS_GET_DISPLAY_MODE); // check display_mode valid command link.fSession->swrite_l(WS_GET_DISPLAY_MODE); // check display_mode valid command
link.fSession->swrite_l(screen_index); link.fSession->swrite_l(screen_index);
link.fSession->swrite(sizeof(display_mode), (void *)dmode); link.fSession->swrite(sizeof(display_mode), (void *)dmode);