Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-19 19:30:42 +00:00
Code Issues Projects Releases Wiki Activity

reuse existing mask layer

Browse Source
This commit is contained in:
Jesús A. Álvarez 2019-11-05 21:35:03 +01:00
parent f81ca7897a
commit f995962795
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BasiliskII/src/MacOSX/utils_macosx.mm
View File

@ -71,9 +71,11 @@ void make_window_transparent(SDL_Window * window)
NSWindow *cocoaWindow = wmInfo.info.cocoa.window; NSWindow *cocoaWindow = wmInfo.info.cocoa.window;
NSView *sdlView = cocoaWindow.contentView; NSView *sdlView = cocoaWindow.contentView;
sdlView.layer.backgroundColor = [NSColor clearColor].CGColor; sdlView.layer.backgroundColor = [NSColor clearColor].CGColor;
CALayer *maskLayer = [CAShapeLayer layer]; if (SDL_GetWindowData(window, "maskLayer") == NULL) {
sdlView.layer.mask = [maskLayer retain]; CALayer *maskLayer = [CAShapeLayer layer];
SDL_SetWindowData(window, "maskLayer", maskLayer); sdlView.layer.mask = maskLayer;
SDL_SetWindowData(window, "maskLayer", maskLayer);
}
cocoaWindow.backgroundColor = [NSColor clearColor]; cocoaWindow.backgroundColor = [NSColor clearColor];
cocoaWindow.hasShadow = NO; cocoaWindow.hasShadow = NO;
cocoaWindow.opaque = NO; cocoaWindow.opaque = NO;

20
BasiliskII/src/SDL/video_rootless.cpp
View File

@ -13,6 +13,9 @@
#include "prefs.h" #include "prefs.h"
#include <vector> #include <vector>
extern void make_window_transparent(SDL_Window * window);
extern void update_sdl_video(SDL_Surface *s, int numrects, SDL_Rect *rects);
/* /*
* Rootless mode support * Rootless mode support
*/ */
@ -340,13 +343,23 @@ void update_display_mask(SDL_Window *window, int w, int h) {
printf("low_mem_map at 0x%x\n", low_mem_map); printf("low_mem_map at 0x%x\n", low_mem_map);
} }
std::vector<SDL_Rect> mask_rects;
if (display_mask.w != w || display_mask.h != h) { if (display_mask.w != w || display_mask.h != h) {
// new mask // new mask
free(display_mask.pixels); free(display_mask.pixels);
display_mask.pixels = (uint8_t*)calloc(1, w*h*2); display_mask.pixels = (uint8_t*)calloc(2, w*h);
display_mask.cursorMask = &display_mask.pixels[display_mask.w * display_mask.h];
display_mask.w = w; display_mask.w = w;
display_mask.h = h; display_mask.h = h;
display_mask.cursorMask = &display_mask.pixels[display_mask.w * display_mask.h];
// update whole screen
make_window_transparent(window);
SDL_Rect rect = {.x = 0, .y = 0, .w = w, .h = h};
update_sdl_video(NULL, 1, &rect);
mask_rects.push_back(rect);
memset(display_mask.pixels, 0xff, 2 * display_mask.w * display_mask.h);
return;
} }
// clear all // clear all
@ -358,7 +371,6 @@ void update_display_mask(SDL_Window *window, int w, int h) {
MaskRegion(deskPortVisRgn, false); MaskRegion(deskPortVisRgn, false);
bool has_front_process = false; bool has_front_process = false;
std::vector<SDL_Rect> mask_rects;
M68kRegisters r; M68kRegisters r;
uint32 rootLayerPtr = 0; uint32 rootLayerPtr = 0;
@ -418,8 +430,6 @@ void apply_display_mask(SDL_Surface * host_surface, SDL_Rect update_rect) {
return; return;
} }
//printf("apply video mask (%d,%d->%dx%d)\n", (int)update_rect.x, (int)update_rect.y, (int)update_rect.w, (int)update_rect.h);
if (host_surface->format->format != SDL_PIXELFORMAT_ARGB8888) { if (host_surface->format->format != SDL_PIXELFORMAT_ARGB8888) {
printf("Invalid host surface\n"); printf("Invalid host surface\n");
return; return;

7
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -66,7 +66,6 @@
#include "vm_alloc.h" #include "vm_alloc.h"
#ifdef VIDEO_ROOTLESS #ifdef VIDEO_ROOTLESS
extern void make_window_transparent(SDL_Window * window);
extern void update_display_mask(SDL_Window * window, int w, int h); extern void update_display_mask(SDL_Window * window, int w, int h);
extern void apply_display_mask(SDL_Surface * host_surface, SDL_Rect update_rect); extern void apply_display_mask(SDL_Surface * host_surface, SDL_Rect update_rect);
extern bool cursor_point_opaque(void); extern bool cursor_point_opaque(void);
@ -757,12 +756,6 @@ static SDL_Surface * init_sdl_video(int width, int height, int bpp, Uint32 flags
} }
} }
if (flags & SDL_WINDOW_FULLSCREEN) SDL_SetWindowGrab(sdl_window, SDL_TRUE); if (flags & SDL_WINDOW_FULLSCREEN) SDL_SetWindowGrab(sdl_window, SDL_TRUE);
#ifdef VIDEO_ROOTLESS
if (PrefsFindBool("rootless")) {
make_window_transparent(sdl_window);
}
#endif
// Some SDL events (regarding some native-window events), need processing // Some SDL events (regarding some native-window events), need processing
// as they are generated. SDL2 has a facility, SDL_AddEventWatch(), which // as they are generated. SDL2 has a facility, SDL_AddEventWatch(), which