yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Client's clormap to xcb_colormap_t

Browse source 
At same time also renaming variable to follow naming scheme and have a
sensible name. Also moved default value initialization into initializer
list.

REVIEW: 110283
This commit is contained in:
Martin Gräßlin 2013-05-03 11:46:18 +02:00
parent 41b37afa96
commit 3f69bb0e7f
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client.cpp
View file

@ -108,6 +108,7 @@ Client::Client()
, autoRaiseTimer(NULL) , autoRaiseTimer(NULL)
, shadeHoverTimer(NULL) , shadeHoverTimer(NULL)
, delayedMoveResizeTimer(NULL) , delayedMoveResizeTimer(NULL)
, m_colormap(XCB_COLORMAP_NONE)
, in_group(NULL) , in_group(NULL)
, m_windowGroup(XCB_WINDOW_NONE) , m_windowGroup(XCB_WINDOW_NONE)
, tab_group(NULL) , tab_group(NULL)
@ -190,8 +191,6 @@ Client::Client()
max_mode = MaximizeRestore; max_mode = MaximizeRestore;
cmap = None;
//Client to workspace connections require that each //Client to workspace connections require that each
//client constructed be connected to the workspace wrapper //client constructed be connected to the workspace wrapper

8
client.h
View file

@ -473,7 +473,7 @@ public:
QRect adjustedClientArea(const QRect& desktop, const QRect& area) const; QRect adjustedClientArea(const QRect& desktop, const QRect& area) const;
Colormap colormap() const; xcb_colormap_t colormap() const;
/// Updates visibility depending on being shaded, virtual desktop, etc. /// Updates visibility depending on being shaded, virtual desktop, etc.
void updateVisibility(); void updateVisibility();
@ -931,7 +931,7 @@ private:
QTimer* autoRaiseTimer; QTimer* autoRaiseTimer;
QTimer* shadeHoverTimer; QTimer* shadeHoverTimer;
QTimer* delayedMoveResizeTimer; QTimer* delayedMoveResizeTimer;
Colormap cmap; xcb_colormap_t m_colormap;
QString cap_normal, cap_iconic, cap_suffix, cap_deco; QString cap_normal, cap_iconic, cap_suffix, cap_deco;
Group* in_group; Group* in_group;
xcb_window_t m_windowGroup; xcb_window_t m_windowGroup;
@ -1177,9 +1177,9 @@ inline bool Client::hasNETSupport() const
return info->hasNETSupport(); return info->hasNETSupport();
} }
inline Colormap Client::colormap() const inline xcb_colormap_t Client::colormap() const
{ {
return cmap; return m_colormap;
} }
inline void Client::invalidateLayer() inline void Client::invalidateLayer()

2
manage.cpp
View file

@ -102,7 +102,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
info = new WinInfo(this, display(), m_client, rootWindow(), properties, 2); info = new WinInfo(this, display(), m_client, rootWindow(), properties, 2);
cmap = attr.colormap; m_colormap = attr.colormap;
getResourceClass(); getResourceClass();
getWindowRole(); getWindowRole();