else
{
var str = '';
- if (indent != undefined)
- for (var i = 0; i <= indent; i++)
- str += ' ';
if (! cont)
- Xex.LogNode.value += "\n";
+ {
+ Xex.LogNode.value += "\n";
+ if (indent != undefined)
+ for (var i = 0; i <= indent; i++)
+ str += ' ';
+ }
Xex.LogNode.value += str + arg;
Xex.LogNode.scrollTop = Xex.LogNode.scrollHeight;
}
if (! name)
throw new Xex.ErrTerm (Xex.Error.NoVariableName, node, '');
var vari = domain.variables[name];
- var desc, val, range;
+ var desc, val = null, range;
if (vari)
{
desc = vari.description;
range.push (pval);
}
}
- if (! val)
+ if (val == null)
val = Xex.Zero;
domain.Defvar (name, desc, val, range);
return name;
proto.Eval = function (domain)
{
- if (! (this.func instanceof Xex.Subrountine))
- Xex.Log (this, domain.depth);
+ Xex.Log (this, domain.depth);
var vari;
if (this.vname)
vari = domain.GetVarCreate (this.vname);
try {
result = this.func.Call (domain, vari, this.args);
} finally {
- Xex.Log (this + ' => ' + result, --domain.depth);
+ Xex.Log (' => ' + result, --domain.depth,
+ this.func instanceof Xex.Subrountine);
}
return result;
}
MIM.Rule = function (keyseq, actions)
{
this.keyseq = keyseq;
- this.actions = actions;
+ if (actions)
+ this.actions = actions;
}
MIM.Rule.prototype = new Xex.Term ('rule');
MIM.Rule.prototype.Parser = function (domain, node)
var keyseq = Xex.Term.Parse (domain, n);
if (keyseq.type != 'keyseq')
throw new Xex.ErrTerm (MIM.Error.ParseError, "invalid rule:" + node);
- var actions = Xex.Term.Parse (domain, n.nextElement (), null);
+ var actions = null;
+ n = n.nextElement ();
+ if (n)
+ actions = Xex.Term.Parse (domain, n, null);
return new MIM.Rule (keyseq, actions);
}
MIM.Rule.prototype.toString = function ()
keymap.name = name;
}
keymap.map_actions = rule.actions;
- keymap.branch_actions = branch_actions;
+ if (branch_actions)
+ keymap.branch_actions = branch_actions;
}
proto.Add = function (map, branch_actions)
else
{
var n = node.firstElement ();
+ var branch_actions = n ? Xex.Term.Parse (domain, n, null) : null;
if (node.nodeName == 'branch')
state.keymap.Add (map_list[node.attributes['mname'].nodeValue],
- Xex.Term.Parse (domain, n, null));
+ branch_actions);
else if (node.nodeName == 'state-hook')
- state.enter_actions = Xex.Term.Parse (domain, n, null);
+ state.enter_actions = branch_actions;
else if (node.nodeName == 'catch-all-branch')
- state.fallback_actions = Xex.Term.Parse (domain, n, null);
+ state.fallback_actions = branch_actions;
}
}
return state;
return (this.Data instanceof Array ? this.Data[i] : this.Data.charAt (i));
}
- MIM.Candidates = function (candidates, column)
+ MIM.Candidates = function (ic, candidates, column)
{
+ this.ic = ic;
this.column = column;
this.row = 0;
this.index = 0;
this.index = col;
this.row = 0;
}
- while (this.blocks[this.row].Index > this.index)
+ while (this.blocks[this.row].Index + this.blocks[this.row].Count ()
+ <= this.index)
this.row++;
}
else
MIM.Candidates.prototype.Select = function (selector)
{
+ var idx = this.index;
+ var gidx = this.column > 0 ? idx / this.column : this.row;
if (selector.type == 'selector')
{
switch (selector.val)
case '@-': prev.call (this); break;
case '@+': next.call (this); break;
case '@[': prev_group.call (this); break;
- case '@]': next_group.cal (this); break;
+ case '@]': next_group.call (this); break;
default: break;
}
- return this.Current ();
- }
- var col, start, end
- if (this.column > 0)
- {
- col = this.index % this.column;
- start = this.index - col;
- end = start + this.column;
}
else
{
- start = this.blocks[this.row].Index;
- col = this.index - start;
- end = start + this.blocks[this.row].Count;
- }
- if (end > this.total)
- end = this.total;
- this.index += selector.val - col;
- if (this.index >= end)
- this.index = end - 1;
- if (this.column > 0)
- {
- if (selector.val > col)
- while (this.blocks[this.row].Index + this.blocks[this.row].Count
- < this.index)
- this.row++;
+ var col, start, end
+ if (this.column > 0)
+ {
+ col = this.index % this.column;
+ start = this.index - col;
+ end = start + this.column;
+ }
else
- while (this.blocks[this.row].Index > this.index)
- this.row--;
+ {
+ start = this.blocks[this.row].Index;
+ col = this.index - start;
+ end = start + this.blocks[this.row].Count;
+ }
+ if (end > this.total)
+ end = this.total;
+ this.index += selector.val - col;
+ if (this.index >= end)
+ this.index = end - 1;
+ if (this.column > 0)
+ {
+ if (selector.val > col)
+ while (this.blocks[this.row].Index + this.blocks[this.row].Count
+ < this.index)
+ this.row++;
+ else
+ while (this.blocks[this.row].Index > this.index)
+ this.row--;
+ }
}
+ var newgidx = this.column > 0 ? this.index / this.column : this.row;
+ if (this.index != idx)
+ this.ic.changed |= (gidx == newgidx
+ ? MIM.ChangedStatus.CandidateIndex
+ : MIM.ChangedStatus.CandidateList);
return this.Current ();
}
- MIM.Candidates.prototype.CurrentGroup = function (selector)
+ MIM.Candidates.prototype.CurrentCol = function ()
{
- var col, start, end
+ return get_col.call (this);
+ }
+
+ MIM.Candidates.prototype.CurrentGroup = function ()
+ {
+ var col, start, end, gnum, gidx;
if (this.column > 0)
{
+ gnum = Math.floor ((this.total - 1) / this.column) + 1;
col = this.index % this.column;
start = this.index - col;
+ gidx = start / this.column + 1;
end = start + this.column;
if (end > this.total)
end = this.total;
}
else
{
+ gnum = this.blocks.length;
+ gidx = this.row + 1;
start = this.blocks[this.row].Index;
col = this.index - start;
end = start + this.blocks[this.row].Count ();
}
var group = new Array ();
- group.push (col);
+ var indices = new Array (gnum, gidx, col);
+ group.push (indices);
var row = this.row;
var block = this.blocks[row++];
while (start < end)
function Finsert_candidates (domain, vari, args)
{
var ic = domain.context;
- var gsize = domain.variables['candidates_group_size'];
- var candidates = new MIM.Candidates (args, gsize ? gsize.Intval () : 0);
+ var gsize = domain.variables['candidates-group-size'];
+ var candidates = new MIM.Candidates (ic, args,
+ gsize ? gsize.val.Intval () : 0);
ic.ins (candidates.Current (), candidates);
return args[0];
}
{
var vari = get_global_var (vname);
if (vari != null)
- this.domain.Defvar (vname);
+ this.domain.Defvar (vname, vari.desc, vari.val, vari.range);
}
vname = Xex.Term.Parse (this.domain, node)
}
this.table.length = 0;
}
- function detach_candidates (ic)
- {
- ic.candidate_table.clear ();
- ic.candidates = null;
- ic.changed |= (MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos
- | MIM.ChangedStatus.CandidateList
- | MIM.ChangedStatus.CandidateIndex
- | MIM.ChangedStatus.CandidateShow);
- }
-
function set_cursor (prefix, pos)
{
this.cursor_pos = pos;
- this.candidates = this.candidate_table.get (pos);
+ var candidates = this.candidate_table.get (pos);
+ if (this.candidates != candidates)
+ {
+ this.candidates = candidates;
+ this.changed |= MIM.ChangedStatus.CandidateList;
+ }
}
function save_state ()
if (out.index > this.key_head)
{
this.key_head = out.index;
- Xex.Log (' with submap for ' + this.key_head + 'keys', false, true);
+ Xex.Log (' with submap', false, true);
restore_state.call (this);
this.keymap = sub;
if (sub.map_actions)
if (! sub.submaps)
{
Xex.Log ('terminal:');
- if (this.keymap.branch_actions != null)
+ if (this.keymap.branch_actions)
{
Xex.Log ('branch actions:');
if (! this.take_actions (this.keymap.branch_actions))
if (map.branch_actions)
{
- Xex.Log ('branch actions');
+ Xex.Log ('branch actions:');
if (! this.take_actions (map.branch_actions))
return false;
}
take_actions: function (actions)
{
+ if (actions.length == 0)
+ return true;;
var func_progn = this.domain.GetFunc ('progn');
var func_catch = this.domain.GetFunc ('catch');
this.catch_args[1] = new Xex.Funcall (func_progn, null, actions);
this.marker_positions[name] = from;
}
}
- if (this.cursor_pos >= to)
- set_cursor.call (this, 'adjust', this.cursor_pos + diff);
- else if (this.cursor_pos > from)
- set_cursor.call (this, 'adjust', from)
},
preedit_replace: function (from, to, text, candidates)
{
+ var newlen = text.length;
this.preedit = (this.preedit.substring (0, from)
+ text + this.preedit.substring (to));
- this.adjust_markers (from, to, text.length);
- this.candidate_table.adjust (from, to, text.length);
+ this.changed |= MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos;
+ this.adjust_markers (from, to, newlen);
+ this.candidate_table.adjust (from, to, newlen);
if (candidates)
- this.candidate_table.put (from, from + text.length, candidates)
+ this.candidate_table.put (from, from + newlen, candidates)
+ if (this.cursor_pos >= to)
+ set_cursor.call (this, 'adjust', this.cursor_pos + text.length - (to - from));
+ else if (this.cursor_pos > from)
+ set_cursor.call (this, 'adjust', from)
},
ins: function (text, candidates)
{
this.preedit_replace (this.cursor_pos, this.cursor_pos, text, candidates);
- this.changed = MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos;
- this.candidates = candidates;
},
rep: function (old_text, new_text, candidates)
{
this.preedit_replace (this.cursor_pos - old_text.length,
this.cursor_pos, new_text, candidates);
- this.changed = MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos;
},
del: function (pos)
if (pos > this.cursor_pos)
this.preedit_replace (this.cursor_pos, pos, '', null);
}
- if (deleted != 0)
- this.changed = MIM.ChangedStatus.Preedit | MIM.ChangedStatus.CursorPos;
return deleted;
},
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 ()
//this.keys.val.splice (0, this.keys.val.length);
this.key_head = this.state_key_head = this.commit_key_head = 0;
}
- MIM.show (this);
- if (false && (this.changed & MIM.ChangedStatus.Candidate))
+ if (this.changed & MIM.ChangedStatus.Candidate)
{
- if (this.candidate_show)
+ if (this.candidate_show && this.candidates)
MIM.show (this);
else
MIM.hide (this);
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';
+ 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;
return false;
key = String.fromCharCode (parseInt (RegExp.$1, 16));
}
- else
- key = key.toLowerCase ();
+ //else
+ //key = key.toLowerCase ();
if (event.shiftKey) mod += 'S-';
return new MIM.Key (mod + key);
}
MIM.show = function (ic)
{
- Xex.Log ('show:' + ic.candidates);
if (! ic.candidates)
return;
var target = ic.target;
document.getElementsByTagName ('body')[0].appendChild (ic.can_node);
}
- ic.can_node.innerHTML = '';
- var tr = document.createElement ('tr');
- ic.can_node.appendChild (tr);
- var group = ic.candidates.CurrentGroup ();
- for (var i = 1; i < group.length; i++)
+ if (ic.changed & MIM.ChangedStatus.CandidateList)
{
+ while (ic.can_node.childNodes.length > 0)
+ ic.can_node.removeChild (ic.can_node.firstChild);
+ var tr = document.createElement ('tr');
+ var group = ic.candidates.CurrentGroup ();
var td = document.createElement ('td');
- td.nowrap = true;
- td.innerHTML = i + '.' + group[i];
- if (i == group[0] + 1)
- td.style.backgroundColor = 'lightblue';
- ic.can_node.appendChild (td);
- }
- ic.div_node_first.innerHTML = target.value.substr (0, ic.range[0]);
- var x = ic.target_left + ic.div_node.lastChild.offsetLeft;
- var y = (ic.target_top + ic.div_node.lastChild.offsetTop
- + ic.div_node.lastChild.offsetHeight - target.scrollTop + 10);
- ic.can_node.style.left = x + 'px';
- ic.can_node.style.top = y + 'px';
+ td.innerHTML = group[0][1] + '/' + group[0][0];
+ td.style.color = 'white';
+ td.style.backgroundColor = 'black';
+ tr.appendChild (td);
+ for (var i = 1; i < group.length; i++)
+ {
+ var td = document.createElement ('td');
+ td.noWrap = true;
+ td.innerHTML = (i < 10 ? i : i == 10 ? '0' : String.fromCharCode (0x60 + (i - 10))) + '.' + group[i];
+ if (i == group[0][2] + 1)
+ td.style.backgroundColor = 'lightblue';
+ tr.appendChild (td);
+ }
+ ic.can_node.appendChild (tr);
+ ic.div_node_first.innerHTML = target.value.substr (0, ic.range[0]);
+ var x = ic.target_left + ic.div_node.lastChild.offsetLeft;
+ var y = (ic.target_top + ic.div_node.lastChild.offsetTop
+ + ic.div_node.lastChild.offsetHeight - target.scrollTop + 10);
+ ic.can_node.style.left = x + 'px';
+ ic.can_node.style.top = y + 'px';
+ }
+ else
+ {
+ var td = ic.can_node.firstElement ().firstElement ().nextElement ();
+ var col = ic.candidates.CurrentCol ();
+ for (var i = 0; td; td = td.nextElement ())
+ td.style.backgroundColor = (i++ == col ? 'lightblue' : 'white');
+ }
ic.can_node.style.display = 'block';
}
+
+ MIM.hide = function (ic)
+ {
+ if (ic.can_node)
+ ic.can_node.style.display = 'none';
+ }
}) ();
MIM.focus_in = function (event)
if (! MIM.get_range (target, ic))
ic.reset ();
}
- //MIM.show (target, ic);
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) {
return;
}
- Xex.Log ("filtering " + ic.key);
try {
var result = ic.Filter (ic.key);
} catch (e) {
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['zh']['tonepy'];
+ MIM.current = MIM.imlist['zh']['py-gb'];
};
}) ();
projects / m17n / m17n-lib-js.git / commitdiff