From: <ave...@us...> - 2004-01-09 17:44:31
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1:/tmp/cvs-serv10007/Core Modified Files: EventMgr.cpp EventMgr.h Log Message: Mod: Applied DragonMeat's mouse patch Index: EventMgr.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/EventMgr.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** EventMgr.cpp 26 Dec 2003 13:46:52 -0000 1.25 --- EventMgr.cpp 9 Jan 2004 17:44:28 -0000 1.26 *************** *** 30,33 **** --- 30,34 ---- lastW = NULL; lastF = NULL; + MButtons = 0; } *************** *** 145,148 **** --- 146,150 ---- std::vector<int>::iterator t; std::vector<Window*>::iterator m; + MButtons |= Button; for(t = topwin.begin(); t != topwin.end(); ++t) { m = windows.begin(); *************** *** 175,178 **** --- 177,181 ---- void EventMgr::MouseUp(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod) { + MButtons &= ~Button; if(lastF != NULL) { lastF->OnMouseUp(x-lastW->XPos-lastF->XPos, y-lastW->YPos-lastF->YPos, Button, Mod); Index: EventMgr.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/EventMgr.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** EventMgr.h 22 Dec 2003 23:25:28 -0000 1.10 --- EventMgr.h 9 Jan 2004 17:44:28 -0000 1.11 *************** *** 77,80 **** --- 77,82 ---- /** Special Ket Press Event */ void OnSpecialKeyPress(unsigned char Key); + /** Mask of which Mouse Buttons are pressed */ + unsigned char MButtons; private: /** Last Window under Mouse Pointer*/ |