X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgbase%2Fdrawcontext.cpp;h=b3eaf9ed74d5971950557530a578091c2f9788db;hb=fcd5f24311fcfe772825a75678e038749401a9be;hp=86edf56a95a83cd416a92d39edf197cda2782cfb;hpb=fbefc4904d290205658209bbe2392b4b7f9e2711;p=libs%2Fgui.git

diff --git a/source/gbase/drawcontext.cpp b/source/gbase/drawcontext.cpp
index 86edf56..b3eaf9e 100644
--- a/source/gbase/drawcontext.cpp
+++ b/source/gbase/drawcontext.cpp
@@ -1,56 +1,72 @@
 /* $Id$
 
 This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef WIN32
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#include <X11/Xlib.h>
+#include <X11/extensions/XShm.h>
 #include <X11/Xutil.h>
 #endif
 #include <msp/core/except.h>
 #include "display.h"
 #include "drawcontext.h"
 #include "window.h"
+#include "display_priv.h"
 
 namespace Msp {
 namespace Graphics {
 
+struct DrawContext::Private
+{
+#ifndef WIN32
+	XImage *image;
+	bool use_shm;
+	XShmSegmentInfo shminfo;
+#endif
+};
+
 DrawContext::DrawContext(Window &w):
 	display(w.get_display()),
 	window(w)
 {
-#ifndef WIN32
-	::Display *dpy=display.get_display();
+#ifdef WIN32
+	throw Exception("DrawContext not supported on win32 yet");
+#else
+	priv=new Private;
 
-	use_shm=XShmQueryExtension(dpy);
+	::Display *dpy=display.get_private().display;
+
+	priv->use_shm=XShmQueryExtension(dpy);
 
 	XWindowAttributes wa;
-	XGetWindowAttributes(dpy, window.get_handle(), &wa);
+	XGetWindowAttributes(dpy, window.get_private().window, &wa);
 
-	if(use_shm)
+	if(priv->use_shm)
 	{
-		image=XShmCreateImage(dpy, wa.visual, wa.depth, ZPixmap, 0, &shminfo, wa.width, wa.height);
-		if(!image)
+		priv->image=XShmCreateImage(dpy, wa.visual, wa.depth, ZPixmap, 0, &priv->shminfo, wa.width, wa.height);
+		if(!priv->image)
 			throw Exception("Could not create shared memory XImage");
 
-		shminfo.shmid=shmget(IPC_PRIVATE, image->bytes_per_line*image->height, IPC_CREAT|0666);
-		shminfo.shmaddr=image->data=reinterpret_cast<char *>(shmat(shminfo.shmid, 0, 0));
-		shminfo.readOnly=false;
+		priv->shminfo.shmid=shmget(IPC_PRIVATE, priv->image->bytes_per_line*priv->image->height, IPC_CREAT|0666);
+		priv->shminfo.shmaddr=priv->image->data=reinterpret_cast<char *>(shmat(priv->shminfo.shmid, 0, 0));
+		priv->shminfo.readOnly=false;
 
-		XShmAttach(dpy, &shminfo);
+		XShmAttach(dpy, &priv->shminfo);
 
 		XSync(dpy, false);
 		display.check_error();
 	}
 	else
 	{
-		image=XCreateImage(dpy, wa.visual, wa.depth, ZPixmap, 0, 0, wa.width, wa.height, 8, 0);
-		if(!image)
+		priv->image=XCreateImage(dpy, wa.visual, wa.depth, ZPixmap, 0, 0, wa.width, wa.height, 8, 0);
+		if(!priv->image)
 			throw Exception("Could not create XImage");
-		image->data=new char[image->bytes_per_line*image->height];
+		priv->image->data=new char[priv->image->bytes_per_line*priv->image->height];
 	}
 #endif
 }
@@ -58,15 +74,17 @@ DrawContext::DrawContext(Window &w):
 DrawContext::~DrawContext()
 {
 #ifndef WIN32
-	if(use_shm)
+	if(priv->use_shm)
 	{
-		XShmDetach(display.get_display(), &shminfo);
-		shmdt(shminfo.shmaddr);
-		shmctl(shminfo.shmid, IPC_RMID, 0);
+		XShmDetach(display.get_private().display, &priv->shminfo);
+		shmdt(priv->shminfo.shmaddr);
+		shmctl(priv->shminfo.shmid, IPC_RMID, 0);
 	}
 
-	XDestroyImage(image);
+	XDestroyImage(priv->image);
 #endif
+
+	delete priv;
 }
 
 unsigned DrawContext::get_depth() const
@@ -74,7 +92,7 @@ unsigned DrawContext::get_depth() const
 #ifdef WIN32
 	return 0;
 #else
-	return image->bits_per_pixel;
+	return priv->image->bits_per_pixel;
 #endif
 }
 
@@ -83,21 +101,22 @@ unsigned char *DrawContext::get_data()
 #ifdef WIN32
 	return 0;
 #else
-	return reinterpret_cast<unsigned char *>(image->data);
+	return reinterpret_cast<unsigned char *>(priv->image->data);
 #endif
 }
 
 void DrawContext::update()
 {
 #ifndef WIN32
-	::Display *dpy=display.get_display();
+	::Display *dpy=display.get_private().display;
+	WindowHandle wnd=window.get_private().window;
 
-	GC gc=XCreateGC(dpy, window.get_handle(), 0, 0);
+	GC gc=XCreateGC(dpy, wnd, 0, 0);
 
-	if(use_shm)
-		XShmPutImage(dpy, window.get_handle(), gc, image, 0, 0, 0, 0, image->width, image->height, false);
+	if(priv->use_shm)
+		XShmPutImage(dpy, wnd, gc, priv->image, 0, 0, 0, 0, priv->image->width, priv->image->height, false);
 	else
-		XPutImage(dpy, window.get_handle(), gc, image, 0, 0, 0, 0, image->width, image->height);
+		XPutImage(dpy, wnd, gc, priv->image, 0, 0, 0, 0, priv->image->width, priv->image->height);
 
 	XFreeGC(dpy, gc);
 #endif