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

Do a whitespace run.

Browse source 
Just for long-term sanity's sake.
This commit is contained in:
Bill Currie 2013-01-27 14:05:24 +09:00
parent e3e0d6aaa9
commit 1a33d2f682
2 changed files with 179 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/QF/joystick.h
View file

@ -37,7 +37,7 @@
extern struct cvar_s *joy_device; // Joystick device name extern struct cvar_s *joy_device; // Joystick device name
extern struct cvar_s *joy_enable; // Joystick enabling flag extern struct cvar_s *joy_enable; // Joystick enabling flag
struct joy_axis_button{ struct joy_axis_button {
float threshold; float threshold;
int key; int key;
int state; int state;
@ -144,10 +144,10 @@ void JOY_Close (void);
void JOY_Read (void); void JOY_Read (void);
const char * JOY_GetOption_c (int i); const char *JOY_GetOption_c (int i);
int JOY_GetOption_i (const char *c); int JOY_GetOption_i (const char *c);
const char * JOY_GetDest_c (int i); const char *JOY_GetDest_c (int i);
int JOY_GetDest_i (const char *c); int JOY_GetDest_i (const char *c);

147
libs/video/targets/joy.c
View file

@ -95,7 +95,7 @@ joy_check_axis_buttons (struct joy_axis *ja, float value)
for (i = 0; i < ja->num_buttons; i++) { for (i = 0; i < ja->num_buttons; i++) {
ab = &ja->axis_buttons[i]; ab = &ja->axis_buttons[i];
if ((value < 0) == (ab->threshold < 0) if ((value < 0) == (ab->threshold < 0)
&& fabsf(value) >= fabsf (ab->threshold)) { && fabsf (value) >= fabsf (ab->threshold)) {
pressed = i; pressed = i;
break; break;
@ -140,10 +140,13 @@ JOY_Move (void)
for (i = 0; i < JOY_MAX_AXES; i++) { for (i = 0; i < JOY_MAX_AXES; i++) {
ja = &joy_axes[i]; ja = &joy_axes[i];
if (abs(ja->offset) + abs(ja->current) < abs(ja->offset) + abs(ja->deadzone)) if (abs (ja->offset) + abs (ja->current) <
abs (ja->offset) + abs (ja->deadzone))
ja->current = -ja->offset; ja->current = -ja->offset;
value = amp * ja->amp * (ja->offset + ja->current * pre * ja->pre_amp) / 100.0f; value =
amp * ja->amp * (ja->offset +
ja->current * pre * ja->pre_amp) / 100.0f;
switch (ja->dest) { switch (ja->dest) {
case js_none: case js_none:
// ignore axis // ignore axis
@ -221,7 +224,7 @@ js_opts_t js_opts[] = {
{"clear", js_clear}, {"clear", js_clear},
{"amp", js_amp}, {"amp", js_amp},
{"pre_amp", js_pre_amp}, {"pre_amp", js_pre_amp},
{"deadzone",js_deadzone}, {"deadzone", js_deadzone},
{"offset", js_offset}, {"offset", js_offset},
{"type", js_type}, {"type", js_type},
{"button", js_axis_button}, {"button", js_axis_button},
@ -231,8 +234,9 @@ const char *
JOY_GetOption_c (int i) JOY_GetOption_c (int i)
{ {
js_opts_t *opt; js_opts_t *opt;
for (opt=&js_opts[0]; opt->name; opt++) {
if ((int)opt->optnum == i) for (opt = &js_opts[0]; opt->name; opt++) {
if ((int) opt->optnum == i)
return opt->name; return opt->name;
} }
@ -243,20 +247,22 @@ int
JOY_GetOption_i (const char *c) JOY_GetOption_i (const char *c)
{ {
js_opts_t *opt; js_opts_t *opt;
for (opt=&js_opts[0]; opt->name; opt++) {
if (!strcmp(opt->name, c)) for (opt = &js_opts[0]; opt->name; opt++) {
if (!strcmp (opt->name, c))
return opt->optnum; return opt->optnum;
} }
return -1; //Failure code; return -1; // Failure code;
} }
const char * const char *
JOY_GetDest_c (int i) JOY_GetDest_c (int i)
{ {
js_dests_t *dest; js_dests_t *dest;
for (dest=&js_dests[0]; dest->name; dest++) {
if ((int)dest->destnum == i) for (dest = &js_dests[0]; dest->name; dest++) {
if ((int) dest->destnum == i)
return dest->name; return dest->name;
} }
@ -267,119 +273,124 @@ int
JOY_GetDest_i (const char *c) JOY_GetDest_i (const char *c)
{ {
js_dests_t *dest; js_dests_t *dest;
for (dest=&js_dests[0]; dest->name; dest++) {
if (!strcmp(dest->name, c)) for (dest = &js_dests[0]; dest->name; dest++) {
if (!strcmp (dest->name, c))
return dest->destnum; return dest->destnum;
} }
return -1; //Failure code; return -1; // Failure code;
} }
static void static void
in_joy_f (void) in_joy_f (void)
{ {
int i, ax, c = Cmd_Argc(); const char *arg;
int i, ax, c = Cmd_Argc ();
if (c == 2) { if (c == 2) {
ax = JOY_GetOption_i (Cmd_Argv(1)); ax = JOY_GetOption_i (Cmd_Argv (1));
switch (ax) { switch (ax) {
case js_clear: case js_clear:
Sys_Printf("Clearing all joystick settings...\n"); Sys_Printf ("Clearing all joystick settings...\n");
for (i = 0; i<JOY_MAX_AXES;i++) { for (i = 0; i < JOY_MAX_AXES; i++) {
joy_clear_axis (i); joy_clear_axis (i);
} }
break; break;
case js_amp: case js_amp:
Sys_Printf("[...]<amp> [<#amp>]: Axis sensitivity\n"); Sys_Printf ("[...]<amp> [<#amp>]: Axis sensitivity\n");
break; break;
case js_pre_amp: case js_pre_amp:
Sys_Printf("[...]<pre_amp> [<#pre_amp>]: Axis sensitivity.\n"); Sys_Printf ("[...]<pre_amp> [<#pre_amp>]: Axis sensitivity.\n");
break; break;
case js_deadzone: case js_deadzone:
Sys_Printf("[...]<deadzone> [<#dz>]: Axis deadzone.\n"); Sys_Printf ("[...]<deadzone> [<#dz>]: Axis deadzone.\n");
break; break;
case js_offset: case js_offset:
Sys_Printf("[...]<offset> [<#off>]: Axis initial position.\n"); Sys_Printf ("[...]<offset> [<#off>]: Axis initial position.\n");
break; break;
case js_type: case js_type:
Sys_Printf("[...]<type> [<act> <#act>].\n"); Sys_Printf ("[...]<type> [<act> <#act>].\n");
Sys_Printf("Values for <act>:\n"); Sys_Printf ("Values for <act>:\n");
Sys_Printf("none: #0\n"); Sys_Printf ("none: #0\n");
Sys_Printf("aim: #1..0\n"); Sys_Printf ("aim: #1..0\n");
Sys_Printf("movement: #1..0\n"); Sys_Printf ("movement: #1..0\n");
break; break;
case js_axis_button: case js_axis_button:
/* TODO */ /* TODO */
break; break;
default: default:
ax = strtol(Cmd_Argv(1), NULL ,0); ax = strtol (Cmd_Argv (1), NULL, 0);
Sys_Printf ("<=====> AXIS %i <=====>\n", ax); Sys_Printf ("<=====> AXIS %i <=====>\n", ax);
Sys_Printf ("amp: %f\n", joy_axes[ax].amp); Sys_Printf ("amp: %f\n", joy_axes[ax].amp);
Sys_Printf ("pre_amp: %f\n", joy_axes[ax].pre_amp); Sys_Printf ("pre_amp: %f\n", joy_axes[ax].pre_amp);
Sys_Printf ("deadzone: %i\n", joy_axes[ax].deadzone); Sys_Printf ("deadzone: %i\n", joy_axes[ax].deadzone);
Sys_Printf ("offset: %f\n", joy_axes[ax].offset); Sys_Printf ("offset: %f\n", joy_axes[ax].offset);
Sys_Printf ("type: %s\n", JOY_GetDest_c(joy_axes[ax].dest)); Sys_Printf ("type: %s\n",
JOY_GetDest_c (joy_axes[ax].dest));
Sys_Printf ("<====================>\n"); Sys_Printf ("<====================>\n");
break; break;
} }
return; return;
} } else if (c < 4) {
else if (c < 4) { if (JOY_GetOption_i (Cmd_Argv (2)) == js_clear) {
if (JOY_GetOption_i (Cmd_Argv(2)) == js_clear) { ax = strtol (Cmd_Argv (1), NULL, 0);
ax = strtol(Cmd_Argv(1), NULL ,0);
joy_clear_axis (ax); joy_clear_axis (ax);
return; return;
} else { } else {
Sys_Printf ("in_joy <axis#> [<var> <value>]* : Configures the joystick behaviour\n"); Sys_Printf ("in_joy <axis#> [<var> <value>]*\n"
" Configures the joystick behaviour\n");
return; return;
} }
} }
ax = strtol(Cmd_Argv(1), NULL ,0); ax = strtol (Cmd_Argv (1), NULL, 0);
const char *arg;
i = 2; i = 2;
while(i<c) while (i < c) {
{ int var = JOY_GetOption_i (Cmd_Argv (i++));
int var = JOY_GetOption_i (Cmd_Argv(i++));
switch (var) { switch (var) {
case js_amp: case js_amp:
joy_axes[ax].amp = strtof (Cmd_Argv(i++), NULL); joy_axes[ax].amp = strtof (Cmd_Argv (i++), NULL);
break; break;
case js_pre_amp: case js_pre_amp:
joy_axes[ax].pre_amp = strtof (Cmd_Argv(i++), NULL); joy_axes[ax].pre_amp = strtof (Cmd_Argv (i++), NULL);
break; break;
case js_deadzone: case js_deadzone:
joy_axes[ax].deadzone = strtol (Cmd_Argv(i++), NULL, 10); joy_axes[ax].deadzone = strtol (Cmd_Argv (i++), NULL, 10);
break; break;
case js_offset: case js_offset:
joy_axes[ax].offset = strtol (Cmd_Argv(i++), NULL, 10); joy_axes[ax].offset = strtol (Cmd_Argv (i++), NULL, 10);
break; break;
case js_type: case js_type:
joy_axes[ax].dest = JOY_GetDest_i (Cmd_Argv(i++)); joy_axes[ax].dest = JOY_GetDest_i (Cmd_Argv (i++));
joy_axes[ax].axis = strtol (Cmd_Argv(i++), NULL, 10); joy_axes[ax].axis = strtol (Cmd_Argv (i++), NULL, 10);
if (joy_axes[ax].axis > 1 || joy_axes[ax].axis < 0) { if (joy_axes[ax].axis > 1 || joy_axes[ax].axis < 0) {
joy_axes[ax].axis = 0; joy_axes[ax].axis = 0;
Sys_Printf("Invalid axis value."); Sys_Printf ("Invalid axis value.");
} }
break; break;
case js_axis_button: case js_axis_button:
arg = Cmd_Argv(i++); arg = Cmd_Argv (i++);
if (!strcmp("add", arg)) { if (!strcmp ("add", arg)) {
int n = joy_axes[ax].num_buttons++; int n = joy_axes[ax].num_buttons++;
joy_axes[ax].axis_buttons = realloc(joy_axes[ax].axis_buttons,
/*sizeof*/ n*sizeof(joy_axes[ax].axis_buttons));
joy_axes[ax].axis_buttons[n].key = strtol (Cmd_Argv(i++), NULL, 10) + QFJ_AXIS1; joy_axes[ax].axis_buttons =
joy_axes[ax].axis_buttons[n].threshold = strtof(Cmd_Argv(i++), NULL); realloc (joy_axes[ax].axis_buttons,
n * sizeof (joy_axes[ax].axis_buttons));
joy_axes[ax].axis_buttons[n].key =
strtol (Cmd_Argv (i++), NULL, 10) + QFJ_AXIS1;
joy_axes[ax].axis_buttons[n].threshold =
strtof (Cmd_Argv (i++), NULL);
} }
break; break;
default: default:
Sys_Printf ("Unknown option %s.\n", Cmd_Argv(i-1)); Sys_Printf ("Unknown option %s.\n", Cmd_Argv (i - 1));
break; break;
} }
} }
@ -388,8 +399,10 @@ in_joy_f (void)
VISIBLE void VISIBLE void
JOY_Init_Cvars (void) JOY_Init_Cvars (void)
{ {
joy_device = Cvar_Get ("joy_device", "/dev/input/js0", CVAR_NONE | CVAR_ROM, 0, int i;
"Joystick device");
joy_device = Cvar_Get ("joy_device", "/dev/input/js0",
CVAR_NONE | CVAR_ROM, 0, "Joystick device");
joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0, joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0,
"Joystick enable flag"); "Joystick enable flag");
joy_amp = Cvar_Get ("joy_amp", "1", CVAR_NONE | CVAR_ARCHIVE, joyamp_f, joy_amp = Cvar_Get ("joy_amp", "1", CVAR_NONE | CVAR_ARCHIVE, joyamp_f,
@ -397,10 +410,9 @@ JOY_Init_Cvars (void)
joy_pre_amp = Cvar_Get ("joy_pre_amp", "1", CVAR_NONE | CVAR_ARCHIVE, joy_pre_amp = Cvar_Get ("joy_pre_amp", "1", CVAR_NONE | CVAR_ARCHIVE,
joyamp_f, "Joystick pre-amplification"); joyamp_f, "Joystick pre-amplification");
Cmd_AddCommand("in_joy", in_joy_f, "Configures the joystick behaviour"); Cmd_AddCommand ("in_joy", in_joy_f, "Configures the joystick behaviour");
int i;
for (i=0;i<JOY_MAX_AXES;i++) for (i = 0; i < JOY_MAX_AXES; i++) {
{
joy_axes[i].dest = js_none; joy_axes[i].dest = js_none;
joy_axes[i].amp = 1; joy_axes[i].amp = 1;
joy_axes[i].pre_amp = 1; joy_axes[i].pre_amp = 1;
@ -410,19 +422,22 @@ JOY_Init_Cvars (void)
void void
Joy_WriteBindings (QFile *f) Joy_WriteBindings (QFile * f)
{ {
int i; int i;
for (i=0;i<JOY_MAX_AXES;i++)
{ for (i = 0; i < JOY_MAX_AXES; i++) {
Qprintf(f, "in_joy %i amp %f pre_amp %f deadzone %i offset %f type %s %i\n", Qprintf (f,
"in_joy %i amp %f pre_amp %f deadzone %i offset %f type %s %i\n",
i, joy_axes[i].amp, joy_axes[i].pre_amp, joy_axes[i].deadzone, i, joy_axes[i].amp, joy_axes[i].pre_amp, joy_axes[i].deadzone,
joy_axes[i].offset, JOY_GetDest_c (joy_axes[i].dest), joy_axes[i].axis); joy_axes[i].offset, JOY_GetDest_c (joy_axes[i].dest),
joy_axes[i].axis);
if (joy_axes[i].num_buttons > 0) { if (joy_axes[i].num_buttons > 0) {
int n; int n;
for (n=0;n<joy_axes[i].num_buttons;n++) {
Qprintf(f, "in_joy %i button add %i %f\n", i, for (n = 0; n < joy_axes[i].num_buttons; n++) {
Qprintf (f, "in_joy %i button add %i %f\n", i,
joy_axes[i].axis_buttons[n].key - QFJ_AXIS1, joy_axes[i].axis_buttons[n].key - QFJ_AXIS1,
joy_axes[i].axis_buttons[n].threshold); joy_axes[i].axis_buttons[n].threshold);
} }