sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utility/Window: Fixes compilation for X11

This commit is contained in:
Lynix 2017-01-18 23:57:37 +01:00
parent d1b5357504
commit eea8b8c7f0
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/Nazara/Utility/X11/WindowImpl.cpp
View File

@ -678,21 +678,11 @@ namespace Nz
connection = X11::OpenConnection(); connection = X11::OpenConnection();
// Create the hidden cursor
CreateHiddenCursor();
return true; return true;
} }
void WindowImpl::Uninitialize() void WindowImpl::Uninitialize()
{ {
// Destroy the cursor
if (hiddenCursor)
{
xcb_free_cursor(connection, hiddenCursor);
hiddenCursor = 0;
}
X11::CloseConnection(connection); X11::CloseConnection(connection);
X11::Uninitialize(); X11::Uninitialize();
@ -939,53 +929,6 @@ namespace Nz
} }
} }
const char* WindowImpl::ConvertWindowCursorToXName(SystemCursor cursor)
{
// http://gnome-look.org/content/preview.php?preview=1&id=128170&file1=128170-1.png&file2=&file3=&name=Dummy+X11+cursors&PHPSESSID=6
switch (cursor)
{
case Nz::WindowCursor_Crosshair:
return "crosshair";
case Nz::WindowCursor_Default:
return "left_ptr";
case Nz::WindowCursor_Hand:
return "hand";
case Nz::WindowCursor_Help:
return "help";
case Nz::WindowCursor_Move:
return "fleur";
case Nz::WindowCursor_None:
return "none"; // Handled in set cursor
case Nz::WindowCursor_Pointer:
return "hand";
case Nz::WindowCursor_Progress:
return "watch";
case Nz::WindowCursor_ResizeE:
return "right_side";
case Nz::WindowCursor_ResizeN:
return "top_side";
case Nz::WindowCursor_ResizeNE:
return "top_right_corner";
case Nz::WindowCursor_ResizeNW:
return "top_left_corner";
case Nz::WindowCursor_ResizeS:
return "bottom_side";
case Nz::WindowCursor_ResizeSE:
return "bottom_right_corner";
case Nz::WindowCursor_ResizeSW:
return "bottom_left_corner";
case Nz::WindowCursor_ResizeW:
return "left_side";
case Nz::WindowCursor_Text:
return "xterm";
case Nz::WindowCursor_Wait:
return "watch";
}
NazaraError("Cursor is not handled by enumeration");
return "X_cursor";
}
void WindowImpl::CommonInitialize() void WindowImpl::CommonInitialize()
{ {
// Show the window // Show the window

1
src/Nazara/Utility/X11/WindowImpl.hpp
View File

@ -83,7 +83,6 @@ namespace Nz
void CleanUp(); void CleanUp();
xcb_keysym_t ConvertKeyCodeToKeySym(xcb_keycode_t keycode, uint16_t state); xcb_keysym_t ConvertKeyCodeToKeySym(xcb_keycode_t keycode, uint16_t state);
Keyboard::Key ConvertVirtualKey(xcb_keysym_t symbol); Keyboard::Key ConvertVirtualKey(xcb_keysym_t symbol);
const char* ConvertWindowCursorToXName(SystemCursor cursor);
void CommonInitialize(); void CommonInitialize();
char32_t GetRepresentation(xcb_keysym_t keysym) const; char32_t GetRepresentation(xcb_keysym_t keysym) const;