add a MANIFEST

diff --git a/MANIFEST b/MANIFEST
new file mode 100644 (file)
index 0000000..d77f018
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,15 @@
+imss.h\r
+Makefile.PL\r
+MANIFEST                       This list of files\r
+MANIFEST.SKIP\r
+Screenshot.c\r
+Screenshot.pm\r
+Screenshot.xs\r
+scwin32.c\r
+scx11.c\r
+t/00load.t\r
+t/10win32.t\r
+t/20x11.t\r
+t/30tkx11.t\r
+t/40tkwin32.t\r
+t/90pod.t\r

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
new file mode 100644 (file)
index 0000000..d680162
--- /dev/null
+++ b/MANIFEST.SKIP
@@ -0,0 +1,12 @@
+\.svn\r
+vc60\.pdb\r
+^blib\r
+\.def$\r
+\.old$\r
+^Makefile$\r
+\.bs$\r
+^pm_to_blib$\r
+~$\r
+\.obj$\r
+\.o$\r
+\.bak$\r

diff --git a/Screenshot.pm b/Screenshot.pm
index f2e2d23bd8813bc8785ea8bd04af9d5a0bf8b0e6..68cb9580d8ba2e7d0daa93ef20197974744d0544 100644 (file)
--- a/Screenshot.pm
+++ b/Screenshot.pm
@@ -32,45 +32,43 @@ sub screenshot {
   my $result;\r
   if (!@_) {\r
     my $result =\r
-      defined &win32 ? win32(0) :\r
-       defined &x11 ? x11($opts{display}, 0) :\r
+      defined &_win32 ? _win32(0) :\r
+       defined &_x11 ? _x11($opts{display}, 0) :\r
           die "No drivers enabled\n";\r
   }\r
   if (defined $opts{hwnd}) {\r
-    defined &win32\r
+    defined &_win32\r
       or die "Win32 driver not enabled\n";\r
-    $result = win32($opts{hwnd}, $opts{decor});\r
+    $result = _win32($opts{hwnd}, $opts{decor});\r
   }\r
   elsif (defined $opts{id}) { # X11 window id\r
-    defined &x11\r
+    defined &_x11\r
       or die "X11 driver not enabled\n";\r
-    $result = x11($opts{display}, $opts{id});\r
+    $result = _x11($opts{display}, $opts{id});\r
   }\r
   elsif ($opts{widget}) {\r
     # Perl/Tk widget\r
     my $top = $opts{widget}->toplevel;\r
     my $sys = $top->windowingsystem;\r
     if ($sys eq 'win32') {\r
-      unless (defined &win32) {\r
+      unless (defined &_win32) {\r
         Imager->_set_error("Win32 Tk and Win32 support not built");\r
         return;\r
       }\r
-      $result = win32(hex($opts{widget}->id));\r
+      $result = _win32(hex($opts{widget}->id));\r
     }\r
     elsif ($sys eq 'x11') {\r
-      unless (defined &x11) {\r
+      unless (defined &_x11) {\r
         Imager->_set_error("X11 Tk and X11 support not built");\r
         return;\r
       }\r
 \r
       my $id_hex = $opts{widget}->id;\r
-      print "id $id_hex\n";\r
       $opts{widget}->can('frame') \r
         and $id_hex = $opts{widget}->frame;\r
-      print "id $id_hex\n";\r
       \r
       # is there a way to get the display pointer from Tk?\r
-      $result = x11(0, hex($id_hex));\r
+      $result = _x11(0, hex($id_hex));\r
     }\r
     else {\r
       Imager->_set_error("Unsupported windowing system '$sys'");\r
@@ -87,11 +85,11 @@ sub screenshot {
 }\r
 \r
 sub have_win32 {\r
-  defined &win32;\r
+  defined &_win32;\r
 }\r
 \r
 sub have_x11 {\r
-  defined &x11;\r
+  defined &_x11;\r
 }\r
 \r
 sub x11_open {\r

diff --git a/Screenshot.xs b/Screenshot.xs
index a22c2f78ff3d94b0ccd7d90f2ed70066dab47faf..eac1afdded9806561476a1aa3614a7ac816cb8f0 100644 (file)
--- a/Screenshot.xs
+++ b/Screenshot.xs
@@ -9,7 +9,7 @@ DEFINE_IMAGER_CALLBACKS;
 \r
 #define imss__x11_open imss_x11_open\r
 \r
-MODULE = Imager::Screenshot  PACKAGE = Imager::Screenshot PREFIX = imss_\r
+MODULE = Imager::Screenshot  PACKAGE = Imager::Screenshot PREFIX = imss\r
 \r
 PROTOTYPES: DISABLE\r
 \r
@@ -30,7 +30,7 @@ imss_x11(display, window_id)
        int window_id\r
 \r
 unsigned long\r
-imss__x11_open(display_name = NULL)\r
+imss_x11_open(display_name = NULL)\r
         const char *display_name\r
 \r
 void\r