- DGA and SHM are only tried on local X11 displays

- re-integrated old window update method (better performance over a networked
  display connection), frameskip=0 selects new method, other values select
  old method
- fixed compilation errors
This commit is contained in:
cebix 2000-07-13 16:12:33 +00:00
parent ff5fcd83a7
commit 343ff7f53b
6 changed files with 165 additions and 40 deletions

View File

@ -22,6 +22,7 @@
#include <sys/ioctl.h>
#include <sys/poll.h>
#include <pthread.h>
#include <semaphore.h>
#include <errno.h>
#include <stdio.h>

View File

@ -4244,7 +4244,7 @@ EOF
fi
if [ "x$WANT_NATIVE_M68K" = "xno" ]; then
CPUINCLUDES="-I../cpu_cpu"
CPUINCLUDES="-I../uae_cpu"
CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp $CPUSRCS"
else
CPUINCLUDES="-I../native_cpu"

View File

@ -330,7 +330,7 @@ fi
dnl UAE CPU sources for all non-m68k-native architectures.
if [[ "x$WANT_NATIVE_M68K" = "xno" ]]; then
CPUINCLUDES="-I../cpu_cpu"
CPUINCLUDES="-I../uae_cpu"
CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp ../uae_cpu/fpp.cpp cpustbl.cpp cpudefs.cpp $CPUSRCS"
else
CPUINCLUDES="-I../native_cpu"

View File

