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

screen: different wayland check

Browse Source
This commit is contained in:
alfrix 2024-03-10 22:27:41 -03:00
parent a32d1d8e80
commit 6a81a90cda
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
screen.py
View File

@ -123,7 +123,8 @@ 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)
monitor_amount = Gdk.Display.get_n_monitors(Gdk.Display.get_default()) display = Gdk.Display.get_default()
monitor_amount = Gdk.Display.get_n_monitors(display)
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):
@ -131,8 +132,9 @@ class KlipperScreen(Gtk.Window):
except ValueError: except ValueError:
mon_n = 0 mon_n = 0
logging.info(f"Monitors: {monitor_amount} using number: {mon_n}") logging.info(f"Monitors: {monitor_amount} using number: {mon_n}")
monitor = Gdk.Display.get_default().get_monitor(mon_n) monitor = display.get_monitor(mon_n)
self.wayland = Gdk.Display.get_default().get_primary_monitor() is None self.wayland = display.get_name().startswith('wayland') or display.get_primary_monitor() is None
logging.info(f"Wayland: {self.wayland} Display name: {display.get_name()}")
self.width = self._config.get_main_config().getint("width", None) self.width = self._config.get_main_config().getint("width", None)
self.height = self._config.get_main_config().getint("height", None) self.height = self._config.get_main_config().getint("height", None)
if 'XDG_CURRENT_DESKTOP' in os.environ: if 'XDG_CURRENT_DESKTOP' in os.environ: