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

Windowscreen sorta works. This should've waited till the end of Christmas holidays, but since I had to fix the build today...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15670 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-12-25 10:45:39 +00:00
parent 805d0b82d1
commit 5a077d3f0d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/WindowScreen.cpp
+12 -12
View File
@@ -286,8 +286,8 @@ set_mouse_position(int32 x, int32 y)
BWindowScreen::BWindowScreen(const char *title, uint32 space, BWindowScreen::BWindowScreen(const char *title, uint32 space,
status_t *error, bool debug_enable) status_t *error, bool debug_enable)
: BWindow(BScreen().Frame().InsetByCopy(100, 100), title, B_TITLED_WINDOW, : BWindow(BScreen().Frame(), title, B_TITLED_WINDOW,
kWindowScreenFlag | B_NOT_MINIMIZABLE /*| B_NOT_CLOSABLE*/ kWindowScreenFlag | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE
| B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE, | B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
@@ -304,8 +304,8 @@ BWindowScreen::BWindowScreen(const char *title, uint32 space,
BWindowScreen::BWindowScreen(const char *title, uint32 space, BWindowScreen::BWindowScreen(const char *title, uint32 space,
uint32 attributes, status_t *error) uint32 attributes, status_t *error)
: BWindow(BScreen().Frame().InsetByCopy(100, 100), title, B_TITLED_WINDOW, : BWindow(BScreen().Frame(), title, B_TITLED_WINDOW,
kWindowScreenFlag | B_NOT_MINIMIZABLE /*| B_NOT_CLOSABLE*/ kWindowScreenFlag | B_NOT_MINIMIZABLE | B_NOT_CLOSABLE
| B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE, | B_NOT_ZOOMABLE | B_NOT_MOVABLE | B_NOT_RESIZABLE,
B_CURRENT_WORKSPACE) B_CURRENT_WORKSPACE)
{ {
@@ -752,10 +752,9 @@ BWindowScreen::SetActiveState(int32 state)
CALLED(); CALLED();
status_t status = B_ERROR; status_t status = B_ERROR;
if (state == 1) { if (state == 1) {
//be_app->HideCursor(); be_app->HideCursor();
if (/*be_app->IsCursorHidden() && */(status = SetLockState(1)) == B_OK) { if (be_app->IsCursorHidden() && (status = SetLockState(1)) == B_OK) {
status = AssertDisplayMode(fDisplayMode); status = AssertDisplayMode(fDisplayMode);
printf("AssertDisplayMode() returned %s\n", strerror(status));
if (status == B_OK) { if (status == B_OK) {
if (!fActivateState) { if (!fActivateState) {
while (acquire_sem(fActivateSem) == B_INTERRUPTED) while (acquire_sem(fActivateSem) == B_INTERRUPTED)
@@ -823,7 +822,6 @@ BWindowScreen::SetLockState(int32 state)
if (state == 1) { if (state == 1) {
if (fAddonImage < 0) { if (fAddonImage < 0) {
status = InitClone(); status = InitClone();
printf("InitClone() returned %s\n", strerror(status));
if (status == B_OK) { if (status == B_OK) {
m_wei = (wait_engine_idle)m_gah(B_WAIT_ENGINE_IDLE, NULL); m_wei = (wait_engine_idle)m_gah(B_WAIT_ENGINE_IDLE, NULL);
m_re = (release_engine)m_gah(B_RELEASE_ENGINE, NULL); m_re = (release_engine)m_gah(B_RELEASE_ENGINE, NULL);
@@ -831,7 +829,7 @@ BWindowScreen::SetLockState(int32 state)
} }
} }
if (status == B_OK && state == 1) { if (status == B_OK) {
fill_rect_global = fill_rect; fill_rect_global = fill_rect;
blit_rect_global = blit_rect; blit_rect_global = blit_rect;
trans_blit_rect_global = trans_blit_rect; trans_blit_rect_global = trans_blit_rect;
@@ -1006,7 +1004,6 @@ BWindowScreen::InitClone()
return fAddonImage; return fAddonImage;
} }
status = get_image_symbol(fAddonImage, B_ACCELERANT_ENTRY_POINT, status = get_image_symbol(fAddonImage, B_ACCELERANT_ENTRY_POINT,
B_SYMBOL_TYPE_ANY, (void **)&m_gah); B_SYMBOL_TYPE_ANY, (void **)&m_gah);
if (status < B_OK) { if (status < B_OK) {
@@ -1046,10 +1043,13 @@ BWindowScreen::InitClone()
status_t status_t
BWindowScreen::AssertDisplayMode(display_mode *dmode) BWindowScreen::AssertDisplayMode(display_mode *dmode)
{ {
status_t status = B_OK; status_t status = B_ERROR;
display_mode mode = *dmode;
mode.flags |= B_SCROLL;
// TODO: Assert display mode: negotiation with app server // TODO: Assert display mode: negotiation with app server
status = BScreen(this).SetMode(&mode);
if (status == B_OK) { if (status == B_OK) {
memcpy(fDisplayMode, dmode, sizeof(display_mode)); memcpy(fDisplayMode, dmode, sizeof(display_mode));
space_mode = 1; space_mode = 1;
src/servers/app/drawing/AccelerantHWInterface.cpp
+3 -2
View File
@@ -631,8 +631,9 @@ AccelerantHWInterface::GetAccelerantPath(BString &string)
status_t status_t
AccelerantHWInterface::GetDriverPath(BString &string) AccelerantHWInterface::GetDriverPath(BString &string)
{ {
// TODO: Get path from fCardFD: is that possible ? // TODO: hardcoded to vesa for now. Fix me
return B_ERROR; string = "graphics/vesa";
return B_OK;
} }