summaryrefslogtreecommitdiffstats
path: root/surf.c
diff options
context:
space:
mode:
Diffstat (limited to 'surf.c')
-rw-r--r--surf.c57
1 files changed, 46 insertions, 11 deletions
diff --git a/surf.c b/surf.c
index f43d848..bf489b9 100644
--- a/surf.c
+++ b/surf.c
@@ -29,7 +29,7 @@ union Arg {
} ;
typedef struct Client {
- GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar;
+ GtkWidget *win, *scroll, *vbox, *urlbar, *searchbar, *indicator;
WebKitWebView *view;
WebKitDownload *download;
gchar *title;
@@ -77,6 +77,8 @@ static void destroyclient(Client *c);
static void destroywin(GtkWidget* w, Client *c);
static void die(char *str);
static void download(WebKitDownload *o, GParamSpec *pspec, Client *c);
+static void drawindicator(Client *c);
+static gboolean exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c);
static gboolean initdownload(WebKitWebView *view, WebKitDownload *o, Client *c);
static gchar *geturi(Client *c);
static void hidesearch(Client *c, const Arg *arg);
@@ -107,7 +109,7 @@ static void showurl(Client *c, const Arg *arg);
static void stop(Client *c, const Arg *arg);
static void titlechange(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, Client *c);
static void usage();
-static void updatetitle(Client *c, const gchar *title);
+static void update(Client *c, const gchar *title);
static void zoom(Client *c, const Arg *arg);
#include "config.h"
@@ -174,6 +176,29 @@ die(char *str) {
}
void
+drawindicator(Client *c) {
+ GtkWidget *w;
+ gint width;
+
+ w = c->indicator;
+ width = c->progress * w->allocation.width / 100;
+ gdk_draw_rectangle(w->window,
+ w->style->fg_gc[GTK_WIDGET_STATE(w)],
+ TRUE,
+ 0, 0, w->allocation.width, w->allocation.height);
+ gdk_draw_rectangle(w->window,
+ w->style->bg_gc[GTK_WIDGET_STATE(w)],
+ TRUE,
+ 0, 0, width, w->allocation.height);
+}
+
+gboolean
+exposeindicator(GtkWidget *w, GdkEventExpose *e, Client *c) {
+ drawindicator(c);
+ return TRUE;
+}
+
+void
download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
WebKitDownloadStatus status;
@@ -181,7 +206,7 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
c->progress = (int)(webkit_download_get_progress(c->download)*100);
}
- updatetitle(c, NULL);
+ update(c, NULL);
}
gboolean
@@ -205,7 +230,7 @@ initdownload(WebKitWebView *view, WebKitDownload *o, Client *c) {
g_signal_connect(c->download, "notify::progress", G_CALLBACK(download), c);
g_signal_connect(c->download, "notify::status", G_CALLBACK(download), c);
webkit_download_start(c->download);
- updatetitle(c, filename);
+ update(c, filename);
g_free(html);
return TRUE;
}
@@ -260,7 +285,7 @@ linkhover(WebKitWebView* page, const gchar* t, const gchar* l, Client *c) {
if(l)
gtk_window_set_title(GTK_WINDOW(c->win), l);
else
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
@@ -277,7 +302,7 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
void
loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
c->progress = 0;
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
@@ -308,7 +333,7 @@ loadfile(Client *c, const gchar *f) {
arg.v = uri = g_strdup_printf("file://%s", f);
loaduri(c, &arg);
}
- updatetitle(c, uri);
+ update(c, uri);
g_free(uri);
}
@@ -322,7 +347,7 @@ loaduri(Client *c, const Arg *arg) {
: g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
- updatetitle(c, u);
+ update(c, u);
g_free(u);
}
@@ -376,6 +401,12 @@ newclient(void) {
c->searchbar = gtk_entry_new();
gtk_entry_set_has_frame(GTK_ENTRY(c->searchbar), FALSE);
+ /* indicator */
+ c->indicator = gtk_drawing_area_new();
+ gtk_widget_set_size_request(c->indicator, 800, 5);
+ g_signal_connect (G_OBJECT (c->indicator), "expose_event",
+ G_CALLBACK (exposeindicator), c);
+
/* downloadbar */
/* Arranging */
@@ -384,15 +415,18 @@ newclient(void) {
gtk_container_add(GTK_CONTAINER(c->vbox), c->scroll);
gtk_container_add(GTK_CONTAINER(c->vbox), c->searchbar);
gtk_container_add(GTK_CONTAINER(c->vbox), c->urlbar);
+ gtk_container_add(GTK_CONTAINER(c->vbox), c->indicator);
/* Setup */
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->urlbar, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->searchbar, FALSE, FALSE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing(GTK_BOX(c->vbox), c->indicator, FALSE, FALSE, 0, GTK_PACK_START);
gtk_box_set_child_packing(GTK_BOX(c->vbox), c->scroll, TRUE, TRUE, 0, GTK_PACK_START);
gtk_widget_grab_focus(GTK_WIDGET(c->view));
gtk_widget_hide_all(c->searchbar);
gtk_widget_hide_all(c->urlbar);
gtk_widget_show(c->vbox);
+ gtk_widget_show(c->indicator);
gtk_widget_show(c->scroll);
gtk_widget_show(GTK_WIDGET(c->view));
gtk_widget_show(c->win);
@@ -458,7 +492,7 @@ print(Client *c, const Arg *arg) {
void
progresschange(WebKitWebView* view, gint p, Client *c) {
c->progress = p;
- updatetitle(c, NULL);
+ update(c, NULL);
}
void
@@ -535,7 +569,7 @@ stop(Client *c, const Arg *arg) {
void
titlechange(WebKitWebView *v, WebKitWebFrame *f, const gchar *t, Client *c) {
- updatetitle(c, t);
+ update(c, t);
}
void
@@ -545,7 +579,7 @@ usage() {
}
void
-updatetitle(Client *c, const char *title) {
+update(Client *c, const char *title) {
gchar *t;
if(title) {
@@ -557,6 +591,7 @@ updatetitle(Client *c, const char *title) {
t = g_strdup(c->title);
else
t = g_strdup_printf("%s [%i%%]", c->title, c->progress);
+ drawindicator(c);
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2026-04-18 14:18:23 +0000
/+2 2015-01-26Describe the web page indicators too.Gravatar Christoph Lohmann 1-0/+1 2015-01-26It wasn't really clear what was meant with site indicators in the manpage.Gravatar Christoph Lohmann 1-0/+1 2015-01-26surf: documented indicators in man pageGravatar Greg Reagle 1-0/+50 Patch attached. -- http://www.fastmail.com - The professional email service From 4a64624fee94c16c093d2b192389bad9bd6675d8 Mon Sep 17 00:00:00 2001 From: Greg Reagle <greg.reagle@umbc.edu> Date: Mon, 26 Jan 2015 14:29:05 -0500 Subject: [PATCH] Documented indicators Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-20fix stylesheet interna.Gravatar Markus Teich 1-19/+12 * no more segfault when running `surf -m` * allow to enable custom styles after `surf -m` with mod+shift+m * use enablestyles instead of the webkit-setting, which clears things up a bit Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-20Only plumb some URI, when it's ASCII.Gravatar Christoph Lohmann 1-1/+10 2015-01-20Oh my blob!Gravatar Christoph Lohmann 1-0/+1 Adding blob: to the URIS handled by the browser. 2015-01-19Data: is part of the browser too.Gravatar Christoph Lohmann 1-0/+1 2015-01-19file:// should be handled in surf too.Gravatar Christoph Lohmann 1-0/+1 2015-01-19Remove the debugging from the testing.Gravatar Christoph Lohmann 1-1/+0 2015-01-19Add some description for the plumb feature.Gravatar Christoph Lohmann 1-0/+3 2015-01-19Add plumbing functionality.Gravatar Christoph Lohmann 2-2/+28 2015-01-18Add a comment about how the styles are iterated.Gravatar Christoph Lohmann 1-0/+4 Thanks quing for noticing. 2015-01-18My CMD was too short. :OGravatar Christoph Lohmann 1-1/+1 Thanks Carlos Torres for mentioning this. 2015-01-17Add the manpage changes for the disk cache support.Gravatar Christoph Lohmann 1-1/+7 2015-01-17Adding disk cache support for soup.Gravatar Christoph Lohmann 2-9/+40 This is a merge of the patch of Ben Woolley <tautolog@gmail.com> 2015-01-17Fix extra newline, and add -g where other switches are forwarded.Gravatar Ben Woolley 1-1/+3 Signed-off-by: Christoph Lohmann <20h@r-36.net> 2015-01-17Newer libc want _DEFAULT_SOURCE.Gravatar Christoph Lohmann 1-1/+1 2015-01-17Major styles update.Gravatar Christoph Lohmann 3-11/+84 In config.h there is now some styles array to apply site-specific styles. This can be toggled using the -mM flags. If a stylefile is manually specified, then this will overwrite everything. 2015-01-02Fix a typo in surf manual.Gravatar Jakukyo Friel 1-1/+1 `Ctrl-/` displays incorrectly in `man surf` on my machine. A patch is attached. (You also access it here: https://github.com/weakish/surf/commit/07e97eccedd96eabf14b2fbf77de75ec1b594d97) ---- surf.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Christoph Lohmann <20h@r-36.net> 2014-09-28Minor style change.Gravatar Christoph Lohmann 1-1/+1 2014-09-28Make »Copy image address« work.Gravatar Christoph Lohmann 1-3/+10 Thanks yui@blekksprut.net for the patch! 2014-08-07Mention xdotool in SEE ALSO too.Gravatar Christoph Lohmann 1-1/+2 2014-08-07Fix the manpage about xid.Gravatar Christoph Lohmann 1-1/+3 Something was missing from this one sentence. Now it is complete.