RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix event storm when toggling a device's property

This commit is contained in:
Daniel Pavel 2012-12-12 22:55:04 +02:00
parent 630f71b349
commit 954fc29613
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/ui/config_panel.py
View File

@ -6,7 +6,6 @@ from __future__ import absolute_import, division, print_function, unicode_litera
from gi.repository import Gtk, GObject from gi.repository import Gtk, GObject
import ui
from logitech.unifying_receiver import settings as _settings from logitech.unifying_receiver import settings as _settings
# #
@ -17,7 +16,7 @@ try:
from Queue import Queue as _Queue from Queue import Queue as _Queue
except ImportError: except ImportError:
from queue import Queue as _Queue from queue import Queue as _Queue
_apply_queue = _Queue(8) _apply_queue = _Queue(4)
def _process_apply_queue(): def _process_apply_queue():
def _write_start(sbox): def _write_start(sbox):
@ -30,14 +29,15 @@ def _process_apply_queue():
while True: while True:
task = _apply_queue.get() task = _apply_queue.get()
assert isinstance(task, tuple) assert isinstance(task, tuple)
# print ("task", *task)
if task[0] == 'write': if task[0] == 'write':
_, setting, value, sbox = task _, setting, value, sbox = task
GObject.idle_add(_write_start, sbox) GObject.idle_add(_write_start, sbox, priority=0)
value = setting.write(value) value = setting.write(value)
elif task[0] == 'read': elif task[0] == 'read':
_, setting, cached, sbox = task _, setting, cached, sbox = task
value = setting.read(cached) value = setting.read(cached)
GObject.idle_add(_update_setting_item, sbox, value) GObject.idle_add(_update_setting_item, sbox, value, priority=99)
from threading import Thread as _Thread from threading import Thread as _Thread
_queue_processor = _Thread(name='SettingsProcessor', target=_process_apply_queue) _queue_processor = _Thread(name='SettingsProcessor', target=_process_apply_queue)
@ -49,11 +49,17 @@ _queue_processor.start()
# #
def _switch_notify(switch, _, setting, spinner): def _switch_notify(switch, _, setting, spinner):
_apply_queue.put(('write', setting, switch.get_active() == True, switch.get_parent())) # print ("switch notify", switch, switch.get_active(), setting)
if switch.get_sensitive():
# value = setting.write(switch.get_active() == True)
# _update_setting_item(switch.get_parent(), value)
_apply_queue.put(('write', setting, switch.get_active() == True, switch.get_parent()))
def _combo_notify(cbbox, setting, spinner): def _combo_notify(cbbox, setting, spinner):
_apply_queue.put(('write', setting, cbbox.get_active_id(), cbbox.get_parent())) # print ("combo notify", cbbox, cbbox.get_active_id(), setting)
if cbbox.get_sensitive():
_apply_queue.put(('write', setting, cbbox.get_active_id(), cbbox.get_parent()))
# def _scale_notify(scale, setting, spinner): # def _scale_notify(scale, setting, spinner):
@ -127,13 +133,13 @@ def _update_setting_item(sbox, value):
spinner.set_visible(False) spinner.set_visible(False)
spinner.stop() spinner.stop()
# print ("update", control, "with new value", value)
if value is None: if value is None:
control.set_sensitive(False) control.set_sensitive(False)
failed.set_visible(True) failed.set_visible(True)
return return
failed.set_visible(False) failed.set_visible(False)
control.set_sensitive(True)
if isinstance(control, Gtk.Switch): if isinstance(control, Gtk.Switch):
control.set_active(value) control.set_active(value)
elif isinstance(control, Gtk.ComboBoxText): elif isinstance(control, Gtk.ComboBoxText):
@ -142,6 +148,7 @@ def _update_setting_item(sbox, value):
# control.set_value(int(value)) # control.set_value(int(value))
else: else:
raise NotImplemented raise NotImplemented
control.set_sensitive(True)
def update(frame): def update(frame):

12
lib/logitech/unifying_receiver/hidpp10.py
View File

@ -87,9 +87,11 @@ class SmoothScroll_Setting(_settings.Setting):
def write(self, value): def write(self, value):
if self._device: if self._device:
reply = self.write_register(0x40 if bool(value) else 0x00) reply = self.write_register(0x40 if bool(value) else 0x00)
self._value = None # self._value = None
if reply: if reply:
return self.read() self._value = value
return value
# return self.read(False)
class MouseDPI_Setting(_settings.Setting): class MouseDPI_Setting(_settings.Setting):
@ -116,9 +118,11 @@ class MouseDPI_Setting(_settings.Setting):
if choice is None: if choice is None:
raise ValueError(repr(value)) raise ValueError(repr(value))
reply = self.write_register(value) reply = self.write_register(value)
self._value = None # self._value = None
if reply: if reply:
return self.read() self._value = value
return value
# return self.read(False)
# #
# functions # functions