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

Added the WM_CLASS property to SFML windows on Linux

Browse Source
This commit is contained in:
Laurent Gomila 2013-05-23 21:12:46 +02:00
parent 8cb05fc6d0
commit 7fc29c78f7
1 changed files with 49 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/SFML/Window/Linux/WindowImplX11.cpp
View File

@ -33,6 +33,8 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>
#include <unistd.h>
#include <cstring>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <string> #include <string>
@ -49,13 +51,30 @@ namespace
PointerMotionMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask | PointerMotionMask | KeyPressMask | KeyReleaseMask | StructureNotifyMask |
EnterWindowMask | LeaveWindowMask; EnterWindowMask | LeaveWindowMask;
/// Filter the events received by windows // Filter the events received by windows (only allow those matching a specific window)
/// (only allow those matching a specific window)
Bool checkEvent(::Display*, XEvent* event, XPointer userData) Bool checkEvent(::Display*, XEvent* event, XPointer userData)
{ {
// Just check if the event matches the window // Just check if the event matches the window
return event->xany.window == reinterpret_cast< ::Window >(userData); return event->xany.window == reinterpret_cast< ::Window >(userData);
} }
// Find the name of the current executable
const char* findExecutableName()
{
char buffer[512];
std::size_t length = readlink("/proc/self/exe", buffer, sizeof(buffer));
if ((length > 0) && (length < sizeof(buffer)))
{
// Remove the path to keep the executable name only
buffer[length] = '\0';
return basename(buffer);
}
else
{
// Fallback name
return "sfml";
}
}
} }
@ -179,32 +198,32 @@ m_previousSize(-1, -1)
struct WMHints struct WMHints
{ {
unsigned long Flags; unsigned long flags;
unsigned long Functions; unsigned long functions;
unsigned long Decorations; unsigned long decorations;
long InputMode; long inputMode;
unsigned long State; unsigned long state;
}; };
WMHints hints; WMHints hints;
hints.Flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS;
hints.Decorations = 0; hints.decorations = 0;
hints.Functions = 0; hints.functions = 0;
if (style & Style::Titlebar) if (style & Style::Titlebar)
{ {
hints.Decorations |= MWM_DECOR_BORDER | MWM_DECOR_TITLE | MWM_DECOR_MINIMIZE | MWM_DECOR_MENU; hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_TITLE | MWM_DECOR_MINIMIZE | MWM_DECOR_MENU;
hints.Functions |= MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE; hints.functions |= MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE;
} }
if (style & Style::Resize) if (style & Style::Resize)
{ {
hints.Decorations |= MWM_DECOR_MAXIMIZE | MWM_DECOR_RESIZEH; hints.decorations |= MWM_DECOR_MAXIMIZE | MWM_DECOR_RESIZEH;
hints.Functions |= MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; hints.functions |= MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE;
} }
if (style & Style::Close) if (style & Style::Close)
{ {
hints.Decorations |= 0; hints.decorations |= 0;
hints.Functions |= MWM_FUNC_CLOSE; hints.functions |= MWM_FUNC_CLOSE;
} }
const unsigned char* ptr = reinterpret_cast<const unsigned char*>(&hints); const unsigned char* ptr = reinterpret_cast<const unsigned char*>(&hints);
@ -214,14 +233,23 @@ m_previousSize(-1, -1)
// This is a hack to force some windows managers to disable resizing // This is a hack to force some windows managers to disable resizing
if (!(style & Style::Resize)) if (!(style & Style::Resize))
{ {
XSizeHints sizeHints; XSizeHints* sizeHints = XAllocSizeHints();
sizeHints.flags = PMinSize | PMaxSize; sizeHints->flags = PMinSize | PMaxSize;
sizeHints.min_width = sizeHints.max_width = width; sizeHints->min_width = sizeHints->max_width = width;
sizeHints.min_height = sizeHints.max_height = height; sizeHints->min_height = sizeHints->max_height = height;
XSetWMNormalHints(m_display, m_window, &sizeHints); XSetWMNormalHints(m_display, m_window, sizeHints);
XFree(sizeHints);
} }
} }
// Set the window's WM class (this can be used by window managers)
const char* windowClass = findExecutableName();
XClassHint* classHint = XAllocClassHint();
classHint->res_name = const_cast<char*>(windowClass);
classHint->res_class = const_cast<char*>(windowClass);
XSetClassHint(m_display, m_window, classHint);
XFree(classHint);
// Do some common initializations // Do some common initializations
initialize(); initialize();