qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Whitespace.

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-08-21 05:59:00 +00:00
parent 84afd9e299
commit 9d2e09feee
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/video/targets/in_x11.c
View file

@ -157,7 +157,7 @@ selection_notify (XEvent *event)
if (XGetWindowProperty (x_disp, x_win, property, 0, num_bytes, True, if (XGetWindowProperty (x_disp, x_win, property, 0, num_bytes, True,
AnyPropertyType, &type, &format, &len, &tmp, &data) AnyPropertyType, &type, &format, &len, &tmp, &data)
!= Success) { != Success) {
XFree (data); //FIXME is this correct for this instance? XFree (data); // FIXME is this correct for this instance?
return; return;
} }
@ -562,8 +562,7 @@ IN_LL_Ungrab_Input (void)
void void
IN_LL_SendKeyEvents (void) IN_LL_SendKeyEvents (void)
{ {
// Get events from X server. X11_ProcessEvents (); // Get events from X server.
X11_ProcessEvents ();
} }
void void

22
libs/video/targets/vid_glx.c
View file

@ -62,13 +62,13 @@ static const char rcsid[] =
#include "compat.h" #include "compat.h"
#include "context_x11.h" #include "context_x11.h"
#include "sbar.h"
#include "r_cvar.h" #include "r_cvar.h"
#include "sbar.h"
#define WARP_WIDTH 320 #define WARP_WIDTH 320
#define WARP_HEIGHT 200 #define WARP_HEIGHT 200
/* GLXContext is a pointer to opaque data. */ // GLXContext is a pointer to opaque data
typedef struct __GLXcontextRec *GLXContext; typedef struct __GLXcontextRec *GLXContext;
#define GLX_RGBA 4 // true if RGBA mode #define GLX_RGBA 4 // true if RGBA mode
@ -88,8 +88,7 @@ GLXContext (* qfglXCreateContext) (Display *dpy, XVisualInfo *vis,
Bool (* qfglXMakeCurrent) (Display *dpy, GLXDrawable drawable, GLXContext ctx); Bool (* qfglXMakeCurrent) (Display *dpy, GLXDrawable drawable, GLXContext ctx);
/*-----------------------------------------------------------------------*/ // ============================================================================
#if defined(HAVE_DLOPEN) #if defined(HAVE_DLOPEN)
@ -196,17 +195,16 @@ VID_Init (unsigned char *palette)
"quake window in a virtual desktop.\n"); "quake window in a virtual desktop.\n");
VID_GetWindowSize (640, 480); VID_GetWindowSize (640, 480);
Con_CheckResize (); // Now that we have a window size, fix console Con_CheckResize (); // Now that we have a window size, fix console
vid.maxwarpwidth = WARP_WIDTH; vid.maxwarpwidth = WARP_WIDTH;
vid.maxwarpheight = WARP_HEIGHT; vid.maxwarpheight = WARP_HEIGHT;
vid.colormap8 = vid_colormap; vid.colormap8 = vid_colormap;
vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048)); vid.fullbright = 256 - LittleLong (*((int *) vid.colormap8 + 2048));
/* Interpret command-line params */ // Interpret command-line params
/* Set vid parameters */
// Set vid parameters
if ((i = COM_CheckParm ("-conwidth"))) if ((i = COM_CheckParm ("-conwidth")))
vid.conwidth = atoi (com_argv[i + 1]); vid.conwidth = atoi (com_argv[i + 1]);
else else
@ -218,8 +216,7 @@ VID_Init (unsigned char *palette)
// pick a conheight that matches with correct aspect // pick a conheight that matches with correct aspect
vid.conheight = vid.conwidth * 3 / 4; vid.conheight = vid.conwidth * 3 / 4;
if ((i = COM_CheckParm ("-conheight"))) // conheight no smaller than if ((i = COM_CheckParm ("-conheight"))) // conheight no smaller than 200p
// 200px
vid.conheight = atoi (com_argv[i + 1]); vid.conheight = atoi (com_argv[i + 1]);
vid.conheight = max (vid.conheight, 200); vid.conheight = max (vid.conheight, 200);
@ -233,8 +230,7 @@ VID_Init (unsigned char *palette)
X11_SetVidMode (scr_width, scr_height); X11_SetVidMode (scr_width, scr_height);
X11_CreateWindow (scr_width, scr_height); X11_CreateWindow (scr_width, scr_height);
/* Invisible cursor */ X11_CreateNullCursor (); // hide mouse pointer
X11_CreateNullCursor ();
XSync (x_disp, 0); XSync (x_disp, 0);
@ -248,8 +244,6 @@ VID_Init (unsigned char *palette)
vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0); vid.aspect = ((float) vid.height / (float) vid.width) * (320.0 / 240.0);
vid.numpages = 2; vid.numpages = 2;
// InitSig (); // trap evil signals
GL_Init (); GL_Init ();
VID_InitGamma (palette); VID_InitGamma (palette);