Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-01-15 10:39:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-01-15 10:40:15 +0300
commitd21eeffbbf9090aec18ca1bf6b61f119dca771a0 (patch)
treeb19d5491b649206ef458aebdf8fad8b158ae029c /intern/ghost
parent663a2f6e0cea223a926df9a5cabaebc2bf21bb58 (diff)
Cleanup: used pre-defined atoms in ghost
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_WindowX11.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index 4b01f0dd39f..7e59ec82755 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -355,22 +355,17 @@ GHOST_WindowX11(GHOST_SystemX11 *system,
#endif
if (state == GHOST_kWindowStateMaximized || state == GHOST_kWindowStateFullScreen) {
- Atom _NET_WM_STATE = XInternAtom(m_display, "_NET_WM_STATE", False);
- Atom _NET_WM_STATE_MAXIMIZED_VERT = XInternAtom(m_display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
- Atom _NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom(m_display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
- Atom _NET_WM_STATE_FULLSCREEN = XInternAtom(m_display, "_NET_WM_STATE_FULLSCREEN", False);
Atom atoms[2];
int count = 0;
-
if (state == GHOST_kWindowStateMaximized) {
- atoms[count++] = _NET_WM_STATE_MAXIMIZED_VERT;
- atoms[count++] = _NET_WM_STATE_MAXIMIZED_HORZ;
+ atoms[count++] = m_system->m_atom._NET_WM_STATE_MAXIMIZED_VERT;
+ atoms[count++] = m_system->m_atom._NET_WM_STATE_MAXIMIZED_HORZ;
}
else {
- atoms[count++] = _NET_WM_STATE_FULLSCREEN;
+ atoms[count++] = m_system->m_atom._NET_WM_STATE_FULLSCREEN;
}
- XChangeProperty(m_display, m_window, _NET_WM_STATE, XA_ATOM, 32,
+ XChangeProperty(m_display, m_window, m_system->m_atom._NET_WM_STATE, XA_ATOM, 32,
PropModeReplace, (unsigned char *)atoms, count);
m_post_init = False;
}