summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
1901359)
When navigating history, the document-loaded signal isn't triggered and
we can't directly get back the previous webview, so we have no other
choice than to look it up everytime a new message is received.
typedef struct Page {
guint64 id;
WebKitWebPage *webpage;
typedef struct Page {
guint64 id;
WebKitWebPage *webpage;
- WebKitDOMDOMWindow *view;
struct Page *next;
} Page;
struct Page *next;
} Page;
{
char msg[MSGBUFSZ];
gsize msgsz;
{
char msg[MSGBUFSZ];
gsize msgsz;
+ WebKitDOMDOMWindow *view;
GError *gerr = NULL;
glong wh, ww;
Page *p;
GError *gerr = NULL;
glong wh, ww;
Page *p;
if (p->id == msg[0])
break;
}
if (p->id == msg[0])
break;
}
+ if (!p || !(view = webkit_dom_document_get_default_view(
+ webkit_web_page_get_dom_document(p->webpage))))
return TRUE;
switch (msg[1]) {
case 'h':
return TRUE;
switch (msg[1]) {
case 'h':
- ww = webkit_dom_dom_window_get_inner_width(p->view);
- webkit_dom_dom_window_scroll_by(p->view,
+ ww = webkit_dom_dom_window_get_inner_width(view);
+ webkit_dom_dom_window_scroll_by(view,
(ww / 100) * msg[2], 0);
break;
case 'v':
(ww / 100) * msg[2], 0);
break;
case 'v':
- wh = webkit_dom_dom_window_get_inner_height(p->view);
- webkit_dom_dom_window_scroll_by(p->view,
+ wh = webkit_dom_dom_window_get_inner_height(view);
+ webkit_dom_dom_window_scroll_by(view,
0, (wh / 100) * msg[2]);
break;
}
0, (wh / 100) * msg[2]);
break;
}
-static void
-documentloaded(WebKitWebPage *wp, Page *p)
-{
- p->view = webkit_dom_document_get_default_view(
- webkit_web_page_get_dom_document(wp));
-}
-
static void
webpagecreated(WebKitWebExtension *e, WebKitWebPage *wp, gpointer unused)
{
Page *p = newpage(wp);
static void
webpagecreated(WebKitWebExtension *e, WebKitWebPage *wp, gpointer unused)
{
Page *p = newpage(wp);
-
- g_signal_connect(wp, "document-loaded", G_CALLBACK(documentloaded), p);