From 5f41fdc2c51d6e9ae92be4a165b31a93eb3b7b95 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Sat, 6 Dec 2014 22:58:02 -0500
Subject: [PATCH] updates for terminal emulator

---
 script.d        |  5 +++++
 simpledisplay.d | 38 ++++++++++++++++++++++++++++++--------
 xwindows.d      |  4 ++++
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/script.d b/script.d
index 1a0d9d7..c28a0e1 100644
--- a/script.d
+++ b/script.d
@@ -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.
 
 	Script features:
diff --git a/simpledisplay.d b/simpledisplay.d
index 44b7782..858a93d 100644
--- a/simpledisplay.d
+++ b/simpledisplay.d
@@ -1772,6 +1772,8 @@ class SimpleWindow : CapableOfHandlingNativeEvent {
 
 	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 {
 		int lastMouseX = int.min;
 		int lastMouseY = int.min;
@@ -2354,6 +2356,11 @@ version(Windows) {
 					if(wind.handleCharEvent)
 						wind.handleCharEvent(cast(dchar) c);
 				break;
+				  case WM_SETFOCUS:
+				  case WM_KILLFOCUS:
+					if(wind.onFocusChange)
+						wind.onFocusChange(msg == WM_SETFOCUS);
+				  break;
 				case WM_KEYDOWN:
 				case WM_KEYUP:
 					KeyEvent ev;
@@ -2443,6 +2450,8 @@ version(Windows) {
 		}
 
 		HWND hwnd;
+		int oldWidth;
+		int oldHeight;
 
 		// the extern(Windows) wndproc should just forward to this
 		int windowProcedure(HWND hwnd, uint msg, WPARAM wParam, LPARAM lParam) {
@@ -2460,14 +2469,20 @@ version(Windows) {
 						PostQuitMessage(0);
 				break;
 				case WM_SIZE:
-					auto width = LOWORD(lParam);
-					auto height = HIWORD(lParam);
-
-					auto oldWidth = this.width;
-					auto oldHeight = this.height;
-
-					this.width = width;
-					this.height = height;
+					width = LOWORD(lParam);
+					height = HIWORD(lParam);
+				break;
+				// I don't like the tearing I get when redrawing on WM_SIZE
+				// (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.
+				case 0x0231: /* WM_ENTERSIZEMOVE */
+					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
 					// 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;
+		  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
 			if(auto win = e.xclient.window in SimpleWindow.nativeMapping)
 				(*win).close();
diff --git a/xwindows.d b/xwindows.d
index 9b0db34..619dc33 100644
--- a/xwindows.d
+++ b/xwindows.d
@@ -10,6 +10,8 @@ module arsd.xwindows;
 
 import simpledisplay;
 
+static if(UsingSimpledisplayX11) {
+
 enum _NET_WM_STATE_ADD = 1;
 enum _NET_WM_STATE_REMOVE = 0;
 enum _NET_WM_STATE_TOGGLE = 2;
@@ -86,3 +88,5 @@ TrueColorImage getWindowNetWmIcon(Window window) {
 
 	return null;
 }
+
+}