Make command buffer use new event system

jcd · jcd · commit db9c73767975 · 2016-08-16T16:28:04.000+02:00
diff --git a/libdeadcode/src/controls/command.d b/libdeadcode/src/controls/command.d
@@ -237,9 +237,9 @@ class CommandControl : Widget
 		commandField.h = 32;
 		commandField.bufferView.onChanged.connect(&handleBufferChanged);
 		commandField.name = "commandEntryField";
-		commandField.onCommandCallback = (Event event, Widget w) => onCommand(event);
-		commandField.onKeyDownCallback = (Event event, Widget w) => onKeyDown(event);
-		commandField.onKeyUpCallback = (Event event, Widget w) => onKeyUp(event);
+		commandField.onCommandCallback = (CommandEvent event, Widget w) => onCommandEvent(event);
+		commandField.onKeyPressedCallback = (KeyPressedEvent event, Widget w) => onKeyPressedEvent(event);
+		commandField.onKeyReleasedCallback = (KeyReleasedEvent event, Widget w) => onKeyReleasedEvent(event);
 
 		auto ww = new Widget(this, 0, 0, 1, 1); // dummy for grid cell
 		ww.name = "dummy";
@@ -277,16 +277,16 @@ class CommandControl : Widget
 		questionLabel.text = "";
 	}
 
-	override EventUsed onMouseClick(Event event)
+	override EventUsed onMouseClickedEvent(MouseClickedEvent event)
 	{
 		if (!isShown)
 			show(Mode.multiline);
 		return EventUsed.yes;
 	}
 
