zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup - membervariables start with uppercase letters. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4745 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-03-28 19:55:29 +00:00
parent 6bbb9b1beb
commit 4bf4c5ef17
2 changed files with 238 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

434
source/Irrlicht/CIrrDeviceLinux.cpp
View File

File diff suppressed because it is too large Load Diff

42
source/Irrlicht/CIrrDeviceLinux.h
View File

@ -182,9 +182,9 @@ namespace irr
if (!Null) if (!Null)
{ {
if ( !IsVisible ) if ( !IsVisible )
XDefineCursor( Device->display, Device->window, invisCursor ); XDefineCursor( Device->XDisplay, Device->XWindow, InvisCursor );
else else
XUndefineCursor( Device->display, Device->window ); XUndefineCursor( Device->XDisplay, Device->XWindow );
} }
#endif #endif
} }
@ -222,9 +222,9 @@ namespace irr
{ {
if (UseReferenceRect) if (UseReferenceRect)
{ {
XWarpPointer(Device->display, XWarpPointer(Device->XDisplay,
None, None,
Device->window, 0, 0, Device->XWindow, 0, 0,
Device->Width, Device->Width,
Device->Height, Device->Height,
ReferenceRect.UpperLeftCorner.X + x, ReferenceRect.UpperLeftCorner.X + x,
@ -233,13 +233,13 @@ namespace irr
} }
else else
{ {
XWarpPointer(Device->display, XWarpPointer(Device->XDisplay,
None, None,
Device->window, 0, 0, Device->XWindow, 0, 0,
Device->Width, Device->Width,
Device->Height, x, y); Device->Height, x, y);
} }
XFlush(Device->display); XFlush(Device->XDisplay);
} }
#endif #endif
CursorPos.X = x; CursorPos.X = x;
@ -326,15 +326,15 @@ namespace irr
if ( PlatformBehavior&gui::ECPB_X11_CACHE_UPDATES && !os::Timer::isStopped() ) if ( PlatformBehavior&gui::ECPB_X11_CACHE_UPDATES && !os::Timer::isStopped() )
{ {
u32 now = os::Timer::getTime(); u32 now = os::Timer::getTime();
if (now <= lastQuery) if (now <= LastQuery)
return; return;
lastQuery = now; LastQuery = now;
} }
Window tmp; Window tmp;
int itmp1, itmp2; int itmp1, itmp2;
unsigned int maskreturn; unsigned int maskreturn;
XQueryPointer(Device->display, Device->window, XQueryPointer(Device->XDisplay, Device->XWindow,
&tmp, &tmp, &tmp, &tmp,
&itmp1, &itmp2, &itmp1, &itmp2,
&CursorPos.X, &CursorPos.Y, &maskreturn); &CursorPos.X, &CursorPos.Y, &maskreturn);
@ -355,8 +355,8 @@ namespace irr
core::rect<s32> ReferenceRect; core::rect<s32> ReferenceRect;
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
gui::ECURSOR_PLATFORM_BEHAVIOR PlatformBehavior; gui::ECURSOR_PLATFORM_BEHAVIOR PlatformBehavior;
u32 lastQuery; u32 LastQuery;
Cursor invisCursor; Cursor InvisCursor;
struct CursorFrameX11 struct CursorFrameX11
{ {
@ -393,25 +393,25 @@ namespace irr
#ifdef _IRR_COMPILE_WITH_X11_ #ifdef _IRR_COMPILE_WITH_X11_
friend class COpenGLDriver; friend class COpenGLDriver;
Display *display; Display *XDisplay;
XVisualInfo* visual; XVisualInfo* VisualInfo;
int screennr; int Screennr;
Window window; Window XWindow;
XSetWindowAttributes attributes; XSetWindowAttributes WndAttributes;
XSizeHints* StdHints; XSizeHints* StdHints;
XImage* SoftwareImage; XImage* SoftwareImage;
XIM XInputMethod; XIM XInputMethod;
XIC XInputContext; XIC XInputContext;
mutable core::stringc Clipboard; mutable core::stringc Clipboard;
#ifdef _IRR_LINUX_X11_VIDMODE_ #ifdef _IRR_LINUX_X11_VIDMODE_
XF86VidModeModeInfo oldVideoMode; XF86VidModeModeInfo OldVideoMode;
#endif #endif
#ifdef _IRR_LINUX_X11_RANDR_ #ifdef _IRR_LINUX_X11_RANDR_
SizeID oldRandrMode; SizeID OldRandrMode;
Rotation oldRandrRotation; Rotation OldRandrRotation;
#endif #endif
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
GLXWindow glxWin; GLXWindow GlxWin;
GLXContext Context; GLXContext Context;
#endif #endif
#endif #endif