Mason Larobina [Sat, 25 Jul 2009 22:52:28 +0000 (06:52 +0800)]
Initial commit of cookie_daemon.py
Mason Larobina [Sat, 25 Jul 2009 22:51:06 +0000 (06:51 +0800)]
indentation fix
Mason Larobina [Sat, 25 Jul 2009 21:20:01 +0000 (05:20 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Dieter Plaetinck [Sat, 25 Jul 2009 20:34:25 +0000 (22:34 +0200)]
merge in ruskies font family patch
Dieter Plaetinck [Sat, 25 Jul 2009 19:48:55 +0000 (21:48 +0200)]
add lwithers to authors file
Dieter Plaetinck [Sat, 25 Jul 2009 19:47:29 +0000 (21:47 +0200)]
document talk_to_socket
ruskie [Sat, 25 Jul 2009 19:03:53 +0000 (21:03 +0200)]
uzbl.c, uzbl.h: added _font_family variables
Laurence Withers [Sat, 25 Jul 2009 18:11:40 +0000 (18:11 +0000)]
talk_to_socket: split arguments in packet with \0
In the packet that is written to the daemon via talk_to_socket(), we were
previously using a space to separate each argument, and asking uzbl to quote
the arguments as though for the shell. This just makes life complicated since
we have to undo this in the daemon.
This commit changes the behaviour so that arguments are delimited by ASCII
nul (\0) in the packet. The daemon can thus unambiguously determine where
each argument ends and the next begins.
Mason Larobina [Fri, 24 Jul 2009 13:04:08 +0000 (21:04 +0800)]
Use #!/usr/bin/env python instead of #!/usr/bin/python
Laurence Withers [Wed, 22 Jul 2009 19:46:43 +0000 (19:46 +0000)]
Add talk_to_socket handler
This handler talks directly to a daemon using a Unix SOCK_SEQPACKET socket,
allowing e.g. cookie handlers to be implemented without having to fork and
and execute an external program or script interpreter.
A little explanation of the functioning of talk_to_socket():
1. We receive our argument as a string in the format of "HANDLER EXTRA_ARGS".
2. Copy "HANDLER" into our Unix socket address structure and connect to that
address (blocking). Error out if connection fails.
3. Write "EXTRA_ARGS" to the socket. Error out if writing fails.
4. Use poll() to wait for a response, timing out after 500ms of inactivity.
5. Use ioctl(FIONREAD) to find out how long the pending datagram is.
6. Allocate an appropriately sized buffer (len+1) and write a null at the
end, so our output is always null-terminated no matter what.
7. Read from socket into buffer. Error out if read fails.
8. Close socket.
Mason Larobina [Wed, 22 Jul 2009 09:35:29 +0000 (17:35 +0800)]
Bugfix: Accidentally broke non-json session loading.
Mason Larobina [Wed, 22 Jul 2009 09:03:49 +0000 (17:03 +0800)]
Added dependencies section to the top of uzbl_tabbed.py
Mason Larobina [Wed, 22 Jul 2009 08:50:14 +0000 (16:50 +0800)]
Made json_session false by default.
Mason Larobina [Wed, 22 Jul 2009 05:48:51 +0000 (13:48 +0800)]
bugfix: uzbl_tabbed.py crashed when loading old format session file
Mason Larobina [Wed, 22 Jul 2009 04:25:42 +0000 (12:25 +0800)]
Added session preset adding/saving/listing/deleting.
Mason Larobina [Tue, 21 Jul 2009 13:38:58 +0000 (21:38 +0800)]
Huge refactorisation of session handling in uzbl_tabbed.py
Mason Larobina [Mon, 20 Jul 2009 15:55:22 +0000 (23:55 +0800)]
uzbl_tabbed.py modified to use json for state saving & restoration.
Mason Larobina [Mon, 20 Jul 2009 14:34:38 +0000 (22:34 +0800)]
Found and fixed the real source of the state restoration bug.
Mason Larobina [Mon, 20 Jul 2009 14:10:51 +0000 (22:10 +0800)]
uzbl takes the first un-parsed argument as the uri, no need for --uri
Mason Larobina [Mon, 20 Jul 2009 14:02:22 +0000 (22:02 +0800)]
Use dict.items() when iterating over a dict.
Mason Larobina [Mon, 20 Jul 2009 11:45:41 +0000 (19:45 +0800)]
Added support for uzbl's new window handler in uzbl_tabbed.py
Dieter Plaetinck [Sun, 19 Jul 2009 21:09:04 +0000 (23:09 +0200)]
so kwin also has tabs. and looking pretty good actually
Dieter Plaetinck [Sun, 19 Jul 2009 17:01:26 +0000 (19:01 +0200)]
Merge commit 'bct/headless-tests' into experimental
Mason Larobina [Sun, 19 Jul 2009 16:22:35 +0000 (00:22 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Brendan Taylor [Sun, 19 Jul 2009 15:35:12 +0000 (09:35 -0600)]
fix 'make test' after a commit.
Brendan Taylor [Sun, 19 Jul 2009 15:33:07 +0000 (09:33 -0600)]
rearrange initialization so that 'make tests' doesn't require X
Dieter Plaetinck [Sun, 19 Jul 2009 08:50:41 +0000 (10:50 +0200)]
usage output fixes
Dieter Plaetinck [Sat, 18 Jul 2009 17:53:45 +0000 (19:53 +0200)]
readme entry for geometry flag
Tom Adams [Sat, 18 Jul 2009 09:04:02 +0000 (10:04 +0100)]
Merge commit 'Dieterbe/experimental' into new_experimental
Tom Adams [Sat, 18 Jul 2009 09:02:00 +0000 (10:02 +0100)]
Take argv[1] as URI.
Brendan Taylor [Sat, 18 Jul 2009 08:30:55 +0000 (02:30 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into clean
Brendan Taylor [Sat, 18 Jul 2009 08:04:35 +0000 (02:04 -0600)]
call set_mode_indicator after updating the whatever_indicator setting
Dieter Plaetinck [Sat, 18 Jul 2009 07:33:47 +0000 (09:33 +0200)]
Merge commit 'holizz/new_experimental' into experimental
Tom Adams [Fri, 17 Jul 2009 21:35:08 +0000 (22:35 +0100)]
uzbl.scan RIP.
Dieter Plaetinck [Fri, 17 Jul 2009 21:07:47 +0000 (23:07 +0200)]
i heard fluxbox supports tabs too
Dieter Plaetinck [Fri, 17 Jul 2009 20:37:12 +0000 (22:37 +0200)]
document fixes + document all variables/constants in readme, so example config can be a bit cleaner
Dieter Plaetinck [Fri, 17 Jul 2009 19:15:21 +0000 (21:15 +0200)]
merge in bct's sweet code
Dieter Plaetinck [Fri, 17 Jul 2009 16:32:09 +0000 (18:32 +0200)]
credit uranther for test framework
Mason Larobina [Fri, 17 Jul 2009 15:14:24 +0000 (23:14 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Mason Larobina [Fri, 17 Jul 2009 15:11:24 +0000 (23:11 +0800)]
Use built-in os.makedirs instead of homemade mkdirs function.
Brendan Taylor [Fri, 17 Jul 2009 00:01:46 +0000 (18:01 -0600)]
remove out-of-date test-1.c
Brendan Taylor [Fri, 17 Jul 2009 00:01:24 +0000 (18:01 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Conflicts:
Makefile
tests/Makefile
uzbl.c
uzbl.h
Dieter Plaetinck [Thu, 16 Jul 2009 20:51:48 +0000 (22:51 +0200)]
revert commit
cdbe169f to make date for history handler back in same format
Dieter Plaetinck [Thu, 16 Jul 2009 20:44:34 +0000 (22:44 +0200)]
merge uranthers stuff
uranther [Thu, 16 Jul 2009 20:27:18 +0000 (16:27 -0400)]
Added back in code to check if fifo exists, in case user wants to 'set fifo_dir =' while uzbl is running
Mason Larobina [Thu, 16 Jul 2009 14:17:44 +0000 (22:17 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Brendan Taylor [Thu, 16 Jul 2009 00:16:26 +0000 (18:16 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
uranther [Wed, 15 Jul 2009 21:27:19 +0000 (17:27 -0400)]
Changed my instructions for unit tests in docs/CONTRIBUTING
uranther [Wed, 15 Jul 2009 21:21:12 +0000 (17:21 -0400)]
Remove more trailing whitespace
Dieter Plaetinck [Wed, 15 Jul 2009 20:12:10 +0000 (22:12 +0200)]
Merge commit 'holizz/whitespace' into experimental
Dieter Plaetinck [Wed, 15 Jul 2009 19:19:53 +0000 (21:19 +0200)]
merge in the00z his ${!8} fix for posix sh
Brendan Taylor [Tue, 14 Jul 2009 23:56:02 +0000 (17:56 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Conflicts:
Makefile
Tom Adams [Tue, 14 Jul 2009 21:45:58 +0000 (22:45 +0100)]
Add note about whitespace to docs/CONTRIBUTING.
Tom Adams [Tue, 14 Jul 2009 21:35:49 +0000 (22:35 +0100)]
Whitespace fixes. And ignore whitespace in formfiller data files.
uranther [Tue, 14 Jul 2009 21:09:39 +0000 (17:09 -0400)]
Added instructions in CONTRIBUTING to remind developers to write unit tests for bugfixes and new functionality
uranther [Tue, 14 Jul 2009 21:05:46 +0000 (17:05 -0400)]
Ran :%s/ $//g to remove trailing spaces in uzbl.h and uzbl.c
uranther [Tue, 14 Jul 2009 21:03:48 +0000 (17:03 -0400)]
Updated CFLAGS and LDFLAGS in tests/Makefile. TODO: Find a way for those variables to be inherited or passed to the tests/Makefile.
uranther [Tue, 14 Jul 2009 20:48:51 +0000 (16:48 -0400)]
Merge commit 'Dieterbe/experimental' into experimental
uranther [Tue, 14 Jul 2009 20:48:29 +0000 (16:48 -0400)]
Removed 'quit' command to exit from uzbl
uranther [Tue, 14 Jul 2009 20:28:29 +0000 (16:28 -0400)]
Removed commented section of Makefile that would produce XML/HTML reports of unit tests
Dieter Plaetinck [Tue, 14 Jul 2009 20:14:27 +0000 (22:14 +0200)]
update authors file
Dieter Plaetinck [Tue, 14 Jul 2009 20:05:48 +0000 (22:05 +0200)]
merge 1 from the00z. examples/data/uzbl/scripts/yank.sh is still bash, this should become fixed in next merge commit
uranther [Tue, 14 Jul 2009 19:45:37 +0000 (15:45 -0400)]
Merge commit 'Dieterbe/experimental' into experimental
Brendan Taylor [Mon, 13 Jul 2009 23:00:18 +0000 (17:00 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
uranther [Mon, 13 Jul 2009 12:45:15 +0000 (08:45 -0400)]
Merge with Dieterbe/experimental
Robert Manea [Mon, 13 Jul 2009 06:55:35 +0000 (08:55 +0200)]
tidy up move to expand()
Mason Larobina [Mon, 13 Jul 2009 03:56:24 +0000 (11:56 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Tom Adams [Sun, 12 Jul 2009 21:22:49 +0000 (22:22 +0100)]
cookies.py now fits in with the new arguments, and works better.
Tom Adams [Sun, 12 Jul 2009 20:54:21 +0000 (21:54 +0100)]
Add request address scheme to cookie_handler's arguments.
Tom Adams [Sun, 12 Jul 2009 20:50:28 +0000 (21:50 +0100)]
Merge commit 'Dieterbe/experimental' into new_experimental
Robert Manea [Sun, 12 Jul 2009 20:37:16 +0000 (22:37 +0200)]
more fixes
Robert Manea [Sun, 12 Jul 2009 20:35:03 +0000 (22:35 +0200)]
fix conflicts agains bct
Brendan Taylor [Sun, 12 Jul 2009 19:52:34 +0000 (13:52 -0600)]
"set keycmd = x" is now equivalent to "keycmd x"
Dieter Plaetinck [Sun, 12 Jul 2009 19:48:08 +0000 (21:48 +0200)]
document bugreporting
Brendan Taylor [Sun, 12 Jul 2009 19:38:02 +0000 (13:38 -0600)]
update mode indicator when @insert_mode is set
Abel `00z' Camarillo [Sun, 12 Jul 2009 19:29:00 +0000 (14:29 -0500)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into the00z
Abel `00z' Camarillo [Sun, 12 Jul 2009 19:21:50 +0000 (14:21 -0500)]
replace that ugly ${!8} bashism
Brendan Taylor [Sun, 12 Jul 2009 19:09:45 +0000 (13:09 -0600)]
updated readme and example config
Brendan Taylor [Sun, 12 Jul 2009 18:28:20 +0000 (12:28 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Brendan Taylor [Sun, 12 Jul 2009 18:27:58 +0000 (12:27 -0600)]
get rid of some duplication in expand()
Brendan Taylor [Sun, 12 Jul 2009 18:23:24 +0000 (12:23 -0600)]
make keycmd a variable. new escape expansion syntax. delete
expand_template entirely.
Tassilo Horn [Sun, 12 Jul 2009 17:19:56 +0000 (19:19 +0200)]
use $VISUAL in formfiller.sh
Robert Manea [Sun, 12 Jul 2009 15:45:55 +0000 (17:45 +0200)]
fix pull
Robert Manea [Sun, 12 Jul 2009 15:43:29 +0000 (17:43 +0200)]
style changes, line breaks
Mason Larobina [Sun, 12 Jul 2009 03:40:49 +0000 (11:40 +0800)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental
Abel `00z' Camarillo [Sat, 11 Jul 2009 20:51:42 +0000 (15:51 -0500)]
Merge branch 'experimental' into the00z
Brendan Taylor [Sat, 11 Jul 2009 18:11:59 +0000 (12:11 -0600)]
fixed uri_override and verbose_override positioning
Brendan Taylor [Sat, 11 Jul 2009 16:44:18 +0000 (10:44 -0600)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into replace-expand-template
Conflicts:
uzbl.c
Dieter Plaetinck [Sat, 11 Jul 2009 14:18:29 +0000 (16:18 +0200)]
document alternative way for uri setting
Dieter Plaetinck [Sat, 11 Jul 2009 14:01:58 +0000 (16:01 +0200)]
2 small doc fixes
Dieter Plaetinck [Sat, 11 Jul 2009 13:46:31 +0000 (15:46 +0200)]
Merge branch 'experimental' of git@github.com:Dieterbe/uzbl into experimental
Tom Adams [Sat, 11 Jul 2009 11:12:18 +0000 (12:12 +0100)]
Merge commit 'Dieterbe/experimental' into new_experimental
Tom Adams [Sat, 11 Jul 2009 11:11:13 +0000 (12:11 +0100)]
Added new_window handler.
Dieter Plaetinck [Sat, 11 Jul 2009 10:57:43 +0000 (12:57 +0200)]
documentation fixes
Dieter Plaetinck [Sat, 11 Jul 2009 10:49:53 +0000 (12:49 +0200)]
new contribution instructions, most notably new merging workflow
Tom Adams [Wed, 8 Jul 2009 11:07:52 +0000 (12:07 +0100)]
Add -V/--version option to print the commit and exit.
Tom Adams [Tue, 7 Jul 2009 10:50:45 +0000 (11:50 +0100)]
Use first argument as URI if none provided with --uri.
Tom Adams [Sun, 5 Jul 2009 20:50:43 +0000 (21:50 +0100)]
Don't g_free uzbl.gui.icon twice!
Tom Adams [Tue, 30 Jun 2009 05:23:51 +0000 (06:23 +0100)]
Only open one new window when requested.
Tom Adams [Sat, 11 Jul 2009 10:31:02 +0000 (11:31 +0100)]
Set the background on the vbox, not the main_window.