diff options
| author | James Cowgill <jcowgill@debian.org> | 2016-10-27 18:34:24 +0100 |
|---|---|---|
| committer | James Cowgill <jcowgill@debian.org> | 2016-10-27 18:34:24 +0100 |
| commit | fc50d231530ae85da5cc3f3ebd131310c15bf359 (patch) | |
| tree | 12c9f3c3f01ee1182d399593347a8611217bbb6c /src/SFML/Window/Unix/Display.hpp | |
| parent | df93e238e30e97850d76ad5585b8ab9ad9c03e67 (diff) | |
New upstream version 2.4.1~git15.b61c2f8+dfsg
Diffstat (limited to 'src/SFML/Window/Unix/Display.hpp')
| -rw-r--r-- | src/SFML/Window/Unix/Display.hpp | 56 |
1 files changed, 3 insertions, 53 deletions
diff --git a/src/SFML/Window/Unix/Display.hpp b/src/SFML/Window/Unix/Display.hpp index 2743678..f0eb302 100644 --- a/src/SFML/Window/Unix/Display.hpp +++ b/src/SFML/Window/Unix/Display.hpp @@ -28,7 +28,7 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// -#include <X11/Xlib-xcb.h> +#include <X11/Xlib.h> #include <string> @@ -48,17 +48,6 @@ namespace priv Display* OpenDisplay(); //////////////////////////////////////////////////////////// -/// \brief Get the xcb connection of the shared Display -/// -/// This function increments the reference count of the display, -/// it must be matched with a call to CloseConnection. -/// -/// \return Pointer to the shared connection -/// -//////////////////////////////////////////////////////////// -xcb_connection_t* OpenConnection(); - -//////////////////////////////////////////////////////////// /// \brief Release a reference to the shared display /// /// \param display Display to release @@ -67,54 +56,15 @@ xcb_connection_t* OpenConnection(); void CloseDisplay(Display* display); //////////////////////////////////////////////////////////// -/// \brief Release a reference to the shared display -/// -/// \param connection Connection of display to release -/// -//////////////////////////////////////////////////////////// -void CloseConnection(xcb_connection_t* connection); - -//////////////////////////////////////////////////////////// -/// \brief Get screen of a display by index (equivalent to XScreenOfDisplay) -/// -/// \param connection Connection of display -/// \param screen_nbr The index of the screen -/// -/// \return Pointer to the screen -/// -//////////////////////////////////////////////////////////// -xcb_screen_t* XCBScreenOfDisplay(xcb_connection_t* connection, int screen_nbr); - -//////////////////////////////////////////////////////////// -/// \brief Get default screen of a display (equivalent to XDefaultScreen) -/// -/// \param connection Connection of display -/// -/// \return Pointer to the default screen of the display -/// -//////////////////////////////////////////////////////////// -xcb_screen_t* XCBDefaultScreen(xcb_connection_t* connection); - -//////////////////////////////////////////////////////////// -/// \brief Get default root window of a display (equivalent to XDefaultRootWindow) -/// -/// \param connection Connection of display -/// -/// \return Root window of the display -/// -//////////////////////////////////////////////////////////// -xcb_window_t XCBDefaultRootWindow(xcb_connection_t* connection); - -//////////////////////////////////////////////////////////// /// \brief Get the atom with the specified name /// /// \param name Name of the atom /// \param onlyIfExists Don't try to create the atom if it doesn't already exist /// -/// \return Atom if it exists or XCB_ATOM_NONE (0) if it doesn't +/// \return Atom if it exists or None (0) if it doesn't /// //////////////////////////////////////////////////////////// -xcb_atom_t getAtom(const std::string& name, bool onlyIfExists = false); +Atom getAtom(const std::string& name, bool onlyIfExists = false); } // namespace priv |