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

Provide pixmap format in XShm helper

Browse source
This commit is contained in:
Martin Gräßlin 2013-06-17 13:41:35 +02:00
parent f4ee319c6a
commit 2cf7a4bad3
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xcbutils.cpp
View file

@ -265,6 +265,7 @@ Shm::Shm()
, m_buffer(NULL) , m_buffer(NULL)
, m_segment(XCB_NONE) , m_segment(XCB_NONE)
, m_valid(false) , m_valid(false)
, m_pixmapFormat(XCB_IMAGE_FORMAT_XY_BITMAP)
{ {
m_valid = init(); m_valid = init();
} }
@ -290,6 +291,7 @@ bool Shm::init()
qDebug() << "Failed to get SHM extension version information"; qDebug() << "Failed to get SHM extension version information";
return false; return false;
} }
m_pixmapFormat = version->pixmap_format;
const int MAXSIZE = 4096 * 2048 * 4; // TODO check there are not larger windows const int MAXSIZE = 4096 * 2048 * 4; // TODO check there are not larger windows
m_shmId = shmget(IPC_PRIVATE, MAXSIZE, IPC_CREAT | 0600); m_shmId = shmget(IPC_PRIVATE, MAXSIZE, IPC_CREAT | 0600);
if (m_shmId < 0) { if (m_shmId < 0) {

8
xcbutils.h
View file

@ -923,12 +923,14 @@ public:
void *buffer() const; void *buffer() const;
xcb_shm_seg_t segment() const; xcb_shm_seg_t segment() const;
bool isValid() const; bool isValid() const;
uint8_t pixmapFormat() const;
private: private:
bool init(); bool init();
int m_shmId; int m_shmId;
void *m_buffer; void *m_buffer;
xcb_shm_seg_t m_segment; xcb_shm_seg_t m_segment;
bool m_valid; bool m_valid;
uint8_t m_pixmapFormat;
}; };
inline inline
@ -955,6 +957,12 @@ int Shm::shmId() const
return m_shmId; return m_shmId;
} }
inline
uint8_t Shm::pixmapFormat() const
{
return m_pixmapFormat;
}
} // namespace X11 } // namespace X11
} // namespace KWin } // namespace KWin