use monitor to select the monitor to grab instead of overloading display

diff --git a/Screenshot.pm b/Screenshot.pm
index beecbc96d916d9cdcb3e4743f1229345db95b879..93735fca659118fcaa5da541ea743818d9e90a22 100644 (file)
--- a/Screenshot.pm
+++ b/Screenshot.pm
@@ -35,6 +35,7 @@ sub screenshot {
      top => 0,
      right => 0,
      bottom => 0,
+     monitor => 0,
      @_);
 
   my $result;
@@ -42,7 +43,7 @@ sub screenshot {
     defined &_win32
       or die "Win32 driver not enabled\n";
     $result = _win32($opts{hwnd}, $opts{decor}, $opts{left}, $opts{top},
-                    $opts{right}, $opts{bottom}, $opts{display});
+                    $opts{right}, $opts{bottom}, $opts{monitor});
   }
   elsif (defined $opts{id}) { # X11 window id
     exists $opts{display} or $opts{display} = 0;
@@ -88,7 +89,7 @@ sub screenshot {
   else {
     $result =
       defined &_win32 ? _win32(0, $opts{decor}, $opts{left}, $opts{top},
-                              $opts{right}, $opts{bottom}, $opts{display}) :
+                              $opts{right}, $opts{bottom}, $opts{monitor}) :
       defined &_darwin ? _darwin($opts{left}, $opts{top},
                                 $opts{right}, $opts{bottom}) :
       defined &_x11 ? _x11($opts{display}, 0, $opts{left}, $opts{top},
@@ -195,7 +196,7 @@ As of 0.010 hwnd can also be C<"active"> to capture the active (or
 
 Retrieve a screeshot of the default desktop under Win32.
 
-=item screenshot hwnd => 0, display => -1
+=item screenshot hwnd => 0, monitor => -1
 
 Retrieve a screenshot of all attached monitors under Win32.
 
@@ -203,10 +204,12 @@ Note: this returns an image with an alpha channel, since there can be
 regions in the bounding rectangle of all monitors that no particular
 monitor covers.
 
-=item screenshot hwnd => 0, display => I<index>
+=item screenshot hwnd => 0, monitor => I<index>
 
 Retrieve a screenshot from a particular monitor under Win32.  A
-I<display> of zero is always treated as the primary monitor.
+I<monitor> of zero is always treated as the primary monitor.
+
+If the given monitor is not active screenshot() will fail.
 
 =item screenshot id => I<window id>
 

diff --git a/Screenshot.xs b/Screenshot.xs
index d908364e1585cb4bf709f4c89a83635e38c735d7..ecc5a3dbbd26e9c901b7d931f75ffdc85fde9693 100644 (file)
--- a/Screenshot.xs
+++ b/Screenshot.xs
@@ -20,14 +20,14 @@ PROTOTYPES: DISABLE
 #ifdef SS_WIN32
 
 Imager::ImgRaw
-imss_win32(hwnd, include_decor = 0, left = 0, top = 0, right = 0, bottom = 0, display = 0)
+imss_win32(hwnd, include_decor = 0, left = 0, top = 0, right = 0, bottom = 0, monitor = 0)
        SSHWND hwnd
        int include_decor
        int left
        int top
        int right
        int bottom
-       int display
+       int monitor
 
 #endif