mirror of
https://git.code.sf.net/p/quake/nuq
synced 2025-02-16 17:11:21 +00:00
A small code change to VID_Update that I think is cleaner and *should*
run better, though tests show no improvement. Also, major whitespace changes, the whole file should be uniform now.
This commit is contained in:
Dan Olson
parent
88234b13e8
commit
225c65a3a4
1 changed files with 304 additions and 311 deletions
615
source/vid_sdl.c
615
source/vid_sdl.c
|
|
@ -56,7 +56,6 @@
|
||||||
#include "d_local.h"
|
#include "d_local.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
|
|
||||||
cvar_t *_windowed_mouse;
|
cvar_t *_windowed_mouse;
|
||||||
|
|
||||||
int old_windowed_mouse;
|
int old_windowed_mouse;
|
||||||
|
|
@ -92,96 +91,95 @@ static int mouse_oldbuttonstate = 0;
|
||||||
|
|
||||||
void VID_SetPalette (unsigned char *palette)
|
void VID_SetPalette (unsigned char *palette)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
SDL_Color colors[256];
|
SDL_Color colors[256];
|
||||||
|
|
||||||
for ( i=0; i<256; ++i )
|
for ( i=0; i<256; ++i )
|
||||||
{
|
{
|
||||||
colors[i].r = *palette++;
|
colors[i].r = *palette++;
|
||||||
colors[i].g = *palette++;
|
colors[i].g = *palette++;
|
||||||
colors[i].b = *palette++;
|
colors[i].b = *palette++;
|
||||||
}
|
}
|
||||||
SDL_SetColors(screen, colors, 0, 256);
|
SDL_SetColors(screen, colors, 0, 256);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VID_ShiftPalette (unsigned char *palette)
|
void VID_ShiftPalette (unsigned char *palette)
|
||||||
{
|
{
|
||||||
VID_SetPalette(palette);
|
VID_SetPalette(palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
void VID_Init (unsigned char *palette)
|
void VID_Init (unsigned char *palette)
|
||||||
{
|
{
|
||||||
int pnum, chunk;
|
int pnum, chunk;
|
||||||
byte *cache;
|
byte *cache;
|
||||||
int cachesize;
|
int cachesize;
|
||||||
//Uint8 video_bpp;
|
//Uint8 video_bpp;
|
||||||
//Uint16 video_w, video_h;
|
//Uint16 video_w, video_h;
|
||||||
Uint32 flags;
|
Uint32 flags;
|
||||||
|
|
||||||
|
// Load the SDL library
|
||||||
|
if (SDL_Init(SDL_INIT_VIDEO)<0) //|SDL_INIT_AUDIO|SDL_INIT_CDROM) < 0)
|
||||||
|
Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError());
|
||||||
|
|
||||||
// Load the SDL library
|
// Set up display mode (width and height)
|
||||||
if (SDL_Init(SDL_INIT_VIDEO)<0) //|SDL_INIT_AUDIO|SDL_INIT_CDROM) < 0)
|
vid.width = BASEWIDTH;
|
||||||
Sys_Error("VID: Couldn't load SDL: %s", SDL_GetError());
|
vid.height = BASEHEIGHT;
|
||||||
|
vid.maxwarpwidth = WARP_WIDTH;
|
||||||
|
vid.maxwarpheight = WARP_HEIGHT;
|
||||||
|
if ((pnum=COM_CheckParm("-winsize")))
|
||||||
|
{
|
||||||
|
if (pnum >= com_argc-2)
|
||||||
|
Sys_Error("VID: -winsize <width> <height>\n");
|
||||||
|
vid.width = atoi(com_argv[pnum+1]);
|
||||||
|
vid.height = atoi(com_argv[pnum+2]);
|
||||||
|
if (!vid.width || !vid.height)
|
||||||
|
Sys_Error("VID: Bad window width/height\n");
|
||||||
|
}
|
||||||
|
|
||||||
// Set up display mode (width and height)
|
// Set video width, height and flags
|
||||||
vid.width = BASEWIDTH;
|
flags = (SDL_SWSURFACE|SDL_HWPALETTE);
|
||||||
vid.height = BASEHEIGHT;
|
if ( COM_CheckParm ("-fullscreen") )
|
||||||
vid.maxwarpwidth = WARP_WIDTH;
|
flags |= SDL_FULLSCREEN;
|
||||||
vid.maxwarpheight = WARP_HEIGHT;
|
|
||||||
if ((pnum=COM_CheckParm("-winsize")))
|
|
||||||
{
|
|
||||||
if (pnum >= com_argc-2)
|
|
||||||
Sys_Error("VID: -winsize <width> <height>\n");
|
|
||||||
vid.width = atoi(com_argv[pnum+1]);
|
|
||||||
vid.height = atoi(com_argv[pnum+2]);
|
|
||||||
if (!vid.width || !vid.height)
|
|
||||||
Sys_Error("VID: Bad window width/height\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set video width, height and flags
|
// Initialize display
|
||||||
flags = (SDL_SWSURFACE|SDL_HWPALETTE);
|
if (!(screen = SDL_SetVideoMode(vid.width, vid.height, 8, flags)))
|
||||||
if ( COM_CheckParm ("-fullscreen") )
|
Sys_Error("VID: Couldn't set video mode: %s\n", SDL_GetError());
|
||||||
flags |= SDL_FULLSCREEN;
|
VID_SetPalette(palette);
|
||||||
|
VID_SetCaption("sdlquakeworld");
|
||||||
|
|
||||||
// Initialize display
|
// now know everything we need to know about the buffer
|
||||||
if (!(screen = SDL_SetVideoMode(vid.width, vid.height, 8, flags)))
|
VGA_width = vid.conwidth = vid.width;
|
||||||
Sys_Error("VID: Couldn't set video mode: %s\n", SDL_GetError());
|
VGA_height = vid.conheight = vid.height;
|
||||||
VID_SetPalette(palette);
|
vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
|
||||||
VID_SetCaption("sdlquakeworld");
|
vid.numpages = 1;
|
||||||
|
vid.colormap = host_colormap;
|
||||||
|
vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
|
||||||
|
VGA_pagebase = vid.buffer = screen->pixels;
|
||||||
|
VGA_rowbytes = vid.rowbytes = screen->pitch;
|
||||||
|
vid.conbuffer = vid.buffer;
|
||||||
|
vid.conrowbytes = vid.rowbytes;
|
||||||
|
vid.direct = 0;
|
||||||
|
|
||||||
// now know everything we need to know about the buffer
|
// allocate z buffer and surface cache
|
||||||
VGA_width = vid.conwidth = vid.width;
|
chunk = vid.width * vid.height * sizeof (*d_pzbuffer);
|
||||||
VGA_height = vid.conheight = vid.height;
|
cachesize = D_SurfaceCacheForRes (vid.width, vid.height);
|
||||||
vid.aspect = ((float)vid.height / (float)vid.width) * (320.0 / 240.0);
|
chunk += cachesize;
|
||||||
vid.numpages = 1;
|
d_pzbuffer = Hunk_HighAllocName(chunk, "video");
|
||||||
vid.colormap = host_colormap;
|
if (d_pzbuffer == NULL)
|
||||||
vid.fullbright = 256 - LittleLong (*((int *)vid.colormap + 2048));
|
Sys_Error ("Not enough memory for video mode\n");
|
||||||
VGA_pagebase = vid.buffer = screen->pixels;
|
|
||||||
VGA_rowbytes = vid.rowbytes = screen->pitch;
|
|
||||||
vid.conbuffer = vid.buffer;
|
|
||||||
vid.conrowbytes = vid.rowbytes;
|
|
||||||
vid.direct = 0;
|
|
||||||
|
|
||||||
// allocate z buffer and surface cache
|
// initialize the cache memory
|
||||||
chunk = vid.width * vid.height * sizeof (*d_pzbuffer);
|
cache = (byte *) d_pzbuffer + vid.width * vid.height *
|
||||||
cachesize = D_SurfaceCacheForRes (vid.width, vid.height);
|
sizeof (*d_pzbuffer);
|
||||||
chunk += cachesize;
|
D_InitCaches (cache, cachesize);
|
||||||
d_pzbuffer = Hunk_HighAllocName(chunk, "video");
|
|
||||||
if (d_pzbuffer == NULL)
|
|
||||||
Sys_Error ("Not enough memory for video mode\n");
|
|
||||||
|
|
||||||
// initialize the cache memory
|
// initialize the mouse
|
||||||
cache = (byte *) d_pzbuffer
|
SDL_ShowCursor(0);
|
||||||
+ vid.width * vid.height * sizeof (*d_pzbuffer);
|
|
||||||
D_InitCaches (cache, cachesize);
|
|
||||||
|
|
||||||
// initialize the mouse
|
|
||||||
SDL_ShowCursor(0);
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
// fixme: EVIL thing - but needed for win32 until we get
|
// fixme: EVIL thing - but needed for win32 until we get
|
||||||
// SDL_sound ready - without this DirectSound fails.
|
// SDL_sound ready - without this DirectSound fails.
|
||||||
// could replace this with SDL_SysWMInfo
|
// could replace this with SDL_SysWMInfo
|
||||||
mainwindow=GetActiveWindow();
|
mainwindow=GetActiveWindow();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -189,35 +187,18 @@ void VID_Init (unsigned char *palette)
|
||||||
|
|
||||||
void VID_Shutdown (void)
|
void VID_Shutdown (void)
|
||||||
{
|
{
|
||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
void VID_Update (vrect_t *rects)
|
void VID_Update (vrect_t *rects)
|
||||||
{
|
{
|
||||||
SDL_Rect *sdlrects;
|
// I feel this is an improvement on Sam's code, as it does not
|
||||||
int n, i;
|
// calloc every frame. - DDOI
|
||||||
vrect_t *rect;
|
while (rects) {
|
||||||
|
SDL_UpdateRect (screen, rects->x, rects->y, rects->width,
|
||||||
// Two-pass system, since Quake doesn't do it the SDL way...
|
rects->height);
|
||||||
|
rects = rects->pnext;
|
||||||
// First, count the number of rectangles
|
}
|
||||||
n = 0;
|
|
||||||
for (rect = rects; rect; rect = rect->pnext)
|
|
||||||
++n;
|
|
||||||
|
|
||||||
// Second, copy them to SDL rectangles and update
|
|
||||||
if(!(sdlrects=(SDL_Rect *)calloc(1,n*sizeof(SDL_Rect))))
|
|
||||||
Sys_Error("Out of memory!");
|
|
||||||
i = 0;
|
|
||||||
for (rect = rects; rect; rect = rect->pnext)
|
|
||||||
{
|
|
||||||
sdlrects[i].x = rect->x;
|
|
||||||
sdlrects[i].y = rect->y;
|
|
||||||
sdlrects[i].w = rect->width;
|
|
||||||
sdlrects[i].h = rect->height;
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
SDL_UpdateRects(screen, n, sdlrects);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -227,18 +208,17 @@ D_BeginDirectRect
|
||||||
*/
|
*/
|
||||||
void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
|
void D_BeginDirectRect (int x, int y, byte *pbitmap, int width, int height)
|
||||||
{
|
{
|
||||||
Uint8 *offset;
|
Uint8 *offset;
|
||||||
|
|
||||||
|
if (!screen) return;
|
||||||
if (!screen) return;
|
if ( x < 0 ) x = screen->w+x-1;
|
||||||
if ( x < 0 ) x = screen->w+x-1;
|
offset = (Uint8 *)screen->pixels + y*screen->pitch + x;
|
||||||
offset = (Uint8 *)screen->pixels + y*screen->pitch + x;
|
while ( height-- )
|
||||||
while ( height-- )
|
{
|
||||||
{
|
memcpy(offset, pbitmap, width);
|
||||||
memcpy(offset, pbitmap, width);
|
offset += screen->pitch;
|
||||||
offset += screen->pitch;
|
pbitmap += width;
|
||||||
pbitmap += width;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -249,9 +229,11 @@ D_EndDirectRect
|
||||||
*/
|
*/
|
||||||
void D_EndDirectRect (int x, int y, int width, int height)
|
void D_EndDirectRect (int x, int y, int width, int height)
|
||||||
{
|
{
|
||||||
if (!screen) return;
|
if (!screen)
|
||||||
if (x < 0) x = screen->w+x-1;
|
return;
|
||||||
SDL_UpdateRect(screen, x, y, width, height);
|
if (x < 0)
|
||||||
|
x = screen->w+x-1;
|
||||||
|
SDL_UpdateRect(screen, x, y, width, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -267,165 +249,178 @@ void IN_SendKeyEvents (void)
|
||||||
int sym, state, but;
|
int sym, state, but;
|
||||||
int modstate;
|
int modstate;
|
||||||
|
|
||||||
while (SDL_PollEvent(&event))
|
while (SDL_PollEvent(&event))
|
||||||
{
|
{
|
||||||
switch (event.type) {
|
switch (event.type) {
|
||||||
|
|
||||||
case SDL_KEYDOWN:
|
case SDL_KEYDOWN:
|
||||||
case SDL_KEYUP:
|
case SDL_KEYUP:
|
||||||
sym = event.key.keysym.sym;
|
sym = event.key.keysym.sym;
|
||||||
state = event.key.state;
|
state = event.key.state;
|
||||||
modstate = SDL_GetModState();
|
modstate = SDL_GetModState();
|
||||||
switch(sym)
|
switch(sym)
|
||||||
{
|
{
|
||||||
case SDLK_DELETE: sym = K_DEL; break;
|
case SDLK_DELETE: sym = K_DEL; break;
|
||||||
case SDLK_BACKSPACE: sym = K_BACKSPACE; break;
|
case SDLK_BACKSPACE: sym = K_BACKSPACE; break;
|
||||||
case SDLK_F1: sym = K_F1; break;
|
case SDLK_F1: sym = K_F1; break;
|
||||||
case SDLK_F2: sym = K_F2; break;
|
case SDLK_F2: sym = K_F2; break;
|
||||||
case SDLK_F3: sym = K_F3; break;
|
case SDLK_F3: sym = K_F3; break;
|
||||||
case SDLK_F4: sym = K_F4; break;
|
case SDLK_F4: sym = K_F4; break;
|
||||||
case SDLK_F5: sym = K_F5; break;
|
case SDLK_F5: sym = K_F5; break;
|
||||||
case SDLK_F6: sym = K_F6; break;
|
case SDLK_F6: sym = K_F6; break;
|
||||||
case SDLK_F7: sym = K_F7; break;
|
case SDLK_F7: sym = K_F7; break;
|
||||||
case SDLK_F8: sym = K_F8; break;
|
case SDLK_F8: sym = K_F8; break;
|
||||||
case SDLK_F9: sym = K_F9; break;
|
case SDLK_F9: sym = K_F9; break;
|
||||||
case SDLK_F10: sym = K_F10; break;
|
case SDLK_F10: sym = K_F10; break;
|
||||||
case SDLK_F11: sym = K_F11; break;
|
case SDLK_F11: sym = K_F11; break;
|
||||||
case SDLK_F12: sym = K_F12; break;
|
case SDLK_F12: sym = K_F12; break;
|
||||||
case SDLK_BREAK:
|
case SDLK_BREAK:
|
||||||
case SDLK_PAUSE: sym = K_PAUSE; break;
|
case SDLK_PAUSE: sym = K_PAUSE; break;
|
||||||
case SDLK_UP: sym = K_UPARROW; break;
|
case SDLK_UP: sym = K_UPARROW; break;
|
||||||
case SDLK_DOWN: sym = K_DOWNARROW; break;
|
case SDLK_DOWN: sym = K_DOWNARROW; break;
|
||||||
case SDLK_RIGHT: sym = K_RIGHTARROW; break;
|
case SDLK_RIGHT: sym = K_RIGHTARROW; break;
|
||||||
case SDLK_LEFT: sym = K_LEFTARROW; break;
|
case SDLK_LEFT: sym = K_LEFTARROW; break;
|
||||||
case SDLK_INSERT: sym = K_INS; break;
|
case SDLK_INSERT: sym = K_INS; break;
|
||||||
case SDLK_HOME: sym = K_HOME; break;
|
case SDLK_HOME: sym = K_HOME; break;
|
||||||
case SDLK_END: sym = K_END; break;
|
case SDLK_END: sym = K_END; break;
|
||||||
case SDLK_PAGEUP: sym = K_PGUP; break;
|
case SDLK_PAGEUP: sym = K_PGUP; break;
|
||||||
case SDLK_PAGEDOWN: sym = K_PGDN; break;
|
case SDLK_PAGEDOWN: sym = K_PGDN; break;
|
||||||
case SDLK_RSHIFT:
|
case SDLK_RSHIFT:
|
||||||
case SDLK_LSHIFT: sym = K_SHIFT; break;
|
case SDLK_LSHIFT: sym = K_SHIFT; break;
|
||||||
case SDLK_RCTRL:
|
case SDLK_RCTRL:
|
||||||
case SDLK_LCTRL: sym = K_CTRL; break;
|
case SDLK_LCTRL: sym = K_CTRL; break;
|
||||||
case SDLK_RALT:
|
case SDLK_RALT:
|
||||||
case SDLK_LALT: sym = K_ALT; break;
|
case SDLK_LALT: sym = K_ALT; break;
|
||||||
case SDLK_CAPSLOCK: sym = K_CAPSLOCK; break;
|
case SDLK_CAPSLOCK: sym = K_CAPSLOCK; break;
|
||||||
case SDLK_KP0:
|
case SDLK_KP0:
|
||||||
if(modstate & KMOD_NUM) sym = K_INS;
|
if(modstate & KMOD_NUM)
|
||||||
else sym = SDLK_0;
|
sym = K_INS;
|
||||||
break;
|
else
|
||||||
case SDLK_KP1:
|
sym = SDLK_0;
|
||||||
if(modstate & KMOD_NUM) sym = K_END;
|
break;
|
||||||
else sym = SDLK_1;
|
case SDLK_KP1:
|
||||||
break;
|
if(modstate & KMOD_NUM)
|
||||||
case SDLK_KP2:
|
sym = K_END;
|
||||||
if(modstate & KMOD_NUM) sym = K_DOWNARROW;
|
else
|
||||||
else sym = SDLK_2;
|
sym = SDLK_1;
|
||||||
break;
|
break;
|
||||||
case SDLK_KP3:
|
case SDLK_KP2:
|
||||||
if(modstate & KMOD_NUM) sym = K_PGDN;
|
if(modstate & KMOD_NUM)
|
||||||
else sym = SDLK_3;
|
sym = K_DOWNARROW;
|
||||||
break;
|
else
|
||||||
case SDLK_KP4:
|
sym = SDLK_2;
|
||||||
if(modstate & KMOD_NUM) sym = K_LEFTARROW;
|
break;
|
||||||
else sym = SDLK_4;
|
case SDLK_KP3:
|
||||||
break;
|
if(modstate & KMOD_NUM)
|
||||||
case SDLK_KP5: sym = SDLK_5; break;
|
sym = K_PGDN;
|
||||||
case SDLK_KP6:
|
else
|
||||||
if(modstate & KMOD_NUM) sym = K_RIGHTARROW;
|
sym = SDLK_3;
|
||||||
else sym = SDLK_6;
|
break;
|
||||||
break;
|
case SDLK_KP4:
|
||||||
case SDLK_KP7:
|
if(modstate & KMOD_NUM)
|
||||||
if(modstate & KMOD_NUM) sym = K_HOME;
|
sym = K_LEFTARROW;
|
||||||
else sym = SDLK_7;
|
else
|
||||||
break;
|
sym = SDLK_4;
|
||||||
case SDLK_KP8:
|
break;
|
||||||
if(modstate & KMOD_NUM) sym = K_UPARROW;
|
case SDLK_KP5: sym = SDLK_5; break;
|
||||||
else sym = SDLK_8;
|
case SDLK_KP6:
|
||||||
break;
|
if(modstate & KMOD_NUM)
|
||||||
case SDLK_KP9:
|
sym = K_RIGHTARROW;
|
||||||
if(modstate & KMOD_NUM) sym = K_PGUP;
|
else
|
||||||
else sym = SDLK_9;
|
sym = SDLK_6;
|
||||||
break;
|
break;
|
||||||
case SDLK_KP_PERIOD:
|
case SDLK_KP7:
|
||||||
if(modstate & KMOD_NUM) sym = K_DEL;
|
if(modstate & KMOD_NUM)
|
||||||
else sym = SDLK_PERIOD;
|
sym = K_HOME;
|
||||||
break;
|
else
|
||||||
case SDLK_KP_DIVIDE: sym = SDLK_SLASH; break;
|
sym = SDLK_7;
|
||||||
case SDLK_KP_MULTIPLY: sym = SDLK_ASTERISK; break;
|
break;
|
||||||
case SDLK_KP_MINUS: sym = SDLK_MINUS; break;
|
case SDLK_KP8:
|
||||||
case SDLK_KP_PLUS: sym = SDLK_PLUS; break;
|
if(modstate & KMOD_NUM)
|
||||||
case SDLK_KP_ENTER: sym = SDLK_RETURN; break;
|
sym = K_UPARROW;
|
||||||
case SDLK_KP_EQUALS: sym = SDLK_EQUALS; break;
|
else
|
||||||
}
|
sym = SDLK_8;
|
||||||
// If we're not directly handled and still above 255
|
break;
|
||||||
// just force it to 0
|
case SDLK_KP9:
|
||||||
if(sym > 255) sym = 0;
|
if(modstate & KMOD_NUM)
|
||||||
Key_Event(sym, state);
|
sym = K_PGUP;
|
||||||
break;
|
else
|
||||||
|
sym = SDLK_9;
|
||||||
|
break;
|
||||||
|
case SDLK_KP_PERIOD:
|
||||||
|
if(modstate & KMOD_NUM)
|
||||||
|
sym = K_DEL;
|
||||||
|
else
|
||||||
|
sym = SDLK_PERIOD;
|
||||||
|
break;
|
||||||
|
case SDLK_KP_DIVIDE: sym = SDLK_SLASH; break;
|
||||||
|
case SDLK_KP_MULTIPLY: sym = SDLK_ASTERISK; break;
|
||||||
|
case SDLK_KP_MINUS: sym = SDLK_MINUS; break;
|
||||||
|
case SDLK_KP_PLUS: sym = SDLK_PLUS; break;
|
||||||
|
case SDLK_KP_ENTER: sym = SDLK_RETURN; break;
|
||||||
|
case SDLK_KP_EQUALS: sym = SDLK_EQUALS; break;
|
||||||
|
}
|
||||||
|
// If we're not directly handled and still above
|
||||||
|
// 255 just force it to 0
|
||||||
|
if(sym > 255) sym = 0;
|
||||||
|
Key_Event(sym, state);
|
||||||
|
break;
|
||||||
|
case SDL_MOUSEBUTTONDOWN:
|
||||||
|
case SDL_MOUSEBUTTONUP:
|
||||||
|
but = event.button.button;
|
||||||
|
if (but == 2)
|
||||||
|
but = 3;
|
||||||
|
else if (but == 3)
|
||||||
|
but = 2;
|
||||||
|
|
||||||
case SDL_MOUSEBUTTONDOWN:
|
switch (but)
|
||||||
case SDL_MOUSEBUTTONUP:
|
{
|
||||||
but = event.button.button;
|
case 1:
|
||||||
if (but == 2)
|
case 2:
|
||||||
but = 3;
|
case 3:
|
||||||
else if (but == 3)
|
Key_Event(K_MOUSE1 + but - 1, event.type == SDL_MOUSEBUTTONDOWN);
|
||||||
but = 2;
|
break;
|
||||||
|
case 4:
|
||||||
|
Key_Event(K_MWHEELUP, 1);
|
||||||
|
Key_Event(K_MWHEELUP, 0);
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
Key_Event(K_MWHEELDOWN, 1);
|
||||||
|
Key_Event(K_MWHEELDOWN, 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
switch (but)
|
case SDL_MOUSEMOTION:
|
||||||
{
|
if (_windowed_mouse->int_val)
|
||||||
case 1:
|
{
|
||||||
case 2:
|
if ((event.motion.x != (vid.width/2))
|
||||||
case 3:
|
|| (event.motion.y != (vid.height/2)) )
|
||||||
Key_Event(K_MOUSE1 + but - 1, event.type
|
{
|
||||||
== SDL_MOUSEBUTTONDOWN);
|
mouse_x = event.motion.xrel*10;
|
||||||
break;
|
mouse_y = event.motion.yrel*10;
|
||||||
case 4:
|
if ((event.motion.x < ((vid.width/2)-(vid.width/4))) || (event.motion.x > ((vid.width/2)+(vid.width/4))) || (event.motion.y < ((vid.height/2)-(vid.height/4))) || (event.motion.y > ((vid.height/2)+(vid.height/4))) )
|
||||||
Key_Event(K_MWHEELUP, 1);
|
SDL_WarpMouse(vid.width/2, vid.height/2);
|
||||||
Key_Event(K_MWHEELUP, 0);
|
}
|
||||||
break;
|
}
|
||||||
case 5:
|
else
|
||||||
Key_Event(K_MWHEELDOWN, 1);
|
{
|
||||||
Key_Event(K_MWHEELDOWN, 0);
|
mouse_x = event.motion.xrel*10;
|
||||||
break;
|
mouse_y = event.motion.yrel*10;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SDL_QUIT:
|
||||||
|
CL_Disconnect ();
|
||||||
|
Sys_Quit ();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
break;
|
}
|
||||||
|
|
||||||
case SDL_MOUSEMOTION:
|
|
||||||
if (_windowed_mouse->int_val)
|
|
||||||
{
|
|
||||||
if ((event.motion.x != (vid.width/2))
|
|
||||||
|| (event.motion.y != (vid.height/2)) )
|
|
||||||
{
|
|
||||||
mouse_x = event.motion.xrel*10;
|
|
||||||
mouse_y = event.motion.yrel*10;
|
|
||||||
if ((event.motion.x < ((vid.width/2)-(vid.width/4))) ||
|
|
||||||
(event.motion.x > ((vid.width/2)+(vid.width/4))) ||
|
|
||||||
(event.motion.y < ((vid.height/2)-(vid.height/4))) ||
|
|
||||||
(event.motion.y > ((vid.height/2)+(vid.height/4))) )
|
|
||||||
SDL_WarpMouse(vid.width/2, vid.height/2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mouse_x = event.motion.xrel*10;
|
|
||||||
mouse_y = event.motion.yrel*10;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SDL_QUIT:
|
|
||||||
CL_Disconnect ();
|
|
||||||
Sys_Quit ();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void IN_Commands (void)
|
||||||
void
|
|
||||||
IN_Commands (void)
|
|
||||||
{
|
{
|
||||||
if (old_windowed_mouse != _windowed_mouse->int_val)
|
if (old_windowed_mouse != _windowed_mouse->int_val)
|
||||||
{
|
{
|
||||||
|
|
@ -439,83 +434,81 @@ IN_Commands (void)
|
||||||
|
|
||||||
void IN_Init (void)
|
void IN_Init (void)
|
||||||
{
|
{
|
||||||
_windowed_mouse = Cvar_Get ("_windowed_mouse","0",CVAR_ARCHIVE,"None");
|
_windowed_mouse = Cvar_Get ("_windowed_mouse","0",CVAR_ARCHIVE,"None");
|
||||||
|
|
||||||
if ( COM_CheckParm("-nomouse") && !_windowed_mouse->int_val)
|
if ( COM_CheckParm("-nomouse") && !_windowed_mouse->int_val)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mouse_x = mouse_y = 0.0;
|
mouse_x = mouse_y = 0.0;
|
||||||
mouse_avail = 1;
|
mouse_avail = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IN_Shutdown (void)
|
void IN_Shutdown (void)
|
||||||
{
|
{
|
||||||
mouse_avail = 0;
|
mouse_avail = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IN_Frame(void)
|
void IN_Frame(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int mouse_buttonstate;
|
int mouse_buttonstate;
|
||||||
|
|
||||||
if (!mouse_avail) return;
|
if (!mouse_avail) return;
|
||||||
|
|
||||||
i = SDL_GetMouseState(NULL, NULL);
|
i = SDL_GetMouseState(NULL, NULL);
|
||||||
/* Quake swaps the second and third buttons */
|
/* Quake swaps the second and third buttons */
|
||||||
mouse_buttonstate = (i & ~0x06) | ((i & 0x02)<<1) | ((i & 0x04)>>1);
|
mouse_buttonstate = (i & ~0x06) | ((i & 0x02)<<1) |
|
||||||
for (i=0 ; i<3 ; i++) {
|
((i & 0x04)>>1);
|
||||||
if ( (mouse_buttonstate & (1<<i)) && !(mouse_oldbuttonstate & (1<<i)) )
|
for (i=0 ; i<3 ; i++) {
|
||||||
Key_Event (K_MOUSE1 + i, true);
|
if ( (mouse_buttonstate & (1<<i)) && !(mouse_oldbuttonstate & (1<<i)) )
|
||||||
|
Key_Event (K_MOUSE1 + i, true);
|
||||||
|
|
||||||
if ( !(mouse_buttonstate & (1<<i)) && (mouse_oldbuttonstate & (1<<i)) )
|
if ( !(mouse_buttonstate & (1<<i)) && (mouse_oldbuttonstate & (1<<i)) )
|
||||||
Key_Event (K_MOUSE1 + i, false);
|
Key_Event (K_MOUSE1 + i, false);
|
||||||
}
|
}
|
||||||
mouse_oldbuttonstate = mouse_buttonstate;
|
mouse_oldbuttonstate = mouse_buttonstate;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IN_Move (usercmd_t *cmd)
|
void IN_Move (usercmd_t *cmd)
|
||||||
{
|
{
|
||||||
if (!mouse_avail)
|
if (!mouse_avail)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mouse_x *= sensitivity->value;
|
mouse_x *= sensitivity->value;
|
||||||
mouse_y *= sensitivity->value;
|
mouse_y *= sensitivity->value;
|
||||||
|
|
||||||
if ( (in_strafe.state & 1) || (lookstrafe->int_val && (in_mlook.state & 1) ))
|
if ( (in_strafe.state & 1) || (lookstrafe->int_val && (in_mlook.state & 1) ))
|
||||||
cmd->sidemove += m_side->value * mouse_x;
|
cmd->sidemove += m_side->value * mouse_x;
|
||||||
else
|
else
|
||||||
cl.viewangles[YAW] -= m_yaw->value * mouse_x;
|
cl.viewangles[YAW] -= m_yaw->value * mouse_x;
|
||||||
if (in_mlook.state & 1)
|
if (in_mlook.state & 1)
|
||||||
V_StopPitchDrift ();
|
V_StopPitchDrift ();
|
||||||
|
|
||||||
if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) {
|
if ( (in_mlook.state & 1) && !(in_strafe.state & 1)) {
|
||||||
cl.viewangles[PITCH] += m_pitch->value * mouse_y;
|
cl.viewangles[PITCH] += m_pitch->value * mouse_y;
|
||||||
if (cl.viewangles[PITCH] > 80)
|
if (cl.viewangles[PITCH] > 80)
|
||||||
cl.viewangles[PITCH] = 80;
|
cl.viewangles[PITCH] = 80;
|
||||||
if (cl.viewangles[PITCH] < -70)
|
if (cl.viewangles[PITCH] < -70)
|
||||||
cl.viewangles[PITCH] = -70;
|
cl.viewangles[PITCH] = -70;
|
||||||
} else {
|
} else {
|
||||||
if ((in_strafe.state & 1) && noclip_anglehack)
|
if ((in_strafe.state & 1) && noclip_anglehack)
|
||||||
cmd->upmove -= m_forward->value * mouse_y;
|
cmd->upmove -= m_forward->value * mouse_y;
|
||||||
else
|
else
|
||||||
cmd->forwardmove -= m_forward->value * mouse_y;
|
cmd->forwardmove -= m_forward->value * mouse_y;
|
||||||
}
|
}
|
||||||
mouse_x = mouse_y = 0.0;
|
mouse_x = mouse_y = 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void VID_InitCvars ()
|
void VID_InitCvars ()
|
||||||
{
|
{
|
||||||
// It may not look like it, but this is important
|
// It may not look like it, but this is important
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void VID_SetCaption (char *text)
|
||||||
VID_SetCaption (char *text)
|
|
||||||
{
|
{
|
||||||
SDL_WM_SetCaption(text, NULL);
|
SDL_WM_SetCaption(text, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void VID_HandlePause (qboolean pause)
|
void VID_HandlePause (qboolean pause)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue