mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Fixed compile errors on Linux
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1168 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
1bf35973be
commit
1ce18ed1b9
@ -132,7 +132,7 @@ inline Out Unicode::UTF8ToUTF16(In begin, In end, Out output, Uint16 replacement
|
||||
else
|
||||
{
|
||||
// Valid character directly convertible to 16 bits
|
||||
*Output++ = static_cast<Uint16>(character);
|
||||
*output++ = static_cast<Uint16>(character);
|
||||
}
|
||||
}
|
||||
else if (character > 0x0010FFFF)
|
||||
|
@ -169,7 +169,7 @@ Vector3<T>& operator /=(Vector3<T>& left, T right)
|
||||
/// Operator == overload ; compares the equality of two vectors
|
||||
////////////////////////////////////////////////////////////
|
||||
template <typename T>
|
||||
bool operator ==(const Vector3<T>& left, const Vector3<T>& V2)
|
||||
bool operator ==(const Vector3<T>& left, const Vector3<T>& right)
|
||||
{
|
||||
return (left.x == right.x) && (left.y == right.y) && (left.z == right.z);
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ int main()
|
||||
XSetWindowAttributes attributes;
|
||||
attributes.background_pixel = BlackPixel(display, screen);
|
||||
attributes.event_mask = KeyPressMask;
|
||||
Window window = XCreateWindow(Disp, RootWindow(display, screen),
|
||||
Window window = XCreateWindow(display, RootWindow(display, screen),
|
||||
0, 0, 650, 330, 0,
|
||||
DefaultDepth(display, screen),
|
||||
InputOutput,
|
||||
|
@ -146,7 +146,7 @@ bool RenderImageImplPBuffer::Create(unsigned int width, unsigned int height, uns
|
||||
glXMakeCurrent(myDisplay, NULL, NULL);
|
||||
|
||||
// Create the context
|
||||
XVisualInfo* Visual = glXGetVisualFromFBConfig(myDisplay, configs[0]);
|
||||
XVisualInfo* visual = glXGetVisualFromFBConfig(myDisplay, configs[0]);
|
||||
myContext = glXCreateContext(myDisplay, visual, currentContext, true);
|
||||
if (!myContext)
|
||||
{
|
||||
@ -173,7 +173,7 @@ bool RenderImageImplPBuffer::Create(unsigned int width, unsigned int height, uns
|
||||
////////////////////////////////////////////////////////////
|
||||
bool RenderImageImplPBuffer::Activate(bool active)
|
||||
{
|
||||
if (Active)
|
||||
if (active)
|
||||
{
|
||||
if (myPBuffer && myContext && (glXGetCurrentContext() != myContext))
|
||||
{
|
||||
|
@ -193,10 +193,10 @@ void ContextGLX::CreateContext(ContextGLX* shared, unsigned int bitsPerPixel, co
|
||||
// Get all the visuals matching the template
|
||||
int nbVisuals = 0;
|
||||
XVisualInfo* visuals = XGetVisualInfo(myDisplay.GetDisplay(), VisualDepthMask | VisualIDMask | VisualScreenMask, &tpl, &nbVisuals);
|
||||
if (!Visuals || (NbVisuals == 0))
|
||||
if (!visuals || (nbVisuals == 0))
|
||||
{
|
||||
if (Visuals)
|
||||
XFree(Visuals);
|
||||
if (visuals)
|
||||
XFree(visuals);
|
||||
std::cerr << "There is no valid visual for the selected screen" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
@ -51,7 +51,7 @@ void VideoModeSupport::GetSupportedVideoModes(std::vector<VideoMode>& modes)
|
||||
|
||||
// Check if the XRandR extension is present
|
||||
int version;
|
||||
if (XQueryExtension(Disp.GetDisplay(), "RANDR", &version, &version, &version))
|
||||
if (XQueryExtension(disp.GetDisplay(), "RANDR", &version, &version, &version))
|
||||
{
|
||||
// Get the current configuration
|
||||
XRRScreenConfiguration* config = XRRGetScreenInfo(disp.GetDisplay(), RootWindow(disp.GetDisplay(), screen));
|
||||
@ -125,7 +125,7 @@ VideoMode VideoModeSupport::GetDesktopVideoMode()
|
||||
|
||||
// Get the available screen sizes
|
||||
int nbSizes;
|
||||
XRRScreenSize* sizes = XRRConfigSizes(Config, &nbSizes);
|
||||
XRRScreenSize* sizes = XRRConfigSizes(config, &nbSizes);
|
||||
if (sizes && (nbSizes > 0))
|
||||
desktopMode = VideoMode(sizes[currentMode].width, sizes[currentMode].height, DefaultDepth(disp.GetDisplay(), screen));
|
||||
|
||||
|
@ -94,7 +94,7 @@ myKeyRepeat (true)
|
||||
myHeight = windowAttributes.height;
|
||||
|
||||
// Make sure the window is listening to all the requiered events
|
||||
XSelectInput(myDisplay, myWindow, EventMask & ~ButtonPressMask);
|
||||
XSelectInput(myDisplay, myWindow, eventMask & ~ButtonPressMask);
|
||||
|
||||
// Do some common initializations
|
||||
Initialize();
|
||||
@ -560,7 +560,7 @@ void WindowImplX11::CreateHiddenCursor()
|
||||
// Create the cursor, using the pixmap as both the shape and the mask of the cursor
|
||||
XColor color;
|
||||
color.flags = DoRed | DoGreen | DoBlue;
|
||||
color.red = Color.blue = Color.green = 0;
|
||||
color.red = color.blue = color.green = 0;
|
||||
myHiddenCursor = XCreatePixmapCursor(myDisplay, cursorPixmap, cursorPixmap, &color, &color, 0, 0);
|
||||
|
||||
// We don't need the pixmap any longer, free it
|
||||
@ -759,7 +759,7 @@ void WindowImplX11::ProcessEvent(XEvent windowEvent)
|
||||
event.Type = Event::MouseButtonPressed;
|
||||
event.MouseButton.X = windowEvent.xbutton.x;
|
||||
event.MouseButton.Y = windowEvent.xbutton.y;
|
||||
switch (Button)
|
||||
switch (button)
|
||||
{
|
||||
case Button1 : event.MouseButton.Button = Mouse::Left; break;
|
||||
case Button2 : event.MouseButton.Button = Mouse::Middle; break;
|
||||
@ -782,7 +782,7 @@ void WindowImplX11::ProcessEvent(XEvent windowEvent)
|
||||
event.Type = Event::MouseButtonReleased;
|
||||
event.MouseButton.X = windowEvent.xbutton.x;
|
||||
event.MouseButton.Y = windowEvent.xbutton.y;
|
||||
switch (Button)
|
||||
switch (button)
|
||||
{
|
||||
case Button1 : event.MouseButton.Button = Mouse::Left; break;
|
||||
case Button2 : event.MouseButton.Button = Mouse::Middle; break;
|
||||
|
Loading…
Reference in New Issue
Block a user