From 12a341e607f553962093129cbdef69d0eae226b0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 28 Sep 2019 02:21:29 +0200
Subject: [PATCH] click handling and tuning

---
 htdocs/css/openwebrx.css |  4 ++++
 htdocs/openwebrx.js      | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index b269a28..c33ed26 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -187,6 +187,10 @@ input[type=range]:focus::-ms-fill-upper
     transform: translate(-50%, 0);
 }
 
+#openwebrx-bookmarks-container .bookmark.selected {
+    z-index: 10;
+}
+
 #openwebrx-bookmarks-container .bookmark:hover {
     z-index: 11;
 }
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 44ab1ce..aa55f0b 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -630,6 +630,7 @@ function demodulator_set_offset_frequency(which,to_what)
 	demodulators[0].offset_frequency=Math.round(to_what);
 	demodulators[0].set();
 	mkenvelopes(get_visible_freq_range());
+    $("#webrx-actual-freq").html(format_frequency("{x} MHz", center_freq + to_what, 1e6, 4));
 }
 
 
@@ -1016,7 +1017,6 @@ function canvas_mouseup(evt)
 	{
 		//ws.send("SET offset_freq="+canvas_get_freq_offset(relativeX).toString());
 		demodulator_set_offset_frequency(0, canvas_get_freq_offset(relativeX));
-		e("webrx-actual-freq").innerHTML=format_frequency("{x} MHz",canvas_get_frequency(relativeX),1e6,4);
 	}
 	else
 	{
@@ -1346,6 +1346,19 @@ function position_bookmarks() {
     });
 }
 
+function init_bookmarks() {
+    $container = $("#openwebrx-bookmarks-container")
+    $container.click(function(e){
+        $container.find('.bookmark').removeClass('selected');
+        $bookmark = $(e.target);
+        b = $bookmark.closest('.bookmark-locator').data();
+        if (!b || !b.frequency || !b.modulation) return;
+        demodulator_set_offset_frequency(0, b.frequency - center_freq);
+        demodulator_analog_replace(b.modulation);
+        $bookmark.addClass('selected');
+    });
+}
+
 var dial_frequencies = [];
 
 function find_dial_frequencies() {
@@ -1366,7 +1379,6 @@ function dial_button_click() {
     var frequency = available[0].frequency;
     console.info(frequency);
     demodulator_set_offset_frequency(0, frequency - center_freq);
-    $("#webrx-actual-freq").html(format_frequency("{x} MHz", frequency, 1e6, 4));
 }
 
 function update_metadata(meta) {
@@ -2533,6 +2545,7 @@ function openwebrx_init()
 	window.addEventListener("resize",openwebrx_resize);
 	check_top_bar_congestion();
 	init_header();
+	init_bookmarks();
 
 	//Synchronise volume with slider
 	updateVolume();