X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat_nocanvas_monochrome.html;h=105866376f1f40df2f6dd76e8d7709d6598fb582;hb=196af065fb3b232ab863303dc9d0b8acc1b062bb;hp=c2c6bc7d338ae912218f91df48d5f2c0ba532e32;hpb=d3167bc558c709d7f10a237def2763530b7fed32;p=plomrogue2

diff --git a/rogue_chat_nocanvas_monochrome.html b/rogue_chat_nocanvas_monochrome.html
index c2c6bc7..1058663 100644
--- a/rogue_chat_nocanvas_monochrome.html
+++ b/rogue_chat_nocanvas_monochrome.html
@@ -12,28 +12,58 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <div>
 <h3>for mouse players</h3>
 <table style="float: left">
-<tr><td><button id="move_upleft">up-left</button></td><td><button id="move_up">up</button></td><td><button id="move_upright">up-right</button></td></tr>
-<tr><td><button id="move_left">left</button></td><td>MOVE</td><td><button id="move_right">right</button></td></tr>
-<tr><td><button id="move_downleft">down-left</button></td><td><button id="move_down">down</button></td><td><button id="move_downright">down-right</button></td></tr>
+  <tr>
+    <td><button id="move_upleft">up-left</button></td>
+    <td><button id="move_up">up</button></td>
+    <td><button id="move_upright">up-right</button></td>
+  </tr>
+  <tr>
+    <td><button id="move_left">left</button></td>
+    <td>MOVE</td>
+    <td><button id="move_right">right</button></td>
+  </tr>
+  <tr>
+    <td><button id="move_downleft">down-left</button></td>
+    <td><button id="move_down">down</button></td>
+    <td><button id="move_downright">down-right</button></td>
+  </tr>
+</table>
+<table>
+  <tr>
+    <td><button id="help">help</button></td>
+  </tr>
+  <tr>
+    <td><button id="switch_to_chat">chat mode</button><br /></td>
+  </tr>
+    <td><button id="switch_to_study">study mode</button></td>
+    <td><button id="toggle_map_mode">toggle terrain/annotations/control view</button>
+  <tr>
+    <td><button id="switch_to_play">play mode</button></td>
+    <td>
+      <table>
+        <tr>
+          <td><button id="take_thing">take thing</button></td>
+          <td><button id="switch_to_edit">change tile</button></td>
+          <td><button id="switch_to_admin">become admin</button></td>
+        </tr>
+        <tr>
+          <td><button id="drop_thing">drop thing</button></td>
+          <td><button id="switch_to_password">change tile editing password</button></td>
+          <td><button id="switch_to_control_pw_type">change tile control password</button></td>
+        </tr>
+        <tr>
+          <td><button id="flatten">flatten surroundings</button></td>
+          <td><button id="switch_to_annotate">annotate tile</button></td>
+          <td><button id="switch_to_control_tile_type">change tiles control</button></td>
+        </tr>
+        <tr>
+          <td><button id="teleport">teleport</button></td>
+          <td><button id="switch_to_portal">edit portal link</button></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
-<div>
-<button id="help">help</button>
-<button id="switch_to_play">play mode</button>
-<button id="switch_to_study">study mode</button>
-<button id="switch_to_chat">chat mode</button><br />
-<button id="take_thing">take thing</button>
-<button id="drop_thing">drop thing</button>
-<button id="flatten">flatten surroundings</button>
-<button id="teleport">teleport</button>
-<button id="switch_to_edit">change tile</button><br />
-<button id="switch_to_password">change tile editing password</button>
-<button id="switch_to_annotate">annotate tile</button>
-<button id="switch_to_portal">edit portal link</button>
-<button id="toggle_map_mode">toggle terrain/annotations/control view</button>
-<button id="switch_to_admin">become admin</button>
-<button id="switch_to_control_pw_type">change tile control password</button>
-<button id="switch_to_control_tile_type">change tiles control</button>
-</div>
 <h3>edit keybindings</h3> (see <a href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a> for non-obvious available values):<br />
 <ul>
 <li>move up (square grid): <input id="key_square_move_up" type="text" value="w" /> (hint: ArrowUp)
