From c8d71fa5538003a48d367fea5a1d8b463b98ede3 Mon Sep 17 00:00:00 2001 From: keis Date: Mon, 19 Oct 2009 02:13:15 +0200 Subject: Add simple commandline history plugin to EM. --- examples/data/uzbl/plugins/history.py | 124 ++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 examples/data/uzbl/plugins/history.py (limited to 'examples') diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py new file mode 100644 index 0000000..5ea2794 --- /dev/null +++ b/examples/data/uzbl/plugins/history.py @@ -0,0 +1,124 @@ +__export__ = ['get_history'] +UZBLS = {} + +import random + +class History(object): + def __init__(self): + self._commands = [] + self.cursor = None + self.__temp_tail = False + self.search_key = None + + def prev(self): + if self.cursor is None: + self.cursor = len(self._commands) - 1 + else: + self.cursor -= 1 + + if self.search_key: + while self.cursor >= 0 and self.search_key not in self._commands[self.cursor]: + self.cursor -= 1 + + if self.cursor < 0 or len(self._commands) == 0: + self.cursor = -1 + return random.choice(end_messages) + + return self._commands[self.cursor] + + def next(self): + if self.cursor is None: + return '' + + self.cursor += 1 + + if self.search_key: + while self.cursor < len(self._commands) and self.search_key not in self._commands[self.cursor]: + self.cursor += 1 + + if self.cursor >= len(self._commands) - (1 if self.__temp_tail else 0): + self.cursor = None + self.search_key = None + + if self.__temp_tail: + print 'popping temporary' + self.__temp_tail = False + return self._commands.pop() + return '' + + return self._commands[self.cursor] + + def search(self, key): + self.search_key = key + return self.prev() + + def add(self, cmd): + if self.__temp_tail: + self._commands.pop() + self.__temp_tail = False + + self._commands.append(cmd) + self.cursor = None + self.search_key = None + + def add_temporary(self, cmd): + assert not self.__temp_tail + + self._commands.append(cmd) + self.__temp_tail = True + self.cursor = len(self._commands) - 1 + + print 'adding temporary', self + + def __str__(self): + return "(History %s, %s)" % (self.cursor, str(self._commands)) + +def get_history(uzbl): + return UZBLS[uzbl] + +def add_instance(uzbl, *args): + UZBLS[uzbl] = History() + +def del_instance(uzbl, *args): + if uzbl in UZBLS: + del UZBLS[uzbl] + +def keycmd_exec(uzbl, keylet): + history = get_history(uzbl) + cmd = keylet.key_cmd() + if cmd: + history.add(cmd) + +def history_prev(uzbl, _x): + history = get_history(uzbl) + cmd = uzbl.get_keylet().key_cmd() + if history.cursor is None and cmd: + history.add_temporary(cmd) + + uzbl.set_keycmd(history.prev()) + print 'PREV', history + +def history_next(uzbl, _x): + history = get_history(uzbl) + cmd = uzbl.get_keylet().key_cmd() + + uzbl.set_keycmd(history.next()) + print 'NEXT', history + +def history_search(uzbl, key): + history = get_history(uzbl) + uzbl.set_keycmd(history.search(key)) + print 'SEARCH', history + +end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') + +def init(uzbl): + connects = {'INSTANCE_START': add_instance, + 'INSTANCE_EXIT': del_instance, + 'KEYCMD_EXEC': keycmd_exec, + 'HISTORY_PREV': history_prev, + 'HISTORY_NEXT': history_next, + 'HISTORY_SEARCH': history_search + } + + uzbl.connect_dict(connects) -- cgit v1.2.3 From 830e075e51528c03db3fb9e0206c2934fe012c8e Mon Sep 17 00:00:00 2001 From: David Keijser Date: Sun, 25 Oct 2009 17:47:28 +0100 Subject: update history plugin to work with latest EM. --- examples/data/uzbl/plugins/history.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py index 5ea2794..595600e 100644 --- a/examples/data/uzbl/plugins/history.py +++ b/examples/data/uzbl/plugins/history.py @@ -85,13 +85,13 @@ def del_instance(uzbl, *args): def keycmd_exec(uzbl, keylet): history = get_history(uzbl) - cmd = keylet.key_cmd() + cmd = keylet.get_keycmd() if cmd: history.add(cmd) def history_prev(uzbl, _x): history = get_history(uzbl) - cmd = uzbl.get_keylet().key_cmd() + cmd = uzbl.get_keylet().get_keycmd() if history.cursor is None and cmd: history.add_temporary(cmd) @@ -100,7 +100,7 @@ def history_prev(uzbl, _x): def history_next(uzbl, _x): history = get_history(uzbl) - cmd = uzbl.get_keylet().key_cmd() + cmd = uzbl.get_keylet().get_keycmd() uzbl.set_keycmd(history.next()) print 'NEXT', history -- cgit v1.2.3 From 4f70b20a578d2618ca066f200f5b97d9a3f61220 Mon Sep 17 00:00:00 2001 From: keis Date: Thu, 5 Nov 2009 20:11:10 +0100 Subject: share history among instances. --- examples/data/uzbl/plugins/history.py | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py index 595600e..7855014 100644 --- a/examples/data/uzbl/plugins/history.py +++ b/examples/data/uzbl/plugins/history.py @@ -3,50 +3,54 @@ UZBLS = {} import random +shared_history = [] + class History(object): def __init__(self): - self._commands = [] + self._temporary = [] self.cursor = None self.__temp_tail = False self.search_key = None def prev(self): + commands = shared_history + self._temporary if self.cursor is None: - self.cursor = len(self._commands) - 1 + self.cursor = len(commands) - 1 else: self.cursor -= 1 if self.search_key: - while self.cursor >= 0 and self.search_key not in self._commands[self.cursor]: + while self.cursor >= 0 and self.search_key not in commands[self.cursor]: self.cursor -= 1 - if self.cursor < 0 or len(self._commands) == 0: + if self.cursor < 0 or len(commands) == 0: self.cursor = -1 return random.choice(end_messages) - return self._commands[self.cursor] + return commands[self.cursor] def next(self): + commands = shared_history + self._temporary if self.cursor is None: return '' self.cursor += 1 if self.search_key: - while self.cursor < len(self._commands) and self.search_key not in self._commands[self.cursor]: + while self.cursor < len(commands) and self.search_key not in commands[self.cursor]: self.cursor += 1 - if self.cursor >= len(self._commands) - (1 if self.__temp_tail else 0): + if self.cursor >= len(commands) - (1 if self.__temp_tail else 0): self.cursor = None self.search_key = None if self.__temp_tail: print 'popping temporary' self.__temp_tail = False - return self._commands.pop() + return self._temporary.pop() return '' - return self._commands[self.cursor] + return commands[self.cursor] def search(self, key): self.search_key = key @@ -54,24 +58,24 @@ class History(object): def add(self, cmd): if self.__temp_tail: - self._commands.pop() + self._temporary.pop() self.__temp_tail = False - self._commands.append(cmd) + shared_history.append(cmd) self.cursor = None self.search_key = None def add_temporary(self, cmd): assert not self.__temp_tail - self._commands.append(cmd) + self._temporary.append(cmd) self.__temp_tail = True - self.cursor = len(self._commands) - 1 + self.cursor = len(self._temporary) + len(shared_history) - 1 print 'adding temporary', self def __str__(self): - return "(History %s, %s)" % (self.cursor, str(self._commands)) + return "(History %s)" % (self.cursor) def get_history(uzbl): return UZBLS[uzbl] -- cgit v1.2.3 From 039caee15ad50e042d680a975ce6b066b3bdd19a Mon Sep 17 00:00:00 2001 From: keis Date: Thu, 5 Nov 2009 20:20:20 +0100 Subject: refactor history plugin. --- examples/data/uzbl/plugins/history.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py index 7855014..f514f36 100644 --- a/examples/data/uzbl/plugins/history.py +++ b/examples/data/uzbl/plugins/history.py @@ -13,67 +13,70 @@ class History(object): self.search_key = None def prev(self): - commands = shared_history + self._temporary if self.cursor is None: - self.cursor = len(commands) - 1 + self.cursor = len(self) - 1 else: self.cursor -= 1 if self.search_key: - while self.cursor >= 0 and self.search_key not in commands[self.cursor]: + while self.cursor >= 0 and self.search_key not in self[self.cursor]: self.cursor -= 1 - if self.cursor < 0 or len(commands) == 0: + if self.cursor < 0 or len(self) == 0: self.cursor = -1 return random.choice(end_messages) - return commands[self.cursor] + return self[self.cursor] def next(self): - commands = shared_history + self._temporary if self.cursor is None: return '' self.cursor += 1 if self.search_key: - while self.cursor < len(commands) and self.search_key not in commands[self.cursor]: + while self.cursor < len(self) and self.search_key not in self[self.cursor]: self.cursor += 1 - if self.cursor >= len(commands) - (1 if self.__temp_tail else 0): + if self.cursor >= len(shared_history): self.cursor = None self.search_key = None - if self.__temp_tail: + if self._temporary: print 'popping temporary' - self.__temp_tail = False return self._temporary.pop() return '' - return commands[self.cursor] + return self[self.cursor] def search(self, key): self.search_key = key return self.prev() def add(self, cmd): - if self.__temp_tail: + if self._temporary: self._temporary.pop() - self.__temp_tail = False shared_history.append(cmd) self.cursor = None self.search_key = None def add_temporary(self, cmd): - assert not self.__temp_tail + assert not self._temporary self._temporary.append(cmd) - self.__temp_tail = True - self.cursor = len(self._temporary) + len(shared_history) - 1 + self.cursor = len(self) - 1 print 'adding temporary', self + def __getitem__(self, i): + if i < len(shared_history): + return shared_history[i] + return self._temporary[i-len(shared_history)+1] + + def __len__(self): + return len(shared_history) + len(self._temporary) + def __str__(self): return "(History %s)" % (self.cursor) -- cgit v1.2.3 From b5042ed71d57e006bad8ac2b6fd02a5c0ece70be Mon Sep 17 00:00:00 2001 From: keis Date: Thu, 5 Nov 2009 20:21:32 +0100 Subject: add example history bindings. --- examples/config/uzbl/config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples') diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 8a2ad87..00c6c14 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -213,6 +213,8 @@ set formfiller = spawn @scripts_dir/formfiller @bind du = event APPEND_KEYCMD \@uri @bind dt = event APPEND_KEYCMD \@TITLE +@bind = request HISTORY_PREV +@bind = request HISTORY_NEXT # === command editing configuration ========================================== -- cgit v1.2.3 From 4e16343b4b30c1ff24c46e75945f092732413deb Mon Sep 17 00:00:00 2001 From: keis Date: Tue, 8 Dec 2009 17:37:23 +0100 Subject: maintain separate histories for each prompt --- examples/data/uzbl/plugins/history.py | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py index f514f36..4467e5d 100644 --- a/examples/data/uzbl/plugins/history.py +++ b/examples/data/uzbl/plugins/history.py @@ -3,11 +3,12 @@ UZBLS = {} import random -shared_history = [] +shared_history = {'':[]} class History(object): def __init__(self): self._temporary = [] + self.prompt = '' self.cursor = None self.__temp_tail = False self.search_key = None @@ -38,7 +39,7 @@ class History(object): while self.cursor < len(self) and self.search_key not in self[self.cursor]: self.cursor += 1 - if self.cursor >= len(shared_history): + if self.cursor >= len(shared_history[self.prompt]): self.cursor = None self.search_key = None @@ -49,6 +50,13 @@ class History(object): return self[self.cursor] + def change_prompt(self, prompt): + self.prompt = prompt + self._temporary = [] + self.__temp_tail = False + if prompt not in shared_history: + shared_history[prompt] = [] + def search(self, key): self.search_key = key return self.prev() @@ -57,7 +65,7 @@ class History(object): if self._temporary: self._temporary.pop() - shared_history.append(cmd) + shared_history[self.prompt].append(cmd) self.cursor = None self.search_key = None @@ -70,17 +78,20 @@ class History(object): print 'adding temporary', self def __getitem__(self, i): - if i < len(shared_history): - return shared_history[i] + if i < len(shared_history[self.prompt]): + return shared_history[self.prompt][i] return self._temporary[i-len(shared_history)+1] def __len__(self): - return len(shared_history) + len(self._temporary) + return len(shared_history[self.prompt]) + len(self._temporary) def __str__(self): return "(History %s)" % (self.cursor) def get_history(uzbl): + if uzbl not in UZBLS: + add_instance(uzbl) + return UZBLS[uzbl] def add_instance(uzbl, *args): @@ -96,6 +107,11 @@ def keycmd_exec(uzbl, keylet): if cmd: history.add(cmd) +def config_changed(uzbl, key, value): + if key == 'keycmd_prompt': + history = get_history(uzbl) + history.change_prompt(value) + def history_prev(uzbl, _x): history = get_history(uzbl) cmd = uzbl.get_keylet().get_keycmd() @@ -123,6 +139,7 @@ def init(uzbl): connects = {'INSTANCE_START': add_instance, 'INSTANCE_EXIT': del_instance, 'KEYCMD_EXEC': keycmd_exec, + 'CONFIG_CHANGED': config_changed, 'HISTORY_PREV': history_prev, 'HISTORY_NEXT': history_next, 'HISTORY_SEARCH': history_search -- cgit v1.2.3 From 5930439a3003f1d77d71bca440bbe918e7c657d9 Mon Sep 17 00:00:00 2001 From: keis Date: Tue, 8 Dec 2009 18:47:42 +0100 Subject: use event instead of request for history prev/next --- examples/config/uzbl/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 1ef1758..e9f7f8d 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -248,8 +248,8 @@ set formfiller = spawn @scripts_dir/formfiller @bind du = event APPEND_KEYCMD \@uri @bind dt = event APPEND_KEYCMD \@TITLE -@bind = request HISTORY_PREV -@bind = request HISTORY_NEXT +@bind = event HISTORY_PREV +@bind = event HISTORY_NEXT # === command editing configuration ========================================== -- cgit v1.2.3 From c37f739ce5b51091732cec0452e8035fc187c096 Mon Sep 17 00:00:00 2001 From: keis Date: Sun, 4 Apr 2010 22:27:11 +0200 Subject: move history plugin --- examples/data/plugins/history.py | 148 ++++++++++++++++++++++++++++++++++ examples/data/uzbl/plugins/history.py | 148 ---------------------------------- 2 files changed, 148 insertions(+), 148 deletions(-) create mode 100644 examples/data/plugins/history.py delete mode 100644 examples/data/uzbl/plugins/history.py (limited to 'examples') diff --git a/examples/data/plugins/history.py b/examples/data/plugins/history.py new file mode 100644 index 0000000..4467e5d --- /dev/null +++ b/examples/data/plugins/history.py @@ -0,0 +1,148 @@ +__export__ = ['get_history'] +UZBLS = {} + +import random + +shared_history = {'':[]} + +class History(object): + def __init__(self): + self._temporary = [] + self.prompt = '' + self.cursor = None + self.__temp_tail = False + self.search_key = None + + def prev(self): + if self.cursor is None: + self.cursor = len(self) - 1 + else: + self.cursor -= 1 + + if self.search_key: + while self.cursor >= 0 and self.search_key not in self[self.cursor]: + self.cursor -= 1 + + if self.cursor < 0 or len(self) == 0: + self.cursor = -1 + return random.choice(end_messages) + + return self[self.cursor] + + def next(self): + if self.cursor is None: + return '' + + self.cursor += 1 + + if self.search_key: + while self.cursor < len(self) and self.search_key not in self[self.cursor]: + self.cursor += 1 + + if self.cursor >= len(shared_history[self.prompt]): + self.cursor = None + self.search_key = None + + if self._temporary: + print 'popping temporary' + return self._temporary.pop() + return '' + + return self[self.cursor] + + def change_prompt(self, prompt): + self.prompt = prompt + self._temporary = [] + self.__temp_tail = False + if prompt not in shared_history: + shared_history[prompt] = [] + + def search(self, key): + self.search_key = key + return self.prev() + + def add(self, cmd): + if self._temporary: + self._temporary.pop() + + shared_history[self.prompt].append(cmd) + self.cursor = None + self.search_key = None + + def add_temporary(self, cmd): + assert not self._temporary + + self._temporary.append(cmd) + self.cursor = len(self) - 1 + + print 'adding temporary', self + + def __getitem__(self, i): + if i < len(shared_history[self.prompt]): + return shared_history[self.prompt][i] + return self._temporary[i-len(shared_history)+1] + + def __len__(self): + return len(shared_history[self.prompt]) + len(self._temporary) + + def __str__(self): + return "(History %s)" % (self.cursor) + +def get_history(uzbl): + if uzbl not in UZBLS: + add_instance(uzbl) + + return UZBLS[uzbl] + +def add_instance(uzbl, *args): + UZBLS[uzbl] = History() + +def del_instance(uzbl, *args): + if uzbl in UZBLS: + del UZBLS[uzbl] + +def keycmd_exec(uzbl, keylet): + history = get_history(uzbl) + cmd = keylet.get_keycmd() + if cmd: + history.add(cmd) + +def config_changed(uzbl, key, value): + if key == 'keycmd_prompt': + history = get_history(uzbl) + history.change_prompt(value) + +def history_prev(uzbl, _x): + history = get_history(uzbl) + cmd = uzbl.get_keylet().get_keycmd() + if history.cursor is None and cmd: + history.add_temporary(cmd) + + uzbl.set_keycmd(history.prev()) + print 'PREV', history + +def history_next(uzbl, _x): + history = get_history(uzbl) + cmd = uzbl.get_keylet().get_keycmd() + + uzbl.set_keycmd(history.next()) + print 'NEXT', history + +def history_search(uzbl, key): + history = get_history(uzbl) + uzbl.set_keycmd(history.search(key)) + print 'SEARCH', history + +end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') + +def init(uzbl): + connects = {'INSTANCE_START': add_instance, + 'INSTANCE_EXIT': del_instance, + 'KEYCMD_EXEC': keycmd_exec, + 'CONFIG_CHANGED': config_changed, + 'HISTORY_PREV': history_prev, + 'HISTORY_NEXT': history_next, + 'HISTORY_SEARCH': history_search + } + + uzbl.connect_dict(connects) diff --git a/examples/data/uzbl/plugins/history.py b/examples/data/uzbl/plugins/history.py deleted file mode 100644 index 4467e5d..0000000 --- a/examples/data/uzbl/plugins/history.py +++ /dev/null @@ -1,148 +0,0 @@ -__export__ = ['get_history'] -UZBLS = {} - -import random - -shared_history = {'':[]} - -class History(object): - def __init__(self): - self._temporary = [] - self.prompt = '' - self.cursor = None - self.__temp_tail = False - self.search_key = None - - def prev(self): - if self.cursor is None: - self.cursor = len(self) - 1 - else: - self.cursor -= 1 - - if self.search_key: - while self.cursor >= 0 and self.search_key not in self[self.cursor]: - self.cursor -= 1 - - if self.cursor < 0 or len(self) == 0: - self.cursor = -1 - return random.choice(end_messages) - - return self[self.cursor] - - def next(self): - if self.cursor is None: - return '' - - self.cursor += 1 - - if self.search_key: - while self.cursor < len(self) and self.search_key not in self[self.cursor]: - self.cursor += 1 - - if self.cursor >= len(shared_history[self.prompt]): - self.cursor = None - self.search_key = None - - if self._temporary: - print 'popping temporary' - return self._temporary.pop() - return '' - - return self[self.cursor] - - def change_prompt(self, prompt): - self.prompt = prompt - self._temporary = [] - self.__temp_tail = False - if prompt not in shared_history: - shared_history[prompt] = [] - - def search(self, key): - self.search_key = key - return self.prev() - - def add(self, cmd): - if self._temporary: - self._temporary.pop() - - shared_history[self.prompt].append(cmd) - self.cursor = None - self.search_key = None - - def add_temporary(self, cmd): - assert not self._temporary - - self._temporary.append(cmd) - self.cursor = len(self) - 1 - - print 'adding temporary', self - - def __getitem__(self, i): - if i < len(shared_history[self.prompt]): - return shared_history[self.prompt][i] - return self._temporary[i-len(shared_history)+1] - - def __len__(self): - return len(shared_history[self.prompt]) + len(self._temporary) - - def __str__(self): - return "(History %s)" % (self.cursor) - -def get_history(uzbl): - if uzbl not in UZBLS: - add_instance(uzbl) - - return UZBLS[uzbl] - -def add_instance(uzbl, *args): - UZBLS[uzbl] = History() - -def del_instance(uzbl, *args): - if uzbl in UZBLS: - del UZBLS[uzbl] - -def keycmd_exec(uzbl, keylet): - history = get_history(uzbl) - cmd = keylet.get_keycmd() - if cmd: - history.add(cmd) - -def config_changed(uzbl, key, value): - if key == 'keycmd_prompt': - history = get_history(uzbl) - history.change_prompt(value) - -def history_prev(uzbl, _x): - history = get_history(uzbl) - cmd = uzbl.get_keylet().get_keycmd() - if history.cursor is None and cmd: - history.add_temporary(cmd) - - uzbl.set_keycmd(history.prev()) - print 'PREV', history - -def history_next(uzbl, _x): - history = get_history(uzbl) - cmd = uzbl.get_keylet().get_keycmd() - - uzbl.set_keycmd(history.next()) - print 'NEXT', history - -def history_search(uzbl, key): - history = get_history(uzbl) - uzbl.set_keycmd(history.search(key)) - print 'SEARCH', history - -end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') - -def init(uzbl): - connects = {'INSTANCE_START': add_instance, - 'INSTANCE_EXIT': del_instance, - 'KEYCMD_EXEC': keycmd_exec, - 'CONFIG_CHANGED': config_changed, - 'HISTORY_PREV': history_prev, - 'HISTORY_NEXT': history_next, - 'HISTORY_SEARCH': history_search - } - - uzbl.connect_dict(connects) -- cgit v1.2.3 From 14bce08a78c86e8cca7a6ca4b64d3692fa2782b5 Mon Sep 17 00:00:00 2001 From: keis Date: Tue, 30 Nov 2010 18:35:20 +0100 Subject: make history plugin work with new EM --- examples/data/plugins/history.py | 65 ++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) (limited to 'examples') diff --git a/examples/data/plugins/history.py b/examples/data/plugins/history.py index 4467e5d..886cbe0 100644 --- a/examples/data/plugins/history.py +++ b/examples/data/plugins/history.py @@ -1,12 +1,10 @@ -__export__ = ['get_history'] -UZBLS = {} - import random shared_history = {'':[]} class History(object): - def __init__(self): + def __init__(self, uzbl): + self.uzbl = uzbl self._temporary = [] self.prompt = '' self.cursor = None @@ -86,63 +84,46 @@ class History(object): return len(shared_history[self.prompt]) + len(self._temporary) def __str__(self): - return "(History %s)" % (self.cursor) - -def get_history(uzbl): - if uzbl not in UZBLS: - add_instance(uzbl) - - return UZBLS[uzbl] - -def add_instance(uzbl, *args): - UZBLS[uzbl] = History() - -def del_instance(uzbl, *args): - if uzbl in UZBLS: - del UZBLS[uzbl] + return "(History %s, %s)" % (self.cursor, self.prompt) def keycmd_exec(uzbl, keylet): - history = get_history(uzbl) cmd = keylet.get_keycmd() if cmd: - history.add(cmd) - -def config_changed(uzbl, key, value): - if key == 'keycmd_prompt': - history = get_history(uzbl) - history.change_prompt(value) + uzbl.history.add(cmd) def history_prev(uzbl, _x): - history = get_history(uzbl) - cmd = uzbl.get_keylet().get_keycmd() - if history.cursor is None and cmd: - history.add_temporary(cmd) + cmd = uzbl.keylet.get_keycmd() + if uzbl.history.cursor is None and cmd: + uzbl.history.add_temporary(cmd) - uzbl.set_keycmd(history.prev()) - print 'PREV', history + uzbl.set_keycmd(uzbl.history.prev()) + uzbl.logger.debug('PREV %s' % uzbl.history) def history_next(uzbl, _x): - history = get_history(uzbl) - cmd = uzbl.get_keylet().get_keycmd() + cmd = uzbl.keylet.get_keycmd() - uzbl.set_keycmd(history.next()) - print 'NEXT', history + uzbl.set_keycmd(uzbl.history.next()) + uzbl.logger.debug('NEXT %s' % uzbl.history) def history_search(uzbl, key): - history = get_history(uzbl) uzbl.set_keycmd(history.search(key)) - print 'SEARCH', history + uzbl.logger.debug('SEARCH %s %s' % (key, uzbl.history)) end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') +# plugin init hook def init(uzbl): - connects = {'INSTANCE_START': add_instance, - 'INSTANCE_EXIT': del_instance, + connect_dict(uzbl, { 'KEYCMD_EXEC': keycmd_exec, - 'CONFIG_CHANGED': config_changed, 'HISTORY_PREV': history_prev, 'HISTORY_NEXT': history_next, 'HISTORY_SEARCH': history_search - } + }) + + export_dict(uzbl, { + 'history' : History(uzbl) + }) - uzbl.connect_dict(connects) +# plugin after hook +def after(uzbl): + uzbl.on_set('keycmd_prompt', lambda uzbl, k, v: uzbl.history.change_prompt(v)) -- cgit v1.2.3 From 7cf3fb88d1e094da5b516699a61d5e589c039e8f Mon Sep 17 00:00:00 2001 From: keis Date: Tue, 30 Nov 2010 19:25:34 +0100 Subject: disable odd clear of keycmd was breaking history of prompts, for what I can tell no good reason --- examples/data/plugins/bind.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/plugins/bind.py b/examples/data/plugins/bind.py index 5b13476..bf693b3 100644 --- a/examples/data/plugins/bind.py +++ b/examples/data/plugins/bind.py @@ -421,7 +421,8 @@ def match_and_exec(uzbl, bind, depth, keylet, bindlet): if not has_args or on_exec: del uzbl.config['mode'] bindlet.reset() - uzbl.clear_current() + # cleared by keycmd_exec_current, why is this here? breaks history + #uzbl.clear_current() return True -- cgit v1.2.3 From 32800e94c6667c8f44dfe2178115049c280de339 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 27 Dec 2010 19:55:44 -0700 Subject: remove example cookie daemons --- Makefile | 16 +- examples/data/scripts/uzbl-cookie-daemon | 677 ------------------------------- examples/uzbl-cookie-manager.c | 381 ----------------- src/uzbl-browser | 7 - 4 files changed, 3 insertions(+), 1078 deletions(-) delete mode 100755 examples/data/scripts/uzbl-cookie-daemon delete mode 100644 examples/uzbl-cookie-manager.c (limited to 'examples') diff --git a/Makefile b/Makefile index e4d1b42..2b1a70a 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ SRC = $(wildcard src/*.c) HEAD = $(wildcard src/*.h) OBJ = $(foreach obj, $(SRC:.c=.o), $(notdir $(obj))) -all: uzbl-browser uzbl-cookie-manager +all: uzbl-browser VPATH:=src @@ -24,11 +24,7 @@ uzbl-core: ${OBJ} @echo -e "\n${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS}" @${CC} -o $@ ${OBJ} ${UZBL_LDFLAGS} -uzbl-cookie-manager: examples/uzbl-cookie-manager.o src/util.o - @echo -e "\n${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} ${shell pkg-config --libs glib-2.0 libsoup-2.4}" - @${CC} -o $@ uzbl-cookie-manager.o util.o ${LDFLAGS} $(shell pkg-config --libs glib-2.0 libsoup-2.4) - -uzbl-browser: uzbl-core uzbl-cookie-manager +uzbl-browser: uzbl-core # packagers, set DESTDIR to your "package directory" and PREFIX to the prefix you want to have on the end-user system # end-users who build from source: don't care about DESTDIR, update PREFIX if you want to @@ -66,10 +62,8 @@ test-uzbl-browser-sandbox: uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data cp -np ./misc/env.sh ./sandbox/env.sh - -source ./sandbox/env.sh && uzbl-cookie-manager -v -source ./sandbox/env.sh && uzbl-event-manager restart -avv source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose - kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid` source ./sandbox/env.sh && uzbl-event-manager stop -ivv make DESTDIR=./sandbox uninstall rm -rf ./sandbox/usr @@ -79,17 +73,14 @@ test-uzbl-tabbed-sandbox: uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-example-data cp -np ./misc/env.sh ./sandbox/env.sh - -source ./sandbox/env.sh && uzbl-cookie-manager -v -source ./sandbox/env.sh && uzbl-event-manager restart -avv source ./sandbox/env.sh && ./sandbox/home/.local/share/uzbl/scripts/uzbl-tabbed - kill `cat ./sandbox/home/.cache/uzbl/cookie_daemon_socket.pid` source ./sandbox/env.sh && uzbl-event-manager stop -ivv make DESTDIR=./sandbox uninstall rm -rf ./sandbox/usr clean: rm -f uzbl-core - rm -f uzbl-cookie-manager rm -f uzbl-core.o rm -f events.o rm -f callbacks.o @@ -121,9 +112,8 @@ install-uzbl-core: all install-dirs chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core -install-uzbl-browser: uzbl-cookie-manager install-dirs +install-uzbl-browser: install-dirs install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser - install -m755 uzbl-cookie-manager $(INSTALLDIR)/bin/uzbl-cookie-manager install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager mv $(INSTALLDIR)/bin/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser.bak sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < $(INSTALLDIR)/bin/uzbl-browser.bak > $(INSTALLDIR)/bin/uzbl-browser diff --git a/examples/data/scripts/uzbl-cookie-daemon b/examples/data/scripts/uzbl-cookie-daemon deleted file mode 100755 index 0b9bef9..0000000 --- a/examples/data/scripts/uzbl-cookie-daemon +++ /dev/null @@ -1,677 +0,0 @@ -#!/usr/bin/env python - -# The Python Cookie Daemon for Uzbl. -# Copyright (c) 2009, Tom Adams -# Copyright (c) 2009, Dieter Plaetinck -# Copyright (c) 2009, Mason Larobina -# Copyright (c) 2009, Michael Fiano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -''' -The Python Cookie Daemon -======================== - -This daemon is a re-write of the original cookies.py script found in uzbl's -master branch. This script provides more functionality than the original -cookies.py by adding numerous command line options to specify different cookie -jar locations, socket locations, verbose output, etc. This functionality is -very useful as it allows you to run multiple daemons at once serving cookies -to different groups of uzbl instances as required. - -Keeping up to date -================== - -Check the cookie daemon uzbl-wiki page for more information on where to -find the latest version of the cookie_daemon.py - - http://www.uzbl.org/wiki/cookie_daemon.py - -Command line options -==================== - -Use the following command to get a full list of the cookie_daemon.py command -line options: - - ./cookie_daemon.py --help - -Talking with uzbl -================= - -In order to get uzbl to talk to a running cookie daemon you add the following -to your uzbl config: - - set cookie_handler = talk_to_socket $XDG_CACHE_HOME/uzbl/cookie_daemon_socket - -Or if you prefer using the $HOME variable: - - set cookie_handler = talk_to_socket $HOME/.cache/uzbl/cookie_daemon_socket - -Todo list -========= - - - Use a pid file to make force killing a running daemon possible. - -Reporting bugs / getting help -============================= - -The best way to report bugs and or get help with the cookie daemon is to -contact the maintainers it the #uzbl irc channel found on the Freenode IRC -network (irc.freenode.org). -''' - -import cookielib -import os -import sys -import urllib2 -import select -import socket -import time -import atexit -from traceback import print_exc -from signal import signal, SIGTERM -from optparse import OptionParser -from os.path import join - -try: - import cStringIO as StringIO - -except ImportError: - import StringIO - - -# ============================================================================ -# ::: Default configuration section :::::::::::::::::::::::::::::::::::::::::: -# ============================================================================ - -def xdghome(key, default): - '''Attempts to use the environ XDG_*_HOME paths if they exist otherwise - use $HOME and the default path.''' - - xdgkey = "XDG_%s_HOME" % key - if xdgkey in os.environ.keys() and os.environ[xdgkey]: - return os.environ[xdgkey] - - return join(os.environ['HOME'], default) - -# Setup xdg paths. -CACHE_DIR = join(xdghome('CACHE', '.cache/'), 'uzbl/') -DATA_DIR = join(xdghome('DATA', '.local/share/'), 'uzbl/') -CONFIG_DIR = join(xdghome('CONFIG', '.config/'), 'uzbl/') - -# Ensure data paths exist. -for path in [CACHE_DIR, DATA_DIR, CONFIG_DIR]: - if not os.path.exists(path): - os.makedirs(path) - -# Default config -config = { - - # Default cookie jar, whitelist, and daemon socket locations. - 'cookie_jar': join(DATA_DIR, 'cookies.txt'), - 'cookie_whitelist': join(CONFIG_DIR, 'cookie_whitelist'), - 'cookie_socket': join(CACHE_DIR, 'cookie_daemon_socket'), - - # Don't use a cookie whitelist policy by default. - 'use_whitelist': False, - - # Time out after x seconds of inactivity (set to 0 for never time out). - # WARNING: Do not use this option if you are manually launching the daemon. - 'daemon_timeout': 0, - - # Daemonise by default. - 'daemon_mode': True, - - # Optionally print helpful debugging messages to the terminal. - 'verbose': False, - -} # End of config dictionary. - - -# ============================================================================ -# ::: End of configuration section ::::::::::::::::::::::::::::::::::::::::::: -# ============================================================================ - - -_SCRIPTNAME = os.path.basename(sys.argv[0]) -def echo(msg): - '''Prints only if the verbose flag has been set.''' - - if config['verbose']: - sys.stderr.write("%s: %s\n" % (_SCRIPTNAME, msg)) - - -def error(msg): - '''Prints error message and exits.''' - - sys.stderr.write("%s: error: %s\n" % (_SCRIPTNAME, msg)) - sys.exit(1) - - -def mkbasedir(filepath): - '''Create the base directories of the file in the file-path if the dirs - don't exist.''' - - dirname = os.path.dirname(filepath) - if not os.path.exists(dirname): - echo("creating dirs: %r" % dirname) - os.makedirs(dirname) - - -def daemon_running(cookie_socket): - '''Check if another process (hopefully a cookie_daemon.py) is listening - on the cookie daemon socket. If another process is found to be - listening on the socket exit the daemon immediately and leave the - socket alone. If the connect fails assume the socket has been abandoned - and delete it (to be re-created in the create socket function).''' - - if not os.path.exists(cookie_socket): - return False - - if os.path.isfile(cookie_socket): - raise Exception("regular file at %r is not a socket" % cookie_socket) - - - if os.path.isdir(cookie_socket): - raise Exception("directory at %r is not a socket" % cookie_socket) - - try: - sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - sock.connect(cookie_socket) - sock.close() - echo("detected daemon listening on %r" % cookie_socket) - return True - - except socket.error: - # Failed to connect to cookie_socket so assume it has been - # abandoned by another cookie daemon process. - if os.path.exists(cookie_socket): - echo("deleting abandoned socket at %r" % cookie_socket) - os.remove(cookie_socket) - - return False - - -def send_command(cookie_socket, cmd): - '''Send a command to a running cookie daemon.''' - - if not daemon_running(cookie_socket): - return False - - try: - sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET) - sock.connect(cookie_socket) - sock.send(cmd) - sock.close() - echo("sent command %r to %r" % (cmd, cookie_socket)) - return True - - except socket.error: - print_exc() - error("failed to send message %r to %r" % (cmd, cookie_socket)) - return False - - -def kill_daemon(cookie_socket): - '''Send the "EXIT" command to running cookie_daemon.''' - - if send_command(cookie_socket, "EXIT"): - # Now ensure the cookie_socket is cleaned up. - start = time.time() - while os.path.exists(cookie_socket): - time.sleep(0.1) - if (time.time() - start) > 5: - error("force deleting socket %r" % cookie_socket) - os.remove(cookie_socket) - return - - echo("stopped daemon listening on %r"% cookie_socket) - - else: - if os.path.exists(cookie_socket): - os.remove(cookie_socket) - echo("removed abandoned/broken socket %r" % cookie_socket) - - -def daemonize(): - '''Daemonize the process using the Stevens' double-fork magic.''' - - try: - if os.fork(): - os._exit(0) - - except OSError: - print_exc() - sys.stderr.write("fork #1 failed") - sys.exit(1) - - os.chdir('/') - os.setsid() - os.umask(0) - - try: - if os.fork(): - os._exit(0) - - except OSError: - print_exc() - sys.stderr.write("fork #2 failed") - sys.exit(1) - - if sys.stdout.isatty(): - sys.stdout.flush() - sys.stderr.flush() - - devnull = '/dev/null' - stdin = file(devnull, 'r') - stdout = file(devnull, 'a+') - stderr = file(devnull, 'a+', 0) - - os.dup2(stdin.fileno(), sys.stdin.fileno()) - os.dup2(stdout.fileno(), sys.stdout.fileno()) - os.dup2(stderr.fileno(), sys.stderr.fileno()) - - -class CookieMonster: - '''The uzbl cookie daemon class.''' - - def __init__(self): - '''Initialise class variables.''' - - self.server_socket = None - self.jar = None - self.last_request = time.time() - self._running = False - - - def run(self): - '''Start the daemon.''' - - # The check healthy function will exit if another daemon is detected - # listening on the cookie socket and remove the abandoned socket if - # there isnt. - if os.path.exists(config['cookie_socket']): - if daemon_running(config['cookie_socket']): - sys.exit(1) - - # Create cookie daemon socket. - self.create_socket() - - # Daemonize process. - if config['daemon_mode']: - echo("entering daemon mode") - daemonize() - - # Register a function to cleanup on exit. - atexit.register(self.quit) - - # Make SIGTERM act orderly. - signal(SIGTERM, lambda signum, stack_frame: sys.exit(1)) - - # Create cookie jar object from file. - self.open_cookie_jar() - - # Create a way to exit nested loops by setting a running flag. - self._running = True - - while self._running: - try: - # Enter main listen loop. - self.listen() - - except KeyboardInterrupt: - self._running = False - print - - except socket.error: - print_exc() - - except: - # Clean up - self.del_socket() - - # Raise exception - raise - - # Always delete the socket before calling create again. - self.del_socket() - # Create cookie daemon socket. - self.create_socket() - - - def load_whitelist(self): - '''Load the cookie jar whitelist policy.''' - - cookie_whitelist = config['cookie_whitelist'] - - if cookie_whitelist: - mkbasedir(cookie_whitelist) - - # Create cookie whitelist file if it does not exist. - if not os.path.exists(cookie_whitelist): - open(cookie_whitelist, 'w').close() - - # Read cookie whitelist file into list. - file = open(cookie_whitelist,'r') - domain_list = [line.rstrip('\n') for line in file] - file.close() - - # Define policy of allowed domains - policy = cookielib.DefaultCookiePolicy(allowed_domains=domain_list) - self.jar.set_policy(policy) - - # Save the last modified time of the whitelist. - self._whitelistmtime = os.stat(cookie_whitelist).st_mtime - - - def open_cookie_jar(self): - '''Open the cookie jar.''' - - cookie_jar = config['cookie_jar'] - cookie_whitelist = config['cookie_whitelist'] - - if cookie_jar: - mkbasedir(cookie_jar) - - # Create cookie jar object from file. - self.jar = cookielib.MozillaCookieJar(cookie_jar) - - # Load cookie whitelist policy. - if config['use_whitelist']: - self.load_whitelist() - - if cookie_jar: - try: - # Attempt to load cookies from the cookie jar. - self.jar.load(ignore_discard=True) - - # Ensure restrictive permissions are set on the cookie jar - # to prevent other users on the system from hi-jacking your - # authenticated sessions simply by copying your cookie jar. - os.chmod(cookie_jar, 0600) - - except: - pass - - - def reload_whitelist(self): - '''Reload the cookie whitelist.''' - - cookie_whitelist = config['cookie_whitelist'] - if os.path.exists(cookie_whitelist): - echo("reloading whitelist %r" % cookie_whitelist) - self.open_cookie_jar() - - - def create_socket(self): - '''Create AF_UNIX socket for communication with uzbl instances.''' - - cookie_socket = config['cookie_socket'] - mkbasedir(cookie_socket) - - self.server_socket = socket.socket(socket.AF_UNIX, - socket.SOCK_SEQPACKET) - - self.server_socket.bind(cookie_socket) - - # Set restrictive permissions on the cookie socket to prevent other - # users on the system from data-mining your cookies. - os.chmod(cookie_socket, 0600) - - - def listen(self): - '''Listen for incoming cookie PUT and GET requests.''' - - daemon_timeout = config['daemon_timeout'] - echo("listening on %r" % config['cookie_socket']) - - connections = [] - - while self._running: - # This line tells the socket how many pending incoming connections - # to enqueue at once. Raising this number may or may not increase - # performance. - self.server_socket.listen(1) - - r, w, x = select.select([self.server_socket]+connections, [], [], 1) - - for socket in r: - if self.server_socket == socket: - client_socket, _ = socket.accept() - connections.append(client_socket) - else: - if not self.handle_request(socket): - # connection was closed, forget about the client socket - connections.remove(socket) - - self.last_request = time.time() - - if daemon_timeout: - # Checks if the daemon has been idling for too long. - idle = time.time() - self.last_request - if idle > daemon_timeout: - self._running = False - - - def handle_request(self, client_socket): - '''Connection made, now to serve a cookie PUT or GET request.''' - - # Receive cookie request from client. - data = client_socket.recv(8192) - if not data: - return False - - # Cookie argument list in packet is null separated. - argv = data.split("\0") - action = argv[0].upper().strip() - - # Catch the EXIT command sent to kill running daemons. - if action == "EXIT": - self._running = False - return False - - # Catch whitelist RELOAD command. - elif action == "RELOAD": - self.reload_whitelist() - return True - - # Return if command unknown. - elif action not in ['GET', 'PUT']: - error("unknown command %r." % argv) - return True - - # Determine whether or not to print cookie data to terminal. - print_cookie = (config['verbose'] and not config['daemon_mode']) - if print_cookie: - print ' '.join(argv[:4]) - - uri = urllib2.urlparse.ParseResult( - scheme=argv[1], - netloc=argv[2], - path=argv[3], - params='', - query='', - fragment='').geturl() - - req = urllib2.Request(uri) - - if action == "GET": - self.jar._policy._now = self._now = int(time.time()) - cookies = self.jar._cookies_for_request(req) - attrs = self.jar._cookie_attrs(cookies) - if attrs: - cookie = "; ".join(attrs) - client_socket.send(cookie) - if print_cookie: - print cookie - else: - client_socket.send("\0") - - elif action == "PUT": - cookie = argv[4] if len(argv) > 3 else None - if print_cookie: - print cookie - - self.put_cookie(req, cookie) - client_socket.send("\0") - - if print_cookie: - print - - return True - - - def put_cookie(self, req, cookie=None): - '''Put a cookie in the cookie jar.''' - - hdr = urllib2.httplib.HTTPMessage(\ - StringIO.StringIO('Set-Cookie: %s' % cookie)) - res = urllib2.addinfourl(StringIO.StringIO(), hdr, - req.get_full_url()) - self.jar.extract_cookies(res, req) - if config['cookie_jar']: - self.jar.save(ignore_discard=True) - - - def del_socket(self): - '''Remove the cookie_socket file on exit. In a way the cookie_socket - is the daemons pid file equivalent.''' - - if self.server_socket: - try: - self.server_socket.close() - - except: - pass - - self.server_socket = None - - cookie_socket = config['cookie_socket'] - if os.path.exists(cookie_socket): - echo("deleting socket %r" % cookie_socket) - os.remove(cookie_socket) - - - def quit(self): - '''Called on exit to make sure all loose ends are tied up.''' - - self.del_socket() - sys.exit(0) - - -def main(): - '''Main function.''' - - # Define command line parameters. - usage = "usage: %prog [options] {start|stop|restart|reload}" - parser = OptionParser(usage=usage) - parser.add_option('-n', '--no-daemon', dest='no_daemon', - action='store_true', help="don't daemonise the process.") - - parser.add_option('-v', '--verbose', dest="verbose", - action='store_true', help="print verbose output.") - - parser.add_option('-t', '--daemon-timeout', dest='daemon_timeout', - action="store", metavar="SECONDS", help="shutdown the daemon after x "\ - "seconds inactivity. WARNING: Do not use this when launching the "\ - "cookie daemon manually.") - - parser.add_option('-s', '--cookie-socket', dest="cookie_socket", - metavar="SOCKET", help="manually specify the socket location.") - - parser.add_option('-j', '--cookie-jar', dest='cookie_jar', - metavar="FILE", help="manually specify the cookie jar location.") - - parser.add_option('-m', '--memory', dest='memory', action='store_true', - help="store cookies in memory only - do not write to disk") - - parser.add_option('-u', '--use-whitelist', dest='usewhitelist', - action='store_true', help="use cookie whitelist policy") - - parser.add_option('-w', '--cookie-whitelist', dest='whitelist', - action='store', help="manually specify whitelist location", - metavar='FILE') - - # Parse the command line arguments. - (options, args) = parser.parse_args() - - expand = lambda p: os.path.realpath(os.path.expandvars(p)) - - initcommands = ['start', 'stop', 'restart', 'reload'] - for arg in args: - if arg not in initcommands: - error("unknown argument %r" % args[0]) - sys.exit(1) - - if len(args) > 1: - error("the daemon only accepts one {%s} action at a time." - % '|'.join(initcommands)) - sys.exit(1) - - if len(args): - action = args[0] - - else: - action = "start" - - if options.no_daemon: - config['daemon_mode'] = False - - if options.cookie_socket: - config['cookie_socket'] = expand(options.cookie_socket) - - if options.cookie_jar: - config['cookie_jar'] = expand(options.cookie_jar) - - if options.memory: - config['cookie_jar'] = None - - if options.whitelist: - config['cookie_whitelist'] = expand(options.whitelist) - - if options.whitelist or options.usewhitelist: - config['use_whitelist'] = True - - if options.daemon_timeout: - try: - config['daemon_timeout'] = int(options.daemon_timeout) - - except ValueError: - error("expected int argument for -t, --daemon-timeout") - - # Expand $VAR's in config keys that relate to paths. - for key in ['cookie_socket', 'cookie_jar', 'cookie_whitelist']: - if config[key]: - config[key] = os.path.expandvars(config[key]) - - if options.verbose: - config['verbose'] = True - import pprint - sys.stderr.write("%s\n" % pprint.pformat(config)) - - # It would be better if we didn't need to start this python process just - # to send a command to the socket, but unfortunately socat doesn't seem - # to support SEQPACKET. - if action == "reload": - send_command(config['cookie_socket'], "RELOAD") - - if action in ['stop', 'restart']: - kill_daemon(config['cookie_socket']) - - if action in ['start', 'restart']: - CookieMonster().run() - - -if __name__ == "__main__": - main() diff --git a/examples/uzbl-cookie-manager.c b/examples/uzbl-cookie-manager.c deleted file mode 100644 index 70addf3..0000000 --- a/examples/uzbl-cookie-manager.c +++ /dev/null @@ -1,381 +0,0 @@ -#define _POSIX_SOURCE - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include "../src/util.h" - -extern const XDG_Var XDG[]; - -int verbose = 0; - -#define SOCK_BACKLOG 10 -#define MAX_COOKIE_LENGTH 4096 - -char cookie_buffer[MAX_COOKIE_LENGTH]; - -int setup_socket(const char *cookied_socket_path) { - /* delete the cookie socket if it was left behind on a previous run */ - unlink(cookied_socket_path); - - int socket_fd = socket(AF_UNIX, SOCK_SEQPACKET, 0); - - if(socket_fd < 0) { - fprintf(stderr, "socket failed (%s)\n", strerror(errno)); - return -1; - } - - struct sockaddr_un sa; - sa.sun_family = AF_UNIX; - strcpy(sa.sun_path, cookied_socket_path); - - if(bind(socket_fd, (struct sockaddr*)&sa, sizeof(sa)) < 0) { - fprintf(stderr, "bind failed (%s)\n", strerror(errno)); - return -1; - } - - if(listen(socket_fd, SOCK_BACKLOG) < 0) { - fprintf(stderr, "listen failed (%s)\n", strerror(errno)); - return -1; - } - - return socket_fd; -} - -const char *whitelist_path = NULL; -GPtrArray *whitelisted_hosts = NULL; -time_t whitelist_update_time = 0; - -void whitelist_line_cb(const gchar* line, void *user_data) { - (void) user_data; - - gchar *norm_host; - - const gchar *p = line; - while(isspace(*p)) - p++; - - if(p[0] == '#' || !p[0]) /* ignore comments and blank lines */ - return; - - if(p[0] == '.') - norm_host = g_strdup(p); - else - norm_host = g_strconcat(".", p, NULL); - - g_ptr_array_add(whitelisted_hosts, g_strchomp(norm_host)); -} - -gboolean load_whitelist(const char *whitelist_path) { - if(!file_exists(whitelist_path)) - return FALSE; - - /* check if the whitelist file was updated */ - struct stat f; - if(stat(whitelist_path, &f) < 0) - return FALSE; - - if(whitelisted_hosts == NULL) - whitelisted_hosts = g_ptr_array_new(); - - if(f.st_mtime > whitelist_update_time) { - /* the file was updated, reload the whitelist */ - if(verbose) puts("reloading whitelist"); - while(whitelisted_hosts->len > 0) { - g_free(g_ptr_array_index(whitelisted_hosts, 0)); - g_ptr_array_remove_index_fast(whitelisted_hosts, 0); - } - for_each_line_in_file(whitelist_path, whitelist_line_cb, NULL); - whitelist_update_time = f.st_mtime; - } - - return TRUE; -} - -gboolean should_save_cookie(const char *host) { - if(!load_whitelist(whitelist_path)) - return TRUE; /* some error with the file, assume no whitelist */ - - /* we normalize the hostname so it has a . in front like the whitelist entries */ - gchar *test_host = (host[0] == '.') ? g_strdup(host) : g_strconcat(".", host, NULL); - int hl = strlen(test_host); - - /* test against each entry in the whitelist */ - gboolean result = FALSE; - guint i; - for(i = 0; i < whitelisted_hosts->len; i++) { - /* a match means the host ends with (or is equal to) the whitelist entry */ - const gchar *entry = g_ptr_array_index(whitelisted_hosts, i); - int el = strlen(entry); - result = (el <= hl) && !strcmp(test_host + (hl - el), entry); - - if(result) - break; - } - - g_free(test_host); - - return result; -} - -void handle_request(SoupCookieJar *j, const char *buff, int len, int fd) { - const char *command = buff; - - const char *scheme = command + strlen(command) + 1; - if((scheme - buff) > len) { - fprintf(stderr, "got malformed or partial request\n"); - return; - } - - const char *host = scheme + strlen(scheme) + 1; - if((host - buff) > len) { - fprintf(stderr, "got malformed or partial request\n"); - return; - } - - const char *path = host + strlen(host) + 1; - if((path - buff) > len) { - fprintf(stderr, "got malformed or partial request\n"); - return; - } - - /* glue the parts back together into a SoupURI */ - char *u = g_strconcat(scheme, "://", host, path, NULL); - if(verbose) printf("%s %s\n", command, u); - SoupURI *uri = soup_uri_new(u); - g_free(u); - - if(!strcmp(command, "GET")) { - char *result = soup_cookie_jar_get_cookies(j, uri, TRUE); - if(result) { - if(verbose) puts(result); - if(write(fd, result, strlen(result)+1) < 0) - fprintf(stderr, "write failed (%s)", strerror(errno)); - - g_free(result); - } else { - if(verbose) puts("-"); - if(write(fd, "", 1) < 0) - fprintf(stderr, "write failed (%s)", strerror(errno)); - } - } else if(!strcmp(command, "PUT")) { - const char *name_and_val = path + strlen(path) + 1; - if((name_and_val - buff) > len) { - fprintf(stderr, "got malformed or partial request\n"); - return; - } - - if(verbose) puts(name_and_val); - - if(should_save_cookie(host)) { - char *eql = strchr(name_and_val, '='); - eql[0] = 0; - - const char *name = name_and_val; - const char *value = eql + 1; - - SoupCookie *cookie = soup_cookie_new(name, value, host, path, SOUP_COOKIE_MAX_AGE_ONE_YEAR); - - soup_cookie_jar_add_cookie(j, cookie); - } else if(verbose) - puts("no, blacklisted."); - - if(write(fd, "", 1) < 0) - fprintf(stderr, "write failed (%s)", strerror(errno)); - } - - soup_uri_free(uri); -} - -void -wait_for_things_to_happen_and_then_do_things(SoupCookieJar* j, int cookie_socket) { - GArray *connections = g_array_new (FALSE, FALSE, sizeof (int)); - - while(1) { - unsigned int i; - int r; - fd_set fs; - - int maxfd = cookie_socket; - FD_ZERO(&fs); - FD_SET(maxfd, &fs); - - for(i = 0; i < connections->len; i++) { - int fd = g_array_index(connections, int, i); - if(fd > maxfd) maxfd = fd; - FD_SET(fd, &fs); - } - - r = select(maxfd+1, &fs, NULL, NULL, NULL); - if(r < 0) { - fprintf(stderr, "select failed (%s)\n", strerror(errno)); - continue; - } - - if(FD_ISSET(cookie_socket, &fs)) { - /* handle new connection */ - int fd = accept(cookie_socket, NULL, NULL); - g_array_append_val(connections, fd); - if(verbose) puts("got connection."); - } - - for(i = 0; i < connections->len; i++) { - /* handle activity on a connection */ - int fd = g_array_index(connections, int, i); - if(FD_ISSET(fd, &fs)) { - r = read(fd, cookie_buffer, MAX_COOKIE_LENGTH); - if(r < 0) { - fprintf(stderr, "read failed (%s)\n", strerror(errno)); - continue; - } else if(r == 0) { - if(verbose) puts("client hung up."); - g_array_remove_index(connections, i); - i--; /* other elements in the array are moved down to fill the gap */ - continue; - } - cookie_buffer[r] = 0; - - handle_request(j, cookie_buffer, r, fd); - } - } - } -} - -void usage(const char *progname) { - printf("%s [-s socket-path] [-f cookies.txt] [-w whitelist-file] [-n] [-v]\n", progname); - puts("\t-n\tdon't daemonise the process"); - puts("\t-v\tbe verbose"); -} - -void daemonise() { - int r = fork(); - - if(r < 0) { - fprintf(stderr, "fork failed (%s)", strerror(errno)); - exit(1); - } else if (r > 0) { - /* this is the parent, which has done its job */ - exit(0); - } - - if(setsid() < 0) { - fprintf(stderr, "setsid failed (%s)", strerror(errno)); - exit(1); - } -} - -const char *pid_file_path = NULL; -const char *cookied_socket_path = NULL; - -void cleanup_after_signal(int signal) { - (void) signal; - unlink(pid_file_path); - unlink(cookied_socket_path); - exit(0); -} - -int main(int argc, char *argv[]) { - int i; - - const char *cookies_txt_path = NULL; - gboolean foreground = FALSE; - - for(i = 1; i < argc && argv[i][0] == '-'; i++) { - switch(argv[i][1]) { - case 's': - cookied_socket_path = argv[++i]; - break; - case 'f': - cookies_txt_path = argv[++i]; - break; - case 'w': - whitelist_path = argv[++i]; - break; - case 'n': - foreground = TRUE; - break; - case 'v': - verbose = 1; - break; - default: - usage(argv[0]); - return 1; - } - } - - if(!foreground) - daemonise(); - - if(!cookies_txt_path) - cookies_txt_path = g_strconcat(get_xdg_var(XDG[1]), "/uzbl/cookies.txt", NULL); - - if(!cookied_socket_path) - cookied_socket_path = g_strconcat(get_xdg_var(XDG[2]), "/uzbl/cookie_daemon_socket", NULL); - - if(!whitelist_path) - whitelist_path = g_strconcat(get_xdg_var(XDG[0]), "/uzbl/cookie_whitelist", NULL); - - /* write out and lock the pid file. - * this ensures that only one uzbl-cookie-manager is running per-socket. - * (we should probably also lock the cookies.txt to prevent accidents...) */ - pid_file_path = g_strconcat(cookied_socket_path, ".pid", NULL); - int lockfd = open(pid_file_path, O_RDWR|O_CREAT, 0600); - if(lockfd < 0) { - fprintf(stderr, "couldn't open pid file %s (%s)\n", pid_file_path, strerror(errno)); - return 1; - } - - if(flock(lockfd, LOCK_EX|LOCK_NB) < 0) { - fprintf(stderr, "couldn't lock pid file %s (%s)\n", pid_file_path, strerror(errno)); - fprintf(stderr, "uzbl-cookie-manager is probably already running\n"); - return 1; - } - - gchar* pids = g_strdup_printf("%d\n", getpid()); - write(lockfd, pids, strlen(pids)); - g_free(pids); - - struct sigaction sa; - sa.sa_handler = cleanup_after_signal; - if(sigaction(SIGINT, &sa, NULL) || sigaction(SIGTERM, &sa, NULL)) { - fprintf(stderr, "sigaction failed (%s)\n", strerror(errno)); - return 1; - } - - if(!foreground) { - /* close STDIO */ - close(0); - close(1); - close(2); - } - - g_type_init(); - - SoupCookieJar *j = soup_cookie_jar_text_new(cookies_txt_path, FALSE); - - int cookie_socket = setup_socket(cookied_socket_path); - if(cookie_socket < 0) - return 1; - - wait_for_things_to_happen_and_then_do_things(j, cookie_socket); - - return 0; -} diff --git a/src/uzbl-browser b/src/uzbl-browser index faa2829..81645ca 100755 --- a/src/uzbl-browser +++ b/src/uzbl-browser @@ -64,13 +64,6 @@ then export UZBL_UTIL_DIR fi -# uzbl-cookie-manager will exit if another instance is already running. -# we could also check if its pid file exists to avoid having to spawn it. -#if [ ! -f "$XDG_CACHE_HOME"/uzbl/cookie_daemon_socket.pid ] -#then -# ${UZBL_COOKIE_DAEMON:-uzbl-cookie-manager} -#fi - # uzbl-event-manager will exit if one is already running. # we could also check if its pid file exists to avoid having to spawn it. DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon -- cgit v1.2.3 From 15c83d8a85a150f46e80f7fc97041f10a43a96df Mon Sep 17 00:00:00 2001 From: keis Date: Sat, 1 Jan 2011 03:01:48 +0100 Subject: malformed cookie rows pass through delete --- examples/data/plugins/cookies.py | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py index c9fe2c3..9eccace 100644 --- a/examples/data/plugins/cookies.py +++ b/examples/data/plugins/cookies.py @@ -38,24 +38,38 @@ class TextStore(object): self.filename = filename def as_event(self, cookie): + """Convert cookie.txt row to uzbls cookie event format""" + scheme = { + 'TRUE' : 'https', + 'FALSE' : 'http' + } if cookie[0].startswith("#HttpOnly_"): domain = cookie[0][len("#HttpOnly_"):] elif cookie[0].startswith('#'): return None else: domain = cookie[0] - return (domain, - cookie[2], - cookie[5], - cookie[6], - 'https' if cookie[3] == 'TRUE' else 'http', - cookie[4]) + try: + return (domain, + cookie[2], + cookie[5], + cookie[6], + scheme[cookie[3]], + cookie[4]) + except (KeyError,IndexError): + # Let malformed rows pass through like comments + return None def as_file(self, cookie): + """Convert cookie event to cookie.txt row""" + secure = { + 'https' : 'TRUE', + 'http' : 'FALSE' + } return (cookie[0], 'TRUE' if cookie[0].startswith('.') else 'FALSE', cookie[1], - 'TRUE' if cookie[4] == 'https' else 'FALSE', + secure[cookie[4]], cookie[5], cookie[2], cookie[3]) -- cgit v1.2.3 From 08b45348831fadadeaac4cefb03eb11538c7aa0c Mon Sep 17 00:00:00 2001 From: keis Date: Tue, 11 Jan 2011 12:51:00 +0100 Subject: fix bug in history search disable keycmd set in search as this will not work from stacked bindings --- examples/config/config | 1 + examples/data/plugins/history.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index 7b9fba2..ddeca7b 100644 --- a/examples/config/config +++ b/examples/config/config @@ -185,6 +185,7 @@ set ebind = @mode_bind global,-insert @ebind = event HISTORY_PREV @ebind = event HISTORY_NEXT +@ebind r_ = event HISTORY_SEARCH %s # Keycmd injection/append examples. #@ebind su = event INJECT_KEYCMD \@uri #@ebind st = event INJECT_KEYCMD \@title diff --git a/examples/data/plugins/history.py b/examples/data/plugins/history.py index 886cbe0..78a94ce 100644 --- a/examples/data/plugins/history.py +++ b/examples/data/plugins/history.py @@ -57,7 +57,7 @@ class History(object): def search(self, key): self.search_key = key - return self.prev() + self.cursor = None def add(self, cmd): if self._temporary: @@ -106,7 +106,7 @@ def history_next(uzbl, _x): uzbl.logger.debug('NEXT %s' % uzbl.history) def history_search(uzbl, key): - uzbl.set_keycmd(history.search(key)) + uzbl.history.search(key) uzbl.logger.debug('SEARCH %s %s' % (key, uzbl.history)) end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') -- cgit v1.2.3 From 6a737a7137c8cfbbe21bb5f0c0182ca2255a5b4c Mon Sep 17 00:00:00 2001 From: keis Date: Mon, 17 Jan 2011 21:37:08 +0100 Subject: multiple components/re -pairs in cookie filters --- README | 4 ++-- docs/README.uzbl-event-manager | 20 ++++++++++---------- examples/config/config | 6 +++++- examples/data/plugins/cookies.py | 28 ++++++++++++++++++---------- 4 files changed, 35 insertions(+), 23 deletions(-) (limited to 'examples') diff --git a/README b/README index a8c500c..d20cbd2 100644 --- a/README +++ b/README @@ -770,12 +770,12 @@ Events/requests which the EM and its plugins listens for move the cursor back by one character. * `START_COMPLETION`: TODO explain completion * `BLACKLIST_COOKIE`: add a rule for blacklisting cookies - - `request BLACKLIST_COOKIE `: Blacklist cookies where + - `request BLACKLIST_COOKIE [ ]*`: Blacklist cookies where `` matches ``. `` is one of `domain`, `path`, `name`, `value`, `scheme` or `expires`. * `WHITELIST_COOKIE`: add a rule for whitelisting cookies (if any whitelist is set then only cookies that are whitelisted cookies will be used) - - `request WHITELIST_COOKIE `: Whitelist cookies where + - `request WHITELIST_COOKIE [ ]*`: Whitelist cookies where `` matches ``. `` is one of `domain`, `path`, `name`, `value`, `scheme` or `expires`. diff --git a/docs/README.uzbl-event-manager b/docs/README.uzbl-event-manager index 074811e..b9467d7 100644 --- a/docs/README.uzbl-event-manager +++ b/docs/README.uzbl-event-manager @@ -83,17 +83,17 @@ events. If any whitelist is set, then any cookie that is not whitelisted will be rejected. Otherwise, only cookies that have been blacklisted will be rejected. -BLACKLIST_COOKIE - Adds a new blacklist filter. cookies where the component specified by - `part` matches the regular expression `re` will be filtered. part can be - either 0-5 or any of the symbolic names domain, path, name, value, scheme, - expires +BLACKLIST_COOKIE [ ]* + Adds a new blacklist filter. cookies where the components specified by + `component` matches the regular expression `re` will be filtered. component + may be either 0-5 or any of the symbolic names domain, path, name, value, + scheme, expires - for example to block all cookies which name is "__utm" followed by a single + for example to block all cookies which name is "__utm" followed by a single character (google analytics cookies) do. request BLACKLIST_COOKIE name '^__utm.$' -WHITELIST_COOKIE - Adds a new whitelist filter. cookies where the component specified by - `part` matches the regular expression `re` will be allowed. part can be any - of the parts allowed for the BLACKLIST_COOKIE event +WHITELIST_COOKIE [ ]* + Adds a new whitelist filter. cookies where the components specified by + `component` matches the regular expression `re` will be allowed. component + may be any of the components allowed for the BLACKLIST_COOKIE event diff --git a/examples/config/config b/examples/config/config index a2ecdb8..bdf1c00 100644 --- a/examples/config/config +++ b/examples/config/config @@ -129,7 +129,11 @@ set progress.pending = set useragent = Uzbl (Webkit @{WEBKIT_MAJOR}.@{WEBKIT_MINOR}) (@(+uname -sm)@ [@ARCH_UZBL]) # === Configure cookie blacklist ======================================================== -# Drop google analytics tracking cookies + +# Accept 'session cookies' from uzbl.org (when you have a whitelist all other cookies are dropped) +#request WHITELIST_COOKIE domain 'uzbl.org$' expires '^$' + +# Drop google analytics tracking cookies (applied after whitelists if any) #request BLACKLIST_COOKIE name '^__utm.$' # === Key binding configuration ============================================== diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py index 9eccace..6ee8798 100644 --- a/examples/data/plugins/cookies.py +++ b/examples/data/plugins/cookies.py @@ -106,8 +106,11 @@ DefaultStore = TextStore(os.path.join(xdg_data_home, 'uzbl/cookies.txt')) SessionStore = TextStore(os.path.join(xdg_data_home, 'uzbl/session-cookies.txt')) def match_list(_list, cookie): - for component, match in _list: - if match(cookie[component]) is not None: + for matcher in _list: + for component, match in matcher: + if match(cookie[component]) is None: + break + else: return True return False @@ -158,18 +161,21 @@ def delete_cookie(uzbl, cookie): store.delete_cookie(cookie, splitted) # add a cookie matcher to a whitelist or a blacklist. -# a matcher is a (component, re) tuple that matches a cookie when the +# a matcher is a list of (component, re) tuples that matches a cookie when the # "component" part of the cookie matches the regular expression "re". # "component" is one of the keys defined in the variable "symbolic" above, # or the index of a component of a cookie tuple. def add_cookie_matcher(_list, arg): - component, regexp = splitquoted(arg) - try: - component = symbolic[component] - except KeyError: - component = int(component) - assert component <= 5 - _list.append((component, re.compile(regexp).search)) + args = splitquoted(arg) + mlist = [] + for (component, regexp) in zip(args[0::2], args[1::2]): + try: + component = symbolic[component] + except KeyError: + component = int(component) + assert component <= 5 + mlist.append((component, re.compile(regexp).search)) + _list.append(mlist) def blacklist(uzbl, arg): add_cookie_matcher(uzbl.cookie_blacklist, arg) @@ -188,3 +194,5 @@ def init(uzbl): 'cookie_blacklist' : [], 'cookie_whitelist' : [] }) + +# vi: set et ts=4: -- cgit v1.2.3 From f93cce44561b2475965c91419e72895bc368918e Mon Sep 17 00:00:00 2001 From: keis Date: Sun, 23 Jan 2011 16:59:49 +0100 Subject: disable keycmd reset on mode change * makes history search work * adds new KEYCMD_CLEAR event * configure to clear keycmd on ESCAPE event --- examples/config/config | 1 + examples/data/plugins/bind.py | 3 ++- examples/data/plugins/history.py | 3 +++ examples/data/plugins/keycmd.py | 5 ++++- 4 files changed, 10 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index 4934469..2fea0d7 100644 --- a/examples/config/config +++ b/examples/config/config @@ -172,6 +172,7 @@ set ebind = @mode_bind global,-insert # Resets keycmd and returns to default mode. @on_event ESCAPE @set_mode +@on_event ESCAPE event KEYCMD_CLEAR @bind = event ESCAPE @bind [ = event ESCAPE diff --git a/examples/data/plugins/bind.py b/examples/data/plugins/bind.py index bf693b3..261dc5d 100644 --- a/examples/data/plugins/bind.py +++ b/examples/data/plugins/bind.py @@ -379,7 +379,6 @@ def mode_changed(uzbl, mode): if mode != 'stack': uzbl.bindlet.reset() - uzbl.clear_keycmd() def match_and_exec(uzbl, bind, depth, keylet, bindlet): @@ -470,3 +469,5 @@ def init(uzbl): 'mode_bind': mode_bind, 'bindlet': Bindlet(uzbl), }) + +# vi: set et ts=4: diff --git a/examples/data/plugins/history.py b/examples/data/plugins/history.py index 78a94ce..2ab2ce3 100644 --- a/examples/data/plugins/history.py +++ b/examples/data/plugins/history.py @@ -107,6 +107,7 @@ def history_next(uzbl, _x): def history_search(uzbl, key): uzbl.history.search(key) + uzbl.send('event HISTORY_PREV') uzbl.logger.debug('SEARCH %s %s' % (key, uzbl.history)) end_messages = ('Look behind you, A three-headed monkey!', 'error #4: static from nylon underwear.', 'error #5: static from plastic slide rules.', 'error #6: global warming.', 'error #9: doppler effect.', 'error #16: somebody was calculating pi on the server.', 'error #19: floating point processor overflow.', 'error #21: POSIX compliance problem.', 'error #25: Decreasing electron flux.', 'error #26: first Saturday after first full moon in Winter.', 'error #64: CPU needs recalibration.', 'error #116: the real ttys became pseudo ttys and vice-versa.', 'error #229: wrong polarity of neutron flow.', 'error #330: quantum decoherence.', 'error #388: Bad user karma.', 'error #407: Route flapping at the NAP.', 'error #435: Internet shut down due to maintenance.') @@ -127,3 +128,5 @@ def init(uzbl): # plugin after hook def after(uzbl): uzbl.on_set('keycmd_prompt', lambda uzbl, k, v: uzbl.history.change_prompt(v)) + +# vi: set et ts=4: diff --git a/examples/data/plugins/keycmd.py b/examples/data/plugins/keycmd.py index 2fb2283..928c597 100644 --- a/examples/data/plugins/keycmd.py +++ b/examples/data/plugins/keycmd.py @@ -210,7 +210,7 @@ def modkey_addition_parse(uzbl, modkeys): add_modkey_addition(uzbl, keys[:-1], keys[-1]) -def clear_keycmd(uzbl): +def clear_keycmd(uzbl, *args): '''Clear the keycmd for this uzbl instance.''' k = uzbl.keylet @@ -493,6 +493,7 @@ def init(uzbl): 'KEYCMD_DELETE': keycmd_delete, 'KEYCMD_EXEC_CURRENT': keycmd_exec_current, 'KEYCMD_STRIP_WORD': keycmd_strip_word, + 'KEYCMD_CLEAR': clear_keycmd, 'KEY_PRESS': key_press, 'KEY_RELEASE': key_release, 'MODKEY_ADDITION': modkey_addition_parse, @@ -514,3 +515,5 @@ def init(uzbl): 'set_cursor_pos': set_cursor_pos, 'set_keycmd': set_keycmd, }) + +# vi: set et ts=4: -- cgit v1.2.3 From 42ead959c23fdaacb530744139be2bb94600be3d Mon Sep 17 00:00:00 2001 From: keis Date: Sun, 23 Jan 2011 21:14:42 +0100 Subject: clear keycmd after following link in follow.sh --- examples/data/scripts/follow.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh index d1560bf..d7fe117 100755 --- a/examples/data/scripts/follow.sh +++ b/examples/data/scripts/follow.sh @@ -17,5 +17,5 @@ case $result in echo 'event FORM_ACTIVE' > "$UZBL_FIFO" ;; *XXXRESET_MODEXXX*) # a link was selected, reset uzbl's input mode - echo 'set mode=' > "$UZBL_FIFO" ;; + printf 'set mode=\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO" ;; esac -- cgit v1.2.3 From a159bc7c3f437857f3684959caeeee9e33972598 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Fri, 7 Jan 2011 12:20:52 -0700 Subject: tidying after the history branch merge --- examples/config/config | 3 +-- examples/data/plugins/bind.py | 2 -- examples/data/plugins/history.py | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index 2fea0d7..c708576 100644 --- a/examples/config/config +++ b/examples/config/config @@ -200,8 +200,7 @@ set ebind = @mode_bind global,-insert #@ebind du = event APPEND_KEYCMD \@uri #@ebind dt = event APPEND_KEYCMD \@title - -# === Mouse bindings ========================================================= +# --- Mouse bindings --------------------------------------------------------- # Middle click open in new window @bind = sh 'if [ "$1" ]; then echo "event REQ_NEW_WINDOW $1" > "$UZBL_FIFO"; else echo "uri $(xclip -o | sed s/\\\@/%40/g)" > "$UZBL_FIFO"; fi' '\@SELECTED_URI' diff --git a/examples/data/plugins/bind.py b/examples/data/plugins/bind.py index 261dc5d..41f96c5 100644 --- a/examples/data/plugins/bind.py +++ b/examples/data/plugins/bind.py @@ -420,8 +420,6 @@ def match_and_exec(uzbl, bind, depth, keylet, bindlet): if not has_args or on_exec: del uzbl.config['mode'] bindlet.reset() - # cleared by keycmd_exec_current, why is this here? breaks history - #uzbl.clear_current() return True diff --git a/examples/data/plugins/history.py b/examples/data/plugins/history.py index 2ab2ce3..5e9e4e1 100644 --- a/examples/data/plugins/history.py +++ b/examples/data/plugins/history.py @@ -42,7 +42,6 @@ class History(object): self.search_key = None if self._temporary: - print 'popping temporary' return self._temporary.pop() return '' @@ -73,8 +72,6 @@ class History(object): self._temporary.append(cmd) self.cursor = len(self) - 1 - print 'adding temporary', self - def __getitem__(self, i): if i < len(shared_history[self.prompt]): return shared_history[self.prompt][i] -- cgit v1.2.3 From 8ae529244eeefa13b43a08593eedf80cf6d3a2b3 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 10 Jan 2011 10:28:49 -0700 Subject: document history plugin and add example HISTORY_SEARCH binding --- docs/README.uzbl-event-manager | 19 +++++++++++++++++++ examples/config/config | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/docs/README.uzbl-event-manager b/docs/README.uzbl-event-manager index 074811e..92f0228 100644 --- a/docs/README.uzbl-event-manager +++ b/docs/README.uzbl-event-manager @@ -97,3 +97,22 @@ WHITELIST_COOKIE Adds a new whitelist filter. cookies where the component specified by `part` matches the regular expression `re` will be allowed. part can be any of the parts allowed for the BLACKLIST_COOKIE event + +### history.py ### +- Status bar command history +- Connects To: (KEYCMD_EXEC, HISTORY_PREV, HISTORY_NEXT, HISTORY_SEARCH) + +Records commands that are typed into the status bar so that they can be +recalled. The same history is shared by all uzbl instances connected to the +same event manager. + +HISTORY_PREV + Iterates backwards through commands that have been issued (filtered by the + last HISTORY_SEARCH if applicable). + +HISTORY_NEXT + Iterates forwards through commands that have been issued (filtered by the + last HISTORY_SEARCH if applicable). + +HISTORY_SEARCH + Searches backwards through command history for an exact string. diff --git a/examples/config/config b/examples/config/config index c708576..864d37e 100644 --- a/examples/config/config +++ b/examples/config/config @@ -193,7 +193,7 @@ set ebind = @mode_bind global,-insert @ebind = event HISTORY_PREV @ebind = event HISTORY_NEXT -@ebind r_ = event HISTORY_SEARCH %s +@ebind r_ = event HISTORY_SEARCH %s # Keycmd injection/append examples. #@ebind su = event INJECT_KEYCMD \@uri #@ebind st = event INJECT_KEYCMD \@title -- cgit v1.2.3 From 90dd4c0ad5e7585b6226a4c591a7783edd6c5f66 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 14 Feb 2011 23:11:04 -0700 Subject: correct per-site-settings example --- examples/data/per-site-settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/per-site-settings b/examples/data/per-site-settings index 78bade4..d02d7a7 100644 --- a/examples/data/per-site-settings +++ b/examples/data/per-site-settings @@ -1,3 +1,3 @@ .* .*/\d+-\w+/(thread|subject|author|date).html - script @data_home/uzbl/scripts/pipermail.js + script @scripts_dir/pipermail.js -- cgit v1.2.3 From 713c9bb02b9bab9956f8e5439a0d47e7dedfaf24 Mon Sep 17 00:00:00 2001 From: keis Date: Sat, 15 Jan 2011 22:16:42 +0100 Subject: grok quoted strings in a select places in the em --- examples/data/plugins/config.py | 10 +++++++++- examples/data/plugins/cookies.py | 11 +++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/data/plugins/config.py b/examples/data/plugins/config.py index ed2d761..dde4ae1 100644 --- a/examples/data/plugins/config.py +++ b/examples/data/plugins/config.py @@ -2,8 +2,16 @@ from re import compile from types import BooleanType from UserDict import DictMixin +_unquote = compile("'(.*?)'|\"(.*?)\"") +def unquote(s): + m = _unquote.match(s) + if m is not None: + return unicode(m.group(1)).decode('string_escape') + return unicode(s).decode('string_escape') + + valid_key = compile('^[A-Za-z0-9_\.]+$').match -types = {'int': int, 'float': float, 'str': unicode} +types = {'int': int, 'float': float, 'str': unquote} escape = lambda s: unicode(s).replace('\n', '\\n') class Config(DictMixin): diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py index 6ee8798..05a8901 100644 --- a/examples/data/plugins/cookies.py +++ b/examples/data/plugins/cookies.py @@ -7,9 +7,16 @@ import os, re # these are symbolic names for the components of the cookie tuple symbolic = {'domain': 0, 'path':1, 'name':2, 'value':3, 'scheme':4, 'expires':5} -_splitquoted = re.compile("( |\\\".*?\\\"|'.*?')") +_unquote = re.compile("'(.*?)'|\"(.*?)\"") +def unquote(s): + m = _unquote.match(s) + if m is not None: + return unicode(m.group(1)).decode('string_escape') + return unicode(s).decode('string_escape') + +_splitquoted = re.compile("( |\"(?:\\\\.|[^\"])*?\"|'(?:\\\\.|[^'])*?')") def splitquoted(text): - return [str(p.strip('\'"')) for p in _splitquoted.split(text) if p.strip()] + return [unquote(p) for p in _splitquoted.split(text) if p.strip()] # allows for partial cookies # ? allow wildcard in key -- cgit v1.2.3 From 3594f35e565ebf210b583bcc3c4df042e0dc4191 Mon Sep 17 00:00:00 2001 From: keis Date: Sun, 23 Jan 2011 21:57:16 +0100 Subject: move common function related to escaping to Plugin --- examples/data/plugins/bind.py | 9 --------- examples/data/plugins/config.py | 14 +++----------- examples/data/plugins/cookies.py | 11 ----------- examples/data/scripts/uzbl-event-manager | 20 +++++++++++++++++++- 4 files changed, 22 insertions(+), 32 deletions(-) (limited to 'examples') diff --git a/examples/data/plugins/bind.py b/examples/data/plugins/bind.py index 41f96c5..69fd863 100644 --- a/examples/data/plugins/bind.py +++ b/examples/data/plugins/bind.py @@ -164,15 +164,6 @@ def split_glob(glob): return (mods, glob) -def unquote(str): - '''Remove quotation marks around string.''' - - if str and str[0] == str[-1] and str[0] in ['"', "'"]: - str = str[1:-1] - - return str - - class Bind(object): # Class attribute to hold the number of Bind classes created. diff --git a/examples/data/plugins/config.py b/examples/data/plugins/config.py index dde4ae1..b7ecf42 100644 --- a/examples/data/plugins/config.py +++ b/examples/data/plugins/config.py @@ -2,17 +2,7 @@ from re import compile from types import BooleanType from UserDict import DictMixin -_unquote = compile("'(.*?)'|\"(.*?)\"") -def unquote(s): - m = _unquote.match(s) - if m is not None: - return unicode(m.group(1)).decode('string_escape') - return unicode(s).decode('string_escape') - - valid_key = compile('^[A-Za-z0-9_\.]+$').match -types = {'int': int, 'float': float, 'str': unquote} -escape = lambda s: unicode(s).replace('\n', '\\n') class Config(DictMixin): def __init__(self, uzbl): @@ -57,7 +47,7 @@ class Config(DictMixin): value = int(value) else: - value = escape(value) + value = value.encode('unicode_escape') if not force and key in self and self[key] == value: return @@ -90,6 +80,8 @@ def parse_set_event(uzbl, args): # plugin init hook def init(uzbl): + global types + types = {'int': int, 'float': float, 'str': unquote} export(uzbl, 'config', Config(uzbl)) connect(uzbl, 'VARIABLE_SET', parse_set_event) diff --git a/examples/data/plugins/cookies.py b/examples/data/plugins/cookies.py index 05a8901..e29ee36 100644 --- a/examples/data/plugins/cookies.py +++ b/examples/data/plugins/cookies.py @@ -7,17 +7,6 @@ import os, re # these are symbolic names for the components of the cookie tuple symbolic = {'domain': 0, 'path':1, 'name':2, 'value':3, 'scheme':4, 'expires':5} -_unquote = re.compile("'(.*?)'|\"(.*?)\"") -def unquote(s): - m = _unquote.match(s) - if m is not None: - return unicode(m.group(1)).decode('string_escape') - return unicode(s).decode('string_escape') - -_splitquoted = re.compile("( |\"(?:\\\\.|[^\"])*?\"|'(?:\\\\.|[^'])*?')") -def splitquoted(text): - return [unquote(p) for p in _splitquoted.split(text) if p.strip()] - # allows for partial cookies # ? allow wildcard in key def match(key, cookie): diff --git a/examples/data/scripts/uzbl-event-manager b/examples/data/scripts/uzbl-event-manager index 8ad3af7..d47318a 100755 --- a/examples/data/scripts/uzbl-event-manager +++ b/examples/data/scripts/uzbl-event-manager @@ -34,6 +34,7 @@ import socket import sys import time import weakref +import re from collections import defaultdict from functools import partial from glob import glob @@ -169,13 +170,16 @@ class EventHandler(object): self.callback(uzbl, *args, **kwargs) + + + class Plugin(object): '''Plugin module wrapper object.''' # Special functions exported from the Plugin instance to the # plugin namespace. special_functions = ['require', 'export', 'export_dict', 'connect', - 'connect_dict', 'logger'] + 'connect_dict', 'logger', 'unquote', 'splitquoted'] def __init__(self, parent, name, path, plugin): @@ -291,6 +295,20 @@ class Plugin(object): assert plugin in self.parent.plugins, self.logger.critical( 'plugin %r required by plugin %r' (plugin, self.name)) + @classmethod + def unquote(cls, s): + '''Removes quotation marks around strings if any and interprets + \\-escape sequences using `unicode_escape`''' + if s and s[0] == s[-1] and s[0] in ['"', "'"]: + s = s[1:-1] + return unicode(s).decode('unicode_escape') + + _splitquoted = re.compile("( |\"(?:\\\\.|[^\"])*?\"|'(?:\\\\.|[^'])*?')") + @classmethod + def splitquoted(cls, text): + '''Splits string on whitespace while respecting quotations''' + return [cls.unquote(p) for p in cls._splitquoted.split(text) if p.strip()] + class Uzbl(object): def __init__(self, parent, child_socket): -- cgit v1.2.3 From e2e1f6203fa8e9bdbae567cfbec1ee341c10282b Mon Sep 17 00:00:00 2001 From: keis Date: Mon, 24 Jan 2011 18:59:17 +0100 Subject: don't escape in Config.set escapes should be done by caller checks for plain newline as these would break stuff --- examples/data/plugins/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/data/plugins/config.py b/examples/data/plugins/config.py index b7ecf42..c9bdf67 100644 --- a/examples/data/plugins/config.py +++ b/examples/data/plugins/config.py @@ -47,7 +47,8 @@ class Config(DictMixin): value = int(value) else: - value = value.encode('unicode_escape') + value = unicode(value) + assert '\n' not in value if not force and key in self and self[key] == value: return -- cgit v1.2.3 From 70b9ba7440c5164c90f61ddf4d988f32019a5ecc Mon Sep 17 00:00:00 2001 From: keis Date: Mon, 7 Feb 2011 11:11:41 +0100 Subject: use string_escape to remove \-escapes unicode_escape fails on non-ascii chars. --- examples/data/scripts/uzbl-event-manager | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/uzbl-event-manager b/examples/data/scripts/uzbl-event-manager index d47318a..cb462c7 100755 --- a/examples/data/scripts/uzbl-event-manager +++ b/examples/data/scripts/uzbl-event-manager @@ -298,10 +298,10 @@ class Plugin(object): @classmethod def unquote(cls, s): '''Removes quotation marks around strings if any and interprets - \\-escape sequences using `unicode_escape`''' + \\-escape sequences using `string_escape`''' if s and s[0] == s[-1] and s[0] in ['"', "'"]: s = s[1:-1] - return unicode(s).decode('unicode_escape') + return s.encode('utf-8').decode('string_escape').decode('utf-8') _splitquoted = re.compile("( |\"(?:\\\\.|[^\"])*?\"|'(?:\\\\.|[^'])*?')") @classmethod @@ -987,3 +987,5 @@ if __name__ == "__main__": daemon_actions[action]() logger.debug('process CPU time: %f' % time.clock()) + +# vi: set et ts=4: -- cgit v1.2.3 From 3cb9af3b4457f5c6aec1eae2acf552aad8a3e6db Mon Sep 17 00:00:00 2001 From: keis Date: Sun, 23 Jan 2011 22:06:33 +0100 Subject: support quoted events in a few more places * downloads * on_event handlers --- examples/data/plugins/downloads.py | 18 +++++++++++++----- examples/data/plugins/on_event.py | 6 ++++++ 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/data/plugins/downloads.py b/examples/data/plugins/downloads.py index 7bf32d7..8d796ce 100644 --- a/examples/data/plugins/downloads.py +++ b/examples/data/plugins/downloads.py @@ -31,7 +31,11 @@ def update_download_section(uzbl): if uzbl.config.get('downloads', '') != result: uzbl.config['downloads'] = result -def download_started(uzbl, destination_path): +def download_started(uzbl, args): + # parse the arguments + args = splitquoted(args) + destination_path = args[0] + # add to the list of active downloads global ACTIVE_DOWNLOADS ACTIVE_DOWNLOADS[destination_path] = (0.0,) @@ -41,9 +45,9 @@ def download_started(uzbl, destination_path): def download_progress(uzbl, args): # parse the arguments - s = args.rindex(' ') - destination_path = args[:s] - progress = float(args[s+1:]) + args = splitquoted(args) + destination_path = args[0] + progress = float(args[1]) # update the progress global ACTIVE_DOWNLOADS @@ -52,7 +56,11 @@ def download_progress(uzbl, args): # update the status bar variable update_download_section(uzbl) -def download_complete(uzbl, destination_path): +def download_complete(uzbl, args): + # parse the arguments + args = splitquoted(args) + destination_path = args[0] + # remove from the list of active downloads global ACTIVE_DOWNLOADS del ACTIVE_DOWNLOADS[destination_path] diff --git a/examples/data/plugins/on_event.py b/examples/data/plugins/on_event.py index 5142275..32f09e2 100644 --- a/examples/data/plugins/on_event.py +++ b/examples/data/plugins/on_event.py @@ -24,6 +24,10 @@ def event_handler(uzbl, *args, **kargs): '''This function handles all the events being watched by various on_event definitions and responds accordingly.''' + # Could be connected to a EM internal event that can use anything as args + if len(args) == 1 and isinstance(args[0], basestring): + args = splitquoted(args[0]) + events = uzbl.on_events event = kargs['on_event'] if event not in events: @@ -80,3 +84,5 @@ def cleanup(uzbl): del handlers[:] uzbl.on_events.clear() + +# vi: set et ts=4: -- cgit v1.2.3 From 05357cb88daca76428437a960f973f8a4058938f Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 16 Feb 2011 17:19:58 -0700 Subject: add taylanub's formfiller as-is --- examples/data/scripts/formfiller.js | 67 ++++++++ examples/data/scripts/formfiller.sh | 329 +++++++++++++++--------------------- 2 files changed, 205 insertions(+), 191 deletions(-) create mode 100644 examples/data/scripts/formfiller.js mode change 100755 => 100644 examples/data/scripts/formfiller.sh (limited to 'examples') diff --git a/examples/data/scripts/formfiller.js b/examples/data/scripts/formfiller.js new file mode 100644 index 0000000..abf0162 --- /dev/null +++ b/examples/data/scripts/formfiller.js @@ -0,0 +1,67 @@ +uzbl.formfiller = { + + dump: function() { + var rv = ''; + var allFrames = new Array(window); + for ( f=0; f -# files contain lines like: !profile= -# (fieldtype): -# profile_name should be replaced with a name that will tell sth about that -# profile -# fieldtype can be checkbox, text or password, textarea - only for information -# pupropse (auto-generated) - don't change that -# -# Texteares: for textareas edited text can be now splitted into more lines. -# If there will be text, that doesn't match key line: -# (fieldtype): -# then it will be considered as a multiline for the first field above it -# Keep in mind, that if you make more than one line for fileds like input -# text fields, then all lines will be inserted into as one line -# -# Checkboxes/radio-buttons: to uncheck it type on of the following after the -# colon: -# no -# off -# 0 -# unchecked -# false -# or leave it blank, even without spaces -# otherwise it will be considered as checked -# -# user arg 1: -# edit: force editing the file (falls back to new if not found) -# new: start with a new file. -# load: try to load from file into form -# add: try to add another profile to an existing file -# once: edit form using external editor -# -# something else (or empty): if file not available: new, otherwise load. +# action +# new: add new profile template (creates file if not found), then edit +# edit: edit file (fall back to 'new' if file not found) +# load: load from file +# once: use temporary file to edit form once +# (empty): if file not available, new; otherwise, load # -DMENU_ARGS="-i" -DMENU_SCHEMA="formfiller" -DMENU_LINES="3" -DMENU_PROMPT="Choose profile" -DMENU_OPTIONS="vertical resize" +action=$1 +shift $# + +keydir=$HOME/etc/uzbl/dforms + +mkdir -p "$keydir" || exit + +Ed () { "${VTERM:-xterm}" -e "${VISUAL:-${EDITOR:-vi}}" "$@"; } + +Dmenu () +{ + dmenu -p "choose profile" \ + ${DMENU_FONT+-fn "$DMENU_FONT"} \ + -nb "#0f0f0f" -nf "#4e7093" -sb "#003d7c" -sf "#3a9bff" \ + -l 4 \ + "$@" +} + +domain=${UZBL_URI#*://} +domain=${domain%%/*} + +test "$domain" || exit + +file=$keydir/$domain + +GenForm () +{ + echo 'js uzbl.formfiller.dump();' \ + | socat - unix-connect:"$UZBL_SOCKET" \ + | awk ' + /^formfillerstart$/ { + while (getline) { + if ( /^%!end/ ) exit + print + } + } + ' +} + +GetOption () + if [ $(grep -c '^!profile' "$1") -gt 1 ] + then sed -n 's/^!profile=//p' "$1" | Dmenu + else sed -n 's/^!profile=//p' "$1" + fi + +ParseProfile () +{ + sed "/^>/d; /^!profile=$1$/,/^!/!d; /^!/d" +} + +ParseFields () +{ + awk '/^%/ { + + sub ( /%/, "" ) + + split( $0, parts, /\(|\)|\{|\}/ ) + + field = $0 + sub ( /[^:]*:/, "", field ) + + if ( parts[2] ~ /(text|password|search)/ ) + printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n", + parts[1], parts[2], field ) + + else if ( parts[2] ~ /(checkbox|radio)/ ) + printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",%s);\n", + parts[1], parts[2], parts[3], field ) + + else if ( parts[2] == "textarea" ) { + field = "" + while (getline) { + if ( /^%/ ) break + sub ( /^\\/, "" ) + gsub ( /"/, "\\\"" ) + gsub ( /\\/, "\\\\" ) + field = field $0 "\\n" + } + printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n", + parts[1], parts[2], field ) + } + + }' +} + +New () +{ + { echo '!profile=NAME_THIS_PROFILE' + GenForm | sed 's/^!/\\!/' + echo '!' + } >> "$file" + chmod 600 "$file" + Ed "$file" +} + +Edit () + if [ -e "$file" ] + then Ed "$file" + else New + fi -. $UZBL_UTIL_DIR/dmenu.sh -. $UZBL_UTIL_DIR/editor.sh -. $UZBL_UTIL_DIR/uzbl-dir.sh +Load () +{ + test -e "$file" || exit -RAND=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c 1-5) -MODELINE="> vim:ft=formfiller" + option=$(GetOption "$file") -[ -d "$(dirname $UZBL_FORMS_DIR)" ] || exit 1 -[ -d $UZBL_FORMS_DIR ] || mkdir $UZBL_FORMS_DIR || exit 1 + case $option in *[!a-zA-Z0-9_-]*) exit 1; esac -action=$1 + ParseProfile $option < "$file" \ + | ParseFields \ + | sed 's/@/\\@/' \ + > "$UZBL_FIFO" +} -domain=$(echo $UZBL_URI | sed 's/\(http\|https\):\/\/\([^\/]\+\)\/.*/\2/') - -if [ "$action" != 'edit' -a "$action" != 'new' -a "$action" != 'load' -a "$action" != 'add' -a "$action" != 'once' ]; then - action="new" - [ -e "$UZBL_FORMS_DIR/$domain" ] && action="load" -elif [ "$action" = 'edit' ] && [ ! -e "$UZBL_FORMS_DIR/$domain" ]; then - action="new" -fi - -dumpFunction="function dump() { \ - var rv=''; \ - var allFrames = new Array(window); \ - for(f=0;f/d' -i $tmpfile - - sed 's/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):\(off\|no\|false\|unchecked\|0\|$\)/\1{\2}(\3):0/I;s/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[^0]\+/\1{\2}(\3):1/I' -i $UZBL_FORMS_DIR/$domain - fields=$(cat $UZBL_FORMS_DIR/$domain | \ - sed -n "/^!profile=${option}/,/^!profile=/p" | \ - sed '/^!profile=/d' | \ - sed 's/^\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):/%{>\1\2):<}%/' | \ - sed 's/^\(.\+\)$/<{br}>\1/' | \ - tr -d '\n' | \ - sed 's/<{br}>%{>\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):<}%/\\n\1\2):/g') - printf '%s\n' "${fields}" | \ - sed -n -e "s/\([^(]\+\)(\(password\|text\|search\|textarea\)\+):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\2', '\3', 0);/p" | \ - sed -e 's/@/\\@/g;s/<{br}>/\\\\n/g' | socat - unix-connect:$UZBL_SOCKET - printf '%s\n' "${fields}" | \ - sed -n -e "s/\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\3', '\2', \4);/p" | \ - sed -e 's/@/\\@/g' | socat - unix-connect:$UZBL_SOCKET -elif [ "$action" = "once" ]; then - tmpfile=$(mktemp) - printf 'js %s dump(); \n' "$dumpFunction" | \ - socat - unix-connect:$UZBL_SOCKET | \ - sed -n '/^[^(]\+([^)]\+):/p' > $tmpfile - echo "$MODELINE" >> $tmpfile - $UZBL_EDITOR $tmpfile - - [ -e $tmpfile ] || exit 2 - - # Remove comments - sed '/^>/d' -i $tmpfile - - sed 's/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):\(off\|no\|false\|unchecked\|0\|$\)/\1{\2}(\3):0/I;s/^\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[^0]\+/\1{\2}(\3):1/I' -i $tmpfile - fields=$(cat $tmpfile | \ - sed 's/^\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):/%{>\1\2):<}%/' | \ - sed 's/^\(.\+\)$/<{br}>\1/' | \ - tr -d '\n' | \ - sed 's/<{br}>%{>\([^(]\+(\)\(radio\|checkbox\|text\|search\|textarea\|password\)):<}%/\\n\1\2):/g') - printf '%s\n' "${fields}" | \ - sed -n -e "s/\([^(]\+\)(\(password\|text\|search\|textarea\)\+):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\2', '\3', 0);/p" | \ - sed -e 's/@/\\@/g;s/<{br}>/\\\\n/g' | socat - unix-connect:$UZBL_SOCKET - printf '%s\n' "${fields}" | \ - sed -n -e "s/\([^{]\+\){\([^}]*\)}(\(radio\|checkbox\)):[ ]*\(.\+\)/js $insertFunction; insert('\1', '\3', '\2', \4);/p" | \ - sed -e 's/@/\\@/g' | socat - unix-connect:$UZBL_SOCKET - rm -f $tmpfile -else - if [ "$action" = 'new' -o "$action" = 'add' ]; then - [ "$action" = 'new' ] && echo "$MODELINE" > $UZBL_FORMS_DIR/$domain - echo "!profile=NAME_THIS_PROFILE$RAND" >> $UZBL_FORMS_DIR/$domain - # - # 2. and 3. line (tr -d and sed) are because, on gmail login for example, - # tag is splited into lines - # ex: - # - # So, tr removes all new lines, and sed inserts new line after each > - # Next sed selects only tags and only with type = "text" or = "password" - # If type is first and name is second, then another sed will change their order - # so the last sed will make output - # text_from_the_name_attr(text or password): - # - # login(text): - # passwd(password): - # - printf 'js %s dump(); \n' "$dumpFunction" | \ - socat - unix-connect:$UZBL_SOCKET | \ - sed -n '/^[^(]\+([^)]\+):/p' >> $UZBL_FORMS_DIR/$domain - fi - [ -e "$UZBL_FORMS_DIR/$domain" ] || exit 3 #this should never happen, but you never know. - $UZBL_EDITOR "$UZBL_FORMS_DIR/$domain" #TODO: if user aborts save in editor, the file is already overwritten -fi + GenForm > "$tmpfile" + chmod 600 "$tmpfile" + + Ed "$tmpfile" + + test -e "$tmpfile" && + ParseFields < "$tmpfile" \ + | sed 's/@/\\@' \ + > "$UZBL_FIFO" +} -# vim:fileencoding=utf-8:sw=4 +case $action in + new) New; Load ;; + edit) Edit; Load ;; + load) Load ;; + once) Once ;; + '') if [ -e "$file" ]; then Load; else New; Load; fi ;; + *) exit 1 +esac -- cgit v1.2.3 From 82fa30898161800e2a4fdc8129d1f99cdd4c545e Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 16 Feb 2011 21:34:10 -0700 Subject: formfiller: use the util dir for file location, editor and dmenu config --- examples/data/scripts/formfiller.sh | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) mode change 100644 => 100755 examples/data/scripts/formfiller.sh (limited to 'examples') diff --git a/examples/data/scripts/formfiller.sh b/examples/data/scripts/formfiller.sh old mode 100644 new mode 100755 index 9b35fbe..3dc9dc4 --- a/examples/data/scripts/formfiller.sh +++ b/examples/data/scripts/formfiller.sh @@ -9,29 +9,18 @@ # action=$1 -shift $# -keydir=$HOME/etc/uzbl/dforms +. "$UZBL_UTIL_DIR/uzbl-dir.sh" +. "$UZBL_UTIL_DIR/editor.sh" -mkdir -p "$keydir" || exit - -Ed () { "${VTERM:-xterm}" -e "${VISUAL:-${EDITOR:-vi}}" "$@"; } - -Dmenu () -{ - dmenu -p "choose profile" \ - ${DMENU_FONT+-fn "$DMENU_FONT"} \ - -nb "#0f0f0f" -nf "#4e7093" -sb "#003d7c" -sf "#3a9bff" \ - -l 4 \ - "$@" -} +mkdir -p "$UZBL_FORMS_DIR" || exit domain=${UZBL_URI#*://} domain=${domain%%/*} test "$domain" || exit -file=$keydir/$domain +file=$UZBL_FORMS_DIR/$domain GenForm () { @@ -48,10 +37,18 @@ GenForm () } GetOption () +{ + DMENU_SCHEME=formfiller + DMENU_PROMPT="choose profile" + DMENU_LINES=4 + + . "$UZBL_UTIL_DIR/dmenu.sh" + if [ $(grep -c '^!profile' "$1") -gt 1 ] - then sed -n 's/^!profile=//p' "$1" | Dmenu + then sed -n 's/^!profile=//p' "$1" | $DMENU else sed -n 's/^!profile=//p' "$1" fi +} ParseProfile () { @@ -100,12 +97,12 @@ New () echo '!' } >> "$file" chmod 600 "$file" - Ed "$file" + $UZBL_EDITOR "$file" } Edit () if [ -e "$file" ] - then Ed "$file" + then $UZBL_EDITOR "$file" else New fi @@ -131,7 +128,7 @@ Once () GenForm > "$tmpfile" chmod 600 "$tmpfile" - Ed "$tmpfile" + $UZBL_EDITOR "$tmpfile" test -e "$tmpfile" && ParseFields < "$tmpfile" \ -- cgit v1.2.3 From 303aeea88f99ec3505a17f36e5ee420830fe298a Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 16 Feb 2011 21:52:10 -0700 Subject: updated config for the new formfiller --- examples/config/config | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index bc07b0c..1ec462d 100644 --- a/examples/config/config +++ b/examples/config/config @@ -69,6 +69,10 @@ set download_handler = sync_spawn @scripts_dir/download.sh # Load commit handlers @on_event LOAD_COMMIT @set_status recv + # add some javascript to the page for other 'js' and 'script' commands to access later. +@on_event LOAD_COMMIT js uzbl = {}; +@on_event LOAD_COMMIT script @scripts_dir/formfiller.js + # Userscripts/per-site-settings. See the script and the example configuration for details #@on_event LOAD_COMMIT spawn @scripts_dir/per-site-settings.py @data_home/uzbl/per-site-settings -- cgit v1.2.3 From 6adefaba33cae17f59aecd078ac909d553af468a Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 21 Feb 2011 15:25:18 -0700 Subject: new escaped events require new scroll percentage binding --- examples/config/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index bc07b0c..d5555e0 100644 --- a/examples/config/config +++ b/examples/config/config @@ -85,7 +85,7 @@ set download_handler = sync_spawn @scripts_dir/download.sh #@on_event CONFIG_CHANGED print Config changed: %1 = %2 # Scroll percentage calculation -@on_event SCROLL_VERT set scroll_message = \@<(function(){var a='%1'.split(' ');var p='--';if(a[2]!=a[1]){p=(a[0]/(a[2]-a[3]));p=Math.round(10000*p)/100;};return p+'%';})()>\@ +@on_event SCROLL_VERT set scroll_message = \@<(function(){var p='--';if(%3!=%2){p=(%1/(%3-%4));p=Math.round(10000*p)/100;};return p+'%';})()>\@ # === Behaviour and appearance =============================================== -- cgit v1.2.3 From 80fda6e7880e598be9f7e7425e66c7b7eaa04e2a Mon Sep 17 00:00:00 2001 From: keis Date: Sat, 26 Feb 2011 23:44:28 +0100 Subject: replace follow.js with taylanUBs version --- examples/data/scripts/follow.js | 282 +++++++++++++++++++--------------------- 1 file changed, 131 insertions(+), 151 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index d995696..b0c4643 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -1,43 +1,47 @@ /* This is the basic linkfollowing script. * Its pretty stable, and you configure which keys to use for hinting * - * TODO: Some pages mess around a lot with the zIndex which - * lets some hints in the background. - * TODO: Some positions are not calculated correctly (mostly - * because of uber-fancy-designed-webpages. Basic HTML and CSS - * works good - * TODO: Still some links can't be followed/unexpected things - * happen. Blame some freaky webdesigners ;) + * TODO: + * Some pages mess around a lot with the zIndex which + * lets some hints in the background. + * Some positions are not calculated correctly (mostly + * because of uber-fancy-designed-webpages. Basic HTML and CSS + * works good + * Still some links can't be followed/unexpected things + * happen. Blame some freaky webdesigners ;) */ -//Just some shortcuts and globals -var uzblid = 'uzbl_link_hint'; -var uzbldivid = uzblid + '_div_container'; -var doc = document; -var win = window; -var links = document.links; -var forms = document.forms; -//Make onlick-links "clickable" -try { - HTMLElement.prototype.click = function() { - if (typeof this.onclick == 'function') { - this.onclick({ - type: 'click' - }); +uzbl.follow = function() { + + // Export + charset = arguments[0] + keypress = arguments[1] + newwindow = arguments[2] + + // Some shortcuts and globals + uzblid = 'uzbl_link_hint'; + uzbldivid = uzblid + '_div_container'; + doc = document; + win = window; + links = doc.links; + forms = doc.forms; + + // Make onclick-links "clickable" + try { + HTMLElement.prototype.click = function() { + if (typeof this.onclick == 'function') { + this.onclick({ type: 'click' }); + } } - }; -} catch(e) {} -//Catch the ESC keypress to stop linkfollowing -function keyPressHandler(e) { - var kC = window.event ? event.keyCode: e.keyCode; - var Esc = window.event ? 27 : e.DOM_VK_ESCAPE; - if (kC == Esc) { - removeAllHints(); - } + } catch(e) {} + + arguments.callee.followLinks(keypress); + } -//Calculate element position to draw the hint -//Pretty accurate but on fails in some very fancy cases -function elementPosition(el) { + +// Calculate element position to draw the hint +// Pretty accurate but fails in some very fancy cases +uzbl.follow.elementPosition = function(el) { var up = el.offsetTop; var left = el.offsetLeft; var width = el.offsetWidth; @@ -49,171 +53,155 @@ function elementPosition(el) { } return [up, left, width, height]; } -//Calculate if an element is visible -function isVisible(el) { - if (el == doc) { - return true; - } - if (!el) { - return false; - } - if (!el.parentNode) { - return false; - } + +// Calculate if an element is visible +uzbl.follow.isVisible = function(el) { + if (el == doc) return true; + if (!el) return false; + if (!el.parentNode) return false; + if (el.style) { - if (el.style.display == 'none') { - return false; - } - if (el.style.visibility == 'hidden') { - return false; - } + if (el.style.display == 'none') return false; + if (el.style.visibility == 'hidden') return false; } - return isVisible(el.parentNode); + return this.isVisible(el.parentNode); } -//Calculate if an element is on the viewport. -function elementInViewport(el) { - offset = elementPosition(el); + +// Calculate if an element is on the viewport. +uzbl.follow.elementInViewport = function(el) { + offset = this.elementPosition(el); var up = offset[0]; var left = offset[1]; var width = offset[2]; var height = offset[3]; return up < window.pageYOffset + window.innerHeight && left < window.pageXOffset + window.innerWidth && (up + height) > window.pageYOffset && (left + width) > window.pageXOffset; } -//Removes all hints/leftovers that might be generated -//by this script. -function removeAllHints() { + +// Removes all hints/leftovers that might be generated +// by this script. +uzbl.follow.removeAllHints = function() { var elements = doc.getElementById(uzbldivid); - if (elements) { - elements.parentNode.removeChild(elements); - } + if (elements) elements.parentNode.removeChild(elements); } -//Generate a hint for an element with the given label -//Here you can play around with the style of the hints! -function generateHint(el, label) { - var pos = elementPosition(el); + +// Generate a hint for an element with the given label +// Here you can play around with the style of the hints! +uzbl.follow.generateHint = function(el, label) { + var pos = this.elementPosition(el); var hint = doc.createElement('div'); hint.setAttribute('name', uzblid); hint.innerText = label; hint.style.display = 'inline'; - hint.style.backgroundColor = '#B9FF00'; - hint.style.border = '2px solid #4A6600'; + if (newwindow) hint.style.backgroundColor = '#ffff00'; + else hint.style.backgroundColor = '#aaff00'; + hint.style.border = '2px solid #556600'; hint.style.color = 'black'; + hint.style.fontFamily = 'Verdana'; hint.style.fontSize = '9px'; hint.style.fontWeight = 'bold'; + hint.style.fontVariant = 'normal'; hint.style.lineHeight = '9px'; hint.style.margin = '0px'; hint.style.width = 'auto'; // fix broken rendering on w3schools.com hint.style.padding = '1px'; hint.style.position = 'absolute'; hint.style.zIndex = '1000'; - // hint.style.textTransform = 'uppercase'; hint.style.left = pos[1] + 'px'; hint.style.top = pos[0] + 'px'; - // var img = el.getElementsByTagName('img'); - // if (img.length > 0) { - // hint.style.top = pos[1] + img[0].height / 2 - 6 + 'px'; - // } hint.style.textDecoration = 'none'; - // hint.style.webkitBorderRadius = '6px'; // slow - // Play around with this, pretty funny things to do :) - // hint.style.webkitTransform = 'scale(1) rotate(0deg) translate(-6px,-5px)'; + hint.style.webkitTransform = 'translate(-5px,-5px)'; return hint; } -// Here we choose what to do with an element that the user has selected. -// Form elements get selected and/or focussed, and links and buttons are -// clicked. This function returns "XXXRESET_MODEXXX" to indicate that uzbl -// should be reset to command mode with an empty keycmd, or -// "XXX_EMIT_FORM_ACTIVEXXX" to indicate that uzbl should be set to insert mode. -function clickElem(item) { - removeAllHints(); +// Here we choose what to do with an element if we +// want to "follow" it. On form elements we "select" +// or pass the focus, on links we try to perform a click, +// but at least set the href of the link. (needs some improvements) +uzbl.follow.clickElem = function(item) { + this.removeAllHints(); if (item) { - var name = item.tagName; - if (name == 'BUTTON') { - item.click(); - return "XXXRESET_MODEXXX"; - } else if (name == 'INPUT') { - var type = item.type.toUpperCase(); - if (type == 'TEXT' || type == 'SEARCH' || type == 'PASSWORD') { + if (newwindow && item.tagName == 'A') window.open(item.href); + else { + var name = item.tagName; + if (name == 'A') { + item.click(); + window.location = item.href; + } else if (name == 'INPUT') { + var type = item.getAttribute('type').toUpperCase(); + if (type == 'TEXT' || type == 'FILE' || type == 'PASSWORD') { + item.focus(); + item.select(); + } else { + item.click(); + } + } else if (name == 'TEXTAREA' || name == 'SELECT') { item.focus(); item.select(); - return "XXXEMIT_FORM_ACTIVEXXX"; } else { item.click(); - return "XXXRESET_MODEXXX"; + window.location = item.href; } - } else if (name == 'TEXTAREA' || name == 'SELECT') { - item.focus(); - item.select(); - return "XXXEMIT_FORM_ACTIVEXXX"; - } else { - item.click(); - window.location = item.href; - return "XXXRESET_MODEXXX"; } } } -//Returns a list of all links (in this version -//just the elements itself, but in other versions, we -//add the label here. -function addLinks() { + +// Returns a list of all links (in this version +// just the elements itself, but in other versions, we +// add the label here. +uzbl.follow.addLinks = function() { res = [[], []]; for (var l = 0; l < links.length; l++) { var li = links[l]; - if (isVisible(li) && elementInViewport(li)) { - res[0].push(li); - } + if (this.isVisible(li) && this.elementInViewport(li)) res[0].push(li); } return res; } -//Same as above, just for the form elements -function addFormElems() { + +// Same as above, just for the form elements +uzbl.follow.addFormElems = function() { res = [[], []]; for (var f = 0; f < forms.length; f++) { for (var e = 0; e < forms[f].elements.length; e++) { var el = forms[f].elements[e]; - if (el && ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON'].indexOf(el.tagName) + 1 && isVisible(el) && elementInViewport(el)) { - res[0].push(el); - } + if (el && ['INPUT', 'TEXTAREA', 'SELECT'].indexOf(el.tagName) + 1 && this.isVisible(el) && this.elementInViewport(el)) res[0].push(el); } } return res; } -//Draw all hints for all elements passed. "len" is for -//the number of chars we should use to avoid collisions -function reDrawHints(elems, chars) { - removeAllHints(); + +// Draw all hints for all elements passed. "len" is for +// the number of chars we should use to avoid collisions +uzbl.follow.reDrawHints = function(elems, chars) { + this.removeAllHints(); var hintdiv = doc.createElement('div'); hintdiv.setAttribute('id', uzbldivid); for (var i = 0; i < elems[0].length; i++) { if (elems[0][i]) { var label = elems[1][i].substring(chars); - var h = generateHint(elems[0][i], label); + var h = this.generateHint(elems[0][i], label); hintdiv.appendChild(h); } } - if (document.body) { - document.body.appendChild(hintdiv); - } + if (document.body) document.body.appendChild(hintdiv); } + // pass: number of keys // returns: key length -function labelLength(n) { +uzbl.follow.labelLength = function(n) { var oldn = n; var keylen = 0; - if(n < 2) { - return 1; - } - n -= 1; // our highest key will be n-1 + if(n < 2) return 1; + n -= 1; // Our highest key will be n-1 while(n) { keylen += 1; n = Math.floor(n / charset.length); } return keylen; } + // pass: number // returns: label -function intToLabel(n) { +uzbl.follow.intToLabel = function(n) { var label = ''; do { label = charset.charAt(n % charset.length) + label; @@ -221,9 +209,10 @@ function intToLabel(n) { } while(n); return label; } + // pass: label // returns: number -function labelToInt(label) { +uzbl.follow.labelToInt = function(label) { var n = 0; var i; for(i = 0; i < label.length; ++i) { @@ -232,44 +221,35 @@ function labelToInt(label) { } return n; } -//Put it all together -function followLinks(follow) { - // if(follow.charAt(0) == 'l') { - // follow = follow.substr(1); - // charset = 'thsnlrcgfdbmwvz-/'; - // } + +// Put it all together +uzbl.follow.followLinks = function(follow) { + //if(follow.charAt(0) == 'l') { + // follow = follow.substr(1); + // charset = 'thsnlrcgfdbmwvz-/'; + //} var s = follow.split(''); - var linknr = labelToInt(follow); + var linknr = this.labelToInt(follow); if (document.body) document.body.setAttribute('onkeyup', 'keyPressHandler(event)'); - var linkelems = addLinks(); - var formelems = addFormElems(); + var linkelems = this.addLinks(); + var formelems = this.addFormElems(); var elems = [linkelems[0].concat(formelems[0]), linkelems[1].concat(formelems[1])]; - var len = labelLength(elems[0].length); + var len = this.labelLength(elems[0].length); var oldDiv = doc.getElementById(uzbldivid); var leftover = [[], []]; - if (s.length == len && linknr < elems[0].length && linknr >= 0) { - return clickElem(elems[0][linknr]); - } else { + if (s.length == len && linknr < elems[0].length && linknr >= 0) this.clickElem(elems[0][linknr]); + else { for (var j = 0; j < elems[0].length; j++) { var b = true; - var label = intToLabel(j); + var label = this.intToLabel(j); var n = label.length; - for (n; n < len; n++) { - label = charset.charAt(0) + label; - } - for (var k = 0; k < s.length; k++) { - b = b && label.charAt(k) == s[k]; - } + for (n; n < len; n++) label = charset.charAt(0) + label; + for (var k = 0; k < s.length; k++) b = b && label.charAt(k) == s[k]; if (b) { leftover[0].push(elems[0][j]); leftover[1].push(label); } } - reDrawHints(leftover, s.length); + this.reDrawHints(leftover, s.length); } } - -//Parse input: first argument is follow keys, second is user input. -var args = '%s'.split(' '); -var charset = args[0]; -followLinks(args[1]); -- cgit v1.2.3 From d86a69f6a105f611e49ecb10d206933cfdd7f90a Mon Sep 17 00:00:00 2001 From: keis Date: Sat, 26 Feb 2011 23:56:20 +0100 Subject: bring back mode change hints in follow.js --- examples/data/scripts/follow.js | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index b0c4643..2976834 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -35,8 +35,7 @@ uzbl.follow = function() { } } catch(e) {} - arguments.callee.followLinks(keypress); - + return arguments.callee.followLinks(keypress); } // Calculate element position to draw the hint @@ -120,26 +119,34 @@ uzbl.follow.generateHint = function(el, label) { uzbl.follow.clickElem = function(item) { this.removeAllHints(); if (item) { - if (newwindow && item.tagName == 'A') window.open(item.href); + if (newwindow && item.tagName == 'A') { + window.open(item.href); + return "XXXRESET_MODEXXX" + } else { var name = item.tagName; if (name == 'A') { item.click(); window.location = item.href; + return "XXXRESET_MODEXXX"; } else if (name == 'INPUT') { var type = item.getAttribute('type').toUpperCase(); if (type == 'TEXT' || type == 'FILE' || type == 'PASSWORD') { item.focus(); item.select(); + return "XXXEMIT_FORM_ACTIVEXXX"; } else { item.click(); + return "XXXRESET_MODEXXX"; } } else if (name == 'TEXTAREA' || name == 'SELECT') { item.focus(); item.select(); + return "XXXEMIT_FORM_ACTIVEXXX"; } else { item.click(); window.location = item.href; + return "XXXRESET_MODEXXX"; } } } @@ -237,19 +244,19 @@ uzbl.follow.followLinks = function(follow) { var len = this.labelLength(elems[0].length); var oldDiv = doc.getElementById(uzbldivid); var leftover = [[], []]; - if (s.length == len && linknr < elems[0].length && linknr >= 0) this.clickElem(elems[0][linknr]); - else { - for (var j = 0; j < elems[0].length; j++) { - var b = true; - var label = this.intToLabel(j); - var n = label.length; - for (n; n < len; n++) label = charset.charAt(0) + label; - for (var k = 0; k < s.length; k++) b = b && label.charAt(k) == s[k]; - if (b) { - leftover[0].push(elems[0][j]); - leftover[1].push(label); - } + if (s.length == len && linknr < elems[0].length && linknr >= 0) + return this.clickElem(elems[0][linknr]); + + for (var j = 0; j < elems[0].length; j++) { + var b = true; + var label = this.intToLabel(j); + var n = label.length; + for (n; n < len; n++) label = charset.charAt(0) + label; + for (var k = 0; k < s.length; k++) b = b && label.charAt(k) == s[k]; + if (b) { + leftover[0].push(elems[0][j]); + leftover[1].push(label); } - this.reDrawHints(leftover, s.length); } + this.reDrawHints(leftover, s.length); } -- cgit v1.2.3 From 1197e8ddbc8348e9437ada42b35c72f38d4698ce Mon Sep 17 00:00:00 2001 From: keis Date: Sat, 26 Feb 2011 23:56:45 +0100 Subject: update config and follow.sh to use new follow.js --- examples/config/config | 4 +++- examples/data/scripts/follow.sh | 20 +++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index ab690e0..5c00fb5 100644 --- a/examples/config/config +++ b/examples/config/config @@ -72,6 +72,7 @@ set download_handler = sync_spawn @scripts_dir/download.sh # add some javascript to the page for other 'js' and 'script' commands to access later. @on_event LOAD_COMMIT js uzbl = {}; @on_event LOAD_COMMIT script @scripts_dir/formfiller.js +@on_event LOAD_COMMIT script @scripts_dir/follow.js # Userscripts/per-site-settings. See the script and the example configuration for details #@on_event LOAD_COMMIT spawn @scripts_dir/per-site-settings.py @data_home/uzbl/per-site-settings @@ -327,7 +328,8 @@ set follow_hint_keys = 0123456789 #set follow_hint_keys = qwerty #set follow_hint_keys = asdfghjkl; #set follow_hint_keys = thsnd-rcgmvwb/;789aefijkopquxyz234 -@cbind fl* = spawn @scripts_dir/follow.sh "%s" +@cbind fl* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 0) >\@ +@cbind Fl* = spawn @scripts_dir/follow.sh \@< uzbl.follow("\@follow_hint_keys", "%s", 1) >\@ @cbind gi = spawn @scripts_dir/go_input.sh # Form filler binds diff --git a/examples/data/scripts/follow.sh b/examples/data/scripts/follow.sh index d7fe117..1f8947d 100755 --- a/examples/data/scripts/follow.sh +++ b/examples/data/scripts/follow.sh @@ -1,21 +1,11 @@ #!/bin/sh +# This scripts acts on the return value of followLinks in follow.js -# This script is just a wrapper around follow.js that lets us change uzbl's mode -# after a link is selected. - -# if socat is installed then we can change Uzbl's input mode once a link is -# selected; otherwise we just select a link. -if ! which socat >/dev/null 2>&1; then - echo 'script @scripts_dir/follow.js "@{follow_hint_keys} '$1'"' > "$UZBL_FIFO" - exit -fi - -result=$(echo 'script @scripts_dir/follow.js "@{follow_hint_keys} '$1'"' | socat - unix-connect:"$UZBL_SOCKET") -case $result in - *XXXEMIT_FORM_ACTIVEXXX*) +case "$1" in + XXXEMIT_FORM_ACTIVEXXX) # a form element was selected - echo 'event FORM_ACTIVE' > "$UZBL_FIFO" ;; - *XXXRESET_MODEXXX*) + printf 'event FORM_ACTIVE\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO" ;; + XXXRESET_MODEXXX) # a link was selected, reset uzbl's input mode printf 'set mode=\nevent KEYCMD_CLEAR\n' > "$UZBL_FIFO" ;; esac -- cgit v1.2.3 From 941b92e60d4f636e16ab0d3bd0814073b27a0642 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 6 Mar 2011 02:40:35 -0700 Subject: frames-enabled follow.js --- examples/data/scripts/follow.js | 291 +++++++++++++++++++++------------------- 1 file changed, 153 insertions(+), 138 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index 2976834..1551f1c 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -12,81 +12,101 @@ */ uzbl.follow = function() { - // Export - charset = arguments[0] - keypress = arguments[1] - newwindow = arguments[2] + charset = arguments[0]; + newwindow = arguments[2]; // Some shortcuts and globals uzblid = 'uzbl_link_hint'; uzbldivid = uzblid + '_div_container'; - doc = document; - win = window; - links = doc.links; - forms = doc.forms; - - // Make onclick-links "clickable" - try { - HTMLElement.prototype.click = function() { - if (typeof this.onclick == 'function') { - this.onclick({ type: 'click' }); - } - } - } catch(e) {} + var keypress = arguments[1]; return arguments.callee.followLinks(keypress); } +uzbl.follow.isFrame = function(el) { + return (el.tagName == "FRAME" || el.tagName == "IFRAME"); +} + +// find the document that the given element belongs to +uzbl.follow.getDocument = function(el) { + if (this.isFrame(el)) + return el.contentDocument; + + var doc = el; + while (doc.parentNode !== null) + doc = doc.parentNode; + return doc; +} + +// find all documents in the display, searching frames recursively +uzbl.follow.documents = function() { + return this.windows().map(function(w) { return w.document; }).filter(function(d) { return d != null; }); +} + +// find all windows in the display, searching for frames recursively +uzbl.follow.windows = function(w) { +  w = (typeof w == 'undefined') ? window.top : w; + + var wins = [w]; + var frames = w.frames; + for(var i = 0; i < frames.length; i++) + wins = wins.concat(uzbl.follow.windows(frames[i])); + return wins; +} + +// search all frames for elements matching the given CSS selector +uzbl.follow.query = function(selector) { + var res = []; + this.documents().forEach(function (doc) { + var set = doc.body.querySelectorAll(selector); + // convert the NodeList to an Array + set = Array.prototype.slice.call(set); + res = res.concat(set); + }); + return res; +} + // Calculate element position to draw the hint -// Pretty accurate but fails in some very fancy cases uzbl.follow.elementPosition = function(el) { - var up = el.offsetTop; - var left = el.offsetLeft; - var width = el.offsetWidth; - var height = el.offsetHeight; - while (el.offsetParent) { - el = el.offsetParent; - up += el.offsetTop; - left += el.offsetLeft; - } - return [up, left, width, height]; -} + var rect = el.getBoundingClientRect(); -// Calculate if an element is visible -uzbl.follow.isVisible = function(el) { - if (el == doc) return true; - if (!el) return false; - if (!el.parentNode) return false; + var left, up; - if (el.style) { - if (el.style.display == 'none') return false; - if (el.style.visibility == 'hidden') return false; + if (uzbl.follow.isFrame(el)) { + left = document.defaultView.scrollX; + up = document.defaultView.scrollY; + } else { + left = Math.max((rect.left + document.defaultView.scrollX), document.defaultView.scrollX); + up = Math.max((rect.top + document.defaultView.scrollY), document.defaultView.scrollY); } - return this.isVisible(el.parentNode); + + return [up, left, rect.width, rect.height]; } // Calculate if an element is on the viewport. uzbl.follow.elementInViewport = function(el) { - offset = this.elementPosition(el); - var up = offset[0]; - var left = offset[1]; - var width = offset[2]; + offset = uzbl.follow.elementPosition(el); + var up = offset[0]; + var left = offset[1]; + var width = offset[2]; var height = offset[3]; - return up < window.pageYOffset + window.innerHeight && left < window.pageXOffset + window.innerWidth && (up + height) > window.pageYOffset && (left + width) > window.pageXOffset; + return up < window.pageYOffset + window.innerHeight && + left < window.pageXOffset + window.innerWidth && + (up + height) > window.pageYOffset && + (left + width) > window.pageXOffset; } // Removes all hints/leftovers that might be generated // by this script. -uzbl.follow.removeAllHints = function() { +uzbl.follow.removeAllHints = function(doc) { var elements = doc.getElementById(uzbldivid); if (elements) elements.parentNode.removeChild(elements); } // Generate a hint for an element with the given label // Here you can play around with the style of the hints! -uzbl.follow.generateHint = function(el, label) { - var pos = this.elementPosition(el); +uzbl.follow.generateHint = function(doc, el, label, top, left) { var hint = doc.createElement('div'); hint.setAttribute('name', uzblid); hint.innerText = label; @@ -105,10 +125,10 @@ uzbl.follow.generateHint = function(el, label) { hint.style.padding = '1px'; hint.style.position = 'absolute'; hint.style.zIndex = '1000'; - hint.style.left = pos[1] + 'px'; - hint.style.top = pos[0] + 'px'; hint.style.textDecoration = 'none'; hint.style.webkitTransform = 'translate(-5px,-5px)'; + hint.style.top = top + 'px'; + hint.style.left = left + 'px'; return hint; } @@ -117,79 +137,53 @@ uzbl.follow.generateHint = function(el, label) { // or pass the focus, on links we try to perform a click, // but at least set the href of the link. (needs some improvements) uzbl.follow.clickElem = function(item) { - this.removeAllHints(); - if (item) { - if (newwindow && item.tagName == 'A') { - window.open(item.href); - return "XXXRESET_MODEXXX" - } - else { - var name = item.tagName; - if (name == 'A') { - item.click(); - window.location = item.href; - return "XXXRESET_MODEXXX"; - } else if (name == 'INPUT') { - var type = item.getAttribute('type').toUpperCase(); - if (type == 'TEXT' || type == 'FILE' || type == 'PASSWORD') { - item.focus(); - item.select(); - return "XXXEMIT_FORM_ACTIVEXXX"; - } else { - item.click(); - return "XXXRESET_MODEXXX"; - } - } else if (name == 'TEXTAREA' || name == 'SELECT') { - item.focus(); - item.select(); - return "XXXEMIT_FORM_ACTIVEXXX"; - } else { - item.click(); - window.location = item.href; - return "XXXRESET_MODEXXX"; - } - } - } -} + if(!item) return; + var name = item.tagName; -// Returns a list of all links (in this version -// just the elements itself, but in other versions, we -// add the label here. -uzbl.follow.addLinks = function() { - res = [[], []]; - for (var l = 0; l < links.length; l++) { - var li = links[l]; - if (this.isVisible(li) && this.elementInViewport(li)) res[0].push(li); - } - return res; -} - -// Same as above, just for the form elements -uzbl.follow.addFormElems = function() { - res = [[], []]; - for (var f = 0; f < forms.length; f++) { - for (var e = 0; e < forms[f].elements.length; e++) { - var el = forms[f].elements[e]; - if (el && ['INPUT', 'TEXTAREA', 'SELECT'].indexOf(el.tagName) + 1 && this.isVisible(el) && this.elementInViewport(el)) res[0].push(el); + if (name == 'INPUT') { + var type = item.getAttribute('type').toUpperCase(); + if (type == 'TEXT' || type == 'FILE' || type == 'PASSWORD') { + item.focus(); + item.select(); + return "XXXEMIT_FORM_ACTIVEXXX"; } + // otherwise fall through to a simulated mouseclick. + } else if (name == 'TEXTAREA' || name == 'SELECT') { + item.focus(); + item.select(); + return "XXXEMIT_FORM_ACTIVEXXX"; } - return res; + + // simulate a mouseclick to activate the element + var mouseEvent = document.createEvent("MouseEvent"); + mouseEvent.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + item.dispatchEvent(mouseEvent); + return "XXXRESET_MODEXXX"; } -// Draw all hints for all elements passed. "len" is for -// the number of chars we should use to avoid collisions +// Draw all hints for all elements passed. uzbl.follow.reDrawHints = function(elems, chars) { - this.removeAllHints(); - var hintdiv = doc.createElement('div'); - hintdiv.setAttribute('id', uzbldivid); - for (var i = 0; i < elems[0].length; i++) { - if (elems[0][i]) { - var label = elems[1][i].substring(chars); - var h = this.generateHint(elems[0][i], label); - hintdiv.appendChild(h); - } - } - if (document.body) document.body.appendChild(hintdiv); + var elements = elems.map(function(pair) { return pair[0] }); + var labels = elems.map(function(pair) { return pair[1].substring(chars) }); + // we have to calculate element positions before we modify the DOM + // otherwise the elementPosition call slows way down. + var positions = elements.map(uzbl.follow.elementPosition); + + this.documents().forEach(function(doc) { + uzbl.follow.removeAllHints(doc); + if (!doc.body) return; + doc.hintdiv = doc.createElement('div'); + doc.hintdiv.setAttribute('id', uzbldivid); + doc.body.appendChild(doc.hintdiv); + }); + + elements.forEach(function(el, i) { + var label = labels[i]; + var pos = positions[i]; + var doc = uzbl.follow.getDocument(el); + var h = uzbl.follow.generateHint(doc, el, label, pos[0], pos[1]); + doc.hintdiv.appendChild(h); + }); } // pass: number of keys @@ -221,8 +215,7 @@ uzbl.follow.intToLabel = function(n) { // returns: number uzbl.follow.labelToInt = function(label) { var n = 0; - var i; - for(i = 0; i < label.length; ++i) { + for(var i = 0; i < label.length; ++i) { n *= charset.length; n += charset.indexOf(label[i]); } @@ -231,32 +224,54 @@ uzbl.follow.labelToInt = function(label) { // Put it all together uzbl.follow.followLinks = function(follow) { - //if(follow.charAt(0) == 'l') { - // follow = follow.substr(1); - // charset = 'thsnlrcgfdbmwvz-/'; - //} var s = follow.split(''); var linknr = this.labelToInt(follow); - if (document.body) document.body.setAttribute('onkeyup', 'keyPressHandler(event)'); - var linkelems = this.addLinks(); - var formelems = this.addFormElems(); - var elems = [linkelems[0].concat(formelems[0]), linkelems[1].concat(formelems[1])]; - var len = this.labelLength(elems[0].length); - var oldDiv = doc.getElementById(uzbldivid); - var leftover = [[], []]; - if (s.length == len && linknr < elems[0].length && linknr >= 0) - return this.clickElem(elems[0][linknr]); - - for (var j = 0; j < elems[0].length; j++) { + + var followable = 'a, area, textarea, select, input:not([type=hidden]), button'; + var uri = 'a, area, frame, iframe'; + //var focusable = 'a, area, textarea, select, input:not([type=hidden]), button, frame, iframe, applet, object'; + //var desc = '*[title], img[alt], applet[alt], area[alt], input[alt]'; + //var image = 'img, input[type=image]'; + + if(newwindow) + var res = this.query(uri); + else + var res = this.query(followable); + + var elems = res.filter(uzbl.follow.elementInViewport); + var len = this.labelLength(elems.length); + + if (s.length == len && linknr < elems.length && linknr >= 0) { + // an element has been selected! + var el = elems[linknr]; + + // clear all of our hints + this.documents().forEach(uzbl.follow.removeAllHints); + + if (newwindow) { + // we're opening a new window using the URL attached to this element + var uri = el.src || el.href; + if(uri.match(/javascript:/)) return; + window.open(uri); + return "XXXRESET_MODEXXX" + } + + // we're just going to click the element + return this.clickElem(el); + } + + var leftover = []; + for (var j = 0; j < elems.length; j++) { var b = true; var label = this.intToLabel(j); var n = label.length; - for (n; n < len; n++) label = charset.charAt(0) + label; - for (var k = 0; k < s.length; k++) b = b && label.charAt(k) == s[k]; - if (b) { - leftover[0].push(elems[0][j]); - leftover[1].push(label); - } + for (n; n < len; n++) + label = charset.charAt(0) + label; + for (var k = 0; k < s.length; k++) + b = b && label.charAt(k) == s[k]; + if (b) + leftover.push([elems[j], label]); } + this.reDrawHints(leftover, s.length); } -- cgit v1.2.3 From bece24e3824d11c08fad9c6338f446ee29d4913f Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 6 Mar 2011 03:06:26 -0700 Subject: do link hint styling in user stylesheet. --- examples/config/config | 3 +++ examples/data/scripts/follow.js | 30 ++++++------------------------ examples/data/style.css | 38 ++++++++++++++++++-------------------- 3 files changed, 27 insertions(+), 44 deletions(-) (limited to 'examples') diff --git a/examples/config/config b/examples/config/config index 5c00fb5..bcd6d3e 100644 --- a/examples/config/config +++ b/examples/config/config @@ -94,6 +94,9 @@ set download_handler = sync_spawn @scripts_dir/download.sh # === Behaviour and appearance =============================================== +# Custom CSS can be defined here, including link follower hint styles +set stylesheet_uri = file://@data_home/uzbl/style.css + set show_status = 1 set status_top = 0 set status_background = #303030 diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index 1551f1c..2b9da59 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -1,5 +1,4 @@ /* This is the basic linkfollowing script. - * Its pretty stable, and you configure which keys to use for hinting * * TODO: * Some pages mess around a lot with the zIndex which @@ -11,15 +10,14 @@ * happen. Blame some freaky webdesigners ;) */ +// Globals +uzbldivid = 'uzbl_link_hints'; + uzbl.follow = function() { // Export charset = arguments[0]; newwindow = arguments[2]; - // Some shortcuts and globals - uzblid = 'uzbl_link_hint'; - uzbldivid = uzblid + '_div_container'; - var keypress = arguments[1]; return arguments.callee.followLinks(keypress); } @@ -107,26 +105,9 @@ uzbl.follow.removeAllHints = function(doc) { // Generate a hint for an element with the given label // Here you can play around with the style of the hints! uzbl.follow.generateHint = function(doc, el, label, top, left) { - var hint = doc.createElement('div'); - hint.setAttribute('name', uzblid); + var hint = doc.createElement('span'); hint.innerText = label; - hint.style.display = 'inline'; - if (newwindow) hint.style.backgroundColor = '#ffff00'; - else hint.style.backgroundColor = '#aaff00'; - hint.style.border = '2px solid #556600'; - hint.style.color = 'black'; - hint.style.fontFamily = 'Verdana'; - hint.style.fontSize = '9px'; - hint.style.fontWeight = 'bold'; - hint.style.fontVariant = 'normal'; - hint.style.lineHeight = '9px'; - hint.style.margin = '0px'; - hint.style.width = 'auto'; // fix broken rendering on w3schools.com - hint.style.padding = '1px'; hint.style.position = 'absolute'; - hint.style.zIndex = '1000'; - hint.style.textDecoration = 'none'; - hint.style.webkitTransform = 'translate(-5px,-5px)'; hint.style.top = top + 'px'; hint.style.left = left + 'px'; return hint; @@ -173,7 +154,8 @@ uzbl.follow.reDrawHints = function(elems, chars) { uzbl.follow.removeAllHints(doc); if (!doc.body) return; doc.hintdiv = doc.createElement('div'); - doc.hintdiv.setAttribute('id', uzbldivid); + doc.hintdiv.id = uzbldivid; + if(newwindow) doc.hintdiv.className = "new-window"; doc.body.appendChild(doc.hintdiv); }); diff --git a/examples/data/style.css b/examples/data/style.css index f9b111e..45bb56f 100644 --- a/examples/data/style.css +++ b/examples/data/style.css @@ -1,25 +1,23 @@ -.uzbl_highlight { background-color: yellow;} -.uzbl_h_first { background-color: lightgreen;} - -.uzbl_follow { border-style: dotted; - border-width: thin; +#uzbl_link_hints > span { + background-color: #aaff00; + color: black; + border: 2px solid #556600; + font-family: Verdana; + font-size: 9px; + font-weight: bold; + font-variant: normal; + line-height: 9px; + margin: 0px; + width: auto; /* fix broken rendering on w3schools.com */ + padding: 1px; + z-index: 1000; + text-decoration: none; + -webkit-transform: translate(-5px,-5px); } -#uzbl_hint > div { - display: inline; - border: 2px solid #4a6600; - background-color: #b9ff00; - color: black; - font-size: 9px; - font-weight: bold; - line-height: 9px; - margin: 0px; - padding: 0px; - position: absolute; - z-index: 1000; - -webkit-border-radius: 6px; - text-decoration: none; - -wekit-transform: scale(1) rotate(0deg) translate(-6px,-5px); +/* we can have different colours for different types of hints! */ +#uzbl_link_hints.new-window > span { + background-color: #ffff00; } /* vim:set et ts=4: */ -- cgit v1.2.3 From a0a11b1b1ad90a16641d0a87b0d43b1fabdabb08 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 6 Mar 2011 09:28:07 -0700 Subject: follow.js: hint wrapped links on their left end, not the left end of the bounding rectangle --- examples/data/scripts/follow.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/follow.js b/examples/data/scripts/follow.js index 2b9da59..536256b 100644 --- a/examples/data/scripts/follow.js +++ b/examples/data/scripts/follow.js @@ -67,19 +67,21 @@ uzbl.follow.query = function(selector) { // Calculate element position to draw the hint uzbl.follow.elementPosition = function(el) { - var rect = el.getBoundingClientRect(); - - var left, up; - - if (uzbl.follow.isFrame(el)) { - left = document.defaultView.scrollX; - up = document.defaultView.scrollY; - } else { - left = Math.max((rect.left + document.defaultView.scrollX), document.defaultView.scrollX); - up = Math.max((rect.top + document.defaultView.scrollY), document.defaultView.scrollY); + // el.getBoundingClientRect is another way to do this, but when a link is + // line-wrapped we want our hint at the left end of the link, not its + // bounding rectangle + var up = el.offsetTop; + var left = el.offsetLeft; + var width = el.offsetWidth; + var height = el.offsetHeight; + + while (el.offsetParent) { + el = el.offsetParent; + up += el.offsetTop; + left += el.offsetLeft; } - return [up, left, rect.width, rect.height]; + return [up, left, width, height]; } // Calculate if an element is on the viewport. -- cgit v1.2.3 From e4c7af276c9ad363f26d34a672508a7acf31dd79 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 6 Mar 2011 09:38:09 -0700 Subject: tidy up link hinting CSS, add !important rules --- examples/data/style.css | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'examples') diff --git a/examples/data/style.css b/examples/data/style.css index 45bb56f..ff055d1 100644 --- a/examples/data/style.css +++ b/examples/data/style.css @@ -1,23 +1,25 @@ #uzbl_link_hints > span { - background-color: #aaff00; - color: black; - border: 2px solid #556600; - font-family: Verdana; - font-size: 9px; - font-weight: bold; - font-variant: normal; - line-height: 9px; - margin: 0px; - width: auto; /* fix broken rendering on w3schools.com */ - padding: 1px; - z-index: 1000; - text-decoration: none; + z-index: 1000 !important; + + background-color: #aaff00 !important; + border: 2px solid #556600 !important; + margin: 0 !important; + padding: 1px !important; + + color: black !important; + font-size: 9px !important; + line-height: 9px !important; + font-weight: bold !important; + font-variant: normal !important; + text-decoration: none !important; + -webkit-transform: translate(-5px,-5px); + /* opacity: 0.7; */ } /* we can have different colours for different types of hints! */ #uzbl_link_hints.new-window > span { - background-color: #ffff00; + background-color: #ffff00 !important; } /* vim:set et ts=4: */ -- cgit v1.2.3 From 316d1c03cc7ec7b41d6222a6a723971523763cdf Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 10 Mar 2011 19:24:05 -0700 Subject: uzbl-tabbed: don't freak out if an invalid status_background colour is given --- examples/data/scripts/uzbl-tabbed | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/data/scripts/uzbl-tabbed b/examples/data/scripts/uzbl-tabbed index 1d64436..de71c2c 100755 --- a/examples/data/scripts/uzbl-tabbed +++ b/examples/data/scripts/uzbl-tabbed @@ -472,8 +472,11 @@ class UzblInstance: self.parent.update_gtk_tab_pos() elif var == "status_background": if config['status_background'].strip(): - col = gtk.gdk.color_parse(config['status_background']) - self.parent.ebox.modify_bg(gtk.STATE_NORMAL, col) + try: + col = gtk.gdk.color_parse(config['status_background']) + self.parent.ebox.modify_bg(gtk.STATE_NORMAL, col) + except ValueError: + pass # got an invalid colour, just ignore it elif var == "tab_titles" or var == "tab_indexes": for tab in self.parent.notebook: self.parent.tabs[tab].title_changed(True) -- cgit v1.2.3