From 78935092b540278e388749b7b0620fce62098fc9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 9 Oct 2009 13:13:57 +0400
Subject: [PATCH] display active hotkey prefix on screen

---
 functions.js           |  22 ++++++++++++++++++++++
 images/shadow_dark.png | Bin 2761 -> 141 bytes
 prefs.js               |  16 ++++++++++++++++
 prefs.php              |   2 ++
 tt-rss.css             |  12 ++++++++++++
 tt-rss.js              |  26 +++++++-------------------
 tt-rss.php             |   2 ++
 7 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/functions.js b/functions.js
index 1e28f1392..6ab23b0f2 100644
--- a/functions.js
+++ b/functions.js
@@ -2169,3 +2169,25 @@ function html5AudioOrFlash(type) {
 		}
 	}
 } */
+
+function hotkey_prefix_timeout() {
+	try {
+
+		var date = new Date();
+		var ts = Math.round(date.getTime() / 1000);
+
+		if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) {
+			debug("hotkey_prefix seems to be stuck, aborting");
+			hotkey_prefix_pressed = false;
+			hotkey_prefix = false;
+			Element.hide('cmdline');
+		}
+
+		setTimeout("hotkey_prefix_timeout()", 1000);
+
+	} catch  (e) {
+		exception_error("hotkey_prefix_timeout", e);
+	}
+}
+
+
diff --git a/images/shadow_dark.png b/images/shadow_dark.png
index a300e9492b1371f6e8d79ae3d1f2ddd17c4092ae..3a26b2a5c4bf7613bb373921a74a6fd504b9d2bf 100644
GIT binary patch
delta 93
zcmX>p+RHdWMTW6B$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQC--wnn6j66`ns~;VC5GU
u=h={77XVbo>*?Yc!f`!0AtB)gKLf)Nh64u-r&j_c7(8A5T-G@yGywpN0Ufgd

delta 2732
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

diff --git a/prefs.js b/prefs.js
index 7f1f89dfb..820c31eac 100644
--- a/prefs.js
+++ b/prefs.js
@@ -6,6 +6,7 @@ var init_params = new Array();
 var caller_subop = false;
 var sanity_check_done = false;
 var hotkey_prefix = false;
+var hotkey_prefix_pressed = false;
 
 var color_picker_active = false;
 var selection_disabled = false;
@@ -1205,6 +1206,8 @@ function init_second_stage() {
 
 		loading_set_progress(60);
 
+		setTimeout("hotkey_prefix_timeout()", 5*1000);
+
 	} catch (e) {
 		exception_error("init_second_stage", e);
 	}
@@ -1408,6 +1411,8 @@ function pref_hotkey_handler(e) {
 		var keycode;
 		var shift_key = false;
 
+		var cmdline = $('cmdline');
+
 		try {
 			shift_key = e.shiftKey;
 		} catch (e) {
@@ -1440,6 +1445,15 @@ function pref_hotkey_handler(e) {
 
 		if ((keycode == 67 || keycode == 71) && !hotkey_prefix) {
 			hotkey_prefix = keycode;
+
+			var date = new Date();
+			var ts = Math.round(date.getTime() / 1000);
+
+			hotkey_prefix_pressed = ts;
+
+			cmdline.innerHTML = keychar;
+			Element.show(cmdline);
+
 			debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
 			return;
 		}
@@ -1456,6 +1470,8 @@ function pref_hotkey_handler(e) {
 
 		/* Global hotkeys */
 
+		Element.hide(cmdline);
+
 		if (!hotkey_prefix) {
 
 			if (keycode == 68 && shift_key) { // d
diff --git a/prefs.php b/prefs.php
index 99c00fd21..91f813b85 100644
--- a/prefs.php
+++ b/prefs.php
@@ -147,6 +147,8 @@ window.onload = init;
 <div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
 <div id="infoBoxShadow"><div id="infoBox">BAH</div></div>
 
+<div id="cmdline" style="display : none"></div>
+
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">
 		<div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>
diff --git a/tt-rss.css b/tt-rss.css
index 2d4f2c23a..f18896784 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2214,3 +2214,15 @@ option {
 	color : black;
 }
 
+div#cmdline {
+	position : absolute;
+	left : 5px;
+	bottom : 5px;
+	font-size : 11px;
+	color : gray;
+	font-weight : bold;
+	background-color : white;
+	border : 1px solid #88b0f0;
+	padding : 3px 5px 3px 5px;
+	z-index : 5;
+}
diff --git a/tt-rss.js b/tt-rss.js
index cb008c10e..408eb3913 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -314,25 +314,6 @@ function viewfeed(feed, subop) {
 	f.viewfeed(feed, subop);
 }
 
-function hotkey_prefix_timeout() {
-	try {
-
-		var date = new Date();
-		var ts = Math.round(date.getTime() / 1000);
-
-		if (hotkey_prefix_pressed && ts - hotkey_prefix_pressed >= 5) {
-			debug("hotkey_prefix seems to be stuck, aborting");
-			hotkey_prefix_pressed = false;
-			hotkey_prefix = false;
-		}
-
-		setTimeout("hotkey_prefix_timeout()", 10);
-
-	} catch  (e) {
-		exception_error("hotkey_prefix_timeout", e);
-	}
-}
-
 function timeout() {
 	if (getInitParam("bw_limit") == "1") return;
 
@@ -1060,6 +1041,7 @@ function hotkey_handler(e) {
 		var keycode;
 		var shift_key = false;
 
+		var cmdline = $('cmdline');
 		var feedlist = $('feedList');
 
 		try {
@@ -1099,6 +1081,10 @@ function hotkey_handler(e) {
 
 			hotkey_prefix = keycode;
 			hotkey_prefix_pressed = ts;
+
+			cmdline.innerHTML = keychar;
+			Element.show(cmdline);
+
 			debug("KP: PREFIX=" + keycode + " CHAR=" + keychar + " TS=" + ts);
 			return true;
 		}
@@ -1109,6 +1095,8 @@ function hotkey_handler(e) {
 
 		/* Global hotkeys */
 
+		Element.hide(cmdline);
+
 		if (!hotkey_prefix) {
 
 			if (keycode == 68 && shift_key) { // d
diff --git a/tt-rss.php b/tt-rss.php
index baf58a088..607bedb1d 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -104,6 +104,8 @@ window.onload = init;
 
 <div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
 
+<div id="cmdline" style="display : none"></div>
+
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">
 		<div id="xebTitle">Fatal Exception</div><div id="xebContent">&nbsp;</div>