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

put a couple externs back for win32. they need a bit more thought on how to

Browse source 
arrange things.
This commit is contained in:
Bill Currie 2001-10-29 16:45:03 +00:00
parent 1d442c496f
commit 8071e8398a
4 changed files with 56 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/audio/cd/cd_win.c
View file

@ -51,6 +51,7 @@ static general_funcs_t plugin_info_general_funcs;
//static cd_data_t plugin_info_cd_data; //static cd_data_t plugin_info_cd_data;
static cd_funcs_t plugin_info_cd_funcs; static cd_funcs_t plugin_info_cd_funcs;
extern HWND mainwindow; //FIXME
static qboolean cdValid = false; static qboolean cdValid = false;
static qboolean playing = false; static qboolean playing = false;

98
libs/video/targets/in_win.c
View file

@ -60,6 +60,8 @@ HRESULT (WINAPI * pDirectInputCreate) (HINSTANCE hinst, DWORD dwVersion,
void VID_UpdateWindowStatus (int window_x, int window_y); void VID_UpdateWindowStatus (int window_x, int window_y);
extern qboolean win_canalttab;
extern DEVMODE win_gdevmode;
// mouse public variables // mouse public variables
unsigned int uiWheelMessage; unsigned int uiWheelMessage;
@ -395,11 +397,11 @@ IN_MouseEvent (int mstate)
// perform button actions // perform button actions
for (i = 0; i < mouse_buttons; i++) { for (i = 0; i < mouse_buttons; i++) {
if ((mstate & (1 << i)) && !(mouse_oldbuttonstate & (1 << i))) { if ((mstate & (1 << i)) && !(mouse_oldbuttonstate & (1 << i))) {
Key_Event (M_BUTTON1 + i, -1, true); Key_Event (QFM_BUTTON1 + i, -1, true);
} }
if (!(mstate & (1 << i)) && (mouse_oldbuttonstate & (1 << i))) { if (!(mstate & (1 << i)) && (mouse_oldbuttonstate & (1 << i))) {
Key_Event (M_BUTTON1 + i, -1, false); Key_Event (QFM_BUTTON1 + i, -1, false);
} }
} }
@ -507,11 +509,11 @@ IN_LL_SendKeyEvents (void)
// perform button actions // perform button actions
for (i = 0; i < mouse_buttons; i++) { for (i = 0; i < mouse_buttons; i++) {
if ((mstate_di & (1 << i)) && !(mouse_oldbuttonstate & (1 << i))) { if ((mstate_di & (1 << i)) && !(mouse_oldbuttonstate & (1 << i))) {
Key_Event (M_BUTTON1 + i, -1, true); Key_Event (QFM_BUTTON1 + i, -1, true);
} }
if (!(mstate_di & (1 << i)) && (mouse_oldbuttonstate & (1 << i))) { if (!(mstate_di & (1 << i)) && (mouse_oldbuttonstate & (1 << i))) {
Key_Event (M_BUTTON1 + i, -1, false); Key_Event (QFM_BUTTON1 + i, -1, false);
} }
} }
@ -539,17 +541,17 @@ unsigned short scantokey[128] = {
// 0 1 2 3 4 5 6 7 // 0 1 2 3 4 5 6 7
// 8 9 A B C D E F // 8 9 A B C D E F
0, 27, '1', '2', '3', '4', '5', '6', 0, 27, '1', '2', '3', '4', '5', '6',
'7', '8', '9', '0', '-', '=', K_BACKSPACE, 9, // 0 '7', '8', '9', '0', '-', '=', QFK_BACKSPACE, 9, // 0
'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',
'o', 'p', '[', ']', 13, K_LCTRL, 'a', 's', // 1 'o', 'p', '[', ']', 13, QFK_LCTRL, 'a', 's', // 1
'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';',
'\'', '`', K_LSHIFT, '\\', 'z', 'x', 'c', 'v', // 2 '\'', '`', QFK_LSHIFT, '\\', 'z', 'x', 'c', 'v', // 2
'b', 'n', 'm', ',', '.', '/', K_RSHIFT, K_KP_MULTIPLY, 'b', 'n', 'm', ',', '.', '/', QFK_RSHIFT, QFK_KP_MULTIPLY,
K_LALT, ' ', K_CAPSLOCK, K_F1, K_F2, K_F3, K_F4, K_F5, // 3 QFK_LALT, ' ', QFK_CAPSLOCK, QFK_F1, QFK_F2, QFK_F3, QFK_F4, QFK_F5, // 3
K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE, K_SCROLLOCK, K_KP7, QFK_F6, QFK_F7, QFK_F8, QFK_F9, QFK_F10, QFK_PAUSE, QFK_SCROLLOCK, QFK_KP7,
K_KP8, K_KP9, K_KP_MINUS, K_KP4, K_KP5, K_KP6, K_KP_PLUS, K_KP1, // 4 QFK_KP8, QFK_KP9, QFK_KP_MINUS, QFK_KP4, QFK_KP5, QFK_KP6, QFK_KP_PLUS, QFK_KP1, // 4
K_KP2, K_KP3, K_KP0, K_KP_PERIOD, 0, 0, 0, K_F11, QFK_KP2, QFK_KP3, QFK_KP0, QFK_KP_PERIOD, 0, 0, 0, QFK_F11,
K_F12, 0, 0, 0, 0, 0, 0, 0, // 5 QFK_F12, 0, 0, 0, 0, 0, 0, 0, // 5
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -560,17 +562,17 @@ unsigned short shift_scantokey[128] = {
// 0 1 2 3 4 5 6 7 // 0 1 2 3 4 5 6 7
// 8 9 A B C D E F // 8 9 A B C D E F
0, 27, '!', '@', '#', '$', '%', '^', 0, 27, '!', '@', '#', '$', '%', '^',
'&', '*', '(', ')', '_', '+', K_BACKSPACE, 9, // 0 '&', '*', '(', ')', '_', '+', QFK_BACKSPACE, 9, // 0
'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I',
'O', 'P', '{', '}', 13, K_LCTRL, 'A', 'S', // 1 'O', 'P', '{', '}', 13, QFK_LCTRL, 'A', 'S', // 1
'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',
'"', '~', K_LSHIFT, '|', 'Z', 'X', 'C', 'V', // 2 '"', '~', QFK_LSHIFT, '|', 'Z', 'X', 'C', 'V', // 2
'B', 'N', 'M', '<', '>', '?', K_RSHIFT, K_KP_MULTIPLY, 'B', 'N', 'M', '<', '>', '?', QFK_RSHIFT, QFK_KP_MULTIPLY,
K_LALT, ' ', K_CAPSLOCK, K_F1, K_F2, K_F3, K_F4, K_F5, // 3 QFK_LALT, ' ', QFK_CAPSLOCK, QFK_F1, QFK_F2, QFK_F3, QFK_F4, QFK_F5, // 3
K_F6, K_F7, K_F8, K_F9, K_F10, K_PAUSE, K_SCROLLOCK, K_KP7, QFK_F6, QFK_F7, QFK_F8, QFK_F9, QFK_F10, QFK_PAUSE, QFK_SCROLLOCK, QFK_KP7,
K_KP8, K_KP9, K_KP_MINUS, K_KP4, K_KP5, K_KP6, K_KP_PLUS, K_KP1, // 4 QFK_KP8, QFK_KP9, QFK_KP_MINUS, QFK_KP4, QFK_KP5, QFK_KP6, QFK_KP_PLUS, QFK_KP1, // 4
K_KP2, K_KP3, K_KP0, K_KP_PERIOD, 0, 0, 0, K_F11, QFK_KP2, QFK_KP3, QFK_KP0, QFK_KP_PERIOD, 0, 0, 0, QFK_F11,
K_F12, 0, 0, 0, 0, 0, 0, 0, // 5 QFK_F12, 0, 0, 0, 0, 0, 0, 0, // 5
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -581,17 +583,17 @@ unsigned short ext_scantokey[128] = {
// 0 1 2 3 4 5 6 7 // 0 1 2 3 4 5 6 7
// 8 9 A B C D E F // 8 9 A B C D E F
0, 27, '1', '2', '3', '4', '5', '6', // 0 0, 27, '1', '2', '3', '4', '5', '6', // 0
'7', '8', '9', '0', '-', '=', K_BACKSPACE, 9, '7', '8', '9', '0', '-', '=', QFK_BACKSPACE, 9,
'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', // 1 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', // 1
'o', 'p', '[', ']', K_KP_ENTER, K_RCTRL, 'a', 's', 'o', 'p', '[', ']', QFK_KP_ENTER, QFK_RCTRL, 'a', 's',
'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', // 2 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', // 2
'\'', '`', K_LSHIFT, '\\', 'z', 'x', 'c', 'v', '\'', '`', QFK_LSHIFT, '\\', 'z', 'x', 'c', 'v',
'b', 'n', 'm', ',', '.', K_KP_DIVIDE, K_RSHIFT, '*', // 3 'b', 'n', 'm', ',', '.', QFK_KP_DIVIDE, QFK_RSHIFT, '*', // 3
K_RALT, ' ', K_CAPSLOCK, K_F1, K_F2, K_F3, K_F4, K_F5, QFK_RALT, ' ', QFK_CAPSLOCK, QFK_F1, QFK_F2, QFK_F3, QFK_F4, QFK_F5,
K_F6, K_F7, K_F8, K_F9, K_F10, K_NUMLOCK, 0, K_HOME, // 4 QFK_F6, QFK_F7, QFK_F8, QFK_F9, QFK_F10, QFK_NUMLOCK, 0, QFK_HOME, // 4
K_UP, K_PAGEUP, '-', K_LEFT, '5', K_RIGHT, '+', K_END, QFK_UP, QFK_PAGEUP, '-', QFK_LEFT, '5', QFK_RIGHT, '+', QFK_END,
K_DOWN, K_PAGEDOWN, K_INSERT, K_DELETE, 0, 0, 0, K_F11, // 5 QFK_DOWN, QFK_PAGEDOWN, QFK_INSERT, QFK_DELETE, 0, 0, 0, QFK_F11, // 5
K_F12, 0, 0, 0, 0, 0, 0, 0, QFK_F12, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -602,17 +604,17 @@ unsigned short shift_ext_scantokey[128] = {
// 0 1 2 3 4 5 6 7 // 0 1 2 3 4 5 6 7
// 8 9 A B C D E F // 8 9 A B C D E F
0, 27, '!', '@', '#', '$', '%', '^', 0, 27, '!', '@', '#', '$', '%', '^',
'&', '*', '(', ')', '_', '+', K_BACKSPACE, 9, // 0 '&', '*', '(', ')', '_', '+', QFK_BACKSPACE, 9, // 0
'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I',
'O', 'P', '{', '}', K_KP_ENTER, K_RCTRL, 'A', 'S', // 1 'O', 'P', '{', '}', QFK_KP_ENTER, QFK_RCTRL, 'A', 'S', // 1
'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':',
'"', '~', K_LSHIFT, '|', 'Z', 'X', 'C', 'V', // 2 '"', '~', QFK_LSHIFT, '|', 'Z', 'X', 'C', 'V', // 2
'B', 'N', 'M', '<', '>', K_KP_DIVIDE, K_RSHIFT, '*', 'B', 'N', 'M', '<', '>', QFK_KP_DIVIDE, QFK_RSHIFT, '*',
K_RALT, ' ', K_CAPSLOCK, K_F1, K_F2, K_F3, K_F4, K_F5, // 3 QFK_RALT, ' ', QFK_CAPSLOCK, QFK_F1, QFK_F2, QFK_F3, QFK_F4, QFK_F5, // 3
K_F6, K_F7, K_F8, K_F9, K_F10, K_NUMLOCK, 0, K_HOME, QFK_F6, QFK_F7, QFK_F8, QFK_F9, QFK_F10, QFK_NUMLOCK, 0, QFK_HOME,
K_UP, K_PAGEUP, '-', K_LEFT, '5', K_RIGHT, '+', K_END, // 4 QFK_UP, QFK_PAGEUP, '-', QFK_LEFT, '5', QFK_RIGHT, '+', QFK_END, // 4
K_DOWN, K_PAGEDOWN, K_INSERT, K_DELETE, 0, 0, 0, K_F11, QFK_DOWN, QFK_PAGEDOWN, QFK_INSERT, QFK_DELETE, 0, 0, 0, QFK_F11,
K_F12, 0, 0, 0, 0, 0, 0, 0, // 5 QFK_F12, 0, 0, 0, 0, 0, 0, 0, // 5
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -665,19 +667,19 @@ MapKey (unsigned int keycode, int press, int *k, int *u)
uc = 0; uc = 0;
switch (key) { switch (key) {
case K_RSHIFT: case QFK_RSHIFT:
shifts &= mask; shifts &= mask;
shifts |= press; shifts |= press;
break; break;
case K_LSHIFT: case QFK_LSHIFT:
shifts &= ROTL(mask, 1); shifts &= ROTL(mask, 1);
shifts |= ROTL(press, 1); shifts |= ROTL(press, 1);
break; break;
case K_RCTRL: case QFK_RCTRL:
shifts &= ROTL(mask, 2); shifts &= ROTL(mask, 2);
shifts |= ROTL(press, 2); shifts |= ROTL(press, 2);
break; break;
case K_LCTRL: case QFK_LCTRL:
shifts &= ROTL(mask, 3); shifts &= ROTL(mask, 3);
shifts |= ROTL(press, 3); shifts |= ROTL(press, 3);
break; break;
@ -832,11 +834,11 @@ MainWndProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
// It's delta is either positive or neg, and we generate the proper Event. // It's delta is either positive or neg, and we generate the proper Event.
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
if ((short) HIWORD (wParam) > 0) { if ((short) HIWORD (wParam) > 0) {
Key_Event (M_WHEEL_UP, -1, true); Key_Event (QFM_WHEEL_UP, -1, true);
Key_Event (M_WHEEL_UP, -1, false); Key_Event (QFM_WHEEL_UP, -1, false);
} else { } else {
Key_Event (M_WHEEL_DOWN, -1, true); Key_Event (QFM_WHEEL_DOWN, -1, true);
Key_Event (M_WHEEL_DOWN, -1, false); Key_Event (QFM_WHEEL_DOWN, -1, false);
} }
break; break;

8
libs/video/targets/joy_win.c
View file

@ -165,11 +165,11 @@ JOY_Read (void)
buttonstate = ji.dwButtons; buttonstate = ji.dwButtons;
for (i = 0; i < joy_numbuttons; i++) { for (i = 0; i < joy_numbuttons; i++) {
if ((buttonstate & (1 << i)) && !(joy_oldbuttonstate & (1 << i))) { if ((buttonstate & (1 << i)) && !(joy_oldbuttonstate & (1 << i))) {
Key_Event (J_BUTTON1 + i, 0, true); Key_Event (QFJ_BUTTON1 + i, 0, true);
} }
if (!(buttonstate & (1 << i)) && (joy_oldbuttonstate & (1 << i))) { if (!(buttonstate & (1 << i)) && (joy_oldbuttonstate & (1 << i))) {
Key_Event (J_BUTTON1 + i, 0, false); Key_Event (QFJ_BUTTON1 + i, 0, false);
} }
} }
joy_oldbuttonstate = buttonstate; joy_oldbuttonstate = buttonstate;
@ -193,11 +193,11 @@ JOY_Read (void)
// each change // each change
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if ((povstate & (1 << i)) && !(joy_oldpovstate & (1 << i))) { if ((povstate & (1 << i)) && !(joy_oldpovstate & (1 << i))) {
Key_Event (J_BUTTON29 + i, -1, true); Key_Event (QFJ_BUTTON29 + i, -1, true);
} }
if (!(povstate & (1 << i)) && (joy_oldpovstate & (1 << i))) { if (!(povstate & (1 << i)) && (joy_oldpovstate & (1 << i))) {
Key_Event (J_BUTTON29 + i, -1, false); Key_Event (QFJ_BUTTON29 + i, -1, false);
} }
} }
joy_oldpovstate = povstate; joy_oldpovstate = povstate;

2
libs/video/targets/vid_wgl.c
View file

@ -55,7 +55,7 @@ static const char rcsid[] =
#include "resource.h" #include "resource.h"
#include "sbar.h" #include "sbar.h"
extern const char *gl_renderer;
HGLRC (GLAPIENTRY *qf_wglCreateContext) (HDC); HGLRC (GLAPIENTRY *qf_wglCreateContext) (HDC);
BOOL (GLAPIENTRY *qf_wglDeleteContext) (HGLRC); BOOL (GLAPIENTRY *qf_wglDeleteContext) (HGLRC);