Toplevel::vis becomes Toplevel::m_visual and is xcb_visualid_t
Only usage of the ::vis was the visualid, so have this as the member instead of the XVisual*.
This commit is contained in:
parent
88d55997f7
commit
b039a07f4d
5 changed files with 9 additions and 9 deletions
|
@ -66,7 +66,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
|
|||
|
||||
embedClient(w, attr);
|
||||
|
||||
vis = attr.visual;
|
||||
m_visual = attr.visual->visualid;
|
||||
bit_depth = attr.depth;
|
||||
|
||||
// SELI TODO: Order all these things in some sane manner
|
||||
|
|
|
@ -476,7 +476,7 @@ QRect SceneXrender::Window::temp_visibleRect;
|
|||
SceneXrender::Window::Window(Toplevel* c, SceneXrender *scene)
|
||||
: Scene::Window(c)
|
||||
, m_scene(scene)
|
||||
, format(findFormatForVisual(c->visual()->visualid))
|
||||
, format(findFormatForVisual(c->visual()))
|
||||
, alpha_cached_opacity(0.0)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -37,7 +37,7 @@ namespace KWin
|
|||
{
|
||||
|
||||
Toplevel::Toplevel()
|
||||
: vis(NULL)
|
||||
: m_visual(XCB_NONE)
|
||||
, info(NULL)
|
||||
, ready_for_painting(true)
|
||||
, m_isDamaged(false)
|
||||
|
@ -107,7 +107,7 @@ void Toplevel::detectShape(Window id)
|
|||
void Toplevel::copyToDeleted(Toplevel* c)
|
||||
{
|
||||
geom = c->geom;
|
||||
vis = c->vis;
|
||||
m_visual = c->m_visual;
|
||||
bit_depth = c->bit_depth;
|
||||
info = c->info;
|
||||
m_client.reset(c->m_client, false);
|
||||
|
|
|
@ -249,7 +249,7 @@ public:
|
|||
static bool resourceMatch(const Toplevel* c1, const Toplevel* c2);
|
||||
|
||||
bool readyForPainting() const; // true if the window has been already painted its contents
|
||||
Visual* visual() const;
|
||||
xcb_visualid_t visual() const;
|
||||
bool shape() const;
|
||||
void setOpacity(double opacity);
|
||||
double opacity() const;
|
||||
|
@ -429,7 +429,7 @@ protected:
|
|||
void deleteEffectWindow();
|
||||
virtual bool shouldUnredirect() const = 0;
|
||||
QRect geom;
|
||||
Visual* vis;
|
||||
xcb_visualid_t m_visual;
|
||||
int bit_depth;
|
||||
NETWinInfo* info;
|
||||
bool ready_for_painting;
|
||||
|
@ -521,9 +521,9 @@ inline bool Toplevel::readyForPainting() const
|
|||
return ready_for_painting;
|
||||
}
|
||||
|
||||
inline Visual* Toplevel::visual() const
|
||||
inline xcb_visualid_t Toplevel::visual() const
|
||||
{
|
||||
return vis;
|
||||
return m_visual;
|
||||
}
|
||||
|
||||
inline bool Toplevel::isDesktop() const
|
||||
|
|
|
@ -62,7 +62,7 @@ bool Unmanaged::track(Window w)
|
|||
Xcb::selectInput(w, attr.your_event_mask | XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_PROPERTY_CHANGE);
|
||||
geom = QRect(attr.x, attr.y, attr.width, attr.height);
|
||||
checkScreen();
|
||||
vis = attr.visual;
|
||||
m_visual = attr.visual->visualid;
|
||||
bit_depth = attr.depth;
|
||||
info = new NETWinInfo(connection(), w, rootWindow(),
|
||||
NET::WMWindowType | NET::WMPid,
|
||||
|
|
Loading…
Reference in a new issue