From ac583cbf2d6c74c5d125640e8f8ff7d23ee59db7 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 6 Jul 2009 18:41:18 -0600 Subject: simple expansion test passes. --- Makefile | 12 ++++++++---- tests/Makefile | 14 ++++++++++++++ tests/test-expand.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ uzbl.c | 8 +++++--- uzbl.h | 2 +- 5 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 tests/Makefile create mode 100644 tests/test-expand.c diff --git a/Makefile b/Makefile index 4e9d282..b914599 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,13 @@ -CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) +CFLAGS:=-std=c99 $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) -fPIC LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) all: uzbl uzblctrl PREFIX?=$(DESTDIR)/usr -test: uzbl - ./uzbl --uri http://www.uzbl.org --verbose +# When compiling unit tests, compile uzbl as a library first +test: uzbl.o + $(CC) -DUZBL_LIBRARY -shared -Wl uzbl.o -o ./tests/libuzbl.so + cd ./tests/; $(MAKE) test-dev: uzbl XDG_DATA_HOME=./examples/data XDG_CONFIG_HOME=./examples/config ./uzbl --uri http://www.uzbl.org --verbose @@ -13,10 +15,12 @@ test-dev: uzbl test-share: uzbl XDG_DATA_HOME=/usr/share/uzbl/examples/data XDG_CONFIG_HOME=/usr/share/uzbl/examples/config ./uzbl --uri http://www.uzbl.org --verbose - + clean: rm -f uzbl rm -f uzblctrl + rm -f uzbl.o + cd ./tests/; $(MAKE) clean install: install -d $(PREFIX)/bin diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..2bfcf98 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,14 @@ +CFLAGS:=-std=c99 -I$(shell pwd)/../ -L$(shell pwd) -luzbl $(shell pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -ggdb -Wall -W -DARCH="\"$(shell uname -m)\"" -lgthread-2.0 -DG_ERRORCHECK_MUTEXES -DCOMMIT="\"$(shell git log | head -n1 | sed "s/.* //")\"" $(CPPFLAGS) +LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS) + +GTESTER:=gtester +GTESTER_REPORT:=gtester-report + +TEST_PROGS:=test-expand + +all: $(TEST_PROGS) + LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." $(GTESTER) --verbose $(TEST_PROGS) + +clean: + rm -f $(TEST_PROGS) + rm -f libuzbl.so diff --git a/tests/test-expand.c b/tests/test-expand.c new file mode 100644 index 0000000..d77c42e --- /dev/null +++ b/tests/test-expand.c @@ -0,0 +1,50 @@ +/* -*- c-basic-offset: 4; -*- */ +#define _POSIX_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +extern Uzbl uzbl; + +extern gchar* expand_template(const char*, gboolean); + +static void +test_URI (void) { + setup_scanner(); + uzbl.state.uri = g_strdup("http://www.uzbl.org/"); + g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri); + g_free(uzbl.state.uri); +} + +int +main (int argc, char *argv[]) { + g_type_init(); + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/test-expand/URI", test_URI); + + return g_test_run(); +} + +/* vi: set et ts=4: */ diff --git a/uzbl.c b/uzbl.c index ed9c4be..3a25cef 100644 --- a/uzbl.c +++ b/uzbl.c @@ -57,7 +57,7 @@ #include "uzbl.h" #include "config.h" -static Uzbl uzbl; +Uzbl uzbl; @@ -1137,7 +1137,7 @@ build_progressbar_ascii(int percent) { return g_string_free(bar, FALSE); } -static void +void setup_scanner() { const GScannerConfig scan_config = { ( @@ -1192,7 +1192,7 @@ setup_scanner() { } } -static gchar * +gchar * expand_template(const char *template, gboolean escape_markup) { if(!template) return NULL; @@ -2685,6 +2685,7 @@ dump_config() { g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL); } +#ifndef UZBL_LIBRARY /** -- MAIN -- **/ int main (int argc, char* argv[]) { @@ -2801,5 +2802,6 @@ main (int argc, char* argv[]) { return EXIT_SUCCESS; } +#endif /* vi: set et ts=4: */ diff --git a/uzbl.h b/uzbl.h index d19ceb3..23409ab 100644 --- a/uzbl.h +++ b/uzbl.h @@ -224,7 +224,7 @@ XDG_Var XDG[] = }; /* Functions */ -static void +void setup_scanner(); char * -- cgit v1.2.3 From e96c32bc6a6c627488df506b4e006197acf38d87 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 6 Jul 2009 19:22:00 -0600 Subject: simple tests for all expansions except DOMAIN --- tests/test-expand.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 119 insertions(+), 2 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index d77c42e..03b9b27 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -29,20 +29,137 @@ extern Uzbl uzbl; extern gchar* expand_template(const char*, gboolean); -static void +void test_URI (void) { - setup_scanner(); uzbl.state.uri = g_strdup("http://www.uzbl.org/"); g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri); g_free(uzbl.state.uri); } +void +test_LOAD_PROGRESS (void) { + uzbl.gui.sbar.load_progress = 50; + g_assert_cmpstr(expand_template("LOAD_PROGRESS", FALSE), ==, "50"); +} + +void +test_LOAD_PROGRESSBAR (void) { + uzbl.gui.sbar.load_progress = 75; + uzbl.gui.sbar.progress_w = 4; + + uzbl.gui.sbar.progress_s = "*"; + uzbl.gui.sbar.progress_u = "-"; + + g_assert_cmpstr(expand_template("LOAD_PROGRESSBAR", FALSE), ==, "***-"); +} + +void +test_TITLE (void) { + uzbl.gui.main_title = "Lorem Ipsum"; + g_assert_cmpstr(expand_template("TITLE", FALSE), ==, "Lorem Ipsum"); +} + +void +test_SELECTED_URI (void) { + uzbl.state.selected_url = "http://example.org/"; + g_assert_cmpstr(expand_template("SELECTED_URI", FALSE), ==, "http://example.org/"); +} + +void +test_NAME (void) { + uzbl.state.instance_name = "12345"; + g_assert_cmpstr(expand_template("NAME", FALSE), ==, "12345"); +} + +void +test_KEYCMD (void) { + uzbl.state.keycmd = g_string_new("gg winslow"); + g_assert_cmpstr(expand_template("KEYCMD", FALSE), ==, "gg winslow"); + g_string_free(uzbl.state.keycmd, TRUE); +} + +void +test_MODE (void) { + uzbl.behave.cmd_indicator = "C"; + uzbl.behave.insert_indicator = "I"; + + uzbl.behave.insert_mode = 0; + g_assert_cmpstr(expand_template("MODE", FALSE), ==, "C"); + + uzbl.behave.insert_mode = 1; + g_assert_cmpstr(expand_template("MODE", FALSE), ==, "I"); +} + +void +test_MSG (void) { + uzbl.gui.sbar.msg = "Hello from frosty Edmonton!"; + g_assert_cmpstr(expand_template("MSG", FALSE), ==, "Hello from frosty Edmonton!"); +} + +void +test_WEBKIT_VERSION (void) { + GString* expected = g_string_new(""); + g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); + g_string_append(expected, " "); + g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); + g_string_append(expected, " "); + g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + + g_assert_cmpstr(expand_template("WEBKIT_MAJOR WEBKIT_MINOR WEBKIT_MICRO", FALSE), ==, g_string_free(expected, FALSE)); +} + +void +test_UNAMEINFO (void) { + GString* expected = g_string_new(""); + + if(uname(&uzbl.state.unameinfo) == -1) + g_printerr("Can't retrieve unameinfo. This test might fail.\n"); + + g_string_append(expected, uzbl.state.unameinfo.sysname); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.nodename); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.release); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.version); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.machine); + + g_assert_cmpstr(expand_template("SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM", FALSE), ==, g_string_free(expected, FALSE)); +} + +void +test_ARCH_UZBL (void) { + g_assert_cmpstr(expand_template("ARCH_UZBL", FALSE), ==, ARCH); +} + +void +test_COMMIT (void) { + g_assert_cmpstr(expand_template("COMMIT", FALSE), ==, COMMIT); +} + int main (int argc, char *argv[]) { g_type_init(); g_test_init(&argc, &argv, NULL); g_test_add_func("/test-expand/URI", test_URI); + g_test_add_func("/test-expand/LOAD_PROGRESS", test_LOAD_PROGRESS); + g_test_add_func("/test-expand/LOAD_PROGRESSBAR", test_LOAD_PROGRESSBAR); + g_test_add_func("/test-expand/TITLE", test_TITLE); + g_test_add_func("/test-expand/SELECTED_URI", test_SELECTED_URI); + g_test_add_func("/test-expand/NAME", test_NAME); + g_test_add_func("/test-expand/KEYCMD", test_KEYCMD); + g_test_add_func("/test-expand/MODE", test_MODE); + g_test_add_func("/test-expand/MSG", test_MSG); + g_test_add_func("/test-expand/WEBKIT_VERSION", test_WEBKIT_VERSION); + g_test_add_func("/test-expand/UNAMEINFO", test_UNAMEINFO); + g_test_add_func("/test-expand/ARCH_UZBL", test_ARCH_UZBL); + /* this only exists on _GNU_SOURCE i guess */ + /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */ + g_test_add_func("/test-expand/COMMIT", test_COMMIT); + + setup_scanner(); return g_test_run(); } -- cgit v1.2.3 From 9026bd0f9e80b52439a4efdd766a00b55c1d99c9 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 6 Jul 2009 19:44:44 -0600 Subject: test simple cmd_useragent --- tests/test-expand.c | 24 ++++++++++++++++++++++++ uzbl.c | 6 +++--- uzbl.h | 4 ++-- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index 03b9b27..9b6bd95 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -138,6 +138,23 @@ test_COMMIT (void) { g_assert_cmpstr(expand_template("COMMIT", FALSE), ==, COMMIT); } +void +test_cmd_useragent (void) { + GString* expected = g_string_new("Uzbl (Webkit "); + g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); + g_string_append(expected, "."); + g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); + g_string_append(expected, "."); + g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + g_string_append(expected, " "); + g_string_append(expected, ARCH); + g_string_append(expected, ")"); + + set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO ARCH_UZBL)"); + cmd_useragent(); + g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); +} + int main (int argc, char *argv[]) { g_type_init(); @@ -159,7 +176,14 @@ main (int argc, char *argv[]) { /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */ g_test_add_func("/test-expand/COMMIT", test_COMMIT); + g_test_add_func("/test-expand/cmd_useragent", test_cmd_useragent); + + if (!g_thread_supported ()) + g_thread_init (NULL); + + uzbl.net.soup_session = webkit_get_default_session(); setup_scanner(); + make_var_to_name_hash(); return g_test_run(); } diff --git a/uzbl.c b/uzbl.c index 3a25cef..1d2a6c9 100644 --- a/uzbl.c +++ b/uzbl.c @@ -181,7 +181,7 @@ const struct { /* construct a hash from the var_name_to_ptr array for quick access */ -static void +void make_var_to_name_hash() { uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal); while(n2v_p->name) { @@ -1758,7 +1758,7 @@ cmd_modkey() { } } -static void +void cmd_useragent() { if (*uzbl.net.useragent == ' ') { g_free (uzbl.net.useragent); @@ -1793,7 +1793,7 @@ move_statusbar() { return; } -static gboolean +gboolean set_var_value(gchar *name, gchar *val) { uzbl_cmdprop *c = NULL; char *endp = NULL; diff --git a/uzbl.h b/uzbl.h index 23409ab..daed44f 100644 --- a/uzbl.h +++ b/uzbl.h @@ -248,7 +248,7 @@ catch_sigterm(int s); static sigfunc * setup_signal(int signe, sigfunc *shandler); -static gboolean +gboolean set_var_value(gchar *name, gchar *val); static void @@ -533,7 +533,7 @@ cmd_socket_dir(); static void cmd_modkey(); -static void +void cmd_useragent() ; static void -- cgit v1.2.3 From 5eeb860a84ba1abdcd41b76bd175b3498b2fccfd Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Mon, 6 Jul 2009 20:32:09 -0600 Subject: test for full useragent expansion --- tests/test-expand.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index 9b6bd95..d9fb6e9 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -28,6 +28,7 @@ extern Uzbl uzbl; extern gchar* expand_template(const char*, gboolean); +extern void make_var_to_name_hash(void); void test_URI (void) { @@ -139,19 +140,45 @@ test_COMMIT (void) { } void -test_cmd_useragent (void) { +test_cmd_useragent_simple (void) { GString* expected = g_string_new("Uzbl (Webkit "); g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); g_string_append(expected, "."); g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); g_string_append(expected, "."); g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + g_string_append(expected, ")"); + + set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO)"); + g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); +} + +void +test_cmd_useragent_full (void) { + GString* expected = g_string_new("Uzbl (Webkit "); + g_string_append(expected, itos(WEBKIT_MAJOR_VERSION)); + g_string_append(expected, "."); + g_string_append(expected, itos(WEBKIT_MINOR_VERSION)); + g_string_append(expected, "."); + g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); + g_string_append(expected, ") ("); + + g_string_append(expected, uzbl.state.unameinfo.sysname); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.nodename); g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.release); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.version); + g_string_append(expected, " "); + g_string_append(expected, uzbl.state.unameinfo.machine); + g_string_append(expected, " ["); g_string_append(expected, ARCH); + g_string_append(expected, "]) (Commit "); + g_string_append(expected, COMMIT); g_string_append(expected, ")"); - set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO ARCH_UZBL)"); - cmd_useragent(); + set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO) (SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM [ARCH_UZBL]) (Commit COMMIT)"); g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); } @@ -176,7 +203,8 @@ main (int argc, char *argv[]) { /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */ g_test_add_func("/test-expand/COMMIT", test_COMMIT); - g_test_add_func("/test-expand/cmd_useragent", test_cmd_useragent); + g_test_add_func("/test-expand/cmd_useragent_simple", test_cmd_useragent_simple); + g_test_add_func("/test-expand/cmd_useragent_full", test_cmd_useragent_full); if (!g_thread_supported ()) g_thread_init (NULL); -- cgit v1.2.3 From 81119479a70c877481271a1a58a7723ac596bc87 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Tue, 7 Jul 2009 04:50:15 -0600 Subject: use expand instead of expand_template for useragent. --- examples/config/uzbl/config | 4 +- tests/test-expand.c | 20 ++++---- uzbl.c | 109 +++++++++++++++++++++----------------------- uzbl.h | 20 ++------ 4 files changed, 68 insertions(+), 85 deletions(-) diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index a4a5f45..c431822 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -85,9 +85,9 @@ set always_insert_mode = 0 #set proxy_url = http://127.0.0.1:8118 #values 0-3 #set http_debug = 0 -#set useragent = uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO) +#set useragent = uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) # Example user agent containing everything: -set useragent = Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO) (SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM [ARCH_UZBL]) (Commit COMMIT) +set useragent = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM [@ARCH_UZBL]) (Commit @COMMIT) #set max_conns = 0 #set max_conns_host = 0 diff --git a/tests/test-expand.c b/tests/test-expand.c index d9fb6e9..c0eae41 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -27,6 +27,7 @@ extern Uzbl uzbl; +extern gchar* expand(char*, guint); extern gchar* expand_template(const char*, gboolean); extern void make_var_to_name_hash(void); @@ -106,16 +107,13 @@ test_WEBKIT_VERSION (void) { g_string_append(expected, " "); g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); - g_assert_cmpstr(expand_template("WEBKIT_MAJOR WEBKIT_MINOR WEBKIT_MICRO", FALSE), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, g_string_free(expected, FALSE)); } void test_UNAMEINFO (void) { GString* expected = g_string_new(""); - if(uname(&uzbl.state.unameinfo) == -1) - g_printerr("Can't retrieve unameinfo. This test might fail.\n"); - g_string_append(expected, uzbl.state.unameinfo.sysname); g_string_append(expected, " "); g_string_append(expected, uzbl.state.unameinfo.nodename); @@ -126,17 +124,17 @@ test_UNAMEINFO (void) { g_string_append(expected, " "); g_string_append(expected, uzbl.state.unameinfo.machine); - g_assert_cmpstr(expand_template("SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM", FALSE), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM", 0), ==, g_string_free(expected, FALSE)); } void test_ARCH_UZBL (void) { - g_assert_cmpstr(expand_template("ARCH_UZBL", FALSE), ==, ARCH); + g_assert_cmpstr(expand("@ARCH_UZBL", 0), ==, ARCH); } void test_COMMIT (void) { - g_assert_cmpstr(expand_template("COMMIT", FALSE), ==, COMMIT); + g_assert_cmpstr(expand("@COMMIT", 0), ==, COMMIT); } void @@ -149,7 +147,7 @@ test_cmd_useragent_simple (void) { g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); g_string_append(expected, ")"); - set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO)"); + set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO)"); g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); } @@ -178,7 +176,7 @@ test_cmd_useragent_full (void) { g_string_append(expected, COMMIT); g_string_append(expected, ")"); - set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO) (SYSNAME NODENAME KERNREL KERNVER ARCH_SYSTEM [ARCH_UZBL]) (Commit COMMIT)"); + set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM [@ARCH_UZBL]) (Commit @COMMIT)"); g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); } @@ -210,6 +208,10 @@ main (int argc, char *argv[]) { g_thread_init (NULL); uzbl.net.soup_session = webkit_get_default_session(); + + if(uname(&uzbl.state.unameinfo) == -1) + g_printerr("Can't retrieve unameinfo. This test might fail.\n"); + setup_scanner(); make_var_to_name_hash(); diff --git a/uzbl.c b/uzbl.c index 1d2a6c9..3c89bb2 100644 --- a/uzbl.c +++ b/uzbl.c @@ -156,6 +156,30 @@ const struct { { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; +const struct { + char *name; + struct { + void *ptr; + int type; + } cp; +} const_name_to_ptr[] = { + { "WEBKIT_MAJOR", {(void*)WEBKIT_MAJOR_VERSION, TYPE_INT}}, + { "WEBKIT_MINOR", {(void*)WEBKIT_MINOR_VERSION, TYPE_INT}}, + { "WEBKIT_MICRO", {(void*)WEBKIT_MICRO_VERSION, TYPE_INT}}, + { "SYSNAME", {&(uzbl.state.unameinfo.sysname), TYPE_STR}}, + { "NODENAME", {&(uzbl.state.unameinfo.nodename), TYPE_STR}}, + { "KERNREL", {&(uzbl.state.unameinfo.release), TYPE_STR}}, + { "KERNVER", {&(uzbl.state.unameinfo.version), TYPE_STR}}, + { "ARCH_SYSTEM", {&(uzbl.state.unameinfo.machine), TYPE_STR}}, + { "ARCH_UZBL", {&(ARCH), TYPE_STR}}, +#ifdef _GNU_SOURCE + { "DOMAINNAME", {&(uzbl.state.unameinfo.domainname), TYPE_STR}}, +#endif + { "COMMIT", {&(COMMIT), TYPE_STR}}, + + { NULL, {NULL, TYPE_INT}} +}, *n2c_p = const_name_to_ptr; + const struct { char *key; guint mask; @@ -180,7 +204,8 @@ const struct { }; -/* construct a hash from the var_name_to_ptr array for quick access */ +/* construct a hash from the var_name_to_ptr and the const_name_to_ptr array + * for quick access */ void make_var_to_name_hash() { uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal); @@ -188,6 +213,12 @@ make_var_to_name_hash() { g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp); n2v_p++; } + + uzbl.comm.proto_const = g_hash_table_new(g_str_hash, g_str_equal); + while(n2c_p->name) { + g_hash_table_insert(uzbl.comm.proto_const, n2c_p->name, (gpointer) &n2c_p->cp); + n2c_p++; + } } /* --- UTILITY FUNCTIONS --- */ @@ -212,7 +243,7 @@ return EXP_ERR; * recurse == 1: don't expand '@(command)@' * recurse == 2: don't expand '@@' */ -static gchar * +gchar * expand(char *s, guint recurse) { uzbl_cmdprop *c; guint etype; @@ -276,17 +307,25 @@ expand(char *s, guint recurse) { break; } - if(etype == EXP_SIMPLE_VAR || + if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { - if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { - if(c->type == TYPE_STR) - g_string_append(buf, (gchar *)*c->ptr); - else if(c->type == TYPE_INT) { - char *b = itos((int)*c->ptr); - g_string_append(buf, b); - g_free(b); - } + void *ptr; + + if('A' <= ret[0] && 'Z' >= ret[0] && + (c = g_hash_table_lookup(uzbl.comm.proto_const, ret))) { + ptr = c->ptr; + } else if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { + ptr = *c->ptr; + } + + if(c && c->type == TYPE_STR) { + g_string_append(buf, (gchar *)ptr); + } else if(c && c->type == TYPE_INT) { + char *b = itos((uintptr_t)ptr); + g_string_append(buf, b); + g_free(b); } + if(etype == EXP_SIMPLE_VAR) s = vend; else @@ -1278,47 +1317,6 @@ expand_template(const char *template, gboolean escape_markup) { uzbl.gui.sbar.msg?uzbl.gui.sbar.msg:""); break; /* useragent syms */ - case SYM_WK_MAJ: - buf = itos(WEBKIT_MAJOR_VERSION); - g_string_append(ret, buf); - g_free(buf); - break; - case SYM_WK_MIN: - buf = itos(WEBKIT_MINOR_VERSION); - g_string_append(ret, buf); - g_free(buf); - break; - case SYM_WK_MIC: - buf = itos(WEBKIT_MICRO_VERSION); - g_string_append(ret, buf); - g_free(buf); - break; - case SYM_SYSNAME: - g_string_append(ret, uzbl.state.unameinfo.sysname); - break; - case SYM_NODENAME: - g_string_append(ret, uzbl.state.unameinfo.nodename); - break; - case SYM_KERNREL: - g_string_append(ret, uzbl.state.unameinfo.release); - break; - case SYM_KERNVER: - g_string_append(ret, uzbl.state.unameinfo.version); - break; - case SYM_ARCHSYS: - g_string_append(ret, uzbl.state.unameinfo.machine); - break; - case SYM_ARCHUZBL: - g_string_append(ret, ARCH); - break; -#ifdef _GNU_SOURCE - case SYM_DOMAINNAME: - g_string_append(ret, uzbl.state.unameinfo.domainname); - break; -#endif - case SYM_COMMIT: - g_string_append(ret, COMMIT); - break; default: break; } @@ -1764,11 +1762,8 @@ cmd_useragent() { g_free (uzbl.net.useragent); uzbl.net.useragent = NULL; } else { - gchar *ua = expand_template(uzbl.net.useragent, FALSE); - if (ua) - g_object_set(G_OBJECT(uzbl.net.soup_session), SOUP_SESSION_USER_AGENT, ua, NULL); - g_free(uzbl.net.useragent); - uzbl.net.useragent = ua; + g_object_set(G_OBJECT(uzbl.net.soup_session), SOUP_SESSION_USER_AGENT, + uzbl.net.useragent, NULL); } } diff --git a/uzbl.h b/uzbl.h index daed44f..e9134fc 100644 --- a/uzbl.h +++ b/uzbl.h @@ -17,12 +17,6 @@ enum { SYM_LOADPRGS, SYM_LOADPRGSBAR, SYM_KEYCMD, SYM_MODE, SYM_MSG, SYM_SELECTED_URI, - /* useragent symbols */ - SYM_WK_MAJ, SYM_WK_MIN, SYM_WK_MIC, - SYM_SYSNAME, SYM_NODENAME, - SYM_KERNREL, SYM_KERNVER, - SYM_ARCHSYS, SYM_ARCHUZBL, - SYM_DOMAINNAME, SYM_COMMIT }; const struct { @@ -39,17 +33,6 @@ const struct { {"LOAD_PROGRESS", SYM_LOADPRGS}, {"LOAD_PROGRESSBAR", SYM_LOADPRGSBAR}, - {"WEBKIT_MAJOR", SYM_WK_MAJ}, - {"WEBKIT_MINOR", SYM_WK_MIN}, - {"WEBKIT_MICRO", SYM_WK_MIC}, - {"SYSNAME", SYM_SYSNAME}, - {"NODENAME", SYM_NODENAME}, - {"KERNREL", SYM_KERNREL}, - {"KERNVER", SYM_KERNVER}, - {"ARCH_SYSTEM", SYM_ARCHSYS}, - {"ARCH_UZBL", SYM_ARCHUZBL}, - {"DOMAINNAME", SYM_DOMAINNAME}, - {"COMMIT", SYM_COMMIT}, {NULL, 0} }, *symp = symbols; @@ -93,6 +76,9 @@ typedef struct { gchar *socket_path; /* stores (key)"variable name" -> (value)"pointer to this var*/ GHashTable *proto_var; + /* stores (key)"CONSTANT NAME" -> (value)"pointer to this var*/ + GHashTable *proto_const; + gchar *sync_stdout; } Communication; -- cgit v1.2.3 From 0f0b2c13c8c71b97d26f324c02313940acf39ac1 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Tue, 7 Jul 2009 06:42:48 -0600 Subject: optional markup escaping in expand() --- tests/test-expand.c | 33 ++++++++++++++++++++++++++++----- uzbl.c | 47 ++++++++++++++++++++++++++++++++++------------- uzbl.h | 2 +- 3 files changed, 63 insertions(+), 19 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index c0eae41..d83bbe5 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -27,7 +27,7 @@ extern Uzbl uzbl; -extern gchar* expand(char*, guint); +extern gchar* expand(char*, guint, gboolean); extern gchar* expand_template(const char*, gboolean); extern void make_var_to_name_hash(void); @@ -107,7 +107,7 @@ test_WEBKIT_VERSION (void) { g_string_append(expected, " "); g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); - g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0, FALSE), ==, g_string_free(expected, FALSE)); } void @@ -124,17 +124,17 @@ test_UNAMEINFO (void) { g_string_append(expected, " "); g_string_append(expected, uzbl.state.unameinfo.machine); - g_assert_cmpstr(expand("@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM", 0), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM", 0, FALSE), ==, g_string_free(expected, FALSE)); } void test_ARCH_UZBL (void) { - g_assert_cmpstr(expand("@ARCH_UZBL", 0), ==, ARCH); + g_assert_cmpstr(expand("@ARCH_UZBL", 0, FALSE), ==, ARCH); } void test_COMMIT (void) { - g_assert_cmpstr(expand("@COMMIT", 0), ==, COMMIT); + g_assert_cmpstr(expand("@COMMIT", 0, FALSE), ==, COMMIT); } void @@ -180,6 +180,24 @@ test_cmd_useragent_full (void) { g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); } +void +test_escape_markup (void) { + /* simple expansion */ + uzbl.state.uri = g_strdup("<&>"); + g_assert_cmpstr(expand("@uri", 0, FALSE), ==, uzbl.state.uri); + g_assert_cmpstr(expand("@uri", 0, TRUE), ==, "<&>"); + + /* shell expansion */ + g_assert_cmpstr(expand("@(echo -n '<&>')@", 0, FALSE), ==, "<&>"); + g_assert_cmpstr(expand("@(echo -n '<&>')@", 0, TRUE), ==, "<&>"); + + /* javascript expansion */ + g_assert_cmpstr(expand("@<'<&>'>@", 0, FALSE), ==, "<&>"); + g_assert_cmpstr(expand("@<'<&>'>@", 0, TRUE), ==, "<&>"); + + g_free(uzbl.state.uri); +} + int main (int argc, char *argv[]) { g_type_init(); @@ -204,6 +222,9 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/cmd_useragent_simple", test_cmd_useragent_simple); g_test_add_func("/test-expand/cmd_useragent_full", test_cmd_useragent_full); + g_test_add_func("/test-expand/escape_markup", test_escape_markup); + + gtk_init(&argc, &argv); if (!g_thread_supported ()) g_thread_init (NULL); @@ -215,6 +236,8 @@ main (int argc, char *argv[]) { setup_scanner(); make_var_to_name_hash(); + uzbl.gui.scrolled_win = create_browser(); + return g_test_run(); } diff --git a/uzbl.c b/uzbl.c index 3c89bb2..631fc2a 100644 --- a/uzbl.c +++ b/uzbl.c @@ -244,7 +244,7 @@ return EXP_ERR; * recurse == 2: don't expand '@@' */ gchar * -expand(char *s, guint recurse) { +expand(char *s, guint recurse, gboolean escape_markup) { uzbl_cmdprop *c; guint etype; char upto = ' '; @@ -319,7 +319,14 @@ expand(char *s, guint recurse) { } if(c && c->type == TYPE_STR) { - g_string_append(buf, (gchar *)ptr); + if(escape_markup) { + char *b = g_markup_escape_text((gchar *)ptr, + strlen((gchar *)ptr)); + g_string_append(buf, b); + g_free(b); + } else { + g_string_append(buf, (gchar *)ptr); + } } else if(c && c->type == TYPE_INT) { char *b = itos((uintptr_t)ptr); g_string_append(buf, b); @@ -331,9 +338,9 @@ expand(char *s, guint recurse) { else s = vend+1; } - else if(recurse != 1 && + else if(recurse != 1 && etype == EXP_EXPR) { - mycmd = expand(ret, 1); + mycmd = expand(ret, 1, escape_markup); g_spawn_command_line_sync(mycmd, &cmd_stdout, NULL, NULL, &err); g_free(mycmd); @@ -342,19 +349,33 @@ expand(char *s, guint recurse) { g_error_free (err); } else if (*cmd_stdout) { - g_string_append(buf, cmd_stdout); + if(escape_markup) { + char *b = g_markup_escape_text(cmd_stdout, + strlen(cmd_stdout)); + g_string_append(buf, b); + g_free(b); + } else { + g_string_append(buf, cmd_stdout); + } g_free(cmd_stdout); } s = vend+2; } - else if(recurse != 2 && + else if(recurse != 2 && etype == EXP_JS) { - mycmd = expand(ret, 2); + mycmd = expand(ret, 2, escape_markup); eval_js(uzbl.gui.web_view, mycmd, js_ret); g_free(mycmd); if(js_ret->str) { - g_string_append(buf, js_ret->str); + if(escape_markup) { + char *b = g_markup_escape_text(js_ret->str, + strlen(js_ret->str)); + g_string_append(buf, b); + g_free(b); + } else { + g_string_append(buf, js_ret->str); + } g_string_free(js_ret, TRUE); js_ret = g_string_new(""); } @@ -855,7 +876,7 @@ print(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; gchar* buf; - buf = expand(argv_idx(argv, 0), 0); + buf = expand(argv_idx(argv, 0), 0, FALSE); g_string_assign(result, buf); g_free(buf); } @@ -1797,17 +1818,17 @@ set_var_value(gchar *name, gchar *val) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) { /* check for the variable type */ if (c->type == TYPE_STR) { - buf = expand(val, 0); + buf = expand(val, 0, FALSE); g_free(*c->ptr); *c->ptr = buf; } else if(c->type == TYPE_INT) { int *ip = (int *)c->ptr; - buf = expand(val, 0); + buf = expand(val, 0, FALSE); *ip = (int)strtoul(buf, &endp, 10); g_free(buf); } else if (c->type == TYPE_FLOAT) { float *fp = (float *)c->ptr; - buf = expand(val, 0); + buf = expand(val, 0, FALSE); *fp = strtod(buf, &endp); g_free(buf); } @@ -2244,7 +2265,7 @@ exec_paramcmd(const Action *act, const guint i) { } -static GtkWidget* +GtkWidget* create_browser () { GUI *g = &uzbl.gui; diff --git a/uzbl.h b/uzbl.h index e9134fc..48d1ef5 100644 --- a/uzbl.h +++ b/uzbl.h @@ -376,7 +376,7 @@ run_keycmd(const gboolean key_ret); static void exec_paramcmd(const Action* act, const guint i); -static GtkWidget* +GtkWidget* create_browser (); static GtkWidget* -- cgit v1.2.3 From 396043a1fd05a10f27c6eb17b09dbb6df6011cca Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 19:15:56 -0600 Subject: lots of stuff, see below. add uzbl.info, move wk_*_version, COMMIT, and ARCH_UZBL into var_name_to_const, get rid of unameinfo, split off initialize() from main() --- tests/test-expand.c | 50 +++--------- uzbl.c | 225 ++++++++++++++++++++++++---------------------------- uzbl.h | 16 +++- 3 files changed, 129 insertions(+), 162 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index d83bbe5..a3163ed 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -110,23 +110,6 @@ test_WEBKIT_VERSION (void) { g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0, FALSE), ==, g_string_free(expected, FALSE)); } -void -test_UNAMEINFO (void) { - GString* expected = g_string_new(""); - - g_string_append(expected, uzbl.state.unameinfo.sysname); - g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.nodename); - g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.release); - g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.version); - g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.machine); - - g_assert_cmpstr(expand("@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM", 0, FALSE), ==, g_string_free(expected, FALSE)); -} - void test_ARCH_UZBL (void) { g_assert_cmpstr(expand("@ARCH_UZBL", 0, FALSE), ==, ARCH); @@ -161,22 +144,26 @@ test_cmd_useragent_full (void) { g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); g_string_append(expected, ") ("); - g_string_append(expected, uzbl.state.unameinfo.sysname); + struct utsname unameinfo; + if(uname(&unameinfo) == -1) + g_printerr("Can't retrieve unameinfo. This test might fail.\n"); + + g_string_append(expected, unameinfo.sysname); g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.nodename); + g_string_append(expected, unameinfo.nodename); g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.release); + g_string_append(expected, unameinfo.release); g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.version); + g_string_append(expected, unameinfo.version); g_string_append(expected, " "); - g_string_append(expected, uzbl.state.unameinfo.machine); + g_string_append(expected, unameinfo.machine); g_string_append(expected, " ["); g_string_append(expected, ARCH); g_string_append(expected, "]) (Commit "); g_string_append(expected, COMMIT); g_string_append(expected, ")"); - set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM [@ARCH_UZBL]) (Commit @COMMIT)"); + set_var_value("useragent", "Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)"); g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE)); } @@ -213,10 +200,7 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/MODE", test_MODE); g_test_add_func("/test-expand/MSG", test_MSG); g_test_add_func("/test-expand/WEBKIT_VERSION", test_WEBKIT_VERSION); - g_test_add_func("/test-expand/UNAMEINFO", test_UNAMEINFO); g_test_add_func("/test-expand/ARCH_UZBL", test_ARCH_UZBL); - /* this only exists on _GNU_SOURCE i guess */ - /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */ g_test_add_func("/test-expand/COMMIT", test_COMMIT); g_test_add_func("/test-expand/cmd_useragent_simple", test_cmd_useragent_simple); @@ -224,19 +208,7 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/escape_markup", test_escape_markup); - gtk_init(&argc, &argv); - if (!g_thread_supported ()) - g_thread_init (NULL); - - uzbl.net.soup_session = webkit_get_default_session(); - - if(uname(&uzbl.state.unameinfo) == -1) - g_printerr("Can't retrieve unameinfo. This test might fail.\n"); - - setup_scanner(); - make_var_to_name_hash(); - - uzbl.gui.scrolled_win = create_browser(); + initialize(argc, argv); return g_test_run(); } diff --git a/uzbl.c b/uzbl.c index 631fc2a..eae4015 100644 --- a/uzbl.c +++ b/uzbl.c @@ -83,102 +83,88 @@ typedef const struct { void **ptr; int type; int dump; + int writeable; void (*func)(void); } uzbl_cmdprop; enum {TYPE_INT, TYPE_STR, TYPE_FLOAT}; -/* an abbreviation to help keep the table's width humane */ -#define PTR(var, t, d, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = d, .func = fun } +/* abbreviations to help keep the table's width humane */ +#define PTR_V(var, t, d, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = d, .writeable = 1, .func = fun } +#define PTR_C(var, t, fun) { .ptr = (void*)&(var), .type = TYPE_##t, .dump = 0, .writeable = 0, .func = fun } const struct { char *name; uzbl_cmdprop cp; } var_name_to_ptr[] = { -/* variable name pointer to variable in code type dump callback function */ -/* --------------------------------------------------------------------------------------- */ - { "uri", PTR(uzbl.state.uri, STR, 1, cmd_load_uri)}, - { "verbose", PTR(uzbl.state.verbose, INT, 1, NULL)}, - { "mode", PTR(uzbl.behave.mode, INT, 0, NULL)}, - { "inject_html", PTR(uzbl.behave.inject_html, STR, 0, cmd_inject_html)}, - { "base_url", PTR(uzbl.behave.base_url, STR, 1, NULL)}, - { "html_endmarker", PTR(uzbl.behave.html_endmarker, STR, 1, NULL)}, - { "html_mode_timeout", PTR(uzbl.behave.html_timeout, INT, 1, NULL)}, - { "status_message", PTR(uzbl.gui.sbar.msg, STR, 1, update_title)}, - { "show_status", PTR(uzbl.behave.show_status, INT, 1, cmd_set_status)}, - { "status_top", PTR(uzbl.behave.status_top, INT, 1, move_statusbar)}, - { "status_format", PTR(uzbl.behave.status_format, STR, 1, update_title)}, - { "status_pbar_done", PTR(uzbl.gui.sbar.progress_s, STR, 1, update_title)}, - { "status_pbar_pending", PTR(uzbl.gui.sbar.progress_u, STR, 1, update_title)}, - { "status_pbar_width", PTR(uzbl.gui.sbar.progress_w, INT, 1, update_title)}, - { "status_background", PTR(uzbl.behave.status_background, STR, 1, update_title)}, - { "insert_indicator", PTR(uzbl.behave.insert_indicator, STR, 1, update_title)}, - { "command_indicator", PTR(uzbl.behave.cmd_indicator, STR, 1, update_title)}, - { "title_format_long", PTR(uzbl.behave.title_format_long, STR, 1, update_title)}, - { "title_format_short", PTR(uzbl.behave.title_format_short, STR, 1, update_title)}, - { "icon", PTR(uzbl.gui.icon, STR, 1, set_icon)}, - { "insert_mode", PTR(uzbl.behave.insert_mode, INT, 1, NULL)}, - { "always_insert_mode", PTR(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, - { "reset_command_mode", PTR(uzbl.behave.reset_command_mode, INT, 1, NULL)}, - { "modkey", PTR(uzbl.behave.modkey, STR, 1, cmd_modkey)}, - { "load_finish_handler", PTR(uzbl.behave.load_finish_handler, STR, 1, NULL)}, - { "load_start_handler", PTR(uzbl.behave.load_start_handler, STR, 1, NULL)}, - { "load_commit_handler", PTR(uzbl.behave.load_commit_handler, STR, 1, NULL)}, - { "history_handler", PTR(uzbl.behave.history_handler, STR, 1, NULL)}, - { "download_handler", PTR(uzbl.behave.download_handler, STR, 1, NULL)}, - { "cookie_handler", PTR(uzbl.behave.cookie_handler, STR, 1, cmd_cookie_handler)}, - { "fifo_dir", PTR(uzbl.behave.fifo_dir, STR, 1, cmd_fifo_dir)}, - { "socket_dir", PTR(uzbl.behave.socket_dir, STR, 1, cmd_socket_dir)}, - { "http_debug", PTR(uzbl.behave.http_debug, INT, 1, cmd_http_debug)}, - { "shell_cmd", PTR(uzbl.behave.shell_cmd, STR, 1, NULL)}, - { "proxy_url", PTR(uzbl.net.proxy_url, STR, 1, set_proxy_url)}, - { "max_conns", PTR(uzbl.net.max_conns, INT, 1, cmd_max_conns)}, - { "max_conns_host", PTR(uzbl.net.max_conns_host, INT, 1, cmd_max_conns_host)}, - { "useragent", PTR(uzbl.net.useragent, STR, 1, cmd_useragent)}, +/* variable name pointer to variable in code type dump callback function */ +/* ---------------------------------------------------------------------------------------------- */ + { "uri", PTR_V(uzbl.state.uri, STR, 1, cmd_load_uri)}, + { "verbose", PTR_V(uzbl.state.verbose, INT, 1, NULL)}, + { "mode", PTR_V(uzbl.behave.mode, INT, 0, NULL)}, + { "inject_html", PTR_V(uzbl.behave.inject_html, STR, 0, cmd_inject_html)}, + { "base_url", PTR_V(uzbl.behave.base_url, STR, 1, NULL)}, + { "html_endmarker", PTR_V(uzbl.behave.html_endmarker, STR, 1, NULL)}, + { "html_mode_timeout", PTR_V(uzbl.behave.html_timeout, INT, 1, NULL)}, + { "status_message", PTR_V(uzbl.gui.sbar.msg, STR, 1, update_title)}, + { "show_status", PTR_V(uzbl.behave.show_status, INT, 1, cmd_set_status)}, + { "status_top", PTR_V(uzbl.behave.status_top, INT, 1, move_statusbar)}, + { "status_format", PTR_V(uzbl.behave.status_format, STR, 1, update_title)}, + { "status_pbar_done", PTR_V(uzbl.gui.sbar.progress_s, STR, 1, update_title)}, + { "status_pbar_pending", PTR_V(uzbl.gui.sbar.progress_u, STR, 1, update_title)}, + { "status_pbar_width", PTR_V(uzbl.gui.sbar.progress_w, INT, 1, update_title)}, + { "status_background", PTR_V(uzbl.behave.status_background, STR, 1, update_title)}, + { "insert_indicator", PTR_V(uzbl.behave.insert_indicator, STR, 1, update_title)}, + { "command_indicator", PTR_V(uzbl.behave.cmd_indicator, STR, 1, update_title)}, + { "title_format_long", PTR_V(uzbl.behave.title_format_long, STR, 1, update_title)}, + { "title_format_short", PTR_V(uzbl.behave.title_format_short, STR, 1, update_title)}, + { "icon", PTR_V(uzbl.gui.icon, STR, 1, set_icon)}, + { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, NULL)}, + { "always_insert_mode", PTR_V(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, + { "reset_command_mode", PTR_V(uzbl.behave.reset_command_mode, INT, 1, NULL)}, + { "modkey", PTR_V(uzbl.behave.modkey, STR, 1, cmd_modkey)}, + { "load_finish_handler", PTR_V(uzbl.behave.load_finish_handler, STR, 1, NULL)}, + { "load_start_handler", PTR_V(uzbl.behave.load_start_handler, STR, 1, NULL)}, + { "load_commit_handler", PTR_V(uzbl.behave.load_commit_handler, STR, 1, NULL)}, + { "history_handler", PTR_V(uzbl.behave.history_handler, STR, 1, NULL)}, + { "download_handler", PTR_V(uzbl.behave.download_handler, STR, 1, NULL)}, + { "cookie_handler", PTR_V(uzbl.behave.cookie_handler, STR, 1, cmd_cookie_handler)}, + { "fifo_dir", PTR_V(uzbl.behave.fifo_dir, STR, 1, cmd_fifo_dir)}, + { "socket_dir", PTR_V(uzbl.behave.socket_dir, STR, 1, cmd_socket_dir)}, + { "http_debug", PTR_V(uzbl.behave.http_debug, INT, 1, cmd_http_debug)}, + { "shell_cmd", PTR_V(uzbl.behave.shell_cmd, STR, 1, NULL)}, + { "proxy_url", PTR_V(uzbl.net.proxy_url, STR, 1, set_proxy_url)}, + { "max_conns", PTR_V(uzbl.net.max_conns, INT, 1, cmd_max_conns)}, + { "max_conns_host", PTR_V(uzbl.net.max_conns_host, INT, 1, cmd_max_conns_host)}, + { "useragent", PTR_V(uzbl.net.useragent, STR, 1, cmd_useragent)}, /* exported WebKitWebSettings properties */ - { "zoom_level", PTR(uzbl.behave.zoom_level, FLOAT,1, cmd_zoom_level)}, - { "font_size", PTR(uzbl.behave.font_size, INT, 1, cmd_font_size)}, - { "monospace_size", PTR(uzbl.behave.monospace_size, INT, 1, cmd_font_size)}, - { "minimum_font_size", PTR(uzbl.behave.minimum_font_size, INT, 1, cmd_minimum_font_size)}, - { "disable_plugins", PTR(uzbl.behave.disable_plugins, INT, 1, cmd_disable_plugins)}, - { "disable_scripts", PTR(uzbl.behave.disable_scripts, INT, 1, cmd_disable_scripts)}, - { "autoload_images", PTR(uzbl.behave.autoload_img, INT, 1, cmd_autoload_img)}, - { "autoshrink_images", PTR(uzbl.behave.autoshrink_img, INT, 1, cmd_autoshrink_img)}, - { "enable_spellcheck", PTR(uzbl.behave.enable_spellcheck, INT, 1, cmd_enable_spellcheck)}, - { "enable_private", PTR(uzbl.behave.enable_private, INT, 1, cmd_enable_private)}, - { "print_backgrounds", PTR(uzbl.behave.print_bg, INT, 1, cmd_print_bg)}, - { "stylesheet_uri", PTR(uzbl.behave.style_uri, STR, 1, cmd_style_uri)}, - { "resizable_text_areas",PTR(uzbl.behave.resizable_txt, INT, 1, cmd_resizable_txt)}, - { "default_encoding", PTR(uzbl.behave.default_encoding, STR, 1, cmd_default_encoding)}, - { "enforce_96_dpi", PTR(uzbl.behave.enforce_96dpi, INT, 1, cmd_enforce_96dpi)}, - { "caret_browsing", PTR(uzbl.behave.caret_browsing, INT, 1, cmd_caret_browsing)}, - - { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .func = NULL}} + { "zoom_level", PTR_V(uzbl.behave.zoom_level, FLOAT,1, cmd_zoom_level)}, + { "font_size", PTR_V(uzbl.behave.font_size, INT, 1, cmd_font_size)}, + { "monospace_size", PTR_V(uzbl.behave.monospace_size, INT, 1, cmd_font_size)}, + { "minimum_font_size", PTR_V(uzbl.behave.minimum_font_size, INT, 1, cmd_minimum_font_size)}, + { "disable_plugins", PTR_V(uzbl.behave.disable_plugins, INT, 1, cmd_disable_plugins)}, + { "disable_scripts", PTR_V(uzbl.behave.disable_scripts, INT, 1, cmd_disable_scripts)}, + { "autoload_images", PTR_V(uzbl.behave.autoload_img, INT, 1, cmd_autoload_img)}, + { "autoshrink_images", PTR_V(uzbl.behave.autoshrink_img, INT, 1, cmd_autoshrink_img)}, + { "enable_spellcheck", PTR_V(uzbl.behave.enable_spellcheck, INT, 1, cmd_enable_spellcheck)}, + { "enable_private", PTR_V(uzbl.behave.enable_private, INT, 1, cmd_enable_private)}, + { "print_backgrounds", PTR_V(uzbl.behave.print_bg, INT, 1, cmd_print_bg)}, + { "stylesheet_uri", PTR_V(uzbl.behave.style_uri, STR, 1, cmd_style_uri)}, + { "resizable_text_areas",PTR_V(uzbl.behave.resizable_txt, INT, 1, cmd_resizable_txt)}, + { "default_encoding", PTR_V(uzbl.behave.default_encoding, STR, 1, cmd_default_encoding)}, + { "enforce_96_dpi", PTR_V(uzbl.behave.enforce_96dpi, INT, 1, cmd_enforce_96dpi)}, + { "caret_browsing", PTR_V(uzbl.behave.caret_browsing, INT, 1, cmd_caret_browsing)}, + + /* constants (not dumpable or writeable) */ + { "WEBKIT_MAJOR", PTR_C(uzbl.info.webkit_major, INT, NULL)}, + { "WEBKIT_MINOR", PTR_C(uzbl.info.webkit_minor, INT, NULL)}, + { "WEBKIT_MICRO", PTR_C(uzbl.info.webkit_micro, INT, NULL)}, + { "ARCH_UZBL", PTR_C(uzbl.info.arch, STR, NULL)}, + { "COMMIT", PTR_C(uzbl.info.commit, STR, NULL)}, + + { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; -const struct { - char *name; - struct { - void *ptr; - int type; - } cp; -} const_name_to_ptr[] = { - { "WEBKIT_MAJOR", {(void*)WEBKIT_MAJOR_VERSION, TYPE_INT}}, - { "WEBKIT_MINOR", {(void*)WEBKIT_MINOR_VERSION, TYPE_INT}}, - { "WEBKIT_MICRO", {(void*)WEBKIT_MICRO_VERSION, TYPE_INT}}, - { "SYSNAME", {&(uzbl.state.unameinfo.sysname), TYPE_STR}}, - { "NODENAME", {&(uzbl.state.unameinfo.nodename), TYPE_STR}}, - { "KERNREL", {&(uzbl.state.unameinfo.release), TYPE_STR}}, - { "KERNVER", {&(uzbl.state.unameinfo.version), TYPE_STR}}, - { "ARCH_SYSTEM", {&(uzbl.state.unameinfo.machine), TYPE_STR}}, - { "ARCH_UZBL", {&(ARCH), TYPE_STR}}, -#ifdef _GNU_SOURCE - { "DOMAINNAME", {&(uzbl.state.unameinfo.domainname), TYPE_STR}}, -#endif - { "COMMIT", {&(COMMIT), TYPE_STR}}, - - { NULL, {NULL, TYPE_INT}} -}, *n2c_p = const_name_to_ptr; const struct { char *key; @@ -213,12 +199,6 @@ make_var_to_name_hash() { g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp); n2v_p++; } - - uzbl.comm.proto_const = g_hash_table_new(g_str_hash, g_str_equal); - while(n2c_p->name) { - g_hash_table_insert(uzbl.comm.proto_const, n2c_p->name, (gpointer) &n2c_p->cp); - n2c_p++; - } } /* --- UTILITY FUNCTIONS --- */ @@ -309,28 +289,21 @@ expand(char *s, guint recurse, gboolean escape_markup) { if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { - void *ptr; - - if('A' <= ret[0] && 'Z' >= ret[0] && - (c = g_hash_table_lookup(uzbl.comm.proto_const, ret))) { - ptr = c->ptr; - } else if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { - ptr = *c->ptr; - } - - if(c && c->type == TYPE_STR) { - if(escape_markup) { - char *b = g_markup_escape_text((gchar *)ptr, - strlen((gchar *)ptr)); + if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { + if(c->type == TYPE_STR) { + if(escape_markup) { + char *b = g_markup_escape_text((gchar *)*c->ptr, + strlen((gchar *)*c->ptr)); + g_string_append(buf, b); + g_free(b); + } else { + g_string_append(buf, (gchar *)*c->ptr); + } + } else if(c && c->type == TYPE_INT) { + char *b = itos((uintptr_t)*c->ptr); g_string_append(buf, b); g_free(b); - } else { - g_string_append(buf, (gchar *)ptr); } - } else if(c && c->type == TYPE_INT) { - char *b = itos((uintptr_t)ptr); - g_string_append(buf, b); - g_free(b); } if(etype == EXP_SIMPLE_VAR) @@ -1816,6 +1789,8 @@ set_var_value(gchar *name, gchar *val) { char *buf = NULL; if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) { + if(!c->writeable) return TRUE; + /* check for the variable type */ if (c->type == TYPE_STR) { buf = expand(val, 0, FALSE); @@ -2701,10 +2676,10 @@ dump_config() { g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL); } -#ifndef UZBL_LIBRARY -/** -- MAIN -- **/ -int -main (int argc, char* argv[]) { +/* set up gtk, gobject, variable defaults and other things that tests and other + * external applications need to do anyhow */ +void +initialize(int argc, char *argv[]) { gtk_init (&argc, &argv); if (!g_thread_supported ()) g_thread_init (NULL); @@ -2717,9 +2692,6 @@ main (int argc, char* argv[]) { g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, NULL); g_option_context_free(context); - - gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); - gboolean verbose_override = uzbl.state.verbose; /* initialize hash table */ uzbl.bindings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, free_action); @@ -2734,10 +2706,6 @@ main (int argc, char* argv[]) { if(setup_signal(SIGALRM, catch_alrm) == SIG_ERR) fprintf(stderr, "uzbl: error hooking SIGALARM\n"); - - if(uname(&uzbl.state.unameinfo) == -1) - g_printerr("Can't retrieve unameinfo. Your useragent might appear wrong.\n"); - uzbl.gui.sbar.progress_s = g_strdup("="); uzbl.gui.sbar.progress_u = g_strdup("·"); uzbl.gui.sbar.progress_w = 10; @@ -2752,13 +2720,27 @@ main (int argc, char* argv[]) { uzbl.behave.insert_indicator = g_strdup("I"); uzbl.behave.cmd_indicator = g_strdup("C"); + uzbl.info.webkit_major = WEBKIT_MAJOR_VERSION; + uzbl.info.webkit_minor = WEBKIT_MINOR_VERSION; + uzbl.info.webkit_micro = WEBKIT_MICRO_VERSION; + uzbl.info.arch = ARCH; + uzbl.info.commit = COMMIT; + setup_scanner(); commands_hash (); make_var_to_name_hash(); + uzbl.gui.scrolled_win = create_browser(); +} + +#ifndef UZBL_LIBRARY +/** -- MAIN -- **/ +int +main (int argc, char* argv[]) { + initialize(argc, argv); + uzbl.gui.vbox = gtk_vbox_new (FALSE, 0); - uzbl.gui.scrolled_win = create_browser(); create_mainbar(); /* initial packing */ @@ -2804,6 +2786,9 @@ main (int argc, char* argv[]) { /* WebInspector */ set_up_inspector(); + gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); + gboolean verbose_override = uzbl.state.verbose; + if (verbose_override > uzbl.state.verbose) uzbl.state.verbose = verbose_override; diff --git a/uzbl.h b/uzbl.h index 48d1ef5..275c5c1 100644 --- a/uzbl.h +++ b/uzbl.h @@ -76,8 +76,6 @@ typedef struct { gchar *socket_path; /* stores (key)"variable name" -> (value)"pointer to this var*/ GHashTable *proto_var; - /* stores (key)"CONSTANT NAME" -> (value)"pointer to this var*/ - GHashTable *proto_const; gchar *sync_stdout; } Communication; @@ -93,7 +91,6 @@ typedef struct { gchar *executable_path; GString* keycmd; gchar* searchtx; - struct utsname unameinfo; /* system info */ gboolean verbose; } State; @@ -169,6 +166,15 @@ typedef struct { JSClassRef classref; } Javascript; +/* static information */ +typedef struct { + int webkit_major; + int webkit_minor; + int webkit_micro; + gchar *arch; + gchar *commit; +} Info; + /* main uzbl data structure */ typedef struct { GUI gui; @@ -177,6 +183,7 @@ typedef struct { Behaviour behave; Communication comm; Javascript js; + Info info; Window xwin; GScanner *scan; @@ -376,6 +383,9 @@ run_keycmd(const gboolean key_ret); static void exec_paramcmd(const Action* act, const guint i); +void +initialize (); + GtkWidget* create_browser (); -- cgit v1.2.3 From 9483c1c817b98fcc44fb68ae84607eeaf04e884c Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 19:23:33 -0600 Subject: strip trailing newline from @()@ expansions --- uzbl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uzbl.c b/uzbl.c index eae4015..2751cb6 100644 --- a/uzbl.c +++ b/uzbl.c @@ -322,9 +322,13 @@ expand(char *s, guint recurse, gboolean escape_markup) { g_error_free (err); } else if (*cmd_stdout) { + int len = strlen(cmd_stdout); + + if(cmd_stdout[len-1] == '\n') + cmd_stdout[--len] = 0; /* strip trailing newline */ + if(escape_markup) { - char *b = g_markup_escape_text(cmd_stdout, - strlen(cmd_stdout)); + char *b = g_markup_escape_text(cmd_stdout, len); g_string_append(buf, b); g_free(b); } else { -- cgit v1.2.3 From f60b8c882034190252cc465c33606ccc9ae79a74 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 21:31:49 -0600 Subject: test-expand: rely on default *_indicator and progress_* --- tests/test-expand.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index a3163ed..c114564 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -49,10 +49,7 @@ test_LOAD_PROGRESSBAR (void) { uzbl.gui.sbar.load_progress = 75; uzbl.gui.sbar.progress_w = 4; - uzbl.gui.sbar.progress_s = "*"; - uzbl.gui.sbar.progress_u = "-"; - - g_assert_cmpstr(expand_template("LOAD_PROGRESSBAR", FALSE), ==, "***-"); + g_assert_cmpstr(expand_template("LOAD_PROGRESSBAR", FALSE), ==, "===·"); } void @@ -82,9 +79,6 @@ test_KEYCMD (void) { void test_MODE (void) { - uzbl.behave.cmd_indicator = "C"; - uzbl.behave.insert_indicator = "I"; - uzbl.behave.insert_mode = 0; g_assert_cmpstr(expand_template("MODE", FALSE), ==, "C"); -- cgit v1.2.3 From f77af67457a2a9ceb5e49b796ef339bd0afbdd77 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 21:45:07 -0600 Subject: expand: append "" for a NULL string var --- uzbl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uzbl.c b/uzbl.c index 2751cb6..6b01a32 100644 --- a/uzbl.c +++ b/uzbl.c @@ -290,7 +290,7 @@ expand(char *s, guint recurse, gboolean escape_markup) { if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { - if(c->type == TYPE_STR) { + if(c->type == TYPE_STR && *c->ptr != NULL) { if(escape_markup) { char *b = g_markup_escape_text((gchar *)*c->ptr, strlen((gchar *)*c->ptr)); @@ -299,7 +299,7 @@ expand(char *s, guint recurse, gboolean escape_markup) { } else { g_string_append(buf, (gchar *)*c->ptr); } - } else if(c && c->type == TYPE_INT) { + } else if(c->type == TYPE_INT) { char *b = itos((uintptr_t)*c->ptr); g_string_append(buf, b); g_free(b); -- cgit v1.2.3 From 443fd2cffcf4608db9212b87f0519c2e999aff02 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 22:14:10 -0600 Subject: move all the simple stuff from expand_template --- tests/test-expand.c | 34 +++++++++++++++--------------- uzbl.c | 59 +++++++++-------------------------------------------- uzbl.h | 6 +++++- 3 files changed, 33 insertions(+), 66 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index c114564..a84a413 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -32,36 +32,38 @@ extern gchar* expand_template(const char*, gboolean); extern void make_var_to_name_hash(void); void -test_URI (void) { +test_uri (void) { + g_assert_cmpstr(expand("@uri", 0, FALSE), ==, ""); + uzbl.state.uri = g_strdup("http://www.uzbl.org/"); - g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri); + g_assert_cmpstr(expand("@uri", 0, FALSE), ==, uzbl.state.uri); g_free(uzbl.state.uri); } void test_LOAD_PROGRESS (void) { uzbl.gui.sbar.load_progress = 50; - g_assert_cmpstr(expand_template("LOAD_PROGRESS", FALSE), ==, "50"); + g_assert_cmpstr(expand("@LOAD_PROGRESS", 0, FALSE), ==, "50"); } void test_LOAD_PROGRESSBAR (void) { - uzbl.gui.sbar.load_progress = 75; uzbl.gui.sbar.progress_w = 4; + progress_change_cb(NULL, 75, NULL); - g_assert_cmpstr(expand_template("LOAD_PROGRESSBAR", FALSE), ==, "===·"); + g_assert_cmpstr(expand("@LOAD_PROGRESSBAR", 0, FALSE), ==, "===·"); } void test_TITLE (void) { uzbl.gui.main_title = "Lorem Ipsum"; - g_assert_cmpstr(expand_template("TITLE", FALSE), ==, "Lorem Ipsum"); + g_assert_cmpstr(expand("@TITLE", 0, FALSE), ==, "Lorem Ipsum"); } void test_SELECTED_URI (void) { uzbl.state.selected_url = "http://example.org/"; - g_assert_cmpstr(expand_template("SELECTED_URI", FALSE), ==, "http://example.org/"); + g_assert_cmpstr(expand("@SELECTED_URI", 0, FALSE), ==, "http://example.org/"); } void @@ -89,7 +91,7 @@ test_MODE (void) { void test_MSG (void) { uzbl.gui.sbar.msg = "Hello from frosty Edmonton!"; - g_assert_cmpstr(expand_template("MSG", FALSE), ==, "Hello from frosty Edmonton!"); + g_assert_cmpstr(expand("@MSG", 0, FALSE), ==, "Hello from frosty Edmonton!"); } void @@ -184,18 +186,18 @@ main (int argc, char *argv[]) { g_type_init(); g_test_init(&argc, &argv, NULL); - g_test_add_func("/test-expand/URI", test_URI); - g_test_add_func("/test-expand/LOAD_PROGRESS", test_LOAD_PROGRESS); - g_test_add_func("/test-expand/LOAD_PROGRESSBAR", test_LOAD_PROGRESSBAR); - g_test_add_func("/test-expand/TITLE", test_TITLE); - g_test_add_func("/test-expand/SELECTED_URI", test_SELECTED_URI); + g_test_add_func("/test-expand/@uri", test_uri); + g_test_add_func("/test-expand/@LOAD_PROGRESS", test_LOAD_PROGRESS); + g_test_add_func("/test-expand/@LOAD_PROGRESSBAR", test_LOAD_PROGRESSBAR); + g_test_add_func("/test-expand/@TITLE", test_TITLE); + g_test_add_func("/test-expand/@SELECTED_URI", test_SELECTED_URI); g_test_add_func("/test-expand/NAME", test_NAME); g_test_add_func("/test-expand/KEYCMD", test_KEYCMD); g_test_add_func("/test-expand/MODE", test_MODE); g_test_add_func("/test-expand/MSG", test_MSG); - g_test_add_func("/test-expand/WEBKIT_VERSION", test_WEBKIT_VERSION); - g_test_add_func("/test-expand/ARCH_UZBL", test_ARCH_UZBL); - g_test_add_func("/test-expand/COMMIT", test_COMMIT); + g_test_add_func("/test-expand/@WEBKIT_*", test_WEBKIT_VERSION); + g_test_add_func("/test-expand/@ARCH_UZBL", test_ARCH_UZBL); + g_test_add_func("/test-expand/@COMMIT", test_COMMIT); g_test_add_func("/test-expand/cmd_useragent_simple", test_cmd_useragent_simple); g_test_add_func("/test-expand/cmd_useragent_full", test_cmd_useragent_full); diff --git a/uzbl.c b/uzbl.c index 6b01a32..2812570 100644 --- a/uzbl.c +++ b/uzbl.c @@ -161,6 +161,11 @@ const struct { { "WEBKIT_MICRO", PTR_C(uzbl.info.webkit_micro, INT, NULL)}, { "ARCH_UZBL", PTR_C(uzbl.info.arch, STR, NULL)}, { "COMMIT", PTR_C(uzbl.info.commit, STR, NULL)}, + { "LOAD_PROGRESS", PTR_C(uzbl.gui.sbar.load_progress, INT, NULL)}, + { "LOAD_PROGRESSBAR", PTR_C(uzbl.gui.sbar.progress_bar, STR, NULL)}, + { "TITLE", PTR_C(uzbl.gui.main_title, STR, NULL)}, + { "SELECTED_URI", PTR_C(uzbl.state.selected_url, STR, NULL)}, + { "MSG", PTR_C(uzbl.gui.sbar.msg, STR, NULL)}, { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; @@ -683,11 +688,15 @@ title_change_cb (WebKitWebView* web_view, GParamSpec param_spec) { update_title(); } -static void +void progress_change_cb (WebKitWebView* page, gint progress, gpointer data) { (void) page; (void) data; uzbl.gui.sbar.load_progress = progress; + + g_free(uzbl.gui.sbar.progress_bar); + uzbl.gui.sbar.progress_bar = build_progressbar_ascii(uzbl.gui.sbar.load_progress); + update_title(); } @@ -1245,49 +1254,6 @@ expand_template(const char *template, gboolean escape_markup) { if(token == G_TOKEN_SYMBOL) { sym = GPOINTER_TO_INT(g_scanner_cur_value(uzbl.scan).v_symbol); switch(sym) { - case SYM_URI: - if(escape_markup) { - buf = uzbl.state.uri? - g_markup_printf_escaped("%s", uzbl.state.uri):g_strdup(""); - g_string_append(ret, buf); - g_free(buf); - } - else - g_string_append(ret, uzbl.state.uri? - uzbl.state.uri:g_strdup("")); - break; - case SYM_LOADPRGS: - buf = itos(uzbl.gui.sbar.load_progress); - g_string_append(ret, buf); - g_free(buf); - break; - case SYM_LOADPRGSBAR: - buf = build_progressbar_ascii(uzbl.gui.sbar.load_progress); - g_string_append(ret, buf); - g_free(buf); - break; - case SYM_TITLE: - if(escape_markup) { - buf = uzbl.gui.main_title? - g_markup_printf_escaped("%s", uzbl.gui.main_title):g_strdup(""); - g_string_append(ret, buf); - g_free(buf); - } - else - g_string_append(ret, uzbl.gui.main_title? - uzbl.gui.main_title:g_strdup("")); - break; - case SYM_SELECTED_URI: - if(escape_markup) { - buf = uzbl.state.selected_url? - g_markup_printf_escaped("%s", uzbl.state.selected_url):g_strdup(""); - g_string_append(ret, buf); - g_free(buf); - } - else - g_string_append(ret, uzbl.state.selected_url? - uzbl.state.selected_url:g_strdup("")); - break; case SYM_NAME: buf = itos(uzbl.xwin); g_string_append(ret, @@ -1310,11 +1276,6 @@ expand_template(const char *template, gboolean escape_markup) { uzbl.behave.insert_mode? uzbl.behave.insert_indicator:uzbl.behave.cmd_indicator); break; - case SYM_MSG: - g_string_append(ret, - uzbl.gui.sbar.msg?uzbl.gui.sbar.msg:""); - break; - /* useragent syms */ default: break; } diff --git a/uzbl.h b/uzbl.h index 275c5c1..2672c25 100644 --- a/uzbl.h +++ b/uzbl.h @@ -42,6 +42,7 @@ typedef struct { gchar *msg; gchar *progress_s, *progress_u; int progress_w; + gchar *progress_bar; } StatusBar; @@ -271,7 +272,7 @@ link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpoin static void title_change_cb (WebKitWebView* web_view, GParamSpec param_spec); -static void +void progress_change_cb (WebKitWebView* page, gint progress, gpointer data); static void @@ -329,6 +330,9 @@ static gboolean run_command(const gchar *command, const guint npre, const gchar **args, const gboolean sync, char **output_stdout); +static char* +build_progressbar_ascii(int percent); + static void spawn(WebKitWebView *web_view, GArray *argv, GString *result); -- cgit v1.2.3 From a65f797d1d8b01c09d0a545f53c02688aef952b6 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 22:44:51 -0600 Subject: undef the expand_template symbols that i deleted --- uzbl.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/uzbl.h b/uzbl.h index 2672c25..1899618 100644 --- a/uzbl.h +++ b/uzbl.h @@ -24,14 +24,8 @@ const struct { guint symbol_token; } symbols[] = { {"NAME", SYM_NAME}, - {"URI", SYM_URI}, - {"TITLE", SYM_TITLE}, - {"SELECTED_URI", SYM_SELECTED_URI}, {"KEYCMD", SYM_KEYCMD}, {"MODE", SYM_MODE}, - {"MSG", SYM_MSG}, - {"LOAD_PROGRESS", SYM_LOADPRGS}, - {"LOAD_PROGRESSBAR", SYM_LOADPRGSBAR}, {NULL, 0} }, *symp = symbols; -- cgit v1.2.3 From b705305b4ff6ba7b0c8b97969fbda4f2327a24a4 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 23:09:22 -0600 Subject: escape_expansion test and new failing expand() tests --- tests/test-expand.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index a84a413..0613acf 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -28,7 +28,6 @@ extern Uzbl uzbl; extern gchar* expand(char*, guint, gboolean); -extern gchar* expand_template(const char*, gboolean); extern void make_var_to_name_hash(void); void @@ -68,24 +67,24 @@ test_SELECTED_URI (void) { void test_NAME (void) { - uzbl.state.instance_name = "12345"; - g_assert_cmpstr(expand_template("NAME", FALSE), ==, "12345"); + uzbl.state.instance_name = "testing"; + g_assert_cmpstr(expand("@NAME", 0, FALSE), ==, "testing"); } void test_KEYCMD (void) { uzbl.state.keycmd = g_string_new("gg winslow"); - g_assert_cmpstr(expand_template("KEYCMD", FALSE), ==, "gg winslow"); + g_assert_cmpstr(expand("@KEYCMD", 0, FALSE), ==, "gg winslow"); g_string_free(uzbl.state.keycmd, TRUE); } void test_MODE (void) { uzbl.behave.insert_mode = 0; - g_assert_cmpstr(expand_template("MODE", FALSE), ==, "C"); + g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "C"); uzbl.behave.insert_mode = 1; - g_assert_cmpstr(expand_template("MODE", FALSE), ==, "I"); + g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "I"); } void @@ -181,6 +180,21 @@ test_escape_markup (void) { g_free(uzbl.state.uri); } +void +test_escape_expansion (void) { + /* \@ -> @ */ + g_assert_cmpstr(expand("\\@uri", 0, FALSE), ==, "@uri"); + + /* \\\@ -> \@ */ + g_assert_cmpstr(expand("\\\\\\@uri", 0, FALSE), ==, "\\@uri"); + + /* \@(...)\@ -> @(...)@ */ + g_assert_cmpstr(expand("\\@(echo hi)\\@", 0, FALSE), ==, "@(echo hi)@"); + + /* \@<...>\@ -> @<...>@ */ + g_assert_cmpstr(expand("\\@<\"hi\">\\@", 0, FALSE), ==, "@<\"hi\">@"); +} + int main (int argc, char *argv[]) { g_type_init(); @@ -191,10 +205,10 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/@LOAD_PROGRESSBAR", test_LOAD_PROGRESSBAR); g_test_add_func("/test-expand/@TITLE", test_TITLE); g_test_add_func("/test-expand/@SELECTED_URI", test_SELECTED_URI); - g_test_add_func("/test-expand/NAME", test_NAME); - g_test_add_func("/test-expand/KEYCMD", test_KEYCMD); - g_test_add_func("/test-expand/MODE", test_MODE); - g_test_add_func("/test-expand/MSG", test_MSG); + g_test_add_func("/test-expand/@NAME", test_NAME); +// g_test_add_func("/test-expand/@KEYCMD", test_KEYCMD); +// g_test_add_func("/test-expand/@MODE", test_MODE); + g_test_add_func("/test-expand/@MSG", test_MSG); g_test_add_func("/test-expand/@WEBKIT_*", test_WEBKIT_VERSION); g_test_add_func("/test-expand/@ARCH_UZBL", test_ARCH_UZBL); g_test_add_func("/test-expand/@COMMIT", test_COMMIT); @@ -203,6 +217,7 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/cmd_useragent_full", test_cmd_useragent_full); g_test_add_func("/test-expand/escape_markup", test_escape_markup); + g_test_add_func("/test-expand/escape_expansion", test_escape_expansion); initialize(argc, argv); -- cgit v1.2.3 From 2b235eb3774321f4f0dea3407e27ddc5e74c8948 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Wed, 8 Jul 2009 23:11:15 -0600 Subject: move NAME from expand_template to expand --- uzbl.c | 19 ++++++------------- uzbl.h | 1 - 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/uzbl.c b/uzbl.c index 2812570..6ace047 100644 --- a/uzbl.c +++ b/uzbl.c @@ -166,6 +166,7 @@ const struct { { "TITLE", PTR_C(uzbl.gui.main_title, STR, NULL)}, { "SELECTED_URI", PTR_C(uzbl.state.selected_url, STR, NULL)}, { "MSG", PTR_C(uzbl.gui.sbar.msg, STR, NULL)}, + { "NAME", PTR_C(uzbl.state.instance_name, STR, NULL)}, { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} }, *n2v_p = var_name_to_ptr; @@ -1254,12 +1255,6 @@ expand_template(const char *template, gboolean escape_markup) { if(token == G_TOKEN_SYMBOL) { sym = GPOINTER_TO_INT(g_scanner_cur_value(uzbl.scan).v_symbol); switch(sym) { - case SYM_NAME: - buf = itos(uzbl.xwin); - g_string_append(ret, - uzbl.state.instance_name?uzbl.state.instance_name:buf); - g_free(buf); - break; case SYM_KEYCMD: if(escape_markup) { buf = uzbl.state.keycmd->str? @@ -1834,21 +1829,16 @@ parse_cmd_line(const char *ctl_line, GString *result) { static gchar* build_stream_name(int type, const gchar* dir) { - char *xwin_str = NULL; State *s = &uzbl.state; gchar *str = NULL; - xwin_str = itos((int)uzbl.xwin); if (type == FIFO) { str = g_strdup_printf - ("%s/uzbl_fifo_%s", dir, - s->instance_name ? s->instance_name : xwin_str); + ("%s/uzbl_fifo_%s", dir, s->instance_name); } else if (type == SOCKET) { str = g_strdup_printf - ("%s/uzbl_socket_%s", dir, - s->instance_name ? s->instance_name : xwin_str ); + ("%s/uzbl_socket_%s", dir, s->instance_name); } - g_free(xwin_str); return str; } @@ -2723,6 +2713,9 @@ main (int argc, char* argv[]) { uzbl.xwin = GDK_WINDOW_XID (GTK_WIDGET (uzbl.gui.main_window)->window); } + if(!uzbl.state.instance_name) + uzbl.state.instance_name = itos((int)uzbl.xwin); + gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view)); if (uzbl.state.verbose) { diff --git a/uzbl.h b/uzbl.h index 1899618..83d7871 100644 --- a/uzbl.h +++ b/uzbl.h @@ -23,7 +23,6 @@ const struct { gchar *symbol_name; guint symbol_token; } symbols[] = { - {"NAME", SYM_NAME}, {"KEYCMD", SYM_KEYCMD}, {"MODE", SYM_MODE}, -- cgit v1.2.3 From c7b4ccdb0438fa84317a1eac5dc62c3643bc39bd Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 9 Jul 2009 10:41:01 +0200 Subject: Added -geometry option and geometry variable --- uzbl.c | 24 +++++++++++++++++++----- uzbl.h | 4 ++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/uzbl.c b/uzbl.c index ed9c4be..3759b20 100644 --- a/uzbl.c +++ b/uzbl.c @@ -65,16 +65,18 @@ static Uzbl uzbl; static const GOptionEntry entries[] = { - { "uri", 'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri, + { "uri", 'u', 0, G_OPTION_ARG_STRING, &uzbl.state.uri, "Uri to load at startup (equivalent to 'set uri = URI')", "URI" }, - { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, + { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, "Whether to print all messages or just errors.", NULL }, - { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, + { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id)", "NAME" }, - { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, + { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" }, - { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, + { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, + { "geometry", 'g', 0, G_OPTION_ARG_STRING, &uzbl.gui.geometry, + "Set window geometry (format: WIDTHxHEIGHT+-X+-Y)", "GEOMETRY" }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -98,6 +100,7 @@ const struct { /* variable name pointer to variable in code type dump callback function */ /* --------------------------------------------------------------------------------------- */ { "uri", PTR(uzbl.state.uri, STR, 1, cmd_load_uri)}, + { "geometry", PTR(uzbl.gui.geometry, STR, 1, cmd_set_geometry)}, { "verbose", PTR(uzbl.state.verbose, INT, 1, NULL)}, { "mode", PTR(uzbl.behave.mode, INT, 0, NULL)}, { "inject_html", PTR(uzbl.behave.inject_html, STR, 0, cmd_inject_html)}, @@ -587,6 +590,14 @@ scroll_horz(WebKitWebView* page, GArray *argv, GString *result) { scroll(uzbl.gui.bar_h, argv); } +static void +cmd_set_geometry() { + if(!gtk_window_parse_geometry(GTK_WINDOW(uzbl.gui.main_window), uzbl.gui.geometry)) { + if(uzbl.state.verbose) + printf("Error in geometry string: %s\n", uzbl.gui.geometry); + } +} + static void cmd_set_status() { if (!uzbl.behave.show_status) { @@ -2777,6 +2788,9 @@ main (int argc, char* argv[]) { uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h); gtk_widget_set_scroll_adjustments ((GtkWidget*) uzbl.gui.web_view, uzbl.gui.bar_h, uzbl.gui.bar_v); + if(uzbl.gui.geometry) + cmd_set_geometry(); + settings_init (); if (!uzbl.behave.show_status) diff --git a/uzbl.h b/uzbl.h index d19ceb3..c081cd9 100644 --- a/uzbl.h +++ b/uzbl.h @@ -65,6 +65,7 @@ typedef struct { /* gui elements */ typedef struct { GtkWidget* main_window; + gchar* geometry; GtkPlug* plug; GtkWidget* scrolled_win; GtkWidget* vbox; @@ -569,4 +570,7 @@ cmd_inject_html(); static void cmd_caret_browsing(); +static void +cmd_set_geometry(); + /* vi: set et ts=4: */ -- cgit v1.2.3 From f23019c50952162e41f7dbf9a2f12e91c55b3f28 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 9 Jul 2009 10:57:08 +0200 Subject: pre-populate geometry variable --- uzbl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/uzbl.c b/uzbl.c index 3759b20..cd16b31 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2696,6 +2696,18 @@ dump_config() { g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL); } +static void +retreive_geometry() { + int w, h, x, y; + GString *buf = g_string_new(""); + + gtk_window_get_size(GTK_WINDOW(uzbl.gui.main_window), &w, &h); + gtk_window_get_position(GTK_WINDOW(uzbl.gui.main_window), &x, &y); + + g_string_printf(buf, "%dx%d+%d+%d", w, h, x, y); + uzbl.gui.geometry = g_string_free(buf, FALSE); +} + /** -- MAIN -- **/ int main (int argc, char* argv[]) { @@ -2790,6 +2802,8 @@ main (int argc, char* argv[]) { if(uzbl.gui.geometry) cmd_set_geometry(); + else + retreive_geometry(); settings_init (); -- cgit v1.2.3 From 333718c5cee02fcf84f3538a720687c832bc4fc8 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 9 Jul 2009 11:39:04 +0200 Subject: set current geometry on configure-event --- uzbl.c | 10 ++++++++++ uzbl.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/uzbl.c b/uzbl.c index cd16b31..bc51642 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2147,6 +2147,15 @@ update_title (void) { } } +static gboolean +configure_event_cb(GtkWidget* window, GdkEventConfigure* event) { + (void) window; + (void) event; + + retreive_geometry(); + return FALSE; +} + static gboolean key_press_cb (GtkWidget* window, GdkEventKey* event) { @@ -2312,6 +2321,7 @@ GtkWidget* create_window () { gtk_widget_set_name (window, "Uzbl browser"); g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (destroy_cb), NULL); g_signal_connect (G_OBJECT (window), "key-press-event", G_CALLBACK (key_press_cb), NULL); + g_signal_connect (G_OBJECT (window), "configure-event", G_CALLBACK (configure_event_cb), NULL); return window; } diff --git a/uzbl.h b/uzbl.h index c081cd9..84f0950 100644 --- a/uzbl.h +++ b/uzbl.h @@ -471,6 +471,12 @@ static void dump_config(); +static void +retreive_geometry(); + +static gboolean +configure_event_cb(GtkWidget* window, GdkEventConfigure* event); + typedef void (*Command)(WebKitWebView*, GArray *argv, GString *result); typedef struct { Command function; -- cgit v1.2.3 From 4be1386eeb4858bce3ade065deb2f351b9cae2ff Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 9 Jul 2009 11:44:51 +0200 Subject: free uzbl.gui.geometry before resetting it --- uzbl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uzbl.c b/uzbl.c index bc51642..2220832 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2715,6 +2715,9 @@ retreive_geometry() { gtk_window_get_position(GTK_WINDOW(uzbl.gui.main_window), &x, &y); g_string_printf(buf, "%dx%d+%d+%d", w, h, x, y); + + if(uzbl.gui.geometry) + g_free(uzbl.gui.geometry); uzbl.gui.geometry = g_string_free(buf, FALSE); } -- cgit v1.2.3 From 17a9c2bcf54d3891f91dd2b8fa61e0df9f52e197 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Thu, 9 Jul 2009 12:34:43 +0200 Subject: prevent the geometry var from reporting false values --- uzbl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/uzbl.c b/uzbl.c index 2220832..11c6018 100644 --- a/uzbl.c +++ b/uzbl.c @@ -596,6 +596,12 @@ cmd_set_geometry() { if(uzbl.state.verbose) printf("Error in geometry string: %s\n", uzbl.gui.geometry); } + /* update geometry var with the actual geometry + this is necessary as some WMs don't seem to honour + the above setting and we don't want to end up with + wrong geometry information + */ + retreive_geometry(); } static void -- cgit v1.2.3 From 1216c4822c70f3bd74f4776a2f4f7ce6e7e206e6 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 07:09:16 -0600 Subject: do expand as well as expand_template in update_title --- uzbl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uzbl.c b/uzbl.c index 6ace047..210e94f 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2054,12 +2054,14 @@ update_title (void) { if (b->show_status) { if (b->title_format_short) { parsed = expand_template(b->title_format_short, FALSE); + parsed = expand(parsed, 0, FALSE); if (uzbl.gui.main_window) gtk_window_set_title (GTK_WINDOW(uzbl.gui.main_window), parsed); g_free(parsed); } if (b->status_format) { parsed = expand_template(b->status_format, TRUE); + parsed = expand(parsed, 0, TRUE); gtk_label_set_markup(GTK_LABEL(uzbl.gui.mainbar_label), parsed); g_free(parsed); } @@ -2075,6 +2077,7 @@ update_title (void) { } else { if (b->title_format_long) { parsed = expand_template(b->title_format_long, FALSE); + parsed = expand(parsed, 0, FALSE); if (uzbl.gui.main_window) gtk_window_set_title (GTK_WINDOW(uzbl.gui.main_window), parsed); g_free(parsed); -- cgit v1.2.3 From df924bde8429a2decf025ed57acd3412aa5355b0 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 17:11:03 -0600 Subject: @MODE works. --- tests/test-expand.c | 6 +++--- uzbl.c | 25 +++++++++++++------------ uzbl.h | 1 + 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index 0613acf..72aef23 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -80,10 +80,10 @@ test_KEYCMD (void) { void test_MODE (void) { - uzbl.behave.insert_mode = 0; + set_insert_mode(FALSE); g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "C"); - uzbl.behave.insert_mode = 1; + set_insert_mode(TRUE); g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "I"); } @@ -207,7 +207,7 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/@SELECTED_URI", test_SELECTED_URI); g_test_add_func("/test-expand/@NAME", test_NAME); // g_test_add_func("/test-expand/@KEYCMD", test_KEYCMD); -// g_test_add_func("/test-expand/@MODE", test_MODE); + g_test_add_func("/test-expand/@MODE", test_MODE); g_test_add_func("/test-expand/@MSG", test_MSG); g_test_add_func("/test-expand/@WEBKIT_*", test_WEBKIT_VERSION); g_test_add_func("/test-expand/@ARCH_UZBL", test_ARCH_UZBL); diff --git a/uzbl.c b/uzbl.c index 210e94f..d95dc8c 100644 --- a/uzbl.c +++ b/uzbl.c @@ -165,6 +165,7 @@ const struct { { "LOAD_PROGRESSBAR", PTR_C(uzbl.gui.sbar.progress_bar, STR, NULL)}, { "TITLE", PTR_C(uzbl.gui.main_title, STR, NULL)}, { "SELECTED_URI", PTR_C(uzbl.state.selected_url, STR, NULL)}, + { "MODE", PTR_C(uzbl.gui.sbar.mode_indicator, STR, NULL)}, { "MSG", PTR_C(uzbl.gui.sbar.msg, STR, NULL)}, { "NAME", PTR_C(uzbl.state.instance_name, STR, NULL)}, @@ -729,7 +730,7 @@ load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { GString* newuri = g_string_new (webkit_web_frame_get_uri (frame)); uzbl.state.uri = g_string_free (newuri, FALSE); if (uzbl.behave.reset_command_mode && uzbl.behave.insert_mode) { - uzbl.behave.insert_mode = uzbl.behave.always_insert_mode; + set_insert_mode(uzbl.behave.always_insert_mode); update_title(); } if (uzbl.behave.load_commit_handler) @@ -884,18 +885,24 @@ act_dump_config() { dump_config(); } +void set_insert_mode(gboolean mode) { + uzbl.behave.insert_mode = mode; + uzbl.gui.sbar.mode_indicator = (mode ? + uzbl.behave.insert_indicator : uzbl.behave.cmd_indicator); +} + static void toggle_insert_mode(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; if (argv_idx(argv, 0)) { if (strcmp (argv_idx(argv, 0), "0") == 0) { - uzbl.behave.insert_mode = FALSE; + set_insert_mode(FALSE); } else { - uzbl.behave.insert_mode = TRUE; + set_insert_mode(TRUE); } } else { - uzbl.behave.insert_mode = ! uzbl.behave.insert_mode; + set_insert_mode( !uzbl.behave.insert_mode ); } update_title(); @@ -1266,11 +1273,6 @@ expand_template(const char *template, gboolean escape_markup) { g_string_append(ret, uzbl.state.keycmd->str? uzbl.state.keycmd->str:g_strdup("")); break; - case SYM_MODE: - g_string_append(ret, - uzbl.behave.insert_mode? - uzbl.behave.insert_indicator:uzbl.behave.cmd_indicator); - break; default: break; } @@ -1527,8 +1529,7 @@ cmd_load_uri() { static void cmd_always_insert_mode() { - uzbl.behave.insert_mode = - uzbl.behave.always_insert_mode ? TRUE : FALSE; + set_insert_mode(uzbl.behave.always_insert_mode); update_title(); } @@ -2098,7 +2099,7 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) /* turn off insert mode (if always_insert_mode is not used) */ if (uzbl.behave.insert_mode && (event->keyval == GDK_Escape)) { - uzbl.behave.insert_mode = uzbl.behave.always_insert_mode; + set_insert_mode(uzbl.behave.always_insert_mode); update_title(); return TRUE; } diff --git a/uzbl.h b/uzbl.h index 83d7871..d6a646c 100644 --- a/uzbl.h +++ b/uzbl.h @@ -36,6 +36,7 @@ typedef struct { gchar *progress_s, *progress_u; int progress_w; gchar *progress_bar; + gchar *mode_indicator; } StatusBar; -- cgit v1.2.3 From 7aad409f8623ea8f881bef1020641cb87b800950 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 17:37:46 -0600 Subject: test nested expansions --- tests/test-expand.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/test-expand.c b/tests/test-expand.c index 72aef23..dcbe7e3 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -195,6 +195,16 @@ test_escape_expansion (void) { g_assert_cmpstr(expand("\\@<\"hi\">\\@", 0, FALSE), ==, "@<\"hi\">@"); } +void +test_nested (void) { + uzbl.gui.sbar.msg = "xxx"; + g_assert_cmpstr(expand("@<\"..@MSG..\">@", 0, FALSE), ==, "..xxx.."); + g_assert_cmpstr(expand("@<\"..\\@MSG..\">@", 0, FALSE), ==, "..@MSG.."); + + g_assert_cmpstr(expand("@(echo ..@MSG..)@", 0, FALSE), ==, "..xxx.."); + g_assert_cmpstr(expand("@(echo ..\\@MSG..)@", 0, FALSE), ==, "..@MSG.."); +} + int main (int argc, char *argv[]) { g_type_init(); @@ -218,6 +228,7 @@ main (int argc, char *argv[]) { g_test_add_func("/test-expand/escape_markup", test_escape_markup); g_test_add_func("/test-expand/escape_expansion", test_escape_expansion); + g_test_add_func("/test-expand/nested", test_nested); initialize(argc, argv); -- cgit v1.2.3 From 2867f88b0072fec249a2ef7ed293b4a726773bb2 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 17:45:10 -0600 Subject: remove SYM_MODE --- uzbl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/uzbl.h b/uzbl.h index d6a646c..1e0c8b5 100644 --- a/uzbl.h +++ b/uzbl.h @@ -24,7 +24,6 @@ const struct { guint symbol_token; } symbols[] = { {"KEYCMD", SYM_KEYCMD}, - {"MODE", SYM_MODE}, {NULL, 0} }, *symp = symbols; -- cgit v1.2.3 From 3c71ee0f28524a4a86e3a845c9dc6faadaf0f5ac Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 19:14:37 -0600 Subject: silly me, @MSG -> @status_message --- tests/test-expand.c | 30 +++++++++++++++--------------- uzbl.c | 1 - 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index dcbe7e3..0fd95d0 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -30,6 +30,13 @@ extern Uzbl uzbl; extern gchar* expand(char*, guint, gboolean); extern void make_var_to_name_hash(void); +void +test_keycmd (void) { + uzbl.state.keycmd = g_string_new("gg winslow"); + g_assert_cmpstr(expand("@keycmd", 0, FALSE), ==, "gg winslow"); + g_string_free(uzbl.state.keycmd, TRUE); +} + void test_uri (void) { g_assert_cmpstr(expand("@uri", 0, FALSE), ==, ""); @@ -71,13 +78,6 @@ test_NAME (void) { g_assert_cmpstr(expand("@NAME", 0, FALSE), ==, "testing"); } -void -test_KEYCMD (void) { - uzbl.state.keycmd = g_string_new("gg winslow"); - g_assert_cmpstr(expand("@KEYCMD", 0, FALSE), ==, "gg winslow"); - g_string_free(uzbl.state.keycmd, TRUE); -} - void test_MODE (void) { set_insert_mode(FALSE); @@ -88,9 +88,9 @@ test_MODE (void) { } void -test_MSG (void) { +test_status_message (void) { uzbl.gui.sbar.msg = "Hello from frosty Edmonton!"; - g_assert_cmpstr(expand("@MSG", 0, FALSE), ==, "Hello from frosty Edmonton!"); + g_assert_cmpstr(expand("@status_message", 0, FALSE), ==, "Hello from frosty Edmonton!"); } void @@ -198,11 +198,11 @@ test_escape_expansion (void) { void test_nested (void) { uzbl.gui.sbar.msg = "xxx"; - g_assert_cmpstr(expand("@<\"..@MSG..\">@", 0, FALSE), ==, "..xxx.."); - g_assert_cmpstr(expand("@<\"..\\@MSG..\">@", 0, FALSE), ==, "..@MSG.."); + g_assert_cmpstr(expand("@<\"..@status_message..\">@", 0, FALSE), ==, "..xxx.."); + g_assert_cmpstr(expand("@<\"..\\@status_message..\">@", 0, FALSE), ==, "..@status_message.."); - g_assert_cmpstr(expand("@(echo ..@MSG..)@", 0, FALSE), ==, "..xxx.."); - g_assert_cmpstr(expand("@(echo ..\\@MSG..)@", 0, FALSE), ==, "..@MSG.."); + g_assert_cmpstr(expand("@(echo ..@status_message..)@", 0, FALSE), ==, "..xxx.."); + g_assert_cmpstr(expand("@(echo ..\\@status_message..)@", 0, FALSE), ==, "..@status_message.."); } int @@ -210,15 +210,15 @@ main (int argc, char *argv[]) { g_type_init(); g_test_init(&argc, &argv, NULL); +// g_test_add_func("/test-expand/@keycmd", test_keycmd); + g_test_add_func("/test-expand/@status_message", test_status_message); g_test_add_func("/test-expand/@uri", test_uri); g_test_add_func("/test-expand/@LOAD_PROGRESS", test_LOAD_PROGRESS); g_test_add_func("/test-expand/@LOAD_PROGRESSBAR", test_LOAD_PROGRESSBAR); g_test_add_func("/test-expand/@TITLE", test_TITLE); g_test_add_func("/test-expand/@SELECTED_URI", test_SELECTED_URI); g_test_add_func("/test-expand/@NAME", test_NAME); -// g_test_add_func("/test-expand/@KEYCMD", test_KEYCMD); g_test_add_func("/test-expand/@MODE", test_MODE); - g_test_add_func("/test-expand/@MSG", test_MSG); g_test_add_func("/test-expand/@WEBKIT_*", test_WEBKIT_VERSION); g_test_add_func("/test-expand/@ARCH_UZBL", test_ARCH_UZBL); g_test_add_func("/test-expand/@COMMIT", test_COMMIT); diff --git a/uzbl.c b/uzbl.c index d95dc8c..3e1aa75 100644 --- a/uzbl.c +++ b/uzbl.c @@ -166,7 +166,6 @@ const struct { { "TITLE", PTR_C(uzbl.gui.main_title, STR, NULL)}, { "SELECTED_URI", PTR_C(uzbl.state.selected_url, STR, NULL)}, { "MODE", PTR_C(uzbl.gui.sbar.mode_indicator, STR, NULL)}, - { "MSG", PTR_C(uzbl.gui.sbar.msg, STR, NULL)}, { "NAME", PTR_C(uzbl.state.instance_name, STR, NULL)}, { NULL, {.ptr = NULL, .type = TYPE_INT, .dump = 0, .writeable = 0, .func = NULL}} -- cgit v1.2.3 From 633c4bd519e3f3557526e0b4b5cc0e90868f80b3 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 9 Jul 2009 19:17:38 -0600 Subject: initilaze uzbl.gui.sbar.mode_indicator --- uzbl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/uzbl.c b/uzbl.c index 3e1aa75..4a51476 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2677,6 +2677,7 @@ initialize(int argc, char *argv[]) { /* default mode indicators */ uzbl.behave.insert_indicator = g_strdup("I"); uzbl.behave.cmd_indicator = g_strdup("C"); + set_insert_mode(FALSE); uzbl.info.webkit_major = WEBKIT_MAJOR_VERSION; uzbl.info.webkit_minor = WEBKIT_MINOR_VERSION; -- cgit v1.2.3 From 226f5b7980a7a3b2ad527a57ece9796acdc843ad Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sat, 11 Jul 2009 12:11:59 -0600 Subject: fixed uri_override and verbose_override positioning --- uzbl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uzbl.c b/uzbl.c index f48e391..a53b252 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2764,6 +2764,9 @@ main (int argc, char* argv[]) { uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h); gtk_widget_set_scroll_adjustments ((GtkWidget*) uzbl.gui.web_view, uzbl.gui.bar_h, uzbl.gui.bar_v); + gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); + gboolean verbose_override = uzbl.state.verbose; + settings_init (); if (!uzbl.behave.show_status) @@ -2774,9 +2777,6 @@ main (int argc, char* argv[]) { /* WebInspector */ set_up_inspector(); - gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL); - gboolean verbose_override = uzbl.state.verbose; - if (verbose_override > uzbl.state.verbose) uzbl.state.verbose = verbose_override; -- cgit v1.2.3 From 68f51084240b156df872d9206640ca80e2cd22a5 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sun, 12 Jul 2009 17:43:29 +0200 Subject: style changes, line breaks --- uzbl.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/uzbl.c b/uzbl.c index 11c6018..6494fd9 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2169,8 +2169,15 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) (void) window; - if (event->type != GDK_KEY_PRESS || event->keyval == GDK_Page_Up || event->keyval == GDK_Page_Down - || event->keyval == GDK_Up || event->keyval == GDK_Down || event->keyval == GDK_Left || event->keyval == GDK_Right || event->keyval == GDK_Shift_L || event->keyval == GDK_Shift_R) + if (event->type != GDK_KEY_PRESS || + event->keyval == GDK_Page_Up || + event->keyval == GDK_Page_Down || + event->keyval == GDK_Up || + event->keyval == GDK_Down || + event->keyval == GDK_Left || + event->keyval == GDK_Right || + event->keyval == GDK_Shift_L || + event->keyval == GDK_Shift_R) return FALSE; /* turn off insert mode (if always_insert_mode is not used) */ @@ -2180,7 +2187,11 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) return TRUE; } - if (uzbl.behave.insert_mode && (((event->state & uzbl.behave.modmask) != uzbl.behave.modmask) || (!uzbl.behave.modmask))) + if (uzbl.behave.insert_mode && + ( ((event->state & uzbl.behave.modmask) != uzbl.behave.modmask) || + (!uzbl.behave.modmask) + ) + ) return FALSE; if (event->keyval == GDK_Escape) { @@ -2707,7 +2718,7 @@ dump_key_hash(gpointer k, gpointer v, gpointer ud) { } static void -dump_config() { +dump_config() { //ADD "result" var so we can use this with uzblctrl g_hash_table_foreach(uzbl.comm.proto_var, dump_var_hash, NULL); g_hash_table_foreach(uzbl.bindings, dump_key_hash, NULL); } -- cgit v1.2.3 From ec6d931c0826795f55a28dedd4b4d6e65a58dd61 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Jul 2009 12:23:24 -0600 Subject: make keycmd a variable. new escape expansion syntax. delete expand_template entirely. --- tests/test-expand.c | 63 +++++++-------- uzbl.c | 227 ++++++++++++++++------------------------------------ uzbl.h | 2 +- 3 files changed, 101 insertions(+), 191 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index 0fd95d0..7cc558b 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -27,29 +27,28 @@ extern Uzbl uzbl; -extern gchar* expand(char*, guint, gboolean); +extern gchar* expand(char*, guint); extern void make_var_to_name_hash(void); void test_keycmd (void) { - uzbl.state.keycmd = g_string_new("gg winslow"); - g_assert_cmpstr(expand("@keycmd", 0, FALSE), ==, "gg winslow"); - g_string_free(uzbl.state.keycmd, TRUE); + uzbl.state.keycmd = "gg winslow"; + g_assert_cmpstr(expand("@keycmd", 0), ==, "gg winslow"); } void test_uri (void) { - g_assert_cmpstr(expand("@uri", 0, FALSE), ==, ""); + g_assert_cmpstr(expand("@uri", 0), ==, ""); uzbl.state.uri = g_strdup("http://www.uzbl.org/"); - g_assert_cmpstr(expand("@uri", 0, FALSE), ==, uzbl.state.uri); + g_assert_cmpstr(expand("@uri", 0), ==, uzbl.state.uri); g_free(uzbl.state.uri); } void test_LOAD_PROGRESS (void) { uzbl.gui.sbar.load_progress = 50; - g_assert_cmpstr(expand("@LOAD_PROGRESS", 0, FALSE), ==, "50"); + g_assert_cmpstr(expand("@LOAD_PROGRESS", 0), ==, "50"); } void @@ -57,40 +56,40 @@ test_LOAD_PROGRESSBAR (void) { uzbl.gui.sbar.progress_w = 4; progress_change_cb(NULL, 75, NULL); - g_assert_cmpstr(expand("@LOAD_PROGRESSBAR", 0, FALSE), ==, "===·"); + g_assert_cmpstr(expand("@LOAD_PROGRESSBAR", 0), ==, "===·"); } void test_TITLE (void) { uzbl.gui.main_title = "Lorem Ipsum"; - g_assert_cmpstr(expand("@TITLE", 0, FALSE), ==, "Lorem Ipsum"); + g_assert_cmpstr(expand("@TITLE", 0), ==, "Lorem Ipsum"); } void test_SELECTED_URI (void) { uzbl.state.selected_url = "http://example.org/"; - g_assert_cmpstr(expand("@SELECTED_URI", 0, FALSE), ==, "http://example.org/"); + g_assert_cmpstr(expand("@SELECTED_URI", 0), ==, "http://example.org/"); } void test_NAME (void) { uzbl.state.instance_name = "testing"; - g_assert_cmpstr(expand("@NAME", 0, FALSE), ==, "testing"); + g_assert_cmpstr(expand("@NAME", 0), ==, "testing"); } void test_MODE (void) { set_insert_mode(FALSE); - g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "C"); + g_assert_cmpstr(expand("@MODE", 0), ==, "C"); set_insert_mode(TRUE); - g_assert_cmpstr(expand("@MODE", 0, FALSE), ==, "I"); + g_assert_cmpstr(expand("@MODE", 0), ==, "I"); } void test_status_message (void) { uzbl.gui.sbar.msg = "Hello from frosty Edmonton!"; - g_assert_cmpstr(expand("@status_message", 0, FALSE), ==, "Hello from frosty Edmonton!"); + g_assert_cmpstr(expand("@status_message", 0), ==, "Hello from frosty Edmonton!"); } void @@ -102,17 +101,17 @@ test_WEBKIT_VERSION (void) { g_string_append(expected, " "); g_string_append(expected, itos(WEBKIT_MICRO_VERSION)); - g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0, FALSE), ==, g_string_free(expected, FALSE)); + g_assert_cmpstr(expand("@WEBKIT_MAJOR @WEBKIT_MINOR @WEBKIT_MICRO", 0), ==, g_string_free(expected, FALSE)); } void test_ARCH_UZBL (void) { - g_assert_cmpstr(expand("@ARCH_UZBL", 0, FALSE), ==, ARCH); + g_assert_cmpstr(expand("@ARCH_UZBL", 0), ==, ARCH); } void test_COMMIT (void) { - g_assert_cmpstr(expand("@COMMIT", 0, FALSE), ==, COMMIT); + g_assert_cmpstr(expand("@COMMIT", 0), ==, COMMIT); } void @@ -166,16 +165,16 @@ void test_escape_markup (void) { /* simple expansion */ uzbl.state.uri = g_strdup("<&>"); - g_assert_cmpstr(expand("@uri", 0, FALSE), ==, uzbl.state.uri); - g_assert_cmpstr(expand("@uri", 0, TRUE), ==, "<&>"); + g_assert_cmpstr(expand("@uri", 0), ==, uzbl.state.uri); + g_assert_cmpstr(expand("@[@uri]@", 0), ==, "<&>"); /* shell expansion */ - g_assert_cmpstr(expand("@(echo -n '<&>')@", 0, FALSE), ==, "<&>"); - g_assert_cmpstr(expand("@(echo -n '<&>')@", 0, TRUE), ==, "<&>"); + g_assert_cmpstr(expand("@(echo -n '<&>')@", 0), ==, "<&>"); + g_assert_cmpstr(expand("@[@(echo -n '<&>')@]@", 0), ==, "<&>"); /* javascript expansion */ - g_assert_cmpstr(expand("@<'<&>'>@", 0, FALSE), ==, "<&>"); - g_assert_cmpstr(expand("@<'<&>'>@", 0, TRUE), ==, "<&>"); + g_assert_cmpstr(expand("@<'<&>'>@", 0), ==, "<&>"); + g_assert_cmpstr(expand("@[@<'<&>'>@]@", 0), ==, "<&>"); g_free(uzbl.state.uri); } @@ -183,26 +182,26 @@ test_escape_markup (void) { void test_escape_expansion (void) { /* \@ -> @ */ - g_assert_cmpstr(expand("\\@uri", 0, FALSE), ==, "@uri"); + g_assert_cmpstr(expand("\\@uri", 0), ==, "@uri"); /* \\\@ -> \@ */ - g_assert_cmpstr(expand("\\\\\\@uri", 0, FALSE), ==, "\\@uri"); + g_assert_cmpstr(expand("\\\\\\@uri", 0), ==, "\\@uri"); /* \@(...)\@ -> @(...)@ */ - g_assert_cmpstr(expand("\\@(echo hi)\\@", 0, FALSE), ==, "@(echo hi)@"); + g_assert_cmpstr(expand("\\@(echo hi)\\@", 0), ==, "@(echo hi)@"); /* \@<...>\@ -> @<...>@ */ - g_assert_cmpstr(expand("\\@<\"hi\">\\@", 0, FALSE), ==, "@<\"hi\">@"); + g_assert_cmpstr(expand("\\@<\"hi\">\\@", 0), ==, "@<\"hi\">@"); } void test_nested (void) { uzbl.gui.sbar.msg = "xxx"; - g_assert_cmpstr(expand("@<\"..@status_message..\">@", 0, FALSE), ==, "..xxx.."); - g_assert_cmpstr(expand("@<\"..\\@status_message..\">@", 0, FALSE), ==, "..@status_message.."); + g_assert_cmpstr(expand("@<\"..@status_message..\">@", 0), ==, "..xxx.."); + g_assert_cmpstr(expand("@<\"..\\@status_message..\">@", 0), ==, "..@status_message.."); - g_assert_cmpstr(expand("@(echo ..@status_message..)@", 0, FALSE), ==, "..xxx.."); - g_assert_cmpstr(expand("@(echo ..\\@status_message..)@", 0, FALSE), ==, "..@status_message.."); + g_assert_cmpstr(expand("@(echo ..@status_message..)@", 0), ==, "..xxx.."); + g_assert_cmpstr(expand("@(echo ..\\@status_message..)@", 0), ==, "..@status_message.."); } int @@ -210,7 +209,7 @@ main (int argc, char *argv[]) { g_type_init(); g_test_init(&argc, &argv, NULL); -// g_test_add_func("/test-expand/@keycmd", test_keycmd); + g_test_add_func("/test-expand/@keycmd", test_keycmd); g_test_add_func("/test-expand/@status_message", test_status_message); g_test_add_func("/test-expand/@uri", test_uri); g_test_add_func("/test-expand/@LOAD_PROGRESS", test_LOAD_PROGRESS); diff --git a/uzbl.c b/uzbl.c index a53b252..ab12e1a 100644 --- a/uzbl.c +++ b/uzbl.c @@ -108,6 +108,7 @@ const struct { { "base_url", PTR_V(uzbl.behave.base_url, STR, 1, NULL)}, { "html_endmarker", PTR_V(uzbl.behave.html_endmarker, STR, 1, NULL)}, { "html_mode_timeout", PTR_V(uzbl.behave.html_timeout, INT, 1, NULL)}, + { "keycmd", PTR_V(uzbl.state.keycmd, STR, 1, NULL)}, /* XXX */ { "status_message", PTR_V(uzbl.gui.sbar.msg, STR, 1, update_title)}, { "show_status", PTR_V(uzbl.behave.show_status, INT, 1, cmd_set_status)}, { "status_top", PTR_V(uzbl.behave.status_top, INT, 1, move_statusbar)}, @@ -121,7 +122,7 @@ const struct { { "title_format_long", PTR_V(uzbl.behave.title_format_long, STR, 1, update_title)}, { "title_format_short", PTR_V(uzbl.behave.title_format_short, STR, 1, update_title)}, { "icon", PTR_V(uzbl.gui.icon, STR, 1, set_icon)}, - { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, NULL)}, + { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, NULL)}, /* XXX */ { "always_insert_mode", PTR_V(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, { "reset_command_mode", PTR_V(uzbl.behave.reset_command_mode, INT, 1, NULL)}, { "modkey", PTR_V(uzbl.behave.modkey, STR, 1, cmd_modkey)}, @@ -212,7 +213,7 @@ make_var_to_name_hash() { /* --- UTILITY FUNCTIONS --- */ -enum {EXP_ERR, EXP_SIMPLE_VAR, EXP_BRACED_VAR, EXP_EXPR, EXP_JS}; +enum {EXP_ERR, EXP_SIMPLE_VAR, EXP_BRACED_VAR, EXP_EXPR, EXP_JS, EXP_ESCAPE}; static guint get_exp_type(gchar *s) { /* variables */ @@ -222,6 +223,8 @@ get_exp_type(gchar *s) { return EXP_BRACED_VAR; else if(*(s+1) == '<') return EXP_JS; + else if(*(s+1) == '[') + return EXP_ESCAPE; else return EXP_SIMPLE_VAR; @@ -233,7 +236,7 @@ return EXP_ERR; * recurse == 2: don't expand '@@' */ gchar * -expand(char *s, guint recurse, gboolean escape_markup) { +expand(char *s, guint recurse) { uzbl_cmdprop *c; guint etype; char upto = ' '; @@ -294,20 +297,23 @@ expand(char *s, guint recurse, gboolean escape_markup) { ret[vend-s] = '\0'; } break; + case EXP_ESCAPE: + s++; + strcpy(str_end, "]@"); + str_end[2] = '\0'; + if( (vend = strstr(s, str_end)) || + (vend = strchr(s, '\0')) ) { + strncpy(ret, s, vend-s); + ret[vend-s] = '\0'; + } + break; } if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { if(c->type == TYPE_STR && *c->ptr != NULL) { - if(escape_markup) { - char *b = g_markup_escape_text((gchar *)*c->ptr, - strlen((gchar *)*c->ptr)); - g_string_append(buf, b); - g_free(b); - } else { - g_string_append(buf, (gchar *)*c->ptr); - } + g_string_append(buf, (gchar *)*c->ptr); } else if(c->type == TYPE_INT) { char *b = itos((uintptr_t)*c->ptr); g_string_append(buf, b); @@ -322,7 +328,7 @@ expand(char *s, guint recurse, gboolean escape_markup) { } else if(recurse != 1 && etype == EXP_EXPR) { - mycmd = expand(ret, 1, escape_markup); + mycmd = expand(ret, 1); g_spawn_command_line_sync(mycmd, &cmd_stdout, NULL, NULL, &err); g_free(mycmd); @@ -336,37 +342,34 @@ expand(char *s, guint recurse, gboolean escape_markup) { if(cmd_stdout[len-1] == '\n') cmd_stdout[--len] = 0; /* strip trailing newline */ - if(escape_markup) { - char *b = g_markup_escape_text(cmd_stdout, len); - g_string_append(buf, b); - g_free(b); - } else { - g_string_append(buf, cmd_stdout); - } + g_string_append(buf, cmd_stdout); g_free(cmd_stdout); } s = vend+2; } else if(recurse != 2 && etype == EXP_JS) { - mycmd = expand(ret, 2, escape_markup); + mycmd = expand(ret, 2); eval_js(uzbl.gui.web_view, mycmd, js_ret); g_free(mycmd); if(js_ret->str) { - if(escape_markup) { - char *b = g_markup_escape_text(js_ret->str, - strlen(js_ret->str)); - g_string_append(buf, b); - g_free(b); - } else { - g_string_append(buf, js_ret->str); - } + g_string_append(buf, js_ret->str); g_string_free(js_ret, TRUE); js_ret = g_string_new(""); } s = vend+2; } + else if(etype == EXP_ESCAPE) { + mycmd = expand(ret, 0); + char *escaped = g_markup_escape_text(mycmd, strlen(mycmd)); + + g_string_append(buf, escaped); + + g_free(escaped); + g_free(mycmd); + s = vend+2; + } break; default: @@ -479,7 +482,7 @@ clean_up(void) { unlink (uzbl.comm.socket_path); g_free(uzbl.state.executable_path); - g_string_free(uzbl.state.keycmd, TRUE); + g_free(uzbl.state.keycmd); g_hash_table_destroy(uzbl.bindings); g_hash_table_destroy(uzbl.behave.commands); } @@ -713,13 +716,18 @@ load_finish_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { run_handler(uzbl.behave.load_finish_handler, ""); } +void clear_keycmd() { + g_free(uzbl.state.keycmd); + uzbl.state.keycmd = g_strdup(""); +} + static void load_start_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { (void) page; (void) frame; (void) data; uzbl.gui.sbar.load_progress = 0; - g_string_truncate(uzbl.state.keycmd, 0); // don't need old commands to remain on new page? + clear_keycmd(); // don't need old commands to remain on new page? if (uzbl.behave.load_start_handler) run_handler(uzbl.behave.load_start_handler, ""); } @@ -866,7 +874,7 @@ print(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; gchar* buf; - buf = expand(argv_idx(argv, 0), 0, FALSE); + buf = expand(argv_idx(argv, 0), 0); g_string_assign(result, buf); g_free(buf); } @@ -887,6 +895,7 @@ act_dump_config() { dump_config(); } +/* XXX set_var_value instead? */ void set_insert_mode(gboolean mode) { uzbl.behave.insert_mode = mode; uzbl.gui.sbar.mode_indicator = (mode ? @@ -1144,7 +1153,7 @@ keycmd (WebKitWebView *page, GArray *argv, GString *result) { (void)page; (void)argv; (void)result; - g_string_assign(uzbl.state.keycmd, argv_idx(argv, 0)); + uzbl.state.keycmd = g_strdup(argv_idx(argv, 0)); run_keycmd(FALSE); update_title(); } @@ -1154,7 +1163,7 @@ keycmd_nl (WebKitWebView *page, GArray *argv, GString *result) { (void)page; (void)argv; (void)result; - g_string_assign(uzbl.state.keycmd, argv_idx(argv, 0)); + uzbl.state.keycmd = g_strdup(argv_idx(argv, 0)); run_keycmd(TRUE); update_title(); } @@ -1165,9 +1174,10 @@ keycmd_bs (WebKitWebView *page, GArray *argv, GString *result) { (void)page; (void)argv; (void)result; - prev = g_utf8_find_prev_char(uzbl.state.keycmd->str, uzbl.state.keycmd->str + uzbl.state.keycmd->len); + int len = strlen(uzbl.state.keycmd); + prev = g_utf8_find_prev_char(uzbl.state.keycmd, uzbl.state.keycmd + len); if (prev) - g_string_truncate(uzbl.state.keycmd, prev - uzbl.state.keycmd->str); + uzbl.state.keycmd[prev - uzbl.state.keycmd] = '\0'; update_title(); } @@ -1198,108 +1208,6 @@ build_progressbar_ascii(int percent) { return g_string_free(bar, FALSE); } - -void -setup_scanner() { - const GScannerConfig scan_config = { - ( - "\t\r\n" - ) /* cset_skip_characters */, - ( - G_CSET_a_2_z - "_#" - G_CSET_A_2_Z - ) /* cset_identifier_first */, - ( - G_CSET_a_2_z - "_0123456789" - G_CSET_A_2_Z - G_CSET_LATINS - G_CSET_LATINC - ) /* cset_identifier_nth */, - ( "" ) /* cpair_comment_single */, - - TRUE /* case_sensitive */, - - FALSE /* skip_comment_multi */, - FALSE /* skip_comment_single */, - FALSE /* scan_comment_multi */, - TRUE /* scan_identifier */, - TRUE /* scan_identifier_1char */, - FALSE /* scan_identifier_NULL */, - TRUE /* scan_symbols */, - FALSE /* scan_binary */, - FALSE /* scan_octal */, - FALSE /* scan_float */, - FALSE /* scan_hex */, - FALSE /* scan_hex_dollar */, - FALSE /* scan_string_sq */, - FALSE /* scan_string_dq */, - TRUE /* numbers_2_int */, - FALSE /* int_2_float */, - FALSE /* identifier_2_string */, - FALSE /* char_2_token */, - FALSE /* symbol_2_token */, - TRUE /* scope_0_fallback */, - FALSE, - TRUE - }; - - uzbl.scan = g_scanner_new(&scan_config); - while(symp->symbol_name) { - g_scanner_scope_add_symbol(uzbl.scan, 0, - symp->symbol_name, - GINT_TO_POINTER(symp->symbol_token)); - symp++; - } -} - -gchar * -expand_template(const char *template, gboolean escape_markup) { - if(!template) return NULL; - - GTokenType token = G_TOKEN_NONE; - GString *ret = g_string_new(""); - char *buf=NULL; - int sym; - - g_scanner_input_text(uzbl.scan, template, strlen(template)); - while(!g_scanner_eof(uzbl.scan) && token != G_TOKEN_LAST) { - token = g_scanner_get_next_token(uzbl.scan); - - if(token == G_TOKEN_SYMBOL) { - sym = GPOINTER_TO_INT(g_scanner_cur_value(uzbl.scan).v_symbol); - switch(sym) { - case SYM_KEYCMD: - if(escape_markup) { - buf = uzbl.state.keycmd->str? - g_markup_printf_escaped("%s", uzbl.state.keycmd->str):g_strdup(""); - g_string_append(ret, buf); - g_free(buf); - } - else - g_string_append(ret, uzbl.state.keycmd->str? - uzbl.state.keycmd->str:g_strdup("")); - break; - default: - break; - } - } - else if(token == G_TOKEN_INT) { - buf = itos(g_scanner_cur_value(uzbl.scan).v_int); - g_string_append(ret, buf); - g_free(buf); - } - else if(token == G_TOKEN_IDENTIFIER) { - g_string_append(ret, (gchar *)g_scanner_cur_value(uzbl.scan).v_identifier); - } - else if(token == G_TOKEN_CHAR) { - g_string_append_c(ret, (gchar)g_scanner_cur_value(uzbl.scan).v_char); - } - } - - return g_string_free(ret, FALSE); -} /* --End Statusbar functions-- */ static void @@ -1774,17 +1682,17 @@ set_var_value(gchar *name, gchar *val) { /* check for the variable type */ if (c->type == TYPE_STR) { - buf = expand(val, 0, FALSE); + buf = expand(val, 0); g_free(*c->ptr); *c->ptr = buf; } else if(c->type == TYPE_INT) { int *ip = (int *)c->ptr; - buf = expand(val, 0, FALSE); + buf = expand(val, 0); *ip = (int)strtoul(buf, &endp, 10); g_free(buf); } else if (c->type == TYPE_FLOAT) { float *fp = (float *)c->ptr; - buf = expand(val, 0, FALSE); + buf = expand(val, 0); *fp = strtod(buf, &endp); g_free(buf); } @@ -2074,15 +1982,13 @@ update_title (void) { if (b->show_status) { if (b->title_format_short) { - parsed = expand_template(b->title_format_short, FALSE); - parsed = expand(parsed, 0, FALSE); + parsed = expand(b->title_format_short, 0); if (uzbl.gui.main_window) gtk_window_set_title (GTK_WINDOW(uzbl.gui.main_window), parsed); g_free(parsed); } if (b->status_format) { - parsed = expand_template(b->status_format, TRUE); - parsed = expand(parsed, 0, TRUE); + parsed = expand(b->status_format, 0); gtk_label_set_markup(GTK_LABEL(uzbl.gui.mainbar_label), parsed); g_free(parsed); } @@ -2097,8 +2003,7 @@ update_title (void) { } } else { if (b->title_format_long) { - parsed = expand_template(b->title_format_long, FALSE); - parsed = expand(parsed, 0, FALSE); + parsed = expand(b->title_format_long, 0); if (uzbl.gui.main_window) gtk_window_set_title (GTK_WINDOW(uzbl.gui.main_window), parsed); g_free(parsed); @@ -2128,7 +2033,7 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) return FALSE; if (event->keyval == GDK_Escape) { - g_string_truncate(uzbl.state.keycmd, 0); + clear_keycmd(); update_title(); dehilight(uzbl.gui.web_view, NULL, NULL); return TRUE; @@ -2143,7 +2048,9 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) str = gtk_clipboard_wait_for_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)); } if (str) { - g_string_append (uzbl.state.keycmd, str); + GString* keycmd = g_string_new(uzbl.state.keycmd); + g_string_append (keycmd, str); + uzbl.state.keycmd = g_string_free(keycmd, FALSE); update_title (); g_free (str); } @@ -2156,7 +2063,11 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) gboolean key_ret = FALSE; if ((event->keyval == GDK_Return) || (event->keyval == GDK_KP_Enter)) key_ret = TRUE; - if (!key_ret) g_string_append(uzbl.state.keycmd, event->string); + if (!key_ret) { + GString* keycmd = g_string_new(uzbl.state.keycmd); + g_string_append(keycmd, event->string); + uzbl.state.keycmd = g_string_free(keycmd, FALSE); + } run_keycmd(key_ret); update_title(); @@ -2168,8 +2079,8 @@ static void run_keycmd(const gboolean key_ret) { /* run the keycmd immediately if it isn't incremental and doesn't take args */ Action *act; - if ((act = g_hash_table_lookup(uzbl.bindings, uzbl.state.keycmd->str))) { - g_string_truncate(uzbl.state.keycmd, 0); + if ((act = g_hash_table_lookup(uzbl.bindings, uzbl.state.keycmd))) { + clear_keycmd(); parse_command(act->name, act->param, NULL); return; } @@ -2178,8 +2089,9 @@ run_keycmd(const gboolean key_ret) { GString* short_keys = g_string_new (""); GString* short_keys_inc = g_string_new (""); guint i; - for (i=0; i<(uzbl.state.keycmd->len); i++) { - g_string_append_c(short_keys, uzbl.state.keycmd->str[i]); + guint len = strlen(uzbl.state.keycmd); + for (i=0; istr); g_string_append_c(short_keys, '_'); g_string_append_c(short_keys_inc, '*'); @@ -2187,11 +2099,11 @@ run_keycmd(const gboolean key_ret) { if (key_ret && (act = g_hash_table_lookup(uzbl.bindings, short_keys->str))) { /* run normal cmds only if return was pressed */ exec_paramcmd(act, i); - g_string_truncate(uzbl.state.keycmd, 0); + clear_keycmd(); break; } else if ((act = g_hash_table_lookup(uzbl.bindings, short_keys_inc->str))) { if (key_ret) /* just quit the incremental command on return */ - g_string_truncate(uzbl.state.keycmd, 0); + clear_keycmd(); else exec_paramcmd(act, i); /* otherwise execute the incremental */ break; } @@ -2204,7 +2116,7 @@ run_keycmd(const gboolean key_ret) { static void exec_paramcmd(const Action *act, const guint i) { - GString *parampart = g_string_new (uzbl.state.keycmd->str); + GString *parampart = g_string_new (uzbl.state.keycmd); GString *actionname = g_string_new (""); GString *actionparam = g_string_new (""); g_string_erase (parampart, 0, i+1); @@ -2681,7 +2593,7 @@ initialize(int argc, char *argv[]) { uzbl.bindings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, free_action); uzbl.net.soup_session = webkit_get_default_session(); - uzbl.state.keycmd = g_string_new(""); + uzbl.state.keycmd = g_strdup(""); if(setup_signal(SIGTERM, catch_sigterm) == SIG_ERR) fprintf(stderr, "uzbl: error hooking SIGTERM\n"); @@ -2711,7 +2623,6 @@ initialize(int argc, char *argv[]) { uzbl.info.arch = ARCH; uzbl.info.commit = COMMIT; - setup_scanner(); commands_hash (); make_var_to_name_hash(); diff --git a/uzbl.h b/uzbl.h index 0d0e928..0343e88 100644 --- a/uzbl.h +++ b/uzbl.h @@ -83,7 +83,7 @@ typedef struct { char *instance_name; gchar *selected_url; gchar *executable_path; - GString* keycmd; + gchar* keycmd; gchar* searchtx; gboolean verbose; } State; -- cgit v1.2.3 From 2bedc2c788dd7974df90b0080b6078ec5417a862 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Jul 2009 12:27:58 -0600 Subject: get rid of some duplication in expand() --- uzbl.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/uzbl.c b/uzbl.c index ab12e1a..d1a1ca4 100644 --- a/uzbl.c +++ b/uzbl.c @@ -243,7 +243,7 @@ expand(char *s, guint recurse) { char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½"; char str_end[2]; char ret[4096]; - char *vend; + char *vend = NULL; GError *err = NULL; gchar *cmd_stdout = NULL; gchar *mycmd = NULL; @@ -263,52 +263,42 @@ expand(char *s, guint recurse) { switch(etype) { case EXP_SIMPLE_VAR: - if( (vend = strpbrk(s, end_simple_var)) || - (vend = strchr(s, '\0')) ) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + vend = strpbrk(s, end_simple_var); + if(!vend) vend = strchr(s, '\0'); break; case EXP_BRACED_VAR: s++; upto = '}'; - if( (vend = strchr(s, upto)) || - (vend = strchr(s, '\0')) ) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + vend = strchr(s, upto); + if(!vend) vend = strchr(s, '\0'); break; case EXP_EXPR: s++; strcpy(str_end, ")@"); str_end[2] = '\0'; - if( (vend = strstr(s, str_end)) || - (vend = strchr(s, '\0')) ) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + vend = strstr(s, str_end); + if(!vend) vend = strchr(s, '\0'); break; case EXP_JS: s++; strcpy(str_end, ">@"); str_end[2] = '\0'; - if( (vend = strstr(s, str_end)) || - (vend = strchr(s, '\0')) ) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + vend = strstr(s, str_end); + if(!vend) vend = strchr(s, '\0'); break; case EXP_ESCAPE: s++; strcpy(str_end, "]@"); str_end[2] = '\0'; - if( (vend = strstr(s, str_end)) || - (vend = strchr(s, '\0')) ) { - strncpy(ret, s, vend-s); - ret[vend-s] = '\0'; - } + vend = strstr(s, str_end); + if(!vend) vend = strchr(s, '\0'); break; } + if(vend) { + strncpy(ret, s, vend-s); + ret[vend-s] = '\0'; + } + if(etype == EXP_SIMPLE_VAR || etype == EXP_BRACED_VAR) { if( (c = g_hash_table_lookup(uzbl.comm.proto_var, ret)) ) { -- cgit v1.2.3 From 3b209125f06785c0baf23478433ed36230281ea3 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Jul 2009 13:09:45 -0600 Subject: updated readme and example config --- README | 44 +++++++++++++++++++++++++++++++++++--------- examples/config/uzbl/config | 8 ++++---- 2 files changed, 39 insertions(+), 13 deletions(-) diff --git a/README b/README index ae9932b..266a207 100644 --- a/README +++ b/README @@ -235,22 +235,48 @@ the java script in @< >@. Variable expansion also works within a java script substitution. +When a piece of text needs to be XML escaped after it is expanded (for example, +in the status bar format), you can use @[ ]@ substitution: + + print This text is XML escaped: @[<&>]@ + + # prints: This text is XML escaped: <&> + + NOTE: If you need to use literal @ or \ characters you will need to escape them: print At sign: \@ and backslash: \\ -### VARIABLE REPLACEMENT -Some of the variables are interpreted: +### TITLE AND STATUS BAR EVALUATION + +The contents of the status bar can be customized by setting the status_format +variable. The contents of the window title can be customized by setting the +title_format_short variable (which is used when the status bar is displayed) and +the title_format_long variable (which is used when the status bar is not +displayed). Their values can be set using the expansion and substitution +techniques described above. + +These variables are expanded in multiple stages; once when the variable is set, +and again every time that the status bar or window title are updated. Expansions +that should be evaluated on every update need to be escaped: + + set title_format_short = @(date)@ + # this expansion will be evaluated when the variable is set. + # the title will stay constant with the date that the variable was set. + + set title_format_short = \@(date)\@ + # this expansion will be evaluated when the window title is updated. + # the date in the title will change when you change pages, for example. -* title bar: variable replacement (long and short version, depending if statusbar is visible or not) -* user agent: variable replacement -* statusbar: variable replacement + pango markup + set title_format_short = \\\@(date)\\\@ + # the title will stay constant as a literal "@(date)@" -This means you can customize how these things appear, what's shown in them and for the statusbar you can even play with the layout. -For examples, see the example config. -For a list of possible variables, see uzbl.h -For more info about the markup format see http://library.gnome.org/devel/pango/stable/PangoMarkupFormat.html +The status_format variable can contain Pango markup (see +). In the +status_format, variables that might contain characters like '<', '&' and '>', +should be wrapped in a @[]@ substitution so that they don't interfere with the +status bar's markup; see the example config for examples. ### EXTERNAL SCRIPTS diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 4d455b1..126df49 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -68,11 +68,11 @@ set shell_cmd = sh -c set show_status = 1 # you can optionally use this setting to override the background color of the statusbar from your GTK theme. set status_background = #303030 -set status_format = [MODE] [KEYCMD] LOAD_PROGRESSBAR URI NAME MSGSELECTED_URI +set status_format = [\@[\@MODE]\@] [\@[\@ keycmd]\@] \@[\@LOAD_PROGRESSBAR]\@ \@[\@uri]\@ \@[\@NAME]\@ \@status_message\@[\@ SELECTED_URI]\@ set status_top = 0 # define how your titlebar should look like. (short = statusbar is also shown, long = show everything you must see if statusbar is off) -set title_format_short = TITLE - Uzbl browser -set title_format_long = KEYCMD MODE TITLE - Uzbl browser > SELECTED_URI +set title_format_short = \@TITLE - Uzbl browser <\@NAME> +set title_format_long = \@keycmd \@MODE \@TITLE - Uzbl browser <\@NAME> > \@SELECTED_URI # set the characters to use for, and the width of the progress bar set status_pbar_done = * set status_pbar_pending = - @@ -91,7 +91,7 @@ set always_insert_mode = 0 #set http_debug = 0 #set useragent = uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) # Example user agent containing everything: -set useragent = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@SYSNAME @NODENAME @KERNREL @KERNVER @ARCH_SYSTEM [@ARCH_UZBL]) (Commit @COMMIT) +set useragent = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname-s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT) #set max_conns = 0 #set max_conns_host = 0 -- cgit v1.2.3 From 8fab11200e300712484ac5f31bc610f9943029cc Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Jul 2009 13:38:02 -0600 Subject: update mode indicator when @insert_mode is set --- tests/test-expand.c | 4 ++-- uzbl.c | 11 +++++++---- uzbl.h | 6 +++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/test-expand.c b/tests/test-expand.c index 7cc558b..07e3fea 100644 --- a/tests/test-expand.c +++ b/tests/test-expand.c @@ -79,10 +79,10 @@ test_NAME (void) { void test_MODE (void) { - set_insert_mode(FALSE); + set_var_value("insert_mode", "0"); g_assert_cmpstr(expand("@MODE", 0), ==, "C"); - set_insert_mode(TRUE); + set_var_value("insert_mode", "1"); g_assert_cmpstr(expand("@MODE", 0), ==, "I"); } diff --git a/uzbl.c b/uzbl.c index d1a1ca4..daf7e4d 100644 --- a/uzbl.c +++ b/uzbl.c @@ -122,7 +122,7 @@ const struct { { "title_format_long", PTR_V(uzbl.behave.title_format_long, STR, 1, update_title)}, { "title_format_short", PTR_V(uzbl.behave.title_format_short, STR, 1, update_title)}, { "icon", PTR_V(uzbl.gui.icon, STR, 1, set_icon)}, - { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, NULL)}, /* XXX */ + { "insert_mode", PTR_V(uzbl.behave.insert_mode, INT, 1, set_mode_indicator)}, { "always_insert_mode", PTR_V(uzbl.behave.always_insert_mode, INT, 1, cmd_always_insert_mode)}, { "reset_command_mode", PTR_V(uzbl.behave.reset_command_mode, INT, 1, NULL)}, { "modkey", PTR_V(uzbl.behave.modkey, STR, 1, cmd_modkey)}, @@ -885,11 +885,14 @@ act_dump_config() { dump_config(); } -/* XXX set_var_value instead? */ +void set_mode_indicator() { + uzbl.gui.sbar.mode_indicator = (uzbl.behave.insert_mode ? + uzbl.behave.insert_indicator : uzbl.behave.cmd_indicator); +} + void set_insert_mode(gboolean mode) { uzbl.behave.insert_mode = mode; - uzbl.gui.sbar.mode_indicator = (mode ? - uzbl.behave.insert_indicator : uzbl.behave.cmd_indicator); + set_mode_indicator(); } static void diff --git a/uzbl.h b/uzbl.h index 0343e88..6c292a0 100644 --- a/uzbl.h +++ b/uzbl.h @@ -297,7 +297,11 @@ new_action(const gchar *name, const gchar *param); static bool file_exists (const char * filename); -void set_insert_mode(gboolean mode); +void +set_mode_indicator(); + +void +set_insert_mode(gboolean mode); static void toggle_insert_mode(WebKitWebView *page, GArray *argv, GString *result); -- cgit v1.2.3 From e39152702c839cafe5a73536ba6d3c3d769d4546 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Sun, 12 Jul 2009 13:52:34 -0600 Subject: "set keycmd = x" is now equivalent to "keycmd x" --- tests/Makefile | 2 +- tests/test-command.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ uzbl.c | 11 +++++++--- uzbl.h | 7 ++++-- 4 files changed, 74 insertions(+), 6 deletions(-) create mode 100644 tests/test-command.c diff --git a/tests/Makefile b/tests/Makefile index 2bfcf98..7901b7d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -4,7 +4,7 @@ LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) GTESTER:=gtester GTESTER_REPORT:=gtester-report -TEST_PROGS:=test-expand +TEST_PROGS:=test-expand test-command all: $(TEST_PROGS) LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):." $(GTESTER) --verbose $(TEST_PROGS) diff --git a/tests/test-command.c b/tests/test-command.c new file mode 100644 index 0000000..aee4bf2 --- /dev/null +++ b/tests/test-command.c @@ -0,0 +1,60 @@ +/* -*- c-basic-offset: 4; -*- */ +#define _POSIX_SOURCE + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +extern Uzbl uzbl; + +void +test_keycmd (void) { + add_binding("insert", "set insert_mode = 1"); + add_binding("command", "set insert_mode = 0"); + + /* the 'keycmd' command */ + parse_command("keycmd", "insert", NULL); + + g_assert_cmpint(1, ==, uzbl.behave.insert_mode); + g_assert_cmpstr("", ==, uzbl.state.keycmd); + + /* setting the keycmd variable directly, equivalent to the 'keycmd' comand */ + set_var_value("keycmd", "command"); + + g_assert_cmpint(0, ==, uzbl.behave.insert_mode); + g_assert_cmpstr("", ==, uzbl.state.keycmd); +} + +int +main (int argc, char *argv[]) { + g_type_init(); + g_test_init(&argc, &argv, NULL); + + g_test_add_func("/test-command/keycmd", test_keycmd); + + initialize(argc, argv); + + return g_test_run(); +} + +/* vi: set et ts=4: */ diff --git a/uzbl.c b/uzbl.c index daf7e4d..f4f93ea 100644 --- a/uzbl.c +++ b/uzbl.c @@ -108,7 +108,7 @@ const struct { { "base_url", PTR_V(uzbl.behave.base_url, STR, 1, NULL)}, { "html_endmarker", PTR_V(uzbl.behave.html_endmarker, STR, 1, NULL)}, { "html_mode_timeout", PTR_V(uzbl.behave.html_timeout, INT, 1, NULL)}, - { "keycmd", PTR_V(uzbl.state.keycmd, STR, 1, NULL)}, /* XXX */ + { "keycmd", PTR_V(uzbl.state.keycmd, STR, 1, set_keycmd)}, { "status_message", PTR_V(uzbl.gui.sbar.msg, STR, 1, update_title)}, { "show_status", PTR_V(uzbl.behave.show_status, INT, 1, cmd_set_status)}, { "status_top", PTR_V(uzbl.behave.status_top, INT, 1, move_statusbar)}, @@ -885,6 +885,11 @@ act_dump_config() { dump_config(); } +void set_keycmd() { + run_keycmd(FALSE); + update_title(); +} + void set_mode_indicator() { uzbl.gui.sbar.mode_indicator = (uzbl.behave.insert_mode ? uzbl.behave.insert_indicator : uzbl.behave.cmd_indicator); @@ -1364,7 +1369,7 @@ spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result) { g_strfreev (cmd); } -static void +void parse_command(const char *cmd, const char *param, GString *result) { CommandInfo *c; @@ -2291,7 +2296,7 @@ run_handler (const gchar *act, const gchar *args) { g_strfreev(parts); } -static void +void add_binding (const gchar *key, const gchar *act) { char **parts = g_strsplit(act, " ", 2); Action *action; diff --git a/uzbl.h b/uzbl.h index 6c292a0..ef462f5 100644 --- a/uzbl.h +++ b/uzbl.h @@ -297,6 +297,9 @@ new_action(const gchar *name, const gchar *param); static bool file_exists (const char * filename); +void +set_keycmd(); + void set_mode_indicator(); @@ -346,7 +349,7 @@ spawn_sync(WebKitWebView *web_view, GArray *argv, GString *result); static void spawn_sh_sync(WebKitWebView *web_view, GArray *argv, GString *result); -static void +void parse_command(const char *cmd, const char *param, GString *result); static void @@ -406,7 +409,7 @@ GtkPlug* create_plug (); static void run_handler (const gchar *act, const gchar *args); -static void +void add_binding (const gchar *key, const gchar *act); static gchar* -- cgit v1.2.3 From 5bd15da8a07f91f1dee53087e598ecb1182fe0a8 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Sun, 12 Jul 2009 22:37:16 +0200 Subject: more fixes --- uzbl.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/uzbl.c b/uzbl.c index 7ea3688..5b2ece7 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2617,9 +2617,6 @@ retreive_geometry() { uzbl.gui.geometry = g_string_free(buf, FALSE); } -/** -- MAIN -- **/ -int -main (int argc, char* argv[]) { /* set up gtk, gobject, variable defaults and other things that tests and other * external applications need to do anyhow */ void -- cgit v1.2.3 From f52c73418f9a68bde9d2668e5215960a0f20cbcf Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Mon, 13 Jul 2009 08:55:35 +0200 Subject: tidy up move to expand() --- config.h | 6 +++--- examples/config/uzbl/config | 4 ++-- uzbl.c | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config.h b/config.h index ab6e195..c6e3f35 100644 --- a/config.h +++ b/config.h @@ -2,8 +2,8 @@ const struct { char *command; } default_config[] = { { "set reset_command_mode = 1"}, -{ "set status_format = MODE KEYCMD (LOAD_PROGRESS%) TITLE - Uzbl browser"}, -{ "set title_format_long = KEYCMD MODE TITLE - Uzbl browser > SELECTED_URI"}, -{ "set title_format_short = TITLE - Uzbl browser "}, +{ "set status_format = \\@MODE \\@[\\@keycmd]\\@ (\\@LOAD_PROGRESS%) \\@[\\@TITLE]\\@ - Uzbl browser"}, +{ "set title_format_long = \\@keycmd \\@MODE \\@TITLE - Uzbl browser <\\@NAME> > \\@SELECTED_URI"}, +{ "set title_format_short = \\@TITLE - Uzbl browser <\\@NAME>"}, { NULL } }; diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index 126df49..e75789d 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -68,7 +68,7 @@ set shell_cmd = sh -c set show_status = 1 # you can optionally use this setting to override the background color of the statusbar from your GTK theme. set status_background = #303030 -set status_format = [\@[\@MODE]\@] [\@[\@ keycmd]\@] \@[\@LOAD_PROGRESSBAR]\@ \@[\@uri]\@ \@[\@NAME]\@ \@status_message\@[\@ SELECTED_URI]\@ +set status_format = [\@[\@MODE]\@] [\@[\@keycmd]\@] \@[\@LOAD_PROGRESSBAR]\@ \@[\@uri]\@ \@[\@NAME]\@ \@status_message \@[\@SELECTED_URI]\@ set status_top = 0 # define how your titlebar should look like. (short = statusbar is also shown, long = show everything you must see if statusbar is off) set title_format_short = \@TITLE - Uzbl browser <\@NAME> @@ -91,7 +91,7 @@ set always_insert_mode = 0 #set http_debug = 0 #set useragent = uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) # Example user agent containing everything: -set useragent = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname-s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT) +set useragent = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT) #set max_conns = 0 #set max_conns_host = 0 diff --git a/uzbl.c b/uzbl.c index 5b2ece7..9e833d6 100644 --- a/uzbl.c +++ b/uzbl.c @@ -143,6 +143,7 @@ const struct { { "max_conns", PTR_V(uzbl.net.max_conns, INT, 1, cmd_max_conns)}, { "max_conns_host", PTR_V(uzbl.net.max_conns_host, INT, 1, cmd_max_conns_host)}, { "useragent", PTR_V(uzbl.net.useragent, STR, 1, cmd_useragent)}, + /* exported WebKitWebSettings properties */ { "zoom_level", PTR_V(uzbl.behave.zoom_level, FLOAT,1, cmd_zoom_level)}, { "font_size", PTR_V(uzbl.behave.font_size, INT, 1, cmd_font_size)}, @@ -2665,7 +2666,6 @@ initialize(int argc, char *argv[]) { /* default mode indicators */ uzbl.behave.insert_indicator = g_strdup("I"); uzbl.behave.cmd_indicator = g_strdup("C"); - set_insert_mode(FALSE); uzbl.info.webkit_major = WEBKIT_MAJOR_VERSION; uzbl.info.webkit_minor = WEBKIT_MINOR_VERSION; @@ -2734,6 +2734,7 @@ main (int argc, char* argv[]) { gboolean verbose_override = uzbl.state.verbose; settings_init (); + set_insert_mode(FALSE); if (!uzbl.behave.show_status) gtk_widget_hide(uzbl.gui.mainbar); -- cgit v1.2.3 From 922379f5cf1ad948c3c9628853eb8396e1a4dae6 Mon Sep 17 00:00:00 2001 From: Brendan Taylor Date: Thu, 16 Jul 2009 18:01:46 -0600 Subject: remove out-of-date test-1.c --- tests/test-1.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100644 tests/test-1.c diff --git a/tests/test-1.c b/tests/test-1.c deleted file mode 100644 index 3a94c9b..0000000 --- a/tests/test-1.c +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c-basic-offset: 4; -*- */ -#define _POSIX_SOURCE - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -Uzbl uzbl; - -static void -test_URI (void) { - setup_scanner(); - uzbl.state.uri = g_strdup("http://www.uzbl.org"); - g_assert_cmpstr(expand_template("URI", FALSE), ==, uzbl.state.uri); - g_free(uzbl.state.uri); -} - -int -main (int argc, char *argv[]) { - g_type_init(); - g_test_init(&argc, &argv, NULL); - - g_test_add_func("/test-1/URI", test_URI); - - return g_test_run(); -} - -/* vi: set et ts=4: */ -- cgit v1.2.3