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

ketmar patch

This commit is contained in:
Adam D. Ruppe 2016-11-10 10:44:03 -05:00
parent 0a3018d399
commit 2c8b77da5d
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
simpledisplay.d
View File

@ -717,6 +717,7 @@ void sdpyWindowClass (const(char)[] v) {
import core.stdc.stdlib : realloc; import core.stdc.stdlib : realloc;
if (v.length == 0) v = "SimpleDisplayWindow"; if (v.length == 0) v = "SimpleDisplayWindow";
sdpyWindowClassStr = cast(char*)realloc(sdpyWindowClassStr, v.length+1); sdpyWindowClassStr = cast(char*)realloc(sdpyWindowClassStr, v.length+1);
if (sdpyWindowClassStr is null) return; // oops
sdpyWindowClassStr[0..v.length+1] = 0; sdpyWindowClassStr[0..v.length+1] = 0;
sdpyWindowClassStr[0..v.length] = v[]; sdpyWindowClassStr[0..v.length] = v[];
} }
@ -3674,6 +3675,7 @@ version(Windows) {
// Mix this into the SimpleWindow class // Mix this into the SimpleWindow class
mixin template NativeSimpleWindowImplementation() { mixin template NativeSimpleWindowImplementation() {
int curHidden = 0; // counter int curHidden = 0; // counter
bool[string] knownWinClasses;
void hideCursor () { void hideCursor () {
++curHidden; ++curHidden;
@ -3704,7 +3706,6 @@ version(Windows) {
} }
HBITMAP buffer; HBITMAP buffer;
static bool classRegistered;
void setTitle(string title) { void setTitle(string title) {
SetWindowTextA(hwnd, toStringz(title)); SetWindowTextA(hwnd, toStringz(title));
@ -3757,21 +3758,20 @@ version(Windows) {
} }
void createWindow(int width, int height, string title, OpenGlOptions opengl, SimpleWindow parent) { void createWindow(int width, int height, string title, OpenGlOptions opengl, SimpleWindow parent) {
// the .dup here is a hack to make it work on dmd 64 bit. Apparently the import std.conv : to;
// address of the literal doesn't play nice with RegisterClass - it was string cnamec;
// returning error 998 without it. wstring cn;// = "DSimpleWindow\0"w.dup;
wstring cn; if (sdpyWindowClassStr is null) loadBinNameToWindowClassName();
// = "DSimpleWindow\0"w.dup;
if (sdpyWindowClassStr is null || sdpyWindowClassStr[0] == 0) { if (sdpyWindowClassStr is null || sdpyWindowClassStr[0] == 0) {
cn = "DSimpleWindow\0"w.dup; cnamec = "DSimpleWindow";
} else { } else {
import std.conv : to; cnamec = sdpyWindowClass;
cn = sdpyWindowClass.to!wstring ~ "\0"; // just in case, lol
} }
cn = cnamec.to!wstring ~ "\0"; // just in case, lol
HINSTANCE hInstance = cast(HINSTANCE) GetModuleHandle(null); HINSTANCE hInstance = cast(HINSTANCE) GetModuleHandle(null);
if(!classRegistered) { if(cnamec !in knownWinClasses) {
WNDCLASSEX wc; WNDCLASSEX wc;
// FIXME: I might be able to use cbWndExtra to hold the pointer back // FIXME: I might be able to use cbWndExtra to hold the pointer back
@ -3789,7 +3789,7 @@ version(Windows) {
wc.style = CS_HREDRAW | CS_VREDRAW; wc.style = CS_HREDRAW | CS_VREDRAW;
if(!RegisterClassExW(&wc)) if(!RegisterClassExW(&wc))
throw new Exception("RegisterClass"); throw new Exception("RegisterClass");
classRegistered = true; knownWinClasses[cnamec] = true;
} }
int style; int style;
@ -5175,8 +5175,11 @@ version(X11) {
} }
} }
if (sdpyWindowClassStr is null) loadBinNameToWindowClassName();
if (sdpyWindowClassStr is null) sdpyWindowClass = "DSimpleWindow";
// window class // window class
if (sdpyWindowClass !is null) { if (sdpyWindowClassStr !is null && sdpyWindowClassStr[0]) {
//{ import core.stdc.stdio; printf("winclass: [%s]\n", sdpyWindowClassStr); }
XClassHint klass; XClassHint klass;
XWMHints wh; XWMHints wh;
XSizeHints size; XSizeHints size;
@ -9016,3 +9019,26 @@ TrueColorImage getWindowNetWmIcon(Window window) {
} }
} }
void loadBinNameToWindowClassName () {
import core.stdc.stdlib : realloc;
version(linux) {
// args[0] MAY be empty, so we'll just use this
import core.sys.posix.unistd : readlink;
char[1024] ebuf = void; // 1KB should be enough for everyone!
auto len = readlink("/proc/self/exe", ebuf.ptr, ebuf.length);
if (len < 1) return;
} else /*version(Windows)*/ {
import core.runtime : Runtime;
if (Runtime.args.length == 0 || Runtime.args[0].length == 0) return;
auto ebuf = Runtime.args[0];
auto len = ebuf.length;
}
auto pos = len;
while (pos > 0 && ebuf[pos-1] != '/') --pos;
sdpyWindowClassStr = cast(char*)realloc(sdpyWindowClassStr, len-pos+1);
if (sdpyWindowClassStr is null) return; // oops
sdpyWindowClassStr[0..len-pos+1] = 0; // just in case
sdpyWindowClassStr[0..len-pos] = ebuf[pos..len];
}