-	override EventUsed onKeyDown(Event ev)
+	override EventUsed onKeyPressedEvent(KeyPressedEvent ev)
 	{
-		if (ev.keyCode == stringToKeyCode("escape"))
+		if (ev.code == stringToKeyCode("escape"))
 		{
 			if (_promptDelegate !is null)
 			{
@@ -295,7 +295,7 @@ class CommandControl : Widget
 			hide();
 			clearCompletions();
 		}
-		else if (ev.keyCode == stringToKeyCode("return"))
+		else if (ev.code == stringToKeyCode("return"))
 		{
 			if (_promptDelegate is null)
             {
@@ -312,7 +312,7 @@ class CommandControl : Widget
                 }
 			}
 		}
-		else if (ev.mod == 0 && isBufferCycleMode)
+		else if (ev.modifiers == 0 && isBufferCycleMode)
 		{
 			// TODO: Fix hide jumping back to last focus widget since executeCommand may want to change that
             //       and end cycle buffer mode is changing that.
@@ -326,12 +326,12 @@ class CommandControl : Widget
 		return EventUsed.yes;
 	}
 
-	override EventUsed onKeyUp(Event ev)
+	override EventUsed onKeyReleasedEvent(KeyReleasedEvent ev)
 	{
 		if (_promptCompletionsShown)
 			updatePromptCompletions();
 
-		if (ev.mod == 0 && isBufferCycleMode)
+		if (ev.modifiers == 0 && isBufferCycleMode)
 		{
 			endCycleBufferMode();
 			// hide();
@@ -345,7 +345,7 @@ class CommandControl : Widget
 
 	override void draw()
 	{
-		if (!visible)
+		if (!visible || w() == 0)
 			return;
 
 		auto tup = completionWidget.bufferView.buffer.lineEndsForLineNumber(completionStyler.lineHighlighted);
@@ -354,9 +354,9 @@ class CommandControl : Widget
 		super.draw();
 	}
 
-	override EventUsed onCommand(Event event)
+	override EventUsed onCommandEvent(CommandEvent event)
 	{
-		switch (event.name)
+		switch (event.commandName)
 		{
 		case "edit.commitCompletion":
             if (_promptDelegate is null)
@@ -423,7 +423,7 @@ class CommandControl : Widget
 			import std.conv;
 
 			int val = 1;
-			auto valPtr = event.argument[0].peek!string();
+			auto valPtr = event.arguments[0].peek!string();
 			if (valPtr !is null)
 				val = (*valPtr).to!int();
 

Original file line number	Diff line number	Diff line change
`@@ -237,9 +237,9 @@ class CommandControl : Widget`
`237`	`237`	`commandField.h = 32;`
`238`	`238`	`commandField.bufferView.onChanged.connect(&handleBufferChanged);`
`239`	`239`	`commandField.name = "commandEntryField";`
`240`		`- commandField.onCommandCallback = (Event event, Widget w) => onCommand(event);`
`241`		`- commandField.onKeyDownCallback = (Event event, Widget w) => onKeyDown(event);`
`242`		`- commandField.onKeyUpCallback = (Event event, Widget w) => onKeyUp(event);`
	`240`	`+ commandField.onCommandCallback = (CommandEvent event, Widget w) => onCommandEvent(event);`
	`241`	`+ commandField.onKeyPressedCallback = (KeyPressedEvent event, Widget w) => onKeyPressedEvent(event);`
	`242`	`+ commandField.onKeyReleasedCallback = (KeyReleasedEvent event, Widget w) => onKeyReleasedEvent(event);`
`243`	`243`
`244`	`244`	`auto ww = new Widget(this, 0, 0, 1, 1); // dummy for grid cell`
`245`	`245`	`ww.name = "dummy";`
`@@ -277,16 +277,16 @@ class CommandControl : Widget`
`277`	`277`	`questionLabel.text = "";`
`278`	`278`	`}`
`279`	`279`
`280`		`- override EventUsed onMouseClick(Event event)`
	`280`	`+ override EventUsed onMouseClickedEvent(MouseClickedEvent event)`
`281`	`281`	`{`
`282`	`282`	`if (!isShown)`
`283`	`283`	`show(Mode.multiline);`
`284`	`284`	`return EventUsed.yes;`
`285`	`285`	`}`
`286`	`286`
`287`		`- override EventUsed onKeyDown(Event ev)`
	`287`	`+ override EventUsed onKeyPressedEvent(KeyPressedEvent ev)`
`288`	`288`	`{`
`289`		`- if (ev.keyCode == stringToKeyCode("escape"))`
	`289`	`+ if (ev.code == stringToKeyCode("escape"))`
`290`	`290`	`{`
`291`	`291`	`if (_promptDelegate !is null)`
`292`	`292`	`{`
`@@ -295,7 +295,7 @@ class CommandControl : Widget`
`295`	`295`	`hide();`
`296`	`296`	`clearCompletions();`
`297`	`297`	`}`
`298`		`- else if (ev.keyCode == stringToKeyCode("return"))`
	`298`	`+ else if (ev.code == stringToKeyCode("return"))`
`299`	`299`	`{`
`300`	`300`	`if (_promptDelegate is null)`
`301`	`301`	`{`
`@@ -312,7 +312,7 @@ class CommandControl : Widget`
`312`	`312`	`}`
`313`	`313`	`}`
`314`	`314`	`}`
`315`		`- else if (ev.mod == 0 && isBufferCycleMode)`
	`315`	`+ else if (ev.modifiers == 0 && isBufferCycleMode)`
`316`	`316`	`{`
`317`	`317`	`// TODO: Fix hide jumping back to last focus widget since executeCommand may want to change that`
`318`	`318`	`// and end cycle buffer mode is changing that.`
`@@ -326,12 +326,12 @@ class CommandControl : Widget`
`326`	`326`	`return EventUsed.yes;`
`327`	`327`	`}`
`328`	`328`
`329`		`- override EventUsed onKeyUp(Event ev)`
	`329`	`+ override EventUsed onKeyReleasedEvent(KeyReleasedEvent ev)`
`330`	`330`	`{`
`331`	`331`	`if (_promptCompletionsShown)`
`332`	`332`	`updatePromptCompletions();`
`333`	`333`
`334`		`- if (ev.mod == 0 && isBufferCycleMode)`
	`334`	`+ if (ev.modifiers == 0 && isBufferCycleMode)`
`335`	`335`	`{`
`336`	`336`	`endCycleBufferMode();`
`337`	`337`	`// hide();`
`@@ -345,7 +345,7 @@ class CommandControl : Widget`
`345`	`345`
`346`	`346`	`override void draw()`
`347`	`347`	`{`
`348`		`- if (!visible)`
	`348`	`+ if (!visible \|\| w() == 0)`
`349`	`349`	`return;`
`350`	`350`
`351`	`351`	`auto tup = completionWidget.bufferView.buffer.lineEndsForLineNumber(completionStyler.lineHighlighted);`
`@@ -354,9 +354,9 @@ class CommandControl : Widget`
`354`	`354`	`super.draw();`
`355`	`355`	`}`
`356`	`356`
`357`		`- override EventUsed onCommand(Event event)`
	`357`	`+ override EventUsed onCommandEvent(CommandEvent event)`
`358`	`358`	`{`
`359`		`- switch (event.name)`
	`359`	`+ switch (event.commandName)`
`360`	`360`	`{`
`361`	`361`	`case "edit.commitCompletion":`
`362`	`362`	`if (_promptDelegate is null)`
`@@ -423,7 +423,7 @@ class CommandControl : Widget`
`423`	`423`	`import std.conv;`
`424`	`424`
`425`	`425`	`int val = 1;`
`426`		`- auto valPtr = event.argument[0].peek!string();`
	`426`	`+ auto valPtr = event.arguments[0].peek!string();`
`427`	`427`	`if (valPtr !is null)`
`428`	`428`	`val = (*valPtr).to!int();`
`429`	`429`