@ -75,7 +75,7 @@ struct sigstate {
# include "mon.h"
#endif
#define DEBUG 1
#define DEBUG 0
#include "debug.h"
@ -104,7 +104,7 @@ bool TwentyFourBitAddressing;
// 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 = -1; // FD of /dev/zero

View File

@ -575,6 +575,7 @@ static void mn_10hz(...) {PrefsReplaceInt32("frameskip", 6);}
static void mn_15hz(...) {PrefsReplaceInt32("frameskip", 4);}
static void mn_30hz(...) {PrefsReplaceInt32("frameskip", 2);}
static void mn_60hz(...) {PrefsReplaceInt32("frameskip", 1);}
static void mn_dynamic(...) {PrefsReplaceInt32("frameskip", 0);}
// "Disable Sound Output" button toggled
static void tb_nosound(GtkWidget *widget)
@ -680,27 +681,20 @@ static void create_graphics_pane(GtkWidget *top)
add_menu_item(menu, STR_REF_15HZ_LAB, GTK_SIGNAL_FUNC(mn_15hz));
add_menu_item(menu, STR_REF_30HZ_LAB, GTK_SIGNAL_FUNC(mn_30hz));
add_menu_item(menu, STR_REF_60HZ_LAB, GTK_SIGNAL_FUNC(mn_60hz));
add_menu_item(menu, STR_REF_DYNAMIC_LAB, GTK_SIGNAL_FUNC(mn_dynamic));
int frameskip = PrefsFindInt32("frameskip");
int item = -1;
switch (frameskip) {
case 12:
gtk_menu_set_active(GTK_MENU(menu), 0);
break;
case 8:
gtk_menu_set_active(GTK_MENU(menu), 1);
break;
case 6:
gtk_menu_set_active(GTK_MENU(menu), 2);
break;
case 4:
gtk_menu_set_active(GTK_MENU(menu), 3);
break;
case 2:
gtk_menu_set_active(GTK_MENU(menu), 4);
break;
case 1:
gtk_menu_set_active(GTK_MENU(menu), 5);
break;
case 12: item = 0; break;
case 8: item = 1; break;
case 6: item = 2; break;
case 4: item = 3; break;
case 2: item = 4; break;
case 1: item = 5; break;
case 0: item = 6; break;
}
if (item >= 0)
gtk_menu_set_active(GTK_MENU(menu), item);
gtk_option_menu_set_menu(GTK_OPTION_MENU(w_frameskip), menu);
gtk_table_attach(GTK_TABLE(table), w_frameskip, 1, 2, 1, 2, (GtkAttachOptions)GTK_FILL, (GtkAttachOptions)0, 4, 4);

View File

@ -60,7 +60,7 @@
#include "user_strings.h"
#include "video.h"
#define DEBUG 1
#define DEBUG 0
#include "debug.h"
@ -81,6 +81,7 @@ static int16 mouse_wheel_mode = 1;
static int16 mouse_wheel_lines = 3;
static int display_type = DISPLAY_WINDOW; // See enum above
static bool local_X11; // Flag: X server running on local machine?
static uint8 *the_buffer; // Mac frame buffer
#ifdef HAVE_PTHREADS
@ -164,6 +165,7 @@ static int event2keycode(XKeyEvent *ev);
// From main_unix.cpp
extern char *x_display_name;
extern Display *x_display;
// From sys_unix.cpp
@ -249,8 +251,6 @@ static bool init_window(int width, int height)
// Read frame skip prefs
frame_skip = PrefsFindInt32("frameskip");
if (frame_skip == 0)
frame_skip = 1;
// Create window
XSetWindowAttributes wattr;
@ -290,7 +290,7 @@ static bool init_window(int width, int height)
// Try to create and attach SHM image
have_shm = false;
if (depth != 1 && XShmQueryExtension(x_display)) {
if (depth != 1 && local_X11 && XShmQueryExtension(x_display)) {
// Create SHM image ("height + 2" for safety)
img = XShmCreateImage(x_display, vis, depth, depth == 1 ? XYBitmap : ZPixmap, 0, &shminfo, width, height);
@ -341,7 +341,7 @@ static bool init_window(int width, int height)
img->bitmap_bit_order = MSBFirst;
}
// Allocate memory for frame buffer copy
// Allocate memory for frame buffer
the_buffer = (uint8 *)malloc((aligned_height + 2) * img->bytes_per_line);
// Create GC
@ -660,6 +660,10 @@ static void keycode_init(void)
bool VideoInit(bool classic)
{
// 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 keycode translation
keycode_init();
@ -688,7 +692,7 @@ bool VideoInit(bool classic)
#ifdef ENABLE_XF86_DGA
// DGA available?
int dga_event_base, dga_error_base;
if (XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
if (local_X11 && XF86DGAQueryExtension(x_display, &dga_event_base, &dga_error_base)) {
int dga_flags = 0;
XF86DGAQueryDirectVideo(x_display, screen, &dga_flags);
has_dga = dga_flags & XF86DGADirectPresent;
@ -1311,11 +1315,14 @@ static void handle_events(void)
// Hidden parts exposed, force complete refresh of window
case Expose:
if (display_type == DISPLAY_WINDOW) {
if (frame_skip == 0) { // Dynamic refresh
int x1, y1;
for (y1=0; y1<16; y1++)
for (x1=0; x1<16; x1++)
updt_box[x1][y1] = true;
nr_boxes = 16 * 16;
} else
memset(the_buffer_copy, 0, VideoMonitor.bytes_per_row * VideoMonitor.y);
}
break;
}
@ -1327,7 +1334,8 @@ static void handle_events(void)
* Window display update
*/
static void update_display(int ticker)
// Dynamic display update (variable frame rate for each box)
static void update_display_dynamic(int ticker)
{
int y1, y2, y2s, y2a, i, x1, xm, xmo, ymo, yo, yi, yil, xic, xicl, xi;
int xil = 0;
@ -1416,6 +1424,123 @@ static void update_display(int ticker)
}
}
// Static display update (fixed frame rate, but incremental)
static void update_display_static(void)
{
// Incremental update code
int wide = 0, high = 0, x1, x2, y1, y2, i, j;
int bytes_per_row = VideoMonitor.bytes_per_row;
int bytes_per_pixel = VideoMonitor.bytes_per_row / VideoMonitor.x;
uint8 *p, *p2;
// Check for first line from top and first line from bottom that have changed
y1 = 0;
for (j=0; j<VideoMonitor.y; j++) {
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
y1 = j;
break;
}
}
y2 = y1 - 1;
for (j=VideoMonitor.y-1; j>=y1; j--) {
if (memcmp(&the_buffer[j * bytes_per_row], &the_buffer_copy[j * bytes_per_row], bytes_per_row)) {
y2 = j;
break;
}
}
high = y2 - y1 + 1;
// Check for first column from left and first column from right that have changed
if (high) {
if (depth == 1) {
x1 = VideoMonitor.x;
for (j=y1; j<=y2; j++) {
p = &the_buffer[j * bytes_per_row];
p2 = &the_buffer_copy[j * bytes_per_row];
for (i=0; i<(x1>>3); i++) {
if (*p != *p2) {
x1 = i << 3;
break;
}
p++;
p2++;
}
}
x2 = x1;
for (j=y1; j<=y2; j++) {
p = &the_buffer[j * bytes_per_row];
p2 = &the_buffer_copy[j * bytes_per_row];
p += bytes_per_row;
p2 += bytes_per_row;
for (i=(VideoMonitor.x>>3); i>(x2>>3); i--) {
p--;
p2--;
if (*p != *p2) {
x2 = i << 3;
break;
}
}
}
wide = x2 - x1;
// Update copy of the_buffer
if (high && wide) {
for (j=y1; j<=y2; j++) {
i = j * bytes_per_row + (x1 >> 3);
memcpy(the_buffer_copy + i, the_buffer + i, wide >> 3);
}
}
} else {
x1 = VideoMonitor.x;
for (j=y1; j<=y2; j++) {
p = &the_buffer[j * bytes_per_row];
p2 = &the_buffer_copy[j * bytes_per_row];
for (i=0; i<x1; i++) {
if (memcmp(p, p2, bytes_per_pixel)) {
x1 = i;
break;
}
p += bytes_per_pixel;
p2 += bytes_per_pixel;
}
}
x2 = x1;
for (j=y1; j<=y2; j++) {
p = &the_buffer[j * bytes_per_row];
p2 = &the_buffer_copy[j * bytes_per_row];
p += bytes_per_row;
p2 += bytes_per_row;
for (i=VideoMonitor.x; i>x2; i--) {
p -= bytes_per_pixel;
p2 -= bytes_per_pixel;
if (memcmp(p, p2, bytes_per_pixel)) {
x2 = i;
break;
}
}
}
wide = x2 - x1;
// Update copy of the_buffer
if (high && wide) {
for (j=y1; j<=y2; j++) {
i = j * bytes_per_row + x1 * bytes_per_pixel;
memcpy(the_buffer_copy + i, the_buffer + i, bytes_per_pixel * wide);
}
}
}
}
// Refresh display
if (high && wide) {
if (have_shm)
XShmPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high, 0);
else
XPutImage(x_display, the_win, the_gc, img, x1, y1, x1, y1, wide, high);
}
}
/*
* Thread for screen refresh, input handling etc.
@ -1468,7 +1593,12 @@ void VideoRefresh(void)
static int tick_counter = 0;
if (display_type == DISPLAY_WINDOW) {
tick_counter++;
update_display(tick_counter);
if (frame_skip == 0)
update_display_dynamic(tick_counter);
else if (tick_counter >= frame_skip) {
tick_counter = 0;
update_display_static();
}
}
}