gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 10:17:59 +01:00
Code Issues Projects Releases Wiki Activity

Pass line/column numbers to the editor for rich text editors too.

Browse Source
This commit is contained in:
Kris Maglione
2011-09-26 00:01:08 -04:00
parent 25d7a2fefd
commit 43cd62d40c
5 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
binary/config.mk
View File

@@ -15,7 +15,8 @@ SED := $(shell if [ "xoo" = x$$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]; \
PKGCONFIG ?= pkg-config PKGCONFIG ?= pkg-config
GECKO_SDK_PATH := $(shell $(PKGCONFIG) --libs libxul | $(SED) 's,([^-]|-[^L])*-L([^ ]+)/lib.*,\2,') GECKO_SDK_PATH := $(shell $(PKGCONFIG) --libs libxul | $(SED) 's,([^-]|-[^L])*-L([^ ]+)/lib.*,\2,')
CXX ?= c++ -o CXX ?= c++
CPP = $(CXX) -o
LINK ?= c++ LINK ?= c++
MKDEP ?= $(CXX) -M MKDEP ?= $(CXX) -M

7
binary/install.rdf
View File

@@ -9,6 +9,13 @@
em:description="Binary utilities for dactyl add-ons" em:description="Binary utilities for dactyl add-ons"
em:unpack="true"> em:unpack="true">
<em:targetApplication>
<Description
em:id="toolkit@mozilla.org"
em:minVersion="4.0"
em:maxVersion="9.*"/>
</em:targetApplication>
<em:targetApplication> <em:targetApplication>
<Description <Description
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}" em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"

2
binary/src/Makefile
View File

@@ -75,7 +75,7 @@ $(XPTDIR)%.xpt: %.idl
_CPPFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(DEFINES) _CPPFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(GECKO_DEFINES) $(GECKO_INCLUDES) $(DEFINES)
$(OBJDIR)%.o: %.cpp Makefile $(OBJDIR)%.o: %.cpp Makefile
$(CXX)$@ -c $(_CPPFLAGS) $< $(CPP)$@ -c $(_CPPFLAGS) $<
.depend: $(CPPSRCS) Makefile .depend: $(CPPSRCS) Makefile
$(MKDEP) $(_CPPFLAGS) $(CPPSRCS) | $(SED) 's;^[^ ];$(OBJDIR)&;' >.depend $(MKDEP) $(_CPPFLAGS) $(CPPSRCS) | $(SED) 's;^[^ ];$(OBJDIR)&;' >.depend

7
common/content/dactyl.js
View File

@@ -796,7 +796,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}; };
} }
else if (obj instanceof Option) { else if (obj instanceof Option) {
tag = spec = function (name) <>'{name}'</>; spec = function () template.map(obj.names, tag, " ");
tag = function (name) <>'{name}'</>;
link = function (opt, name) <o>{name}</o>; link = function (opt, name) <o>{name}</o>;
args = { value: "", values: [] }; args = { value: "", values: [] };
} }
@@ -819,9 +820,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
res.* += <> res.* += <>
<item> <item>
<tags>{template.map(obj.names.slice().reverse(), tag, " ")}</tags> <tags>{template.map(obj.names.slice().reverse(), tag, " ")}</tags>
<spec>{(obj instanceof Option) <spec>{let (name = (obj.specs || obj.names)[0])
? template.map(obj.names.slice(), spec, " ")
: let (name = (obj.specs || obj.names)[0])
spec(template.highlightRegexp(tag(name), spec(template.highlightRegexp(tag(name),
/\[(.*?)\]/g, /\[(.*?)\]/g,
function (m, n0) <oa>{n0}</oa>), function (m, n0) <oa>{n0}</oa>),

22
common/content/editor.js
View File

@@ -204,16 +204,32 @@ var Editor = Module("editor", {
if (textBox) { if (textBox) {
var text = textBox.value; var text = textBox.value;
let pre = text.substr(0, textBox.selectionStart); var pre = text.substr(0, textBox.selectionStart);
line = 1 + pre.replace(/[^\n]/g, "").length;
column = 1 + pre.replace(/[^]*\n/, "").length;
} }
else { else {
var editor_ = window.GetCurrentEditor ? GetCurrentEditor() var editor_ = window.GetCurrentEditor ? GetCurrentEditor()
: Editor.getEditor(document.commandDispatcher.focusedWindow); : Editor.getEditor(document.commandDispatcher.focusedWindow);
dactyl.assert(editor_); dactyl.assert(editor_);
text = Array.map(editor_.rootElement.childNodes, function (e) DOM.stringify(e, true)).join(""); text = Array.map(editor_.rootElement.childNodes, function (e) DOM.stringify(e, true)).join("");
util.dump(editor_.selection);
if (!editor_.selection.rangeCount)
var sel = "";
else {
let range = RangeFind.nodeContents(editor_.rootElement);
let end = editor_.selection.getRangeAt(0);
range.setEnd(end.startContainer, end.startOffset);
pre = DOM.stringify(range, true);
if (range.startContainer instanceof Text)
pre = pre.replace(/^(?:<[^>"]+>)+/, "");
if (range.endContainer instanceof Text)
pre = pre.replace(/(?:<\/[^>"]+>)+$/, "");
} }
}
line = 1 + pre.replace(/[^\n]/g, "").length;
column = 1 + pre.replace(/[^]*\n/, "").length;
let origGroup = textBox && textBox.getAttributeNS(NS, "highlight") || ""; let origGroup = textBox && textBox.getAttributeNS(NS, "highlight") || "";
let cleanup = util.yieldable(function cleanup(error) { let cleanup = util.yieldable(function cleanup(error) {