Codepaths for VIDEO_X11 macro conditional

This commit is contained in:
Aaron Culliney 2014-03-23 14:43:19 -07:00
parent e57f332ff6
commit 1dd72ec999
2 changed files with 16 additions and 4 deletions

View File

@ -792,7 +792,7 @@ void video_set_mode(a2_video_mode_t mode) {
_size_hints_set_fixed();
}
void _video_init() {
void X11_video_init() {
XSetWindowAttributes attribs;
unsigned long attribmask;
int x, y; /* window position */
@ -1030,7 +1030,7 @@ void _video_init() {
#endif
}
void video_shutdown(void)
void X11_video_shutdown(void)
{
_destroy_image();
exit(0);

View File

@ -699,7 +699,10 @@ void video_plotchar( int x, int y, int scheme, unsigned char c )
c_interface_print_char80_line(&d,&s);
}
extern void _video_init();
#ifdef VIDEO_X11
extern void X11_video_init();
extern void X11_video_shutdown();
#endif
void video_init() {
video__fb1 = vga_mem_page_0;
@ -709,6 +712,15 @@ void video_init() {
memset(video__fb1,0,SCANWIDTH*SCANHEIGHT);
memset(video__fb2,0,SCANWIDTH*SCANHEIGHT);
_video_init();
#ifdef VIDEO_X11
X11_video_init();
#endif
}
void video_shutdown(void)
{
#ifdef VIDEO_X11
X11_video_shutdown();
#endif
}