qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2024-11-24 21:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

nuq-x11 now compiles and links

Browse source
This commit is contained in:
Bill Currie 2000-08-23 05:56:33 +00:00
parent 7b52e8b908
commit 6f396a55ea
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/dga_check.h
View file

@ -28,11 +28,13 @@
$Id$ $Id$
*/ */
#ifndef DGA_CHECK_H #ifndef __dga_check_h
#define DGA_CHECK_H #define __dga_check_h
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "cvar.h"
extern cvar_t *vid_dga_mouseaccel; extern cvar_t *vid_dga_mouseaccel;
/* /*
@ -50,4 +52,4 @@ int VID_CheckDGA(Display *dpy, int *maj_ver, int *min_ver, int *hasvideo);
*/ */
int VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver); int VID_CheckVMode(Display *dpy, int *maj_ver, int *min_ver);
#endif /* DGA_CHECK_H */ #endif /* __dga_check_h */

17
source/vid_x11.c
View file

@ -47,6 +47,13 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include "d_local.h" #include "d_local.h"
#include "sys.h"
#include "host.h"
#include "qargs.h"
#include "qendian.h"
#include "console.h"
#include "keys.h"
#include "client.h"
cvar_t *_windowed_mouse; cvar_t *_windowed_mouse;
cvar_t *m_filter; cvar_t *m_filter;
@ -505,22 +512,22 @@ void VID_Init (unsigned char *palette)
{ {
if (pnum >= com_argc-2) if (pnum >= com_argc-2)
Sys_Error("VID: -winsize <width> <height>\n"); Sys_Error("VID: -winsize <width> <height>\n");
vid.width = Q_atoi(com_argv[pnum+1]); vid.width = atoi(com_argv[pnum+1]);
vid.height = Q_atoi(com_argv[pnum+2]); vid.height = atoi(com_argv[pnum+2]);
if (!vid.width || !vid.height) if (!vid.width || !vid.height)
Sys_Error("VID: Bad window width/height\n"); Sys_Error("VID: Bad window width/height\n");
} }
if ((pnum=COM_CheckParm("-width"))) { if ((pnum=COM_CheckParm("-width"))) {
if (pnum >= com_argc-1) if (pnum >= com_argc-1)
Sys_Error("VID: -width <width>\n"); Sys_Error("VID: -width <width>\n");
vid.width = Q_atoi(com_argv[pnum+1]); vid.width = atoi(com_argv[pnum+1]);
if (!vid.width) if (!vid.width)
Sys_Error("VID: Bad window width\n"); Sys_Error("VID: Bad window width\n");
} }
if ((pnum=COM_CheckParm("-height"))) { if ((pnum=COM_CheckParm("-height"))) {
if (pnum >= com_argc-1) if (pnum >= com_argc-1)
Sys_Error("VID: -height <height>\n"); Sys_Error("VID: -height <height>\n");
vid.height = Q_atoi(com_argv[pnum+1]); vid.height = atoi(com_argv[pnum+1]);
if (!vid.height) if (!vid.height)
Sys_Error("VID: Bad window height\n"); Sys_Error("VID: Bad window height\n");
} }
@ -532,7 +539,7 @@ void VID_Init (unsigned char *palette)
{ {
if (pnum >= com_argc-1) if (pnum >= com_argc-1)
Sys_Error("VID: -visualid <id#>\n"); Sys_Error("VID: -visualid <id#>\n");
template.visualid = Q_atoi(com_argv[pnum+1]); template.visualid = atoi(com_argv[pnum+1]);
template_mask = VisualIDMask; template_mask = VisualIDMask;
} }