tusing gint instead of int (insane API, but ok.) - surf - customized build of s… | |
git clone git://src.adamsgaard.dk/surf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 4dbf90e0d7846bfdfa93564b6ec85068367f2008 | |
parent 4cbfddf15907c96b55ac3381c9a402260a96ce9f | |
Author: Enno Boland (tox) <[email protected]> | |
Date: Mon, 7 Sep 2009 15:10:25 +0200 | |
using gint instead of int (insane API, but ok.) | |
Diffstat: | |
M surf.c | 31 ++++++++++++-----------------… | |
1 file changed, 12 insertions(+), 19 deletions(-) | |
--- | |
diff --git a/surf.c b/surf.c | |
t@@ -23,8 +23,7 @@ Atom urlprop; | |
typedef union Arg Arg; | |
union Arg { | |
const gboolean b; | |
- const int i; | |
- const unsigned int ui; | |
+ const gint i; | |
const void *v; | |
} ; | |
t@@ -68,7 +67,7 @@ gboolean embed = FALSE; | |
gboolean showxid = FALSE; | |
gboolean ignore_once = FALSE; | |
extern char *optarg; | |
-extern int optind; | |
+extern gint optind; | |
static void cleanup(void); | |
static void proccookies(SoupMessage *m, Client *c); | |
t@@ -177,30 +176,24 @@ die(char *str) { | |
void | |
drawindicator(Client *c) { | |
- GtkWidget *w; | |
gint width; | |
- GdkGC *gc; | |
gchar *uri; | |
+ GtkWidget *w; | |
+ GdkGC *gc; | |
GdkColor fg; | |
- | |
uri = geturi(c); | |
w = c->indicator; | |
width = c->progress * w->allocation.width / 100; | |
- | |
gc = gdk_gc_new(w->window); | |
- | |
gdk_color_parse(strstr(uri, "https://") == uri ? | |
progress_trust : progress, &fg); | |
gdk_gc_set_rgb_fg_color(gc, &fg); | |
gdk_draw_rectangle(w->window, | |
w->style->bg_gc[GTK_WIDGET_STATE(w)], | |
- TRUE, | |
- 0, 0, w->allocation.width, w->allocation.height); | |
- gdk_draw_rectangle(w->window, | |
- gc, | |
- TRUE, | |
- 0, 0, width, w->allocation.height); | |
+ TRUE, 0, 0, w->allocation.width, w->allocation.height); | |
+ gdk_draw_rectangle(w->window, gc, TRUE, 0, 0, width, | |
+ w->allocation.height); | |
g_object_unref(gc);/*g_free(gc);*/ | |
} | |
t@@ -216,7 +209,7 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) { | |
status = webkit_download_get_status(c->download); | |
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLO… | |
- c->progress = (int)(webkit_download_get_progress(c->download)*… | |
+ c->progress = (gint)(webkit_download_get_progress(c->download)… | |
} | |
update(c, NULL); | |
} | |
t@@ -270,7 +263,7 @@ hideurl(Client *c, const Arg *arg) { | |
gboolean | |
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) { | |
- unsigned int i, focus; | |
+ guint i, focus; | |
gboolean processed = FALSE; | |
if(ev->type != GDK_KEY_PRESS) | |
t@@ -450,7 +443,7 @@ newclient(void) { | |
c->next = clients; | |
clients = c; | |
if(showxid) | |
- printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)… | |
+ printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->windo… | |
return c; | |
} | |
t@@ -473,7 +466,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) { | |
Client *c = (Client *)d; | |
XPropertyEvent *ev; | |
Atom adummy; | |
- int idummy; | |
+ gint idummy; | |
unsigned long ldummy; | |
unsigned char *buf = NULL; | |
Arg arg; | |
t@@ -622,7 +615,7 @@ zoom(Client *c, const Arg *arg) { | |
int main(int argc, char *argv[]) { | |
SoupSession *s; | |
Client *c; | |
- int o; | |
+ gint o; | |
const gchar *home, *filename; | |
Arg arg; | |