Skip to content

Commit 6d350d5

Browse files
pthompthom
committed
Fix pure python backends following small changes in bindings
1 parent bacd612 commit 6d350d5

File tree

4 files changed

+37
-36
lines changed

4 files changed

+37
-36
lines changed

‎bindings/imgui_bundle/python_backends/glfw_backend.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ def _map_keys(self):
8181
key_map[glfw.KEY_Z] = imgui.Key.z
8282

8383
self.modifier_map = {}
84-
self.modifier_map[glfw.KEY_LEFT_CONTROL] = imgui.Key.im_gui_mod_ctrl
85-
self.modifier_map[glfw.KEY_RIGHT_CONTROL] = imgui.Key.im_gui_mod_ctrl
86-
self.modifier_map[glfw.KEY_LEFT_SHIFT] = imgui.Key.im_gui_mod_shift
87-
self.modifier_map[glfw.KEY_RIGHT_SHIFT] = imgui.Key.im_gui_mod_shift
88-
self.modifier_map[glfw.KEY_LEFT_ALT] = imgui.Key.im_gui_mod_alt
89-
self.modifier_map[glfw.KEY_RIGHT_ALT] = imgui.Key.im_gui_mod_alt
90-
self.modifier_map[glfw.KEY_LEFT_SUPER] = imgui.Key.im_gui_mod_super
91-
self.modifier_map[glfw.KEY_RIGHT_SUPER] = imgui.Key.im_gui_mod_super
84+
self.modifier_map[glfw.KEY_LEFT_CONTROL] = imgui.Key.mod_ctrl
85+
self.modifier_map[glfw.KEY_RIGHT_CONTROL] = imgui.Key.mod_ctrl
86+
self.modifier_map[glfw.KEY_LEFT_SHIFT] = imgui.Key.mod_shift
87+
self.modifier_map[glfw.KEY_RIGHT_SHIFT] = imgui.Key.mod_shift
88+
self.modifier_map[glfw.KEY_LEFT_ALT] = imgui.Key.mod_alt
89+
self.modifier_map[glfw.KEY_RIGHT_ALT] = imgui.Key.mod_alt
90+
self.modifier_map[glfw.KEY_LEFT_SUPER] = imgui.Key.mod_super
91+
self.modifier_map[glfw.KEY_RIGHT_SUPER] = imgui.Key.mod_super
9292

9393
def keyboard_callback(self, window, glfw_key: int, scancode, action, mods):
9494
# perf: local for faster access

‎bindings/imgui_bundle/python_backends/pyglet_backend.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ class PygletMixin(object):
4343
key.Z: imgui.Key.z,
4444
}
4545
modifier_map = {
46-
key.LCTRL: imgui.Key.im_gui_mod_ctrl,
47-
key.RCTRL: imgui.Key.im_gui_mod_ctrl,
48-
key.LSHIFT: imgui.Key.im_gui_mod_shift,
49-
key.RSHIFT: imgui.Key.im_gui_mod_shift,
50-
key.LALT: imgui.Key.im_gui_mod_alt,
51-
key.RALT: imgui.Key.im_gui_mod_alt,
52-
key.LCOMMAND: imgui.Key.im_gui_mod_super,
53-
key.RCOMMAND: imgui.Key.im_gui_mod_super,
46+
key.LCTRL: imgui.Key.mod_ctrl,
47+
key.RCTRL: imgui.Key.mod_ctrl,
48+
key.LSHIFT: imgui.Key.mod_shift,
49+
key.RSHIFT: imgui.Key.mod_shift,
50+
key.LALT: imgui.Key.mod_alt,
51+
key.RALT: imgui.Key.mod_alt,
52+
key.LCOMMAND: imgui.Key.mod_super,
53+
key.RCOMMAND: imgui.Key.mod_super,
5454
}
5555
_gui_time = None
5656

‎bindings/imgui_bundle/python_backends/python_backends_disabled/pygame_backend.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ def _map_keys(self):
6464
}
6565