@@ -51,17 +81,17 @@ terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 <li>teleport: <input id="key_teleport" type="text" value="p" />
 <li>take thing under player: <input id="key_take_thing" type="text" value="z" />
 <li>drop carried thing: <input id="key_drop_thing" type="text" value="u" />
-<li>switch to chat mode: <input id="key_switch_to_chat" type="text" value="t" />
-<li>switch to play mode: <input id="key_switch_to_play" type="text" value="p" />
-<li>switch to study mode: <input id="key_switch_to_study" type="text" value="?" />
-<li>edit tile (from play mode): <input id="key_switch_to_edit" type="text" value="m" />
-<li>enter tile password (from play mode): <input id="key_switch_to_password" type="text" value="P" />
-<li>enter admin password (from play mode): <input id="key_switch_to_admin" type="text" value="A" />
-<li>change tile control password (from play mode): <input id="key_switch_to_control_pw_type" type="text" value="C" />
-<li>change tiles control (from play mode): <input id="key_switch_to_control_tile_type" type="text" value="Q" />
-<li>annotate tile (from play mode): <input id="key_switch_to_annotate" type="text" value="M" />
-<li>annotate portal (from play mode): <input id="key_switch_to_portal" type="text" value="T" />
-<li>toggle terrain/annotations/control view (from study mode): <input id="key_toggle_map_mode" type="text" value="M" />
+<li><input id="key_switch_to_chat" type="text" value="t" />
+<li><input id="key_switch_to_play" type="text" value="p" />
+<li><input id="key_switch_to_study" type="text" value="?" />
+<li><input id="key_switch_to_edit" type="text" value="m" />
+<li><input id="key_switch_to_password" type="text" value="P" />
+<li><input id="key_switch_to_admin" type="text" value="A" />
+<li><input id="key_switch_to_control_pw_type" type="text" value="C" />
+<li><input id="key_switch_to_control_tile_type" type="text" value="Q" />
+<li><input id="key_switch_to_annotate" type="text" value="M" />
+<li><input id="key_switch_to_portal" type="text" value="T" />
+<li>toggle terrain/annotations/control view: <input id="key_toggle_map_mode" type="text" value="M" />
 </ul>
 </div>
 <script>
