Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-27 23:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Allow 2x window scale and beginnings of fullscreen

Browse Source
This commit is contained in:
Aaron Culliney 2013-11-24 18:24:00 -08:00
parent 64abddfe2f
commit e94e9d6b10
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/video.h
View File

@ -104,6 +104,14 @@ void video_plotchar(int row, int col, int color, unsigned char code);
*/ */
void video_sync(int block); void video_sync(int block);
typedef enum A2_VIDSCALE {
VIDEO_FULL_SCREEN = 0,
VIDEO_SCALE_1,
VIDEO_SCALE_2
} A2_VIDSCALE;
void video_setscale();
#endif /* !__ASSEMBLER__ */ #endif /* !__ASSEMBLER__ */
/**** Private stuff follows *****/ /**** Private stuff follows *****/

38
src/xvideo.c
View File

@ -42,6 +42,7 @@ static Display *display;
static Window win; static Window win;
static GC gc; static GC gc;
static unsigned int width, height; /* window size */ static unsigned int width, height; /* window size */
static A2_VIDSCALE scale = VIDEO_SCALE_1;
static int screen_num; static int screen_num;
static XVisualInfo visualinfo; static XVisualInfo visualinfo;
@ -442,6 +443,26 @@ static void post_image() {
((uint32_t)(colors[index].blue) << blue_shift) | ((uint32_t)(colors[index].blue) << blue_shift) |
((uint32_t)0xff /* alpha */ << alpha_shift) ((uint32_t)0xff /* alpha */ << alpha_shift)
); );
if (scale == VIDEO_SCALE_2)
{
j+=4;
// duplicate pixel
*( (uint32_t*)(image->data + j) ) = (uint32_t)(
((uint32_t)(colors[index].red) << red_shift) |
((uint32_t)(colors[index].green) << green_shift) |
((uint32_t)(colors[index].blue) << blue_shift) |
((uint32_t)0xff /* alpha */ << alpha_shift)
);
if (((i+1) % SCANWIDTH) == 0)
{
// duplicate entire row
int stride8 = SCANWIDTH<<3;//*8
memcpy(/* dest */image->data + j + 4, /* src */image->data + j + 4 - stride8, stride8);
j += stride8;
}
}
} }
// post image... // post image...
@ -454,7 +475,7 @@ static void post_image() {
image, image,
0, 0, 0, 0,
0, 0, 0, 0,
SCANWIDTH, SCANHEIGHT, width, height,
True)) True))
{ {
fprintf(stderr, "XShmPutImage() failed\n"); fprintf(stderr, "XShmPutImage() failed\n");
@ -469,7 +490,7 @@ static void post_image() {
image, image,
0, 0, 0, 0,
0, 0, 0, 0,
SCANWIDTH, SCANHEIGHT width, height
)) ))
{ {
fprintf(stderr, "XPutImage() failed\n"); fprintf(stderr, "XPutImage() failed\n");
@ -593,6 +614,10 @@ static void parseArgs() {
{ {
doShm=0; doShm=0;
} }
else if (strstr(argv[i], "-2"))
{
scale=VIDEO_SCALE_2;
}
} }
} }
@ -713,7 +738,8 @@ void video_init() {
* but would be settable from the command line or resource database. * but would be settable from the command line or resource database.
*/ */
x = y = 0; x = y = 0;
width = SCANWIDTH, height = SCANHEIGHT; width = SCANWIDTH*scale;
height = SCANHEIGHT*scale;
/* init MITSHM if we're doing it */ /* init MITSHM if we're doing it */
if (doShm) if (doShm)
@ -821,14 +847,14 @@ void video_init() {
// pad pixels to uint32_t boundaries // pad pixels to uint32_t boundaries
int bitmap_pad = sizeof(uint32_t); int bitmap_pad = sizeof(uint32_t);
int pixel_buffer_size = SCANWIDTH*SCANHEIGHT*bitmap_pad; int pixel_buffer_size = width*height*bitmap_pad;
xshmeventtype = XShmGetEventBase(display) + ShmCompletion; xshmeventtype = XShmGetEventBase(display) + ShmCompletion;
/* create the image */ /* create the image */
if (doShm) if (doShm)
{ {
image = XShmCreateImage(display, visualinfo.visual, visualinfo.depth, ZPixmap, NULL, &xshminfo, SCANWIDTH, SCANHEIGHT); image = XShmCreateImage(display, visualinfo.visual, visualinfo.depth, ZPixmap, NULL, &xshminfo, width, height);
if (!image) if (!image)
{ {
@ -858,7 +884,7 @@ void video_init() {
} }
printf("Creating regular XImage\n"); printf("Creating regular XImage\n");
image = XCreateImage(display, visualinfo.visual, visualinfo.depth, ZPixmap, 0 /*offset*/, data, SCANWIDTH, SCANHEIGHT, 8, SCANWIDTH*bitmap_pad /*bytes_per_line*/); image = XCreateImage(display, visualinfo.visual, visualinfo.depth, ZPixmap, 0 /*offset*/, data, width, height, 8, width*bitmap_pad /*bytes_per_line*/);
if (!image) if (!image)
{ {