@@ -38,7 +38,7 @@ class _Canvas(object): | |||||
return "<CacaCanvas %dx%d>" % (self.get_width(), self.get_height()) | return "<CacaCanvas %dx%d>" % (self.get_width(), self.get_height()) | ||||
def __del__(self): | def __del__(self): | ||||
if self._cv > 0: | |||||
if self._cv > 0 and _lib is not None: | |||||
self._free() | self._free() | ||||
def _free(self): | def _free(self): | ||||
@@ -32,7 +32,7 @@ class _Display(object): | |||||
return "<CacaDisplay>" | return "<CacaDisplay>" | ||||
def __del__(self): | def __del__(self): | ||||
if self._dp > 0: | |||||
if self._dp > 0 and _lib is not None: | |||||
self._free() | self._free() | ||||
def _free(self): | def _free(self): | ||||
@@ -43,6 +43,7 @@ class _Display(object): | |||||
return _lib.caca_free_display(self) | return _lib.caca_free_display(self) | ||||
class Display(_Display): | class Display(_Display): | ||||
""" Display objects, methods are libcaca functions with display_t as first | """ Display objects, methods are libcaca functions with display_t as first | ||||
parameter. | parameter. | ||||
@@ -96,22 +96,38 @@ if __name__ == "__main__": | |||||
sys.exit() | sys.exit() | ||||
elif ch == ord('1'): | elif ch == ord('1'): | ||||
draw.do_line() | draw.do_line() | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('2'): | elif ch == ord('2'): | ||||
draw.do_line(thin=True) | draw.do_line(thin=True) | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('3'): | elif ch == ord('3'): | ||||
draw.do_polyline() | draw.do_polyline() | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('4'): | elif ch == ord('4'): | ||||
draw.do_polyline(thin=True) | draw.do_polyline(thin=True) | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('5'): | elif ch == ord('5'): | ||||
draw.do_circle() | draw.do_circle() | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('6'): | elif ch == ord('6'): | ||||
draw.do_ellipse() | draw.do_ellipse() | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('7'): | elif ch == ord('7'): | ||||
draw.do_ellipse(thin=True) | draw.do_ellipse(thin=True) | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('8'): | elif ch == ord('8'): | ||||
draw.do_box() | draw.do_box() | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
elif ch == ord('9'): | elif ch == ord('9'): | ||||
draw.do_box(thin=True) | draw.do_box(thin=True) | ||||
dp.refresh() | |||||
time.sleep(2) | |||||
dp.refresh() | |||||
time.sleep(2) | |||||