TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

rename MOUSE_* -> M_*

Browse Source
This commit is contained in:
David Rose 2007-04-18 20:14:00 +00:00
parent 82a9bbab45
commit 029bd3476e
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/display/graphicsWindow.cxx
View File

@ -641,14 +641,14 @@ set_properties_now(WindowProperties &properties) {
properties.clear_mouse_mode(); properties.clear_mouse_mode();
} }
else { else {
if(properties.get_mouse_mode() == WindowProperties::MOUSE_absolute) { if(properties.get_mouse_mode() == WindowProperties::M_absolute) {
_properties.set_mouse_mode(WindowProperties::MOUSE_absolute); _properties.set_mouse_mode(WindowProperties::M_absolute);
mouse_mode_absolute(); mouse_mode_absolute();
properties.clear_mouse_mode(); properties.clear_mouse_mode();
} }
else else
{ {
_properties.set_mouse_mode(WindowProperties::MOUSE_relative); _properties.set_mouse_mode(WindowProperties::M_relative);
mouse_mode_relative(); mouse_mode_relative();
properties.clear_mouse_mode(); properties.clear_mouse_mode();
} }

2
panda/src/display/windowProperties.I
View File

@ -789,7 +789,7 @@ has_mouse_mode() const {
INLINE void WindowProperties:: INLINE void WindowProperties::
clear_mouse_mode() { clear_mouse_mode() {
_specified &= ~S_mouse_mode; _specified &= ~S_mouse_mode;
_mouse_mode=MOUSE_absolute; _mouse_mode = M_absolute;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

14
panda/src/display/windowProperties.cxx
View File

@ -87,7 +87,7 @@ get_default() {
props.set_z_order(z_order); props.set_z_order(z_order);
} }
props.set_title(window_title); props.set_title(window_title);
props.set_mouse_mode(MOUSE_absolute); props.set_mouse_mode(M_absolute);
return props; return props;
} }
@ -145,7 +145,7 @@ clear() {
_cursor_filename = Filename(); _cursor_filename = Filename();
_z_order = Z_normal; _z_order = Z_normal;
_flags = 0; _flags = 0;
_mouse_mode = MOUSE_absolute; _mouse_mode = M_absolute;
_parent_window = 0; _parent_window = 0;
} }
@ -317,9 +317,9 @@ operator >> (istream &in, WindowProperties::ZOrder &z_order) {
ostream & ostream &
operator << (ostream &out, WindowProperties::MouseMode mode) { operator << (ostream &out, WindowProperties::MouseMode mode) {
switch (mode) { switch (mode) {
case WindowProperties::MOUSE_absolute: case WindowProperties::M_absolute:
return out << "absolute"; return out << "absolute";
case WindowProperties::MOUSE_relative: case WindowProperties::M_relative:
return out << "relative"; return out << "relative";
} }
return out << "**invalid WindowProperties::MouseMode(" << (int)mode << ")**"; return out << "**invalid WindowProperties::MouseMode(" << (int)mode << ")**";
@ -331,13 +331,13 @@ operator >> (istream &in, WindowProperties::MouseMode &mode) {
in >> word; in >> word;
if (word == "absolute") { if (word == "absolute") {
mode = WindowProperties::MOUSE_absolute; mode = WindowProperties::M_absolute;
} else if (word == "relative") { } else if (word == "relative") {
mode = WindowProperties::MOUSE_relative; mode = WindowProperties::M_relative;
} else { } else {
display_cat.warning() display_cat.warning()
<< "Unknown mouse mode: " << word << "\n"; << "Unknown mouse mode: " << word << "\n";
mode = WindowProperties::MOUSE_absolute; mode = WindowProperties::M_absolute;
} }
return in; return in;

4
panda/src/display/windowProperties.h
View File

@ -41,8 +41,8 @@ PUBLISHED:
}; };
enum MouseMode { enum MouseMode {
MOUSE_absolute, M_absolute,
MOUSE_relative, M_relative,
}; };
WindowProperties(); WindowProperties();

8
panda/src/osxdisplay/osxGraphicsWindow.cxx
View File

@ -1277,7 +1277,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
{ {
GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button); GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button);
GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers); GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative) if(_properties.get_mouse_mode()==WindowProperties::M_relative)
{ {
GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint); GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint);
MouseData currMouse=get_pointer(0); MouseData currMouse=get_pointer(0);
@ -1304,7 +1304,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
{ {
GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button); GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof(EventMouseButton), NULL, &button);
// GetEventParameter(event, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(HIPoint), NULL, &location); // Mac OS X v10.1 and later // GetEventParameter(event, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(HIPoint), NULL, &location); // Mac OS X v10.1 and later
if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative) if(_properties.get_mouse_mode()==WindowProperties::M_relative)
{ {
GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint); GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint);
MouseData currMouse=get_pointer(0); MouseData currMouse=get_pointer(0);
@ -1328,7 +1328,7 @@ void osxGraphicsWindow::SystemSetWindowForground(bool forground)
break; break;
case kEventMouseMoved: case kEventMouseMoved:
case kEventMouseDragged: case kEventMouseDragged:
if(_properties.get_mouse_mode()==WindowProperties::MOUSE_relative) if(_properties.get_mouse_mode()==WindowProperties::M_relative)
{ {
GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint); GetEventParameter(event, kEventParamMouseDelta,typeQDPoint, NULL, sizeof(Point),NULL , (void*) &qdGlobalPoint);
@ -1544,7 +1544,7 @@ if (osxdisplay_cat.is_debug())
pt.v = y; pt.v = y;
_input_devices[0].set_pointer_in_window(x, y); _input_devices[0].set_pointer_in_window(x, y);
if(_properties.get_mouse_mode()==WindowProperties::MOUSE_absolute) if(_properties.get_mouse_mode()==WindowProperties::M_absolute)
{ {
LocalPointToSystemPoint(pt); LocalPointToSystemPoint(pt);
CGPoint newCursorPosition = {0, 0}; CGPoint newCursorPosition = {0, 0};