CreatBot/CreatBotKlipperScreen
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use environment display on xset

Browse Source 
fixes #1467
This commit is contained in:
Alfredo Monclus
2024-09-20 11:38:56 -03:00
parent 768bbcd285
commit 688ada6c4e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
screen.py
View File

@@ -101,7 +101,12 @@ class KlipperScreen(Gtk.Window):
self.connect("key-press-event", self._key_press_event) self.connect("key-press-event", self._key_press_event)
self.connect("configure_event", self.update_size) self.connect("configure_event", self.update_size)
display = Gdk.Display.get_default() display = Gdk.Display.get_default()
self.display_number = os.environ.get('DISPLAY') or ':0'
logging.debug(f"Display for xset: {self.display_number}")
monitor_amount = Gdk.Display.get_n_monitors(display) monitor_amount = Gdk.Display.get_n_monitors(display)
for i in range(monitor_amount):
m = display.get_monitor(i)
logging.info(f"Screen {i}: {m.get_geometry().width}x{m.get_geometry().height}")
try: try:
mon_n = int(args.monitor) mon_n = int(args.monitor)
if not (-1 < mon_n < monitor_amount): if not (-1 < mon_n < monitor_amount):
@@ -677,7 +682,7 @@ class KlipperScreen(Gtk.Window):
if self._config.get_main_config().get('screen_blanking') != "off": if self._config.get_main_config().get('screen_blanking') != "off":
logging.debug("Screen wake up") logging.debug("Screen wake up")
if not self.wayland: if not self.wayland:
os.system("xset -display :0 dpms force on") os.system(f"xset -display {self.display_number} dpms force on")
def set_dpms(self, use_dpms): def set_dpms(self, use_dpms):
self.use_dpms = use_dpms self.use_dpms = use_dpms
@@ -693,21 +698,21 @@ class KlipperScreen(Gtk.Window):
def set_screenblanking_timeout(self, time): def set_screenblanking_timeout(self, time):
if not self.wayland: if not self.wayland:
os.system("xset -display :0 s off") os.system(f"xset -display {self.display_number} s off")
self.use_dpms = self._config.get_main_config().getboolean("use_dpms", fallback=True) self.use_dpms = self._config.get_main_config().getboolean("use_dpms", fallback=True)
if time == "off": if time == "off":
logging.debug(f"Screen blanking: {time}") logging.debug(f"Screen blanking: {time}")
self.blanking_time = 0 self.blanking_time = 0
if not self.wayland: if not self.wayland:
os.system("xset -display :0 dpms 0 0 0") os.system(f"xset -display {self.display_number} dpms 0 0 0")
return return
self.blanking_time = abs(int(time)) self.blanking_time = abs(int(time))
logging.debug(f"Changing screen blanking to: {self.blanking_time}") logging.debug(f"Changing screen blanking to: {self.blanking_time}")
if self.use_dpms and functions.dpms_loaded is True: if self.use_dpms and functions.dpms_loaded is True:
if not self.wayland: if not self.wayland:
os.system("xset -display :0 +dpms") os.system(f"xset -display {self.display_number} +dpms")
if functions.get_DPMS_state() == functions.DPMS_State.Fail: if functions.get_DPMS_state() == functions.DPMS_State.Fail:
logging.info("DPMS State FAIL") logging.info("DPMS State FAIL")
self.show_popup_message(_("DPMS has failed to load and has been disabled")) self.show_popup_message(_("DPMS has failed to load and has been disabled"))
@@ -716,13 +721,13 @@ class KlipperScreen(Gtk.Window):
else: else:
logging.debug("Using DPMS") logging.debug("Using DPMS")
if not self.wayland: if not self.wayland:
os.system(f"xset -display :0 dpms 0 {self.blanking_time} 0") os.system(f"xset -display {self.display_number} dpms 0 {self.blanking_time} 0")
GLib.timeout_add_seconds(1, self.check_dpms_state) GLib.timeout_add_seconds(1, self.check_dpms_state)
return return
# Without dpms just blank the screen # Without dpms just blank the screen
logging.debug("Not using DPMS") logging.debug("Not using DPMS")
if not self.wayland: if not self.wayland:
os.system("xset -display :0 dpms 0 0 0") os.system(f"xset -display {self.display_number} dpms 0 0 0")
self.reset_screensaver_timeout() self.reset_screensaver_timeout()
return return