Lightpen genlock transparency.

diff --git a/include/drawing.h b/include/drawing.h
index bb87a75698d4851b11a2637e281209fe3121cd98..d01d33d24675de7786637508c1ca8cc538f6ebcb 100644 (file)
--- a/include/drawing.h
+++ b/include/drawing.h
@@ -317,7 +317,7 @@ extern void check_custom_limits (void);
 extern void get_custom_topedge (int *x, int *y, bool max);
 extern void get_custom_raw_limits (int *pw, int *ph, int *pdx, int *pdy);
 void get_custom_mouse_limits (int *pw, int *ph, int *pdx, int *pdy, int dbl);
-extern void putpixel (uae_u8 *buf, int bpp, int x, xcolnr c8, int opaq);
+extern void putpixel (uae_u8 *buf, uae_u8 *genlockbuf, int bpp, int x, xcolnr c8, int opaq);
 extern void allocvidbuffer (struct vidbuffer *buf, int width, int height, int depth);
 extern void freevidbuffer (struct vidbuffer *buf);
 extern void check_prefs_picasso(void);

diff --git a/statusline.cpp b/statusline.cpp
index 6253716ac1c7838830bda2ad6e00540791c4027a..bfa6f86eef377534d1f962b0aa6256bbcbc5e9c5 100644 (file)
--- a/statusline.cpp
+++ b/statusline.cpp
@@ -71,9 +71,9 @@ static void write_tdnumber (uae_u8 *buf, int bpp, int x, int y, int num, uae_u32
        numptr = numbers + num * TD_NUM_WIDTH + NUMBERS_NUM * TD_NUM_WIDTH * y;
        for (j = 0; j < TD_NUM_WIDTH; j++) {
                if (*numptr == 'x')
-                       putpixel (buf, bpp, x + j, c1, 1);
+                       putpixel (buf, NULL, bpp, x + j, c1, 1);
                else if (*numptr == '+')
-                       putpixel (buf, bpp, x + j, c2, 0);
+                       putpixel (buf, NULL, bpp, x + j, c2, 0);
                numptr++;
        }
 }
@@ -276,11 +276,11 @@ void draw_status_line_single (uae_u8 *buf, int bpp, int y, int totalwidth, uae_u
 
                x = x_start + pos * TD_WIDTH;
                if (!border)
-                       putpixel (buf, bpp, x - 1, cb, 0);
+                       putpixel (buf, NULL, bpp, x - 1, cb, 0);
                for (j = 0; j < TD_LED_WIDTH; j++)
-                       putpixel (buf, bpp, x + j, c, 0);
+                       putpixel (buf, NULL, bpp, x + j, c, 0);
                if (!border)
-                       putpixel (buf, bpp, x + j, cb, 0);
+                       putpixel (buf, NULL, bpp, x + j, cb, 0);
 
                if (y >= TD_PADY && y - TD_PADY < TD_NUM_HEIGHT) {
                        if (num3 >= 0) {