[hackers] [surf] Add different progress colors when using proxy. || Christoph Lohmann

From: <hg_AT_suckless.org>
Date: Wed, 31 Oct 2012 21:15:45 +0100 (CET)

changeset: 256:fa9098d48ad4
user: Christoph Lohmann <20h_AT_r-36.net>
date: Wed Oct 31 20:46:38 2012 +0100
files: config.def.h surf.c
description:
Add different progress colors when using proxy.


diff -r 8cae34fadf47 -r fa9098d48ad4 config.def.h
--- a/config.def.h Sun Oct 28 14:16:22 2012 +0100
+++ b/config.def.h Wed Oct 31 20:46:38 2012 +0100
_AT_@ -1,8 +1,11 @@
 /* modifier 0 means no modifier */
 static char *useragent = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
-static char *progress = "#0066FF";
-static char *progress_untrust = "#FF6600";
+static char *progress = "#0000FF";
+static char *progress_untrust = "#FF0000";
 static char *progress_trust = "#00FF00";
+static char *progress_proxy = "#FFFF00";
+static char *progress_proxy_trust = "#66FF00";
+static char *progress_proxy_untrust = "#FF6600";
 static char *stylefile = ".surf/style.css";
 static char *scriptfile = ".surf/script.js";
 static char *cookiefile = ".surf/cookies.txt";
_AT_@ -50,3 +53,4 @@
     { MODKEY, GDK_n, find, { .b = TRUE } },
     { MODKEY|GDK_SHIFT_MASK,GDK_n, find, { .b = FALSE } },
 };
+
diff -r 8cae34fadf47 -r fa9098d48ad4 surf.c
--- a/surf.c Sun Oct 28 14:16:22 2012 +0100
+++ b/surf.c Wed Oct 31 20:46:38 2012 +0100
_AT_@ -75,7 +75,7 @@
 static gboolean showxid = FALSE;
 static char winid[64];
 static char *progname;
-static gboolean loadimage = 1, plugin = 1, script = 1;
+static gboolean loadimage = 1, plugin = 1, script = 1, using_proxy = 0;
 
 static char *buildpath(const char *path);
 static gboolean buttonrelease(WebKitWebView *web, GdkEventButton *e, GList *gl);
_AT_@ -333,6 +333,7 @@
 drawindicator(Client *c) {
         gint width;
         const char *uri;
+ char *colorname;
         GtkWidget *w;
         GdkGC *gc;
         GdkColor fg;
_AT_@ -342,11 +343,20 @@
         width = c->progress * w->allocation.width / 100;
         gc = gdk_gc_new(w->window);
         if(strstr(uri, "https://") == uri) {
- gdk_color_parse(c->sslfailed ?
- progress_untrust : progress_trust, &fg);
+ if(using_proxy) {
+ colorname = c->sslfailed? progress_proxy_untrust : progress_proxy_trust;
+ } else {
+ colorname = c->sslfailed? progress_untrust : progress_trust;
+ }
         } else {
- gdk_color_parse(progress, &fg);
+ if(using_proxy) {
+ colorname = progress_proxy;
+ } else {
+ colorname = progress;
+ }
         }
+
+ gdk_color_parse(colorname, &fg);
         gdk_gc_set_rgb_fg_color(gc, &fg);
         gdk_draw_rectangle(w->window,
                         w->style->bg_gc[GTK_WIDGET_STATE(w)],
_AT_@ -816,6 +826,7 @@
                 g_object_set(G_OBJECT(s), "proxy-uri", puri, NULL);
                 soup_uri_free(puri);
                 g_free(new_proxy);
+ using_proxy = 1;
         }
 }
 
Received on Wed Oct 31 2012 - 21:15:45 CET