qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-18 01:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

context_x11.c: whitespace.

Browse source 
dga_check.c: Make sure that the version of the VidMode extension at
runtime is the same version we compiled with, to deal with a structure
change that occurred between VidMode extension versions 1 and 2. If a
version 3 is developed, this will have to be fixed again.
This commit is contained in:
Jeff Teunissen 2001-02-11 16:05:52 +00:00
parent 549bbbdb1b
commit 443944c48b
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/context_x11.c
View file

@ -279,7 +279,7 @@ x11_set_vidmode (int width, int height)
XF86VidModeGetAllModeLines (x_disp, x_screen, &nummodes, &vidmodes); XF86VidModeGetAllModeLines (x_disp, x_screen, &nummodes, &vidmodes);
XF86VidModeGetViewPort (x_disp, x_screen, &screen_width, &screen_height); XF86VidModeGetViewPort (x_disp, x_screen, &screen_width, &screen_height);
for (i = 0; i < nummodes; i++) { for (i = 0; i < nummodes; i++) {
if ((vidmodes[i]->hdisplay == screen_width) && if ((vidmodes[i]->hdisplay == screen_width) &&
(vidmodes[i]->vdisplay == screen_height)) { (vidmodes[i]->vdisplay == screen_height)) {

36
source/dga_check.c
View file

@ -40,6 +40,11 @@
#endif #endif
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
# include <X11/extensions/xf86vmode.h> # include <X11/extensions/xf86vmode.h>
# ifdef X_XF86VidModeSetClientVersion
# define VIDMODE_VERSION 2
# else
# define VIDMODE_VERSION 1
# endif
#endif #endif
#include "dga_check.h" #include "dga_check.h"
@ -54,7 +59,8 @@ qboolean
VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo) VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
{ {
#ifdef HAVE_DGA #ifdef HAVE_DGA
int event_base, error_base, dgafeat, dummy; int event_base, error_base, dgafeat;
int dummy, dummy_major, dummy_minor, dummy_video;
if (!XQueryExtension (dpy, "XFree86-DGA", &dummy, &dummy, &dummy)) { if (!XQueryExtension (dpy, "XFree86-DGA", &dummy, &dummy, &dummy)) {
return false; return false;
@ -65,16 +71,16 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
} }
if (!maj_ver) if (!maj_ver)
maj_ver = &dummy; maj_ver = &dummy_major;
if (!min_ver) if (!min_ver)
min_ver = &dummy; min_ver = &dummy_minor;
if (!XF86DGAQueryVersion (dpy, maj_ver, min_ver)) { if (!XF86DGAQueryVersion (dpy, maj_ver, min_ver)) {
return false; return false;
} }
if (!hasvideo) if (!hasvideo)
hasvideo = &dummy; hasvideo = &dummy_video;
if (!XF86DGAQueryDirectVideo (dpy, DefaultScreen (dpy), &dgafeat)) { if (!XF86DGAQueryDirectVideo (dpy, DefaultScreen (dpy), &dgafeat)) {
*hasvideo = 0; *hasvideo = 0;
@ -83,7 +89,7 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
} }
if (!(dgafeat & (XF86DGADirectPresent | XF86DGADirectMouse))) { if (!(dgafeat & (XF86DGADirectPresent | XF86DGADirectMouse))) {
return false; return false;
} }
return true; return true;
@ -101,9 +107,9 @@ VID_CheckDGA (Display * dpy, int *maj_ver, int *min_ver, int *hasvideo)
qboolean qboolean
VID_CheckVMode (Display * dpy, int *maj_ver, int *min_ver) VID_CheckVMode (Display * dpy, int *maj_ver, int *min_ver)
{ {
#if defined(HAVE_VIDMODE) #ifdef HAVE_VIDMODE
int event_base, error_base; int event_base, error_base;
int dummy; int dummy, dummy_major, dummy_minor;
if (!XQueryExtension (dpy, "XFree86-VidModeExtension", &dummy, &dummy, &dummy)) { if (!XQueryExtension (dpy, "XFree86-VidModeExtension", &dummy, &dummy, &dummy)) {
return false; return false;
@ -113,14 +119,16 @@ VID_CheckVMode (Display * dpy, int *maj_ver, int *min_ver)
return false; return false;
} }
if (maj_ver == NULL) if (!maj_ver)
maj_ver = &dummy; maj_ver = &dummy_major;
if (min_ver == NULL) if (!min_ver)
min_ver = &dummy; min_ver = &dummy_minor;
if (!XF86VidModeQueryVersion (dpy, maj_ver, min_ver)) { if (!XF86VidModeQueryVersion (dpy, maj_ver, min_ver))
return false;
if ((!maj_ver) || (*maj_ver != VIDMODE_VERSION))
return false; return false;
}
return true; return true;
#else #else