[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src Lib/cMouse.hpp Lib/View/Desktop.c...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src Lib/cMouse.hpp Lib/View/Desktop.c... |
|
Date: |
Fri, 05 Sep 2003 21:09:51 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/05 21:09:50
Modified files:
src/Lib : cMouse.hpp
src/Lib/View : Desktop.cpp
src/NetPanzer/Classes: WorldInputCmdProcessor.cpp
src/NetPanzer/Interfaces: MouseInterface.cpp MouseInterface.hpp
src/NetPanzer/Views/Game: GameView.cpp MiniMapView.cpp
src/Win32 : Win32Mouse.cpp Win32Mouse.hpp
Log message:
-cleaned up MouseInterface
-wrote SDL mouse code
Patches:
Index: netpanzer/src/Lib/View/Desktop.cpp
diff -u netpanzer/src/Lib/View/Desktop.cpp:1.2
netpanzer/src/Lib/View/Desktop.cpp:1.3
--- netpanzer/src/Lib/View/Desktop.cpp:1.2 Mon Sep 1 16:24:19 2003
+++ netpanzer/src/Lib/View/Desktop.cpp Fri Sep 5 21:09:50 2003
@@ -72,7 +72,7 @@
{
iXY mousePos(mouseX, mouseY);
- MouseInterface::setCursor(_mcursor_default);
+ MouseInterface::setCursor(MouseInterface::defaultcursor);
prevMouseView = mouseView;
Index: netpanzer/src/Lib/cMouse.hpp
diff -u netpanzer/src/Lib/cMouse.hpp:1.2 netpanzer/src/Lib/cMouse.hpp:1.3
--- netpanzer/src/Lib/cMouse.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/cMouse.hpp Fri Sep 5 21:09:50 2003
@@ -92,7 +92,8 @@
{
return( button_mask );
}
- //FIXME//static inline const int getCurButton () { return
numButtons; }
+ //FIXME
+ //static inline const int getCurButton () { return numButtons;
}
static void setPointer(Surface *pointer);
}; // end cMouse
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.2
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.3
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.2 Mon Sep
1 16:24:20 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Fri Sep 5
21:09:50 2003
@@ -203,34 +203,37 @@
void WorldInputCmdProcessor::
setMouseCursor( unsigned char world_cursor_status )
{
+ // XXX yet another abstraction here? probably convert the cursor types
to
+ // simple strings (which are the names of the cursor images at the same
+ // time) and get rid of all this code here and in MouseInterface
switch( world_cursor_status )
{
case _cursor_regular :
- MouseInterface::setCursor( _mcursor_default );
+ MouseInterface::setCursor( MouseInterface::defaultcursor );
break;
case _cursor_move :
- MouseInterface::setCursor( _mcursor_move );
+ MouseInterface::setCursor( MouseInterface::move );
break;
case _cursor_blocked :
- MouseInterface::setCursor( _mcursor_noentry );
+ MouseInterface::setCursor( MouseInterface::noentry );
break;
case _cursor_player_unit :
- MouseInterface::setCursor( _mcursor_select );
+ MouseInterface::setCursor( MouseInterface::select );
break;
case _cursor_enemy_unit :
- MouseInterface::setCursor( _mcursor_target );
+ MouseInterface::setCursor( MouseInterface::target );
break;
case _cursor_make_allie :
- MouseInterface::setCursor( _mcursor_make_allie );
+ MouseInterface::setCursor( MouseInterface::allie );
break;
case _cursor_break_allie :
- MouseInterface::setCursor( _mcursor_break_allie );
+ MouseInterface::setCursor( MouseInterface::break_allie );
break;
break;
@@ -619,10 +622,10 @@
{
event = MouseInterface::event_queue.dequeue();
- if( event.button == _left_mbutton )
+ if( event.button == MouseInterface::left_button )
evalLeftMButtonEvents( event );
- if( event.button == _right_mbutton )
+ if( event.button == MouseInterface::right_button )
evalRightMButtonEvents( event );
}
@@ -641,7 +644,7 @@
)
{
- if (event.event == _event_mbutton_down )
+ if (event.event == MouseEvent::EVENT_DOWN )
//if (event.event == _event_mbutton_click )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
@@ -651,7 +654,7 @@
}
else
{
- if ( event.event == _event_mbutton_down )
+ if ( event.event == MouseEvent::EVENT_DOWN )
{
if ( selection_box_active == false )
{
@@ -662,7 +665,8 @@
} // ** _event_mbutton_down
- if ( (event.event == _event_mbutton_click) &&
(left_button_hold_action_complete == false) )
+ if ( (event.event == MouseEvent::EVENT_CLICK) &&
+ (left_button_hold_action_complete == false) )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
click_status = getCursorStatus( world_pos );
@@ -724,7 +728,7 @@
PlayerID player_id;
- if (event.event == _event_mbutton_click )
+ if (event.event == MouseEvent::EVENT_CLICK )
{
if ( (KeyboardInterface::getKeyState(_SCAN_LCRTL) ||
KeyboardInterface::getKeyState(_SCAN_RCRTL) ) )
@@ -751,7 +755,7 @@
} // ** _event_mbutton_click
- if (event.event == _event_mbutton_dbclick )
+ if (event.event == MouseEvent::EVENT_DBCLICK )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
player_id = PlayerInterface::getLocalPlayerID();
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.2
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Fri Sep 5
21:09:50 2003
@@ -15,312 +15,280 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-// XXX need new unix code here
-#ifndef UNIX
-#include "MouseInterface.hpp"
-
+#include <config.h>
+#ifdef WIN32
#include <windows.h>
#include "Win32Mouse.hpp"
+#endif
+#ifdef USE_SDL
+#include <SDL.h>
+#endif
+#include "MouseInterface.hpp"
#include "netPanzerGlobals.h"
#include "DDHardSurface.hpp"
#include "cMouse.hpp"
-
#ifndef _MAP_EDITOR_BUILD
// ** NOTE: TEMPORARY UNIT MOUSE STANDARDIZED
-#include "gdatstct.hpp"
+#include "Gdatstct.hpp"
sprite_dbase CURSOR_DBASE;
#endif // ** _MAP_EDITOR_BUILD
+unsigned char MouseInterface::cursor_x_size;
+unsigned char MouseInterface::cursor_y_size;
+Surface MouseInterface::mouse_cursor( false );
- unsigned char MouseInterface::cursor_x_size;
- unsigned char MouseInterface::cursor_y_size;
- Surface MouseInterface::mouse_cursor( false );
-
- PointXYi MouseInterface::mouse_pos;
+PointXYi MouseInterface::mouse_pos;
- float MouseInterface::button_hold_threshold = (const float) .10;
+float MouseInterface::button_hold_threshold = (const float) .10;
- bool MouseInterface::left_button_down = false;
- bool MouseInterface::left_button_up = false;
- bool MouseInterface::left_button_dbclick_active = false;
- PointXYi MouseInterface::left_button_down_pos;
- PointXYi MouseInterface::left_button_up_pos;
- TIMESTAMP MouseInterface::left_button_hold_time;
+bool MouseInterface::left_button_down = false;
+bool MouseInterface::left_button_up = false;
+bool MouseInterface::left_button_dbclick_active = false;
+PointXYi MouseInterface::left_button_down_pos;
+PointXYi MouseInterface::left_button_up_pos;
+TIMESTAMP MouseInterface::left_button_hold_time;
- bool MouseInterface::right_button_down = false;
- bool MouseInterface::right_button_up = false;
- bool MouseInterface::right_button_dbclick_active = false;
- PointXYi MouseInterface::right_button_down_pos;
- PointXYi MouseInterface::right_button_up_pos;
- TIMESTAMP MouseInterface::right_button_hold_time;
+bool MouseInterface::right_button_down = false;
+bool MouseInterface::right_button_up = false;
+bool MouseInterface::right_button_dbclick_active = false;
+PointXYi MouseInterface::right_button_down_pos;
+PointXYi MouseInterface::right_button_up_pos;
+TIMESTAMP MouseInterface::right_button_hold_time;
- bool MouseInterface::middle_button_down = false;
- bool MouseInterface::middle_button_up = false;
- bool MouseInterface::middle_button_dbclick_active = false;
- PointXYi MouseInterface::middle_button_down_pos;
- PointXYi MouseInterface::middle_button_up_pos;
- TIMESTAMP MouseInterface::middle_button_hold_time;
+bool MouseInterface::middle_button_down = false;
+bool MouseInterface::middle_button_up = false;
+bool MouseInterface::middle_button_dbclick_active = false;
+PointXYi MouseInterface::middle_button_down_pos;
+PointXYi MouseInterface::middle_button_up_pos;
+TIMESTAMP MouseInterface::middle_button_hold_time;
- unsigned char MouseInterface::button_mask;
-
- MouseEventQueue MouseInterface::event_queue;
+unsigned char MouseInterface::button_mask;
+MouseEventQueue MouseInterface::event_queue;
-void MouseInterface::initialize( void )
- {
- event_queue.initialize( 20 );
- mouse_cursor.setOffsetCenter();
- #ifndef _MAP_EDITOR_BUILD
- // ** NOTE: TEMPORARY
- CURSOR_DBASE.load_dbase( ".\\gdbase\\cursor.dbs" );
- #endif // ** _MAP_EDITOR_BUILD
- }
-
-
- void MouseInterface::setMousePosition( long x, long y )
- {
- mouse_pos.x = x;
- mouse_pos.y = y;
- }
+void MouseInterface::initialize()
+{
+ event_queue.initialize( 20 );
+ mouse_cursor.setOffsetCenter();
+#ifndef _MAP_EDITOR_BUILD
+ // ** NOTE: TEMPORARY
+ CURSOR_DBASE.load_dbase( ".\\gdbase\\cursor.dbs" );
+#endif // ** _MAP_EDITOR_BUILD
+}
- bool MouseInterface::buttonHeld( unsigned char mask)
- {
-
- if ( (mask & _LEFT_BUTTON_MASK) && left_button_down )
+bool MouseInterface::buttonHeld(unsigned char mask)
+{
+ if ( mask & button_mask & left_button )
{
- if( (now() - left_button_hold_time) > button_hold_threshold )
- return( true );
-
- }
- else
- if ( (mask & _RIGHT_BUTTON_MASK) && right_button_down )
- {
- if( (now() - right_button_hold_time) > button_hold_threshold )
- return( true );
-
- }
- else
- if ( (mask & _MIDDLE_BUTTON_MASK) && middle_button_down )
- {
- if( (now() - middle_button_hold_time) > button_hold_threshold )
- return( true );
-
- }
+ if( (now() - left_button_hold_time) > button_hold_threshold )
+ return true;
+ }
+ else if ( mask & button_mask & right_button )
+ {
+ if( (now() - right_button_hold_time) > button_hold_threshold )
+ return true;
+ }
+ else if ( mask & button_mask & middle_button )
+ {
+ if( (now() - middle_button_hold_time) > button_hold_threshold )
+ return true;
+ }
- return( false );
+ return false;
}
- void MouseInterface::resetButtonHoldStatus( void )
- {
- left_button_hold_time = now();
- right_button_hold_time = now();
- middle_button_hold_time = now();
- }
-
- void MouseInterface::setLeftButtonDown( void )
- {
- MouseEvent event;
+void MouseInterface::resetButtonHoldStatus( void )
+{
+ left_button_hold_time = now();
+ right_button_hold_time = now();
+ middle_button_hold_time = now();
+}
+
+void MouseInterface::setLeftButtonDown()
+{
+ MouseEvent event;
- //assert( left_button_down == false );
- left_button_down = true;
- left_button_up = false;
- button_mask = button_mask | 0x01;
- left_button_down_pos = mouse_pos;
- left_button_hold_time = now();
-
- event.button = _left_mbutton;
- event.event = _event_mbutton_down;
- event.down_pos = left_button_down_pos;
- event_queue.enqueue( event );
-
- }
-
- void MouseInterface::setLeftButtonUp( void )
- {
- MouseEvent event;
-
- //assert( left_button_up == false );
- left_button_down = false;
- left_button_up = true;
- button_mask = button_mask & (~0x01);
- left_button_up_pos = mouse_pos;
+ //assert( left_button_down == false );
+ left_button_down = true;
+ left_button_up = false;
+ button_mask = button_mask | 0x01;
+ left_button_down_pos = mouse_pos;
+ left_button_hold_time = now();
+
+ event.button = left_button;
+ event.event = MouseEvent::EVENT_DOWN;
+ event.down_pos = left_button_down_pos;
+ event_queue.enqueue( event );
+}
+
+void MouseInterface::setLeftButtonUp()
+{
+ MouseEvent event;
+
+ //assert( left_button_up == false );
+ left_button_down = false;
+ left_button_up = true;
+ button_mask = button_mask & (~0x01);
+ left_button_up_pos = mouse_pos;
-
- event.button = _left_mbutton;
- event.up_pos = left_button_up_pos;
-
+ event.button = left_button;
+ event.up_pos = left_button_up_pos;
- if ( left_button_dbclick_active == true )
- {
- event.event = _event_mbutton_dbclick;
- left_button_dbclick_active = false;
- }
- else
- event.event = _event_mbutton_click;
+ if ( left_button_dbclick_active == true )
+ {
+ event.event = MouseEvent::EVENT_DBCLICK;
+ left_button_dbclick_active = false;
+ }
+ else
+ event.event = MouseEvent::EVENT_CLICK;
- event.down_pos = left_button_down_pos;
- event_queue.enqueue( event );
+ event.down_pos = left_button_down_pos;
+ event_queue.enqueue( event );
- event.event = _event_mbutton_up;
- event_queue.enqueue( event );
-
- }
+ event.event = MouseEvent::EVENT_UP;
+ event_queue.enqueue( event );
+}
-void MouseInterface::setLeftButtonDoubleDown( void )
- {
- left_button_down = true;
- left_button_dbclick_active = true;
- left_button_up = false;
- button_mask = button_mask | 0x01;
- left_button_down_pos = mouse_pos;
- left_button_hold_time = now();
- }
-
-
- void MouseInterface::setRightButtonDown( void )
- {
- MouseEvent event;
+void MouseInterface::setLeftButtonDoubleDown()
+{
+ left_button_down = true;
+ left_button_dbclick_active = true;
+ left_button_up = false;
+ button_mask = button_mask | 0x01;
+ left_button_down_pos = mouse_pos;
+ left_button_hold_time = now();
+}
+
+void MouseInterface::setRightButtonDown()
+{
+ MouseEvent event;
- //assert( right_button_down == false );
- right_button_down = true;
- right_button_up = false;
- button_mask = button_mask | 0x04;
- right_button_down_pos = mouse_pos;
- right_button_hold_time = now();
+ //assert( right_button_down == false );
+ right_button_down = true;
+ right_button_up = false;
+ button_mask = button_mask | 0x04;
+ right_button_down_pos = mouse_pos;
+ right_button_hold_time = now();
- event.button = _right_mbutton;
- event.event = _event_mbutton_down;
- event.down_pos = right_button_down_pos;
- event_queue.enqueue( event );
-
- }
-
- void MouseInterface::setRightButtonUp( void )
- {
- MouseEvent event;
-
- //assert( right_button_up == false );
- right_button_down = false;
- right_button_up = true;
- button_mask = button_mask & (~0x04);
- right_button_up_pos = mouse_pos;
+ event.button = right_button;
+ event.event = MouseEvent::EVENT_DOWN;
+ event.down_pos = right_button_down_pos;
+ event_queue.enqueue( event );
+}
+
+void MouseInterface::setRightButtonUp( void )
+{
+ MouseEvent event;
+
+ //assert( right_button_up == false );
+ right_button_down = false;
+ right_button_up = true;
+ button_mask = button_mask & (~0x04);
+ right_button_up_pos = mouse_pos;
- event.button = _right_mbutton;
- event.up_pos = right_button_up_pos;
-
+ event.button = right_button;
+ event.up_pos = right_button_up_pos;
- if ( right_button_dbclick_active == true )
- {
- event.event = _event_mbutton_dbclick;
- right_button_dbclick_active = false;
- }
- else
- event.event = _event_mbutton_click;
+ if ( right_button_dbclick_active == true )
+ {
+ event.event = MouseEvent::EVENT_DBCLICK;
+ right_button_dbclick_active = false;
+ }
+ else
+ event.event = MouseEvent::EVENT_CLICK;
- event.down_pos = right_button_down_pos;
- event_queue.enqueue( event );
+ event.down_pos = right_button_down_pos;
+ event_queue.enqueue( event );
- event.event = _event_mbutton_up;
- event_queue.enqueue( event );
-
- }
-
-void MouseInterface::setRightButtonDoubleDown( void )
- {
- right_button_down = true;
- right_button_dbclick_active = true;
- right_button_up = false;
- button_mask = button_mask | 0x04;
- right_button_down_pos = mouse_pos;
- right_button_hold_time = now();
- }
-
-
- void MouseInterface::setMiddleButtonDown( void )
- {
- MouseEvent event;
-
- //assert( middle_button_down == false );
- middle_button_down = true;
- middle_button_up = false;
- button_mask = button_mask | 0x02;
- middle_button_down_pos = mouse_pos;
- middle_button_hold_time = now();
+ event.event = MouseEvent::EVENT_UP;
+ event_queue.enqueue( event );
+}
+
+void MouseInterface::setRightButtonDoubleDown()
+{
+ right_button_down = true;
+ right_button_dbclick_active = true;
+ right_button_up = false;
+ button_mask = button_mask | 0x04;
+ right_button_down_pos = mouse_pos;
+ right_button_hold_time = now();
+}
+
+void MouseInterface::setMiddleButtonDown()
+{
+ MouseEvent event;
+
+ //assert( middle_button_down == false );
+ middle_button_down = true;
+ middle_button_up = false;
+ button_mask = button_mask | 0x02;
+ middle_button_down_pos = mouse_pos;
+ middle_button_hold_time = now();
- event.button = _middle_mbutton;
- event.event = _event_mbutton_down;
- event.down_pos = middle_button_down_pos;
- event_queue.enqueue( event );
-
- }
-
-void MouseInterface::setMiddleButtonUp( void )
- {
- MouseEvent event;
-
- //assert( middle_button_up == false );
- middle_button_down = false;
- middle_button_up = true;
- button_mask = button_mask & (~0x02);
- middle_button_up_pos = mouse_pos;
+ event.button = middle_button;
+ event.event = MouseEvent::EVENT_DOWN;
+ event.down_pos = middle_button_down_pos;
+ event_queue.enqueue( event );
+}
+
+void MouseInterface::setMiddleButtonUp()
+{
+ MouseEvent event;
+
+ //assert( middle_button_up == false );
+ middle_button_down = false;
+ middle_button_up = true;
+ button_mask = button_mask & (~0x02);
+ middle_button_up_pos = mouse_pos;
- event.button = _middle_mbutton;
- event.up_pos = middle_button_up_pos;
-
-
+ event.button = middle_button;
+ event.up_pos = middle_button_up_pos;
- if ( middle_button_dbclick_active == true )
- {
- event.event = _event_mbutton_dbclick;
- middle_button_dbclick_active = false;
- }
- else
- event.event = _event_mbutton_click;
+ if ( middle_button_dbclick_active == true )
+ {
+ event.event = MouseEvent::EVENT_DBCLICK;
+ middle_button_dbclick_active = false;
+ }
+ else
+ event.event = MouseEvent::EVENT_CLICK;
- event.down_pos = middle_button_down_pos;
- event_queue.enqueue( event );
+ event.down_pos = middle_button_down_pos;
+ event_queue.enqueue( event );
- event.event = _event_mbutton_up;
- event_queue.enqueue( event );
+ event.event = MouseEvent::EVENT_UP;
+ event_queue.enqueue( event );
+}
+
+void MouseInterface::setMiddleButtonDoubleDown()
+{
+ middle_button_down = true;
+ middle_button_dbclick_active = true;
+ middle_button_up = false;
+ button_mask = button_mask | 0x02;
+ middle_button_down_pos = mouse_pos;
+ middle_button_hold_time = now();
+}
- }
-
-void MouseInterface::setMiddleButtonDoubleDown( void )
- {
- middle_button_down = true;
- middle_button_dbclick_active = true;
- middle_button_up = false;
- button_mask = button_mask | 0x02;
- middle_button_down_pos = mouse_pos;
- middle_button_hold_time = now();
- }
-
-
-void MouseInterface::setCursor( unsigned char cursor_type )
- {
+void MouseInterface::setCursor(CursorType type)
+{
#ifndef _MAP_EDITOR_BUILD
+ switch(type)
+ {
+ case defaultcursor:
+ cursor_x_size = CURSOR_DBASE.sprite_list[ 0 ].x_size;
+ cursor_y_size = CURSOR_DBASE.sprite_list[ 0 ].y_size;
+ mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 0 ].data,
+ iXY( cursor_x_size, cursor_y_size ),
+ cursor_x_size, 1);
+
+ mouse_cursor.setOffsetCenter();
+ mouse.setPointer( &mouse_cursor );
+ break;
- switch( cursor_type )
- {
- case _mcursor_default :
- cursor_x_size = CURSOR_DBASE.sprite_list[ 0 ].x_size;
- cursor_y_size = CURSOR_DBASE.sprite_list[ 0 ].y_size;
-
- mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 0 ].data,
- iXY( cursor_x_size, cursor_y_size ),
- cursor_x_size,
- 1
-
- );
-
- mouse_cursor.setOffsetCenter();
- mouse.setPointer( &mouse_cursor );
- break;
-
- case _mcursor_noentry :
+ case noentry:
cursor_x_size = CURSOR_DBASE.sprite_list[ 4 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 4 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 4 ].data,
@@ -332,7 +300,7 @@
mouse.setPointer( &mouse_cursor );
break;
- case _mcursor_move :
+ case move:
cursor_x_size = CURSOR_DBASE.sprite_list[ 3 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 3 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 3 ].data,
@@ -344,7 +312,7 @@
mouse.setPointer( &mouse_cursor );
break;
- case _mcursor_select :
+ case select:
cursor_x_size = CURSOR_DBASE.sprite_list[ 1 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 1 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 1 ].data,
@@ -356,7 +324,7 @@
mouse.setPointer( &mouse_cursor );
break;
- case _mcursor_target :
+ case target:
cursor_x_size = CURSOR_DBASE.sprite_list[ 2 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 2 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 2 ].data,
@@ -368,7 +336,7 @@
mouse.setPointer( &mouse_cursor );
break;
- case _mcursor_make_allie :
+ case allie:
cursor_x_size = CURSOR_DBASE.sprite_list[ 5 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 5 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 5 ].data,
@@ -380,7 +348,7 @@
mouse.setPointer( &mouse_cursor );
break;
- case _mcursor_break_allie :
+ case break_allie:
cursor_x_size = CURSOR_DBASE.sprite_list[ 6 ].x_size;
cursor_y_size = CURSOR_DBASE.sprite_list[ 6 ].y_size;
mouse_cursor.setTo( (void *) CURSOR_DBASE.sprite_list[ 6 ].data,
@@ -394,32 +362,21 @@
} // ** switch
#endif // ** _MAP_EDITOR_BUILD
- }
+}
-void MouseInterface::Win32UpdateMousePos( void )
- {
- long x_pos, y_pos;
- Win32GetMousePos( &x_pos, &y_pos );
- mouse_pos.x = x_pos;
- mouse_pos.y = y_pos;
- }
-
-void MouseInterface::showHardwareCursor( void )
- {
- Win32ShowHardwareMouse();
- }
-
-void MouseInterface::hideHardwareCursor( void )
- {
- Win32HideHardwareMouse();
- }
-
-void MouseInterface::updateCursor( void )
- {
- Win32UpdateMousePos();
-
- //FRAME_BUFFER.lock();
- //mouse_cursor.bltTrans( FRAME_BUFFER, mouse_pos.x, mouse_pos.y );
- //FRAME_BUFFER.unlock();
- }
+void MouseInterface::updateCursor()
+{
+#ifdef WIN32
+ long x_pos, y_pos;
+ Win32GetMousePos( &x_pos, &y_pos );
+ mouse_pos.x = x_pos;
+ mouse_pos.y = y_pos;
+#endif
+#ifdef USE_SDL
+ int x, y;
+ SDL_GetMouseState(&x, &y);
+ mouse_pox.x = x;
+ mouse_pox.y = y;
#endif
+}
+
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.2
netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.3
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp:1.2 Mon Sep 1
16:24:20 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.hpp Fri Sep 5
21:09:50 2003
@@ -30,80 +30,78 @@
#define _MIDDLE_BUTTON_MASK 0x02
#define _RIGHT_BUTTON_MASK 0x04
-enum { _left_mbutton = 0x01, _middle_mbutton = 0x02, _right_mbutton = 0x04 };
-enum { _event_mbutton_click = 0x01, _event_mbutton_dbclick = 0x02,
- _event_mbutton_down = 0x04, _event_mbutton_up = 0x08 };
-
-enum { _mcursor_default,
- _mcursor_noentry,
- _mcursor_move,
- _mcursor_select,
- _mcursor_target,
- _mcursor_make_allie,
- _mcursor_break_allie };
-
class MouseEvent : public PObject
- {
- public:
- unsigned char button;
- unsigned char event;
- PointXYi down_pos;
- PointXYi up_pos;
-
- };
+{
+public:
+ enum {
+ EVENT_CLICK = 0x01,
+ EVENT_DBCLICK = 0x02,
+ EVENT_DOWN = 0x04,
+ EVENT_UP = 0x08
+ };
+ unsigned char button;
+ unsigned char event;
+ PointXYi down_pos;
+ PointXYi up_pos;
+};
typedef QueueTemplate< MouseEvent > MouseEventQueue;
class MouseInterface : public PObject
- {
- private:
- static Surface mouse_cursor;
- static unsigned char cursor_x_size;
- static unsigned char cursor_y_size;
+{
+private:
+ static Surface mouse_cursor;
+ static unsigned char cursor_x_size;
+ static unsigned char cursor_y_size;
- private:
- static void Win32UpdateMousePos( void );
-
- protected:
- static PointXYi mouse_pos;
+protected:
+ static PointXYi mouse_pos;
- static float button_hold_threshold;
+ static float button_hold_threshold;
- static bool left_button_down;
- static bool left_button_up;
- static bool left_button_dbclick_active;
- static PointXYi left_button_down_pos;
- static PointXYi left_button_up_pos;
- static TIMESTAMP left_button_hold_time;
+ static bool left_button_down;
+ static bool left_button_up;
+ static bool left_button_dbclick_active;
+ static PointXYi left_button_down_pos;
+ static PointXYi left_button_up_pos;
+ static TIMESTAMP left_button_hold_time;
- static bool right_button_down;
- static bool right_button_up;
- static bool right_button_dbclick_active;
- static PointXYi right_button_down_pos;
- static PointXYi right_button_up_pos;
- static TIMESTAMP right_button_hold_time;
-
- static bool middle_button_down;
- static bool middle_button_up;
- static bool middle_button_dbclick_active;
- static PointXYi middle_button_down_pos;
- static PointXYi middle_button_up_pos;
- static TIMESTAMP middle_button_hold_time;
+ static bool right_button_down;
+ static bool right_button_up;
+ static bool right_button_dbclick_active;
+ static PointXYi right_button_down_pos;
+ static PointXYi right_button_up_pos;
+ static TIMESTAMP right_button_hold_time;
+
+ static bool middle_button_down;
+ static bool middle_button_up;
+ static bool middle_button_dbclick_active;
+ static PointXYi middle_button_down_pos;
+ static PointXYi middle_button_up_pos;
+ static TIMESTAMP middle_button_hold_time;
- static unsigned char button_mask;
+ static unsigned char button_mask;
- public:
- static MouseEventQueue event_queue;
-
- static void initialize( void );
-
- static void setMousePosition( long x, long y );
-
- static inline void getMousePosition( long *x, long *y )
- {
- *x = mouse_pos.x;
- *y = mouse_pos.y;
- }
+public:
+ enum {
+ left_button = 0x01,
+ middle_button = 0x02,
+ right_button = 0x04
+ };
+
+ enum CursorType {
+ defaultcursor, noentry, move, select, target, allie, break_allie
+ };
+
+ static MouseEventQueue event_queue;
+
+ static void initialize();
+
+ static inline void getMousePosition( long *x, long *y )
+ {
+ *x = mouse_pos.x;
+ *y = mouse_pos.y;
+ }
static inline unsigned char getButtonMask( void )
{
@@ -125,14 +123,9 @@
static void setMiddleButtonUp( void );
static void setMiddleButtonDoubleDown( void );
- static void setCursor( unsigned char cursor_type );
+ static void setCursor(CursorType type);
- static void showHardwareCursor( void );
- static void hideHardwareCursor( void );
-
static void updateCursor( void );
-
-
- };
+};
#endif // ** _MOUSEINTERFACE_HPP
Index: netpanzer/src/NetPanzer/Views/Game/GameView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.2
netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/GameView.cpp:1.2 Mon Sep 1 16:24:21 2003
+++ netpanzer/src/NetPanzer/Views/Game/GameView.cpp Fri Sep 5 21:09:50 2003
@@ -163,7 +163,7 @@
{
Desktop::setFocusView(this);
//Desktop::setActiveView(this);
- MouseInterface::setCursor(_mcursor_default);
+ MouseInterface::setCursor(MouseInterface::defaultcursor);
}
} // end GameView::mouseMove
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.2
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.3
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.2 Mon Sep 1
16:24:21 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Fri Sep 5 21:09:50 2003
@@ -315,8 +315,6 @@
//--------------------------------------------------------------------------
void MiniMapView::rMouseDrag(const iXY &downPos, const iXY &prevPos, const iXY
&newPos)
{
- float dt = TimerInterface::getTimeSlice();
-
// Let the map go up to the min screen dimension.
//maxMapSize = MIN(SCREEN_XPIX, SCREEN_YPIX);
maxMapSize = MIN(640, 480);
@@ -523,14 +521,14 @@
{
if (MiniMapInterface::isValidUnitMove(newPos))
{
-
MouseInterface::setCursor(_mcursor_move);
+
MouseInterface::setCursor(MouseInterface::move);
} else
{
-
MouseInterface::setCursor(_mcursor_noentry);
+
MouseInterface::setCursor(MouseInterface::noentry);
}
} else
{
- MouseInterface::setCursor(_mcursor_default);
+
MouseInterface::setCursor(MouseInterface::defaultcursor);
}
if (!selectionAnchor)
@@ -542,7 +540,7 @@
selectionAnchor = true;
// Set the selection cursor.
- MouseInterface::setCursor(_mcursor_select);
+ MouseInterface::setCursor(MouseInterface::select);
} else
{
Index: netpanzer/src/Win32/Win32Mouse.cpp
diff -u netpanzer/src/Win32/Win32Mouse.cpp:1.2
netpanzer/src/Win32/Win32Mouse.cpp:1.3
--- netpanzer/src/Win32/Win32Mouse.cpp:1.2 Mon Sep 1 16:24:22 2003
+++ netpanzer/src/Win32/Win32Mouse.cpp Fri Sep 5 21:09:50 2003
@@ -42,12 +42,3 @@
}
}
-void Win32HideHardwareMouse( void )
- {
- while( ShowCursor( false ) > 0 );
- }
-
-void Win32ShowHardwareMouse( void )
- {
- while( ShowCursor( true ) <= 0 );
- }
Index: netpanzer/src/Win32/Win32Mouse.hpp
diff -u netpanzer/src/Win32/Win32Mouse.hpp:1.1
netpanzer/src/Win32/Win32Mouse.hpp:1.2
--- netpanzer/src/Win32/Win32Mouse.hpp:1.1 Sun Dec 1 12:52:09 2002
+++ netpanzer/src/Win32/Win32Mouse.hpp Fri Sep 5 21:09:50 2003
@@ -20,8 +20,4 @@
void Win32GetMousePos( long *x_pos, long *y_pos );
-void Win32HideHardwareMouse( void );
-void Win32ShowHardwareMouse( void );
-
-
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src Lib/cMouse.hpp Lib/View/Desktop.c...,
Matthias Braun <=