apply svgalib input shutdown bugfix patch from ds/XoXus/David Symonds.

Thanks, man!
This commit is contained in:
Bill Currie 2000-04-29 11:57:13 +00:00
parent 8cefba82e2
commit 145475d624
3 changed files with 7 additions and 10 deletions

View file

@ -216,10 +216,11 @@ D: CD-ROM support/optimizations
D: DGA/XMESA support. D: DGA/XMESA support.
D: On-the-fly resizing of window in *-gl versions. D: On-the-fly resizing of window in *-gl versions.
N: David Symonds N: David Symonds (XoXus)
E: xoxus@usa.net E: xoxus@usa.net
D: svgalib fixes D: svgalib fixes
D: warnings cleanup and XShm checking D: warnings cleanup and XShm checking
D: fix for svgalib failing to de-init keyboard
N: Jeff Teunissen (Deek) N: Jeff Teunissen (Deek)
E: deek@quakeforge.net E: deek@quakeforge.net

3
ERRATA
View file

@ -6,9 +6,6 @@ QuakeForge engine. Generally problems will find their way here along with
the person who reported the problem so we can verify it's fixed when we the person who reported the problem so we can verify it's fixed when we
do fix it. Feature requests will usually go into the file WISHLIST. do fix it. Feature requests will usually go into the file WISHLIST.
djsmoke <djsmoke@optonline.net>
- SVGALib target does not properly restore keys on exit
Joseph Carter <knghtbrd@debian.org> Joseph Carter <knghtbrd@debian.org>
- make install is broken - make install is broken

View file

@ -1,12 +1,12 @@
/* /*
vid_svgalib.c vid_svgalib.c
inux SVGALib video routines Linux SVGALib video routines
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 Nelson Rush. Copyright (C) 1999-2000 Nelson Rush.
Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se] Copyright (C) 1999-2000 Marcus Sundberg [mackan@stacken.kth.se]
Copyright (C) 1999-2000 XoXus [xoxus@usa.net] Copyright (C) 1999-2000 David Symonds [xoxus@usa.net]
Copyright (C) 1999,2000 contributors of the QuakeForge project Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors Please see the file "AUTHORS" for a list of contributors
@ -466,7 +466,6 @@ VID_SetMode(int modenum, unsigned char *palette)
D_InitCaches (vid_surfcache, tsize); D_InitCaches (vid_surfcache, tsize);
/* get goin' */ /* get goin' */
/* XoXus: need to check return values! */
err = vga_setmode(current_mode); err = vga_setmode(current_mode);
if (err) { if (err) {
Sys_Error("Video mode failed: %d\n",modenum); Sys_Error("Video mode failed: %d\n",modenum);
@ -509,7 +508,6 @@ VID_Init(unsigned char *palette)
#endif #endif
if (UseDisplay) { if (UseDisplay) {
/* XoXus: return values need to be checked! */
err = vga_init(); err = vga_init();
if (err) if (err)
Sys_Error("SVGALib failed to allocate a new VC\n"); Sys_Error("SVGALib failed to allocate a new VC\n");
@ -553,11 +551,12 @@ VID_Init(unsigned char *palette)
VID_SetPalette(palette); VID_SetPalette(palette);
/* We do want to run in the background when switched away */
/* XoXus: Running in background is just plain bad... */ /* XoXus: Running in background is just plain bad... */
vga_runinbackground(0); vga_runinbackground(0);
} }
IN_Init();
/* XoXus: Why was input initialised here?!? */
/* IN_Init(); */
} }