mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code adjustments to fix warnings.

Browse Source 
Change-Id: Iba40752c6c5baaadc2a1b6a0fd03cbb0e3cde8a3
This commit is contained in:
Stefan Schindler 2015-01-05 22:23:16 +01:00
parent 896bd51b22
commit 92ca32b2f9
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/X11/X11.cpp
View File

@ -201,7 +201,7 @@ int main()
while (running) while (running)
{ {
while (event = xcb_poll_for_event(xcbConnection)) while ((event = xcb_poll_for_event(xcbConnection)))
{ {
running = false; running = false;
} }

2
src/SFML/Window/Unix/InputImpl.cpp
View File

@ -179,7 +179,7 @@ bool InputImpl::isKeyPressed(Keyboard::Key key)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void InputImpl::setVirtualKeyboardVisible(bool visible) void InputImpl::setVirtualKeyboardVisible(bool /*visible*/)
{ {
// Not applicable // Not applicable
} }

1
src/SFML/Window/Unix/VideoModeImpl.cpp
View File

@ -139,7 +139,6 @@ VideoMode VideoModeImpl::getDesktopMode()
if (! errors) if (! errors)
{ {
// Get the current video mode // Get the current video mode
xcb_randr_rotation_t Rotation = (xcb_randr_rotation_t)config->rotation;
xcb_randr_mode_t currentMode = config->sizeID; xcb_randr_mode_t currentMode = config->sizeID;
// Get the available screen sizes // Get the available screen sizes

20
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -67,13 +67,6 @@ namespace
PointerMotionMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask | PointerMotionMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask |
EnterWindowMask | LeaveWindowMask; EnterWindowMask | LeaveWindowMask;
// Filter the events received by windows (only allow those matching a specific window)
Bool checkEvent(::Display*, XEvent* event, XPointer userData)
{
// Just check if the event matches the window
return event->xany.window == reinterpret_cast< ::Window >(userData);
}
// Find the name of the current executable // Find the name of the current executable
void findExecutableName(char* buffer, std::size_t bufferSize) void findExecutableName(char* buffer, std::size_t bufferSize)
{ {
@ -127,7 +120,7 @@ m_useSizeHints(false)
if (m_window) if (m_window)
{ {
// Make sure the window is listening to all the required events // Make sure the window is listening to all the required events
const uint32_t value_list[] = {eventMask}; const uint32_t value_list[] = {static_cast<uint32_t>(eventMask)};
xcb_change_window_attributes(m_connection, xcb_change_window_attributes(m_connection,
m_window, m_window,
@ -141,7 +134,7 @@ m_useSizeHints(false)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
WindowImplX11::WindowImplX11(VideoMode mode, const String& title, unsigned long style, const ContextSettings& settings) : WindowImplX11::WindowImplX11(VideoMode mode, const String& title, unsigned long style, const ContextSettings& /*settings*/) :
m_window (0), m_window (0),
m_inputMethod (NULL), m_inputMethod (NULL),
m_inputContext(NULL), m_inputContext(NULL),
@ -184,11 +177,8 @@ m_useSizeHints(false)
if (fullscreen) if (fullscreen)
switchToFullscreen(mode); switchToFullscreen(mode);
// Choose the visual according to the context settings
XVisualInfo visualInfo = ContextType::selectBestVisual(m_display, mode.bitsPerPixel, settings);
// Define the window attributes // Define the window attributes
const uint32_t value_list[] = {fullscreen, eventMask}; const uint32_t value_list[] = {fullscreen, static_cast<uint32_t>(eventMask)};
// Create the window // Create the window
m_window = xcb_generate_id(m_connection); m_window = xcb_generate_id(m_connection);
@ -378,7 +368,7 @@ void WindowImplX11::processEvents()
xcb_key_release_event_t* lastKeyReleaseEvent = NULL; xcb_key_release_event_t* lastKeyReleaseEvent = NULL;
uint8_t eventType = 0; uint8_t eventType = 0;
while(event = xcb_poll_for_event(m_connection)) while((event = xcb_poll_for_event(m_connection)))
{ {
eventType = event->response_type & ~0x80; eventType = event->response_type & ~0x80;
@ -459,7 +449,7 @@ Vector2i WindowImplX11::getPosition() const
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void WindowImplX11::setPosition(const Vector2i& position) void WindowImplX11::setPosition(const Vector2i& position)
{ {
uint32_t values[] = {position.x, position.y}; uint32_t values[] = {static_cast<uint32_t>(position.x), static_cast<uint32_t>(position.y)};
xcb_configure_window(m_connection, m_window, xcb_configure_window(m_connection, m_window,
XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y, XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y,
values); values);