From 3f3a9c7fafaaffd070b0e07ece7c4ee8bda505bd Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Sat, 12 Oct 2019 09:44:19 +0200
Subject: [PATCH] focus text input on popup dialogs

---
 src/node_dialog_layer_rename.cpp |   7 +
 src/node_dialog_layer_rename.h   |   3 +-
 src/node_dialog_open.cpp         |  14 ++
 src/node_dialog_open.h           |   2 +
 src/node_text_input.cpp          |  11 +
 src/node_text_input.h            |   1 +
 webgl/src/index.html             | 363 -------------------------------
 7 files changed, 37 insertions(+), 364 deletions(-)
 delete mode 100644 webgl/src/index.html

diff --git a/src/node_dialog_layer_rename.cpp b/src/node_dialog_layer_rename.cpp
index 604ae27..6f3a033 100644
--- a/src/node_dialog_layer_rename.cpp
+++ b/src/node_dialog_layer_rename.cpp
@@ -42,3 +42,10 @@ std::string NodeDialogLayerRename::get_name()
 {
     return input ? input->m_text : "";
 }
+
+void NodeDialogLayerRename::added(Node* parent)
+{
+    Node::added(parent);
+    if (added_to_root())
+        input->key_capture();
+}
diff --git a/src/node_dialog_layer_rename.h b/src/node_dialog_layer_rename.h
index 955e2b3..932cedb 100644
--- a/src/node_dialog_layer_rename.h
+++ b/src/node_dialog_layer_rename.h
@@ -12,7 +12,8 @@ public:
     virtual Node* clone_instantiate() const override;
     virtual void clone_finalize(Node* dest) const override;
     virtual void init() override;
-    void init_controls();
     virtual void loaded() override;
+    virtual void added(Node* parent) override;
+    void init_controls();
     std::string get_name();
 };
diff --git a/src/node_dialog_open.cpp b/src/node_dialog_open.cpp
index 55cb432..bbd2335 100644
--- a/src/node_dialog_open.cpp
+++ b/src/node_dialog_open.cpp
@@ -217,6 +217,13 @@ void NodeDialogSave::loaded()
 
 }
 
+void NodeDialogSave::added(Node* parent)
+{
+    Node::added(parent);
+    if (added_to_root())
+        input->key_capture();
+}
+
 //////////////////////////////////////////////////////////////////
 
 Node* NodeDialogNewDoc::clone_instantiate() const
@@ -274,3 +281,10 @@ void NodeDialogNewDoc::loaded()
 {
 
 }
+
+void NodeDialogNewDoc::added(Node* parent)
+{
+    Node::added(parent);
+    if (added_to_root())
+        input->key_capture();
+}
diff --git a/src/node_dialog_open.h b/src/node_dialog_open.h
index ccd8f47..03d831f 100644
--- a/src/node_dialog_open.h
+++ b/src/node_dialog_open.h
@@ -59,6 +59,7 @@ public:
     virtual void init() override;
     void init_controls();
     virtual void loaded() override;
+    virtual void added(Node* parent) override;
 };
 
 class NodeDialogNewDoc : public NodeBorder
@@ -75,4 +76,5 @@ public:
     virtual void init() override;
     void init_controls();
     virtual void loaded() override;
+    virtual void added(Node* parent) override;
 };
diff --git a/src/node_text_input.cpp b/src/node_text_input.cpp
index d3d576f..5765351 100644
--- a/src/node_text_input.cpp
+++ b/src/node_text_input.cpp
@@ -63,6 +63,8 @@ kEventResult NodeTextInput::handle_event(Event* e)
         m_cursor_visible = true;
         break;
     case kEventType::KeyDown:
+        if (!has_focus())
+            return kEventResult::Available;
         //switch (ke->m_key)
         //{
         //case VK_BACK:
@@ -74,6 +76,8 @@ kEventResult NodeTextInput::handle_event(Event* e)
         //}
         break;
     case kEventType::KeyUp:
+        if (!has_focus())
+            return kEventResult::Available;
         if (ke->m_key == kKey::KeyEnter && on_return)
             on_return(this);
         if (ke->m_key == kKey::KeyBackspace)
@@ -86,6 +90,8 @@ kEventResult NodeTextInput::handle_event(Event* e)
         }
         break;
     case kEventType::KeyChar:
