Auto-hide cursor in certain input modes

Author: x-sheep

src/puzzle/KeyInput.js

@@ -193,6 +193,7 @@ pzpr.classmgr.makeCommon({
 		// kc.inputKeys()   キーボードイベントを実行する
 		//---------------------------------------------------------------------------
 		inputKeys: function(array) {
+			this.cursor.isActive = true;
 			for (var i = 0; i < arguments.length; i++) {
 				var ca = arguments[i];
 
@@ -257,6 +258,12 @@ pzpr.classmgr.makeCommon({
 			if (!this.isenablemode()) {
 				return;
 			}
+			if (this.keydown && !this.cursor.isActive) {
+				this.cursor.isActive = true;
+				this.cancelDefault = true;
+				this.cursor.draw();
+				return;
+			}
 			if (this.keydown && this.moveTarget(c)) {
 				this.cancelDefault = true;
 				return;
@@ -456,6 +463,7 @@ pzpr.classmgr.makeCommon({
 			} else if (this.disableAnum && this.puzzle.playmode) {
 				this.targetdir = 5;
 			}
+			this.isActive = !this.puzzle.playeronly;
 		},
 		init: function(bx, by) {
 			this.bx = bx;
@@ -480,6 +488,7 @@ pzpr.classmgr.makeCommon({
 		maxy: null,
 
 		crosstype: false,
+		isActive: true,
 
 		//---------------------------------------------------------------------------
 		// tc.initCursor()           初期化時にカーソルの位置を設定する

src/puzzle/MouseInput.js

@@ -443,11 +443,28 @@ pzpr.classmgr.makeCommon({
 			) {
 				this.inputMode = mode;
 				this.savedInputMode[this.puzzle.editmode ? "edit" : "play"] = mode;
+				this.autohide_cursor();
 				this.puzzle.redraw();
 			} else {
 				throw Error("Invalid input mode: " + mode);
 			}
 		},
+		autohide_cursor: function() {
+			if (
+				this.inputMode.startsWith("number") ||
+				this.inputMode.startsWith("letter")
+			) {
+				this.cursor.isActive = true;
+			} else if (this.inputMode !== "auto") {
+				this.cursor.isActive = false;
+			} else if (this.puzzle.editmode) {
+				this.cursor.isActive = true;
+			} else if (this.cursor.disableAnum) {
+				this.cursor.isActive = false;
+			}
+
+			this.cursor.draw();
+		},
 		getInputModeList: function(type) {
 			if (this.puzzle.instancetype === "viewer") {
 				return [];
@@ -611,12 +628,14 @@ pzpr.classmgr.makeCommon({
 		setcursor: function(pos) {
 			var pos0 = this.cursor.getaddr();
 			this.cursor.setaddr(pos);
+			this.cursor.isActive = true;
 			pos0.draw();
 			pos.draw();
 		},
 		setcursorsnum: function(pos) {
 			var pos0 = this.cursor.getaddr();
 			this.cursor.setaddr(pos);
+			this.cursor.isActive = true;
 			var target;
 			var bx = this.inputPoint.bx,
 				by = this.inputPoint.by;

src/puzzle/Puzzle.js

@@ -357,9 +357,10 @@
 			this.playmode = !this.editmode;
 
 			if (!!this.klass) {
-				this.cursor.adjust_modechange();
 				this.key.keyreset();
 				this.mouse.modechange();
+				this.cursor.adjust_modechange();
+				this.mouse.autohide_cursor();
 				this.board.errclear();
 				this.redraw();
 			}

src/variety-common/Graphic.js

@@ -2065,12 +2065,16 @@ pzpr.classmgr.makeCommon({
 		},
 
 		drawCursor: function(islarge, isdraw) {
+			if (isdraw !== false) {
+				isdraw = this.puzzle.getConfig("cursor") && this.puzzle.cursor.isActive;
+			}
+
 			this.drawRawCursor(
 				"target_cursor",
 				"",
 				this.puzzle.cursor,
 				islarge,
-				isdraw !== false && this.puzzle.getConfig("cursor"),
+				isdraw,
 				this.puzzle.editmode ? this.targetColorEdit : this.targetColorPlay
 			);
 		},
@@ -2177,10 +2181,7 @@ pzpr.classmgr.makeCommon({
 			var target = cursor.targetdir;
 			var cell = cursor.getc();
 
-			if (
-				cursor.disableAnum &&
-				this.puzzle.mouse.inputMode.indexOf("number") === -1
-			) {
+			if (!cursor.isActive) {
 				target = 0;
 			}
 

src/variety-common/MouseInput.js

@@ -51,6 +51,11 @@ pzpr.classmgr.makeCommon({
 			cell.setQsub(this.inputData === unshade ? 1 : 0);
 
 			cell.draw();
+
+			if (this.cursor.isActive) {
+				this.cursor.isActive = false;
+				this.cursor.draw();
+			}
 		},
 		initFirstCell: function(cell) {
 			if (!this.firstCell.isnull) {
@@ -136,7 +141,7 @@ pzpr.classmgr.makeCommon({
 				cell.noNum()
 			) {
 				this.setcursorsnum(cell);
-			} else if (cell !== this.cursor.getc()) {
+			} else if (cell !== this.cursor.getc() || !this.cursor.isActive) {
 				this.setcursor(cell);
 			} else {
 				this.inputqnum_main(cell);
@@ -424,6 +429,10 @@ pzpr.classmgr.makeCommon({
 					this.inputarrow_cell_main(cell, dir);
 					cell.draw();
 					this.mousereset();
+					if (this.cursor.isActive) {
+						this.cursor.isActive = false;
+						this.cursor.draw();
+					}
 					return;
 				}
 			}
@@ -677,6 +686,11 @@ pzpr.classmgr.makeCommon({
 					border.removeBorder();
 				}
 				border.draw();
+
+				if (this.cursor.isActive) {
+					this.cursor.isActive = false;
+					this.cursor.draw();
+				}
 			}
 			this.prevPos = pos;
 		},
@@ -697,6 +711,11 @@ pzpr.classmgr.makeCommon({
 					border.setQsub(0);
 				}
 				border.draw();
+
+				if (this.cursor.isActive) {
+					this.cursor.isActive = false;
+					this.cursor.draw();
+				}
 			}
 			this.prevPos = pos;
 		},
@@ -740,6 +759,11 @@ pzpr.classmgr.makeCommon({
 					border.removeLine();
 				}
 				border.draw();
+
+				if (this.cursor.isActive) {
+					this.cursor.isActive = false;
+					this.cursor.draw();
+				}
 			}
 			this.prevPos = pos;
 		},

src/variety/snakeegg.js

@@ -63,10 +63,15 @@
 		}
 	},
 	"MouseEvent@meidjuluk": {
-		autoplay_func: "border",
 		inputModes: {
 			edit: ["number", "empty", "clear"],
 			play: ["number", "border", "subline"]
+		},
+		mouseinputAutoPlay: function() {
+			this.mouseinputAutoPlay_border();
+			if (this.mouseend && this.notInputted()) {
+				this.inputqnum();
+			}
 		}
 	},
 
@@ -450,7 +455,11 @@
 			this.drawChassis();
 
 			this.drawBank();
-			this.drawTarget();
+			if (this.pid === "meidjuluk") {
+				this.drawCursor();
+			} else {
+				this.drawTarget();
+			}
 		},
 
 		getNumberTextCore: function(num) {
@@ -480,14 +489,6 @@
 			g.fillStyle = this.getBankPieceColor(piece);
 			var str = piece.num >= 0 ? "" + piece.num : "";
 			this.disptext(str, x, y, { ratio: 0.65 });
-		},
-
-		drawTarget: function() {
-			this.drawCursor(
-				true,
-				this.puzzle.editmode ||
-					this.puzzle.mouse.inputMode.indexOf("number") >= 0
-			);
 		}
 	},
 	"Graphic@meidjuluk": {

src/variety/tachibk.js

@@ -28,7 +28,13 @@
 		},
 
 		autoedit_func: "qnum",
-		autoplay_func: "border"
+
+		mouseinputAutoPlay: function() {
+			this.mouseinputAutoPlay_border();
+			if (this.mouseend && this.notInputted()) {
+				this.inputqnum();
+			}
+		}
 	},
 	KeyEvent: {
 		enablemake: true,
@@ -194,15 +200,7 @@
 			this.drawQuesNumbers();
 			this.drawSubNumbers(true);
 
-			this.drawTarget();
-		},
-
-		drawTarget: function() {
-			this.drawCursor(
-				true,
-				this.puzzle.editmode ||
-					this.puzzle.mouse.inputMode.indexOf("number") >= 0
-			);
+			this.drawCursor();
 		},
 
 		fontsizeratio: 0.75,

src/variety/yokeimoji.js

@@ -74,7 +74,6 @@
 			var consonant =
 				cell.qchar === 0 ? "" : String.fromCharCode(97 + cell.qchar);
 
-			// TODO: Support alias of multiple letters
 			if (ca === "enter") {
 				this.cursor.toggleDir();
 			} else if (ca === "BS") {

test/puzzle/input_test.js

@@ -7,6 +7,7 @@ var pzpr = require("../../dist/js/pzpr.js");
 var testdata = require("../load_testdata.js");
 
 function execmouse(puzzle, strs) {
+	puzzle.cursor.isActive = true;
 	var buttons = strs[1].split("+");
 	var button = buttons[buttons.length - 1];