diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | sampleconfig | 9 | ||||
| -rw-r--r-- | uzbl.c | 625 |
4 files changed, 361 insertions, 284 deletions
@@ -1,4 +1,9 @@ -all: - gcc -lpthread `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs --cflags webkit-1.0` `pkg-config --libs --cflags gdk-2.0` -Wall uzbl.c -o uzbl +CPPFLAGS=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) -Wall -W +LDFLAGS=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) +all: uzbl + test: ./uzbl --uri http://www.archlinux.org + +clean: + rm -f uzbl @@ -5,7 +5,7 @@ * do not store the 'http://' part in the history file * improve commandline arguments * have a better look at /merge the fifo code from barrucadu and friends - +* history logging broken. logs always starting url because i made uri const SOMEDAY: figure out caching with webkit and in general how we can speed everything diff --git a/sampleconfig b/sampleconfig index 4d25674..03e1e79 100644 --- a/sampleconfig +++ b/sampleconfig @@ -1,3 +1,4 @@ + # example uzbl config. in a real config, we should obey the xdg spec # all keys in the behavior group are optional. if not set, the corresponding behavior is disabed. @@ -18,9 +19,17 @@ modkey = Mod4 [bindings_internal] next = n +forward = m +stop = s +refresh = r +reload = R +home = h follow_link_here = f follow_link_new_tab = F follow_link_new_window = w +zoom_in = + +zoom_out = - + [bindings_external] ./extra/insert_bookmark.sh = b @@ -28,13 +28,12 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + +#define LENGTH(x) (sizeof x / sizeof x[0]) + #include <gtk/gtk.h> -#include <gdk/gdk.h> #include <gdk/gdkx.h> -#include <gdk/gdkkeys.h> -#include <gdk/gdkkeysyms.h> #include <webkit/webkit.h> - #include <pthread.h> #include <stdio.h> #include <string.h> @@ -43,362 +42,426 @@ #include <unistd.h> #include <stdlib.h> -static GtkWidget* main_window; -static GtkWidget* modeline; +static GtkWidget* main_window; +static GtkWidget* uri_entry; +static GtkWidget* mainbar; static WebKitWebView* web_view; +static gchar* main_title; +static gchar selected_url[500]; -static gchar* history_file; -static gchar* home_page; -static gchar* uri = NULL; -static gchar* fifodir = NULL; -static char fifopath[64]; -static bool modevis = false; -//static Window xwin = 0; +/* 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; +static Window xwin = 0; +static gchar* uri = NULL; + +static gboolean verbose = FALSE; static GOptionEntry entries[] = { - { "uri", 'u', 0, G_OPTION_ARG_STRING, &uri, "Uri to load", NULL }, - { "fifo-dir", 'd', 0, G_OPTION_ARG_STRING, &fifodir, "Directory to place FIFOs", NULL }, - { NULL } + { "uri", 'u', 0, G_OPTION_ARG_STRING, &uri, "Uri to load", NULL }, + { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, + { NULL } }; -struct command +typedef struct { - char command[256]; - void (*func)(WebKitWebView*); -}; + const char *command; + void (*func_1_param)(WebKitWebView*); + void (*func_2_params)(WebKitWebView*, char *); +} Command; -static struct command commands[256]; -static int numcmds = 0; - -struct alias +typedef struct { - char alias[256]; - char command[256]; -}; + const char *binding; + const char *action; +} Binding; -static struct alias aliases[256]; -static int numalias = 0; +static Binding internal_bindings[256]; +static Binding external_bindings[256]; +static int num_internal_bindings = 0; +static int num_external_bindings = 0; -static void parse_command(const char*); +static void +update_title (GtkWindow* window); -static bool parse_modeline (GtkWidget* mode, GdkEventKey* event) -{ - if ((event->type==GDK_KEY_PRESS) && (event->keyval==GDK_Return)) - parse_command (gtk_entry_get_text (GTK_ENTRY (modeline))); - - return false; -} -static void log_history_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) -{ - strncpy (uri, webkit_web_frame_get_uri (frame), strlen (webkit_web_frame_get_uri (frame))); - - FILE * output_file = fopen(history_file, "a"); - if (output_file == NULL) - { - fprintf(stderr, "Cannot open %s for logging\n", history_file); - } - else - { - time_t rawtime; - struct tm * timeinfo; - char buffer [80]; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - strftime (buffer,80,"%Y-%m-%d %H:%M:%S",timeinfo); - - fprintf(output_file, "%s %s\n",buffer, uri); - fclose(output_file); - } +/* --- CALLBACKS --- */ +static void +go_back_cb (GtkWidget* widget, gpointer data) { + webkit_web_view_go_back (web_view); } -static void toggle_command_mode () -{ - if (modevis) - { - gtk_widget_hide (modeline); - gtk_widget_grab_focus (GTK_WIDGET (web_view)); - } - else - { - gtk_widget_show (modeline); - gtk_widget_grab_focus (modeline); - } - modevis = ! modevis; +static void +go_forward_cb (GtkWidget* widget, gpointer data) { + webkit_web_view_go_forward (web_view); } -static gboolean key_press_cb (WebKitWebView* page, GdkEventKey* event) -{ - 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) && (event->keyval==GDK_Escape)) - { - toggle_command_mode (); - result=TRUE; + +static void +link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data) { + /* underflow is allowed */ + //gtk_statusbar_pop (main_statusbar, status_context_id); + //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); } - - return(result); -} + update_title (GTK_WINDOW (main_window)); -static GtkWidget* create_browser () -{ - GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_NEVER); +} - web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ()); - gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_view)); +static void +title_change_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar* title, gpointer data) { + if (main_title) + g_free (main_title); + main_title = g_strdup (title); + update_title (GTK_WINDOW (main_window)); +} - g_signal_connect (G_OBJECT (web_view), "load-committed", G_CALLBACK (log_history_cb), web_view); +static void +progress_change_cb (WebKitWebView* page, gint progress, gpointer data) { + load_progress = progress; + update_title (GTK_WINDOW (main_window)); +} - return scrolled_window; +static void +load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) { + const gchar* uri = webkit_web_frame_get_uri(frame); + if (uri) + gtk_entry_set_text (GTK_ENTRY (uri_entry), uri); } -static GtkWidget* create_window () -{ - GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); - gtk_widget_set_name (window, "Uzbl Browser"); - /*xwin = GDK_WINDOW_XID (GTK_WIDGET (main_window)->window); This segfaults for some reason */ - g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL); - g_signal_connect (G_OBJECT (window), "key-press-event", G_CALLBACK(key_press_cb), NULL); - - return window; +static void +destroy_cb (GtkWidget* widget, gpointer data) { + gtk_main_quit (); } -static GtkWidget* create_modeline () -{ - GtkWidget* modeline = gtk_entry_new (); - g_signal_connect (G_OBJECT (modeline), "key-press-event", G_CALLBACK(parse_modeline), modeline); +static void +activate_uri_entry_cb (GtkWidget* entry, gpointer data) { + const gchar * uri = gtk_entry_get_text (GTK_ENTRY (entry)); + g_assert (uri); + webkit_web_view_load_uri (web_view, uri); +} - return modeline; +static void +log_history_cb () { + FILE * output_file = fopen (history_file, "a"); + if (output_file == NULL) { + fprintf (stderr, "Cannot open %s for logging\n", history_file); + } else { + time_t rawtime; + struct tm * timeinfo; + char buffer [80]; + time ( &rawtime ); + timeinfo = localtime ( &rawtime ); + strftime (buffer, 80, "%Y-%m-%d %H:%M:%S", timeinfo); + + fprintf (output_file, "%s %s\n", buffer, uri); + fclose (output_file); + } } -static void parse_command(const char *command) +/* -- command to callback/function map for things we cannot attach to any signals */ +// TODO: reload, home, quit +static Command commands[] = { - int i = 0; - bool done = false; - char *cmdstr; - void (*func)(WebKitWebView*); - - strcpy(cmdstr, command); - - printf("Checking aliases\n"); - for (i = 0; i < numalias && ! done; i++) - { - if (!strncmp (cmdstr, aliases[i].alias, strlen (aliases[i].alias))) - { - strcpy(cmdstr, aliases[i].command); - done = true; - } - } + { "back", &go_back_cb, NULL }, + { "forward", &go_forward_cb, NULL }, + { "refresh", &webkit_web_view_reload, NULL }, //Buggy + { "stop", &webkit_web_view_stop_loading, NULL }, + { "zoom_in", &webkit_web_view_zoom_in, NULL }, //Can crash (when max zoom reached?). + { "zoom_out", &webkit_web_view_zoom_out, NULL } , + { "uri", NULL, &webkit_web_view_load_uri } +//{ "get uri", &webkit_web_view_get_uri}, +}; - done = false; - printf("Checking commands\n"); - for (i = 0; i < numcmds && ! done; i++) - { - if (!strncmp (cmdstr, commands[i].command, strlen (commands[i].command))) - { - func = commands[i].func; - done = true; +/* -- 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 + + Command *c_tmp; + for (i = 0; i < LENGTH (commands); i++) { + c_tmp = &commands[i]; + if (strncmp (command_name, c_tmp->command, strlen (c_tmp->command)) == 0) { + c = c_tmp; } } - - printf("Command identified as \"%s\"\n", cmdstr); - - if (done) - { - func (web_view); - } - else - { - if (!strncmp ("http://", command, 7)) - { - printf ("Loading URI \"%s\"\n", command); - strcpy(uri, command); - webkit_web_view_load_uri (web_view, uri); + if (c != NULL) { + if (c->func_2_params != NULL) { + 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); + c->func_1_param (web_view); + } else { + 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); + c->func_1_param (web_view); } + } else { + fprintf (stderr, "command \"%s\" not understood. ignoring.\n", command); } } - -static void *control_fifo() -{ - if (fifodir) - { - sprintf (fifopath, "%s/uzbl_%d", fifodir, getpid ()); - } - else - { - sprintf (fifopath, "/tmp/uzbl_%d", getpid ()); + +static void +*control_fifo() { + 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 ("Opened control fifo in %s\n", fifopath); - - while (true) - { - FILE *fifo = fopen(fifopath, "r"); - if (!fifo) - { - printf("Could not open %s for reading\n", fifopath); + + printf ("Control fifo opened in %s\n", fifopath); + + while (true) { + FILE *fifo = fopen (fifopath, "r"); + if (!fifo) { + 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")) - { + while (!feof (fifo) && fgets (buffer, sizeof (buffer), fifo)) { + if (strcmp (buffer, "\n")) { buffer[strlen (buffer) - 1] = '\0'; // Remove newline parse_command (buffer); - } - } - } + } + } + } return NULL; } - -static void add_command (char* cmdstr, void* function) -{ - strncpy (commands[numcmds].command, cmdstr, strlen (cmdstr)); - commands[numcmds].func = function; - numcmds++; + + +static void +setup_threading () { + pthread_t control_thread; + pthread_create(&control_thread, NULL, control_fifo, NULL); } -static void add_command_alias (char* alias, char* command) -{ - strncpy (aliases[numalias].alias, alias, strlen (alias)); - strncpy (aliases[numalias].command, command, strlen (command)); - numalias++; +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 void setup_gtk (int argc, char* argv[]) +static gboolean +key_press_cb (WebKitWebView* page, GdkEventKey* event) { - gtk_init (&argc, &argv); + 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; + } + } - GtkWidget* vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), create_browser (), TRUE, TRUE, 0); - modeline = create_modeline (); - gtk_box_pack_start (GTK_BOX (vbox), modeline, FALSE, FALSE, 0); + return(result); +} - main_window = create_window (); - gtk_container_add (GTK_CONTAINER (main_window), vbox); - GError *error = NULL; +static GtkWidget* +create_browser () { + GtkWidget* scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_NEVER); //todo: some sort of display of position/total length. like what emacs does - GOptionContext* context = g_option_context_new ("- The Usable Browser, controlled entirely through a FIFO"); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - g_option_context_parse (context, &argc, &argv, &error); + web_view = WEBKIT_WEB_VIEW (webkit_web_view_new ()); + gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (web_view)); - if (uri) - { - webkit_web_view_load_uri (web_view, uri); - } + g_signal_connect (G_OBJECT (web_view), "title-changed", G_CALLBACK (title_change_cb), web_view); + g_signal_connect (G_OBJECT (web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), web_view); + 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); - gtk_widget_grab_focus (GTK_WIDGET (web_view)); - gtk_widget_show_all (main_window); - gtk_widget_hide(modeline); - gtk_widget_grab_focus (GTK_WIDGET (web_view)); + return scrolled_window; } -static void setup_commands () -{ - //This func. is nice but currently it cannot be used for functions that require arguments or return data. --sentientswitch - - add_command("back", &webkit_web_view_go_back); - add_command("forward", &webkit_web_view_go_forward); - add_command("refresh", &webkit_web_view_reload); //Buggy - add_command("stop", &webkit_web_view_stop_loading); - add_command("zoom in", &webkit_web_view_zoom_in); //Can crash (when max zoom reached?). - add_command("zoom out", &webkit_web_view_zoom_out); //Crashes as zoom + - //add_command("get uri", &webkit_web_view_get_uri); -} +static GtkWidget* +create_mainbar () { + mainbar = gtk_hbox_new (FALSE, 0); + 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, TRUE,TRUE , 0); + gtk_signal_connect_object (GTK_OBJECT (uri_entry), "activate", GTK_SIGNAL_FUNC (activate_uri_entry_cb), GTK_OBJECT (uri_entry)); -static void setup_threading () -{ - pthread_t control_thread; - pthread_create(&control_thread, NULL, control_fifo, NULL); + //status_context_id = gtk_statusbar_get_context_id (main_statusbar, "Link Hover"); + + return mainbar; } -static void setup_settings () -{ - 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 +static +GtkWidget* create_window () { + GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_default_size (GTK_WINDOW (window), 800, 600); + gtk_widget_set_name (window, "Uzbl browser"); + g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (destroy_cb), NULL); - if (res) - { - printf ("Config loaded\n"); - } - else - { - fprintf (stderr, "config loading failed\n"); //TODO: exit codes with gtk? - } + return window; +} - history_file = g_key_file_get_value (config, "behavior", "history_file", NULL); - if (history_file) - { - printf ("Setting history file to: %s\n", history_file); +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 ++; } - else - { - printf ("History logging disabled\n"); +} + +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"); + } else { + fprintf (stderr, "Config loading failed\n"); //TODO: exit codes with gtk? } - home_page = g_key_file_get_value (config, "behavior", "home_page", NULL); - if (home_page) - { - printf ("Setting home page to: %s\n", home_page); + history_file = g_key_file_get_value (config, "behavior", "history_file", NULL); + if (history_file) { + printf ("History file: %s\n", history_file); + } else { + printf ("History logging disabled\n"); } - else - { - printf ("Home page 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 ("Download manager disabled\n"); } - /*GError *error = 0; - char *keys = g_key_file_get_keys (config, "alias", NULL, &error); + 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"); + } - if (error) - { - printf("Error: %n\n", error); + 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"); } - else - { - printf("Loading aliases\n"); - while (keys != NULL && (*keys) != NULL) - { - char* value = g_key_file_get_value (config, (gchar *)"alias", (*keys), NULL); - add_command_alias((*keys), value); - ++keys; - } + + 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"); } - Until segfaults is fixed, manually add aliases to test the rest of it. */ - add_command_alias("b", "back"); - add_command_alias("f", "forward"); - add_command_alias("z+", "zoom in"); - add_command_alias("z-", "zoom out"); - add_command_alias("r", "refresh"); - add_command_alias("s", "stop"); + 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[]) -{ - if (!g_thread_supported ()) - g_thread_init (NULL); +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; + + GOptionContext* context = g_option_context_new ("- some stuff here maybe someday"); + g_option_context_add_main_entries (context, entries, NULL); + 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); - setup_settings (); - setup_gtk (argc, argv); - setup_commands (); - setup_threading (); - gtk_main (); + gtk_widget_grab_focus (GTK_WIDGET (web_view)); + gtk_widget_show_all (main_window); + xwin = GDK_WINDOW_XID (GTK_WIDGET (main_window)->window); + printf("window_id %i\n",(int) xwin); + printf("pid %i\n", getpid ()); - printf ("Shutting down...\n"); + setup_threading (); - unlink (fifopath); + gtk_main (); - return 0; + unlink (fifopath); + return 0; } |