drawzero 0.5.4__tar.gz → 0.7.0__tar.gz

{drawzero-0.5.4/src/drawzero.egg-info → drawzero-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drawzero
-Version: 0.5.4
+Version: 0.7.0
 Summary: A zero-boilerplate canvas drawing framework for Python 3, based on Pygame.
 Author-email: Sergey Shashkov <sh57@yandex.ru>
 License: MIT
@@ -23,12 +23,12 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: mkdocs-static-i18n[material]>=1.3.0
-Requires-Dist: pygame>=2.0.1
+Requires-Dist: pygame-ce>=2.0.1
 Provides-Extra: dev
 Requires-Dist: setuptools; extra == "dev"
 Requires-Dist: build; extra == "dev"
@@ -263,40 +263,23 @@ text(C.white, 'scale3 = Gradient([C.white, C.black, C.red, C.black, C.white], 20
 
 # Keyboard and mouse events
 
-Process keyboard events in two ways: check if key is pressed via `get_keys_pressed()` or run throw `keysdown` or `keysup` events:
+Use `keyboard`, `mouse`, and ordered `events()` snapshots prepared by `tick()`.
+See the complete [English input guide](https://drawzero.org/keyboard_and_mouse_input/)
+and [Russian input guide](https://drawzero.org/ru/keyboard_and_mouse_input/).
 
-``` python
+```python
 from drawzero import *
 
-upper_text = 'Typed: '
-SIZE = 20
-x = y = 500 - SIZE // 2
-
+x = y = 500
 while True:
-    # Mouse buttons events
-    if mousebuttonsdown:
-        x, y = mousebuttonsdown[0].pos
-    # Keys which are still pressed
-    keys = get_keys_pressed()
-    if keys[K.UP] or keys[K.w]:
-        y -= 5
-    if keys[K.DOWN] or keys[K.s]:
-        y += 5
-    if keys[K.LEFT] or keys[K.a]:
-        x -= 5
-    if keys[K.RIGHT] or keys[K.d]:
-        x += 5
-    # Keyboard events
-    for ev in keysdown:
-        if ev.unicode:
-            upper_text += ev.unicode
-
-    # Redraw everything
+    x += 4 * keyboard.axis(('left', 'a'), ('right', 'd'))
+    y += 4 * keyboard.axis(('up', 'w'), ('down', 's'))
+    if keyboard.just_pressed('space'):
+        x = y = 500
     clear()
-    filled_rect(C.red, x, y, SIZE, SIZE)
-    text(C.white, upper_text, (100, 5))
-    filled_circle(C.yellow, mouse_pos(), 3)
-    tick()
+    filled_circle(C.red, (x, y), 20)
+    filled_circle(C.yellow, mouse.pos, 3)
+    tick(fps=60)
 ```
 
 <img alt="keyboard_and_mouse_events.gif" src="https://raw.githubusercontent.com/ShashkovS/drawzero/master/docs/keyboard_and_mouse_events.gif" width="50%">

{drawzero-0.5.4 → drawzero-0.7.0}/README.md

@@ -219,40 +219,23 @@ text(C.white, 'scale3 = Gradient([C.white, C.black, C.red, C.black, C.white], 20
 
 # Keyboard and mouse events
 
-Process keyboard events in two ways: check if key is pressed via `get_keys_pressed()` or run throw `keysdown` or `keysup` events:
+Use `keyboard`, `mouse`, and ordered `events()` snapshots prepared by `tick()`.
+See the complete [English input guide](https://drawzero.org/keyboard_and_mouse_input/)
+and [Russian input guide](https://drawzero.org/ru/keyboard_and_mouse_input/).
 
-``` python
+```python
 from drawzero import *
 
-upper_text = 'Typed: '
-SIZE = 20
-x = y = 500 - SIZE // 2
-
+x = y = 500
 while True:
-    # Mouse buttons events
-    if mousebuttonsdown:
-        x, y = mousebuttonsdown[0].pos
-    # Keys which are still pressed
-    keys = get_keys_pressed()
-    if keys[K.UP] or keys[K.w]:
-        y -= 5
-    if keys[K.DOWN] or keys[K.s]:
-        y += 5
-    if keys[K.LEFT] or keys[K.a]:
-        x -= 5
-    if keys[K.RIGHT] or keys[K.d]:
-        x += 5
-    # Keyboard events
-    for ev in keysdown:
-        if ev.unicode:
-            upper_text += ev.unicode
-
-    # Redraw everything
+    x += 4 * keyboard.axis(('left', 'a'), ('right', 'd'))
+    y += 4 * keyboard.axis(('up', 'w'), ('down', 's'))
+    if keyboard.just_pressed('space'):
+        x = y = 500
     clear()
-    filled_rect(C.red, x, y, SIZE, SIZE)
-    text(C.white, upper_text, (100, 5))
-    filled_circle(C.yellow, mouse_pos(), 3)
-    tick()
+    filled_circle(C.red, (x, y), 20)
+    filled_circle(C.yellow, mouse.pos, 3)
+    tick(fps=60)
 ```
 
 <img alt="keyboard_and_mouse_events.gif" src="https://raw.githubusercontent.com/ShashkovS/drawzero/master/docs/keyboard_and_mouse_events.gif" width="50%">

{drawzero-0.5.4 → drawzero-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "drawzero"
-version = "0.5.4"
+version = "0.7.0"
 authors = [
   { name="Sergey Shashkov", email="sh57@yandex.ru" },
 ]
@@ -30,11 +30,11 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: Implementation :: CPython",
 ]
 dependencies = [
-  "mkdocs-static-i18n[material]>=1.3.0",
-  "pygame>=2.0.1",
+  "pygame-ce>=2.0.1",
 ]
 
 [project.urls]

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/__about__.py

@@ -5,7 +5,7 @@ __all__ = [
     "__copyright__",
 ]
 
-__version__ = '0.5.4'
+__version__ = '0.7.0'
 __author__ = "Sergey Shashkov"
 __license__ = "MIT"
 __copyright__ = "Copyright 2020- Sergey Shashkov"

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/__init__.py

@@ -5,6 +5,7 @@ A zero-boilerplate canvas drawing framework for Python 3, based on Pygame.
 """
 
 from .utils.draw import *
+from .utils.input import keyboard, mouse, events, M, MOD, E
 from .utils.pt import Pt
 from .utils.gradient import Gradient
 from .utils.copy_examples import copy_examples
@@ -15,6 +16,7 @@ from .utils.colors import C, COLORS, THECOLORS, ALL_COLORS
 from .__about__ import __author__, __copyright__, __version__
 
 __all__ = [
+    'keyboard', 'mouse', 'events', 'M', 'MOD', 'E',
     # spec
     '__author__', '__copyright__', '__version__',
     #

drawzero-0.7.0/src/drawzero/examples/16_keyboard_and_mouse.py

@@ -0,0 +1,26 @@
+from drawzero import *
+
+x = y = 500
+color = C.red
+presses = 0
+while True:
+    speed = 12 if keyboard.pressed('shift') else 4
+    dx = keyboard.axis(('left', 'a'), ('right', 'd'))
+    dy = keyboard.axis(('up', 'w'), ('down', 's'))
+    x += speed * dx
+    y += speed * dy
+    if keyboard.just_pressed('space'):
+        presses += 1
+        color = C.blue if color == C.red else C.red
+    for event in events():
+        if event.type == E.MOUSE_DOWN and event.button == M.LEFT:
+            x, y = event.pos
+    clear()
+    text(C.white, 'CONTROLS / STATE', (500, 70), 48)
+    text(C.white, 'Arrows or WASD move; Shift speeds up', (500, 150), 32)
+    text(C.white, 'Space changes color once; click places the square', (500, 205), 30)
+    text(C.cyan, f'Axis: ({dx}, {dy})   Shift: {keyboard.pressed("shift")}', (500, 300), 36)
+    text(C.yellow, f'Space presses: {presses}', (500, 360), 36)
+    filled_rect(color, (x, y), 35, 35)
+    filled_circle(C.yellow, mouse.pos, 6)
+    tick(fps=60)

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/examples/17_mouse_tube.py

@@ -4,7 +4,7 @@ circles = []
 tick()
 scale = Gradient([C.gray10, C.blue, C.orange], 100, 500)
 while True:
-    x, y = mouse_pos()
+    x, y = mouse.pos
     circles.append([x, y, 100])
     clear()
     for i in range(len(circles) - 1, -1, -1):

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/examples/18_game_stars.py

@@ -63,20 +63,20 @@ def draw_stars(stars):
     text('white', 'Press WASD or QE to move', (500, 5), 48, '.^')
 
 
-def process_keys(pressed_keys, speed):
+def process_keys(speed):
     '''Обрабатываем нажатия клавиш
     Используем WASD для вверх/вниз/влево/вправо и QE для вперёд/назад'''
-    if pressed_keys[K.UP] or pressed_keys[K.w]:
+    if keyboard.pressed(K.UP) or keyboard.pressed(K.w):
         speed[2] += 100
-    if pressed_keys[K.DOWN] or pressed_keys[K.s]:
+    if keyboard.pressed(K.DOWN) or keyboard.pressed(K.s):
         speed[2] -= 100
-    if pressed_keys[K.LEFT] or pressed_keys[K.a]:
+    if keyboard.pressed(K.LEFT) or keyboard.pressed(K.a):
         speed[0] += 100
-    if pressed_keys[K.RIGHT] or pressed_keys[K.d]:
+    if keyboard.pressed(K.RIGHT) or keyboard.pressed(K.d):
         speed[0] -= 100
-    if pressed_keys[K.q]:
+    if keyboard.pressed(K.q):
         speed[1] -= 1
-    if pressed_keys[K.e]:
+    if keyboard.pressed(K.e):
         speed[1] += 1
 
 
@@ -88,10 +88,10 @@ while True:
     # Заливаем всё чёрным
     fill((0, 0, 0))
     # Обрабатываем нажатия клавиш
-    process_keys(get_keys_pressed(), speed)
+    process_keys(speed)
     # Двигаем звёзды
     move_stars(stars, speed)
     # Рисуем звёзды
     draw_stars(stars)
-    # Ждём 1/60 секунды
+    # Ждём 1/30 секунды
     tick()

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/examples/19_game_colors.py

@@ -43,7 +43,9 @@ while True:
     elif cur_status == 3:
         text('red', 'Mismatch?', (500, 800), 48)
     # Ignore clicks for half a second after color change
-    for ev in mousebuttonsdown:
+    for ev in mouse.events:
+        if ev.type != E.MOUSE_DOWN:
+            continue
         if cur_ts - last_status_ts > 0.3:
             if ev.button == cur_status:
                 # User confirmed

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/examples/20_game_racing.py

@@ -21,15 +21,14 @@ for i in 3, 2, 1:
     sleep(1)
 
 while True:
-    keys = get_keys_pressed()
     for i in range(len(cars_y)):
-        if keys[ups[i]]:
+        if keyboard.pressed(ups[i]):
             cars_y[i] -= 5
-        if keys[downs[i]]:
+        if keyboard.pressed(downs[i]):
             cars_y[i] += 5
-        if keys[lefts[i]]:
+        if keyboard.pressed(lefts[i]):
             cars_x[i] -= 5
-        if keys[rights[i]]:
+        if keyboard.pressed(rights[i]):
             cars_x[i] += 5
     clear()
     for i in range(len(cars_y)):

drawzero-0.7.0/src/drawzero/examples/21_precise_drawing.py

@@ -0,0 +1,28 @@
+from drawzero import *
+
+segments = []
+previous = None
+while True:
+    for event in events():
+        if event.type == E.FOCUS_LOST:
+            previous = None
+        elif event.type == E.MOUSE_DOWN and event.button == M.LEFT:
+            previous = event.pos
+        elif event.type == E.MOUSE_MOVE:
+            if previous is not None and M.LEFT in event.buttons:
+                segments.append((previous, event.pos))
+                previous = event.pos
+        elif event.type == E.MOUSE_UP and event.button == M.LEFT:
+            if previous is not None and not event.source.cancelled:
+                segments.append((previous, event.pos))
+            previous = None
+    if keyboard.just_pressed('space'):
+        segments.clear()
+    clear()
+    text(C.white, 'PRECISE DRAWING', (500, 70), 48)
+    text(C.white, 'Hold left mouse button to draw; Space clears', (500, 150), 32)
+    for start, end in segments:
+        line(C.cyan, start, end, line_width=6)
+    filled_circle(C.yellow, mouse.pos, 8)
+    text(C.gray, f'Path segments: {len(segments)}', (500, 900), 32)
+    tick(fps=60)

drawzero-0.7.0/src/drawzero/examples/22_text_and_scroll.py

@@ -0,0 +1,29 @@
+from drawzero import *
+
+value = ''
+scroll_x = scroll_y = 0
+composition = ''
+while True:
+    for event in events():
+        if event.type == E.TEXT_INPUT:
+            value += event.text
+            composition = ''
+        elif event.type == E.TEXT_EDITING:
+            composition = event.text
+        elif event.type == E.KEY_DOWN and event.key == K.BACKSPACE:
+            value = value[:-1]
+        elif event.type == E.FOCUS_LOST:
+            composition = ''
+    dx, dy = mouse.wheel
+    scroll_x += dx
+    scroll_y += dy
+    clear()
+    text(C.white, 'TEXT / TWO-DIMENSIONAL SCROLL', (500, 70), 40)
+    text(C.white, 'Type text; Backspace deletes; scroll moves the marker', (500, 150), 28)
+    text(C.cyan, value, (80, 300), 48, '<.')
+    text(C.gray, composition, (80, 370), 36, '<.')
+    text(C.yellow, f'Scroll: ({scroll_x:.1f}, {scroll_y:.1f})', (500, 480), 36)
+    line(C.gray, (200, 720), (800, 720))
+    line(C.gray, (500, 570), (500, 870))
+    filled_circle(C.orange, (500 + 30 * scroll_x, 720 - 30 * scroll_y), 22)
+    tick(fps=60)

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/utils/draw.py

@@ -348,13 +348,13 @@ def _update_events_coordinates():
         ev.rel = (from_canvas_x(x), from_canvas_y(y))
 
 
-def tick(r=1):
-    """Sleep for 1/30 of a second.
-    If tick functions is called in a loop, then sleep time is reduced so
-    takes 1/30 second between calls. For example if calculations between tick() calls take 1/60s,
-    then tick sleeps for 1/60s. So while calculations takes less then 1/30s tick()
-    we get 30 frames per second."""
-    renderer.draw_tick(r)
+def tick(r=1, *, fps=30):
+    """Present drawing and publish one input frame after r polls.
+
+    fps limits each poll interval (30 by default; zero is uncapped).
+    Positional r remains a poll count, not a frame rate.
+    """
+    renderer.draw_tick(r, fps=fps)
     _update_events_coordinates()
 
 

{drawzero-0.5.4 → drawzero-0.7.0}/src/drawzero/utils/i18n.py

@@ -160,6 +160,12 @@ class I18N:
         'en': 'Incorrect number of points for the input data: there should be either 2, or exactly as many as there are colors, that is, {}.',
     }
 
+    input_invalid = {'en': 'Invalid key or mouse button: {!r}.', 'ru': 'Некорректная клавиша или кнопка мыши: {!r}.'}
+    input_suggestion = {'en': ' Did you mean {!r}?', 'ru': ' Возможно, вы имели в виду {!r}?'}
+    input_mask = {'en': 'MOD is a modifier mask; query a key or "ctrl", "shift", "alt", "meta".', 'ru': 'MOD — маска модификаторов; укажите клавишу или "ctrl", "shift", "alt", "meta".'}
+    input_group = {'en': 'An axis group must be a nonempty flat tuple/list of keys.', 'ru': 'Группа оси должна быть непустым плоским кортежем/списком клавиш.'}
+    input_fps = {'en': 'fps must be a finite nonnegative number.', 'ru': 'fps должен быть конечным неотрицательным числом.'}
+
     @classmethod
     def set_lang(cls, lang):
         if lang not in _known_languages: