37 files changed, 89 insertions, 44 deletions
diff --git a/html/display.html b/html/display.html
index a24255e..28d1871 100644
--- a/html/display.html
+++ b/html/display.html
@@ -345,6 +345,12 @@
         }
         let bar_items_left = []
         function load_bar() {
+            document.getElementById("bar-menu").onclick = ((ev) => {
+                if (document.getElementById("bar-menu-root").style.display == "block")
+                    document.getElementById("bar-menu-root").style.display = "none"
+                else
+                    document.getElementById("bar-menu-root").style.display = "block"
+            })
             let items = document.getElementById("bar-menu-root").children
             for (let item = 0; item != items.length; item++) {
                 //console.log(items.item(item))
@@ -380,9 +386,21 @@
 
                                     for (let l of dd[ite].content.split("\n")) {
                                         if (l.split(" ")[0] == "meta") {
-                                            if (l.split(" ")[1] == "icon") {
-                                                icon = `<img class="bar-menu-image" src="${l.split(" ")[2]}">`
+                                            let tem = l.split(" ")
+                                            tem.splice(0, 1);
+                                            tem = tem.join(" ")
+                                            //console.log(tem)
+                                            tem = tem.split(",")
+                                            //console.log(tem)
+                                            for (let tw of tem) {
+                                                if (tw.trim().split(" ")[0] == "icon") {
+                                                    icon = `<img class="bar-menu-image" src="${tw.trim().split(" ")[1]}">`
+                                                }
                                             }
+                                            /*if (l.split(" ")[1] == "icon") {
+                                                icon = `<img class="bar-menu-image" src="${l.split(" ")[2]}">`
+                                            }*/
+
                                         }
                                     }
                                     ins += icon
@@ -480,8 +498,8 @@
         function window_create(uid, name, content, options = {}) {
             let lines = content.split("</br>").length
             let a = ''
-            let size = (options.size != undefined) ? ("width:" + options.size.width + "px;height:" + options.size.height + "px;") : ("width:" + Math.max(document.body.clientWidth * .56, minx) + "px;height:" + Math.max(miny, document.body.clientHeight * .30) + "px;");
-            let pos = (options.pos != undefined) ? ("left:" + options.pos.left + "px;top:" + options.pos.top + "px;") : ("left:0px;top:0px;");
+            let size = (options.width != undefined && options.height != undefined) ? ("width:" + options.width + "px;height:" + options.height + "px;") : ("width:" + Math.max(document.body.clientWidth * .56, minx) + "px;height:" + Math.max(miny, document.body.clientHeight * .30) + "px;");
+            let pos = (options.left != undefined && options.top != undefined) ? ("left:" + options.left + "px;top:" + options.top + "px;") : ("left:0px;top:0px;");
             a += "<div id='" + uid + "-root' class='window' style=\"" + size + pos + "position:absolute;\" window-name='" + name + "'>"
             //console.log(document.getElementById(uid).attributes["window-name"].value)
             a += "<div id='" + uid + "-head' class='head-border' window-name='" + name + "'> <div style='color:fdffff'>" + name + "</div>"
@@ -490,21 +508,27 @@
 <path style=" stroke:none;fill-rule:evenodd;fill:rgb(2.745098%,3.137255%,2.745098%);fill-opacity:1;" d="M 8.476562 6.042969 C 9.042969 6.042969 9.613281 6.042969 10.179688 6.042969 C 10.179688 6.332031 10.179688 6.625 10.179688 6.914062 C 10.464844 6.914062 10.746094 6.914062 11.03125 6.914062 C 11.03125 7.203125 11.03125 7.492188 11.03125 7.78125 C 11.597656 7.78125 12.167969 7.78125 12.734375 7.78125 C 12.734375 7.492188 12.734375 7.203125 12.734375 6.914062 C 13.019531 6.914062 13.304688 6.914062 13.585938 6.914062 C 13.585938 6.625 13.585938 6.332031 13.585938 6.042969 C 14.15625 6.042969 14.722656 6.042969 15.289062 6.042969 C 15.289062 6.332031 15.289062 6.625 15.289062 6.914062 C 15.007812 6.914062 14.722656 6.914062 14.4375 6.914062 C 14.4375 7.203125 14.4375 7.492188 14.4375 7.78125 C 14.15625 7.78125 13.871094 7.78125 13.585938 7.78125 C 13.585938 8.074219 13.585938 8.363281 13.585938 8.652344 C 13.304688 8.652344 13.019531 8.652344 12.734375 8.652344 C 12.734375 8.941406 12.734375 9.230469 12.734375 9.523438 C 13.019531 9.523438 13.304688 9.523438 13.585938 9.523438 C 13.585938 9.8125 13.585938 10.101562 13.585938 10.390625 C 13.871094 10.390625 14.15625 10.390625 14.4375 10.390625 C 14.4375 10.679688 14.4375 10.972656 14.4375 11.261719 C 14.722656 11.261719 15.007812 11.261719 15.289062 11.261719 C 15.289062 11.550781 15.289062 11.839844 15.289062 12.128906 C 14.722656 12.128906 14.15625 12.128906 13.585938 12.128906 C 13.585938 11.839844 13.585938 11.550781 13.585938 11.261719 C 13.304688 11.261719 13.019531 11.261719 12.734375 11.261719 C 12.734375 10.972656 12.734375 10.679688 12.734375 10.390625 C 12.167969 10.390625 11.597656 10.390625 11.03125 10.390625 C 11.03125 10.679688 11.03125 10.972656 11.03125 11.261719 C 10.746094 11.261719 10.464844 11.261719 10.179688 11.261719 C 10.179688 11.550781 10.179688 11.839844 10.179688 12.128906 C 9.613281 12.128906 9.042969 12.128906 8.476562 12.128906 C 8.476562 11.839844 8.476562 11.550781 8.476562 11.261719 C 8.761719 11.261719 9.042969 11.261719 9.328125 11.261719 C 9.328125 10.972656 9.328125 10.679688 9.328125 10.390625 C 9.613281 10.390625 9.894531 10.390625 10.179688 10.390625 C 10.179688 10.101562 10.179688 9.8125 10.179688 9.523438 C 10.464844 9.523438 10.746094 9.523438 11.03125 9.523438 C 11.03125 9.230469 11.03125 8.941406 11.03125 8.652344 C 10.746094 8.652344 10.464844 8.652344 10.179688 8.652344 C 10.179688 8.363281 10.179688 8.074219 10.179688 7.78125 C 9.894531 7.78125 9.613281 7.78125 9.328125 7.78125 C 9.328125 7.492188 9.328125 7.203125 9.328125 6.914062 C 9.042969 6.914062 8.761719 6.914062 8.476562 6.914062 C 8.476562 6.625 8.476562 6.332031 8.476562 6.042969 Z M 8.476562 6.042969 "/>
 </g>
 </svg></div></div>`
-            a += "<div id='" + uid + "-resize-n' class='resize-n'></div>"
-            a += "<div id='" + uid + "-resize-s' class='resize-s'></div>"
-            a += "<div id='" + uid + "-resize-e' class='resize-e'></div>"
-            a += "<div id='" + uid + "-resize-w' class='resize-w'></div>"
+            if (options.resize != false && options.resize != "false") {
+                a += "<div id='" + uid + "-resize-n' class='resize-n'></div>"
+                a += "<div id='" + uid + "-resize-s' class='resize-s'></div>"
+                a += "<div id='" + uid + "-resize-e' class='resize-e'></div>"
+                a += "<div id='" + uid + "-resize-w' class='resize-w'></div>"
+            }
             a += "<div style='height:25px;'></div>"
             a += "<div id='" + uid + "-content-root' class='content-root' style='overflow:scroll;height:calc(100% - 26px);width:100%'>"
+
             a += "<div id='" + uid + "-content-content' class='content-content'>" + content + "</div>"
-            a += "<div id='" + uid + "-content-scrollbar' class='scrollbar'><div id='" + uid + "-content-scrollbar-point' class='scrollbar-point'></div>"
-            a += "</div>"
+            if (options.scroll != false && options.scroll != "false") {
+                a += "<div id='" + uid + "-content-scrollbar' class='scrollbar'><div id='" + uid + "-content-scrollbar-point' class='scrollbar-point'></div>"
+                a += "</div>"
+            }
             a += "</div>"
-
-            a += "<div id='" + uid + "-resize-ne' class='resize-ne'></div>"
-            a += "<div id='" + uid + "-resize-nw' class='resize-nw'></div>"
-            a += "<div id='" + uid + "-resize-sw' class='resize-sw'></div>"
-            a += "<div id='" + uid + "-resize-es' class='resize-es'></div>"
+            if (options.resize != false && options.resize != "false") {
+                a += "<div id='" + uid + "-resize-ne' class='resize-ne'></div>"
+                a += "<div id='" + uid + "-resize-nw' class='resize-nw'></div>"
+                a += "<div id='" + uid + "-resize-sw' class='resize-sw'></div>"
+                a += "<div id='" + uid + "-resize-es' class='resize-es'></div>"
+            }
             document.getElementById("root").innerHTML += a
             //console.log(document.getElementById(uid + "-content-root").clientHeight / (document.getElementById(uid + "-content-content").clientHeight / document.getElementById(uid + "-content-root").clientHeight))
 
@@ -516,18 +540,21 @@
             let elems = document.getElementsByClassName("window")
             for (let i = 0; i != elems.length; i++) {
                 let uid = elems.item(i).id.split("-")[0]
-                document.getElementById(uid + "-content-scrollbar-point").style.height = (document.getElementById(uid + "-content-root").clientHeight / (document.getElementById(uid + "-content-content").clientHeight / document.getElementById(uid + "-content-root").clientHeight)) + "px"
-                if (document.getElementById(uid + "-content-scrollbar-point").clientHeight >= document.getElementById(uid + "-content-root").clientHeight) {
-                    document.getElementById(uid + "-content-scrollbar").style.display = 'none'
-                }
-                else {
-                    if (document.getElementById(uid + "-content-scrollbar").style.display == 'none') {
-                        document.getElementById(uid + "-content-scrollbar").style.display = 'block'
-                        if (document.getElementById(uid + "-content-scrollbar-point").clientHeight >= document.getElementById(uid + "-content-root").clientHeight) {
-                            document.getElementById(uid + "-content-scrollbar").style.display = 'none'
+                try {
+                    document.getElementById(uid + "-content-scrollbar-point").style.height = (document.getElementById(uid + "-content-root").clientHeight / (document.getElementById(uid + "-content-content").clientHeight / document.getElementById(uid + "-content-root").clientHeight)) + "px"
+
+                    if (document.getElementById(uid + "-content-scrollbar-point").clientHeight >= document.getElementById(uid + "-content-root").clientHeight) {
+                        document.getElementById(uid + "-content-scrollbar").style.display = 'none'
+                    }
+                    else {
+                        if (document.getElementById(uid + "-content-scrollbar").style.display == 'none') {
+                            document.getElementById(uid + "-content-scrollbar").style.display = 'block'
+                            if (document.getElementById(uid + "-content-scrollbar-point").clientHeight >= document.getElementById(uid + "-content-root").clientHeight) {
+                                document.getElementById(uid + "-content-scrollbar").style.display = 'none'
+                            }
                         }
                     }
-                }
+                } catch (e) { }
                 //let elem = elems.item(i).children[0]
                 let elec = elems.item(i).children
                 let elem
@@ -833,14 +860,12 @@
                 }
             }
             document.getElementById("bar-menu-root").style.display = "none"
-            document.getElementById("bar-menu").onclick = ((ev) => {
-                if (document.getElementById("bar-menu-root").style.display == "block")
-                    document.getElementById("bar-menu-root").style.display = "none"
-                else
-                    document.getElementById("bar-menu-root").style.display = "block"
-            })
+
             load_bar()
         }
+
+
+
         async function main() {
             fs = await req('src/fs.json')
             document.getElementById("bar-menu").onclick = ((ev) => {
diff --git a/src/fs.json b/src/fs.json
index 96cbf9f..be1a7b4 100644
--- a/src/fs.json
+++ b/src/fs.json
@@ -6,17 +6,21 @@
     "content": [
       {
         "name": "notepad",
-        "icon": "./src/img/notepad.png",
         "perms": { "r": true },
         "dir": false,
         "content": "window Notepad <textarea onkeypress='auto_resize(this)' style='width:100%;overflow:visible;display:block;'></textarea>\nmeta icon src/img/notepad.png"
       },
       {
         "name": "cmd",
-        "icon": "./src/img/cmd.png",
         "perms": { "r": true },
         "dir": false,
         "content": "window cmd <div class='history' id='#_ID-history'></div><form autocomplete='off' onsubmit='exe_com(this);return false;'>λ <input id='#_ID-line' class='line' style='width:95%;' autofocus><input type='submit' style='display: none' /></form>\nmeta icon src/img/cmd.png"
+      },
+      {
+        "name": "Mine Sweeper",
+        "perms": { "r": true },
+        "dir": false,
+        "content": "window uwu uwu\nmeta icon src/img/mine.png, resize false, left 250, top 250, width 144, height 192, scroll false\njs let id = #_ID - 1;let cont = document.getElementById(id + '-content-content');let width = 9; let height = 10;cont.innerHTML='';let board = [];for(let i = 0; i!=height;i++){let temp = [];for(let i = 0; i!=width;i++){if(Math.random() < 0.19){temp.push(-1);} else {temp.push(0);}};board.push(temp);};for(let i = 0; i!= board.length; i++){for(let ii = 0; ii!=board[i].length; ii++){if((i!=0&&i!=height-1&&ii!=0&&ii!=width-1)&&board[i][ii]!=-1){board[i][ii] = (board[i-1][ii]==-1) + (board[i-1][ii-1]==-1) + (board[i][ii-1]==-1) + (board[i+1][ii-1]==-1) + (board[i+1][ii]==-1) + (board[i+1][ii+1]==-1) + (board[i][ii+1]==-1) + (board[i-1][ii+1]==-1);}}};for(let l of board){console.log(l)}"
       }
     ]
   }
diff --git a/src/img/mine.png b/src/img/mine.png
new file mode 100644
index 0000000..a3ae447
--- /dev/null
+++ b/src/img/mine.png
diff --git a/src/jssh.js b/src/jssh.js
index f8a4072..cb7c551 100644
--- a/src/jssh.js
+++ b/src/jssh.js
@@ -80,7 +80,6 @@ class jssh {
   stdout(line) {
     if (this.history != "null" && this.input != "null")
       document.getElementById(this.history).innerHTML += line;
-    else console.log("aaa");
     return;
   }
   add_file(fs, path, dir) {
@@ -108,7 +107,7 @@ class jssh {
       for (let f in fs) {
         if (fs[f].name == path[0] && !fs[f].dir) {
           //console.log(append ? fs[f].content + content : content);
-          fs[f].content = append ? fs[f].content + content : content;
+          fs[f].content = append ? fs[f].content + "\n" + content : content;
           return fs;
         }
       }
@@ -135,7 +134,7 @@ class jssh {
     //console.log(fs, path);
     if (path.length == 1) {
       for (let f in fs) {
-        console.log(f);
+        //console.log(f);
         if (fs[f].name == path[0]) {
           fs.splice(f, 1);
           break;
@@ -161,23 +160,33 @@ class jssh {
       if (i.name == it[0] && !i.dir) {
         let cont = i.content;
         for (let line of cont.split("\n")) {
-          console.log(line);
+          //console.log(line);
           let stripped = line.split(" ");
           switch (stripped[0]) {
             case "window":
               if (this.window_create != null) {
                 let t = line.split(" ");
                 t.splice(0, 2);
+                let settings = {};
+                let con2 = cont.split("\n");
+                for (let l of con2) {
+                  if (l.trim().split(" ")[0] == "meta") {
+                    let nuwu = l.trim().split(" ");
+                    nuwu.splice(0, 1);
+                    let trim = nuwu.join(" ").trim().split(",");
+                    for (let i of trim) {
+                      settings[i.trim().split(" ")[0]] = i.trim().split(" ")[1];
+                    }
+                  }
+                }
+                console.log(settings);
                 let id = document.getElementsByClassName("window").length;
-                console.log(id);
+                //console.log(id);
                 this.window_create(
                   id,
                   stripped[1],
                   t.join(" ").replace(/#_ID/g, id),
-                  {
-                    size: { width: 500, height: 300 },
-                    pos: { left: 250, top: 50 },
-                  }
+                  settings
                 );
               } else {
                 this.stdout("unable to make window reference");
@@ -188,17 +197,24 @@ class jssh {
               t.splice(0, 1);
               this.stdout(t.join(" "));
               break;
+            case "js":
+              let id = document.getElementsByClassName("window").length;
+              let tt = line.split(" ");
+              tt.splice(0, 1);
+              eval(tt.join(" ").replace(/#_ID/g, id));
+              break;
           }
         }
         break;
       }
     }
   }
-  ex() {
+  ex(stdin = null) {
     let temp_working_dir = this.working_dir;
     //document.getElementById(this.history).innerHTML +=
     //  "λ " + document.getElementById(this.input).value + "</br>";
     let com = document.getElementById(this.input).value;
+    if (stdin != null) com = stdin;
     let stripped = com.split(" ");
     let redir = false,
       redir_app = false;
@@ -208,7 +224,7 @@ class jssh {
       "λ " + document.getElementById(this.input).value + "</br>";
     if (stripped.includes(">")) redir = true;
     else if (stripped.includes(">>")) redir_app = true;
-    console.log(redir, redir_app);
+    //console.log(redir, redir_app);
     swi: switch (stripped[0]) {
       case "touch":
         this.add_file(
diff --git a/src/sprites/bomb-ex.png b/src/sprites/bomb-ex.png
new file mode 100644
index 0000000..b3a7260
--- /dev/null
+++ b/src/sprites/bomb-ex.png
diff --git a/src/sprites/bomb-x.png b/src/sprites/bomb-x.png
new file mode 100644
index 0000000..6a5e1b2
--- /dev/null
+++ b/src/sprites/bomb-x.png
diff --git a/src/sprites/cool.png b/src/sprites/cool.png
new file mode 100644
index 0000000..c0679ef
--- /dev/null
+++ b/src/sprites/cool.png
diff --git a/src/sprites/dead.png b/src/sprites/dead.png
new file mode 100644
index 0000000..343ee24
--- /dev/null
+++ b/src/sprites/dead.png
diff --git a/src/sprites/dig-0.png b/src/sprites/dig-0.png
new file mode 100644
index 0000000..3f47382
--- /dev/null
+++ b/src/sprites/dig-0.png
diff --git a/src/sprites/dig-1.png b/src/sprites/dig-1.png
new file mode 100644
index 0000000..68d8055
--- /dev/null
+++ b/src/sprites/dig-1.png
diff --git a/src/sprites/dig-2.png b/src/sprites/dig-2.png
new file mode 100644
index 0000000..467ce62
--- /dev/null
+++ b/src/sprites/dig-2.png
diff --git a/src/sprites/dig-3.png b/src/sprites/dig-3.png
new file mode 100644
index 0000000..018a975
--- /dev/null
+++ b/src/sprites/dig-3.png
diff --git a/src/sprites/dig-4.png b/src/sprites/dig-4.png
new file mode 100644
index 0000000..f6015b3
--- /dev/null
+++ b/src/sprites/dig-4.png
diff --git a/src/sprites/dig-5.png b/src/sprites/dig-5.png
new file mode 100644
index 0000000..7369441
--- /dev/null
+++ b/src/sprites/dig-5.png
diff --git a/src/sprites/dig-6.png b/src/sprites/dig-6.png
new file mode 100644
index 0000000..a8c78e7
--- /dev/null
+++ b/src/sprites/dig-6.png
diff --git a/src/sprites/dig-7.png b/src/sprites/dig-7.png
new file mode 100644
index 0000000..2943d87
--- /dev/null
+++ b/src/sprites/dig-7.png
diff --git a/src/sprites/dig-8.png b/src/sprites/dig-8.png
new file mode 100644
index 0000000..19c26c0
--- /dev/null
+++ b/src/sprites/dig-8.png
diff --git a/src/sprites/dig-9.png b/src/sprites/dig-9.png
new file mode 100644
index 0000000..91f384d
--- /dev/null
+++ b/src/sprites/dig-9.png
diff --git a/src/sprites/dig-dash.png b/src/sprites/dig-dash.png
new file mode 100644
index 0000000..464c97d
--- /dev/null
+++ b/src/sprites/dig-dash.png
diff --git a/src/sprites/dig-nothing.png b/src/sprites/dig-nothing.png
new file mode 100644
index 0000000..ed3a2e8
--- /dev/null
+++ b/src/sprites/dig-nothing.png
diff --git a/src/sprites/shock.png b/src/sprites/shock.png
new file mode 100644
index 0000000..d66fadd
--- /dev/null
+++ b/src/sprites/shock.png
diff --git a/src/sprites/smiley-clicked.png b/src/sprites/smiley-clicked.png
new file mode 100644
index 0000000..cd754aa
--- /dev/null
+++ b/src/sprites/smiley-clicked.png
diff --git a/src/sprites/smiley.png b/src/sprites/smiley.png
new file mode 100644
index 0000000..87444c9
--- /dev/null
+++ b/src/sprites/smiley.png
diff --git a/src/sprites/space-1.png b/src/sprites/space-1.png
new file mode 100644
index 0000000..268343d
--- /dev/null
+++ b/src/sprites/space-1.png
diff --git a/src/sprites/space-3.png b/src/sprites/space-3.png
new file mode 100644
index 0000000..4db8267
--- /dev/null
+++ b/src/sprites/space-3.png
diff --git a/src/sprites/space-4.png b/src/sprites/space-4.png
new file mode 100644
index 0000000..c1f0600
--- /dev/null
+++ b/src/sprites/space-4.png
diff --git a/src/sprites/space-5.png b/src/sprites/space-5.png
new file mode 100644
index 0000000..4d9a161
--- /dev/null
+++ b/src/sprites/space-5.png
diff --git a/src/sprites/space-6.png b/src/sprites/space-6.png
new file mode 100644
index 0000000..75e77bd
--- /dev/null
+++ b/src/sprites/space-6.png
diff --git a/src/sprites/space-7.png b/src/sprites/space-7.png
new file mode 100644
index 0000000..7e44724
--- /dev/null
+++ b/src/sprites/space-7.png
diff --git a/src/sprites/space-8.png b/src/sprites/space-8.png
new file mode 100644
index 0000000..7ee9ddc
--- /dev/null
+++ b/src/sprites/space-8.png
diff --git a/src/sprites/space-bomb.png b/src/sprites/space-bomb.png
new file mode 100644
index 0000000..e3d8a1b
--- /dev/null
+++ b/src/sprites/space-bomb.png
diff --git a/src/sprites/space-clear.png b/src/sprites/space-clear.png
new file mode 100644
index 0000000..de23ec5
--- /dev/null
+++ b/src/sprites/space-clear.png
diff --git a/src/sprites/space-flag.png b/src/sprites/space-flag.png
new file mode 100644
index 0000000..6044e57
--- /dev/null
+++ b/src/sprites/space-flag.png
diff --git a/src/sprites/space-q-2.png b/src/sprites/space-q-2.png
new file mode 100644
index 0000000..5b12833
--- /dev/null
+++ b/src/sprites/space-q-2.png
diff --git a/src/sprites/space-q.png b/src/sprites/space-q.png
new file mode 100644
index 0000000..37e2cde
--- /dev/null
+++ b/src/sprites/space-q.png
diff --git a/src/sprites/space-uncl.png b/src/sprites/space-uncl.png
new file mode 100644
index 0000000..78c5618
--- /dev/null
+++ b/src/sprites/space-uncl.png
diff --git a/src/sprites/square-2.png b/src/sprites/square-2.png
new file mode 100644
index 0000000..156a2b5
--- /dev/null
+++ b/src/sprites/square-2.png