From b9a9c3126fef91dddbab839322a93d382dc77be0 Mon Sep 17 00:00:00 2001 From: Paulchen-Panther Date: Thu, 21 Jan 2016 16:39:52 +0100 Subject: [PATCH] Update X11Grabber.h Former-commit-id: 895bc985c0e732ec5d8e064068cb6f3e0920d09a --- include/grabber/X11Grabber.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/include/grabber/X11Grabber.h b/include/grabber/X11Grabber.h index 61c2d103..b35031cf 100644 --- a/include/grabber/X11Grabber.h +++ b/include/grabber/X11Grabber.h @@ -7,6 +7,11 @@ // X11 includes #include +#include +#include +#include +#include + class X11Grabber { public: @@ -16,6 +21,8 @@ public: virtual ~X11Grabber(); int open(); + + bool Setup(); Image & grab(); @@ -27,18 +34,23 @@ private: int _cropTop; int _cropBottom; - Screen *Xscreen; - XImage *xImage; - XShmSegmentInfo shminfo; - int screen; + XImage* _xImage; + XShmSegmentInfo _shminfo; /// Reference to the X11 display (nullptr if not opened) - Display * _x11Display; + Display* _x11Display; + Window _window; + XWindowAttributes _windowAttr; unsigned _screenWidth; unsigned _screenHeight; + unsigned _croppedWidth; + unsigned _croppedHeight; Image _image; - + + void freeResources(); + void setupResources(); + int updateScreenDimensions(); };