aboutsummaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
authorGravatar Ben Boeckel <MathStuf@gmail.com>2011-03-24 18:53:12 -0400
committerGravatar Ben Boeckel <MathStuf@gmail.com>2011-03-24 18:55:26 -0400
commit7c0d66962b044bf0001005e911aefe78bb10c95f (patch)
tree7f53211c6f98f73a781c379f59e40a79d935986b /examples
parent37fe833febdb26a03816e7a82c5b649fdc0984f3 (diff)
Allow for multiple characters to bound words
Word deletion in URLs is a lot better when characters such as: \ -./&?= are considered to separate words.
Diffstat (limited to 'examples')
-rw-r--r--examples/config/config2
-rw-r--r--examples/data/plugins/keycmd.py14
2 files changed, 11 insertions, 5 deletions
diff --git a/examples/config/config b/examples/config/config
index ab690e0..a1a3494 100644
--- a/examples/config/config
+++ b/examples/config/config
@@ -194,7 +194,7 @@ set ebind = @mode_bind global,-insert
@ebind <Delete> = event KEYCMD_DELETE
@ebind <Tab> = event START_COMPLETION
# Readline-ish bindings.
-@ebind <Ctrl>w = event KEYCMD_STRIP_WORD
+@ebind <Ctrl>w = event KEYCMD_STRIP_WORD \ -./&?=
@ebind <Ctrl>u = event SET_KEYCMD
@ebind <Ctrl>a = event SET_CURSOR_POS 0
@ebind <Ctrl>e = event SET_CURSOR_POS -1
diff --git a/examples/data/plugins/keycmd.py b/examples/data/plugins/keycmd.py
index 928c597..76e2d75 100644
--- a/examples/data/plugins/keycmd.py
+++ b/examples/data/plugins/keycmd.py
@@ -406,16 +406,22 @@ def append_keycmd(uzbl, keycmd):
update_event(uzbl, k, False)
-def keycmd_strip_word(uzbl, sep):
+def keycmd_strip_word(uzbl, seps):
''' Removes the last word from the keycmd, similar to readline ^W '''
- sep = sep or ' '
+ seps = seps or ' '
k = uzbl.keylet
if not k.keycmd:
return
- head, tail = k.keycmd[:k.cursor].rstrip(sep), k.keycmd[k.cursor:]
- rfind = head.rfind(sep)
+ head, tail = k.keycmd[:k.cursor].rstrip(seps), k.keycmd[k.cursor:]
+ rfind = -1
+ for sep in seps:
+ p = head.rfind(sep)
+ if p >= 0 and rfind < p + 1:
+ rfind = p + 1
+ if rfind == len(head) and head[-1] in seps:
+ rfind -= 1
head = head[:rfind] if rfind + 1 else ''
k.keycmd = head + tail
k.cursor = len(head)