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

fix linux+dub build

This commit is contained in:
Vadim Lopatin 2014-04-24 23:19:27 +04:00
parent e9ecc3b26c
commit cbc647a60b
5 changed files with 1522 additions and 1458 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/X11/xcb/image.d vendored
View File

@ -159,6 +159,7 @@ xcb_image_create_native (xcb_connection_t * c,
if (depth != 1) if (depth != 1)
return null; return null;
/* fall through */ /* fall through */
goto case;
case XCB_IMAGE_FORMAT_XY_PIXMAP: case XCB_IMAGE_FORMAT_XY_PIXMAP:
if (depth > 1) { if (depth > 1) {
fmt = find_format_by_depth(setup, depth); fmt = find_format_by_depth(setup, depth);

29
dub.json
View File

@ -21,6 +21,35 @@
"targetPath": "lib", "targetPath": "lib",
"targetType": "staticLibrary", "targetType": "staticLibrary",
"sourceFiles-posix": [
"3rdparty/X11/xcb/bigreq.d",
"3rdparty/X11/xcb/composite.d",
"3rdparty/X11/xcb/damage.d",
"3rdparty/X11/xcb/dpms.d",
"3rdparty/X11/xcb/glx.d",
"3rdparty/X11/xcb/randr.d",
"3rdparty/X11/xcb/record.d",
"3rdparty/X11/xcb/render.d",
"3rdparty/X11/xcb/res.d",
"3rdparty/X11/xcb/screensaver.d",
"3rdparty/X11/xcb/shape.d",
"3rdparty/X11/xcb/shm.d",
"3rdparty/X11/xcb/xcb.d",
"3rdparty/X11/xcb/xc_misc.d",
"3rdparty/X11/xcb/xevie.d",
"3rdparty/X11/xcb/xf86dri.d",
"3rdparty/X11/xcb/xfixes.d",
"3rdparty/X11/xcb/xinerama.d",
"3rdparty/X11/xcb/xprint.d",
"3rdparty/X11/xcb/xproto.d",
"3rdparty/X11/xcb/xtest.d",
"3rdparty/X11/xcb/xv.d",
"3rdparty/X11/xcb/xvmc.d",
"3rdparty/X11/xcb/image.d",
"3rdparty/X11/keysymdef.d",
"3rdparty/X11/X.d",
"3rdparty/X11/Xlib.d"
],
"sourceFiles-windows": [ "sourceFiles-windows": [
"3rdparty/win32/basetsd.d", "3rdparty/win32/basetsd.d",
"3rdparty/win32/basetyps.d", "3rdparty/win32/basetyps.d",

32
examples/example1/dub.json
View File

@ -11,6 +11,36 @@
"sourcePaths": ["../../src"], "sourcePaths": ["../../src"],
"sourceFiles-posix": [
"../../3rdparty/X11/xcb/bigreq.d",
"../../3rdparty/X11/xcb/composite.d",
"../../3rdparty/X11/xcb/damage.d",
"../../3rdparty/X11/xcb/dpms.d",
"../../3rdparty/X11/xcb/glx.d",
"../../3rdparty/X11/xcb/randr.d",
"../../3rdparty/X11/xcb/record.d",
"../../3rdparty/X11/xcb/render.d",
"../../3rdparty/X11/xcb/res.d",
"../../3rdparty/X11/xcb/screensaver.d",
"../../3rdparty/X11/xcb/shape.d",
"../../3rdparty/X11/xcb/shm.d",
"../../3rdparty/X11/xcb/xcb.d",
"../../3rdparty/X11/xcb/xc_misc.d",
"../../3rdparty/X11/xcb/xevie.d",
"../../3rdparty/X11/xcb/xf86dri.d",
"../../3rdparty/X11/xcb/xfixes.d",
"../../3rdparty/X11/xcb/xinerama.d",
"../../3rdparty/X11/xcb/xprint.d",
"../../3rdparty/X11/xcb/xproto.d",
"../../3rdparty/X11/xcb/xtest.d",
"../../3rdparty/X11/xcb/xv.d",
"../../3rdparty/X11/xcb/xvmc.d",
"../../3rdparty/X11/xcb/image.d",
"../../3rdparty/X11/keysymdef.d",
"../../3rdparty/X11/X.d",
"../../3rdparty/X11/Xlib.d"
],
"sourceFiles-windows": [ "sourceFiles-windows": [
"../../3rdparty/win32/basetsd.d", "../../3rdparty/win32/basetsd.d",
"../../3rdparty/win32/basetyps.d", "../../3rdparty/win32/basetyps.d",
@ -81,6 +111,8 @@
"libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"], "libs-windows": ["dlanguilib", "phobos", "ole32", "kernel32", "user32", "comctl32", "comdlg32"],
"libs-posix": ["xcb", "xcb-util", "xcb-shm", "xcb-image", "xcb-keysyms", "X11-xcb", "X11"],
"versions-windows": ["USE_OPENGL", "Unicode"], "versions-windows": ["USE_OPENGL", "Unicode"],

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

@ -70,14 +70,16 @@ version(linux) {
xcb_gcontext_t _g; xcb_gcontext_t _g;
xcb_image_t * _image; xcb_image_t * _image;
xcb_shm_segment_info_t shminfo; xcb_shm_segment_info_t shminfo;
/* Create GLX Window */ version(USE_OPENGL) {
GLXDrawable _drawable; /* Create GLX Window */
GLXWindow _glxwindow; private GLXDrawable _drawable;
private GLXWindow _glxwindow;
private GLXContext _context; private GLXContext _context;
private GLXFBConfig _fb_config;
}
private int _visualID = 0; private int _visualID = 0;
private xcb_colormap_t _colormap; private xcb_colormap_t _colormap;
private GLXFBConfig _fb_config;
@property xcb_window_t windowId() { return _w; } @property xcb_window_t windowId() { return _w; }
this(string caption, Window parent) { this(string caption, Window parent) {
@ -112,46 +114,47 @@ version(linux) {
_w = xcb_generate_id(_xcbconnection); _w = xcb_generate_id(_xcbconnection);
Log.d("window=", _w, " gc=", _g); Log.d("window=", _w, " gc=", _g);
version (USE_OPENGL) {
if (_enableOpengl) { if (_enableOpengl) {
int visual_attribs[] = [ int visual_attribs[] = [
GLX_RENDER_TYPE, GLX_RGBA_BIT, GLX_RENDER_TYPE, GLX_RGBA_BIT,
GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
GLX_DOUBLEBUFFER, 1, GLX_DOUBLEBUFFER, 1,
GLX_RED_SIZE, 8, GLX_RED_SIZE, 8,
GLX_GREEN_SIZE, 8, GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8, GLX_BLUE_SIZE, 8,
std.c.linux.X11.Xlib.None]; std.c.linux.X11.Xlib.None];
Log.d("Getting framebuffer config"); Log.d("Getting framebuffer config");
int fbcount; int fbcount;
GLXFBConfig *fbc = glXChooseFBConfig(_display, DefaultScreen(_display), visual_attribs.ptr, &fbcount); GLXFBConfig *fbc = glXChooseFBConfig(_display, DefaultScreen(_display), visual_attribs.ptr, &fbcount);
if (!fbc) if (!fbc)
{ {
Log.d("Failed to retrieve a framebuffer config"); Log.d("Failed to retrieve a framebuffer config");
//return 1; //return 1;
} }
Log.d("Getting XVisualInfo"); Log.d("Getting XVisualInfo");
_fb_config = fbc[0]; _fb_config = fbc[0];
auto vi = glXGetVisualFromFBConfig(_display, _fb_config); auto vi = glXGetVisualFromFBConfig(_display, _fb_config);
//auto vi = glXChooseVisual(_display, std.c.linux.X11.Xlib.DefaultScreen(_display), attributeList.ptr); //auto vi = glXChooseVisual(_display, std.c.linux.X11.Xlib.DefaultScreen(_display), attributeList.ptr);
_visualID = vi.visualid; _visualID = vi.visualid;
//swa.colormap = std.c.linux.X11.Xlib.XCreateColormap(_display, std.c.linux.X11.Xlib.RootWindow(_display, vi.screen), vi.visual, 0); // AllocNone //swa.colormap = std.c.linux.X11.Xlib.XCreateColormap(_display, std.c.linux.X11.Xlib.RootWindow(_display, vi.screen), vi.visual, 0); // AllocNone
Log.d("Creating color map"); Log.d("Creating color map");
_colormap = xcb_generate_id(_xcbconnection); _colormap = xcb_generate_id(_xcbconnection);
/* Create colormap */ /* Create colormap */
xcb_create_colormap( xcb_create_colormap(
_xcbconnection, _xcbconnection,
XCB_COLORMAP_ALLOC_NONE, XCB_COLORMAP_ALLOC_NONE,
_colormap, _colormap,
_xcbscreen.root, _xcbscreen.root,
_visualID _visualID
); );
depth = cast(ubyte)vi.depth; depth = cast(ubyte)vi.depth;
} }
}
//mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; //mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
//values[0] = _xcbscreen.white_pixel; //values[0] = _xcbscreen.white_pixel;
@ -181,7 +184,7 @@ version(linux) {
//XCB_COPY_FROM_PARENT,//_xcbscreen.root_depth, //XCB_COPY_FROM_PARENT,//_xcbscreen.root_depth,
_w, _w,
_xcbscreen.root, _xcbscreen.root,
50, 50, 500, 400, 30, 30, 800, 650,
1, 1,
XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_WINDOW_CLASS_INPUT_OUTPUT,
visualId, visualId,
@ -288,112 +291,117 @@ version(linux) {
xcb_map_window(_xcbconnection, _w); xcb_map_window(_xcbconnection, _w);
xcb_flush(_xcbconnection); xcb_flush(_xcbconnection);
//_enableOpengl = false; // test //_enableOpengl = false; // test
if (_enableOpengl && !_glxwindow) { version (USE_OPENGL) {
Log.d("Calling glXCreateWindow display=", _display, " fbconfig=", _fb_config, " window=", _w); if (_enableOpengl && !_glxwindow) {
_glxwindow = glXCreateWindow( Log.d("Calling glXCreateWindow display=", _display, " fbconfig=", _fb_config, " window=", _w);
_display, _glxwindow = glXCreateWindow(
_fb_config, _display,
_w, _fb_config,
null); _w,
if (!_glxwindow) { null);
Log.e("Failed to create GLX window: disabling OpenGL"); if (!_glxwindow) {
_enableOpengl = false; Log.e("Failed to create GLX window: disabling OpenGL");
} else { _enableOpengl = false;
import derelict.opengl3.glxext; } else {
import std.c.linux.X11.Xlib; import derelict.opengl3.glxext;
import std.c.linux.X11.Xlib;
_drawable = _glxwindow; _drawable = _glxwindow;
if (!_derelictgl3Reloaded) { if (!_derelictgl3Reloaded) {
int count; int count;
glGetIntegerv( GL_NUM_EXTENSIONS, &count ); glGetIntegerv( GL_NUM_EXTENSIONS, &count );
Log.d("Number of extensions: ", count); Log.d("Number of extensions: ", count);
for( int i=0; i<count; ++i ) { for( int i=0; i<count; ++i ) {
auto e = glGetStringi( GL_EXTENSIONS, i ); auto e = glGetStringi( GL_EXTENSIONS, i );
Log.d("Extension: ", fromStringz(e)); Log.d("Extension: ", fromStringz(e));
} }
Log.e("Reloading DerelictGL3"); Log.e("Reloading DerelictGL3");
_derelictgl3Reloaded = true; _derelictgl3Reloaded = true;
_context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true); _context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true);
if (_context is null) { if (_context is null) {
Log.e("Cannot create temporary context"); Log.e("Cannot create temporary context");
} }
//glXMakeContextCurrent(_display, _drawable, _drawable, _context); //glXMakeContextCurrent(_display, _drawable, _drawable, _context);
glXMakeContextCurrent(_display, _glxwindow, _glxwindow, _context); glXMakeContextCurrent(_display, _glxwindow, _glxwindow, _context);
//glXMakeCurrent(_display, _w, _context); //glXMakeCurrent(_display, _w, _context);
DerelictGL3.reload(); DerelictGL3.reload();
Log.e("Reloaded DerelictGL3 - removing temporary context"); Log.e("Reloaded DerelictGL3 - removing temporary context");
glXMakeCurrent(_display, 0, null); glXMakeCurrent(_display, 0, null);
Log.e("Destroying context"); Log.e("Destroying context");
glXDestroyContext(_display, _context); glXDestroyContext(_display, _context);
Log.e("DerelictGL3 initialized"); Log.e("DerelictGL3 initialized");
_context = null; _context = null;
} }
// Get the default screen's GLX extension list // Get the default screen's GLX extension list
const char *glxExts = glXQueryExtensionsString( _display, const char *glxExts = glXQueryExtensionsString( _display,
DefaultScreen( _display ) ); DefaultScreen( _display ) );
Log.d("GLX Extensions: ", fromStringz(glxExts)); Log.d("GLX Extensions: ", fromStringz(glxExts));
const char * exts = glGetString( GL_EXTENSIONS ); const char * exts = glGetString( GL_EXTENSIONS );
Log.d("Extensions: ", fromStringz(exts)); Log.d("Extensions: ", fromStringz(exts));
Log.d("GLX_ARB_get_proc_address=", GLX_ARB_get_proc_address); Log.d("GLX_ARB_get_proc_address=", GLX_ARB_get_proc_address);
Log.d("GLX_ARB_create_context=", GLX_ARB_create_context); Log.d("GLX_ARB_create_context=", GLX_ARB_create_context);
//da_glXCreateContextAttribsARB glXCreateContextAttribsARB; //da_glXCreateContextAttribsARB glXCreateContextAttribsARB;
//Log.d("getting address of glXCreateContextAttribsARB"); //Log.d("getting address of glXCreateContextAttribsARB");
//glXCreateContextAttribsARB = cast(da_glXCreateContextAttribsARB) //glXCreateContextAttribsARB = cast(da_glXCreateContextAttribsARB)
// glXGetProcAddressARB( cast(const GLubyte *)("glXCreateContextAttribsARB".toStringz)); // glXGetProcAddressARB( cast(const GLubyte *)("glXCreateContextAttribsARB".toStringz));
//Log.d("glXCreateContextAttribsARB = ", &glXCreateContextAttribsARB); //Log.d("glXCreateContextAttribsARB = ", &glXCreateContextAttribsARB);
Log.d("Creating context"); Log.d("Creating context");
//_context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true); //_context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true);
if (!GLX_ARB_create_context) { if (!GLX_ARB_create_context) {
Log.e("glXCreateContextAttribsARB function is not found"); Log.e("glXCreateContextAttribsARB function is not found");
_context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true); _context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true);
} else { } else {
int context_attribs[] = int context_attribs[] =
[ [
GLX_CONTEXT_MAJOR_VERSION_ARB, 3, GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, 0, GLX_CONTEXT_MINOR_VERSION_ARB, 0,
None None
]; ];
Log.e("calling glXCreateContextAttribsARB"); Log.e("calling glXCreateContextAttribsARB");
_context = glXCreateContextAttribsARB(_display, _fb_config, null, true, context_attribs.ptr); _context = glXCreateContextAttribsARB(_display, _fb_config, null, true, context_attribs.ptr);
} }
Log.d("Created context: ", _context); Log.d("Created context: ", _context);
/* Create OpenGL context */ /* Create OpenGL context */
//auto context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true); //auto context = glXCreateNewContext(_display, _fb_config, GLX_RGBA_TYPE, null, true);
if (!_context) { if (!_context) {
_enableOpengl = false; _enableOpengl = false;
Log.e("Failed to create OpenGL context"); Log.e("Failed to create OpenGL context");
} else { } else {
} }
/* make OpenGL context current */ /* make OpenGL context current */
if(!glXMakeContextCurrent(_display, _drawable, _drawable, _context) || !initShaders()) { if(!glXMakeContextCurrent(_display, _drawable, _drawable, _context) || !initShaders()) {
Log.e("Failed to make GL context current"); Log.e("Failed to make GL context current");
_enableOpengl = false; _enableOpengl = false;
glXDestroyContext(_display, _context); glXDestroyContext(_display, _context);
_context = null; _context = null;
} else { } else {
} }
} }
} }
}
} }
string _caption;
protected string _caption;
override @property string windowCaption() { override @property string windowCaption() {
return _caption; return _caption;
} }
override @property void windowCaption(string caption) { override @property void windowCaption(string caption) {
_caption = caption; _caption = caption;
const char * title = _caption.toStringz; const char * title = _caption.toStringz;
@ -410,33 +418,35 @@ version(linux) {
void redraw() { void redraw() {
if (_enableOpengl) { if (_enableOpengl) {
import std.c.linux.X11.Xlib; version(USE_OPENGL) {
Log.d("Drawing using opengl ", _dx, "x", _dy, " context=", _context); import std.c.linux.X11.Xlib;
//glXMakeContextCurrent(_display, _drawable, _drawable, _context); Log.d("Drawing using opengl ", _dx, "x", _dy, " context=", _context);
glXMakeContextCurrent(_display, _glxwindow, _glxwindow, _context); //glXMakeContextCurrent(_display, _drawable, _drawable, _context);
glEnable(GL_BLEND); glXMakeContextCurrent(_display, _glxwindow, _glxwindow, _context);
glDisable(GL_CULL_FACE); glEnable(GL_BLEND);
glDisable(GL_DEPTH_TEST); glDisable(GL_CULL_FACE);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glDisable(GL_DEPTH_TEST);
glViewport(0, 0, _dx, _dy); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
Log.d("glClearColor"); glViewport(0, 0, _dx, _dy);
glClearColor(0.2f, 0.4f, 0.9f, 1.0f); Log.d("glClearColor");
Log.d("glClear"); glClearColor(0.2f, 0.4f, 0.9f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT); Log.d("glClear");
glClear(GL_COLOR_BUFFER_BIT);
import dlangui.graphics.gldrawbuf; import dlangui.graphics.gldrawbuf;
GLDrawBuf buf = new GLDrawBuf(_dx, _dy); GLDrawBuf buf = new GLDrawBuf(_dx, _dy);
buf.beforeDrawing(); buf.beforeDrawing();
onDraw(buf); onDraw(buf);
buf.fillRect(Rect(0, 0, 100, 100), 0x805010); buf.fillRect(Rect(0, 0, 100, 100), 0x805010);
buf.afterDrawing(); buf.afterDrawing();
destroy(buf); destroy(buf);
Log.d("Calling glx swap buffers for drawable ", _drawable); Log.d("Calling glx swap buffers for drawable ", _drawable);
glXSwapBuffers(_display, _drawable); glXSwapBuffers(_display, _drawable);
//glXMakeContextCurrent(_display, _drawable, _drawable, null); //glXMakeContextCurrent(_display, _drawable, _drawable, null);
xcb_flush(_xcbconnection); xcb_flush(_xcbconnection);
glXMakeContextCurrent (_display, None, None, null); glXMakeContextCurrent (_display, None, None, null);
glXWaitGL(); glXWaitGL();
}
} else { } else {
if (!_drawbuf) if (!_drawbuf)
_drawbuf = new ColorDrawBuf(_dx, _dy); _drawbuf = new ColorDrawBuf(_dx, _dy);
@ -573,9 +583,6 @@ version(linux) {
case XK_Linefeed: case XK_Linefeed:
case XK_Return: case XK_Return:
return KeyCode.RETURN; return KeyCode.RETURN;
return KeyCode.SHIFT;
return KeyCode.CONTROL;
return KeyCode.ALT;
case XK_Shift_L: case XK_Shift_L:
return KeyCode.LSHIFT; return KeyCode.LSHIFT;
case XK_Shift_R: case XK_Shift_R:

2591
src/dlangui/widgets/editors.d
View File

File diff suppressed because it is too large Load Diff