+        if (!has_focus())
+            return kEventResult::Available;
         timer = 0;
         m_cursor_visible = true;
         if (ke->m_char == '\b' // backspace
@@ -163,6 +169,11 @@ void NodeTextInput::update_layout()
         m_off.x = (w - m_text_mesh.bb.x) + pad[3];
 }
 
+bool NodeTextInput::has_focus() noexcept
+{
+    return root()->current_key_capture.get() == this;
+}
+
 void NodeTextInput::handle_resize(glm::vec2 old_size, glm::vec2 new_size, float zoom)
 {
     auto pad = GetPadding();
diff --git a/src/node_text_input.h b/src/node_text_input.h
index 1395a5c..3a41af5 100644
--- a/src/node_text_input.h
+++ b/src/node_text_input.h
@@ -41,4 +41,5 @@ public:
     void set_text(const std::string& s);
     void set_text_format(const char* fmt, ...);
     void update_layout();
+    bool has_focus() noexcept;
 };
diff --git a/webgl/src/index.html b/webgl/src/index.html
deleted file mode 100644
index 5062b9a..0000000
--- a/webgl/src/index.html
+++ /dev/null
@@ -1,363 +0,0 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-115610833-1"></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag(){dataLayer.push(arguments);}
-      gtag('js', new Date());
-      gtag('config', 'UA-115610833-1');
-    </script>
-
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>PanoPainter - WebGL</title>
-    <style>
-      body {
-        font-family: arial;
-        margin: 0;
-        padding: none;
-      }
-
-      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block;}
-      div.emscripten { text-align: center; }      
-      div.emscripten_border { border: 1px solid black; }
-      /* the canvas *must not* have any border or padding, or mouse coords will be wrong */
-      canvas.emscripten { border: 0px none; background-color: black; }
-
-      #emscripten_logo {
-        display: inline-block;
-        margin: 0;
-      }
-
-      .spinner {
-        height: 30px;
-        width: 30px;
-        margin: 0;
-        margin-top: 20px;
-        margin-left: 20px;
-        display: inline-block;
-        vertical-align: top;
-
-        -webkit-animation: rotation .8s linear infinite;
-        -moz-animation: rotation .8s linear infinite;
-        -o-animation: rotation .8s linear infinite;
-        animation: rotation 0.8s linear infinite;
-
-        border-left: 5px solid rgb(235, 235, 235);
-        border-right: 5px solid rgb(235, 235, 235);
-        border-bottom: 5px solid rgb(235, 235, 235);
-        border-top: 5px solid rgb(120, 120, 120);
-        
-        border-radius: 100%;
-        background-color: rgb(189, 215, 46);
-      }
-
-      @-webkit-keyframes rotation {
-        from {-webkit-transform: rotate(0deg);}
-        to {-webkit-transform: rotate(360deg);}
-      }
-      @-moz-keyframes rotation {
-        from {-moz-transform: rotate(0deg);}
-        to {-moz-transform: rotate(360deg);}
-      }
-      @-o-keyframes rotation {
-        from {-o-transform: rotate(0deg);}
-        to {-o-transform: rotate(360deg);}
-      }
-      @keyframes rotation {
-        from {transform: rotate(0deg);}
-        to {transform: rotate(360deg);}
-      }
-
-      #status {
-        display: inline-block;
-        vertical-align: top;
-        margin-top: 30px;
-        margin-left: 20px;
-        font-weight: bold;
-        color: rgb(120, 120, 120);
-      }
-
-      #progress {
-        height: 20px;
-        width: 300px;
-      }
-
-      #controls {
-        display: inline-block;
-        float: right;
-        vertical-align: top;
-        margin-top: 30px;
-        margin-right: 20px;
-      }
-
-      #output {
-        width: 100%;
-        height: 200px;
-        margin: 0 auto;
-        margin-top: 10px;
-        border-left: 0px;
-        border-right: 0px;
-        padding-left: 0px;
-        padding-right: 0px;
-        display: block;
-        background-color: black;
-        color: white;
-        font-family: 'Lucida Console', Monaco, monospace;
-        outline: none;
-      }
-    </style>
-  </head>
-  <body>
-
-
-<!--
-<span id='controls'>
-  <span><input type="checkbox" id="resize" checked>Resize canvas</span>
-  <span><input type="checkbox" id="pointerLock">Lock/hide mouse pointer &nbsp;&nbsp;&nbsp;</span>
-  <span><input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked, 
-                                                                            document.getElementById('resize').checked)">
-  </span>
-</span>
--->
-    <div style="text-align: center;">
-      <div>
-        <div class="spinner" id='spinner'></div>
-        <div class="emscripten" id="status">Downloading...</div>
-        <div><progress value="0" max="100" id="progress" hidden=1></progress></div>
-      </div>
-      <canvas style="margin: auto; display: block;" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
-    </div>
-    <!-- <textarea id="output" rows="8"></textarea> -->
-
-    <script type='text/javascript'>
-      var statusElement = document.getElementById('status');
-      var progressElement = document.getElementById('progress');
-      var spinnerElement = document.getElementById('spinner');
-
-      var Module = {
-        preRun: [],
-        postRun: [],
-        print: (function() {
-          var element = document.getElementById('output');
-          if (element) element.value = ''; // clear browser cache
-          return function(text) {
-            if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-            // These replacements are necessary if you render to raw HTML
-            //text = text.replace(/&/g, "&amp;");
-            //text = text.replace(/</g, "&lt;");
-            //text = text.replace(/>/g, "&gt;");
-            //text = text.replace('\n', '<br>', 'g');
-            console.log(text);
-            if (element) {
-              element.value += text + "\n";
-              element.scrollTop = element.scrollHeight; // focus on bottom
-            }
-          };
-        })(),
-        printErr: function(text) {
-          if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-          console.error(text);
-        },
-        canvas: (function() {
-          var canvas = document.getElementById('canvas');
-
-          // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-          // application robust, you may want to override this behavior before shipping!
-          // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-          canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
-
-          return canvas;
-        })(),
-        setStatus: function(text) {
-          if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' };
-          if (text === Module.setStatus.last.text) return;
-          var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-          var now = Date.now();
-          if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
-          Module.setStatus.last.time = now;
-          Module.setStatus.last.text = text;
-          if (m) {
-            text = m[1];
-            progressElement.value = parseInt(m[2])*100;
-            progressElement.max = parseInt(m[4])*100;
-            progressElement.hidden = false;
-            spinnerElement.hidden = false;
-          } else {
-            progressElement.value = null;
-            progressElement.max = null;
-            progressElement.hidden = true;
-            if (!text) spinnerElement.style.display = 'none';
-          }
-          statusElement.innerHTML = text;
-          if (!text)
-            statusElement.style.display = 'none';
-        },
-        totalDependencies: 0,
-        monitorRunDependencies: function(left) {
-          this.totalDependencies = Math.max(this.totalDependencies, left);
-          Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-        }
-      };
-      Module.setStatus('Downloading...');
-      window.onerror = function(event) {
-        // TODO: do not warn on ok events like simulating an infinite loop or exitStatus
-        Module.setStatus('Exception thrown, see JavaScript console');
-        Module.print(event);
-        if (event.includes("shared memory"))
-          Module.setStatus("<b>Shared Memory Disabled!</b><br/>If you are using <b>Firefox</b> here's how to fix the error: <a href=\"https://subscription.packtpub.com/book/web_development/9781788628174/5/ch05lvl1sec47/enabling-sharedarraybuffers-in-firefox\"><br/>How to enable Firefox Shared Memory</a>")
-        spinnerElement.style.display = 'none';
-        Module.setStatus = function(text) {
-          if (text) Module.printErr('[post-exception status] ' + text);
-        };
-      };
-      window.onresize = function(){
-          Module.setCanvasSize(window.innerWidth, window.innerHeight);
-      };
-    </script>
-    <script>
-var ASSERTIONS = 2;
-// Copyright 2017 The Emscripten Authors.  All rights reserved.
-// Emscripten is available under two separate licenses, the MIT license and the
-// University of Illinois/NCSA Open Source License.  Both these licenses can be
-// found in the LICENSE file.
-
-// Prefix of data URIs emitted by SINGLE_FILE and related options.
-var dataURIPrefix = 'data:application/octet-stream;base64,';
-
-// Indicates whether filename is a base64 data URI.
-function isDataURI(filename) {
-  return String.prototype.startsWith ?
-      filename.startsWith(dataURIPrefix) :
-      filename.indexOf(dataURIPrefix) === 0;
-}
-
-
-
-// Copied from https://github.com/strophe/strophejs/blob/e06d027/src/polyfills.js#L149
-
-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
-
-/**
- * Decodes a base64 string.
- * @param {String} input The string to decode.
- */
-var decodeBase64 = typeof atob === 'function' ? atob : function (input) {
-  var keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-
-  var output = '';
-  var chr1, chr2, chr3;
-  var enc1, enc2, enc3, enc4;
-  var i = 0;
-  // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '');
-  do {
-    enc1 = keyStr.indexOf(input.charAt(i++));
-    enc2 = keyStr.indexOf(input.charAt(i++));
-    enc3 = keyStr.indexOf(input.charAt(i++));
-    enc4 = keyStr.indexOf(input.charAt(i++));
-
-    chr1 = (enc1 << 2) | (enc2 >> 4);
-    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-    chr3 = ((enc3 & 3) << 6) | enc4;
-
-    output = output + String.fromCharCode(chr1);
-
-    if (enc3 !== 64) {
-      output = output + String.fromCharCode(chr2);
-    }
-    if (enc4 !== 64) {
-      output = output + String.fromCharCode(chr3);
-    }
-  } while (i < input.length);
-  return output;
-};
-
-// Converts a string of base64 into a byte array.
-// Throws error on invalid input.
-function intArrayFromBase64(s) {
-  if (typeof ENVIRONMENT_IS_NODE === 'boolean' && ENVIRONMENT_IS_NODE) {
-    var buf;
-    try {
-      buf = Buffer.from(s, 'base64');
-    } catch (_) {
-      buf = new Buffer(s, 'base64');
-    }
-    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength);
-  }
-
-  try {
-    var decoded = decodeBase64(s);
-    var bytes = new Uint8Array(decoded.length);
-    for (var i = 0 ; i < decoded.length ; ++i) {
-      bytes[i] = decoded.charCodeAt(i);
-    }
-    return bytes;
-  } catch (_) {
-    throw new Error('Converting base64 string to bytes failed.');
-  }
-}
-
-// If filename is a base64 data URI, parses and returns data (Buffer on node,
-// Uint8Array otherwise). If filename is not a base64 data URI, returns undefined.
-function tryParseAsDataURI(filename) {
-  if (!isDataURI(filename)) {
-    return;
-  }
-
-  return intArrayFromBase64(filename.slice(dataURIPrefix.length));
-}
-
-
-// Copyright 2017 The Emscripten Authors.  All rights reserved.
-// Emscripten is available under two separate licenses, the MIT license and the
-// University of Illinois/NCSA Open Source License.  Both these licenses can be
-// found in the LICENSE file.
-
-/** @type {function(string, boolean=, number=)} */
-function intArrayFromString(stringy, dontAddNull, length) {
-  var len = length > 0 ? length : lengthBytesUTF8(stringy)+1;
-  var u8array = new Array(len);
-  var numBytesWritten = stringToUTF8Array(stringy, u8array, 0, u8array.length);
-  if (dontAddNull) u8array.length = numBytesWritten;
-  return u8array;
-}
-
-function intArrayToString(array) {
-  var ret = [];
-  for (var i = 0; i < array.length; i++) {
-    var chr = array[i];
-    if (chr > 0xFF) {
-      if (ASSERTIONS) {
-        assert(false, 'Character code ' + chr + ' (' + String.fromCharCode(chr) + ')  at offset ' + i + ' not in 0x00-0xFF.');
-      }
-      chr &= 0xFF;
-    }
-    ret.push(String.fromCharCode(chr));
-  }
-  return ret.join('');
-}
-
-
-
-          var memoryInitializer = 'panopainter.html.mem';
-          memoryInitializer = Module['locateFile'] ? Module['locateFile'](memoryInitializer, '') : memoryInitializer;
-          Module['memoryInitializerRequestURL'] = memoryInitializer;
-          var meminitXHR = Module['memoryInitializerRequest'] = new XMLHttpRequest();
-          meminitXHR.open('GET', memoryInitializer, true);
-          meminitXHR.responseType = 'arraybuffer';
-          meminitXHR.send(null);
-
-          var script = document.createElement('script');
-          script.src = "panopainter.js";
-          document.body.appendChild(script);
-
-</script>
-  </body>
-</html>
-
-