Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6fcb0d498f8f5c39a94a8d0c79e425b480c272bc
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6fcb0d498f8f5c39a94a8d0c79e425b480c272bc
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6fcb0d498f8f5c39a94a8d0c79e425b480c272bc
The branch, master has been updated
via 6fcb0d498f8f5c39a94a8d0c79e425b480c272bc (commit)
via 77814588a8177735d8552fd3f11a97c0e8250f01 (commit)
from 6ff3238825f21e0abec37b1d485318648d824cab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6fcb0d498f8f5c39a94a8d0c79e425b480c272bc
commit 6fcb0d498f8f5c39a94a8d0c79e425b480c272bc
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Update farmer a little ready for later
diff --git a/frontends/monkey/farmer.py b/frontends/monkey/farmer.py
index c79b530..80bc8e6 100644
--- a/frontends/monkey/farmer.py
+++ b/frontends/monkey/farmer.py
@@ -56,6 +56,7 @@ class MonkeyFarmer(asyncore.dispatcher):
self.deadmonkey = False
self.online = online
self.quiet = quiet
+ self.discussion = []
def handle_connect(self):
pass
@@ -82,6 +83,7 @@ class MonkeyFarmer(asyncore.dispatcher):
cmd = (" ".join(args))
if not self.quiet:
print(">>> {}".format(cmd))
+ self.discussion.append((">",cmd))
cmd = cmd + "\n"
self.buffer += cmd.encode('utf-8')
@@ -89,6 +91,7 @@ class MonkeyFarmer(asyncore.dispatcher):
line = line.decode('utf-8')
if not self.quiet:
print("<<< {}".format(line))
+ self.discussion.append(("<", line))
self.online(line)
def schedule_event(self, event, secs=None, when=None):
@@ -128,6 +131,11 @@ class Browser:
self.farmer = MonkeyFarmer(online=self.on_monkey_line, quiet=quiet)
self.windows = {}
self.current_draw_target = None
+ self.started = False
+ self.stopped = False
+ self.launchurl = None
+ while not self.started:
+ self.farmer.loop(once=True)
def pass_options(self, *opts):
if len(opts) > 0:
@@ -145,9 +153,18 @@ class Browser:
def quit_and_wait(self):
self.quit()
self.farmer.loop()
+ return self.stopped
def handle_GENERIC(self, what, *args):
- pass
+ if what == 'STARTED':
+ self.started = True
+ elif what == 'FINISHED':
+ self.stopped = True
+ elif what == 'LAUNCH':
+ self.launchurl = args[1]
+ else:
+ # TODO: Nothing for now?
+ pass
def handle_WINDOW(self, action, _win, winid, *args):
if action == "NEW":
@@ -210,6 +227,7 @@ class BrowserWindow:
else:
self.browser.farmer.tell_monkey("WINDOW GO %s %s %s" % (
self.winid, url, referer))
+ self.wait_start_loading()
def reload(self):
self.browser.farmer.tell_monkey("WINDOW RELOAD %s" % self.winid)
@@ -304,13 +322,12 @@ class BrowserWindow:
self.go(url, referer)
self.wait_loaded()
- def reload(self):
- self.browser.farmer.tell_monkey("WINDOW RELOAD %s" % self.winid)
- self.wait_loaded()
-
- def wait_loaded(self):
+ def wait_start_loading(self):
while not self.throbbing:
self.browser.farmer.loop(once=True)
+
+ def wait_loaded(self):
+ self.wait_start_loading()
while self.throbbing:
self.browser.farmer.loop(once=True)
@@ -369,3 +386,7 @@ for cmd in cmds:
print("{} {} -> {}".format(x,y,rest))
browser.quit_and_wait()
+
+#print("Discussion was:")
+#for line in browser.farmer.discussion:
+# print("{} {}".format(line[0], line[1]))
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=77814588a8177735d8552fd3f11a97c0e8250f01
commit 77814588a8177735d8552fd3f11a97c0e8250f01
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Correct wrong MOUT_ERROR to MOUT_WINDOW
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index b93d491..69459fb 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -480,7 +480,7 @@ monkey_window_handle_redraw(int argc, char **argv)
NSLOG(netsurf, INFO, "Issue redraw");
moutf(MOUT_WINDOW, "REDRAW WIN %d START", atoi(argv[2]));
browser_window_redraw(gw->bw, gw->scrollx, gw->scrolly, &clip, &ctx);
- moutf(MOUT_ERROR, "REDRAW WIN %d STOP", atoi(argv[2]));
+ moutf(MOUT_WINDOW, "REDRAW WIN %d STOP", atoi(argv[2]));
}
static void
-----------------------------------------------------------------------
Summary of changes:
frontends/monkey/browser.c | 2 +-
frontends/monkey/farmer.py | 33 +++++++++++++++++++++++++++------
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c
index b93d491..69459fb 100644
--- a/frontends/monkey/browser.c
+++ b/frontends/monkey/browser.c
@@ -480,7 +480,7 @@ monkey_window_handle_redraw(int argc, char **argv)
NSLOG(netsurf, INFO, "Issue redraw");
moutf(MOUT_WINDOW, "REDRAW WIN %d START", atoi(argv[2]));
browser_window_redraw(gw->bw, gw->scrollx, gw->scrolly, &clip, &ctx);
- moutf(MOUT_ERROR, "REDRAW WIN %d STOP", atoi(argv[2]));
+ moutf(MOUT_WINDOW, "REDRAW WIN %d STOP", atoi(argv[2]));
}
static void
diff --git a/frontends/monkey/farmer.py b/frontends/monkey/farmer.py
index c79b530..80bc8e6 100644
--- a/frontends/monkey/farmer.py
+++ b/frontends/monkey/farmer.py
@@ -56,6 +56,7 @@ class MonkeyFarmer(asyncore.dispatcher):
self.deadmonkey = False
self.online = online
self.quiet = quiet
+ self.discussion = []
def handle_connect(self):
pass
@@ -82,6 +83,7 @@ class MonkeyFarmer(asyncore.dispatcher):
cmd = (" ".join(args))
if not self.quiet:
print(">>> {}".format(cmd))
+ self.discussion.append((">",cmd))
cmd = cmd + "\n"
self.buffer += cmd.encode('utf-8')
@@ -89,6 +91,7 @@ class MonkeyFarmer(asyncore.dispatcher):
line = line.decode('utf-8')
if not self.quiet:
print("<<< {}".format(line))
+ self.discussion.append(("<", line))
self.online(line)
def schedule_event(self, event, secs=None, when=None):
@@ -128,6 +131,11 @@ class Browser:
self.farmer = MonkeyFarmer(online=self.on_monkey_line, quiet=quiet)
self.windows = {}
self.current_draw_target = None
+ self.started = False
+ self.stopped = False
+ self.launchurl = None
+ while not self.started:
+ self.farmer.loop(once=True)
def pass_options(self, *opts):
if len(opts) > 0:
@@ -145,9 +153,18 @@ class Browser:
def quit_and_wait(self):
self.quit()
self.farmer.loop()
+ return self.stopped
def handle_GENERIC(self, what, *args):
- pass
+ if what == 'STARTED':
+ self.started = True
+ elif what == 'FINISHED':
+ self.stopped = True
+ elif what == 'LAUNCH':
+ self.launchurl = args[1]
+ else:
+ # TODO: Nothing for now?
+ pass
def handle_WINDOW(self, action, _win, winid, *args):
if action == "NEW":
@@ -210,6 +227,7 @@ class BrowserWindow:
else:
self.browser.farmer.tell_monkey("WINDOW GO %s %s %s" % (
self.winid, url, referer))
+ self.wait_start_loading()
def reload(self):
self.browser.farmer.tell_monkey("WINDOW RELOAD %s" % self.winid)
@@ -304,13 +322,12 @@ class BrowserWindow:
self.go(url, referer)
self.wait_loaded()
- def reload(self):
- self.browser.farmer.tell_monkey("WINDOW RELOAD %s" % self.winid)
- self.wait_loaded()
-
- def wait_loaded(self):
+ def wait_start_loading(self):
while not self.throbbing:
self.browser.farmer.loop(once=True)
+
+ def wait_loaded(self):
+ self.wait_start_loading()
while self.throbbing:
self.browser.farmer.loop(once=True)
@@ -369,3 +386,7 @@ for cmd in cmds:
print("{} {} -> {}".format(x,y,rest))
browser.quit_and_wait()
+
+#print("Discussion was:")
+#for line in browser.farmer.discussion:
+# print("{} {}".format(line[0], line[1]))
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
