From: <ave...@us...> - 2008-09-28 14:54:53
|
Revision: 5366 http://gemrb.svn.sourceforge.net/gemrb/?rev=5366&view=rev Author: avenger_teambg Date: 2008-09-28 14:54:41 +0000 (Sun, 28 Sep 2008) Log Message: ----------- detecting double clicks Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Button.cpp gemrb/trunk/gemrb/plugins/Core/Button.h gemrb/trunk/gemrb/plugins/Core/Control.cpp gemrb/trunk/gemrb/plugins/Core/Control.h gemrb/trunk/gemrb/plugins/Core/EventMgr.cpp gemrb/trunk/gemrb/plugins/Core/EventMgr.h gemrb/trunk/gemrb/plugins/Core/GameControl.cpp gemrb/trunk/gemrb/plugins/Core/GameControl.h gemrb/trunk/gemrb/plugins/Core/Label.cpp gemrb/trunk/gemrb/plugins/Core/Label.h gemrb/trunk/gemrb/plugins/Core/MapControl.cpp gemrb/trunk/gemrb/plugins/Core/MapControl.h gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp gemrb/trunk/gemrb/plugins/Core/ScrollBar.h gemrb/trunk/gemrb/plugins/Core/Slider.cpp gemrb/trunk/gemrb/plugins/Core/Slider.h gemrb/trunk/gemrb/plugins/Core/TextArea.cpp gemrb/trunk/gemrb/plugins/Core/TextArea.h gemrb/trunk/gemrb/plugins/Core/WorldMapControl.cpp gemrb/trunk/gemrb/plugins/Core/WorldMapControl.h Modified: gemrb/trunk/gemrb/plugins/Core/Button.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Button.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Button.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -340,7 +340,7 @@ /** Mouse Button Down */ void Button::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod) + unsigned short Button, unsigned short Mod) { if (State == IE_GUI_BUTTON_DISABLED) { Control::OnMouseDown(x,y,Button,Mod); @@ -393,7 +393,7 @@ } /** Mouse Button Up */ void Button::OnMouseUp(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod) + unsigned short Button, unsigned short Mod) { if (State == IE_GUI_BUTTON_DISABLED) { return; Modified: gemrb/trunk/gemrb/plugins/Core/Button.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Button.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Button.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -158,10 +158,10 @@ /** Mouse Over */ void OnMouseOver(unsigned short x, unsigned short y); /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** A special key has been pressed */ void OnSpecialKeyPress(unsigned char Key); Modified: gemrb/trunk/gemrb/plugins/Core/Control.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Control.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Control.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -160,7 +160,7 @@ /** Mouse Button Down */ void Control::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod) + unsigned short Button, unsigned short Mod) { if (Button == GEM_MB_SCRLUP || Button == GEM_MB_SCRLDOWN) { Control *ctrl = Owner->GetScrollControl(); @@ -172,7 +172,7 @@ /** Mouse Button Up */ void Control::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/, - unsigned char /*Button*/, unsigned short /*Mod*/) + unsigned short /*Button*/, unsigned short /*Mod*/) { //printf("OnMouseUp: CtrlID = 0x%08X, x = %hd, y = %hd, Button = %d, Mos = %hd\n", (unsigned int) ControlID, x, y, Button, Mod); } Modified: gemrb/trunk/gemrb/plugins/Core/Control.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Control.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Control.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -155,10 +155,10 @@ virtual void OnMouseOver(unsigned short x, unsigned short y); /** Mouse Button Down */ virtual void OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod); + unsigned short Button, unsigned short Mod); /** Mouse Button Up */ virtual void OnMouseUp(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod); + unsigned short Button, unsigned short Mod); /** Special Key Press */ virtual void OnSpecialKeyPress(unsigned char Key); virtual bool IsPixelTransparent(unsigned short /*x*/, unsigned short /*y*/) { Modified: gemrb/trunk/gemrb/plugins/Core/EventMgr.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/EventMgr.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/EventMgr.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -24,12 +24,18 @@ #include "Interface.h" #include "Video.h" +//double click time (configure? system variable?) +#define DC_TIME 500 + EventMgr::EventMgr(void) { last_win_focused = NULL; // Last window we were over. Used to determine MouseEnter and MouseLeave events last_win_over = NULL; MButtons = 0; + dc_x = 0; + dc_y = 0; + dc_time = 0; } EventMgr::~EventMgr(void) @@ -198,13 +204,27 @@ } /** BroadCast Mouse Move Event */ -void EventMgr::MouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod) +void EventMgr::MouseDown(unsigned short x, unsigned short y, unsigned short Button, + unsigned short Mod) { std::vector< int>::iterator t; std::vector< Window*>::iterator m; Control *ctrl; + unsigned long thisTime; + GetTime( thisTime ); + if (dc_x==x && dc_y==y && dc_time>thisTime) { + Button |= GEM_MB_DOUBLECLICK; + dc_x = 0; + dc_y = 0; + dc_time = 0; + } else { + printMessage("EventMgr","",GREEN); + printf("time: %d\n", (int) (thisTime-dc_time) ); + dc_x = x; + dc_y = y; + dc_time = thisTime+DC_TIME; + } MButtons |= Button; for (t = topwin.begin(); t != topwin.end(); ++t) { m = windows.begin(); @@ -247,8 +267,8 @@ } } /** BroadCast Mouse Up Event */ -void EventMgr::MouseUp(unsigned short x, unsigned short y, - unsigned char Button, unsigned short Mod) +void EventMgr::MouseUp(unsigned short x, unsigned short y, unsigned short Button, + unsigned short Mod) { MButtons &= ~Button; if (last_win_focused == NULL) return; Modified: gemrb/trunk/gemrb/plugins/Core/EventMgr.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/EventMgr.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/EventMgr.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -56,7 +56,8 @@ #define GEM_MB_MENU 4 #define GEM_MB_SCRLUP 8 #define GEM_MB_SCRLDOWN 16 -//not working actually + +#define GEM_MB_NORMAL 255 #define GEM_MB_DOUBLECLICK 256 #ifdef WIN32 @@ -82,6 +83,8 @@ std::vector< Window*> windows; std::vector< int> topwin; + unsigned short dc_x, dc_y; + unsigned long dc_time; public: EventMgr(void); ~EventMgr(void); @@ -97,10 +100,10 @@ /** BroadCast Mouse Move Event */ void MouseMove(unsigned short x, unsigned short y); /** BroadCast Mouse Move Event */ - void MouseDown(unsigned short x, unsigned short y, unsigned char Button, + void MouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** BroadCast Mouse Move Event */ - void MouseUp(unsigned short x, unsigned short y, unsigned char Button, + void MouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** BroadCast Mouse Idle Event */ void MouseIdle(unsigned long time); Modified: gemrb/trunk/gemrb/plugins/Core/GameControl.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -1343,8 +1343,8 @@ return false; } /** Mouse Button Down */ -void GameControl::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) +void GameControl::OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, + unsigned short /*Mod*/) { if (ScreenFlags&SF_DISABLEMOUSE) return; @@ -1371,8 +1371,8 @@ } } /** Mouse Button Up */ -void GameControl::OnMouseUp(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) +void GameControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, + unsigned short /*Mod*/) { unsigned int i; char Tmp[256]; Modified: gemrb/trunk/gemrb/plugins/Core/GameControl.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameControl.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/GameControl.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -136,10 +136,10 @@ /** Mouse Over Event */ void OnMouseOver(unsigned short x, unsigned short y); /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Special Key Press */ void OnSpecialKeyPress(unsigned char Key); Modified: gemrb/trunk/gemrb/plugins/Core/Label.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Label.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Label.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -114,7 +114,7 @@ } void Label::OnMouseUp(unsigned short x, unsigned short y, - unsigned char /*Button*/, unsigned short /*Mod*/) + unsigned short /*Button*/, unsigned short /*Mod*/) { printf( "Label::OnMouseUp\n" ); if (( x <= Width ) && ( y <= Height )) { Modified: gemrb/trunk/gemrb/plugins/Core/Label.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Label.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Label.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -70,7 +70,7 @@ const char* QueryText(); /** Mouse Button Down */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Set handler for specified event */ bool SetEvent(int eventType, const char *handler); Modified: gemrb/trunk/gemrb/plugins/Core/MapControl.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/MapControl.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/MapControl.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -86,6 +86,8 @@ // initialize var and event callback to no-ops VarName[0] = 0; ResetEventHandler( MapControlOnPress ); + ResetEventHandler( MapControlOnRightPress ); + ResetEventHandler( MapControlOnDoublePress ); MyMap = core->GetGame()->GetCurrentArea(); MapMOS = MyMap->SmallMap->GetImage(); @@ -325,11 +327,24 @@ Owner->Cursor = IE_CURSOR_NORMAL; } -void MapControl::ClickHandle() +void MapControl::ClickHandle(unsigned char Button) { core->GetDictionary()->SetAt( "MapControlX", NotePosX ); core->GetDictionary()->SetAt( "MapControlY", NotePosY ); - RunEventHandler( MapControlOnPress ); + switch(Button&GEM_MB_NORMAL) + { + case GEM_MB_ACTION: + if (Button&GEM_MB_DOUBLECLICK) { + RunEventHandler( MapControlOnDoublePress ); + printMessage("MapControl","Doubleclick detected\n",GREEN); + } else { + RunEventHandler( MapControlOnPress ); + } + break; + case GEM_MB_MENU: + RunEventHandler( MapControlOnRightPress ); + break; + } } void MapControl::ViewHandle(unsigned short x, unsigned short y) @@ -346,16 +361,20 @@ } /** Mouse Button Down */ -void MapControl::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) +void MapControl::OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, + unsigned short /*Mod*/) { - switch(Button) { + switch((unsigned char) Button) { case GEM_MB_SCRLUP: OnSpecialKeyPress(GEM_UP); return; case GEM_MB_SCRLDOWN: OnSpecialKeyPress(GEM_DOWN); return; + case GEM_MB_ACTION: + if (Button & GEM_MB_DOUBLECLICK) { + ClickHandle((unsigned char) Button); + } } mouseIsDown = true; @@ -374,8 +393,8 @@ } /** Mouse Button Up */ -void MapControl::OnMouseUp(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) +void MapControl::OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, + unsigned short /*Mod*/) { if (!mouseIsDown) { return; @@ -388,7 +407,7 @@ ViewHandle(x,y); NotePosX = (short) SCREEN_TO_MAPX(x) * MAP_MULT / MAP_DIV; NotePosY = (short) SCREEN_TO_MAPY(y) * MAP_MULT / MAP_DIV; - ClickHandle(); + ClickHandle((unsigned char) Button); return; case MAP_NO_NOTES: ViewHandle(x,y); @@ -398,10 +417,10 @@ if ((Button == GEM_MB_ACTION) ) { ViewHandle(x,y); } - ClickHandle(); - break; + ClickHandle((unsigned char) Button); + return; default: - ClickHandle(); + ClickHandle((unsigned char) Button); return; } } @@ -448,6 +467,12 @@ case IE_GUI_MAP_ON_PRESS: SetEventHandler( MapControlOnPress, handler ); break; + case IE_GUI_MAP_ON_RIGHT_PRESS: + SetEventHandler( MapControlOnRightPress, handler ); + break; + case IE_GUI_MAP_ON_DOUBLE_PRESS: + SetEventHandler( MapControlOnDoublePress, handler ); + break; default: return false; } Modified: gemrb/trunk/gemrb/plugins/Core/MapControl.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/MapControl.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/MapControl.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -33,9 +33,10 @@ #include "Interface.h" // !!! Keep these synchronized with GUIDefines.py !!! -#define IE_GUI_MAP_ON_PRESS 0x09000000 +#define IE_GUI_MAP_ON_PRESS 0x09000000 +#define IE_GUI_MAP_ON_RIGHT_PRESS 0x09000001 +#define IE_GUI_MAP_ON_DOUBLE_PRESS 0x09000002 - #ifdef WIN32 #ifdef GEM_BUILD_DLL @@ -77,6 +78,8 @@ short ViewWidth, ViewHeight; short XCenter, YCenter; EventHandler MapControlOnPress; + EventHandler MapControlOnRightPress; + EventHandler MapControlOnDoublePress; MapControl(void); ~MapControl(void); @@ -97,10 +100,10 @@ /** Mouse Leave Event */ void OnMouseLeave(unsigned short x, unsigned short y); /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Key Release Event */ void OnKeyRelease(unsigned char Key, unsigned short Mod); @@ -110,7 +113,7 @@ bool SetEvent(int eventType, const char *handler); private: /** Call event handler on click */ - void ClickHandle(); + void ClickHandle(unsigned char Button); /** Move viewport */ void ViewHandle(unsigned short x, unsigned short y); }; Modified: gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -145,7 +145,7 @@ } /** Mouse Button Down */ void ScrollBar::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) + unsigned short Button, unsigned short /*Mod*/) { core->RedrawAll(); @@ -212,7 +212,7 @@ } /** Mouse Button Up */ void ScrollBar::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/, - unsigned char /*Button*/, unsigned short /*Mod*/) + unsigned short /*Button*/, unsigned short /*Mod*/) { Changed = true; State = 0; Modified: gemrb/trunk/gemrb/plugins/Core/ScrollBar.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/ScrollBar.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/ScrollBar.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -95,10 +95,10 @@ Control* ta; public: // Public Events /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Over Event */ void OnMouseOver(unsigned short x, unsigned short y); Modified: gemrb/trunk/gemrb/plugins/Core/Slider.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Slider.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Slider.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -90,11 +90,13 @@ break; } } + /** Returns the actual Slider Position */ unsigned int Slider::GetPosition() { return Pos; } + /** Sets the actual Slider Position trimming to the Max and Min Values */ void Slider::SetPosition(unsigned int pos) { @@ -108,6 +110,7 @@ } Changed = true; } + /** Redraws a slider which is associated with VariableName */ void Slider::RedrawSlider(const char* VariableName, int Sum) { @@ -123,6 +126,7 @@ } Changed = true; } + /** Sets the selected image */ void Slider::SetImage(unsigned char type, Sprite2D* img) { @@ -149,8 +153,8 @@ } /** Mouse Button Down */ -void Slider::OnMouseDown(unsigned short x, unsigned short y, - unsigned char /*Button*/, unsigned short /*Mod*/) +void Slider::OnMouseDown(unsigned short x, unsigned short y, unsigned short /*Button*/, + unsigned short /*Mod*/) { Changed = true; unsigned int oldPos = Pos; @@ -220,15 +224,17 @@ } } } + /** Mouse Button Up */ -void Slider::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/, - unsigned char /*Button*/, unsigned short /*Mod*/) +void Slider::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/, unsigned short /*Button*/, + unsigned short /*Mod*/) { if (State != IE_GUI_SLIDER_KNOB) { Changed = true; } State = IE_GUI_SLIDER_KNOB; } + /** Mouse Over Event */ void Slider::OnMouseOver(unsigned short x, unsigned short /*y*/) { @@ -270,6 +276,7 @@ return 0; } +/** Sets the slider change event */ bool Slider::SetEvent(int eventType, const char *handler) { Changed = true; Modified: gemrb/trunk/gemrb/plugins/Core/Slider.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Slider.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/Slider.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -101,9 +101,11 @@ unsigned int Pos; public: // Public Events /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod); + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, + unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, unsigned short Mod); + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, + unsigned short Mod); /** Mouse Over Event */ void OnMouseOver(unsigned short x, unsigned short y); /** Set handler for specified event */ Modified: gemrb/trunk/gemrb/plugins/Core/TextArea.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/TextArea.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/TextArea.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -775,8 +775,8 @@ } /** Mouse Button Up */ -void TextArea::OnMouseUp(unsigned short x, unsigned short y, - unsigned char /*Button*/, unsigned short /*Mod*/) +void TextArea::OnMouseUp(unsigned short x, unsigned short y, unsigned short /*Button*/, + unsigned short /*Mod*/) { if (( x <= Width ) && ( y <= ( Height - 5 ) ) && ( seltext != -1 )) { Value = (unsigned int) seltext; @@ -912,8 +912,8 @@ AppendText("\n",-1); } -void TextArea::OnMouseDown(unsigned short /*x*/, unsigned short /*y*/, - unsigned char Button, unsigned short /*Mod*/) +void TextArea::OnMouseDown(unsigned short /*x*/, unsigned short /*y*/, unsigned short Button, + unsigned short /*Mod*/) { ScrollBar* scrlbr = (ScrollBar*) sb; Modified: gemrb/trunk/gemrb/plugins/Core/TextArea.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/TextArea.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/TextArea.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -167,10 +167,10 @@ /** Mouse Over Event */ void OnMouseOver(unsigned short x, unsigned short y); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse button down*/ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Set handler for specified event */ bool SetEvent(int eventType, const char *handler); Modified: gemrb/trunk/gemrb/plugins/Core/WorldMapControl.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/WorldMapControl.cpp 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/WorldMapControl.cpp 2008-09-28 14:54:41 UTC (rev 5366) @@ -276,7 +276,7 @@ /** Mouse Button Down */ void WorldMapControl::OnMouseDown(unsigned short x, unsigned short y, - unsigned char Button, unsigned short /*Mod*/) + unsigned short Button, unsigned short /*Mod*/) { switch(Button) { case GEM_MB_ACTION: @@ -294,7 +294,7 @@ } /** Mouse Button Up */ void WorldMapControl::OnMouseUp(unsigned short /*x*/, unsigned short /*y*/, - unsigned char Button, unsigned short /*Mod*/) + unsigned short Button, unsigned short /*Mod*/) { if (Button != GEM_MB_ACTION) { return; Modified: gemrb/trunk/gemrb/plugins/Core/WorldMapControl.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/WorldMapControl.h 2008-09-27 09:06:19 UTC (rev 5365) +++ gemrb/trunk/gemrb/plugins/Core/WorldMapControl.h 2008-09-28 14:54:41 UTC (rev 5366) @@ -108,10 +108,10 @@ /** Mouse Leave Event */ void OnMouseLeave(unsigned short x, unsigned short y); /** Mouse Button Down */ - void OnMouseDown(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseDown(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Mouse Button Up */ - void OnMouseUp(unsigned short x, unsigned short y, unsigned char Button, + void OnMouseUp(unsigned short x, unsigned short y, unsigned short Button, unsigned short Mod); /** Key Release Event */ void OnKeyRelease(unsigned char Key, unsigned short Mod); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |