X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new2%2Frogue_chat_nocanvas_monochrome.html;h=e8f7873eb3794407c53747938bfe6ec2e1ecd459;hb=24ccb759c7925aa91e87398280fc50a4e6123612;hp=3f907c0432b4eadcc58e5013b04e589b088f7de4;hpb=2e712c7bd1617337bafff6afdf8c3ba058d4a709;p=plomrogue2-experiments

diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index 3f907c0..e8f7873 100644
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -44,15 +44,15 @@ let terminal = {
   drawBox: function(start_y, start_x, height, width) {
     let end_y = start_y + height;
     let end_x = start_x + width;
-      for (let y = start_y, x = start_x;; x++) {
-        if (x == end_x) {
-          x = start_x;
-          y += 1;
-          if (y == end_y) {
-              break;
-          }
-        };
-        this.content[y][x] = ' ';
+    for (let y = start_y, x = start_x; y < this.rows; x++) {
+      if (x == end_x) {
+        x = start_x;
+        y += 1;
+        if (y == end_y) {
+            break;
+        }
+      };
+      this.content[y][x] = ' ';
     }
   },
 }
@@ -98,7 +98,7 @@ let parser = {
     };
     return [tokens, token_starts];
   },
-  parse_yx(position_string) {
+  parse_yx: function(position_string) {
     let coordinate_strings = position_string.split(',')
     let position = [0, 0];
     position[0] = parseInt(coordinate_strings[0].slice(2));
@@ -107,38 +107,96 @@ let parser = {
   },
 }
 
-function quote(str) {
-    let quoted = ['"'];
-    for (let i = 0; i < str.length; i++) {
-        let c = str[i];
-        if (c in ['"', '\\']) {
-            quoted.push('\\');
+let server = {
+    init: function(url) {
+        this.websocket = new WebSocket(url);
+        this.websocket.onopen = function(event) {
+            window.setInterval(function() { server.send(['PING']) }, 30000);
+            server.send(['GET_GAMESTATE']);
         };
-        quoted.push(c);
+    },
+    send: function(tokens) {
+        this.websocket.send(unparser.untokenize(tokens));
     }
-    quoted.push('"');
-    return quoted.join('');
 }
 
+let unparser = {
+    quote: function(str) {
+        let quoted = ['"'];
+        for (let i = 0; i < str.length; i++) {
+            let c = str[i];
+            if (c in ['"', '\\']) {
+                quoted.push('\\');
+            };
+            quoted.push(c);
+        }
+        quoted.push('"');
+        return quoted.join('');
+    },
+    to_yx: function(yx_coordinate) {
+        return "Y:" + yx_coordinate[0] + ",X:" + yx_coordinate[1];
+    },
+    untokenize: function(tokens) {
+        let quoted_tokens = [];
+        for (let token of tokens) {
+            quoted_tokens.push(this.quote(token));
+        }
+        return quoted_tokens.join(" ");
+    }
+}
+
+class Mode {
+    constructor(name, has_input_prompt=false, shows_annotations=false) {
+        this.name = name;
+        this.has_input_prompt = has_input_prompt;
+        this.shows_annotations = shows_annotations;
+    }
+}
+let mode_chat = new Mode('chat', true, false);
+let mode_annotate = new Mode('annotate', true, true);
+let mode_play = new Mode('play', false, false);
+let mode_study = new Mode('study', false, true);
+let mode_edit = new Mode('edit', false, false);
+
 let tui = {
-  mode: 'chat',
-  switch_mode: function(mode_name) {
-    if (mode_name == 'explore') {
-        explorer.position = game.things[game.player_id];
+  mode: mode_chat,
+  log: [],
+  input: '',
+  input_lines: [],
+  window_width: terminal.cols / 2,
+  height_turn_line: 1,
+  height_mode_line: 1,
+  height_input: 1,
+  init: function() {
+      this.recalc_input_lines();
+      this.height_header = this.height_turn_line + this.height_mode_line;
+  },
+  switch_mode: function(mode, keep_pos=false) {
+    if (mode == mode_study && !keep_pos) {
+      explorer.position = game.things[game.player_id];
     }
-    this.mode = mode_name;
+    this.mode = mode;
+    this.empty_input();
     this.full_refresh();
   },
+  draw_mode_line: function() {
+      terminal.drawBox(1, this.window_width, this.height_mode_line, this.window_width);
+      terminal.write(1, this.window_width, 'MODE ' + this.mode.name);
+  },
   draw_history: function() {
-    terminal.drawBox(1, terminal.cols / 2, terminal.rows - 2, terminal.cols / 2);
-    let i = 0;
-    for (let line of chat.history) {
-      terminal.write(terminal.rows - 2 - i, terminal.cols / 2, line);
-      i += 1;
+    if (terminal.rows <= this.height_header + this.height_input) {
+        return;
     }
+    terminal.drawBox(this.height_header, this.window_width, terminal.rows - this.height_header - this.height_input, this.window_width);
+      for (let y = terminal.rows - 1 - this.height_input,
+               i = this.log.length - 1;
+           y >= this.height_header && i >= 0;
+           y--, i--) {
+          terminal.write(y, this.window_width, this.log[i]);
+      }
   },
   draw_map: function() {
-    terminal.drawBox(0, 0, terminal.rows, terminal.cols / 2);
+    terminal.drawBox(0, 0, terminal.rows, this.window_width);
     let map_lines = [];
     let line = [];
     for (let i = 0, j = 0; i < game.map.length; i++, j++) {
@@ -151,53 +209,86 @@ let tui = {
     };
     map_lines.push(line);
     let player_position = [0,0];
+    let center_pos = [Math.floor(game.map_size[0] / 2),
+		      Math.floor(game.map_size[1] / 2)];
     for (const thing_id in game.things) {
         let t = game.things[thing_id];
         map_lines[t[0]][t[1]] = '@';
         if (game.player_id == thing_id) {
-            player_position = t;
+            center_pos = t;
         }
     };
-    let center_pos = player_position;
-    if (tui.mode == 'explore') {
+    if (tui.mode.shows_annotations) {
         map_lines[explorer.position[0]][explorer.position[1]] = '?';
         center_pos = explorer.position;
     }
     let offset = [(terminal.rows / 2) - center_pos[0],
-                  terminal.cols / 4 - center_pos[1]];
+                  this.window_width / 2 - center_pos[1]];
       for (let term_y = offset[0], map_y = 0;
            term_y < terminal.rows && map_y < game.map_size[0];
            term_y++, map_y++) {
         if (term_y >= 0) {
-            let to_draw = map_lines[map_y].join('').slice(0, terminal.cols / 2 - offset[1]);
+            let to_draw = map_lines[map_y].join('').slice(0, this.window_width - offset[1]);
             terminal.write(term_y, offset[1], to_draw);
         }
     }
   },
   draw_turn_line: function(n) {
-    terminal.drawBox(0, terminal.cols / 2, 1, terminal.cols / 2);
-    terminal.write(0, terminal.cols / 2, 'turn: ' + game.turn);
+    terminal.drawBox(0, this.window_width, 1, this.window_width);
+    terminal.write(0, this.window_width, 'turn: ' + game.turn);
   },
-  draw_input_line: function() {
-    terminal.drawBox(terminal.rows - 1, terminal.cols / 2, 1, terminal.cols / 2);
-    terminal.write(terminal.rows - 1, terminal.cols / 2, chat.input_line);
+  empty_input: function(str) {
+      this.input = "";
+      if (this.mode.has_input_prompt) {
+          this.recalc_input_lines();
+      } else {
+          this.height_input = 0;
+      }
   },
-  log_msg: function(msg) {
-    let line_length = (terminal.cols / 2);
+  add_to_input: function(str) {
+      if (this.input.length + str.length > this.window_width * terminal.rows) {
+          return;
+      }
+      this.input += str;
+      this.recalc_input_lines();
+  },
+  recalc_input_lines: function() {
+      this.input_lines = this.msg_into_lines_of_width("> " + this.input, this.window_width);
+      this.height_input = this.input_lines.length;
+  },
+  shorten_input: function() {
+      this.input = tui.input.slice(0, -1);
+      this.recalc_input_lines();
+  },
+  draw_input: function() {
+    terminal.drawBox(terminal.rows - this.height_input, this.window_width, this.height_input, this.window_width);
+    if (this.mode.has_input_prompt) {
+        for (let y = terminal.rows - this.height_input, i = 0; y < terminal.rows && i < this.input_lines.length; y++, i++) {
+            terminal.write(y, this.window_width, this.input_lines[i]);
+        }
+    }
+  },
+  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 >= line_length) {
-        chat.history.unshift(chunk);
+      if (x >= width) {
+        lines.push(chunk);
         chunk = "";
         x = 0;
       };
       chunk += msg[i];
     }
-    chat.history.unshift(chunk);
-    while (chat.history.length > terminal.rows - 2) {
-      chat.history.pop();
-    };
-    this.draw_history();
+    lines.push(chunk);
+    return lines;
+  },
+  log_msg: function(msg) {
+      let lines = this.msg_into_lines_of_width(msg, this.window_width);
+      this.log = this.log.concat(lines);
+      while (this.log.length > terminal.rows) {
+        this.log.shift();
+      };
+      this.draw_history();
   },
   refresh: function() {
     terminal.refresh();
@@ -205,38 +296,45 @@ let tui = {
   log_help: function() {
     tui.log_msg("");
     tui.log_msg("HELP");
-    tui.log_msg("chat mode commands:");
     tui.log_msg("");
-    tui.log_msg("/login USER - register as USER");
-    tui.log_msg("/msg USER TEXT - send TEXT to USER");
-    tui.log_msg("/help - show this help");
-    tui.log_msg("/play - switch to play mode");
+    tui.log_msg("chat mode commands:");
+    tui.log_msg(":login USER - register as USER");
+    tui.log_msg(":msg USER TEXT - send TEXT to USER");
+    tui.log_msg(":help - show this help");
+    tui.log_msg(":play or :p - switch to play mode");
+    tui.log_msg(":study or :s - switch to study mode");
     tui.log_msg("");
     tui.log_msg("play mode commands:");
     tui.log_msg("w, a, s, d - move avatar");
     tui.log_msg("f - flatten surroundings");
     tui.log_msg("e - write following ASCII character");
     tui.log_msg("c - switch to chat mode");
-    tui.log_msg("? - switch to explore mode");
+    tui.log_msg("? - switch to study mode");
     tui.log_msg("");
-    tui.log_msg("explore mode commands:");
+    tui.log_msg("study mode commands:");
     tui.log_msg("w, a, s, d - move question mark");
+    tui.log_msg("A - annotate terrain");
     tui.log_msg("c - switch to chat mode");
     tui.log_msg("p - switch to play mode");
     tui.log_msg("");
   },
   draw_info: function() {
-    terminal.drawBox(0, terminal.cols / 2, terminal.rows, terminal.cols / 2);
-    let lines = ['unfinished info screen'];
-    for (let y = 0, i = 0; y < terminal.rows && i < lines.length; y++, i++) {
-      terminal.write(y, terminal.cols / 2, lines[i]);
+    terminal.drawBox(this.height_header, this.window_width, terminal.rows - this.height_header - this.height_input, this.window_width);
+    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]);
     }
   },
   full_refresh: function() {
     this.draw_map();
     this.draw_turn_line();
-    this.draw_history();
-    this.draw_input_line();
+    this.draw_mode_line();
+    if (this.mode.shows_annotations) {
+      this.draw_info();
+    } else {
+      this.draw_history();
+    }
+    this.draw_input();
     this.refresh();
   }
 }
@@ -249,17 +347,13 @@ let game = {
   player_id: 0
 }
 
-let chat = {
-  input_line: "",
-  history: [],
-}
-
 terminal.initialize();
+tui.init();
 tui.log_help();
 tui.full_refresh();
 
-let websocket = new WebSocket(websocket_location);
-websocket.onmessage = function (event) {
+server.init(websocket_location);
+server.websocket.onmessage = function (event) {
   let tokens = parser.tokenize(event.data)[0];
   if (tokens[0] === 'TURN') {
     game.things = {}
@@ -270,6 +364,10 @@ websocket.onmessage = function (event) {
     game.map_size = parser.parse_yx(tokens[1]);
     game.map = tokens[2]
   } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
+    explorer.empty_info_db();
+    if (tui.mode == mode_study) {
+      explorer.query_info();
+    }
     tui.draw_turn_line();
     tui.draw_map();
     tui.refresh();
@@ -281,6 +379,9 @@ websocket.onmessage = function (event) {
   } else if (tokens[0] === 'META') {
      tui.log_msg('@ ' + tokens[1]);
      tui.refresh();
+  } else if (tokens[0] === 'ANNOTATION') {
+     let position = parser.parse_yx(tokens[1]);
+     explorer.update_info_db(position, tokens[2]);
   } else if (tokens[0] === 'UNHANDLED_INPUT') {
      tui.log_msg('? unknown command');
      tui.refresh();
@@ -300,6 +401,7 @@ websocket.onmessage = function (event) {
 
 let explorer = {
     position: [0,0],
+    info_db: {},
     move: function(direction) {
         let try_pos = [0,0];
         try_pos[0] = this.position[0];
@@ -318,87 +420,118 @@ let explorer = {
             !(try_pos[0] >= game.map_size[0])
             && !(try_pos[1] >= game.map_size[1])) {
             this.position = try_pos;
+            this.query_info();
             tui.draw_map();
             tui.draw_info();
             tui.refresh();
         }
+    },
+    update_info_db: function(yx, str) {
+        this.info_db[yx] = str;
+        if (tui.mode == mode_study) {
+            tui.draw_info();
+            tui.refresh();
+        }
+    },
+    empty_info_db: function() {
+        this.info_db = {};
+        if (tui.mode == mode_study) {
+            tui.draw_info();
+            tui.refresh();
+        }
+    },
+    query_info: function() {
+        server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
+    },
+    get_info: function() {
+        if (this.position in this.info_db) {
+            return this.info_db[this.position];
+        } else {
+            return 'waiting …';
+        }
+    },
+    annotate: function(msg) {
+        if (msg.length == 0) {
+            msg = " ";  // triggers annotation deletion
+        }
+        server.send(["ANNOTATE", unparser.to_yx(explorer.position), msg]);
     }
 }
 
 document.addEventListener('keydown', (event) => {
-    if (tui.mode == 'chat') {
-        if (event.key.length === 1) {
-            chat.input_line += event.key;
-            tui.draw_input_line();
-            tui.refresh();
-        } else if (event.key == 'Backspace') {
-            chat.input_line = chat.input_line.slice(0, -1);
-            tui.draw_input_line();
-            tui.refresh();
-        } else if (event.key == 'Enter') {
-            let [tokens, token_starts] = parser.tokenize(chat.input_line);
-            if (tokens.length > 0 && tokens[0].length > 0) {
-                if (tokens[0][0] == '/') {
-                    if (tokens[0] == '/play') {
-                        tui.switch_mode('play');
-                    } else if (tokens[0] == '/?') {
-                        tui.log_help();
-                        tui.refresh();
-                    } else if (tokens[0] == '/login') {
-                        if (tokens.length > 1) {
-                            websocket.send('LOGIN ' + quote(tokens[1]));
-                        } else {
-                            tui.log_msg('? need login name');
-                        }
-                    } else if (tokens[0] == '/msg') {
-                        if (tokens.length > 2) {
-                            let msg = chat.input_line.slice(token_starts[2]);
-                            websocket.send('QUERY ' + quote(tokens[1]) + ' ' + quote(msg));
-                        } else {
-                            tui.log_msg('? need message target and message');
-                        }
+    if (tui.mode.has_input_prompt && event.key.length === 1) {
+        tui.add_to_input(event.key);
+        tui.full_refresh();
+    } else if (tui.mode.has_input_prompt && event.key == 'Backspace') {
+        tui.shorten_input();
+        tui.full_refresh();
+    } else if (tui.mode == mode_annotate && event.key == 'Enter') {
+        explorer.annotate(tui.input);
+        tui.switch_mode(mode_study, true);
+    } else if (tui.mode == mode_chat && event.key == 'Enter') {
+        let [tokens, token_starts] = parser.tokenize(tui.input);
+        if (tokens.length > 0 && tokens[0].length > 0) {
+            if (tokens[0][0] == ':') {
+                if (tokens[0] == ':play' || tokens[0] == ':p') {
+                    tui.switch_mode(mode_play);
+                } else if (tokens[0] == ':study' || tokens[0] == ':s') {
+                    tui.switch_mode(mode_study);
+                } else if (tokens[0] == ':help') {
+                    tui.log_help();
+                    tui.refresh();
+                } else if (tokens[0] == ':login') {
+                    if (tokens.length > 1) {
+                        server.send(['LOGIN', tokens[1]]);
+                    } else {
+                        tui.log_msg('? need login name');
+                    }
+                } else if (tokens[0] == ':msg') {
+                    if (tokens.length > 2) {
+                        let msg = tui.input.slice(token_starts[2]);
+                        server.send(['QUERY', tokens[1], msg]);
                     } else {
-                        tui.log_msg('? unknown command');
+                        tui.log_msg('? need message target and message');
                     }
                 } else {
-                    websocket.send('ALL ' + quote(chat.input_line));
+                    tui.log_msg('? unknown command');
                 }
+            } else {
+                server.send(['ALL', tui.input]);
             }
-            chat.input_line = '';
-            tui.draw_input_line();
-            tui.refresh();
         }
-    } else if (tui.mode == 'play') {
+        tui.empty_input();
+        tui.full_refresh();
+      } else if (tui.mode == mode_play) {
           if (event.key === 'c') {
-              tui.switch_mode('chat');
+              tui.switch_mode(mode_chat);
           } else if (event.key === 'e') {
-              tui.switch_mode('edit');
+              tui.switch_mode(mode_edit);
           } else if (event.key === '?') {
-              tui.switch_mode('explore');
+              tui.switch_mode(mode_study);
           } else if (event.key === 'F1') {
               tui.log_help();
               tui.refresh();
           } else if (event.key === 'f') {
-              websocket.send("TASK:FLATTEN_SURROUNDINGS");
+              server.send(["TASK:FLATTEN_SURROUNDINGS"]);
           } else if (event.key === 'a') {
-              websocket.send('TASK:MOVE LEFT');
+              server.send(['TASK:MOVE', 'LEFT']);
           } else if (event.key === 'd') {
-              websocket.send('TASK:MOVE RIGHT');
+              server.send(['TASK:MOVE', 'RIGHT']);
           } else if (event.key === 'w') {
-              websocket.send('TASK:MOVE UP');
+              server.send(['TASK:MOVE', 'UP']);
           } else if (event.key === 's') {
-              websocket.send('TASK:MOVE DOWN');
+              server.send(['TASK:MOVE', 'DOWN']);
           };
-    } else if (tui.mode == 'edit') {
-        if (event.key.length === 1) {
-            websocket.send("TASK:WRITE " + quote(event.key));
+    } else if (tui.mode == mode_edit) {
+        if (event.key != "Shift" && event.key.length == 1) {
+            server.send(["TASK:WRITE", event.key]);
+            tui.switch_mode(mode_play);
         }
-        tui.switch_mode('play');
-    } else if (tui.mode == 'explore') {
+    } else if (tui.mode == mode_study) {
         if (event.key === 'c') {
-            tui.switch_mode('chat');
+            tui.switch_mode(mode_chat);
         } else if (event.key == 'p') {
-            tui.switch_mode('play');
+            tui.switch_mode(mode_play);
         } else if (event.key === 'a') {
 	      explorer.move('left');
         } else if (event.key === 'd') {
@@ -407,10 +540,12 @@ document.addEventListener('keydown', (event) => {
 	      explorer.move('up');
         } else if (event.key === 's') {
 	      explorer.move('down');
-	};
+        } else if (event.key === 'A') {
+          tui.switch_mode(mode_annotate);
+          tui.draw_info();
+          tui.refresh();
+        };
     }
 }, false);
-
-window.setInterval(function() { websocket.send('PING') }, 30000);
 </script>
 </body></html>