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

ketmar mt patch

This commit is contained in:
Adam D. Ruppe 2016-02-08 10:56:29 -05:00
parent 3105a88e7e
commit 7da0a88a88
1 changed files with 66 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
simpledisplay.d
View File

@ -957,6 +957,9 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
if(redrawOpenGlScene is null) if(redrawOpenGlScene is null)
return; return;
this.mtLock();
scope(exit) this.mtUnlock();
this.setAsCurrentOpenGlContext(); this.setAsCurrentOpenGlContext();
redrawOpenGlScene(); redrawOpenGlScene();
@ -964,7 +967,6 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
this.swapOpenGlBuffers(); this.swapOpenGlBuffers();
// at least nvidia proprietary crap segfaults on exit if you won't do this and will call glTexSubImage2D() too fast; no, `glFlush()` won't work. // at least nvidia proprietary crap segfaults on exit if you won't do this and will call glTexSubImage2D() too fast; no, `glFlush()` won't work.
if (useGLFinish) glFinish(); if (useGLFinish) glFinish();
} }
@ -2632,8 +2634,12 @@ class Sprite {
/// Flushes any pending gui buffers. Necessary if you are using with_eventloop with X - flush after you create your windows but before you call loop() /// Flushes any pending gui buffers. Necessary if you are using with_eventloop with X - flush after you create your windows but before you call loop()
void flushGui() { void flushGui() {
version(X11) version(X11) {
XFlush(XDisplayConnection.get()); auto dpy = XDisplayConnection.get();
XLockDisplay(dpy);
scope(exit) XUnlockDisplay(dpy);
XFlush(dpy);
}
} }
// Internal // Internal
@ -4982,6 +4988,8 @@ version(X11) {
if(SimpleWindow.handleNativeGlobalEvent !is null) { if(SimpleWindow.handleNativeGlobalEvent !is null) {
// see windows impl's comments // see windows impl's comments
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
auto ret = SimpleWindow.handleNativeGlobalEvent(e); auto ret = SimpleWindow.handleNativeGlobalEvent(e);
if(ret == 0) if(ret == 0)
return done; return done;
@ -4990,6 +4998,8 @@ version(X11) {
if(auto win = e.xany.window in CapableOfHandlingNativeEvent.nativeHandleMapping) { if(auto win = e.xany.window in CapableOfHandlingNativeEvent.nativeHandleMapping) {
if(win.getNativeEventHandler !is null) { if(win.getNativeEventHandler !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
auto ret = win.getNativeEventHandler()(e); auto ret = win.getNativeEventHandler()(e);
if(ret == 0) if(ret == 0)
return done; return done;
@ -5004,6 +5014,8 @@ version(X11) {
case EventType.SelectionRequest: case EventType.SelectionRequest:
if(auto win = e.xselectionrequest.owner in SimpleWindow.nativeMapping) if(auto win = e.xselectionrequest.owner in SimpleWindow.nativeMapping)
if(win.setSelectionHandler !is null) { if(win.setSelectionHandler !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.setSelectionHandler(e); win.setSelectionHandler(e);
} }
break; break;
@ -5012,6 +5024,8 @@ version(X11) {
if(win.getSelectionHandler !is null) { if(win.getSelectionHandler !is null) {
// FIXME: maybe we should call a different handler for PRIMARY vs CLIPBOARD // FIXME: maybe we should call a different handler for PRIMARY vs CLIPBOARD
if(e.xselection.property == None) { // || e.xselection.property == GetAtom!("NULL", true)(e.xselection.display)) { if(e.xselection.property == None) { // || e.xselection.property == GetAtom!("NULL", true)(e.xselection.display)) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.getSelectionHandler(null); win.getSelectionHandler(null);
} else { } else {
Atom target; Atom target;
@ -5032,7 +5046,11 @@ version(X11) {
// FIXME: or be other formats... // FIXME: or be other formats...
// FIXME: I don't have to copy it now since it is in char[] instead of string // FIXME: I don't have to copy it now since it is in char[] instead of string
win.getSelectionHandler((cast(char[]) value[0 .. length]).idup); {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.getSelectionHandler((cast(char[]) value[0 .. length]).idup);
}
XFree(value); XFree(value);
XDeleteProperty( XDeleteProperty(
e.xselection.display, e.xselection.display,
@ -5077,6 +5095,8 @@ version(X11) {
} }
if(win.windowResized !is null) if(win.windowResized !is null)
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.windowResized(event.width, event.height); win.windowResized(event.width, event.height);
} }
} }
@ -5086,7 +5106,9 @@ version(X11) {
if((*win).openglMode == OpenGlOptions.no) if((*win).openglMode == OpenGlOptions.no)
XCopyArea(display, cast(Drawable) (*win).buffer, cast(Drawable) (*win).window, (*win).gc, e.xexpose.x, e.xexpose.y, e.xexpose.width, e.xexpose.height, e.xexpose.x, e.xexpose.y); XCopyArea(display, cast(Drawable) (*win).buffer, cast(Drawable) (*win).window, (*win).gc, e.xexpose.x, e.xexpose.y, e.xexpose.width, e.xexpose.height, e.xexpose.x, e.xexpose.y);
else { else {
// need to redraw the scene somehow. // need to redraw the scene somehow
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.redrawOpenGlSceneNow(); win.redrawOpenGlSceneNow();
} }
} }
@ -5098,8 +5120,11 @@ version(X11) {
//{ import core.stdc.stdio : printf; printf("XIC focus change!\n"); } //{ import core.stdc.stdio : printf; printf("XIC focus change!\n"); }
if (e.type == EventType.FocusIn) XSetICFocus(win.xic); else XUnsetICFocus(win.xic); if (e.type == EventType.FocusIn) XSetICFocus(win.xic); else XUnsetICFocus(win.xic);
} }
if(win.onFocusChange) if(win.onFocusChange) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.onFocusChange(e.type == EventType.FocusIn); win.onFocusChange(e.type == EventType.FocusIn);
}
} }
break; break;
case EventType.ClientMessage: case EventType.ClientMessage:
@ -5107,6 +5132,8 @@ version(X11) {
// user clicked the close button on the window manager // user clicked the close button on the window manager
// FIXME: not implemented on Windows // FIXME: not implemented on Windows
if(auto win = e.xclient.window in SimpleWindow.nativeMapping) { if(auto win = e.xclient.window in SimpleWindow.nativeMapping) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
if ((*win).closeQuery !is null) (*win).closeQuery(); else (*win).close(); if ((*win).closeQuery !is null) (*win).closeQuery(); else (*win).close();
} }
} }
@ -5116,15 +5143,27 @@ version(X11) {
(*win)._visible = true; (*win)._visible = true;
if (!(*win)._visibleForTheFirstTimeCalled) { if (!(*win)._visibleForTheFirstTimeCalled) {
(*win)._visibleForTheFirstTimeCalled = true; (*win)._visibleForTheFirstTimeCalled = true;
if ((*win).visibleForTheFirstTime !is null) (*win).visibleForTheFirstTime(); if ((*win).visibleForTheFirstTime !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
(*win).visibleForTheFirstTime();
}
}
if ((*win).visibilityChanged !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
(*win).visibilityChanged(true);
} }
if ((*win).visibilityChanged !is null) (*win).visibilityChanged(true);
} }
break; break;
case EventType.UnmapNotify: case EventType.UnmapNotify:
if(auto win = e.xunmap.window in SimpleWindow.nativeMapping) { if(auto win = e.xunmap.window in SimpleWindow.nativeMapping) {
win._visible = false; win._visible = false;
if (win.visibilityChanged !is null) win.visibilityChanged(false); if (win.visibilityChanged !is null) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.visibilityChanged(false);
}
} }
break; break;
case EventType.DestroyNotify: case EventType.DestroyNotify:
@ -5159,8 +5198,11 @@ version(X11) {
if(auto win = e.xmotion.window in SimpleWindow.nativeMapping) { if(auto win = e.xmotion.window in SimpleWindow.nativeMapping) {
(*win).mdx(mouse); (*win).mdx(mouse);
if((*win).handleMouseEvent) if((*win).handleMouseEvent) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
(*win).handleMouseEvent(mouse); (*win).handleMouseEvent(mouse);
}
mouse.window = *win; mouse.window = *win;
} }
@ -5192,8 +5234,11 @@ version(X11) {
if(auto win = e.xbutton.window in SimpleWindow.nativeMapping) { if(auto win = e.xbutton.window in SimpleWindow.nativeMapping) {
(*win).mdx(mouse); (*win).mdx(mouse);
if((*win).handleMouseEvent) if((*win).handleMouseEvent) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
(*win).handleMouseEvent(mouse); (*win).handleMouseEvent(mouse);
}
mouse.window = *win; mouse.window = *win;
} }
version(with_eventloop) version(with_eventloop)
@ -5247,14 +5292,22 @@ version(X11) {
if (auto win = e.xkey.window in SimpleWindow.nativeMapping) { if (auto win = e.xkey.window in SimpleWindow.nativeMapping) {
ke.window = *win; ke.window = *win;
if (win.handleKeyEvent) win.handleKeyEvent(ke); if (win.handleKeyEvent) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.handleKeyEvent(ke);
}
// char events are separate since they are on Windows too // char events are separate since they are on Windows too
// also, xcompose can generate long char sequences // also, xcompose can generate long char sequences
if (ke.pressed && charbuflen > 0) { if (ke.pressed && charbuflen > 0) {
// FIXME: I think Windows sends these on releases... we should try to match that, but idk about repeats. // FIXME: I think Windows sends these on releases... we should try to match that, but idk about repeats.
foreach (immutable dchar ch; charbuf[0..charbuflen]) { foreach (immutable dchar ch; charbuf[0..charbuflen]) {
if (win.handleCharEvent) win.handleCharEvent(ch); if (win.handleCharEvent) {
XUnlockDisplay(display);
scope(exit) XLockDisplay(display);
win.handleCharEvent(ch);
}
} }
} }
} }