From 9c2bf45c50ea5007be0104e1b54c209fbada1a55 Mon Sep 17 00:00:00 2001
From: Benny Baumann <BenBE@geshi.org>
Date: Sat, 9 Nov 2019 17:21:25 +0100
Subject: [PATCH] chg: Split ncurses test tool into separate utility

---
 po/lang/de/rmrf.po      | 10 +++++++---
 po/lang/en/rmrf.po      | 10 +++++++---
 po/tpl/rmrf.pot         |  8 ++++++--
 src/app/nc-test.cpp     | 38 ++++++++++++++++++++++++++++++++++++++
 src/app/nc-test.ldflags |  1 +
 src/app/rmrf.cpp        | 14 ++++++--------
 6 files changed, 65 insertions(+), 16 deletions(-)
 create mode 100644 src/app/nc-test.cpp
 create mode 100644 src/app/nc-test.ldflags

diff --git a/po/lang/de/rmrf.po b/po/lang/de/rmrf.po
index 064990c..f50b152 100644
--- a/po/lang/de/rmrf.po
+++ b/po/lang/de/rmrf.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rmrf 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-29 18:43+0200\n"
+"POT-Creation-Date: 2019-11-09 17:18+0100\n"
 "PO-Revision-Date: 2019-09-29 02:22+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,7 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/app/rmrf.cpp:27
+#: src/app/nc-test.cpp:29
 #, c-format
 msgid "Detected key: %8x (ct=%i)"
-msgstr "Erkannte Taste: %8x (ct=%i)"
+msgstr "Erkannte Taste: %8x (ct=%i"
+
+#: src/app/rmrf.cpp:24
+msgid "Starting RMRF…"
+msgstr "Starte RMRF…"
diff --git a/po/lang/en/rmrf.po b/po/lang/en/rmrf.po
index 8e0e0eb..97ca3fa 100644
--- a/po/lang/en/rmrf.po
+++ b/po/lang/en/rmrf.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rmrf 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-29 18:43+0200\n"
+"POT-Creation-Date: 2019-11-09 17:18+0100\n"
 "PO-Revision-Date: 2019-09-29 02:22+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,7 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/app/rmrf.cpp:27
+#: src/app/nc-test.cpp:29
 #, c-format
 msgid "Detected key: %8x (ct=%i)"
-msgstr "Detected key: %8x (ct=%i)"
+msgstr ""
+
+#: src/app/rmrf.cpp:24
+msgid "Starting RMRF…"
+msgstr ""
diff --git a/po/tpl/rmrf.pot b/po/tpl/rmrf.pot
index d632f20..c06700a 100644
--- a/po/tpl/rmrf.pot
+++ b/po/tpl/rmrf.pot
@@ -6,7 +6,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: rmrf 0.1\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2019-09-29 18:44+0200\n"
+        "POT-Creation-Date: 2019-11-09 17:18+0100\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,7 +15,11 @@ msgstr  "Project-Id-Version: rmrf 0.1\n"
         "Content-Type: text/plain; charset=UTF-8\n"
         "Content-Transfer-Encoding: 8bit\n"
 
-#: src/app/rmrf.cpp:27
+#: src/app/nc-test.cpp:29
 #, c-format
 msgid   "Detected key: %8x (ct=%i)"
 msgstr  ""
+
+#: src/app/rmrf.cpp:24
+msgid   "Starting RMRF…"
+msgstr  ""
diff --git a/src/app/nc-test.cpp b/src/app/nc-test.cpp
new file mode 100644
index 0000000..1932490
--- /dev/null
+++ b/src/app/nc-test.cpp
@@ -0,0 +1,38 @@
+#include <iostream>
+
+#include "lib/gettext/translations.hpp"
+
+#include "lib/ncurses/ncurses.hpp"
+
+#include "lib/nccpp/ncursescpp.hpp"
+
+#include "ui/view.hpp"
+
+int main() {
+    using rmrf::ui::display;
+
+    setlocale(LC_ALL, "");
+    bindtextdomain("rmrf", "/usr/share/locale");
+    textdomain("rmrf");
+
+    auto h_nc = std::make_shared<display>();
+
+    h_nc->clear();
+
+    bool loop = true;
+
+    while(loop) {
+        wint_t unichar{0};
+
+        int ct = getch(); //(&unichar); /* read character */
+        h_nc->sync([ct, unichar](const display::ptr_type &) {
+            mvprintw(0, 0, _("Detected key: %8x (ct=%i)"), unichar, ct);
+        });
+
+        if(10 == ct) {
+            loop = false;
+        }
+    }
+
+    return 0;
+}
diff --git a/src/app/nc-test.ldflags b/src/app/nc-test.ldflags
new file mode 100644
index 0000000..6f0d287
--- /dev/null
+++ b/src/app/nc-test.ldflags
@@ -0,0 +1 @@
+-lncursesw -pthread
diff --git a/src/app/rmrf.cpp b/src/app/rmrf.cpp
index c57df10..745ded7 100644
--- a/src/app/rmrf.cpp
+++ b/src/app/rmrf.cpp
@@ -4,6 +4,8 @@
 
 #include "lib/ncurses/ncurses.hpp"
 
+#include "lib/nccpp/ncursescpp.hpp"
+
 #include "ui/view.hpp"
 
 int main() {
@@ -17,14 +19,10 @@ int main() {
 
     h_nc->clear();
 
-    for(size_t x = 0; x < 16; x++) {
-        wint_t unichar{0};
-
-        int ct = get_wch(&unichar); /* read character */
-        h_nc->sync([x, ct, unichar](const display::ptr_type &) {
-            mvprintw((int)x, 0, _("Detected key: %8x (ct=%i)"), unichar, ct);
-        });
-    }
+    // Start main loop of RMRF here
+    h_nc->sync([](const display::ptr_type &) {
+        mvprintw(0, 0, _("Starting RMRF…"));
+    });
 
     return 0;
 }
-- 
GitLab