m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11screen.c: Fix fast version of Update_rect()

Browse Source 
also remove useless static variable;
This commit is contained in:
Thomas Bernard 2019-01-18 18:03:20 +01:00
parent 761100beb0
commit 12df99cc3b
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/x11screen.c
View File

@ -34,7 +34,6 @@
Display * X11_display = NULL; Display * X11_display = NULL;
Window X11_window = 0; Window X11_window = 0;
static XImage * X11_image = NULL; static XImage * X11_image = NULL;
static char * image_pixels = NULL;
static XTextProperty windowName; static XTextProperty windowName;
static GC X11_gc = 0; static GC X11_gc = 0;
static T_GFX2_Surface * screen = NULL; static T_GFX2_Surface * screen = NULL;
@ -171,16 +170,14 @@ void GFX2_Set_mode(int *width, int *height, int fullscreen)
screen->h = *height; screen->h = *height;
XDestroyImage(X11_image); XDestroyImage(X11_image);
X11_image = NULL; X11_image = NULL;
image_pixels = NULL;
} }
if (image_pixels == NULL)
{
image_pixels = malloc(*height * *width * 4);
memset(image_pixels, 64, *height * *width * 4);
}
if (X11_image == NULL) if (X11_image == NULL)
{ {
char * image_pixels = NULL;
image_pixels = malloc(*height * *width * 4);
memset(image_pixels, 64, *height * *width * 4);
X11_image = XCreateImage(X11_display, visual, depth, X11_image = XCreateImage(X11_display, visual, depth,
ZPixmap, 0, image_pixels, *width, *height, ZPixmap, 0, image_pixels, *width, *height,
32, 0/**width * 4*/); 32, 0/**width * 4*/);
@ -264,7 +261,7 @@ void Update_rect(short x, short y, unsigned short width, unsigned short height)
width *= Pixel_width; width *= Pixel_width;
y *= Pixel_height; y *= Pixel_height;
height *= Pixel_height; height *= Pixel_height;
//printf("Update_rect(%d %d %d %d) %d %d\n", x, y, width, height, screen->w, screen->h); //GFX2_Log(GFX2_DEBUG, "Update_rect(%d %d %d %d) %d %d\n", x, y, width, height, screen->w, screen->h);
if (y >= screen->h || x >= screen->w) return; if (y >= screen->h || x >= screen->w) return;
if (y + height > screen->h) if (y + height > screen->h)
height = screen->h - y; height = screen->h - y;
@ -272,9 +269,9 @@ void Update_rect(short x, short y, unsigned short width, unsigned short height)
width = screen->w - x; width = screen->w - x;
for (line = y; line < y + height; line++) for (line = y; line < y + height; line++)
{ {
#if 0 #if 1
const byte * src = Get_Screen_pixel_ptr(x, line); const byte * src = Get_Screen_pixel_ptr(x, line);
byte * dest = image_pixels + line * X11_image->bytes_per_line + x * 4, byte * dest = (byte *)X11_image->data + line * X11_image->bytes_per_line + x * 4;
i = width; i = width;
do do
{ {