mirror of
https://github.com/lalbornoz/roar.git
synced 2024-11-19 05:46:37 +00:00
f504fa2b76
1) Add background colour toolbar beneath (foreground) colour toolbar.
2) Add colour flipping command w/ {accelerator,{menu,toolbar} item}.
3) Add {de,in}crease {brush,canvas} size accelerator.
4) Add {hide,show} assets window toolbar item.
5) Circle tool: draw outline with foreground colour.
6) Circle tool: honour transparency.
7) Fill tool: change comprehensive fill modifier key from <Shift> to <Ctrl>.
8) Fill tool: fill with {back,fore}ground colour given <[RL]MB>
9) Fix arrow keys cursor motion when scrolled down.
10 Instantly reflect {brush size,colour,tool} changes in canvas.
11) Object tool: honour transparency w/ non-external objects.
12) Object tool: update selection rectangle during <LMB> whilst dragging, set w/ release of <LMB>.
13) Rectangle tool: draw outline with foreground colour.
14) Rectangle tool: honour transparency.
15) Replace wx.ToolBar() w/ wx.lib.agw.aui.AuiToolBar() & custom wx.lib.agw.aui.AuiDefaultToolBarArt().
16) Restore scrolling position after resizing canvas.
.TODO: deleted.
assets/audio/roar{arab8,spoke11}.wav: added.
assets/text/hotkeys.txt: added to document hotkeys.
assets/text/requirements.txt, requirements.txt: moved.
assets/text/TODO: updated.
{assets/tools,lib{canvas,gui,roar,rtl,tools}}/*.py: remove Vim fold markers.
libroar/RoarCanvasCommandsFile.py:_importFile(): update wx.FileDialog() message.
libroar/RoarCanvasCommandsOperators.py:canvasOperator(): update invert colours {caption,label}.
134 lines
6.2 KiB
Python
134 lines
6.2 KiB
Python
#!/usr/bin/env python3
|
|
#
|
|
# ToolText.py
|
|
# Copyright (c) 2018, 2019 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
|
|
#
|
|
|
|
from Tool import Tool
|
|
import re, string, time, wx
|
|
|
|
class ToolText(Tool):
|
|
name = "Text"
|
|
arabicCombiningRegEx = r'^[\u064B-\u065F\uFE70-\uFE72\uFE74\uFE76-\uFE7F]+$'
|
|
arabicRegEx = r'^[\u0621-\u063A\u0640-\u064A]+$'
|
|
rtlRegEx = r'^[\u0591-\u07FF\uFB1D-\uFDFD\uFE70-\uFEFC]+$'
|
|
|
|
def _checkRtl(self, canvas, brushPos, keyChar):
|
|
rtlFlag = False
|
|
if (keyChar != None) and re.match(self.rtlRegEx, keyChar):
|
|
rtlFlag = True
|
|
else:
|
|
lastX, lastY = brushPos[0], brushPos[1]
|
|
while True:
|
|
if canvas.map[lastY][lastX][3] == " ":
|
|
if (lastX + 1) >= canvas.size[0]:
|
|
if lastY == 0:
|
|
break
|
|
else:
|
|
lastX, lastY = 0, lastY - 1
|
|
else:
|
|
lastX += 1
|
|
elif re.match(self.arabicRegEx, canvas.map[lastY][lastX][3]):
|
|
rtlFlag = True
|
|
if (lastX + 1) >= canvas.size[0]:
|
|
if lastY == 0:
|
|
break
|
|
else:
|
|
lastX, lastY = 0, lastY - 1
|
|
else:
|
|
lastX += 1
|
|
else:
|
|
break
|
|
return rtlFlag
|
|
|
|
def _processKeyChar(self, brushColours, brushPos, canvas, dispatchFn, eventDc, keyChar, keyModifiers):
|
|
if (ord(keyChar) != wx.WXK_NONE) \
|
|
and (not keyChar in set("\t\n\v\f\r")) \
|
|
and ((ord(keyChar) >= 32) if ord(keyChar) < 127 else True):
|
|
dispatchFn(eventDc, False, [*brushPos, *brushColours, 0, keyChar]);
|
|
if not self._checkRtl(canvas, brushPos, keyChar):
|
|
if brushPos[0] < (canvas.size[0] - 1):
|
|
brushPos[0] += 1
|
|
elif brushPos[1] < (canvas.size[1] - 1):
|
|
brushPos[0], brushPos[1] = 0, brushPos[1] + 1
|
|
else:
|
|
brushPos[0], brushPos[1] = 0, 0
|
|
else:
|
|
if brushPos[0] > 0:
|
|
brushPos[0] -= 1
|
|
elif brushPos[1] > 0:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, brushPos[1] - 1
|
|
else:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, canvas.size[1] - 1
|
|
rc, dirty = True, True
|
|
else:
|
|
rc, dirty = False, False
|
|
return rc, dirty
|
|
|
|
|
|
#
|
|
# onKeyboardEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyChar, keyCode, keyModifiers, mapPoint)
|
|
def onKeyboardEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyChar, keyCode, keyModifiers, mapPoint):
|
|
if re.match(self.arabicCombiningRegEx, keyChar):
|
|
rc, dirty = True, False
|
|
elif keyCode == wx.WXK_CONTROL_V:
|
|
rc, dirty = True, False
|
|
if wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)) \
|
|
and wx.TheClipboard.Open():
|
|
inBuffer = wx.TextDataObject()
|
|
if wx.TheClipboard.GetData(inBuffer):
|
|
for inBufferChar in list(inBuffer.GetText()):
|
|
if not re.match(self.arabicCombiningRegEx, inBufferChar):
|
|
rc_, dirty_ = self._processKeyChar(brushColours, brushPos, canvas, dispatchFn, eventDc, inBufferChar, 0)
|
|
rc = True if rc_ else rc; dirty = True if dirty_ else dirty;
|
|
if rc:
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"])
|
|
wx.TheClipboard.Close()
|
|
else:
|
|
rc, error = False, "Clipboard does not contain text data and/or cannot be opened"
|
|
elif keyCode == wx.WXK_BACK:
|
|
if ((brushPos[0] + 1) >= canvas.size[0]):
|
|
if brushPos[1] > 0:
|
|
lastBrushPos = [0, brushPos[1] - 1]
|
|
else:
|
|
lastBrushPos = [0, 0]
|
|
else:
|
|
lastBrushPos = [brushPos[0] + 1, brushPos[1]]
|
|
if not self._checkRtl(canvas, lastBrushPos, None):
|
|
if brushPos[0] > 0:
|
|
brushPos[0] -= 1
|
|
elif brushPos[1] > 0:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, brushPos[1] - 1
|
|
else:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, canvas.size[1] - 1
|
|
else:
|
|
if brushPos[0] < (canvas.size[0] - 1):
|
|
brushPos[0] += 1
|
|
elif brushPos[1] > 0:
|
|
brushPos[0], brushPos[1] = 0, brushPos[1] - 1
|
|
else:
|
|
brushPos[0], brushPos[1] = canvas.size[0] - 1, 0
|
|
rc, dirty = True, False; dispatchFn(eventDc, False, [*brushPos, *brushColours, 0, " "]);
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"]);
|
|
elif keyCode == wx.WXK_RETURN:
|
|
if brushPos[1] < (canvas.size[1] - 1):
|
|
brushPos[0], brushPos[1] = 0, brushPos[1] + 1
|
|
else:
|
|
brushPos[0], brushPos[1] = 0, 0
|
|
rc, dirty = True, False; dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"]);
|
|
else:
|
|
rc, dirty = self._processKeyChar(brushColours, brushPos, canvas, dispatchFn, eventDc, keyChar, keyModifiers)
|
|
if rc:
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"])
|
|
return rc, dirty
|
|
|
|
#
|
|
# onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown)
|
|
def onMouseEvent(self, atPoint, brushColours, brushPos, brushSize, canvas, dispatchFn, eventDc, keyModifiers, mapPoint, mouseDragging, mouseLeftDown, mouseRightDown):
|
|
if mouseLeftDown or mouseRightDown:
|
|
brushPos[0], brushPos[1] = atPoint[0], atPoint[1]
|
|
dispatchFn(eventDc, True, [*brushPos, *brushColours, 0, "_"])
|
|
return True, False
|
|
|
|
# vim:expandtab foldmethod=marker sw=4 ts=4 tw=120
|