Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-26 16:31:11 +00:00
Code Issues Projects Releases Wiki Activity

allow DGA & Xshm only on local displays

Browse Source
This commit is contained in:
gbeauche 2003-10-26 07:54:02 +00:00
parent 5f0a739cc7
commit 46a1b4ada5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SheepShaver/src/Unix/main_unix.cpp
View File

@ -183,7 +183,7 @@ int64 BusClockSpeed; // Bus clock speed (Hz)
// Global variables
static char *x_display_name = NULL; // X11 display name
char *x_display_name = NULL; // X11 display name
Display *x_display = NULL; // X11 display handle
static int zero_fd = 0; // FD of /dev/zero

12
SheepShaver/src/Unix/video_x.cpp
View File

@ -52,6 +52,7 @@ static int32 frame_skip;
static bool redraw_thread_active = false; // Flag: Redraw thread installed
static pthread_t redraw_thread; // Redraw thread
static bool local_X11; // Flag: X server running on local machine?
static volatile bool thread_stop_req = false;
static volatile bool thread_stop_ack = false; // Acknowledge for thread_stop_req
@ -118,7 +119,8 @@ static int num_x_video_modes;
static void *redraw_func(void *arg);
// From main_linux.cpp
// From main_unix.cpp
extern char *x_display_name;
extern Display *x_display;
// From sys_unix.cpp
@ -197,7 +199,7 @@ static bool open_window(int width, int height)
// Try to create and attach SHM image
have_shm = false;
if (depth != 1 && XShmQueryExtension(x_display)) {
if (local_X11 && depth != 1 && XShmQueryExtension(x_display)) {
// Create SHM image ("height + 2" for safety)
img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
@ -597,6 +599,10 @@ bool VideoInit(void)
mainBuffer.pageInfo = NULL;
#endif
// Check if X server runs on local machine
local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
|| (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);
// Init variables
private_data = NULL;
cur_mode = 0; // Window 640x480
@ -612,7 +618,7 @@ bool VideoInit(void)
#ifdef ENABLE_XF86_DGA
// DGA available?
int event_base, error_base;
if (XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
if (local_X11 && XF86DGAQueryExtension(x_display, &event_base, &error_base)) {
int dga_flags = 0;
XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
has_dga = dga_flags & XF86DGADirectPresent;