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

updates for terminal emulator

This commit is contained in:
Adam D. Ruppe 2014-12-06 22:58:02 -05:00
parent 0fa7f5db94
commit 5f41fdc2c5
3 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
script.d
View File

@ -1,4 +1,9 @@
/** /**
FIXME: easier object interop with D
FIXME: prettier stack trace when sent to D
FIXME: add continuations or something too
FIXME: Also ability to get source code for function something so you can mixin. FIXME: Also ability to get source code for function something so you can mixin.
Script features: Script features:

38
simpledisplay.d
View File

@ -1772,6 +1772,8 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
void delegate() handlePulse; void delegate() handlePulse;
void delegate(bool) onFocusChange; /// called when the focus changes, param is if we have it (true) or are losing it (false)
private { private {
int lastMouseX = int.min; int lastMouseX = int.min;
int lastMouseY = int.min; int lastMouseY = int.min;
@ -2354,6 +2356,11 @@ version(Windows) {
if(wind.handleCharEvent) if(wind.handleCharEvent)
wind.handleCharEvent(cast(dchar) c); wind.handleCharEvent(cast(dchar) c);
break; break;
case WM_SETFOCUS:
case WM_KILLFOCUS:
if(wind.onFocusChange)
wind.onFocusChange(msg == WM_SETFOCUS);
break;
case WM_KEYDOWN: case WM_KEYDOWN:
case WM_KEYUP: case WM_KEYUP:
KeyEvent ev; KeyEvent ev;
@ -2443,6 +2450,8 @@ version(Windows) {
} }
HWND hwnd; HWND hwnd;
int oldWidth;
int oldHeight;
// the extern(Windows) wndproc should just forward to this // the extern(Windows) wndproc should just forward to this
int windowProcedure(HWND hwnd, uint msg, WPARAM wParam, LPARAM lParam) { int windowProcedure(HWND hwnd, uint msg, WPARAM wParam, LPARAM lParam) {
@ -2460,14 +2469,20 @@ version(Windows) {
PostQuitMessage(0); PostQuitMessage(0);
break; break;
case WM_SIZE: case WM_SIZE:
auto width = LOWORD(lParam); width = LOWORD(lParam);
auto height = HIWORD(lParam); height = HIWORD(lParam);
break;
auto oldWidth = this.width; // I don't like the tearing I get when redrawing on WM_SIZE
auto oldHeight = this.height; // (I know there's other ways to fix that but I don't like that behavior anyway)
// so instead it is going to redraw only at the end of a size.
this.width = width; case 0x0231: /* WM_ENTERSIZEMOVE */
this.height = height; oldWidth = this.width;
oldHeight = this.height;
break;
case 0x0232: /* WM_EXITSIZEMOVE */
// nothing relevant changed, don't bother redrawing
if(oldWidth == width && oldHeight == height)
break;
// note: OpenGL windows don't use a backing bmp, so no need to change them // note: OpenGL windows don't use a backing bmp, so no need to change them
// if resizability is anything other than allowResizing, it is meant to either stretch the one image or just do nothing // if resizability is anything other than allowResizing, it is meant to either stretch the one image or just do nothing
@ -3410,6 +3425,13 @@ version(X11) {
} }
} }
break; break;
case EventType.FocusIn:
case EventType.FocusOut:
if(auto win = e.xfocus.window in SimpleWindow.nativeMapping) {
if(win.onFocusChange)
win.onFocusChange(e.type == EventType.FocusIn);
}
break;
case EventType.ClientMessage: // User clicked the close button case EventType.ClientMessage: // User clicked the close button
if(auto win = e.xclient.window in SimpleWindow.nativeMapping) if(auto win = e.xclient.window in SimpleWindow.nativeMapping)
(*win).close(); (*win).close();

4
xwindows.d
View File

@ -10,6 +10,8 @@ module arsd.xwindows;
import simpledisplay; import simpledisplay;
static if(UsingSimpledisplayX11) {
enum _NET_WM_STATE_ADD = 1; enum _NET_WM_STATE_ADD = 1;
enum _NET_WM_STATE_REMOVE = 0; enum _NET_WM_STATE_REMOVE = 0;
enum _NET_WM_STATE_TOGGLE = 2; enum _NET_WM_STATE_TOGGLE = 2;
@ -86,3 +88,5 @@ TrueColorImage getWindowNetWmIcon(Window window) {
return null; return null;
} }
}