This commit is contained in:
Devine Lu Linvega
2017-04-17 16:02:40 -10:00
parent 540452ea39
commit 70910f7cb9
23 changed files with 203 additions and 313 deletions

View File

@@ -10,7 +10,7 @@ ronin.cursor.mode = ronin.brush;
document.addEventListener('mousedown', function(e){ ronin.cursor.mouse_down(ronin.position_in_canvas(e));}, false);
document.addEventListener('mousemove', function(e){ ronin.cursor.mouse_move(ronin.position_in_canvas(e));}, false);
document.addEventListener('mouseup', function(e){ ronin.cursor.mouse_up(ronin.position_in_canvas(e));}, false);
document.addEventListener('contextmenu', function(ev){ ev.preventDefault(); return false;}, false);
// document.addEventListener('contextmenu', function(ev){ ev.preventDefault(); return false;}, false);
window.addEventListener('resize', function(){ ronin.on_resize(); }, true);
// Keyboard
@@ -31,8 +31,4 @@ starting_canvas.height = window.innerHeight - 300;
starting_canvas.width = parseInt(starting_canvas.width/40) * 40;
starting_canvas.height = parseInt(starting_canvas.height/40) * 40;
ronin.terminal.query("terminal.load default.rin");
ronin.terminal.input_element.focus();
ronin.terminal.update_hint();
ronin.widget.update();

View File

@@ -13,7 +13,8 @@ function Keyboard()
}
ronin.cursor.update(event);
ronin.widget.update();
ronin.terminal.update_hint();
ronin.terminal.timer = 0;
ronin.terminal.update_status();
}
this.listen_onkeyup = function(event)
@@ -44,9 +45,8 @@ function Keyboard()
}
// Passive
ronin.terminal.passive(ronin.terminal.input_element.value);
ronin.widget.update();
ronin.terminal.update_hint();
ronin.terminal.update_status();
};
this.key_tab = function()
@@ -55,7 +55,6 @@ function Keyboard()
this.key_enter = function()
{
ronin.terminal.query(ronin.terminal.input_element.value);
}
this.key_space = function()

View File

@@ -43,7 +43,7 @@ function Ronin()
this.modules[key].install();
}
this.terminal.install();
// this.terminal.install();
this.widget.install();
}
@@ -52,11 +52,11 @@ function Ronin()
this.position_in_canvas = function(e)
{
var x = e.clientX;
x -= (window.innerWidth - this.frame.settings["size"].width)/2;
x -= parseInt(this.frame.element.style.marginLeft) + (this.frame.settings["size"].width/2);
x -= (window.innerWidth - this.frame.settings["size"].width) * 0.4 - 25;
x -= parseInt(0) + (this.frame.settings["size"].width/2);
var y = e.clientY;
y -= (window.innerHeight - this.frame.settings["size"].height)/2;
y -= parseInt(this.frame.element.style.marginTop) + parseInt(this.frame.settings["size"].height/2);
// y -= (window.innerHeight - this.frame.settings["size"].height)/2;
y -= parseInt(-100) + parseInt(this.frame.settings["size"].height/2);
return new Position(x,y);
}

View File

@@ -1,28 +0,0 @@
function Widget()
{
this.element = null;
this.update = function()
{
var s = "";
s += "<div class='module'>";
for (var key in ronin.modules){
s += ronin.modules[key].widget() ? ronin.modules[key].widget()+"<br />" : "";
}
s += "</div>";
s += "<div class='cursor'>"+ronin.cursor.mode.widget_cursor()+"</div>";
this.element.innerHTML = s;
}
this.on_resize = function()
{
this.element.style.left = (window.innerWidth/2)-(ronin.frame.settings["size"].width/2);
this.element.style.top = (window.innerHeight/2)+(ronin.frame.settings["size"].height/2)+20;
this.element.style.width = ronin.frame.settings["size"].width+"px";
this.update();
}
}