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