mirror of
https://github.com/Febbweiss/mopidy-touchscreen.git
synced 2026-03-04 22:25:39 +00:00
Lower CPU usage
Screen will not be always updated
This commit is contained in:
@@ -13,20 +13,24 @@ class Keyboard(BaseScreen):
|
||||
self.base_height = size[1]/5
|
||||
self.listener = listener
|
||||
self.manager = manager
|
||||
try:
|
||||
self.font is None
|
||||
except AttributeError:
|
||||
self.font = pygame.font.SysFont("arial", size[1]/6)
|
||||
self.selected_row = 0
|
||||
self.selected_col = 0
|
||||
self.selected_others = -1
|
||||
self.font = pygame.font.SysFont("arial", size[1]/6)
|
||||
self.keyboards = [ScreenObjectsManager(), ScreenObjectsManager()]
|
||||
self.other_objects = ScreenObjectsManager()
|
||||
self.current_keyboard = 0
|
||||
|
||||
rows = [['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
|
||||
['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'],
|
||||
[',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']]
|
||||
self.keys = [[['q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p'],
|
||||
['a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', '-'],
|
||||
[',', 'z', 'x', 'c', 'v', 'b', 'n', 'm', '.', '_']],
|
||||
|
||||
[['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
|
||||
['!', '@', '#', '$', '%', '&', '/', '(', ')', '='],
|
||||
['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]]
|
||||
|
||||
line = self.base_height
|
||||
for row in rows:
|
||||
for row in self.keys[self.current_keyboard]:
|
||||
pos = 0
|
||||
for key in row:
|
||||
button = \
|
||||
@@ -40,11 +44,8 @@ class Keyboard(BaseScreen):
|
||||
line += self.base_height
|
||||
|
||||
self.current_keyboard = 1
|
||||
rows = [['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'],
|
||||
['!', '@', '#', '$', '%', '&', '/', '(', ')', '='],
|
||||
['?', '{', '}', '_', '[', ']', '+', '<', '>', '*']]
|
||||
line = self.base_height
|
||||
for row in rows:
|
||||
for row in self.keys[self.current_keyboard]:
|
||||
pos = 0
|
||||
for key in row:
|
||||
button = \
|
||||
@@ -91,6 +92,7 @@ class Keyboard(BaseScreen):
|
||||
(self.base_width*10, self.base_height),
|
||||
center=True)
|
||||
self.other_objects.set_object("text", button)
|
||||
self.change_selected(0, 0)
|
||||
|
||||
def update(self, screen):
|
||||
screen.fill((0, 0, 0))
|
||||
@@ -107,10 +109,7 @@ class Keyboard(BaseScreen):
|
||||
touch_event.current_pos)
|
||||
for key in keys:
|
||||
if key == 'symbols':
|
||||
if self.current_keyboard == 0:
|
||||
self.current_keyboard = 1
|
||||
else:
|
||||
self.current_keyboard = 0
|
||||
self.change_keyboard()
|
||||
elif key == "remove":
|
||||
self.other_objects.get_object("text").remove_text(1, False)
|
||||
elif key == "space":
|
||||
@@ -120,9 +119,83 @@ class Keyboard(BaseScreen):
|
||||
self.listener.text_input(text)
|
||||
self.manager.close_keyboard()
|
||||
elif touch_event.type == InputManager.key:
|
||||
if len(touch_event.unicode):
|
||||
if isinstance(touch_event.unicode, unicode):
|
||||
if touch_event.unicode == u'\x08':
|
||||
self.other_objects.get_object("text").remove_text(1, False)
|
||||
else:
|
||||
self.other_objects.get_object("text").add_text(
|
||||
touch_event.unicode, False)
|
||||
elif touch_event.direction is not None:
|
||||
x = 0
|
||||
y = 0
|
||||
if touch_event.direction == InputManager.left:
|
||||
x = -1
|
||||
elif touch_event.direction == InputManager.right:
|
||||
x = 1
|
||||
elif touch_event.direction == InputManager.up:
|
||||
y = -1
|
||||
elif touch_event.direction == InputManager.down:
|
||||
y = 1
|
||||
self.change_selected(x, y)
|
||||
|
||||
def change_keyboard(self):
|
||||
if self.current_keyboard == 0:
|
||||
self.current_keyboard = 1
|
||||
else:
|
||||
self.current_keyboard = 0
|
||||
if self.selected_others < 0:
|
||||
self.change_selected(0, 0)
|
||||
|
||||
def change_selected(self, x, y):
|
||||
if self.selected_others < 0:
|
||||
self.selected_row += x
|
||||
if self.selected_row < 0:
|
||||
self.selected_row = 0
|
||||
elif self.selected_row > 9:
|
||||
self.selected_row = 9
|
||||
self.selected_col += y
|
||||
if self.selected_col < 0:
|
||||
self.selected_col = 0
|
||||
elif self.selected_col > 2:
|
||||
if self.selected_col < 2:
|
||||
self.selected_others = 0
|
||||
elif self.selected_col < 8:
|
||||
self.selected_others = 1
|
||||
else:
|
||||
self.selected_others = 2
|
||||
self.set_selected_other()
|
||||
if self.selected_others < 0:
|
||||
key = self.keys[self.current_keyboard]
|
||||
[self.selected_col][self.selected_row]
|
||||
self.keyboards[self.current_keyboard].set_selected(key)
|
||||
else:
|
||||
self.keyboards[0].set_selected(None)
|
||||
self.keyboards[0].set_selected(None)
|
||||
else:
|
||||
if y < 0:
|
||||
self.selected_others = -1
|
||||
self.set_selected_other()
|
||||
self.selected_col = 2
|
||||
self.selected_row = 0
|
||||
key = self.keys[self.current_keyboard]
|
||||
[self.selected_col][self.selected_row]
|
||||
self.keyboards[self.current_keyboard].set_selected(key)
|
||||
else:
|
||||
self.selected_others += x
|
||||
if self.selected_others < 0:
|
||||
self.selected_others = 0
|
||||
elif self.selected_others > 3:
|
||||
self.selected_others = 3
|
||||
self.set_selected_other()
|
||||
|
||||
def set_selected_other(self):
|
||||
key = None
|
||||
if self.selected_others == 0:
|
||||
key = "symbols"
|
||||
elif self.selected_others == 1:
|
||||
key = "remove"
|
||||
elif self.selected_others == 2:
|
||||
key = "space"
|
||||
elif self.selected_others == 3:
|
||||
key = "ok"
|
||||
self.other_objects.set_selected(key)
|
||||
|
||||
Reference in New Issue
Block a user