aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/callbacks.c19
-rw-r--r--src/callbacks.h3
-rw-r--r--src/events.c7
-rw-r--r--src/events.h2
-rw-r--r--src/uzbl-core.c12
-rw-r--r--src/uzbl-core.h8
6 files changed, 11 insertions, 40 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index c95c0f1..ac6c75d 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -311,7 +311,7 @@ cmd_view_source() {
void
cmd_set_zoom_type () {
- if(uzbl.behave.zoom_type)
+ if(uzbl.behave.zoom_type)
webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, TRUE);
else
webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, FALSE);
@@ -692,23 +692,7 @@ gboolean
download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data) {
(void) web_view;
(void) user_data;
- if (uzbl.behave.download_handler) {
- const gchar* uri = webkit_download_get_uri ((WebKitDownload*)download);
- if (uzbl.state.verbose)
- printf("Download -> %s\n",uri);
-
- /* if urls not escaped, we may have to escape and quote uri before this call */
- GString *args = g_string_new(uri);
-
- if (uzbl.net.proxy_url) {
- g_string_append_c(args, ' ');
- g_string_append(args, uzbl.net.proxy_url);
- }
- run_handler(uzbl.behave.download_handler, args->str);
-
- g_string_free(args, TRUE);
- }
send_event(DOWNLOAD_REQ, webkit_download_get_uri ((WebKitDownload*)download), NULL);
return (FALSE);
}
@@ -778,4 +762,3 @@ populate_popup_cb(WebKitWebView *v, GtkMenu *m, void *c) {
}
}
}
-
diff --git a/src/callbacks.h b/src/callbacks.h
index 6ed8986..278a31a 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -1,4 +1,4 @@
-/*
+/*
** Callbacks
** (c) 2009 by Robert Manea et al.
*/
@@ -207,4 +207,3 @@ button_release_cb (GtkWidget* window, GdkEventButton* event);
gboolean
focus_cb(GtkWidget* window, GdkEventFocus* event, void *ud);
-
diff --git a/src/events.c b/src/events.c
index 1028c30..c209550 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1,5 +1,5 @@
-/*
- ** Uzbl event routines
+/*
+ ** Uzbl event routines
** (c) 2009 by Robert Manea
*/
@@ -84,7 +84,7 @@ send_event_socket(GString *msg) {
tmp->str, tmp->len,
&len, &error);
- if (ret == G_IO_STATUS_ERROR)
+ if (ret == G_IO_STATUS_ERROR)
g_warning ("Error sending event to socket: %s", error->message);
else
g_io_channel_flush(gio, &error);
@@ -205,4 +205,3 @@ key_to_event(guint keyval, gint mode) {
}
}
-
diff --git a/src/events.h b/src/events.h
index fe3ff3b..1bd8804 100644
--- a/src/events.h
+++ b/src/events.h
@@ -1,4 +1,4 @@
-/*
+/*
** Uzbl event routines
** (c) 2009 by Robert Manea
*/
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index c288b5f..4d60bd3 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -90,7 +90,6 @@ const struct var_name_to_ptr_t {
{ "print_events", PTR_V_INT(uzbl.state.events_stdout, 1, NULL)},
{ "inject_html", PTR_V_STR(uzbl.behave.inject_html, 0, cmd_inject_html)},
{ "geometry", PTR_V_STR(uzbl.gui.geometry, 1, cmd_set_geometry)},
- { "keycmd", PTR_V_STR(uzbl.state.keycmd, 1, NULL)},
{ "show_status", PTR_V_INT(uzbl.behave.show_status, 1, cmd_set_status)},
{ "status_top", PTR_V_INT(uzbl.behave.status_top, 1, move_statusbar)},
{ "status_format", PTR_V_STR(uzbl.behave.status_format, 1, NULL)},
@@ -99,7 +98,6 @@ const struct var_name_to_ptr_t {
{ "title_format_short", PTR_V_STR(uzbl.behave.title_format_short, 1, NULL)},
{ "icon", PTR_V_STR(uzbl.gui.icon, 1, set_icon)},
{ "forward_keys", PTR_V_INT(uzbl.behave.forward_keys, 1, NULL)},
- { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)},
{ "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, NULL)},
{ "authentication_handler", PTR_V_STR(uzbl.behave.authentication_handler, 1, set_authentication_handler)},
{ "new_window", PTR_V_STR(uzbl.behave.new_window, 1, NULL)},
@@ -197,7 +195,7 @@ gchar *
expand(const char *s, guint recurse) {
uzbl_cmdprop *c;
enum exp_type etype;
- char *end_simple_var = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½";
+ char *end_simple_var = "\t^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½";
char *ret = NULL;
char *vend = NULL;
GError *err = NULL;
@@ -999,7 +997,7 @@ act_dump_config_as_events() {
void
load_uri (WebKitWebView *web_view, GArray *argv, GString *result) {
(void) web_view; (void) result;
- load_uri_imp (argv_idx (argv, 0));
+ set_var_value("uri", argv_idx(argv, 0));
}
/* Javascript*/
@@ -1643,7 +1641,7 @@ set_var_value(const gchar *name, gchar *val) {
uzbl_cmdprop *c = NULL;
char *endp = NULL;
char *buf = NULL;
- char *invalid_chars = "^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½";
+ char *invalid_chars = "\t^°!\"§$%&/()=?'`'+~*'#-.:,;@<>| \\{}[]¹²³¼½";
GString *msg;
if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) {
@@ -2536,7 +2534,6 @@ initialize(int argc, char *argv[]) {
}
uzbl.net.soup_session = webkit_get_default_session();
- uzbl.state.keycmd = g_strdup("");
for(i=0; sigs[i]; i++) {
if(setup_signal(sigs[i], catch_signal) == SIG_ERR)
@@ -2658,7 +2655,8 @@ main (int argc, char* argv[]) {
/* generate an event with a list of built in commands */
builtins();
- gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view));
+ if (!uzbl.state.plug_mode)
+ gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view));
if (uzbl.state.verbose) {
printf("Uzbl start location: %s\n", argv[0]);
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 23072e4..73ec7c1 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -92,7 +92,6 @@ typedef struct {
gchar *selected_url;
gchar *last_selected_url;
gchar *executable_path;
- gchar* keycmd;
gchar* searchtx;
gboolean verbose;
gboolean events_stdout;
@@ -122,7 +121,6 @@ typedef struct {
gchar* status_background;
gchar* fifo_dir;
gchar* socket_dir;
- gchar* download_handler;
gchar* cookie_handler;
gchar* authentication_handler;
gchar* new_window;
@@ -266,9 +264,6 @@ bool
file_exists (const char * filename);
void
-set_keycmd();
-
-void
load_uri (WebKitWebView * web_view, GArray *argv, GString *result);
void
@@ -339,9 +334,6 @@ gboolean
key_release_cb (GtkWidget* window, GdkEventKey* event);
void
-run_keycmd(const gboolean key_ret);
-
-void
initialize (int argc, char *argv[]);
void
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 18:28:52 +0000