X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.js;h=08930d835b324da7200f4c1eedb3341c83779ac2;hb=257904c72234d9aed6fa84bdf8af9e6ba9f5ee56;hp=ffcfc70f584377edce80a224a56535808c1dfb0d;hpb=b80d723bac900d147bed053b5bf432fc70a0991c;p=m17n%2Fm17n-lib-js.git diff --git a/xex.js b/xex.js index ffcfc70..08930d8 100644 --- a/xex.js +++ b/xex.js @@ -14,7 +14,8 @@ var Xex = { if (indent != undefined) for (var i = 0; i <= indent; i++) str += ' '; - Xex.LogNode.value = str + arg + "\n" + Xex.LogNode.value; + Xex.LogNode.value += "\n" + str + arg; + Xex.LogNode.scrollTop = Xex.LogNode.scrollHeight; } } }; @@ -249,7 +250,11 @@ Xex.Domain = function (name, parent, context) for (elt in parent.functions) this.functions[elt] = parent.functions[elt]; for (elt in parent.variables) - this.variables[elt] = parent.variables[elt]; + { + var vari = parent.variables[elt]; + this.variables[elt] = new Xex.Variable (this, vari.name, vari.desc, + vari.val, vari.range); + } } this.call_stack = new Array (); @@ -624,10 +629,9 @@ Xex.Varref = function (vname) proto.Clone = function () { return new Xex.Varref (this.val); } proto.Eval = function (domain) { - if (! this.vari || this.vari.domain != domain) - this.vari = domain.GetVarCreate (this.val); - Xex.Log (this.ToString () + '=>' + this.vari.val, domain.depth); - return this.vari.val; + var vari = domain.GetVarCreate (this.val); + Xex.Log (this.ToString () + '=>' + vari.val, domain.depth); + return vari.val; } proto.Parser = function (domain, node) @@ -645,10 +649,10 @@ Xex.Varref = function (vname) var null_args = new Array (); -Xex.Funcall = function (func, vari, args) +Xex.Funcall = function (func, vname, args) { this.func = func; - this.vari = vari; + this.vname = vname; this.args = args || null_args; }; @@ -663,18 +667,17 @@ Xex.Funcall = function (func, vari, args) if (fname == 'funcall') fname = node.attributes['fname'].nodeValue; var func = domain.GetFunc (fname); - var vari; + var vname; attr = node.attributes['vname']; - vari = attr != undefined ? domain.GetVarCreate (attr.nodeValue) : null; + vname = attr != undefined ? attr.nodeValue : null; var args = Xex.Term.Parse (domain, node.firstElement (), null); - return new Xex.Funcall (func, vari, args); + return new Xex.Funcall (func, vname, args); } proto.New = function (domain, fname, vname, args) { var func = domain.GetFunc (fname); - var vari = vname ? domain.GetVarCreate (vname) : null; - var funcall = new Xex.Funcall (func, vari, args); + var funcall = new Xex.Funcall (func, vname, args); if (func instanceof Xex.Macro) funcall = funcall.Eval (domain); return funcall; @@ -684,10 +687,13 @@ Xex.Funcall = function (func, vari, args) { if (! (this.func instanceof Xex.Subrountine)) Xex.Log (this, domain.depth); + var vari; + if (this.vname) + vari = domain.GetVarCreate (this.vname); domain.depth++; var result; try { - result = this.func.Call (domain, this.vari, this.args); + result = this.func.Call (domain, vari, this.args); } finally { Xex.Log (this + ' => ' + result, --domain.depth); } @@ -1386,7 +1392,6 @@ var MIM = { MIM.Key = function (val) { this.key; - this.has_modifier = false; if (val instanceof Xex.Term) this.key = val.val; else if (typeof val == 'string' || val instanceof String) @@ -1407,13 +1412,16 @@ var MIM = { } MIM.Key.prototype.toString = function () { return this.key; }; + + MIM.Key.FocusIn = new MIM.Key (new Xex.StrTerm ('input-focus-in')); + MIM.Key.FocusOut = new MIM.Key (new Xex.StrTerm ('input-focus-out')); + MIM.Key.FocusMove = new MIM.Key (new Xex.StrTerm ('input-focus-move')); }) (); (function () { MIM.KeySeq = function (seq) { this.val = new Array (); - this.has_modifier = false; if (seq) { @@ -1738,6 +1746,13 @@ MIM.Keymap = function () var sub; if (index < keys.val.length && this.submaps + && ! keys.val[index]) + { + Xex.Log ('invalid key at ' + index); + throw 'invalid key'; + } + + if (index < keys.val.length && this.submaps && (sub = this.submaps[keys.val[index].key])) { index++; @@ -2118,10 +2133,11 @@ MIM.im_domain.DefType (MIM.State.prototype); { var ic = domain.context; var n = args.length == 0 ? -2 : args[0].val; + Xex.Log ('undo with arg ' + args[0]); if (n < 0) - ic.keys.val.splice (ic.keys.length + n, -n); + ic.keys.val.splice (ic.keys.val.length + n, -n); else - ic.keys.val.splice (n, ic.keys.length); + ic.keys.val.splice (n, ic.keys.val.length); ic.reset (); return Xex.nil; } @@ -2133,10 +2149,10 @@ MIM.im_domain.DefType (MIM.State.prototype); } function Funhandle (domain, vari, args) - { - domain.context.commit (); - return Xex.Fthrow (domain, vari, Xex.CatchTag._mimtag); - } + { + domain.context.commit (); + return Xex.Fthrow (domain, vari, Xex.CatchTag._mimtag); + } function Fshift (domain, vari, args) { @@ -2287,8 +2303,8 @@ MIM.im_domain.DefType (MIM.State.prototype); alert ('inclusion fail'); continue; } - for (var mapname in im.map_list) - this.map_list[mapname] = im.map_list[mapname]; + for (var mname in im.map_list) + this.map_list[mname] = im.map_list[mname]; } else { @@ -2302,7 +2318,20 @@ MIM.im_domain.DefType (MIM.State.prototype); this.domain.map_list = this.map_list; for (node = node.firstElement (); node; node = node.nextElement ()) { - if (node.nodeName == 'state') + if (node.nodeName == 'xi:include') + { + var im = include (node); + if (! im) + alert ('inclusion fail'); + for (var sname in im.state_list) + { + state = im.state_list[sname]; + if (! this.initial_state) + this.initial_state = state; + this.state_list[sname] = state; + } + } + else if (node.nodeName == 'state') { var state = Xex.Term.Parse (this.domain, node); if (! state.title) @@ -2459,25 +2488,26 @@ MIM.im_domain.DefType (MIM.State.prototype); function handle_key () { - var out = this.keymap.Lookup (this.keys, this.key_head); + Xex.Log ('Key(' + this.key_head + ') "' + this.keys.val[this.key_head] + + '" in ' + this.state.name + ':' + this.keymap.name + + " key/state/commit-head/len:" + + this.key_head + '/' + this.state_key_head + '/' + this.commit_key_head + '/' + this.keys.val.length); + var out = this.state.keymap.Lookup (this.keys, this.state_key_head); var sub = out.map; - Xex.Log ('handling ' + this.keys.val[this.key_head] - + ' in ' + this.state.name + ':' + this.keymap.name); - this.key_head = out.index; - if (sub != this.keymap) + if (out.index > this.key_head) { - + this.key_head = out.index; + Xex.Log (' with submap for ' + this.key_head + 'keys'); restore_state.call (this); this.keymap = sub; - Xex.Log ('submap found'); - if (this.keymap.map_actions) + if (sub.map_actions) { Xex.Log ('taking map actions:'); - if (! this.take_actions (this.keymap.map_actions)) + if (! this.take_actions (sub.map_actions)) return false; } - else if (this.keymap.submaps) + else if (sub.submaps) { Xex.Log ('no map actions'); for (var i = this.state_key_head; i < this.key_head; i++) @@ -2486,7 +2516,7 @@ MIM.im_domain.DefType (MIM.State.prototype); this.ins (this.keys.val[i].key, null); } } - if (! this.keymap.submaps) + if (! sub.submaps) { Xex.Log ('terminal:'); if (this.keymap.branch_actions != null) @@ -2495,13 +2525,14 @@ MIM.im_domain.DefType (MIM.State.prototype); if (! this.take_actions (this.keymap.branch_actions)) return false; } - if (this.keymap != this.state.keymap) + if (sub != this.state.keymap) this.shift (this.state); } } else { - Xex.Log ('no submap'); + Xex.Log (' without submap'); + this.keymap = sub; var current_state = this.state; var map = this.keymap; @@ -2533,7 +2564,6 @@ MIM.im_domain.DefType (MIM.State.prototype); proto = { reset: function () { - Xex.Log ('reseting ' + this.im.lang); this.cursor_pos = 0; this.candidate_show = false; this.prev_state = null; @@ -2543,7 +2573,7 @@ MIM.im_domain.DefType (MIM.State.prototype); this.state_var_values = {}; this.state_pos = 0; this.key_head = 0; - this.keys.val.length = 0; + this.commit_key_head = 0; this.key_unhandled = false; this.unhandled_key = null; this.changed = MIM.ChangedStatus.None; @@ -2745,6 +2775,7 @@ MIM.im_domain.DefType (MIM.State.prototype); if (this.key_head > this.keys.val.length) this.key_head = this.keys.val.length; } + Xex.Log ('0: key head = ' + this.key_head); }, pop: function () @@ -2760,6 +2791,9 @@ MIM.im_domain.DefType (MIM.State.prototype); this.candidate_table.clear (); this.produced += this.preedit; this.preedit_replace.call (this, 0, this.preedit.length, '', null); + this.preedit_saved = ''; + this.state_pos = 0; + this.commit_key_head = this.key_head; } }, @@ -2778,7 +2812,7 @@ MIM.im_domain.DefType (MIM.State.prototype); { this.commit (); this.keys.val.splice (0, this.key_head); - this.key_head = 0; + this.key_head = this.state_key_head = this.commit_key_head0; this.prev_state = null; } } @@ -2793,7 +2827,6 @@ MIM.im_domain.DefType (MIM.State.prototype); this.changed |= MIM.ChangedStatus.StateTitle; this.state = state; this.keymap = state.keymap; - this.state_key_head = this.key_head; save_state.call (this); }, @@ -2821,6 +2854,10 @@ MIM.im_domain.DefType (MIM.State.prototype); this.unhandled_key = this.keys.val[this.key_head]; this.keys.val.splice (this.key_head, this.key_head + 1); } + if (this.state_key_head > 0) + this.state_key_head--; + if (this.commit_key_head > 0) + this.commit_key_head--; this.key_unhandled = true; break; } @@ -2831,14 +2868,24 @@ MIM.im_domain.DefType (MIM.State.prototype); break; } } + if (this.keymap == this.initial_state.keymap) + this.commit (); + + if (this.commit_key_head > 0) + { + this.keys.val.splice (0, this.commit_key_head); + this.key_head -= this.commit_key_head; + this.state_key_head -= this.commit_key_head; + this.commit_key_head = 0; + } if (this.key_unhandled) { this.keys.val.length = 0; + //this.keys.val.splice (0, this.keys.val.length); this.key_head = this.state_key_head = this.commit_key_head = 0; } return (! this.key_unhandled - && this.produced.length == 0 - && this.preedit.length == 0); + && this.produced.length == 0); } } @@ -3069,6 +3116,8 @@ MIM.set_caret = function (target, ic) } }; +MIM.ignore_focus = false; + MIM.update = function (target, ic) { var text = target.value; @@ -3081,16 +3130,37 @@ MIM.update = function (target, ic) MIM.set_caret (target, ic); }; -MIM.reset_ic = function (event) +MIM.focus_in = function (event) +{ + var target = event.target; + var ic = target.mim_ic; + if (ic.wait_update == true) + { + Xex.Log ("Focus in " + target.tagName + ' IGNORED'); + event.preventDefault (); + return false; + } + Xex.Log ("Focus in " + target.tagName); + ic.Filter (MIM.Key.FocusIn); + MIM.update (target, ic); +} + +MIM.focus_out = function (event) { - if (event.target.mim_ic) + var target = event.target; + var ic = target.mim_ic; + function reset_update () { ic.wait_update = false; }; + if (ic.wait_update == true) { - var target = event.target; - var ic = target.mim_ic; - if (ic.preedit.length > 0) - event.target.setSelectionRange (ic.range[1], ic.range[1]); - ic.reset (); + Xex.Log ("Focus out " + target.tagName + ' IGNORED'); + event.preventDefault (); + return false; } + Xex.Log ("Focus out " + target.tagName); + ic.Filter (MIM.Key.FocusOut); + ic.wait_update = true; + MIM.update (target, ic, true); + setTimeout (reset_update, 1000); }; MIM.keydown = function (event) @@ -3100,6 +3170,7 @@ MIM.keydown = function (event) return; if (! (target.type == "text" || target.type == "textarea")) return; + document.akey = event; var ic = target.mim_ic; if (! ic || ic.im != MIM.current) @@ -3110,7 +3181,8 @@ MIM.keydown = function (event) if (ic.im.load_status != MIM.LoadStatus.Loaded) return; target.mim_ic = ic; - MIM.add_event_listener (target, 'blur', MIM.reset_ic); + MIM.add_event_listener (target, 'focus', MIM.focus_in); + MIM.add_event_listener (target, 'blur', MIM.focus_out); MIM.get_range (target, ic) } else @@ -3126,7 +3198,7 @@ MIM.keydown = function (event) try { var result = ic.Filter (ic.key); } catch (e) { - Xex.Log ('Error;' + e); + Xex.Log ('Error' + e); throw (e); } MIM.update (target, ic); @@ -3161,7 +3233,7 @@ MIM.keypress = function (event) try { var result = ic.Filter (ic.key); } catch (e) { - Xex.Log ('Error;' + e); + Xex.Log ('Error:' + e); throw (e); } MIM.update (target, ic); @@ -3429,7 +3501,7 @@ MIM.keypress = function (event) MIM.add_event_listener (window, 'mousedown', create_menu); if (window.location == 'http://localhost/mim/index.html') MIM.server = 'http://localhost/mim'; - MIM.current = MIM.imlist['vi']['telex']; + MIM.current = MIM.imlist['zh']['tonepy']; }; }) ();