X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=xex.js;h=08930d835b324da7200f4c1eedb3341c83779ac2;hb=257904c72234d9aed6fa84bdf8af9e6ba9f5ee56;hp=ed3996e1724e93d9c73f01fdeeccb8b53f3160cf;hpb=35ed51a848fa23e5e2cf34cee9e3ba8511b53261;p=m17n%2Fm17n-lib-js.git diff --git a/xex.js b/xex.js index ed3996e..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) : false; + 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); } @@ -803,7 +809,7 @@ Xex.StrTerm = function (str) { this.val = str; }; proto.Clone = function () { return new Xex.StrTerm (this.val); } proto.Parser = function (domain, node) { - return new Xex.StrTerm (node.firstChild.nodeValue); + return new Xex.StrTerm (node.firstChild ? node.firstChild.nodeValue : ''); } Xex.StrTerm.prototype = proto; }) (); @@ -871,6 +877,11 @@ Xex.LstTerm = function (list) { this.val = list; }; return args[0]; } + function Fnot (domain, vari, args) + { + return (args[0].IsTrue () ? Xex.Zero : Xex.One); + } + function maybe_set_intvar (vari, n) { var term = new Xex.IntTerm (n); @@ -948,6 +959,39 @@ Xex.LstTerm = function (list) { this.val = list; }; return maybe_set_intvar (vari, n); } + function Flogand (domain, vari, args) + { + var n, i; + if (vari == null) + { + Xex.Log ("logand arg args[0]" + args[0]); + n = args[0].Intval () + i = 1; + } + else + { + Xex.Log ("logand arg var " + vari); + n = vari.val.Intval (); + i = 0; + } + while (n > 0 && i < args.length) + { + Xex.Log ("logand arg " + args[i]); + n &= args[i++].val; + } + return maybe_set_intvar (vari, n); + } + + function Flsh (domain, vari, args) + { + return maybe_set_intvar (vari, args[0].Intval () << args[1].Intval ()); + } + + function Frsh (domain, vari, args) + { + return maybe_set_intvar (vari, args[0].Intval () >> args[1].Intval ()); + } + function Fand (domain, vari, args) { var len = args.length; @@ -984,13 +1028,18 @@ Xex.LstTerm = function (list) { this.val = list; }; return Xex.One; } + function Fnoteq (domain, vari, args) + { + return (Feq (domain, vari, args) == Xex.One ? Xex.Zero : Xex.One); + } + function Flt (domain, vari, args) { - var n = args[0].Intval; + var n = args[0].Intval (); for (var i = 1; i < args.length; i++) { - var n1 = args[i].Intval; + var n1 = args[i].Intval (); if (n >= n1) return Xex.Zero; n = n1; @@ -1000,10 +1049,10 @@ Xex.LstTerm = function (list) { this.val = list; }; function Fle (domain, vari, args) { - var n = args[0].Intval; + var n = args[0].Intval (); for (var i = 1; i < args.length; i++) { - var n1 = args[i].Intval; + var n1 = args[i].Intval (); if (n > n1) return Xex.Zero; n = n1; @@ -1013,10 +1062,10 @@ Xex.LstTerm = function (list) { this.val = list; }; function Fgt (domain, vari, args) { - var n = args[0].Intval; + var n = args[0].Intval (); for (var i = 1; i < args.length; i++) { - var n1 = args[i].Intval; + var n1 = args[i].Intval (); if (n <= n1) return Xex.Zero; n = n1; @@ -1026,10 +1075,10 @@ Xex.LstTerm = function (list) { this.val = list; }; function Fge (domain, vari, args) { - var n = args[0].Intval; + var n = args[0].Intval (); for (var i = 1; i < args.Length; i++) { - var n1 = args[i].Intval; + var n1 = args[i].Intval (); if (n < n1) return Xex.Zero; n = n1; @@ -1158,8 +1207,8 @@ Xex.LstTerm = function (list) { this.val = list; }; basic.DefSubr (Fset, "set", true, 1, 1); basic.DefAlias ("=", "set"); - //basic.DefSubr (Fnot, "not", false, 1, 1); - //basic.DefAlias ("!", "not"); + basic.DefSubr (Fnot, "not", false, 1, 1); + basic.DefAlias ("!", "not"); basic.DefSubr (Fadd, "add", true, 1, -1); basic.DefSubr (Fmul, "mul", true, 1, -1); basic.DefAlias ("*", "mul"); @@ -1171,16 +1220,16 @@ Xex.LstTerm = function (list) { this.val = list; }; basic.DefAlias ("%", "mod"); basic.DefSubr (Flogior, "logior", true, 1, -1); basic.DefAlias ('|', "logior"); - //basic.DefSubr (Flogand, "logand", true, 1, -1); - //basic.DefAlias ("&", "logand"); - //basic.DefSubr (Flsh, "lsh", true, 1, 2); - //basic.DefAlias ("<<", "lsh"); - //basic.DefSubr (Frsh, "rsh", true, 1, 2); - //basic.DefAlias (">>", "rsh"); + basic.DefSubr (Flogand, "logand", true, 1, -1); + basic.DefAlias ("&", "logand"); + basic.DefSubr (Flsh, "lsh", true, 1, 2); + basic.DefAlias ("<<", "lsh"); + basic.DefSubr (Frsh, "rsh", true, 1, 2); + basic.DefAlias (">>", "rsh"); basic.DefSubr (Feq, "eq", false, 2, -1); basic.DefAlias ("==", "eq"); - //basic.DefSubr (Fnoteq, "noteq", false, 2, 2); - //basic.DefAlias ("!=", "noteq"); + basic.DefSubr (Fnoteq, "noteq", false, 2, 2); + basic.DefAlias ("!=", "noteq"); basic.DefSubr (Flt, "lt", false, 2, -1); basic.DefAlias ("<", "lt"); basic.DefSubr (Fle, "le", false, 2, -1); @@ -1305,6 +1354,8 @@ var MIM = { keysyms["del"] = "delete"; function decode_keysym (str) { + if (str.length == 1) + return str; var parts = str.split ("-"); var len = parts.length, i; var has_modifier = len > 1; @@ -1341,8 +1392,9 @@ var MIM = { MIM.Key = function (val) { this.key; - this.has_modifier = false; - if (typeof val == 'string' || val instanceof String) + if (val instanceof Xex.Term) + this.key = val.val; + else if (typeof val == 'string' || val instanceof String) { this.key = decode_keysym (val); if (! this.key) @@ -1360,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) { @@ -1375,12 +1430,14 @@ var MIM = { var len = seq.val.length; for (var i = 0; i < len; i++) { - var v = seq.val[i]; - if (v.type != 'string' && v.type != 'integer' - && v.type != 'symbol') + var v = seq.val[i], key; + if (v.type == 'symbol' || v.type == 'string') + key = new MIM.Key (v); + else if (v.type == 'integer') + key = new MIM.Key (v.val); + else throw new Xex.ErrTerm (MIM.Error.ParseError, "Invalid key: " + v); - var key = new MIM.Key (v.val); this.val.push (key); if (key.has_modifier) this.has_modifier = true; @@ -1526,7 +1583,7 @@ var MIM = { var n = predefined[name]; if (n) return n; - if (name.charAt (1) == '-') + if (name.charAt (1) == '-' || name.charAt (1) == '+') return new MIM.SurroundMarker (name); throw new Xex.ErrTerm (MIM.Error.ParseError, "Invalid marker: " + name); @@ -1689,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++; @@ -1987,7 +2051,7 @@ MIM.im_domain.DefType (MIM.State.prototype); { var ic = domain.context; var gsize = domain.variables['candidates_group_size']; - var candidates = new MIM.Candidates (args, gsize ? gsize.Intval : 0); + var candidates = new MIM.Candidates (args, gsize ? gsize.Intval () : 0); ic.ins (candidates.Current (), candidates); return args[0]; } @@ -1995,7 +2059,7 @@ MIM.im_domain.DefType (MIM.State.prototype); function Fdelete (domain, vari, args) { var ic = domain.context; - var pos = args[0].IsInt ? args[0].Intval : args[0].Position (ic); + var pos = args[0].IsInt ? args[0].Intval () : args[0].Position (ic); return new Xex.IntTerm (ic.del (pos)); } @@ -2015,6 +2079,20 @@ MIM.im_domain.DefType (MIM.State.prototype); return args[0]; } + function Fshow (domain, vari, args) + { + domain.context.candidate_show = true; + domain.context.changed |= MIM.ChangedStatus.CandidateShow; + return Xex.nil; + } + + function Fhide (domain, vari, args) + { + domain.context.candidate_show = false; + domain.context.changed |= MIM.ChangedStatus.CandidateShow; + return Xex.nil; + } + function Fchar_at (domain, vari, args) { return new Xex.IntTerm (args[0].CharAt (domain.context)); @@ -2043,14 +2121,23 @@ MIM.im_domain.DefType (MIM.State.prototype); return args[0]; } + function Fpop (domain, vari, args) + { + var ic = domain.context; + if (ic.key_head < ic.keys.val.length) + ic.keys.val.splice (ic.keys_head, 1); + return Xex.nil; + } + function Fundo (domain, vari, args) { 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; } @@ -2062,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) { @@ -2078,6 +2165,17 @@ MIM.im_domain.DefType (MIM.State.prototype); return args[0]; } + function Fshiftback (domain, vari, args) + { + domain.context.shift (null); + return Xex.nil; + } + + function Fkey_count (domain, vari, args) + { + return new Xex.IntTerm (domain.context.key_head); + } + function Fsurrounding_flag (domain, vari, args) { return new Xex.IntTerm (-1); @@ -2087,19 +2185,19 @@ MIM.im_domain.DefType (MIM.State.prototype); im_domain.DefSubr (Finsert_candidates, "insert-candidates", false, 1, 1); im_domain.DefSubr (Fdelete, "delete", false, 1, 1); im_domain.DefSubr (Fselect, "select", false, 1, 1); - //im_domain.DefSubr (Fshow, "show-candidates", false, 0, 0); - //im_domain.DefSubr (Fhide, "hide-candidates", false, 0, 0); + im_domain.DefSubr (Fshow, "show-candidates", false, 0, 0); + im_domain.DefSubr (Fhide, "hide-candidates", false, 0, 0); im_domain.DefSubr (Fmove, "move", false, 1, 1); im_domain.DefSubr (Fmark, "mark", false, 1, 1); im_domain.DefSubr (Fpushback, "pushback", false, 1, 1); - //im_domain.DefSubr (Fpop, "pop", false, 0, 0); + im_domain.DefSubr (Fpop, "pop", false, 0, 0); im_domain.DefSubr (Fundo, "undo", false, 0, 1); im_domain.DefSubr (Fcommit, "commit", false, 0, 0); im_domain.DefSubr (Funhandle, "unhandle", false, 0, 0); im_domain.DefSubr (Fshift, "shift", false, 1, 1); - //im_domain.DefSubr (Fshiftback, "shiftback", false, 0, 0); + im_domain.DefSubr (Fshiftback, "shiftback", false, 0, 0); im_domain.DefSubr (Fchar_at, "char-at", false, 1, 1); - //im_domain.DefSubr (Fkey_count, "key-count", false, 0, 0); + im_domain.DefSubr (Fkey_count, "key-count", false, 0, 0); im_domain.DefSubr (Fsurrounding_flag, "surrounding-text-flag", false, 0, 0); }) (); @@ -2205,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 { @@ -2220,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) @@ -2349,9 +2460,9 @@ MIM.im_domain.DefType (MIM.State.prototype); ic.candidate_table.clear (); ic.candidates = null; ic.changed |= (MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos - | ChangedStatus.CandidateList - | ChangedStatus.CandidateIndex - | ChangedStatus.CandidateShow); + | MIM.ChangedStatus.CandidateList + | MIM.ChangedStatus.CandidateIndex + | MIM.ChangedStatus.CandidateShow); } function set_cursor (prefix, pos) @@ -2377,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++) @@ -2404,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) @@ -2413,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; @@ -2460,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; @@ -2662,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 () @@ -2677,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; } }, @@ -2695,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; } } @@ -2710,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); }, @@ -2738,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; } @@ -2748,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); } } @@ -2823,22 +2953,64 @@ MIM.im_domain.DefType (MIM.State.prototype); keys[0x90] = "numlock"; keys[0xF0] = "capslock"; + var keyids = {}; + keyids['U+0008'] = 'backspace'; + keyids['U+0009'] = 'tab'; + keyids['U+0018'] = 'cancel'; + keyids['U+001B'] = 'escape'; + keyids['U+0020'] = 'space'; + keyids['U+007F'] = 'delete'; + + var modifiers = {} + modifiers.Shift = 1; + modifiers.Control = 1; + modifiers.Alt = 1; + modifiers.AltGraph = 1; + modifiers.Meta = 1 + MIM.decode_key_event = function (event) { - var key = ((event.type == 'keydown' || event.keyCode) ? event.keyCode + var key = event.keyIdentifier; + + if (key) // keydown event of Chrome + { + if (modifiers[key]) + return false; + var mod = ''; + if (event.ctrlKey) mod += 'C-'; + if (event.metaKey) mod += 'M-'; + if (event.altKey) mod += 'A-'; + var keysym = keyids[key]; + if (keysym) + key = keysym; + else if (key.match(/^U\+([0-9A-Z]+)$/)) + { + if (mod.length == 0) + return false; + key = String.fromCharCode (parseInt (RegExp.$1, 16)); + } + else + key = key.toLowerCase (); + if (event.shiftKey) mod += 'S-'; + return new MIM.Key (mod + key); + } + else + { + key = ((event.type == 'keydown' || event.keyCode) ? event.keyCode : event.charCode ? event.charCode : false); - if (! key) - return false; - if (event.type == 'keydown') - { - key = keys[key]; if (! key) return false; - if (event.shiftKey) key = "S-" + key ; + if (event.type == 'keydown') + { + key = keys[key]; + if (! key) + return false; + if (event.shiftKey) key = "S-" + key ; + } + else + key = String.fromCharCode (key); } - else - key = String.fromCharCode (key); if (event.altKey) key = "A-" + key ; if (event.ctrlKey) key = "C-" + key ; return new MIM.Key (key); @@ -2869,10 +3041,10 @@ MIM.debug_print = function (event, ic) if (! MIM.debug_nodes) { MIM.debug_nodes = new Array (); - MIM.debug_nodes['keydown'] = document.getElementById ('keydown'); - MIM.debug_nodes['keypress'] = document.getElementById ('keypress'); MIM.debug_nodes['status0'] = document.getElementById ('status0'); MIM.debug_nodes['status1'] = document.getElementById ('status1'); + MIM.debug_nodes['keydown'] = document.getElementById ('keydown'); + MIM.debug_nodes['keypress'] = document.getElementById ('keypress'); MIM.debug_nodes['keymap0'] = document.getElementById ('keymap0'); MIM.debug_nodes['keymap1'] = document.getElementById ('keymap1'); MIM.debug_nodes['preedit0'] = document.getElementById ('preedit0'); @@ -2880,11 +3052,11 @@ MIM.debug_print = function (event, ic) } var target = event.target; var code = event.keyCode; - var ch = event.type == 'keydown' ? 0 : event.charCode; + var ch = event.type == 'keypress' ? event.charCode : 0; var key = MIM.decode_key_event (event); var index; - MIM.debug_nodes[event.type].innerHTML = "" + code + "/" + ch + " : " + key; + MIM.debug_nodes[event.type].innerHTML = "" + code + "/" + ch + ":" + key + '/' + event.keyIdentifier; index = (event.type == 'keydown' ? '0' : '1'); if (ic) MIM.debug_nodes['status' + index].innerHTML = ic.im.load_status; @@ -2944,6 +3116,8 @@ MIM.set_caret = function (target, ic) } }; +MIM.ignore_focus = false; + MIM.update = function (target, ic) { var text = target.value; @@ -2956,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) @@ -2975,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) @@ -2985,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 @@ -2995,6 +3192,19 @@ MIM.keydown = function (event) } MIM.debug_print (event, ic); ic.key = MIM.decode_key_event (event); + if (ic.key) + { + Xex.Log ("filtering " + ic.key); + try { + var result = ic.Filter (ic.key); + } catch (e) { + Xex.Log ('Error' + e); + throw (e); + } + MIM.update (target, ic); + if (! ic.key_unhandled) + event.preventDefault (); + } }; MIM.keypress = function (event) @@ -3020,10 +3230,18 @@ MIM.keypress = function (event) } Xex.Log ("filtering " + ic.key); - var result = ic.Filter (ic.key); + try { + var result = ic.Filter (ic.key); + } catch (e) { + Xex.Log ('Error:' + e); + throw (e); + } MIM.update (target, ic); if (! ic.key_unhandled) event.preventDefault (); + } catch (e) { + Xex.Log ("error:" + e); + event.preventDefault (); } finally { MIM.debug_print (event, ic); } @@ -3036,10 +3254,13 @@ MIM.keypress = function (event) cs: { name: 'Czech' }, da: { name: 'Danish' }, el: { name: 'Greek' }, + en: { name: 'English' }, eo: { name: 'Esperanto' }, fr: { name: 'French' }, + grc: { name: 'ClassicGreek' }, hr: { name: 'Croatian' }, hy: { name: 'Armenian' }, + ka: { name: 'Georgian' }, kk: { name: 'Kazakh' }, ru: { name: 'Russian' }, sk: { name: 'Slovak' }, @@ -3076,6 +3297,7 @@ MIM.keypress = function (event) te: { name: 'Telugu' }, ur: { name: 'Urdu' } }, SouthEastAsia: { + cmc: { name: 'Cham' }, km: { name: 'Khmer'}, lo: { name: 'Lao' }, my: { name: 'Burmese' }, @@ -3095,7 +3317,8 @@ MIM.keypress = function (event) eo: { name: 'Esperanto' }, iu: { name: 'Inuktitut' }, nsk: { name: 'Naskapi' }, - oj: { name: 'Ojibwe' } } + oj: { name: 'Ojibwe' }, + t: { name: 'Generic' } } }; function categorize_im () @@ -3115,82 +3338,106 @@ MIM.keypress = function (event) if (list) for (name in MIM.imlist[lang]) list[name] = MIM.imlist[lang][name]; + else + for (name in MIM.imlist[lang]) + Xex.Log ('no category ' + lang + '-' + name); } } var destroy_timer; + var last_target; function destroy () { clearTimeout (destroy_timer); + destroy_timer = null; var target = document.getElementById ('mim-menu'); if (target) - document.getElementsByTagName ('body')[0].removeChild (target); + { + for (; last_target && last_target.menu_level; + last_target = last_target.parentLi) + last_target.style.backgroundColor = 'white'; + var nodes = target.getElementsByTagName ('ul'); + for (var i = 0; i < nodes.length; i++) + nodes[i].style.visibility = 'hidden'; + document.getElementsByTagName ('body')[0].removeChild (target); + } } - function destroy_menu () { destroy_timer = setTimeout (destroy, 1000); } - - var last_target; + function destroy_menu () { + if (! destroy_timer) + destroy_timer = setTimeout (destroy, 1000); + } function show_submenu (event) { if (destroy_timer) - clearTimeout (destroy_timer); + { + clearTimeout (destroy_timer); + destroy_timer = null; + } var target = event.target; - if (target.menu_level) + if (! target.menu_level) + return; + if (last_target && target.parentLi != last_target) { - Xex.Log ("menu show level " + target.menu_level - + ': ' + target.tagName); - if (! last_target || last_target.parentLi == target) - { - Xex.Log ('Sub opened'); - } - else + last_target.style.backgroundColor = 'white'; + if (target.menu_level < last_target.menu_level) { - Xex.Log ('Sibling opened'); + last_target = last_target.parentLi; last_target.style.backgroundColor = 'white'; - var uls = last_target.getElementsByTagName ('ul'); - for (var i = 0; i < uls.length; i++) - uls[i].style.visibility = 'hidden'; } - last_target = target; - target.style.backgroundColor = 'yellow'; + var uls = last_target.getElementsByTagName ('ul'); + for (var i = 0; i < uls.length; i++) + uls[i].style.visibility = 'hidden'; + } + last_target = target; + target.style.backgroundColor = 'yellow'; + if (target.menu_level < 3) + { target.lastChild.style.visibility = 'visible'; target.lastChild.style.left = target.clientWidth + 'px'; - event.preventDefault (); } + event.preventDefault (); } - function hide_submenu (event) + function select_im (event) { var target = event.target; - target.style.backgroundColor = 'white'; - for (var ul = target.firstChild; ul; ul = ul.nextSibling) - if (ul.tagName == 'UL') - ul.style.visibility = 'hidden'; + if (target.im) + { + MIM.current = target.im; + destroy (); + } + event.preventDefault (); } - function select_im (event) + function create_ul (visibility) { - var target = event.target.parentNode; - while (target.tagName != "mim-menu") - target = target.parentNode; - var idx = 0; - var im = false; - for (var lang in MIM.imlist) - for (var name in MIM.imlist[lang]) - if (idx++ == target.selectedIndex) - { - im = MIM.imlist[lang][name]; - break; - } - document.getElementsByTagName ('body')[0].removeChild (target); - target.target.focus (); - if (im && im != MIM.current) - { - MIM.current = im; - Xex.Log ('select IM: ' + im.name); - } + var ul = document.createElement ('ul'); + ul.style.position = 'absolute'; + ul.style.margin = '0px'; + ul.style.padding = '0px'; + ul.style.border = '1px solid gray'; + ul.style.borderBottom = 'none'; + ul.style.top = '-1px'; + ul.style.backgroundColor = 'white'; + ul.style.visibility = visibility; + return ul; + } + + function create_li (level, text) + { + var li = document.createElement ('li'); + li.style.position = 'relative'; + li.style.margin = '0px'; + li.style.padding = '1px'; + li.style.borderBottom = '1px solid gray'; + li.style.top = '0px'; + li.style.listStyle = 'none'; + li.menu_level = level; + li.appendChild (document.createTextNode (text)); + return li; } var menu; @@ -3205,101 +3452,45 @@ MIM.keypress = function (event) if (! menu) { categorize_im (); - menu = document.createElement ('ul'); + menu = create_ul ('visible'); menu.style.fontFamily = 'sans-serif'; menu.style.fontWeight = 'bold'; - menu.style.margin = '0px'; - menu.style.padding = '0px'; - menu.style.border = '1px solid gray'; - menu.style.borderBottom = 'none'; - menu.style.backgroundColor = 'white'; - menu.style.position='absolute'; - menu.style.left = (event.clientX - 10) + "px"; - menu.style.top = (event.clientY - 10) + "px"; - //menu.style.width = '100px'; menu.id = 'mim-menu'; menu.onclick = select_im; + menu.onmouseover = show_submenu; menu.onmouseout = destroy_menu; - menu.target = target; - var idx = 0; for (var catname in lang_category) { var cat = lang_category[catname]; - var li = document.createElement ('li'); - li.menu_level = 1; - li.parentLi = menu; - li.style.position = 'relative'; - li.style.listStyle= 'none'; - li.style.margin = '0'; - li.style.padding = '1px'; - li.style.borderBottom = '1px solid gray'; - li.onmouseover = show_submenu; - //li.onmouseout = hide_submenu; - li.appendChild (document.createTextNode (catname)); - var sub = document.createElement ('ul'); - sub.style.position = 'absolute'; - sub.style.margin = '0px'; - sub.style.padding = '0px'; - sub.style.border = '1px solid gray'; - sub.style.borderBottom = 'none'; - sub.style.top = '-1px'; - //sub.style.width = '100px'; - sub.style.listStyle = 'disc inside'; - sub.style.visibility = 'hidden'; - sub.style.backgroundColor = 'white'; - li.appendChild (sub); + var li = create_li (1, catname); + var sub = create_ul ('hidden'); for (var langname in cat) { var lang = cat[langname]; if (! lang.list) continue; - var sub_li = document.createElement ('li'); - sub_li.menu_level = 2; + var sub_li = create_li (2, lang.name); sub_li.parentLi = li; - sub_li.style.position = 'relative'; - sub_li.style.padding = '1px'; - sub_li.style.borderBottom = '1px solid gray'; - sub_li.style.listStyle= 'none'; - sub_li.style.backgroundColor = 'white'; - //sub_li.onmouseover = show_submenu; - //sub_li.onmouseout = hide_submenu; - sub_li.appendChild (document.createTextNode (lang.name)); - sub.appendChild (sub_li); - var subsub = document.createElement ('ul'); - subsub.style.position = 'absolute'; - subsub.style.margin = '0px'; - subsub.style.padding = '0px'; - subsub.style.border = '1px solid gray'; - subsub.style.borderBottom = 'none'; - subsub.style.top = '-1px'; - //subsub.style.width = '100px'; - //subsub.style.listStyle = 'disc inside'; - subsub.style.visibility = 'hidden'; - subsub.style.backgroundColor = 'white'; + var subsub = create_ul ('hidden'); for (var name in lang.list) { var im = lang.list[name]; - var subsub_li = document.createElement ('li'); - subsub_li.menu_level = 3; + var subsub_li = create_li (3, im.name); subsub_li.parentLi = sub_li; - subsub_li.style.position = 'relative'; - subsub_li.style.padding = '1px'; - subsub_li.style.borderBottom = '1px solid gray'; - subsub_li.style.listStyle= 'none'; - subsub_li.style.backgroundColor = 'white'; - //subsub_li.onmouseover = show_submenu; - //subsub_li.onmouseout = hide_submenu; - subsub_li.appendChild (document.createTextNode (im.name)); subsub_li.im = im; subsub.appendChild (subsub_li); } sub_li.appendChild (subsub); - idx++; + sub.appendChild (sub_li); } + li.appendChild (sub); menu.appendChild (li); } document.mimmenu = menu; + lang_category = null; } + menu.style.left = (event.clientX - 10) + "px"; + menu.style.top = (event.clientY - 10) + "px"; document.getElementsByTagName ('body')[0].appendChild (menu); }; @@ -3310,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']; }; }) ();