itermediate working result

diff --git a/scwin32.c b/scwin32.c
index 8613f4cd144efea1cd4c4b76468c5a52c26d0dd7..2ce2ab26b9f364ad6f6d7d9e7ac06c5380b8620f 100644 (file)
--- a/scwin32.c
+++ b/scwin32.c
@@ -3,19 +3,84 @@
 #include <string.h>
 #include "imss.h"
 
+/* the SDK headers supplied with cygwin, and with some older strawberry perls */
+#ifndef DISPLAY_DEVICE_ACTIVE
+#define DISPLAY_DEVICE_ACTIVE 1
+#endif
+
+struct moniter_ctx {
+  i_img *out;
+  i_img_dim orig_x, orig_y;
+};
+
+static int
+display_to_img(HDC dc, i_img *im, const RECT *src, int dest_x, int dest_y) {
+  HBITMAP work_bmp;
+  HDC bmdc;
+  HBITMAP old_dc_bmp;
+  i_img_dim width = src->right - src->left;
+  i_img_dim height = src->bottom - src->top;
+  int result = 0;
+  BITMAPINFO bmi;
+  unsigned char *di_bits;
+
+  work_bmp = CreateCompatibleBitmap(dc, width, height);
+  bmdc = CreateCompatibleDC(dc);
+  old_dc_bmp = SelectObject(bmdc, work_bmp);
+  BitBlt(bmdc, 0, 0, width, height, dc, src->left, src->top, SRCCOPY);
+
+  /* make a dib */
+  memset(&bmi, 0, sizeof(bmi));
+  bmi.bmiHeader.biSize = sizeof(bmi);
+  bmi.bmiHeader.biWidth = width;
+  bmi.bmiHeader.biHeight = -height;
+  bmi.bmiHeader.biPlanes = 1;
+  bmi.bmiHeader.biBitCount = 32;
+  bmi.bmiHeader.biCompression = BI_RGB;
+
+  di_bits = mymalloc(4 * width * height);
+  if (GetDIBits(bmdc, work_bmp, 0, height, di_bits, &bmi, DIB_RGB_COLORS)) {
+    i_color *line = mymalloc(sizeof(i_color) * width);
+    i_color *cp;
+    int x, y;
+    unsigned char *ch_pp = di_bits;
+    for (y = 0; y < height; ++y) {
+      cp = line;
+      for (x = 0; x < width; ++x) {
+       cp->rgb.b = *ch_pp++;
+       cp->rgb.g = *ch_pp++;
+       cp->rgb.r = *ch_pp++;
+       ch_pp++;
+       cp++;
+      }
+      i_plin(im, dest_x, width, dest_y + y, line);
+    }
+    myfree(line);
+    result = 1;
+  }
+  else {
+    i_push_errorf(0, "GetDIBits() failure %d", (long)GetLastError());
+  }
+
+  myfree(di_bits);
+  SelectObject(bmdc, old_dc_bmp);
+  DeleteDC(bmdc);
+  DeleteObject(work_bmp);
+
+  return result;
+}
+
 i_img *
 imss_win32(unsigned hwnd_u, int include_decor, int left, int top, 
           int right, int bottom, int display) {
   HWND hwnd = (HWND)hwnd_u;
-  HDC cdc = 0, wdc, bmdc;
-  HBITMAP work_bmp, old_dc_bmp;
+  HDC cdc = 0, wdc;
   int orig_x = 0;
   int orig_y = 0;
   int window_width, window_height;
-  BITMAPINFO bmi;
-  unsigned char *di_bits;
   i_img *result = NULL;
   int width, height;
+  int channels = 3;
 
   i_clear_error();
 
@@ -44,12 +109,14 @@ imss_win32(unsigned hwnd_u, int include_decor, int left, int top,
       orig_y = GetSystemMetrics(SM_YVIRTUALSCREEN);
       window_width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
       window_height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+      channels = 4;
     }
     else {
       DISPLAY_DEVICE dd;
       dd.cb = sizeof(dd);
 
       if (EnumDisplayDevices(NULL, display, &dd, 0)) {
+       printf("Flags %lx\n", (unsigned long)dd.StateFlags);
        if (dd.StateFlags & DISPLAY_DEVICE_ACTIVE) {
          cdc = CreateDC(dd.DeviceName, dd.DeviceName, NULL, NULL);
        }
@@ -101,60 +168,29 @@ imss_win32(unsigned hwnd_u, int include_decor, int left, int top,
   }
   width = right - left;
   height = bottom - top;
-
-  work_bmp = CreateCompatibleBitmap(wdc, width, height);
-  bmdc = CreateCompatibleDC(wdc);
-  old_dc_bmp = SelectObject(bmdc, work_bmp);
-  BitBlt(bmdc, 0, 0, width, height, wdc, orig_x + left, orig_y + top, SRCCOPY);
-
-  /* make a dib */
-  memset(&bmi, 0, sizeof(bmi));
-  bmi.bmiHeader.biSize = sizeof(bmi);
-  bmi.bmiHeader.biWidth = width;
-  bmi.bmiHeader.biHeight = -height;
-  bmi.bmiHeader.biPlanes = 1;
-  bmi.bmiHeader.biBitCount = 32;
-  bmi.bmiHeader.biCompression = BI_RGB;
-
-  di_bits = mymalloc(4 * width * height);
-  if (GetDIBits(bmdc, work_bmp, 0, height, di_bits, &bmi, DIB_RGB_COLORS)) {
-    result = i_img_8_new(width, height, 3);
-
-    if (result) {
-      i_color *line = mymalloc(sizeof(i_color) * width);
-      i_color *cp;
-      int x, y;
-      unsigned char *ch_pp = di_bits;
-      for (y = 0; y < height; ++y) {
-       cp = line;
-       for (x = 0; x < width; ++x) {
-         cp->rgb.b = *ch_pp++;
-         cp->rgb.g = *ch_pp++;
-         cp->rgb.r = *ch_pp++;
-         ch_pp++;
-         cp++;
-       }
-       i_plin(result, 0, width, y, line);
-      }
-      myfree(line);
+  
+  result = i_img_8_new(width, height, channels);
+  
+  if (result) {
+    RECT r;
+    r.left = orig_x + left;
+    r.top = orig_y + top;
+    r.right = r.left + width;
+    r.bottom = r.top + height;
+    
+    if (display_to_img(wdc, result, &r, 0, 0)) {
+      i_tags_setn(&result->tags, "ss_window_width", window_width);
+      i_tags_setn(&result->tags, "ss_window_height", window_height);
+      i_tags_set(&result->tags, "ss_type", "Win32", 5);
+      i_tags_setn(&result->tags, "ss_left", left);
+      i_tags_setn(&result->tags, "ss_top", top);
+    }
+    else {
+      i_img_destroy(result);
+      result = NULL;
     }
   }
-  else {
-    i_push_errorf(0, "GetDIBits() failure %d", (long)GetLastError());
-  }
-
-  i_tags_setn(&result->tags, "ss_window_width", window_width);
-  i_tags_setn(&result->tags, "ss_window_height", window_height);
-  i_tags_set(&result->tags, "ss_type", "Win32", 5);
-  i_tags_setn(&result->tags, "ss_left", left);
-  i_tags_setn(&result->tags, "ss_top", top);
-
   /* clean up */
-  myfree(di_bits);
-  SelectObject(bmdc, old_dc_bmp);
-  DeleteDC(bmdc);
-  DeleteObject(work_bmp);
-
   if (cdc) {
     DeleteDC(cdc);
   }