Merge pull request #203 from thenaterhood/dev

Next Release

specs/gscreenshot.spec

@@ -1,6 +1,6 @@
 %define name gscreenshot
-%define version 3.6.2
-%define unmangled_version 3.6.2
+%define version 3.6.3
+%define unmangled_version 3.6.3
 %define release 1
 
 Summary: A simple screenshot tool

src/gscreenshot/frontend/gtk/view.py

@@ -449,7 +449,6 @@ def update_preview(self, pixbuf):
 
         This assumes the pixbuf has already been resized appropriately.
         '''
-        # view the previewPixbuf in the image_preview widget
         self._preview.set_from_pixbuf(pixbuf)
 
     def copy_to_clipboard(self, pixbuf):

src/gscreenshot/scaling/scaling_factor.py

@@ -6,7 +6,7 @@
 def get_scaling_factor() -> float:
     """Get the scaling factor for the display"""
     methods = [
-        get_scaling_from_gdk,
+        get_scaling_from_gtk,
         get_scaling_from_qt,
         get_scaling_from_xft_dpi,
     ]
@@ -23,14 +23,21 @@ def get_scaling_factor() -> float:
     return 1
 
 
-def get_scaling_from_gdk() -> typing.Optional[float]:
-    """Get scaling factor from Gdk"""
+def get_scaling_from_gtk() -> typing.Optional[float]:
+    """Get scaling factor from Gtk"""
     # pylint: disable=import-outside-toplevel
     import gi
     gi.require_version('Gtk', '3.0')
-    from gi.repository import Gdk # type: ignore
-    display = Gdk.Display.get_default()
-    monitor = display.get_primary_monitor() or display.get_monitor(0)
+    from gi.repository import Gtk # type: ignore
+
+    window = Gtk.Window()
+    screen = window.get_screen()
+    display = screen.get_display()
+    monitor = (
+        display.get_monitor_at_window(screen.get_root_window())
+        or display.get_primary_monitor()
+        or display.get_monitor(0)
+    )
     if monitor:
         return monitor.get_scale_factor()
     return None

src/gscreenshot/screenshooter/exceptions.py

@@ -6,3 +6,7 @@ class NoSupportedScreenshooterError(BaseException):
     def __init__(self, msg="No supported screenshot backend found", required=None):
         BaseException.__init__(self, msg)
         self.required = required
+
+
+class ScreenshotError(BaseException):
+    '''Generic screenshot error'''

src/gscreenshot/screenshooter/screenshooter.py

@@ -15,6 +15,7 @@
 from gscreenshot.selector.exceptions import SelectionExecError, SelectionParseError
 from gscreenshot.selector.exceptions import SelectionCancelled, NoSupportedSelectorError
 from gscreenshot.util import GSCapabilities
+from .exceptions import ScreenshotError
 
 
 class Screenshooter(object):
@@ -243,15 +244,20 @@ def _call_screenshooter(self, screenshooter: str,
             params = []
 
         params = [screenshooter] + params
+        self._screenshot = None
         try:
-            subprocess.check_output(params)
+            screenshot_output = subprocess.check_output(params)
+            if not os.path.exists(self._tempfile):
+                if len(screenshot_output.decode()) > 0:
+                    raise ScreenshotError(f"screenshot failed: {screenshot_output.decode()}")
+                raise ScreenshotError("screenshot failed but provided no output")
+
             self._screenshot = Screenshot(PIL.Image.open(self._tempfile))
             os.unlink(self._tempfile)
-        except (subprocess.CalledProcessError, IOError, OSError):
-            self._screenshot = None
-            return False
+        except (subprocess.CalledProcessError, IOError, OSError, ScreenshotError) as exc:
+            print(repr(exc))
 
-        return True
+        return self._screenshot is not None
 
     def __repr__(self) -> str:
         return f'{self.__class__.__name__}(selector={self._selector})'

src/gscreenshot/screenshooter/xdg_desktop_portal.py

@@ -98,15 +98,19 @@ def get_request_handle(self, token) -> str:
 
     @staticmethod
     def callback(response, result):
-        '''callback function when a screenshot is completed'''
+        '''
+        callback function when a screenshot is completed
+        Do not raise exceptions or exit in this function - this is a dbus callback
+        and will not fail in a convenient place.
+        '''
         if response == 0:
             uri = result["uri"]
             path = uri.replace("file://", "")
             shutil.move(path, sys.argv[1])
-            loop.quit()
         else:
-            loop.quit()
-            sys.exit(1)
+            print(response, result)
+
+        loop.quit()
 
 
 class XdgDesktopPortal(Screenshooter):

src/gscreenshot/screenshot/screenshot.py

@@ -74,6 +74,9 @@ def get_preview(self, width: int, height: int, with_border=False) -> Image.Image
         except AttributeError: # PIL < 9.0
             antialias_algo = Image.ANTIALIAS
 
+        if thumbnail.height/height < .1 and thumbnail.width/width < .1:
+            thumbnail = thumbnail.resize((thumbnail.width*10, thumbnail.height*10))
+
         thumbnail.thumbnail((width, height), antialias_algo)
 
         if with_border: