pinosaur
/
surf.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied patch from pancake
[surf.git]
/
surf.c
diff --git
a/surf.c
b/surf.c
index
bf489b9
..
deb916f
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-17,14
+17,14
@@
#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
#include <glib/gstdio.h>
#define LENGTH(x) (sizeof x / sizeof x[0])
+#define CLEANMASK(mask) (mask & ~(GDK_MOD2_MASK))
Display *dpy;
Atom urlprop;
typedef union Arg Arg;
union Arg {
const gboolean b;
Display *dpy;
Atom urlprop;
typedef union Arg Arg;
union Arg {
const gboolean b;
- const int i;
- const unsigned int ui;
+ const gint i;
const void *v;
} ;
const void *v;
} ;
@@
-68,7
+68,7
@@
gboolean embed = FALSE;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
extern char *optarg;
gboolean showxid = FALSE;
gboolean ignore_once = FALSE;
extern char *optarg;
-extern int optind;
+extern
g
int optind;
static void cleanup(void);
static void proccookies(SoupMessage *m, Client *c);
static void cleanup(void);
static void proccookies(SoupMessage *m, Client *c);
@@
-177,19
+177,25
@@
die(char *str) {
void
drawindicator(Client *c) {
void
drawindicator(Client *c) {
- GtkWidget *w;
gint width;
gint width;
+ gchar *uri;
+ GtkWidget *w;
+ GdkGC *gc;
+ GdkColor fg;
+ uri = geturi(c);
w = c->indicator;
width = c->progress * w->allocation.width / 100;
w = c->indicator;
width = c->progress * w->allocation.width / 100;
- g
dk_draw_rectangle(w->window,
- w->style->fg_gc[GTK_WIDGET_STATE(w)],
- TRUE,
-
0, 0, w->allocation.width, w->allocation.height
);
+ g
c = 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)],
gdk_draw_rectangle(w->window,
w->style->bg_gc[GTK_WIDGET_STATE(w)],
- 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);*/
}
gboolean
}
gboolean
@@
-204,7
+210,7
@@
download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
status = webkit_download_get_status(c->download);
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
status = webkit_download_get_status(c->download);
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
- c->progress = (int)(webkit_download_get_progress(c->download)*100);
+ c->progress = (
g
int)(webkit_download_get_progress(c->download)*100);
}
update(c, NULL);
}
}
update(c, NULL);
}
@@
-258,7
+264,7
@@
hideurl(Client *c, const Arg *arg) {
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
gboolean
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
-
unsigned
int i, focus;
+
gu
int i, focus;
gboolean processed = FALSE;
if(ev->type != GDK_KEY_PRESS)
gboolean processed = FALSE;
if(ev->type != GDK_KEY_PRESS)
@@
-271,7
+277,8
@@
keypress(GtkWidget* w, GdkEventKey *ev, Client *c) {
focus = BROWSER;
for(i = 0; i < LENGTH(keys); i++) {
if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
focus = BROWSER;
for(i = 0; i < LENGTH(keys); i++) {
if(focus & keys[i].focus && ev->keyval == keys[i].keyval &&
- (ev->state == keys[i].mod || ev->state & keys[i].mod)
+ (CLEANMASK(ev->state) == keys[i].mod ||
+ CLEANMASK(ev->state) & keys[i].mod)
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
processed = TRUE;
&& keys[i].func) {
keys[i].func(c, &(keys[i].arg));
processed = TRUE;
@@
-403,7
+410,7
@@
newclient(void) {
/* indicator */
c->indicator = gtk_drawing_area_new();
/* indicator */
c->indicator = gtk_drawing_area_new();
- gtk_widget_set_size_request(c->indicator,
800, 5
);
+ gtk_widget_set_size_request(c->indicator,
0, 2
);
g_signal_connect (G_OBJECT (c->indicator), "expose_event",
G_CALLBACK (exposeindicator), c);
g_signal_connect (G_OBJECT (c->indicator), "expose_event",
G_CALLBACK (exposeindicator), c);
@@
-437,8
+444,11
@@
newclient(void) {
c->title = NULL;
c->next = clients;
clients = c;
c->title = NULL;
c->next = clients;
clients = c;
- if(showxid)
- printf("%u\n", (unsigned int)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ if(showxid) {
+ gdk_display_sync(gtk_widget_get_display(c->win));
+ printf("%u\n", (guint)GDK_WINDOW_XID(GTK_WIDGET(c->win)->window));
+ fflush(NULL);
+ }
return c;
}
return c;
}
@@
-461,7
+471,7
@@
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
Client *c = (Client *)d;
XPropertyEvent *ev;
Atom adummy;
Client *c = (Client *)d;
XPropertyEvent *ev;
Atom adummy;
- int idummy;
+
g
int idummy;
unsigned long ldummy;
unsigned char *buf = NULL;
Arg arg;
unsigned long ldummy;
unsigned char *buf = NULL;
Arg arg;
@@
-610,7
+620,7
@@
zoom(Client *c, const Arg *arg) {
int main(int argc, char *argv[]) {
SoupSession *s;
Client *c;
int main(int argc, char *argv[]) {
SoupSession *s;
Client *c;
- int o;
+
g
int o;
const gchar *home, *filename;
Arg arg;
const gchar *home, *filename;
Arg arg;
@@
-649,8
+659,6
@@
int main(int argc, char *argv[]) {
/* make dirs */
home = g_get_home_dir();
/* make dirs */
home = g_get_home_dir();
- filename = g_build_filename(home, ".surf", NULL);
- g_mkdir_with_parents(filename, 0711);
filename = g_build_filename(home, ".surf", "dl", NULL);
g_mkdir_with_parents(filename, 0755);
filename = g_build_filename(home, ".surf", "dl", NULL);
g_mkdir_with_parents(filename, 0755);