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

If the popup was asynchronous, the window menu semaphore was never resetted

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16962 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-04-02 07:39:13 +00:00
parent b9e275a6a5
commit 9deb82dfc0
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/PopUpMenu.cpp
+12 -16
View File
@@ -298,10 +298,11 @@ BPopUpMenu::_go(BPoint where, bool autoInvoke, bool startOpened,
popup_menu_data *data = new popup_menu_data; popup_menu_data *data = new popup_menu_data;
sem_id sem = create_sem(0, "window close lock"); sem_id sem = create_sem(0, "window close lock");
data->window = window;
// Asynchronous menu: we set the BWindow menu's semaphore // Asynchronous menu: we set the BWindow menu's semaphore
// and let BWindow block when needed // and let BWindow block when needed
if (async) { if (async) {
data->window = window;
_set_menu_sem_(window, sem); _set_menu_sem_(window, sem);
} }
@@ -313,7 +314,6 @@ BPopUpMenu::_go(BPoint where, bool autoInvoke, bool startOpened,
data->async = async; data->async = async;
data->where = where; data->where = where;
data->startOpened = startOpened; data->startOpened = startOpened;
data->window = NULL;
data->selected = selected; data->selected = selected;
data->lock = sem; data->lock = sem;
@@ -326,7 +326,7 @@ BPopUpMenu::_go(BPoint where, bool autoInvoke, bool startOpened,
// Something went wrong. Cleanup and return NULL // Something went wrong. Cleanup and return NULL
delete_sem(sem); delete_sem(sem);
if (async) if (async)
_set_menu_sem_(window, B_NO_MORE_SEMS); _set_menu_sem_(window, B_BAD_SEM_ID);
delete data; delete data;
return NULL; return NULL;
} }
@@ -339,7 +339,8 @@ BPopUpMenu::_go(BPoint where, bool autoInvoke, bool startOpened,
// code. Though here we just want to wait till the semaphore is deleted // code. Though here we just want to wait till the semaphore is deleted
// (it will return B_BAD_SEM_ID in that case), not provide locking or whatever. // (it will return B_BAD_SEM_ID in that case), not provide locking or whatever.
while (acquire_sem_etc(sem, 1, B_TIMEOUT, 50000) != B_BAD_SEM_ID) while (acquire_sem_etc(sem, 1, B_TIMEOUT, 50000) != B_BAD_SEM_ID)
window->UpdateIfNeeded(); window->UpdateIfNeeded();
} }
status_t unused; status_t unused;
@@ -359,8 +360,7 @@ int32
BPopUpMenu::entry(void *arg) BPopUpMenu::entry(void *arg)
{ {
popup_menu_data *data = static_cast<popup_menu_data *>(arg); popup_menu_data *data = static_cast<popup_menu_data *>(arg);
BPopUpMenu *menu = data->object; BPopUpMenu *menu = data->object;
BPoint where = data->where; BPoint where = data->where;
BRect *rect = NULL; BRect *rect = NULL;
bool autoInvoke = data->autoInvoke; bool autoInvoke = data->autoInvoke;
@@ -369,17 +369,13 @@ BPopUpMenu::entry(void *arg)
if (data->useRect) if (data->useRect)
rect = &data->rect; rect = &data->rect;
BMenuItem *selected = menu->start_track(where, autoInvoke, data->selected = menu->start_track(where, autoInvoke, startOpened, rect);
startOpened, rect);
// Put the selected item in the shared struct.
data->selected = selected;
delete_sem(data->lock); delete_sem(data->lock);
// Reset the window menu semaphore // Reset the window menu semaphore
if (data->window) if (data->async && data->window)
_set_menu_sem_(data->window, B_NO_MORE_SEMS); _set_menu_sem_(data->window, B_BAD_SEM_ID);
// Commit suicide if needed // Commit suicide if needed
if (menu->fAutoDestruct) if (menu->fAutoDestruct)
@@ -396,8 +392,6 @@ BMenuItem *
BPopUpMenu::start_track(BPoint where, bool autoInvoke, BPopUpMenu::start_track(BPoint where, bool autoInvoke,
bool startOpened, BRect *_specialRect) bool startOpened, BRect *_specialRect)
{ {
BMenuItem *result = NULL;
fWhere = where; fWhere = where;
// I know, this doesn't look senseful, but don't be fooled, // I know, this doesn't look senseful, but don't be fooled,
@@ -410,7 +404,7 @@ BPopUpMenu::start_track(BPoint where, bool autoInvoke,
// Wait some time then track the menu // Wait some time then track the menu
snooze(50000); snooze(50000);
result = Track(startOpened, _specialRect); BMenuItem *result = Track(startOpened, _specialRect);
if (result != NULL && autoInvoke) if (result != NULL && autoInvoke)
result->Invoke(); result->Invoke();
@@ -418,6 +412,8 @@ BPopUpMenu::start_track(BPoint where, bool autoInvoke,
Hide(); Hide();
be_app->ShowCursor();
return result; return result;
} }