@@ -82,11 +112,11 @@ let mode_helps = {
         'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the first of two steps to change the password for a tile control character.  First enter the tile control character for which you want to change the password!'
     },
     'control_pw_pw': {
-        'short': 'change tile control password',
+        'short': 'change tiles control password',
         'long': 'This mode is the second of two steps to change the password for a tile control character.  Enter the new password for the tile control character you chose.'
     },
     'control_tile_type': {
@@ -98,7 +128,7 @@ let mode_helps = {
         'long': 'This mode is the second of two steps to change tile control areas on the map.  Move cursor around the map to draw selected tile control character'
     },
     'annotate': {
-        'short': 'annotation',
+        'short': 'annotate tile',
         'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.'
     },
     'portal': {
@@ -106,7 +136,7 @@ let mode_helps = {
         'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
     },
     'chat': {
-        'short': 'chat mode',
+        'short': 'chat',
         'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:'
     },
     'login': {
@@ -122,7 +152,7 @@ let mode_helps = {
         'long': 'Waiting for a server response.'
     },
     'password': {
-        'short': 'password input',
+        'short': 'map edit password',
         'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.'
     },
     'admin': {
@@ -135,6 +165,11 @@ let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
 let key_selectors = document.querySelectorAll('[id^="key_"]');
 
+for (const key_switch_selector of document.querySelectorAll('[id^="key_switch_to_"]')) {
+    const action = key_switch_selector.id.slice("key_switch_to_".length);
+    key_switch_selector.parentNode.prepend(mode_helps[action].short + ': ');
+}
+
 function restore_selector_value(selector) {
     let stored_selection = window.localStorage.getItem(selector.id);
     if (stored_selection) {
@@ -180,12 +215,39 @@ let terminal = {
       }, 100);
   },
   refresh: function() {
-      let pre_string = '';
+      function escapeHTML(str) {
+          return str.
+              replace(/&/g, '&amp;').
+              replace(/</g, '&lt;').
+              replace(/>/g, '&gt;').
+              replace(/'/g, '&apos;').
+              replace(/"/g, '&quot;');
+      };
+      let pre_content = '';
       for (let y = 0; y < this.rows; y++) {
           let line = this.content[y].join('');
-          pre_string += line + '\n';
+          let chunks = [];
+          if (y in tui.links) {
+              let start_x = 0;
+              for (let span of tui.links[y]) {
+                  chunks.push(escapeHTML(line.slice(start_x, span[0])));
+                  chunks.push('<a href="');
+                  chunks.push(escapeHTML(span[2]));
+                  chunks.push('">');
+                  chunks.push(escapeHTML(line.slice(span[0], span[1])));
+                  chunks.push('</a>');
+                  start_x = span[1];
+              }
+              chunks.push(escapeHTML(line.slice(start_x)));
+          } else {
+              chunks = [escapeHTML(line)];
+          }
+          for (const chunk of chunks) {
+              pre_content += chunk;
+          }
+          pre_content += '\n';
       }
-      this.pre_el.textContent = pre_string;
+      this.pre_el.innerHTML = pre_content;
   },
   write: function(start_y, start_x, msg) {
       for (let x = start_x, i = 0; x < this.cols && i < msg.length; x++, i++) {
@@ -438,6 +500,7 @@ class Mode {
     }
 }
 let tui = {
+  links: {},
   log: [],
   input_prompt: '> ',
   input_lines: [],
@@ -486,13 +549,26 @@ let tui = {
     for (let key_selector of key_selectors) {
         this.keys[key_selector.id.slice(4)] = key_selector.value;
     }
-    this.movement_keys = {
-        [this.keys.square_move_up]: 'UP',
-        [this.keys.square_move_left]: 'LEFT',
-        [this.keys.square_move_down]: 'DOWN',
-        [this.keys.square_move_right]: 'RIGHT'
-    };
-    if (game.map_geometry == 'Hex') {
+    if (game.map_geometry == 'Square') {
+        this.movement_keys = {
+            [this.keys.square_move_up]: 'UP',
+            [this.keys.square_move_left]: 'LEFT',
+            [this.keys.square_move_down]: 'DOWN',
+            [this.keys.square_move_right]: 'RIGHT'
+        };
+        document.getElementById("move_upright").hidden = true;
+        document.getElementById("move_upleft").hidden = true;
+        document.getElementById("move_downright").hidden = true;
+        document.getElementById("move_downleft").hidden = true;
+        document.getElementById("move_up").hidden = false;
+        document.getElementById("move_down").hidden = false;
+    } else if (game.map_geometry == 'Hex') {
+        document.getElementById("move_upright").hidden = false;
+        document.getElementById("move_upleft").hidden = false;
+        document.getElementById("move_downright").hidden = false;
+        document.getElementById("move_downleft").hidden = false;
+        document.getElementById("move_up").hidden = true;
+        document.getElementById("move_down").hidden = true;
         this.movement_keys = {
             [this.keys.hex_move_upleft]: 'UPLEFT',
             [this.keys.hex_move_upright]: 'UPRIGHT',
@@ -518,40 +594,13 @@ let tui = {
     }
     this.empty_input();
     this.restore_input_values();
-    document.getElementById("take_thing").disabled = true;
-    document.getElementById("drop_thing").disabled = true;
-    document.getElementById("flatten").disabled = true;
-    document.getElementById("teleport").disabled = true;
-    document.getElementById("toggle_map_mode").disabled = true;
-    document.getElementById("switch_to_chat").disabled = true;
-    document.getElementById("switch_to_play").disabled = true;
-    document.getElementById("switch_to_study").disabled = true;
-    document.getElementById("switch_to_edit").disabled = true;
-    document.getElementById("switch_to_portal").disabled = true;
-    document.getElementById("switch_to_annotate").disabled = true;
-    document.getElementById("switch_to_password").disabled = true;
-    document.getElementById("switch_to_admin").disabled = true;
-    document.getElementById("switch_to_control_pw_type").disabled = true;
-    document.getElementById("switch_to_control_tile_type").disabled = true;
-    document.getElementById("move_left").disabled = true;
-    document.getElementById("move_upleft").disabled = true;
-    document.getElementById("move_up").disabled = true;
-    document.getElementById("move_upright").disabled = true;
-    document.getElementById("move_downleft").disabled = true;
-    document.getElementById("move_down").disabled = true;
-    document.getElementById("move_downright").disabled = true;
-    document.getElementById("move_right").disabled = true;
+    for (let el of document.getElementsByTagName("button")) {
+        el.disabled = true;
+    }
+    document.getElementById("help").disabled = false;
     if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw') {
-        document.getElementById("move_left").disabled = false;
-        document.getElementById("move_right").disabled = false;
-        if (game.map_geometry == 'Hex') {
-            document.getElementById("move_upleft").disabled = false;
-            document.getElementById("move_upright").disabled = false;
-            document.getElementById("move_downleft").disabled = false;
-            document.getElementById("move_downright").disabled = false;
-        } else {
-            document.getElementById("move_up").disabled = false;
-            document.getElementById("move_down").disabled = false;
+        for (const move_key of document.querySelectorAll('[id^="move_"]')) {
+            move_key.disabled = false;
         }
     }
     if (!this.mode.is_intro && this.mode.name != 'play') {
@@ -602,6 +651,18 @@ let tui = {
     }
     this.full_refresh();
   },
+  offset_links: function(offset, links) {
+      for (let y in links) {
+          let real_y = offset[0] + parseInt(y);
+          if (!this.links[real_y]) {
+              this.links[real_y] = [];
+          }
+          for (let link of links[y]) {
+              const offset_link = [link[0] + offset[1], link[1] + offset[1], link[2]];
+              this.links[real_y].push(offset_link);
+          }
+      }
+  },
   restore_input_values: function() {
       if (this.mode.name == 'annotate' && explorer.position in explorer.info_db) {
           let info = explorer.info_db[explorer.position];
@@ -627,24 +688,64 @@ let tui = {
       }
   },
   recalc_input_lines: function() {
-      this.input_lines = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value, this.window_width);
+      let _ = null;
+      [this.input_lines, _] = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value, this.window_width);
       this.height_input = this.input_lines.length;
   },
   msg_into_lines_of_width: function(msg, width) {
-    let chunk = "";
-    let lines = [];
-    for (let i = 0, x = 0; i < msg.length; i++, x++) {
-      if (x >= width || msg[i] == "\n") {
-        lines.push(chunk);
-        chunk = "";
-        x = 0;
+      function push_inner_link(y, end_x) {
+          if (!inner_links[y]) {
+              inner_links[y] = [];
+          };
+          inner_links[y].push([url_start_x, end_x, url]);
       };
-      if (msg[i] != "\n") {
-        chunk += msg[i];
+      const matches = msg.matchAll(/https?:\/\/[^\s]+/g)
+      let link_data = {};
+      let url_ends = [];
+      for (const match of matches) {
+          const url = match[0];
+          const url_start = match.index;
+          const url_end = match.index + match[0].length;
+          link_data[url_start] = url;
+          url_ends.push(url_end);
       }
-    }
-    lines.push(chunk);
-    return lines;
+      let url_start_x = 0;
+      let url = '';
+      let inner_links = {};
+      let in_link = false;
+      let chunk = "";
+      let lines = [];
+      for (let i = 0, x = 0, y = 0; i < msg.length; i++, x++) {
+          if (x >= width || msg[i] == "\n") {
+              if (in_link) {
+                  push_inner_link(y, chunk.length);
+                  url_start_x = 0;
+              };
+              lines.push(chunk);
+              chunk = "";
+              x = 0;
+              if (msg[i] == "\n") {
+                  x -= 1;
+              };
+              y += 1;
+          };
+          if (msg[i] != "\n") {
+              chunk += msg[i];
+          };
+          if (i in link_data) {
+              url_start_x = x;
+              url = link_data[i];
+              in_link = true;
+          } else if (url_ends.includes(i)) {
+              push_inner_link(y, x);
+              in_link = false;
+          }
+      }
+      lines.push(chunk);
+      if (in_link) {
+          push_inner_link(lines.length - 1, chunk.length);
+      }
+      return [lines, inner_links];
   },
   log_msg: function(msg) {
       this.log.push(msg);
@@ -745,21 +846,44 @@ let tui = {
   },
   draw_history: function() {
       let log_display_lines = [];
+      let log_links = {};
+      let y_offset_in_log = 0;
       for (let line of this.log) {
-          log_display_lines = log_display_lines.concat(this.msg_into_lines_of_width(line, this.window_width));
+          let [new_lines, link_data] = this.msg_into_lines_of_width(line,
+                                                                    this.window_width)
+          log_display_lines = log_display_lines.concat(new_lines);
+          for (const y in link_data) {
+              const rel_y = y_offset_in_log + parseInt(y);
+              log_links[rel_y] = [];
+              for (let link of link_data[y]) {
+                  log_links[rel_y].push(link);
+              }
+          }
+          y_offset_in_log += new_lines.length;
       };
-      for (let y = terminal.rows - 1 - this.height_input,
-               i = log_display_lines.length - 1;
+      let i = log_display_lines.length - 1;
+      for (let y = terminal.rows - 1 - this.height_input;
            y >= this.height_header && i >= 0;
            y--, i--) {
           terminal.write(y, this.window_width, log_display_lines[i]);
       }
+      for (const key of Object.keys(log_links)) {
+          if (parseInt(key) <= i) {
+              delete log_links[key];
+          }
+      }
+      let offset = [terminal.rows - this.height_input - log_display_lines.length,
+                    this.window_width];
+      this.offset_links(offset, log_links);
   },
   draw_info: function() {
-    let lines = this.msg_into_lines_of_width(explorer.get_info(), this.window_width);
-    for (let y = this.height_header, i = 0; y < terminal.rows && i < lines.length; y++, i++) {
-      terminal.write(y, this.window_width, lines[i]);
-    }
+      let [lines, link_data] = this.msg_into_lines_of_width(explorer.get_info(),
+                                                            this.window_width);
+      let offset = [this.height_header, this.window_width];
+      for (let y = offset[0], i = 0; y < terminal.rows && i < lines.length; y++, i++) {
+        terminal.write(y, offset[1], lines[i]);
+      }
+      this.offset_links(offset, link_data);
   },
   draw_input: function() {
     if (this.mode.has_input_prompt) {
@@ -803,12 +927,13 @@ let tui = {
           start_x = this.window_width
       }
       terminal.drawBox(0, start_x, terminal.rows, this.window_width);
-      let lines = this.msg_into_lines_of_width(content, this.window_width);
+      let [lines, _] = this.msg_into_lines_of_width(content, this.window_width);
       for (let y = 0, i = 0; y < terminal.rows && i < lines.length; y++, i++) {
           terminal.write(y, start_x, lines[i]);
       }
   },
   full_refresh: function() {
+    this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
     if (this.mode.is_intro) {
         this.draw_history();