Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the reader threading model to do callbacks on the main thread.
[automanga.git]
/
manga
/
reader.py
diff --git
a/manga/reader.py
b/manga/reader.py
index
af27289
..
37972b4
100644
(file)
--- a/
manga/reader.py
+++ b/
manga/reader.py
@@
-23,17
+23,18
@@
class future(threading.Thread):
try:
val = self.value()
except Exception as e:
try:
val = self.value()
except Exception as e:
- with gtk.gdk.lock:
- self._exc = e
- for cb in self._notlist:
- cb()
- self._notlist = []
+ self._exc = e
+ gobject.idle_add(self._callcbs, True)
else:
else:
- with gtk.gdk.lock:
- self._val = [val]
- for cb in self._notlist:
- cb()
- self._notlist = []
+ self._val = [val]
+ gobject.idle_add(self._callcbs, True)
+
+ def _callcbs(self, final):
+ nls = []
+ for cb in self._notlist:
+ if cb():
+ nls.append(cb)
+ self._notlist = [] if final else nls
# Caller must hold GDK lock
def notify(self, cb):
# Caller must hold GDK lock
def notify(self, cb):
@@
-44,12
+45,7
@@
class future(threading.Thread):
cb()
def progcb(self):
cb()
def progcb(self):
- with gtk.gdk.lock:
- nls = []
- for cb in self._notlist:
- if cb():
- nls.append(cb)
- self._notlist = nls
+ gobject.idle_add(self._callcbs, False)
@property
def val(self):
@property
def val(self):
@@
-91,7
+87,11
@@
class imgload(future):
buf.extend(read)
self.progcb()
self.st = None
buf.extend(read)
self.progcb()
self.st = None
- return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf)))
+ with gtk.gdk.lock:
+ try:
+ return gtk.gdk.pixbuf_new_from_stream(gio.memory_input_stream_new_from_data(str(buf)))
+ finally:
+ gtk.gdk.flush()
@property
def prog(self):
@property
def prog(self):
@@
-112,7
+112,7
@@
class pagecache(object):
f = imgload(page)
self.bk.append((idl, f))
if len(self.bk) > self.sz:
f = imgload(page)
self.bk.append((idl, f))
if len(self.bk) > self.sz:
- self.bk = self.bk[-sz:]
+ self.bk = self.bk[-s
elf.s
z:]
return f
class relpageget(future):
return f
class relpageget(future):
@@
-185,7
+185,8
@@
class pageview(gtk.Widget):
self.window.set_user_data(None)
def do_size_request(self, req):
self.window.set_user_data(None)
def do_size_request(self, req):
- req.width, req.height = self.get_osize()
+ w, h = self.get_osize()
+ req.width, req.height = max(min(w, 4096), 0), max(min(h, 4096), 0)
def fitzoom(self):
w, h = self.get_osize()
def fitzoom(self):
w, h = self.get_osize()
@@
-428,6
+429,7
@@
class sbox(gtk.ComboBox):
self.set_active(0)
self.set_sensitive(False)
self.set_active(0)
self.set_sensitive(False)
+ self.set_focus_on_click(False)
self.bk.append([ptnode.name])
self.loadlist = procslot(self)
self.loadlist.set(loadplist(self.pnode))
self.bk.append([ptnode.name])
self.loadlist = procslot(self)
self.loadlist.set(loadplist(self.pnode))
@@
-435,7
+437,7
@@
class sbox(gtk.ComboBox):
def setlist(self, ls):
self.bk.clear()
for i, ch in enumerate(ls):
def setlist(self, ls):
self.bk.clear()
for i, ch in enumerate(ls):
- self.bk.append([
ch.name
])
+ self.bk.append([
"%i/%i: %s" % (i + 1, len(ls), ch.name)
])
self.set_active(self.pidx)
self.set_sensitive(True)
self.connect("changed", self.changed_cb)
self.set_active(self.pidx)
self.set_sensitive(True)
self.connect("changed", self.changed_cb)