aboutsummaryrefslogtreecommitdiffhomepage
path: root/uzbl.c
diff options
context:
space:
mode:
Diffstat (limited to 'uzbl.c')
-rw-r--r--uzbl.c226
1 files changed, 173 insertions, 53 deletions
diff --git a/uzbl.c b/uzbl.c
index 05b0582..fe45d57 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -47,8 +47,15 @@ static GtkWidget* uri_entry;
static GtkWidget* mainbar;
static WebKitWebView* web_view;
static gchar* main_title;
-static gchar* history_file;
-static gchar* fifodir = NULL;
+static gchar selected_url[500];
+
+/* Behaviour variables */
+static gchar* history_file = NULL;
+static gchar* fifodir = NULL;
+static gchar* download_handler = NULL;
+static gchar* always_insert_mode = NULL;
+static gchar* modkey = NULL;
+
static char fifopath[64];
static gint load_progress;
static guint status_context_id;
@@ -71,13 +78,22 @@ typedef struct
void (*func_2_params)(WebKitWebView*, char *);
} Command;
+typedef struct
+{
+ const char *binding;
+ const char *action;
+} Binding;
+
+static Binding internal_bindings[256];
+static Binding external_bindings[256];
+static int num_internal_bindings = 0;
+static int num_external_bindings = 0;
static void
update_title (GtkWindow* window);
/* --- CALLBACKS --- */
-
static void
go_back_cb (GtkWidget* widget, gpointer data) {
webkit_web_view_go_back (web_view);
@@ -96,6 +112,14 @@ link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpoin
//if (link)
// gtk_statusbar_push (main_statusbar, status_context_id, link);
//TODO implementation roadmap pending..
+
+ //ADD HOVER URL TO WINDOW TITLE
+ selected_url[0]='\0';
+ if (link) {
+ strcpy (selected_url,link);
+ }
+ update_title (GTK_WINDOW (main_window));
+
}
static void
@@ -149,7 +173,6 @@ log_history_cb () {
}
}
-
/* -- command to callback/function map for things we cannot attach to any signals */
// TODO: reload, home, quit
static Command commands[] =
@@ -165,13 +188,13 @@ static Command commands[] =
};
/* -- CORE FUNCTIONS -- */
-
+
static void
parse_command(const char *command) {
int i;
Command *c;
- char * command_name = strtok (command," ");
- char * command_param = strtok (NULL, " ,"); //dunno how this works, but it seems to work
+ char * command_name = strtok (command, " ");
+ char * command_param = strtok (NULL, " ,"); //dunno how this works, but it seems to work
Command *c_tmp;
for (i = 0; i < LENGTH(commands); i++) {
@@ -182,81 +205,115 @@ parse_command(const char *command) {
}
if (c != NULL) {
if (c->func_2_params != NULL) {
- if(command_param != NULL) {
- printf("command executing: \"%s %s\"\n", command_name, command_param);
+ if (command_param != NULL) {
+ printf ("command executing: \"%s %s\"\n", command_name, command_param);
c->func_2_params (web_view, command_param);
} else {
- if(c->func_1_param != NULL) {
- printf("command executing: \"%s\"\n", command_name);
+ if (c->func_1_param != NULL) {
+ printf ("command executing: \"%s\"\n", command_name);
c->func_1_param (web_view);
} else {
- fprintf(stderr, "command needs a parameter. \"%s\" is not complete\n", command_name);
+ fprintf (stderr, "command needs a parameter. \"%s\" is not complete\n", command_name);
}
}
} else if(c->func_1_param != NULL) {
- printf("command executing: \"%s\"\n", command_name);
+ printf ("command executing: \"%s\"\n", command_name);
c->func_1_param (web_view);
}
} else {
- fprintf(stderr, "command \"%s\" not understood. ignoring.\n", command);
+ fprintf (stderr, "command \"%s\" not understood. ignoring.\n", command);
}
}
-
+
static void
*control_fifo() {
- if (fifodir) {
- sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin);
- } else {
- sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin);
+ if (fifodir) {
+ sprintf (fifopath, "%s/uzbl_%d", fifodir, (int) xwin);
+ } else {
+ sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin);
}
-
- if (mkfifo (fifopath, 0666) == -1) {
- printf ("Possible error creating fifo\n");
+
+ if (mkfifo (fifopath, 0666) == -1) {
+ printf ("Possible error creating fifo\n");
}
-
- printf ("ontrol fifo opened in %s\n", fifopath);
-
+
+ printf ("Control fifo opened in %s\n", fifopath);
+
while (true) {
- FILE *fifo = fopen(fifopath, "r");
+ FILE *fifo = fopen (fifopath, "r");
if (!fifo) {
- printf("Could not open %s for reading\n", fifopath);
+ printf ("Could not open %s for reading\n", fifopath);
return NULL;
- }
+ }
char buffer[256];
memset (buffer, 0, sizeof (buffer));
while (!feof (fifo) && fgets (buffer, sizeof (buffer), fifo)) {
if (strcmp (buffer, "\n")) {
buffer[strlen (buffer) - 1] = '\0'; // Remove newline
- parse_command (buffer);
- }
- }
- }
+ parse_command (buffer);
+ }
+ }
+ }
return NULL;
}
-
-
+
+
static void
setup_threading () {
- pthread_t control_thread;
- pthread_create(&control_thread, NULL, control_fifo, NULL);
+ pthread_t control_thread;
+ pthread_create(&control_thread, NULL, control_fifo, NULL);
}
-
-
-
static void
update_title (GtkWindow* window) {
GString* string = g_string_new (main_title);
g_string_append (string, " - Uzbl browser");
if (load_progress < 100)
g_string_append_printf (string, " (%d%%)", load_progress);
+
+ if (selected_url[0]!=0) {
+ g_string_append_printf (string, " -> (%s)", selected_url);
+ }
+
gchar* title = g_string_free (string, FALSE);
gtk_window_set_title (window, title);
g_free (title);
}
+
+static void
+MsgBox (const char *s) {
+ GtkWidget* dialog = gtk_message_dialog_new (main_window,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ "%s", s);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+}
+
+
+static gboolean
+key_press_cb (WebKitWebView* page, GdkEventKey* event)
+{
+ int i;
+ gboolean result=FALSE; //TRUE to stop other handlers from being invoked for the event. FALSE to propagate the event further.
+ if (event->type != GDK_KEY_PRESS)
+ return(result);
+
+ for (i = 0; i < num_internal_bindings; i++) {
+ if (event->string[0] == internal_bindings[i].binding[0]) {
+ parse_command(internal_bindings[i].action);
+ result = FALSE;
+ }
+ }
+
+ return(result);
+}
+
+
static GtkWidget*
create_browser () {
GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -270,6 +327,7 @@ create_browser () {
g_signal_connect (G_OBJECT (web_view), "load-committed", G_CALLBACK (load_commit_cb), web_view);
g_signal_connect (G_OBJECT (web_view), "load-committed", G_CALLBACK (log_history_cb), web_view);
g_signal_connect (G_OBJECT (web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), web_view);
+ g_signal_connect (G_OBJECT (web_view), "key-press-event", G_CALLBACK(key_press_cb), web_view);
return scrolled_window;
}
@@ -280,7 +338,7 @@ create_mainbar () {
uri_entry = gtk_entry_new();
gtk_entry_set_width_chars(GTK_ENTRY(uri_entry), 40);
gtk_entry_set_text(GTK_ENTRY(uri_entry), "http://");
- gtk_box_pack_start (GTK_BOX (mainbar), uri_entry, FALSE,TRUE , 0);
+ gtk_box_pack_start (GTK_BOX (mainbar), uri_entry, TRUE,TRUE , 0);
gtk_signal_connect_object (GTK_OBJECT (uri_entry), "activate", GTK_SIGNAL_FUNC (activate_uri_entry_cb), GTK_OBJECT (uri_entry));
//status_context_id = gtk_statusbar_get_context_id (main_statusbar, "Link Hover");
@@ -298,31 +356,94 @@ GtkWidget* create_window () {
return window;
}
-int main (int argc, char* argv[]) {
- gtk_init (&argc, &argv);
- if (!g_thread_supported ())
- g_thread_init (NULL);
+static void
+add_binding (char *binding, char *action, bool internal) {
+ Binding bind = {binding, action};
+ if (internal) {
+ internal_bindings[num_internal_bindings] = bind;
+ num_internal_bindings ++;
+ } else {
+ external_bindings[num_external_bindings] = bind;
+ num_external_bindings ++;
+ }
+}
+static void
+settings_init () {
GKeyFile* config = g_key_file_new ();
gboolean res = g_key_file_load_from_file (config, "./sampleconfig", G_KEY_FILE_NONE, NULL); //TODO: pass config file as argument
- if(res) {
- printf("config loaded\n");
+ if (res) {
+ printf ("Config loaded\n");
} else {
- fprintf(stderr,"config loading failed\n"); //TODO: exit codes with gtk?
+ fprintf (stderr, "Config loading failed\n"); //TODO: exit codes with gtk?
}
+
history_file = g_key_file_get_value (config, "behavior", "history_file", NULL);
- if(history_file) {
- printf("history file: %s\n",history_file);
+ if (history_file) {
+ printf ("History file: %s\n", history_file);
+ } else {
+ printf ("History logging disabled\n");
+ }
+
+ download_handler = g_key_file_get_value (config, "behavior", "download_handler", NULL);
+ if (download_handler) {
+ printf ("Download manager: %s\n", history_file);
} else {
- printf("history logging disabled\n");
+ printf ("Download manager disabled\n");
}
+ if (! fifodir)
+ fifodir = g_key_file_get_value (config, "behavior", "fifodir", NULL);
+ if (fifodir) {
+ printf ("Fifo directory: %s\n", history_file);
+ } else {
+ printf ("Fifo directory: /tmp\n");
+ }
+
+ always_insert_mode = g_key_file_get_value (config, "behavior", "always_insert_mode", NULL);
+ if (always_insert_mode) {
+ printf ("Always insert mode: %s\n", history_file);
+ } else {
+ printf ("Always insert mode disabled/\n");
+ }
+
+ modkey = g_key_file_get_value (config, "behavior", "modkey", NULL);
+ if (modkey) {
+ printf ("Mod key: %s\n", history_file);
+ } else {
+ printf ("Mod key disabled/\n");
+ }
+
+ gchar **keysi = g_key_file_get_keys (config, "bindings_internal", NULL, NULL);
+ int i = 0;
+ for (i = 0; keysi[i]; i++)
+ {
+ gchar *binding = g_key_file_get_string(config, "bindings_internal", keysi[i], NULL);
+ printf("Action: %s, Binding: %s (internal)\n", g_strdup (keysi[i]), binding);
+ add_binding (binding, g_strdup (keysi[i]), true);
+ }
+
+ gchar **keyse = g_key_file_get_keys (config, "bindings_external", NULL, NULL);
+ for (i = 0; keyse[i]; i++)
+ {
+ gchar *binding = g_key_file_get_string(config, "bindings_external", keyse[i], NULL);
+ printf("Action: %s, Binding: %s (external)\n", g_strdup (keyse[i]), binding);
+ add_binding (binding, g_strdup (keyse[i]), false);
+ }
+}
+
+int
+main (int argc, char* argv[]) {
+ gtk_init (&argc, &argv);
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
+
+ settings_init ();
+
GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), create_browser (), TRUE, TRUE, 0);
-
-
main_window = create_window ();
gtk_container_add (GTK_CONTAINER (main_window), vbox);
GError *error = NULL;
@@ -332,7 +453,6 @@ int main (int argc, char* argv[]) {
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_parse (context, &argc, &argv, &error);
-
webkit_web_view_load_uri (web_view, uri);
gtk_widget_grab_focus (GTK_WIDGET (web_view));
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 15:50:49 +0000