diff --git a/links/main.css b/links/main.css index 5b1d7ef..67fef5e 100644 --- a/links/main.css +++ b/links/main.css @@ -2,7 +2,7 @@ body { margin:0px; padding:0px; overflow:hidden; font-family:"input_mono_medium" *:focus {outline: none; } #ronin { background:#ddd; width:100%; height:100%; overflow:hidden; background-image:url(../media/graphics/grid.svg); background-position: 0px 0px; } -#frame { width:50vw; height:50vh; overflow:hidden; position:fixed; left: calc(40vw + 15px); top:100px; background:white;} +#frame { width:50vw; height:50vh; overflow:hidden; position:fixed; left: calc(40vw + 15px); top:100px; background-image:url(../media/graphics/void.svg); background-position:0px 0px; } #frame > .layer { position:absolute; top:0px; left:0px; width:100%; height:100%;} #overlay { position:absolute; z-index:1000;} #frame { cursor:none;} diff --git a/media/graphics/void.svg b/media/graphics/void.svg new file mode 100644 index 0000000..2b3d851 --- /dev/null +++ b/media/graphics/void.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/scripts/core/keyboard.js b/scripts/core/keyboard.js index 6349bcb..339278f 100644 --- a/scripts/core/keyboard.js +++ b/scripts/core/keyboard.js @@ -90,6 +90,8 @@ function Keyboard() this.key_escape = function() { + ronin.overlay.key_escape(); + for(var key in ronin.modules){ ronin.modules[key].key_escape(); } diff --git a/scripts/core/ronin.js b/scripts/core/ronin.js index 64d4ced..2110ff5 100644 --- a/scripts/core/ronin.js +++ b/scripts/core/ronin.js @@ -111,6 +111,7 @@ function Ronin() if(rawFile.status === 200 || rawFile.status == 0) { var allText = rawFile.responseText; + ronin.terminal.log(new Log(null,"Loaded file "+name)); ronin.terminal.run_multi(allText.split("\n").join(";")); } } diff --git a/scripts/modules/eye.js b/scripts/modules/eye.js index e2f3c5e..a85802d 100644 --- a/scripts/modules/eye.js +++ b/scripts/modules/eye.js @@ -20,7 +20,7 @@ function Eye(rune) this.mouse_down = function(position) { - ronin.overlay.draw(position); + // ronin.overlay.draw(position); this.color_picker(position); } diff --git a/scripts/modules/frame.js b/scripts/modules/frame.js index 17924e2..fa3bffd 100644 --- a/scripts/modules/frame.js +++ b/scripts/modules/frame.js @@ -146,10 +146,27 @@ function Frame(rune) this.widget = function() { - var count = 0; - for(layer in this.layers){ + var html = "" + + html += this.settings.size.render()+" "; + html += this.active_layer.name+" "; + + var user_layers = 0; + var managed_layers = 0; + + count = 0; + for(id in this.layers){ + if(this.layers[id].manager){ + managed_layers += 1; + } + else{ + user_layers += 1; + } count += 1; } - return this.active_layer.name+(count > 1 ? "("+count+" layers)" : ""); + + html += user_layers+"&"+managed_layers+" "; + + return html } } \ No newline at end of file diff --git a/scripts/modules/source.js b/scripts/modules/source.js index e0bebad..9a58818 100644 --- a/scripts/modules/source.js +++ b/scripts/modules/source.js @@ -93,6 +93,5 @@ function Source(rune) this.coordinates = []; this.last_pos = null; ronin.terminal.input.value = ""; - ronin.overlay.get_layer(true).clear(); } } \ No newline at end of file diff --git a/scripts/modules/terminal.js b/scripts/modules/terminal.js index ffa5699..a9b4e19 100644 --- a/scripts/modules/terminal.js +++ b/scripts/modules/terminal.js @@ -102,13 +102,13 @@ function Terminal(rune) // Log -function Log(host,message,error = false) +function Log(host = null,message,error = false) { this.host = host; this.message = message; this.error = error; this.element = document.createElement("log"); this.element.setAttribute("class",error ? "error" : "okay"); - this.element.innerHTML = ""+host.name+" "+message; - console.log(this.host.constructor.name,this.message); + this.element.innerHTML = ""+(this.host ? this.host.name : "Ronin")+" "+message; + console.log(this.host ? this.host.name : "Ronin",this.message); } \ No newline at end of file