Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

fix assumption that SDL_BUTTON < 3

Browse Source 
add ClearMouseState to reset buttons when alt+tabbing out (thanks to
Philip for mentioning the problem and Gustav for telling me how to fix
it :D)

This was SVN commit r3003.
This commit is contained in:
janwas 2005-10-24 21:10:45 +00:00
parent d49dd25385
commit 0d6dd7836d
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/gui/CGUI.cpp
View File

@ -65,11 +65,28 @@ InReaction gui_handler(const SDL_Event* ev)
return g_GUI.HandleEvent(ev);
}
// This is called after tasking out to another application. It avoids
// havoc by resetting the state of all mouse buttons to
// "not currently pressed". Since a button that happened to be pressed
// before the task switch will most likely be released during that time, we
// have to do this to prevent phantom mouse events when returing to our app.
void CGUI::ClearMouseState()
{
// reset all bits to "button is not currently pressed".
m_MouseButtons = 0;
}
InReaction CGUI::HandleEvent(const SDL_Event* ev)
{
InReaction ret = IN_PASS;
if (ev->type == SDL_GUIHOTKEYPRESS)
if (ev->type == SDL_ACTIVEEVENT)
{
if(ev->active.gain == 0)
g_GUI.ClearMouseState();
}
else if (ev->type == SDL_GUIHOTKEYPRESS)
{
const CStr& objectName = *(CStr*) ev->user.data1;
IGUIObject* object = FindObjectByName(objectName);
@ -99,9 +116,16 @@ InReaction CGUI::HandleEvent(const SDL_Event* ev)
// Update m_MouseButtons. (BUTTONUP is handled later.)
else if (ev->type == SDL_MOUSEBUTTONDOWN)
{
// (0,1,2) = (LMB,RMB,MMB)
if (ev->button.button < 3)
m_MouseButtons |= (1 << ev->button.button);
switch (ev->button.button)
{
case SDL_BUTTON_LEFT:
case SDL_BUTTON_RIGHT:
case SDL_BUTTON_MIDDLE:
m_MouseButtons |= BIT(ev->button.button);
break;
default:
break;
}
}
// JW: (pre|post)process omitted; what're they for? why would we need any special button_released handling?
@ -232,9 +256,16 @@ InReaction CGUI::HandleEvent(const SDL_Event* ev)
// on button up) see which mouse button had been pressed.
if (ev->type == SDL_MOUSEBUTTONUP)
{
// (0,1,2) = (LMB,RMB,MMB)
if (ev->button.button < 3)
m_MouseButtons &= ~(1 << ev->button.button);
switch (ev->button.button)
{
case SDL_BUTTON_LEFT:
case SDL_BUTTON_RIGHT:
case SDL_BUTTON_MIDDLE:
m_MouseButtons &= ~BIT(ev->button.button);
break;
default:
break;
}
}
// Handle keys for input boxes

3
source/gui/CGUI.h
View File

@ -250,6 +250,9 @@ public:
bool GetPreDefinedColor(const CStr &name, CColor &Output);
private:
void ClearMouseState();
/**
* Updates the object pointers, needs to be called each
* time an object has been added or removed.