static GtkWidget* mainbar;
static WebKitWebView* web_view;
static gchar* main_title;
-static gchar* history_file;
-static gchar* fifodir = NULL;
+
+/* Behaviour variables */
+static gchar* history_file = NULL;
+static gchar* fifo_dir = 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 = NULL;
+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 },
static int numcmds = 0;
static void
-parse_command(const char *command)
-{
+update_title (GtkWindow* window);
+
+
+/* --- CALLBACKS --- */
+
+static void
+go_back_cb (GtkWidget* widget, gpointer data) {
+ webkit_web_view_go_back (web_view);
+}
+
+static void
+go_forward_cb (GtkWidget* widget, gpointer data) {
+ webkit_web_view_go_forward (web_view);
+}
+
+
+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..
+}
+
+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));
+}
+
+static void
+progress_change_cb (WebKitWebView* page, gint progress, gpointer data) {
+ load_progress = progress;
+ update_title (GTK_WINDOW (main_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 void
+destroy_cb (GtkWidget* widget, gpointer data) {
+ gtk_main_quit ();
+}
+
+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);
+}
+
+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);
+ }
+}
+
+
+/* -- CORE FUNCTIONS -- */
+
+static void
+parse_command(const char *command) {
int i = 0;
bool done = false;
char *cmdstr;
strcpy(cmdstr, command);
- done = false;
- printf("Checking commands\n");
- for (i = 0; i < numcmds && ! done; i++)
- {
- if (!strncmp (cmdstr, commands[i].command, strlen (commands[i].command)))
- {
+ for (i = 0; i < numcmds && ! done; i++) {
+ if (!strncmp (cmdstr, commands[i].command, strlen (commands[i].command))) {
func = commands[i].func;
done = true;
}
}
- printf("Command identified as \"%s\"\n", cmdstr);
+ printf("command received: \"%s\"\n", cmdstr);
- if (done)
- {
+ if (done) {
func (web_view);
- }
- else
- {
- if (!strncmp ("http://", command, 7))
- {
+ } else {
+ if (!strncmp ("http://", command, 7)) {
printf ("Loading URI \"%s\"\n", command);
strcpy(uri, command);
webkit_web_view_load_uri (web_view, uri);
}
static void
-*control_fifo()
-{
- if (fifodir)
- {
- sprintf (fifopath, "%s/uzbl_%d", fifodir, getpid ());
- }
- else
- {
- sprintf (fifopath, "/tmp/uzbl_%d", getpid ());
+*control_fifo() {
+ if (fifo_dir) {
+ sprintf (fifopath, "%s/uzbl_%d", fifo_dir, (int) xwin);
+ } else {
+ sprintf (fifopath, "/tmp/uzbl_%d", (int) xwin);
}
- if (mkfifo (fifopath, 0666) == -1)
- {
+ if (mkfifo (fifopath, 0666) == -1) {
printf ("Possible error creating fifo\n");
}
- printf ("Opened control fifo in %s\n", fifopath);
+ printf ("ontrol fifo opened in %s\n", fifopath);
- while (true)
- {
+ while (true) {
FILE *fifo = fopen(fifopath, "r");
- if (!fifo)
- {
+ 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);
}
}
static void
-add_command (char* cmdstr, void* function)
-{
+add_command (char* cmdstr, void* function) {
strncpy (commands[numcmds].command, cmdstr, strlen (cmdstr));
commands[numcmds].func = function;
numcmds++;
}
static void
-setup_commands ()
-{
+setup_commands () {
// This func. is nice but currently it cannot be used for functions that require arguments or return data. --sentientswitch
// TODO: reload, home
- add_command("back", &webkit_web_view_go_back);
- add_command("forward", &webkit_web_view_go_forward);
+ add_command("back", &go_back_cb);
+ add_command("forward", &go_forward_cb);
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("zoom_out", &webkit_web_view_zoom_out);
//add_command("get uri", &webkit_web_view_get_uri);
}
static void
-setup_threading ()
-{
+setup_threading () {
pthread_t control_thread;
pthread_create(&control_thread, NULL, control_fifo, NULL);
}
-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
-activate_uri_entry_cb (GtkWidget* entry, gpointer data)
-{
- uri = gtk_entry_get_text (GTK_ENTRY (entry));
- g_assert (uri);
- webkit_web_view_load_uri (web_view, uri);
-}
static void
-update_title (GtkWindow* window)
-{
+update_title (GtkWindow* window) {
GString* string = g_string_new (main_title);
g_string_append (string, " - Uzbl browser");
if (load_progress < 100)
g_free (title);
}
-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..
-}
-
-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));
-}
-
-static void
-progress_change_cb (WebKitWebView* page, gint progress, gpointer data)
-{
- load_progress = progress;
- update_title (GTK_WINDOW (main_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 void
-destroy_cb (GtkWidget* widget, gpointer data)
-{
- gtk_main_quit ();
-}
-
-static void
-go_back_cb (GtkWidget* widget, gpointer data)
-{
- webkit_web_view_go_back (web_view);
-}
-
-static void
-go_forward_cb (GtkWidget* widget, gpointer data)
-{
- webkit_web_view_go_forward (web_view);
-}
-
static GtkWidget*
-create_browser ()
-{
+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
}
static GtkWidget*
-create_mainbar ()
-{
+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, 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");
}
static
-GtkWidget* create_window ()
-{
+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");
return window;
}
-int main (int argc, char* argv[])
-{
- gtk_init (&argc, &argv);
- if (!g_thread_supported ())
- g_thread_init (NULL);
-
+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("setting history file to: %s\n",history_file);
+ if (history_file) {
+ printf ("History file: %s\n", history_file);
} else {
- printf("history logging disabled\n");
+ printf ("History logging disabled\n");
}
- 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);
+ 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");
+ }
+
+ if (! fifo_dir)
+ fifo_dir = g_key_file_get_value (config, "behavior", "fifo_dir", NULL);
+ if (fifo_dir) {
+ 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");
+ }
+}
+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_browser (), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), create_mainbar (), FALSE, TRUE, 0);
main_window = create_window ();
gtk_container_add (GTK_CONTAINER (main_window), vbox);
- GError *error = NULL;
+ 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);
+ 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);
gtk_widget_grab_focus (GTK_WIDGET (web_view));
gtk_widget_show_all (main_window);
xwin = GDK_WINDOW_XID (GTK_WIDGET (main_window)->window);
- printf("My X window id is %i\n",(int) xwin);
-
+ printf("window_id %i\n",(int) xwin);
+ printf("pid %i\n", getpid ());
setup_commands ();
setup_threading ();
projects / uzbl-mobile / blobdiff