forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

X11

This commit is contained in:
Vadim Lopatin 2015-12-01 12:27:02 +03:00
parent bbd9d365d4
commit 477e825f8f
1 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/dlangui/platforms/x11/x11app.d
View File

@ -72,6 +72,7 @@ class X11Window : DWindow {
this(X11Platform platform, dstring caption, DWindow parent, uint flags, uint width = 0, uint height = 0) { this(X11Platform platform, dstring caption, DWindow parent, uint flags, uint width = 0, uint height = 0) {
_platform = platform; _platform = platform;
_caption = caption; _caption = caption;
//backgroundColor = 0xFFFFFF;
debug Log.d("X11Window: Creating window"); debug Log.d("X11Window: Creating window");
if (width == 0) if (width == 0)
width = 500; width = 500;
@ -203,10 +204,9 @@ class X11Window : DWindow {
_drawbuf.resize(_dx, _dy); _drawbuf.resize(_dx, _dy);
_drawbuf.resetClipping(); _drawbuf.resetClipping();
// draw widgets into buffer // draw widgets into buffer
_drawbuf.fill(backgroundColor);
onDraw(_drawbuf); onDraw(_drawbuf);
// draw buffer on X11 window // draw buffer on X11 window
//_drawbuf.invertAlpha();
//_drawbuf.invertByteOrder();
XImage img; XImage img;
img.width = _drawbuf.width; img.width = _drawbuf.width;
img.height = _drawbuf.height; img.height = _drawbuf.height;
@ -223,55 +223,14 @@ class X11Window : DWindow {
img.green_mask = 0x00FF00; img.green_mask = 0x00FF00;
img.blue_mask = 0x0000FF; img.blue_mask = 0x0000FF;
XInitImage(&img); XInitImage(&img);
XSetClipOrigin(x11display, _gc, 0, 0); //XSetClipOrigin(x11display, _gc, 0, 0);
XPutImage(x11display, _win, XPutImage(x11display, _win,
_gc, //DefaultGC(x11display, DefaultScreen(x11display)), _gc, //DefaultGC(x11display, DefaultScreen(x11display)),
&img, &img,
0, 0, 0, 0, 0, 0, 0, 0,
_drawbuf.width, _drawbuf.width,
_drawbuf.height); _drawbuf.height);
/*
XImage * image = XCreateImage(x11display,
DefaultVisual(x11display, DefaultScreen(x11display)),
24,
ZPixmap, //XYPixmap,
0,
cast(char*)_drawbuf.scanLine(0),
_drawbuf.width,
_drawbuf.height,
32, 0);
//image.bitmap_bit_order = MSBFirst;
//image.b
XPutImage(x11display, _win,
_gc, //DefaultGC(x11display, DefaultScreen(x11display)),
image,
0, 0, 0, 0,
_drawbuf.width,
_drawbuf.height);
*/
XFlush(x11display); XFlush(x11display);
//XDestroyImage(image);
//XFree(image);
// ulong black, white;
// black = BlackPixel(x11display, x11screen); /* get color black */
// white = WhitePixel(x11display, x11screen); /* get color white */
// Pixmap pixmap = XCreatePixmapFromBitmapData(x11display, _win,
// cast(char*)_drawbuf.scanLine(0),
// _drawbuf.width,
// _drawbuf.height,
// black,
// white,
// DefaultDepth(x11display, 0) // depth
// );
// //GC gc = XCreateGC(x11display, pixmap, 0, null);
// XCopyArea(x11display, pixmap, _win,
// _gc, //gc
// 0, 0, _drawbuf.width, _drawbuf.height,
// 0, 0);
//XFlush(x11display);
//XFreePixmap(x11display, pixmap);
} }
} }
@ -284,23 +243,15 @@ class X11Window : DWindow {
if (width > 0 && height > 0) if (width > 0 && height > 0)
onResize(width, height); onResize(width, height);
Log.d(format("processExpose(%d, %d)", width, height)); Log.d(format("processExpose(%d, %d)", width, height));
ulong black, white; // ulong black, white;
black = BlackPixel(x11display, x11screen); /* get color black */ // black = BlackPixel(x11display, x11screen); /* get color black */
white = WhitePixel(x11display, x11screen); /* get color white */ // white = WhitePixel(x11display, x11screen); /* get color white */
XSetBackground(x11display, _gc, white); // XSetBackground(x11display, _gc, white);
XClearWindow(x11display, _win); // XClearWindow(x11display, _win);
drawUsingBitmap(); drawUsingBitmap();
//XSetForeground( x11display, _gc, black );
//XFillRectangle(x11display, _win, _gc, 5, 5, _dx - 10, 5);
//XFillRectangle(x11display, _win, _gc, 5, _dy - 10, _dx - 10, 5);
//XSetForeground ( x11display, _gc, black );
//XDrawString ( x11display, _win, _gc, 20, 50,
// cast(char*)"First example".ptr, "First example".length );
//XFreeGC ( x11display, gc );
XFlush(x11display);
} }
} }