6666
self.modifier_map = {
67-
pygame.K_LCTRL: imgui.Key.im_gui_mod_ctrl,
68-
pygame.K_RCTRL: imgui.Key.im_gui_mod_ctrl,
69-
pygame.K_LSHIFT: imgui.Key.im_gui_mod_shift,
70-
pygame.K_RSHIFT: imgui.Key.im_gui_mod_shift,
71-
pygame.K_LALT: imgui.Key.im_gui_mod_alt,
72-
pygame.K_RALT: imgui.Key.im_gui_mod_alt,
73-
pygame.K_LSUPER: imgui.Key.im_gui_mod_super,
74-
pygame.K_RSUPER: imgui.Key.im_gui_mod_super,
67+
pygame.K_LCTRL: imgui.Key.mod_ctrl,
68+
pygame.K_RCTRL: imgui.Key.mod_ctrl,
69+
pygame.K_LSHIFT: imgui.Key.mod_shift,
70+
pygame.K_RSHIFT: imgui.Key.mod_shift,
71+
pygame.K_LALT: imgui.Key.mod_alt,
72+
pygame.K_RALT: imgui.Key.mod_alt,
73+
pygame.K_LSUPER: imgui.Key.mod_super,
74+
pygame.K_RSUPER: imgui.Key.mod_super,
7575
}
7676

7777
def process_event(self, event):

‎bindings/imgui_bundle/python_backends/sdl_backend.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# -*- coding: utf-8 -*-
22
# ruff: noqa: F403, F405
33
from __future__ import absolute_import
4+
from typing import Any
45

56
from imgui_bundle import imgui
67
from sdl2 import *
@@ -34,14 +35,14 @@ def __init__(self, window):
3435

3536
self.io.display_size = width_ptr[0], height_ptr[0]
3637

37-
def get_clipboard_text() -> str:
38+
def get_clipboard_text(_imgui_context: Any) -> str:
3839
return SDL_GetClipboardText()
3940

40-
def set_clipboard_text(text: str) -> None:
41+
def set_clipboard_text(_imgui_context: Any, text: str) -> None:
4142
SDL_SetClipboardText(ctypes.c_char_p(text.encode()))
4243

43-
imgui.get_io().get_clipboard_text_fn_ = get_clipboard_text
44-
imgui.get_io().set_clipboard_text_fn_ = set_clipboard_text
44+
imgui.get_platform_io().platform_get_clipboard_text_fn = get_clipboard_text
45+
imgui.get_platform_io().platform_set_clipboard_text_fn = set_clipboard_text
4546

4647
self._map_keys()
4748

@@ -72,14 +73,14 @@ def _map_keys(self):
7273
key_map[SDL_SCANCODE_Z] = imgui.Key.z
7374

7475
self.modifier_map = {}
75-
self.modifier_map[SDL_SCANCODE_LCTRL] = imgui.Key.im_gui_mod_ctrl
76-
self.modifier_map[SDL_SCANCODE_RCTRL] = imgui.Key.im_gui_mod_ctrl
77-
self.modifier_map[SDL_SCANCODE_LSHIFT] = imgui.Key.im_gui_mod_shift
78-
self.modifier_map[SDL_SCANCODE_RSHIFT] = imgui.Key.im_gui_mod_shift
79-
self.modifier_map[SDL_SCANCODE_LALT] = imgui.Key.im_gui_mod_alt
80-
self.modifier_map[SDL_SCANCODE_RALT] = imgui.Key.im_gui_mod_alt
81-
self.modifier_map[SDL_SCANCODE_LGUI] = imgui.Key.im_gui_mod_super
82-
self.modifier_map[SDL_SCANCODE_RGUI] = imgui.Key.im_gui_mod_super
76+
self.modifier_map[SDL_SCANCODE_LCTRL] = imgui.Key.mod_ctrl
77+
self.modifier_map[SDL_SCANCODE_RCTRL] = imgui.Key.mod_ctrl
78+
self.modifier_map[SDL_SCANCODE_LSHIFT] = imgui.Key.mod_shift
79+
self.modifier_map[SDL_SCANCODE_RSHIFT] = imgui.Key.mod_shift
80+
self.modifier_map[SDL_SCANCODE_LALT] = imgui.Key.mod_alt
81+
self.modifier_map[SDL_SCANCODE_RALT] = imgui.Key.mod_alt
82+
self.modifier_map[SDL_SCANCODE_LGUI] = imgui.Key.mod_super
83+
self.modifier_map[SDL_SCANCODE_RGUI] = imgui.Key.mod_super
8384

8485
def process_event(self, event):
8586
io = self.io

0 commit comments

Comments
 (0)