Barrucadu [Mon, 27 Apr 2009 16:57:24 +0000 (17:57 +0100)]
Removed axelson from AUTHORS file due to unmerge.
Barrucadu [Mon, 27 Apr 2009 16:57:05 +0000 (17:57 +0100)]
Revert "Merge branch 'experimental' of git://github.com/axelson/uzbl into axelson/experimental"
This reverts commit
b7bfd454d19a611638440340d6c8efc3d21b9494, reversing
changes made to
4a80918204bd7361b9b8c9fdbed986790fa0d12f.
Barrucadu [Mon, 27 Apr 2009 16:51:11 +0000 (17:51 +0100)]
"make test" now goes to uzbl.org
Barrucadu [Mon, 27 Apr 2009 16:46:51 +0000 (17:46 +0100)]
Added support for $XDG_CONFIG_DIRS.
Barrucadu [Mon, 27 Apr 2009 15:58:00 +0000 (16:58 +0100)]
Fixed a bit of spacing.
Barrucadu [Mon, 27 Apr 2009 15:52:35 +0000 (16:52 +0100)]
Added contributor.
Barrucadu [Mon, 27 Apr 2009 15:51:23 +0000 (16:51 +0100)]
Edited .gitignore.
Barrucadu [Mon, 27 Apr 2009 15:50:34 +0000 (16:50 +0100)]
Merge branch 'experimental' of git://github.com/axelson/uzbl into axelson/experimental
Barrucadu [Mon, 27 Apr 2009 15:49:05 +0000 (16:49 +0100)]
Removed uzbl binary file.
dusanx [Mon, 27 Apr 2009 15:23:51 +0000 (17:23 +0200)]
Exec external scripts
dusanx [Mon, 27 Apr 2009 12:53:28 +0000 (14:53 +0200)]
Key handling finished
dusanx [Mon, 27 Apr 2009 09:23:35 +0000 (11:23 +0200)]
Cleaned ALL warnings
dusanx [Mon, 27 Apr 2009 07:24:36 +0000 (09:24 +0200)]
Merged Barrucadu code (I hope)
Jason Axelson (dell.server) [Mon, 27 Apr 2009 03:08:11 +0000 (17:08 -1000)]
Made makefile more robust
By using the .PHONY directive we can avoid errors that appear when there
are already files by that name in the directory.
For example: If we put a file called clean in the directory, than make
clean would not execute because the file 'clean' is already made.
Jason Axelson (dell.server) [Mon, 27 Apr 2009 02:44:21 +0000 (16:44 -1000)]
Created a .gitignore file for ignorable files
Barrucadu [Sun, 26 Apr 2009 21:00:26 +0000 (22:00 +0100)]
Merge branch 'dieter/experimental' into experimental
Barrucadu [Sun, 26 Apr 2009 20:59:05 +0000 (21:59 +0100)]
Fixed some warnings.
Dieter Plaetinck [Sun, 26 Apr 2009 20:50:12 +0000 (22:50 +0200)]
merged in xdg stuff from barrucadu and toggle_status stuff from dusanx (slightly refactored)
Barrucadu [Sun, 26 Apr 2009 20:36:39 +0000 (21:36 +0100)]
Fixed a bug (varuable declared twice).
Barrucadu [Sun, 26 Apr 2009 20:33:14 +0000 (21:33 +0100)]
Merge branch 'dusanx/master' into experimental
Barrucadu [Sun, 26 Apr 2009 20:30:13 +0000 (21:30 +0100)]
Merge branch 'master' of git://github.com/dusanx/uzbl into dusanx/master
Barrucadu [Sun, 26 Apr 2009 20:27:34 +0000 (21:27 +0100)]
Now checks in $XDG_CONFIG_HOME/uzbl if --config is omitted.
Barrucadu [Sun, 26 Apr 2009 20:10:13 +0000 (21:10 +0100)]
Poked code a bit. Doesn't quite work.
Barrucadu [Sun, 26 Apr 2009 20:05:11 +0000 (21:05 +0100)]
Now checks in $XDG_CONFIG_HOME for a "uzbl" file if no config file is specified. Does not check $XDG_CONFIG_DIRS yet.
Dieter Plaetinck [Sun, 26 Apr 2009 20:02:43 +0000 (22:02 +0200)]
Merge branch 'bar/experimental' into experimental
dusanx [Sun, 26 Apr 2009 20:01:41 +0000 (22:01 +0200)]
Status bar
Dieter Plaetinck [Sun, 26 Apr 2009 19:57:07 +0000 (21:57 +0200)]
few fixes related to NULL checking
Barrucadu [Sun, 26 Apr 2009 19:48:13 +0000 (20:48 +0100)]
Merged dieter/experimental.
Barrucadu [Sun, 26 Apr 2009 19:45:44 +0000 (20:45 +0100)]
Merge branch 'dieter/experimental' into experimental
Barrucadu [Sun, 26 Apr 2009 19:44:11 +0000 (20:44 +0100)]
Reorganised AUTHORS file.
Dieter Plaetinck [Sun, 26 Apr 2009 19:43:12 +0000 (21:43 +0200)]
handle config/settings loading step by step so we can also see messages if no config is loaded
Dieter Plaetinck [Sun, 26 Apr 2009 19:16:23 +0000 (21:16 +0200)]
todo cleanups
Dieter Plaetinck [Sun, 26 Apr 2009 19:10:35 +0000 (21:10 +0200)]
Merge branch 'bar/experimental' into experimental
Barrucadu [Sun, 26 Apr 2009 18:53:31 +0000 (19:53 +0100)]
Now runs if no config file is specified (just don't expect it to be very useful).
Dieter Plaetinck [Sun, 26 Apr 2009 18:50:08 +0000 (20:50 +0200)]
todo updates
Dieter Plaetinck [Sun, 26 Apr 2009 18:48:09 +0000 (20:48 +0200)]
todo updates
Barrucadu [Sun, 26 Apr 2009 18:43:42 +0000 (19:43 +0100)]
Support for --config parameter.
Barrucadu [Sun, 26 Apr 2009 18:32:25 +0000 (19:32 +0100)]
Merge branch 'dieter/experimental' into experimental
Barrucadu [Sun, 26 Apr 2009 18:32:16 +0000 (19:32 +0100)]
Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into dieter/experimental
Barrucadu [Sun, 26 Apr 2009 18:31:41 +0000 (19:31 +0100)]
Added file_exists function (will be used to check for config file).
Dieter Plaetinck [Sun, 26 Apr 2009 18:24:12 +0000 (20:24 +0200)]
include sample config
Barrucadu [Sun, 26 Apr 2009 17:54:19 +0000 (18:54 +0100)]
Removed irrelevant bits.
Dieter Plaetinck [Sun, 26 Apr 2009 17:11:52 +0000 (19:11 +0200)]
todo updates
Dieter Plaetinck [Sun, 26 Apr 2009 17:07:38 +0000 (19:07 +0200)]
support --config option + reorganize variables a bit in a clear hierachy
Dieter Plaetinck [Sun, 26 Apr 2009 16:34:54 +0000 (18:34 +0200)]
removed the MsgBox function. it was not needed
Dieter Plaetinck [Sun, 26 Apr 2009 16:34:00 +0000 (18:34 +0200)]
todos
Dieter Plaetinck [Sun, 26 Apr 2009 16:19:46 +0000 (18:19 +0200)]
fix for always logging the same uri
Dieter Plaetinck [Sun, 26 Apr 2009 15:52:28 +0000 (17:52 +0200)]
install target
Dieter Plaetinck [Sun, 26 Apr 2009 15:25:17 +0000 (17:25 +0200)]
generic function which can be used to call external script with some arguments + history logging is now done by an external handler for maximum flexibility
Dieter Plaetinck [Sun, 26 Apr 2009 14:18:22 +0000 (16:18 +0200)]
note/todo updates
Dieter Plaetinck [Sun, 26 Apr 2009 14:14:10 +0000 (16:14 +0200)]
slight reformatting
Dieter Plaetinck [Sun, 26 Apr 2009 14:11:10 +0000 (16:11 +0200)]
Merge branch 'bar/experimental' into experimental
Dieter Plaetinck [Sun, 26 Apr 2009 14:02:06 +0000 (16:02 +0200)]
better documented how scripts should work + refactored sample implementations
Barrucadu [Sun, 26 Apr 2009 13:48:26 +0000 (14:48 +0100)]
Added show_status variable to settings_init()
Barrucadu [Sun, 26 Apr 2009 13:45:41 +0000 (14:45 +0100)]
Added show_status variable and toggle_status key. Fixed a conflicting binding.
Barrucadu [Sun, 26 Apr 2009 13:17:12 +0000 (14:17 +0100)]
Merge branch 'master' of git://github.com/dusanx/uzbl into dusanx/master
Conflicts:
AUTHORS
uzbl.c
dusanx [Sun, 26 Apr 2009 12:35:08 +0000 (14:35 +0200)]
Small fix
dusanx [Sun, 26 Apr 2009 12:31:45 +0000 (14:31 +0200)]
Insert and non-insert mode
dusanx [Sun, 26 Apr 2009 11:21:28 +0000 (13:21 +0200)]
Merged Dieterbe code
Dieter Plaetinck [Sun, 26 Apr 2009 10:15:28 +0000 (12:15 +0200)]
merge in some fixes from barrucadu
Dieter Plaetinck [Sun, 26 Apr 2009 10:11:57 +0000 (12:11 +0200)]
stripped out uri entry widget. all url changing will be outside of uzbl
Barrucadu [Sun, 26 Apr 2009 10:06:46 +0000 (11:06 +0100)]
Merge branch 'dieter/experimental' into experimental
Barrucadu [Sun, 26 Apr 2009 10:01:52 +0000 (11:01 +0100)]
Fixed a bug in settings loading.
Dieter Plaetinck [Sun, 26 Apr 2009 09:48:10 +0000 (11:48 +0200)]
cleaning up / refactoring some things after the merge from Barrucadu. I probably did something wrong earlier
Dieter Plaetinck [Sun, 26 Apr 2009 09:09:20 +0000 (11:09 +0200)]
Merge branch 'bar/experimental' into experimental
Dieter Plaetinck [Sun, 26 Apr 2009 09:00:02 +0000 (11:00 +0200)]
pulled in Barrucadus latest stuff
Dieter Plaetinck [Sun, 26 Apr 2009 08:48:22 +0000 (10:48 +0200)]
fix for sample commands
Barrucadu [Sun, 26 Apr 2009 08:42:41 +0000 (09:42 +0100)]
Fixed all coding style mistakes.
Barrucadu [Sun, 26 Apr 2009 08:39:16 +0000 (09:39 +0100)]
Merge branch 'dieter/experimental' into experimental. Fixed a few coding style mistakes.
Barrucadu [Sun, 26 Apr 2009 08:31:48 +0000 (09:31 +0100)]
Merged dusanx/master.
Dieter Plaetinck [Sun, 26 Apr 2009 07:59:24 +0000 (09:59 +0200)]
more compact way to control allowing 1 or 2 params, by checking the function pointers themselves
Dieter Plaetinck [Sun, 26 Apr 2009 07:50:33 +0000 (09:50 +0200)]
commands can now have arguments! woohoo. try uri <..>
dusanx [Sun, 26 Apr 2009 01:40:21 +0000 (03:40 +0200)]
Rough key processing
dusanx [Sun, 26 Apr 2009 00:49:38 +0000 (02:49 +0200)]
Temp title (just to get in sync
dusanx [Sun, 26 Apr 2009 00:26:40 +0000 (02:26 +0200)]
Merged Barrucadu code
Barrucadu [Sat, 25 Apr 2009 22:52:58 +0000 (23:52 +0100)]
Merge branch 'dieter/experimental' into experimental
Barrucadu [Sat, 25 Apr 2009 22:18:59 +0000 (23:18 +0100)]
Loads key bindings into two structs - internal_bindings and external_bindings.
Dieter Plaetinck [Sat, 25 Apr 2009 21:43:42 +0000 (23:43 +0200)]
attempt for commands which support params. unfortunately this doesnt work yet
Barrucadu [Sat, 25 Apr 2009 21:37:18 +0000 (22:37 +0100)]
Merge branch 'dieter/experimental' into experimental
Dieter Plaetinck [Sat, 25 Apr 2009 21:08:05 +0000 (23:08 +0200)]
more elegant way to set up the map of commands
Barrucadu [Sat, 25 Apr 2009 19:23:52 +0000 (20:23 +0100)]
All behaviour config variables are now loaded.
Barrucadu [Sat, 25 Apr 2009 19:05:22 +0000 (20:05 +0100)]
URL box now fills width of main bar.
Dieter Plaetinck [Sat, 25 Apr 2009 17:34:48 +0000 (19:34 +0200)]
todo updates
Packz Enoch [Sat, 25 Apr 2009 16:18:44 +0000 (18:18 +0200)]
More rational Makefile.
Dieter Plaetinck [Sat, 25 Apr 2009 15:27:46 +0000 (17:27 +0200)]
code style
Dieter Plaetinck [Sat, 25 Apr 2009 15:24:31 +0000 (17:24 +0200)]
use the callbacks instead of immediate webkit functions when parsing incomming commands + reorganize code a bit
Dieter Plaetinck [Sat, 25 Apr 2009 14:57:23 +0000 (16:57 +0200)]
type fixes
Dieter Plaetinck [Sat, 25 Apr 2009 14:50:44 +0000 (16:50 +0200)]
use x window id for fifo, not pid
Dieter Plaetinck [Sat, 25 Apr 2009 14:47:22 +0000 (16:47 +0200)]
make output format bit more uniform
Barrucadu [Sat, 25 Apr 2009 14:25:47 +0000 (15:25 +0100)]
Merged changes from dieter/experimental - bye bye aliases.
Dieter Plaetinck [Sat, 25 Apr 2009 14:12:52 +0000 (16:12 +0200)]
remove the aliases concept. commands is all we need + synchronize command names with bindings in sample config
Dieter Plaetinck [Sat, 25 Apr 2009 13:58:04 +0000 (15:58 +0200)]
experimental fifo support. written by Barrucadu and HashBox. thanks guys
Barrucadu [Sat, 25 Apr 2009 12:36:24 +0000 (13:36 +0100)]
Fixed all warnings. Added a new bug. Oops.
Barrucadu [Sat, 25 Apr 2009 11:40:19 +0000 (12:40 +0100)]
Merge branch 'master' of git://github.com/Dieterbe/uzbl into dieter/master
Dieter Plaetinck [Sat, 25 Apr 2009 11:28:11 +0000 (13:28 +0200)]
some more keys
Dieter Plaetinck [Sat, 25 Apr 2009 11:15:32 +0000 (13:15 +0200)]
merge from experimental
Barrucadu [Sat, 25 Apr 2009 10:53:49 +0000 (11:53 +0100)]
Copied plaintext files from Dieter. Added (broken) command alias support.
Dieter Plaetinck [Sat, 25 Apr 2009 10:52:37 +0000 (12:52 +0200)]
cleanup format + allow 2 keyboard modes
Dieter Plaetinck [Sat, 25 Apr 2009 10:28:50 +0000 (12:28 +0200)]
dir for fifo
Dieter Plaetinck [Sat, 25 Apr 2009 10:25:18 +0000 (12:25 +0200)]
todo updates