diff options
Diffstat (limited to 'src/ui_menu.c')
| -rw-r--r-- | src/ui_menu.c | 1287 |
1 files changed, 682 insertions, 605 deletions
diff --git a/src/ui_menu.c b/src/ui_menu.c index 9611fb0..a931620 100644 --- a/src/ui_menu.c +++ b/src/ui_menu.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -28,10 +28,11 @@ ACTION CONTROL =================================================================== */ -static void Action_Free( menuAction_t *a ) { - Z_Free( a->generic.name ); - Z_Free( a->cmd ); - Z_Free( a ); +static void Action_Free(menuAction_t *a) +{ + Z_Free(a->generic.name); + Z_Free(a->cmd); + Z_Free(a); } /* @@ -39,18 +40,19 @@ static void Action_Free( menuAction_t *a ) { Action_Init ================= */ -static void Action_Init( menuAction_t *a ) { - if( !a->generic.name ) { - Com_Error( ERR_FATAL, "Action_Init: NULL a->generic.name" ); +static void Action_Init(menuAction_t *a) +{ + if (!a->generic.name) { + Com_Error(ERR_FATAL, "Action_Init: NULL a->generic.name"); } - if( ( a->generic.uiFlags & UI_CENTER ) != UI_CENTER ) { + if ((a->generic.uiFlags & UI_CENTER) != UI_CENTER) { a->generic.x += RCOLUMN_OFFSET; } a->generic.rect.x = a->generic.x; a->generic.rect.y = a->generic.y; - UI_StringDimensions( &a->generic.rect, a->generic.uiFlags, a->generic.name ); + UI_StringDimensions(&a->generic.rect, a->generic.uiFlags, a->generic.name); } @@ -59,24 +61,25 @@ static void Action_Init( menuAction_t *a ) { Action_Draw ================= */ -static void Action_Draw( menuAction_t *a ) { +static void Action_Draw(menuAction_t *a) +{ int flags; flags = a->generic.uiFlags; - if( a->generic.flags & QMF_HASFOCUS ) { - if( ( a->generic.uiFlags & UI_CENTER ) != UI_CENTER ) { - if( ( uis.realtime >> 8 ) & 1 ) { - UI_DrawChar( a->generic.x - RCOLUMN_OFFSET / 2, a->generic.y, a->generic.uiFlags | UI_RIGHT, 13 ); + if (a->generic.flags & QMF_HASFOCUS) { + if ((a->generic.uiFlags & UI_CENTER) != UI_CENTER) { + if ((uis.realtime >> 8) & 1) { + UI_DrawChar(a->generic.x - RCOLUMN_OFFSET / 2, a->generic.y, a->generic.uiFlags | UI_RIGHT, 13); } } else { flags |= UI_ALTCOLOR; - if( ( uis.realtime >> 8 ) & 1 ) { - UI_DrawChar( a->generic.x - strlen( a->generic.name ) * CHAR_WIDTH / 2 - CHAR_WIDTH, a->generic.y, flags, 13 ); + if ((uis.realtime >> 8) & 1) { + UI_DrawChar(a->generic.x - strlen(a->generic.name) * CHAR_WIDTH / 2 - CHAR_WIDTH, a->generic.y, flags, 13); } } } - UI_DrawString( a->generic.x, a->generic.y, flags, a->generic.name ); + UI_DrawString(a->generic.x, a->generic.y, flags, a->generic.name); } /* @@ -92,20 +95,21 @@ STATIC CONTROL Static_Init ================= */ -static void Static_Init( menuStatic_t *s ) { - if( !s->generic.name ) { - Com_Error( ERR_FATAL, "Static_Init: NULL s->generic.name" ); +static void Static_Init(menuStatic_t *s) +{ + if (!s->generic.name) { + Com_Error(ERR_FATAL, "Static_Init: NULL s->generic.name"); } - if( !s->maxChars ) { + if (!s->maxChars) { s->maxChars = MAX_STRING_CHARS; } s->generic.rect.x = s->generic.x; s->generic.rect.y = s->generic.y; - UI_StringDimensions( &s->generic.rect, - s->generic.uiFlags, s->generic.name ); + UI_StringDimensions(&s->generic.rect, + s->generic.uiFlags, s->generic.name); } /* @@ -113,12 +117,13 @@ static void Static_Init( menuStatic_t *s ) { Static_Draw ================= */ -static void Static_Draw( menuStatic_t *s ) { - if( s->generic.flags & QMF_CUSTOM_COLOR ) { - R_SetColor( s->generic.color.u32 ); +static void Static_Draw(menuStatic_t *s) +{ + if (s->generic.flags & QMF_CUSTOM_COLOR) { + R_SetColor(s->generic.color.u32); } - UI_DrawString( s->generic.x, s->generic.y, s->generic.uiFlags, s->generic.name ); - if( s->generic.flags & QMF_CUSTOM_COLOR ) { + UI_DrawString(s->generic.x, s->generic.y, s->generic.uiFlags, s->generic.name); + if (s->generic.flags & QMF_CUSTOM_COLOR) { R_ClearColor(); } } @@ -131,25 +136,28 @@ BITMAP CONTROL =================================================================== */ -static void Bitmap_Free( menuBitmap_t *b ) { - Z_Free( b->cmd ); - Z_Free( b ); +static void Bitmap_Free(menuBitmap_t *b) +{ + Z_Free(b->cmd); + Z_Free(b); } -static void Bitmap_Init( menuBitmap_t *b ) { +static void Bitmap_Init(menuBitmap_t *b) +{ b->generic.rect.x = b->generic.x; b->generic.rect.y = b->generic.y; b->generic.rect.width = b->generic.width; b->generic.rect.height = b->generic.height; } -static void Bitmap_Draw( menuBitmap_t *b ) { - if( b->generic.flags & QMF_HASFOCUS ) { - unsigned frame = ( uis.realtime / 100 ) % NUM_CURSOR_FRAMES; - R_DrawPic( b->generic.x - CURSOR_OFFSET, b->generic.y, uis.bitmapCursors[frame] ); - R_DrawPic( b->generic.x, b->generic.y, b->pics[1] ); +static void Bitmap_Draw(menuBitmap_t *b) +{ + if (b->generic.flags & QMF_HASFOCUS) { + unsigned frame = (uis.realtime / 100) % NUM_CURSOR_FRAMES; + R_DrawPic(b->generic.x - CURSOR_OFFSET, b->generic.y, uis.bitmapCursors[frame]); + R_DrawPic(b->generic.x, b->generic.y, b->pics[1]); } else { - R_DrawPic( b->generic.x, b->generic.y, b->pics[0] ); + R_DrawPic(b->generic.x, b->generic.y, b->pics[0]); } } @@ -161,10 +169,11 @@ KEYBIND CONTROL =================================================================== */ -static void Keybind_Free( menuKeybind_t *k ) { - Z_Free( k->generic.name ); - Z_Free( k->cmd ); - Z_Free( k ); +static void Keybind_Free(menuKeybind_t *k) +{ + Z_Free(k->generic.name); + Z_Free(k->cmd); + Z_Free(k); } /* @@ -172,21 +181,22 @@ static void Keybind_Free( menuKeybind_t *k ) { Keybind_Init ================= */ -static void Keybind_Init( menuKeybind_t *k ) { - if( !k->generic.name ) { - Com_Error( ERR_FATAL, "Keybind_Init: NULL k->generic.name" ); +static void Keybind_Init(menuKeybind_t *k) +{ + if (!k->generic.name) { + Com_Error(ERR_FATAL, "Keybind_Init: NULL k->generic.name"); } - k->generic.uiFlags &= ~( UI_LEFT | UI_RIGHT ); + k->generic.uiFlags &= ~(UI_LEFT | UI_RIGHT); k->generic.rect.x = k->generic.x + LCOLUMN_OFFSET; k->generic.rect.y = k->generic.y; - UI_StringDimensions( &k->generic.rect, - k->generic.uiFlags | UI_RIGHT, k->generic.name ); + UI_StringDimensions(&k->generic.rect, + k->generic.uiFlags | UI_RIGHT, k->generic.name); - k->generic.rect.width += ( RCOLUMN_OFFSET - LCOLUMN_OFFSET ) + - strlen( k->binding ) * CHAR_WIDTH; + k->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + + strlen(k->binding) * CHAR_WIDTH; } /* @@ -194,130 +204,139 @@ static void Keybind_Init( menuKeybind_t *k ) { Keybind_Draw ================= */ -static void Keybind_Draw( menuKeybind_t *k ) { +static void Keybind_Draw(menuKeybind_t *k) +{ char string[MAX_STRING_CHARS]; int flags; flags = UI_ALTCOLOR; - if( k->generic.flags & QMF_HASFOCUS ) { - /*if( k->generic.parent->keywait ) { - UI_DrawChar( k->generic.x + RCOLUMN_OFFSET / 2, k->generic.y, k->generic.uiFlags | UI_RIGHT, '=' ); - } else*/ if( ( uis.realtime >> 8 ) & 1 ) { - UI_DrawChar( k->generic.x + RCOLUMN_OFFSET / 2, k->generic.y, k->generic.uiFlags | UI_RIGHT, 13 ); + if (k->generic.flags & QMF_HASFOCUS) { + /*if(k->generic.parent->keywait) { + UI_DrawChar(k->generic.x + RCOLUMN_OFFSET / 2, k->generic.y, k->generic.uiFlags | UI_RIGHT, '='); + } else*/ if ((uis.realtime >> 8) & 1) { + UI_DrawChar(k->generic.x + RCOLUMN_OFFSET / 2, k->generic.y, k->generic.uiFlags | UI_RIGHT, 13); } } else { - if( k->generic.parent->keywait ) { - R_SetColor( uis.color.disabled.u32 ); + if (k->generic.parent->keywait) { + R_SetColor(uis.color.disabled.u32); flags = 0; } } - UI_DrawString( k->generic.x + LCOLUMN_OFFSET, k->generic.y, - k->generic.uiFlags | UI_RIGHT | flags, k->generic.name ); + UI_DrawString(k->generic.x + LCOLUMN_OFFSET, k->generic.y, + k->generic.uiFlags | UI_RIGHT | flags, k->generic.name); - if( k->altbinding[0] ) { - Q_concat( string, sizeof( string ), k->binding, " or ", k->altbinding, NULL ); - } else if( k->binding[0] ) { - strcpy( string, k->binding ); + if (k->altbinding[0]) { + Q_concat(string, sizeof(string), k->binding, " or ", k->altbinding, NULL); + } else if (k->binding[0]) { + strcpy(string, k->binding); } else { - strcpy( string, "???" ); + strcpy(string, "???"); } - UI_DrawString( k->generic.x + RCOLUMN_OFFSET, k->generic.y, - k->generic.uiFlags | UI_LEFT, string ); + UI_DrawString(k->generic.x + RCOLUMN_OFFSET, k->generic.y, + k->generic.uiFlags | UI_LEFT, string); R_ClearColor(); } -static void Keybind_Push( menuKeybind_t *k ) { - int key = Key_EnumBindings( 0, k->cmd ); +static void Keybind_Push(menuKeybind_t *k) +{ + int key = Key_EnumBindings(0, k->cmd); + k->altbinding[0] = 0; - if( key == -1 ) { - strcpy( k->binding, "???" ); + if (key == -1) { + strcpy(k->binding, "???"); } else { - strcpy( k->binding, Key_KeynumToString( key ) ); - key = Key_EnumBindings( key + 1, k->cmd ); - if( key != -1 ) { - strcpy( k->altbinding, Key_KeynumToString( key ) ); + strcpy(k->binding, Key_KeynumToString(key)); + key = Key_EnumBindings(key + 1, k->cmd); + if (key != -1) { + strcpy(k->altbinding, Key_KeynumToString(key)); } } } -static void Keybind_Pop( menuKeybind_t *k ) { - Key_WaitKey( NULL, NULL ); +static void Keybind_Pop(menuKeybind_t *k) +{ + Key_WaitKey(NULL, NULL); } -static void Keybind_Update( menuFrameWork_t *menu ) { +static void Keybind_Update(menuFrameWork_t *menu) +{ menuKeybind_t *k; int i; - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { k = menu->items[i]; - if( k->generic.type == MTYPE_KEYBIND ) { - Keybind_Push( k ); + if (k->generic.type == MTYPE_KEYBIND) { + Keybind_Push(k); } } } -static void Keybind_Remove( const char *cmd ) { +static void Keybind_Remove(const char *cmd) +{ int key; - for( key = 0; ; key++ ) { - key = Key_EnumBindings( key, cmd ); - if( key == -1 ) { + for (key = 0; ; key++) { + key = Key_EnumBindings(key, cmd); + if (key == -1) { break; } - Key_SetBinding( key, NULL ); + Key_SetBinding(key, NULL); } } -static qboolean keybind_cb( void *arg, int key ) { +static qboolean keybind_cb(void *arg, int key) +{ menuKeybind_t *k = arg; menuFrameWork_t *menu = k->generic.parent; // console key is hardcoded - if( key == '`' ) { - UI_StartSound( QMS_BEEP ); + if (key == '`') { + UI_StartSound(QMS_BEEP); return qfalse; } // menu key is hardcoded - if( key != K_ESCAPE ) { - if( k->altbinding[0] ) { - Keybind_Remove( k->cmd ); + if (key != K_ESCAPE) { + if (k->altbinding[0]) { + Keybind_Remove(k->cmd); } - Key_SetBinding( key, k->cmd ); + Key_SetBinding(key, k->cmd); } - Keybind_Update( menu ); + Keybind_Update(menu); menu->keywait = qfalse; menu->status = "Press Enter to change, Backspace to clear"; - Key_WaitKey( NULL, NULL ); + Key_WaitKey(NULL, NULL); - UI_StartSound( QMS_OUT ); + UI_StartSound(QMS_OUT); return qfalse; } -static menuSound_t Keybind_DoEnter( menuKeybind_t *k ) { +static menuSound_t Keybind_DoEnter(menuKeybind_t *k) +{ menuFrameWork_t *menu = k->generic.parent; menu->keywait = qtrue; menu->status = "Press the desired key, Escape to cancel"; - Key_WaitKey( keybind_cb, k ); + Key_WaitKey(keybind_cb, k); return QMS_IN; } -static menuSound_t Keybind_Key( menuKeybind_t *k, int key ) { +static menuSound_t Keybind_Key(menuKeybind_t *k, int key) +{ menuFrameWork_t *menu = k->generic.parent; - if( menu->keywait ) { + if (menu->keywait) { return QMS_OUT; // never gets there } - - if( key == K_BACKSPACE || key == K_DEL ) { - Keybind_Remove( k->cmd ); - Keybind_Update( menu ); + + if (key == K_BACKSPACE || key == K_DEL) { + Keybind_Remove(k->cmd); + Keybind_Update(menu); return QMS_IN; } @@ -333,19 +352,22 @@ FIELD CONTROL =================================================================== */ -static void Field_Push( menuField_t *f ) { - IF_Init( &f->field, f->width, f->width ); - IF_Replace( &f->field, f->cvar->string ); +static void Field_Push(menuField_t *f) +{ + IF_Init(&f->field, f->width, f->width); + IF_Replace(&f->field, f->cvar->string); } -static void Field_Pop( menuField_t *f ) { - Cvar_SetByVar( f->cvar, f->field.text, FROM_MENU ); +static void Field_Pop(menuField_t *f) +{ + Cvar_SetByVar(f->cvar, f->field.text, FROM_MENU); } -static void Field_Free( menuField_t *f ) { - Z_Free( f->generic.name ); - Z_Free( f->generic.status ); - Z_Free( f ); +static void Field_Free(menuField_t *f) +{ + Z_Free(f->generic.name); + Z_Free(f->generic.status); + Z_Free(f); } /* @@ -353,17 +375,18 @@ static void Field_Free( menuField_t *f ) { Field_Init ================= */ -static void Field_Init( menuField_t *f ) { +static void Field_Init(menuField_t *f) +{ int w = f->width * CHAR_WIDTH; - f->generic.uiFlags &= ~( UI_LEFT | UI_RIGHT ); - - if( f->generic.name ) { + f->generic.uiFlags &= ~(UI_LEFT | UI_RIGHT); + + if (f->generic.name) { f->generic.rect.x = f->generic.x + LCOLUMN_OFFSET; f->generic.rect.y = f->generic.y; - UI_StringDimensions( &f->generic.rect, - f->generic.uiFlags | UI_RIGHT, f->generic.name ); - f->generic.rect.width += ( RCOLUMN_OFFSET - LCOLUMN_OFFSET ) + w; + UI_StringDimensions(&f->generic.rect, + f->generic.uiFlags | UI_RIGHT, f->generic.name); + f->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + w; } else { f->generic.rect.x = f->generic.x - w / 2; f->generic.rect.y = f->generic.y; @@ -378,30 +401,31 @@ static void Field_Init( menuField_t *f ) { Field_Draw ================= */ -static void Field_Draw( menuField_t *f ) { +static void Field_Draw(menuField_t *f) +{ int flags = f->generic.uiFlags; uint32_t color = uis.color.normal.u32; - if( f->generic.flags & QMF_HASFOCUS ) { + if (f->generic.flags & QMF_HASFOCUS) { flags |= UI_DRAWCURSOR; color = uis.color.active.u32; } - if( f->generic.name ) { - UI_DrawString( f->generic.x + LCOLUMN_OFFSET, f->generic.y, - f->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, f->generic.name ); + if (f->generic.name) { + UI_DrawString(f->generic.x + LCOLUMN_OFFSET, f->generic.y, + f->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, f->generic.name); - R_DrawFill32( f->generic.x + RCOLUMN_OFFSET, f->generic.y - 1, - f->field.visibleChars * CHAR_WIDTH, CHAR_HEIGHT + 2, color ); + R_DrawFill32(f->generic.x + RCOLUMN_OFFSET, f->generic.y - 1, + f->field.visibleChars * CHAR_WIDTH, CHAR_HEIGHT + 2, color); - IF_Draw( &f->field, f->generic.x + RCOLUMN_OFFSET, f->generic.y, - flags, uis.fontHandle ); + IF_Draw(&f->field, f->generic.x + RCOLUMN_OFFSET, f->generic.y, + flags, uis.fontHandle); } else { - R_DrawFill32( f->generic.rect.x, f->generic.rect.y - 1, - f->generic.rect.width, CHAR_HEIGHT + 2, color ); + R_DrawFill32(f->generic.rect.x, f->generic.rect.y - 1, + f->generic.rect.width, CHAR_HEIGHT + 2, color); - IF_Draw( &f->field, f->generic.rect.x, f->generic.rect.y, - flags, uis.fontHandle ); + IF_Draw(&f->field, f->generic.rect.x, f->generic.rect.y, + flags, uis.fontHandle); } } @@ -410,19 +434,20 @@ static void Field_Draw( menuField_t *f ) { Field_Key ================= */ -static int Field_Key( menuField_t *f, int key ) { +static int Field_Key(menuField_t *f, int key) +{ qboolean ret; - ret = IF_KeyEvent( &f->field, key ); - if( ret ) { + ret = IF_KeyEvent(&f->field, key); + if (ret) { return QMS_SILENT; } - if( f->generic.flags & QMF_NUMBERSONLY ) { - if( Q_isdigit( key ) ) { + if (f->generic.flags & QMF_NUMBERSONLY) { + if (Q_isdigit(key)) { return QMS_SILENT; } } else { - if( key >= 32 && key < 127 ) { + if (key >= 32 && key < 127) { return QMS_SILENT; } } @@ -434,18 +459,19 @@ static int Field_Key( menuField_t *f, int key ) { Field_Char ================= */ -static int Field_Char( menuField_t *f, int key ) { +static int Field_Char(menuField_t *f, int key) +{ int ret; - if( f->generic.flags & QMF_NUMBERSONLY ) { - if( key < '0' || key > '9' ) { + if (f->generic.flags & QMF_NUMBERSONLY) { + if (key < '0' || key > '9') { return QMS_BEEP; } } - ret = IF_CharEvent( &f->field, key ); - if( f->generic.change ) { - f->generic.change( &f->generic ); + ret = IF_CharEvent(&f->field, key); + if (f->generic.change) { + f->generic.change(&f->generic); } return ret ? QMS_SILENT : QMS_NOTHANDLED; @@ -459,25 +485,28 @@ SPIN CONTROL =================================================================== */ -static void SpinControl_Push( menuSpinControl_t *s ) { +static void SpinControl_Push(menuSpinControl_t *s) +{ int val = s->cvar->integer; - clamp( val, 0, s->numItems - 1 ); + clamp(val, 0, s->numItems - 1); s->curvalue = val; } -static void SpinControl_Pop( menuSpinControl_t *s ) { - Cvar_SetInteger( s->cvar, s->curvalue, FROM_MENU ); +static void SpinControl_Pop(menuSpinControl_t *s) +{ + Cvar_SetInteger(s->cvar, s->curvalue, FROM_MENU); } -static void SpinControl_Free( menuSpinControl_t *s ) { +static void SpinControl_Free(menuSpinControl_t *s) +{ int i; - Z_Free( s->generic.name ); - for( i = 0; i < s->numItems; i++ ) { - Z_Free( s->itemnames[i] ); + Z_Free(s->generic.name); + for (i = 0; i < s->numItems; i++) { + Z_Free(s->itemnames[i]); } - Z_Free( s->itemnames ); - Z_Free( s ); + Z_Free(s->itemnames); + Z_Free(s); } @@ -486,33 +515,34 @@ static void SpinControl_Free( menuSpinControl_t *s ) { SpinControl_Init ================= */ -void SpinControl_Init( menuSpinControl_t *s ) { +void SpinControl_Init(menuSpinControl_t *s) +{ char **n; int maxLength, length; - s->generic.uiFlags &= ~( UI_LEFT | UI_RIGHT ); + s->generic.uiFlags &= ~(UI_LEFT | UI_RIGHT); s->generic.rect.x = s->generic.x + LCOLUMN_OFFSET; s->generic.rect.y = s->generic.y; - UI_StringDimensions( &s->generic.rect, - s->generic.uiFlags | UI_RIGHT, s->generic.name ); + UI_StringDimensions(&s->generic.rect, + s->generic.uiFlags | UI_RIGHT, s->generic.name); maxLength = 0; s->numItems = 0; n = s->itemnames; - while( *n ) { - length = strlen( *n ); - - if( maxLength < length ) { + while (*n) { + length = strlen(*n); + + if (maxLength < length) { maxLength = length; } s->numItems++; n++; } - s->generic.rect.width += ( RCOLUMN_OFFSET - LCOLUMN_OFFSET ) + - maxLength * CHAR_WIDTH; + s->generic.rect.width += (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + + maxLength * CHAR_WIDTH; } /* @@ -520,14 +550,15 @@ void SpinControl_Init( menuSpinControl_t *s ) { SpinControl_DoEnter ================= */ -static int SpinControl_DoEnter( menuSpinControl_t *s ) { +static int SpinControl_DoEnter(menuSpinControl_t *s) +{ s->curvalue++; - if( s->curvalue >= s->numItems ) + if (s->curvalue >= s->numItems) s->curvalue = 0; - if( s->generic.change ) { - s->generic.change( &s->generic ); + if (s->generic.change) { + s->generic.change(&s->generic); } return QMS_MOVE; @@ -538,17 +569,18 @@ static int SpinControl_DoEnter( menuSpinControl_t *s ) { SpinControl_DoSlide ================= */ -static int SpinControl_DoSlide( menuSpinControl_t *s, int dir ) { +static int SpinControl_DoSlide(menuSpinControl_t *s, int dir) +{ s->curvalue += dir; - if( s->curvalue < 0 ) { + if (s->curvalue < 0) { s->curvalue = s->numItems - 1; - } else if( s->curvalue >= s->numItems ) { + } else if (s->curvalue >= s->numItems) { s->curvalue = 0; } - if( s->generic.change ) { - s->generic.change( &s->generic ); + if (s->generic.change) { + s->generic.change(&s->generic); } return QMS_MOVE; @@ -559,19 +591,20 @@ static int SpinControl_DoSlide( menuSpinControl_t *s, int dir ) { SpinControl_Draw ================= */ -static void SpinControl_Draw( menuSpinControl_t *s ) { - UI_DrawString( s->generic.x + LCOLUMN_OFFSET, s->generic.y, - s->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, s->generic.name ); +static void SpinControl_Draw(menuSpinControl_t *s) +{ + UI_DrawString(s->generic.x + LCOLUMN_OFFSET, s->generic.y, + s->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, s->generic.name); - if( s->generic.flags & QMF_HASFOCUS ) { - if( ( uis.realtime >> 8 ) & 1 ) { - UI_DrawChar( s->generic.x + RCOLUMN_OFFSET / 2, s->generic.y, - s->generic.uiFlags | UI_RIGHT, 13 ); + if (s->generic.flags & QMF_HASFOCUS) { + if ((uis.realtime >> 8) & 1) { + UI_DrawChar(s->generic.x + RCOLUMN_OFFSET / 2, s->generic.y, + s->generic.uiFlags | UI_RIGHT, 13); } } - UI_DrawString( s->generic.x + RCOLUMN_OFFSET, s->generic.y, - s->generic.uiFlags, s->itemnames[s->curvalue] ); + UI_DrawString(s->generic.x + RCOLUMN_OFFSET, s->generic.y, + s->generic.uiFlags, s->itemnames[s->curvalue]); } /* @@ -582,28 +615,31 @@ BITFIELD CONTROL =================================================================== */ -static void BitField_Push( menuSpinControl_t *s ) { - if( s->cvar->integer & s->mask ) { +static void BitField_Push(menuSpinControl_t *s) +{ + if (s->cvar->integer & s->mask) { s->curvalue = 1 ^ s->negate; } else { s->curvalue = 0 ^ s->negate; } } -static void BitField_Pop( menuSpinControl_t *s ) { +static void BitField_Pop(menuSpinControl_t *s) +{ int val = s->cvar->integer; - if( s->curvalue ^ s->negate ) { + if (s->curvalue ^ s->negate) { val |= s->mask; } else { val &= ~s->mask; } - Cvar_SetInteger( s->cvar, val, FROM_MENU ); + Cvar_SetInteger(s->cvar, val, FROM_MENU); } -static void BitField_Free( menuSpinControl_t *s ) { - Z_Free( s->generic.name ); - Z_Free( s ); +static void BitField_Free(menuSpinControl_t *s) +{ + Z_Free(s->generic.name); + Z_Free(s); } /* @@ -614,32 +650,35 @@ PAIRS CONTROL =================================================================== */ -static void Pairs_Push( menuSpinControl_t *s ) { +static void Pairs_Push(menuSpinControl_t *s) +{ int i; - for( i = 0; i < s->numItems; i++ ) { - if( !Q_stricmp( s->itemvalues[i], s->cvar->string ) ) { + for (i = 0; i < s->numItems; i++) { + if (!Q_stricmp(s->itemvalues[i], s->cvar->string)) { s->curvalue = i; break; } } } -static void Pairs_Pop( menuSpinControl_t *s ) { - Cvar_SetByVar( s->cvar, s->itemvalues[s->curvalue], FROM_MENU ); +static void Pairs_Pop(menuSpinControl_t *s) +{ + Cvar_SetByVar(s->cvar, s->itemvalues[s->curvalue], FROM_MENU); } -static void Pairs_Free( menuSpinControl_t *s ) { +static void Pairs_Free(menuSpinControl_t *s) +{ int i; - Z_Free( s->generic.name ); - for( i = 0; i < s->numItems; i++ ) { - Z_Free( s->itemnames[i] ); - Z_Free( s->itemvalues[i] ); + Z_Free(s->generic.name); + for (i = 0; i < s->numItems; i++) { + Z_Free(s->itemnames[i]); + Z_Free(s->itemvalues[i]); } - Z_Free( s->itemnames ); - Z_Free( s->itemvalues ); - Z_Free( s ); + Z_Free(s->itemnames); + Z_Free(s->itemvalues); + Z_Free(s); } /* @@ -650,19 +689,21 @@ STRINGS CONTROL =================================================================== */ -static void Strings_Push( menuSpinControl_t *s ) { +static void Strings_Push(menuSpinControl_t *s) +{ int i; - for( i = 0; i < s->numItems; i++ ) { - if( !Q_stricmp( s->itemnames[i], s->cvar->string ) ) { + for (i = 0; i < s->numItems; i++) { + if (!Q_stricmp(s->itemnames[i], s->cvar->string)) { s->curvalue = i; break; } } } -static void Strings_Pop( menuSpinControl_t *s ) { - Cvar_SetByVar( s->cvar, s->itemnames[s->curvalue], FROM_MENU ); +static void Strings_Pop(menuSpinControl_t *s) +{ + Cvar_SetByVar(s->cvar, s->itemnames[s->curvalue], FROM_MENU); } /* @@ -673,8 +714,9 @@ TOGGLE CONTROL =================================================================== */ -static void Toggle_Push( menuSpinControl_t *s ) { - s->curvalue = ( s->cvar->integer ? 1 : 0 ) ^ s->negate; +static void Toggle_Push(menuSpinControl_t *s) +{ + s->curvalue = (s->cvar->integer ? 1 : 0) ^ s->negate; } /* @@ -690,20 +732,22 @@ LIST CONTROL MenuList_ValidatePrestep ================= */ -static void MenuList_ValidatePrestep( menuList_t *l ) { - if( l->prestep > l->numItems - l->maxItems ) { +static void MenuList_ValidatePrestep(menuList_t *l) +{ + if (l->prestep > l->numItems - l->maxItems) { l->prestep = l->numItems - l->maxItems; } - if( l->prestep < 0 ) { + if (l->prestep < 0) { l->prestep = 0; } } -static void MenuList_AdjustPrestep( menuList_t *l ) { - if( l->numItems > l->maxItems ) { - if( l->prestep > l->curvalue ) { +static void MenuList_AdjustPrestep(menuList_t *l) +{ + if (l->numItems > l->maxItems) { + if (l->prestep > l->curvalue) { l->prestep = l->curvalue; - } else if( l->prestep < l->curvalue - l->maxItems + 1 ) { + } else if (l->prestep < l->curvalue - l->maxItems + 1) { l->prestep = l->curvalue - l->maxItems + 1; } } else { @@ -716,26 +760,27 @@ static void MenuList_AdjustPrestep( menuList_t *l ) { MenuList_Init ================= */ -void MenuList_Init( menuList_t *l ) { +void MenuList_Init(menuList_t *l) +{ int height; int i; height = l->generic.height; - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { + if (!(l->mlFlags & MLF_HIDE_HEADER)) { height -= MLIST_SPACING; } l->maxItems = height / MLIST_SPACING; - clamp( l->curvalue, 0, l->numItems - 1 ); + clamp(l->curvalue, 0, l->numItems - 1); - MenuList_ValidatePrestep( l ); + MenuList_ValidatePrestep(l); l->generic.rect.x = l->generic.x; l->generic.rect.y = l->generic.y; l->generic.rect.width = 0; - for( i = 0; i < l->numcolumns; i++ ) { + for (i = 0; i < l->numcolumns; i++) { l->generic.rect.width += l->columns[i].width; } @@ -745,8 +790,8 @@ void MenuList_Init( menuList_t *l ) { l->generic.rect.height = l->generic.height; - if( l->sortdir && l->sort ) { - l->sort( l, l->sortcol ); + if (l->sortdir && l->sort) { + l->sort(l, l->sortcol); } } @@ -755,28 +800,30 @@ void MenuList_Init( menuList_t *l ) { MenuList_SetValue ================= */ -void MenuList_SetValue( menuList_t *l, int value ) { - clamp( value, 0, l->numItems - 1 ); +void MenuList_SetValue(menuList_t *l, int value) +{ + clamp(value, 0, l->numItems - 1); - if( value != l->curvalue ) { + if (value != l->curvalue) { l->curvalue = value; - if( l->generic.change ) { - l->generic.change( &l->generic ); + if (l->generic.change) { + l->generic.change(&l->generic); } } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep(l); } -static int MenuList_SetColumn( menuList_t *l, int value ) { - if( l->sortcol == value ) { +static int MenuList_SetColumn(menuList_t *l, int value) +{ + if (l->sortcol == value) { l->sortdir = -l->sortdir; } else { l->sortcol = value; l->sortdir = 1; } - if( l->sort ) { - l->sort( l, l->sortcol ); + if (l->sort) { + l->sort(l, l->sortcol); } return QMS_SILENT; } @@ -787,11 +834,12 @@ static int MenuList_SetColumn( menuList_t *l, int value ) { MenuList_Click ================= */ -static int MenuList_Click( menuList_t *l ) { +static int MenuList_Click(menuList_t *l) +{ int i, j; vrect_t rect; - if( !l->items ) { + if (!l->items) { return QMS_SILENT; } @@ -801,12 +849,12 @@ static int MenuList_Click( menuList_t *l ) { rect.height = MLIST_SPACING; // click on header - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { - if( l->sortdir && UI_CursorInRect( &rect ) ) { - for( j = 0; j < l->numcolumns; j++ ) { + if (!(l->mlFlags & MLF_HIDE_HEADER)) { + if (l->sortdir && UI_CursorInRect(&rect)) { + for (j = 0; j < l->numcolumns; j++) { rect.width = l->columns[j].width; - if( UI_CursorInRect( &rect ) ) { - return MenuList_SetColumn( l, j ); + if (UI_CursorInRect(&rect)) { + return MenuList_SetColumn(l, j); } rect.x += rect.width; } @@ -816,21 +864,20 @@ static int MenuList_Click( menuList_t *l ) { } // click on item - j = min( l->numItems, l->prestep + l->maxItems ); - for( i = l->prestep; i < j; i++ ) { - if( UI_CursorInRect( &rect ) ) { - if( l->curvalue == i && uis.realtime - - l->clickTime < DOUBLE_CLICK_DELAY ) - { - if( l->generic.activate ) { - return l->generic.activate( &l->generic ); + j = min(l->numItems, l->prestep + l->maxItems); + for (i = l->prestep; i < j; i++) { + if (UI_CursorInRect(&rect)) { + if (l->curvalue == i && uis.realtime - + l->clickTime < DOUBLE_CLICK_DELAY) { + if (l->generic.activate) { + return l->generic.activate(&l->generic); } return QMS_SILENT; } l->clickTime = uis.realtime; l->curvalue = i; - if( l->generic.change ) { - return l->generic.change( &l->generic ); + if (l->generic.change) { + return l->generic.change(&l->generic); } return QMS_SILENT; } @@ -845,29 +892,30 @@ static int MenuList_Click( menuList_t *l ) { MenuList_Key ================= */ -static int MenuList_Key( menuList_t *l, int key ) { +static int MenuList_Key(menuList_t *l, int key) +{ //int i; - if( !l->items ) { + if (!l->items) { return QMS_NOTHANDLED; } - if( Key_IsDown( K_ALT ) && Q_isdigit( key ) ) { + if (Key_IsDown(K_ALT) && Q_isdigit(key)) { int col = key == '0' ? 9 : key - '0' - 1; - if( l->sortdir && col < l->numcolumns ) { - return MenuList_SetColumn( l, col ); + if (l->sortdir && col < l->numcolumns) { + return MenuList_SetColumn(l, col); } return QMS_NOTHANDLED; } #if 0 - if( key > 32 && key < 127 ) { - if( uis.realtime > l->scratchTime + 1300 ) { + if (key > 32 && key < 127) { + if (uis.realtime > l->scratchTime + 1300) { l->scratchCount = 0; l->scratchTime = uis.realtime; } - if( l->scratchCount >= sizeof( l->scratch ) - 1 ) { + if (l->scratchCount >= sizeof(l->scratch) - 1) { return QMS_NOTHANDLED; } @@ -876,15 +924,14 @@ static int MenuList_Key( menuList_t *l, int key ) { //l->scratchTime = uis.realtime; - if( !Q_stricmpn( UI_GetColumn( ( char * )l->items[l->curvalue] + l->extrasize, l->sortcol ), - l->scratch, l->scratchCount ) ) - { + if (!Q_stricmpn(UI_GetColumn((char *)l->items[l->curvalue] + l->extrasize, l->sortcol), + l->scratch, l->scratchCount)) { return QMS_NOTHANDLED; } - for( i = 0; i < l->numItems; i++ ) { - if( !Q_stricmpn( UI_GetColumn( ( char * )l->items[i] + l->extrasize, l->sortcol ), l->scratch, l->scratchCount ) ) { - MenuList_SetValue( l, i ); + for (i = 0; i < l->numItems; i++) { + if (!Q_stricmpn(UI_GetColumn((char *)l->items[i] + l->extrasize, l->sortcol), l->scratch, l->scratchCount)) { + MenuList_SetValue(l, i); return QMS_SILENT; } i++; @@ -896,34 +943,34 @@ static int MenuList_Key( menuList_t *l, int key ) { l->scratchCount = 0; - switch( key ) { + switch (key) { case K_LEFTARROW: case 'h': - if( l->sortdir ) { - if( l->sortcol > 0 ) { - return MenuList_SetColumn( l, l->sortcol - 1 ); + if (l->sortdir) { + if (l->sortcol > 0) { + return MenuList_SetColumn(l, l->sortcol - 1); } - return MenuList_SetColumn( l, l->numcolumns - 1 ); + return MenuList_SetColumn(l, l->numcolumns - 1); } break; case K_RIGHTARROW: case 'l': - if( l->sortdir ) { - if( l->sortcol < l->numcolumns - 1 ) { - return MenuList_SetColumn( l, l->sortcol + 1 ); + if (l->sortdir) { + if (l->sortcol < l->numcolumns - 1) { + return MenuList_SetColumn(l, l->sortcol + 1); } - return MenuList_SetColumn( l, 0 ); + return MenuList_SetColumn(l, 0); } break; case K_UPARROW: case K_KP_UPARROW: case 'k': - if( l->curvalue > 0 ) { + if (l->curvalue > 0) { l->curvalue--; - if( l->generic.change ) { - l->generic.change( &l->generic ); + if (l->generic.change) { + l->generic.change(&l->generic); } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep(l); return QMS_MOVE; } return QMS_BEEP; @@ -931,12 +978,12 @@ static int MenuList_Key( menuList_t *l, int key ) { case K_DOWNARROW: case K_KP_DOWNARROW: case 'j': - if( l->curvalue < l->numItems - 1 ) { + if (l->curvalue < l->numItems - 1) { l->curvalue++; - if( l->generic.change ) { - l->generic.change( &l->generic ); + if (l->generic.change) { + l->generic.change(&l->generic); } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep(l); return QMS_MOVE; } return QMS_BEEP; @@ -945,56 +992,56 @@ static int MenuList_Key( menuList_t *l, int key ) { case K_KP_HOME: l->prestep = 0; l->curvalue = 0; - if( l->generic.change ) { - l->generic.change( &l->generic ); + if (l->generic.change) { + l->generic.change(&l->generic); } return QMS_MOVE; case K_END: case K_KP_END: - if( l->numItems > l->maxItems ) { + if (l->numItems > l->maxItems) { l->prestep = l->numItems - l->maxItems; } l->curvalue = l->numItems - 1; - if( l->generic.change ) { - l->generic.change( &l->generic ); + if (l->generic.change) { + l->generic.change(&l->generic); } return QMS_MOVE; case K_MWHEELUP: - if( Key_IsDown( K_CTRL ) ) { + if (Key_IsDown(K_CTRL)) { l->prestep -= 4; } else { l->prestep -= 2; } - MenuList_ValidatePrestep( l ); + MenuList_ValidatePrestep(l); return QMS_SILENT; case K_MWHEELDOWN: - if( Key_IsDown( K_CTRL ) ) { + if (Key_IsDown(K_CTRL)) { l->prestep += 4; } else { l->prestep += 2; } - MenuList_ValidatePrestep( l ); + MenuList_ValidatePrestep(l); return QMS_SILENT; case K_PGUP: case K_KP_PGUP: l->prestep -= l->maxItems; - MenuList_ValidatePrestep( l ); + MenuList_ValidatePrestep(l); return QMS_SILENT; case K_PGDN: case K_KP_PGDN: l->prestep += l->maxItems; - MenuList_ValidatePrestep( l ); + MenuList_ValidatePrestep(l); return QMS_SILENT; case K_MOUSE1: case K_MOUSE2: //case K_MOUSE3: - return MenuList_Click( l ); + return MenuList_Click(l); } return QMS_NOTHANDLED; @@ -1005,9 +1052,9 @@ static int MenuList_Key( menuList_t *l, int key ) { MenuList_DrawString ================= */ -static void MenuList_DrawString( int x, int y, int flags, - menuListColumn_t *column, - const char *string ) +static void MenuList_DrawString(int x, int y, int flags, + menuListColumn_t *column, + const char *string) { clipRect_t rc; @@ -1016,20 +1063,20 @@ static void MenuList_DrawString( int x, int y, int flags, rc.top = 0; rc.bottom = 0; - if( ( column->uiFlags & UI_CENTER ) == UI_CENTER ) { + if ((column->uiFlags & UI_CENTER) == UI_CENTER) { x += column->width / 2; - } else if( column->uiFlags & UI_RIGHT ) { + } else if (column->uiFlags & UI_RIGHT) { x += column->width - MLIST_PRESTEP; } else { x += MLIST_PRESTEP; } - R_SetClipRect( DRAW_CLIP_RIGHT|DRAW_CLIP_LEFT, &rc ); - UI_DrawString( x, y + 1, column->uiFlags | flags, string ); + R_SetClipRect(DRAW_CLIP_RIGHT | DRAW_CLIP_LEFT, &rc); + UI_DrawString(x, y + 1, column->uiFlags | flags, string); #if USE_REF == REF_SOFT - R_SetClipRect( DRAW_CLIP_MASK, &uis.clipRect ); + R_SetClipRect(DRAW_CLIP_MASK, &uis.clipRect); #else - R_SetClipRect( DRAW_CLIP_DISABLED, NULL ); + R_SetClipRect(DRAW_CLIP_DISABLED, NULL); #endif } @@ -1038,7 +1085,8 @@ static void MenuList_DrawString( int x, int y, int flags, MenuList_Draw ================= */ -static void MenuList_Draw( menuList_t *l ) { +static void MenuList_Draw(menuList_t *l) +{ char *s; int x, y, xx, yy; int i, j, k; @@ -1052,24 +1100,24 @@ static void MenuList_Draw( menuList_t *l ) { height = l->generic.rect.height; // draw header - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { + if (!(l->mlFlags & MLF_HIDE_HEADER)) { xx = x; - for( j = 0; j < l->numcolumns; j++ ) { + for (j = 0; j < l->numcolumns; j++) { int flags = UI_ALTCOLOR; uint32_t color = uis.color.normal.u32; - if( l->sortcol == j && l->sortdir ) { + if (l->sortcol == j && l->sortdir) { flags = 0; - if( l->generic.flags & QMF_HASFOCUS ) { + if (l->generic.flags & QMF_HASFOCUS) { color = uis.color.active.u32; } } - R_DrawFill32( xx, y, l->columns[j].width - 1, - MLIST_SPACING - 1, color ); + R_DrawFill32(xx, y, l->columns[j].width - 1, + MLIST_SPACING - 1, color); - if( l->columns[j].name ) { - MenuList_DrawString( xx, y, flags, - &l->columns[j], l->columns[j].name ); + if (l->columns[j].name) { + MenuList_DrawString(xx, y, flags, + &l->columns[j], l->columns[j].name); } xx += l->columns[j].width; } @@ -1077,100 +1125,100 @@ static void MenuList_Draw( menuList_t *l ) { height -= MLIST_SPACING; } - if( !( l->mlFlags & MLF_HIDE_SCROLLBAR ) && - ( !( l->mlFlags & MLF_HIDE_SCROLLBAR_EMPTY ) || l->numItems > l->maxItems ) ) - { + if (!(l->mlFlags & MLF_HIDE_SCROLLBAR) && + (!(l->mlFlags & MLF_HIDE_SCROLLBAR_EMPTY) || l->numItems > l->maxItems)) { barHeight = height - MLIST_SPACING * 2; yy = y + MLIST_SPACING; // draw scrollbar background - if( !( l->mlFlags & MLF_HIDE_BACKGROUND ) ) { - R_DrawFill32( x + width, yy, MLIST_SCROLLBAR_WIDTH - 1, - barHeight, uis.color.normal.u32 ); + if (!(l->mlFlags & MLF_HIDE_BACKGROUND)) { + R_DrawFill32(x + width, yy, MLIST_SCROLLBAR_WIDTH - 1, + barHeight, uis.color.normal.u32); } - if( l->numItems > l->maxItems ) { - pageFrac = ( float )l->maxItems / l->numItems; - prestepFrac = ( float )l->prestep / l->numItems; + if (l->numItems > l->maxItems) { + pageFrac = (float)l->maxItems / l->numItems; + prestepFrac = (float)l->prestep / l->numItems; } else { pageFrac = 1; prestepFrac = 0; } // draw scrollbar thumb - R_DrawFill32( x + width, - yy + Q_rint( barHeight * prestepFrac ), - MLIST_SCROLLBAR_WIDTH - 1, - Q_rint( barHeight * pageFrac ), - uis.color.selection.u32 ); + R_DrawFill32(x + width, + yy + Q_rint(barHeight * prestepFrac), + MLIST_SCROLLBAR_WIDTH - 1, + Q_rint(barHeight * pageFrac), + uis.color.selection.u32); } xx = x; - for( j = 0; j < l->numcolumns; j++ ) { + for (j = 0; j < l->numcolumns; j++) { uint32_t color = uis.color.normal.u32; - if( l->sortcol == j && l->sortdir ) { - if( l->generic.flags & QMF_HASFOCUS ) { + if (l->sortcol == j && l->sortdir) { + if (l->generic.flags & QMF_HASFOCUS) { color = uis.color.active.u32; } } - R_DrawFill32( xx, y, l->columns[j].width - 1, - height, color ); + R_DrawFill32(xx, y, l->columns[j].width - 1, + height, color); xx += l->columns[j].width; } yy = y; - k = min( l->numItems, l->prestep + l->maxItems ); - for( i = l->prestep; i < k; i++ ) { + k = min(l->numItems, l->prestep + l->maxItems); + for (i = l->prestep; i < k; i++) { // draw selection - if( !( l->generic.flags & QMF_DISABLED ) && i == l->curvalue ) { + if (!(l->generic.flags & QMF_DISABLED) && i == l->curvalue) { xx = x; - for( j = 0; j < l->numcolumns; j++ ) { - R_DrawFill32( xx, yy, l->columns[j].width - 1, - MLIST_SPACING, uis.color.selection.u32 ); + for (j = 0; j < l->numcolumns; j++) { + R_DrawFill32(xx, yy, l->columns[j].width - 1, + MLIST_SPACING, uis.color.selection.u32); xx += l->columns[j].width; } } // draw contents - s = ( char * )l->items[i] + l->extrasize; + s = (char *)l->items[i] + l->extrasize; xx = x; - for( j = 0; j < l->numcolumns; j++ ) { - if( !*s ) { + for (j = 0; j < l->numcolumns; j++) { + if (!*s) { break; } - - MenuList_DrawString( xx, yy, 0, &l->columns[j], s ); - + + MenuList_DrawString(xx, yy, 0, &l->columns[j], s); + xx += l->columns[j].width; - s += strlen( s ) + 1; + s += strlen(s) + 1; } yy += MLIST_SPACING; } } -void MenuList_Sort( menuList_t *l, int offset, int (*cmpfunc)( const void *, const void * ) ) { +void MenuList_Sort(menuList_t *l, int offset, int (*cmpfunc)(const void *, const void *)) +{ void *n; int i; - if( !l->items ) { + if (!l->items) { return; } n = l->items[l->curvalue]; - qsort( l->items + offset, l->numItems - offset, sizeof( char * ), cmpfunc ); + qsort(l->items + offset, l->numItems - offset, sizeof(char *), cmpfunc); - for( i = 0; i < l->numItems; i++ ) { - if( l->items[i] == n ) { + for (i = 0; i < l->numItems; i++) { + if (l->items[i] == n) { l->curvalue = i; break; } } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep(l); } /* @@ -1181,33 +1229,38 @@ SLIDER CONTROL =================================================================== */ -static void Slider_Push( menuSlider_t *s ) { +static void Slider_Push(menuSlider_t *s) +{ s->curvalue = s->cvar->value; - cclamp( s->curvalue, s->minvalue, s->maxvalue ); + cclamp(s->curvalue, s->minvalue, s->maxvalue); } -static void Slider_Pop( menuSlider_t *s ) { - Cvar_SetValue( s->cvar, s->curvalue, FROM_MENU ); +static void Slider_Pop(menuSlider_t *s) +{ + Cvar_SetValue(s->cvar, s->curvalue, FROM_MENU); } -static void Slider_Free( menuSlider_t *s ) { - Z_Free( s->generic.name ); - Z_Free( s ); +static void Slider_Free(menuSlider_t *s) +{ + Z_Free(s->generic.name); + Z_Free(s); } -static void Slider_Init( menuSlider_t *s ) { - int len = strlen( s->generic.name ) * CHAR_WIDTH; +static void Slider_Init(menuSlider_t *s) +{ + int len = strlen(s->generic.name) * CHAR_WIDTH; s->generic.rect.x = s->generic.x + LCOLUMN_OFFSET - len; s->generic.rect.y = s->generic.y; - s->generic.rect.width = ( RCOLUMN_OFFSET - LCOLUMN_OFFSET ) + - len + ( SLIDER_RANGE + 2 ) * CHAR_WIDTH; + s->generic.rect.width = (RCOLUMN_OFFSET - LCOLUMN_OFFSET) + + len + (SLIDER_RANGE + 2) * CHAR_WIDTH; s->generic.rect.height = CHAR_HEIGHT; } -static int Slider_Key( menuSlider_t *s, int key ) { - switch( key ) { +static int Slider_Key(menuSlider_t *s, int key) +{ + switch (key) { case K_END: s->curvalue = s->maxvalue; return QMS_MOVE; @@ -1225,14 +1278,15 @@ static int Slider_Key( menuSlider_t *s, int key ) { Slider_DoSlide ================= */ -static int Slider_DoSlide( menuSlider_t *s, int dir ) { +static int Slider_DoSlide(menuSlider_t *s, int dir) +{ s->curvalue += dir * s->step; - cclamp( s->curvalue, s->minvalue, s->maxvalue ); + cclamp(s->curvalue, s->minvalue, s->maxvalue); - if( s->generic.change ) { - menuSound_t sound = s->generic.change( &s->generic ); - if( sound != QMS_NOTHANDLED ) { + if (s->generic.change) { + menuSound_t sound = s->generic.change(&s->generic); + if (sound != QMS_NOTHANDLED) { return sound; } } @@ -1245,32 +1299,33 @@ static int Slider_DoSlide( menuSlider_t *s, int dir ) { Slider_Draw ================= */ -static void Slider_Draw( menuSlider_t *s ) { +static void Slider_Draw(menuSlider_t *s) +{ int i, flags; float pos; - flags = s->generic.uiFlags & ~( UI_LEFT | UI_RIGHT ); + flags = s->generic.uiFlags & ~(UI_LEFT | UI_RIGHT); - if( s->generic.flags & QMF_HASFOCUS ) { - if( ( uis.realtime >> 8 ) & 1 ) { - UI_DrawChar( s->generic.x + RCOLUMN_OFFSET / 2, s->generic.y, s->generic.uiFlags | UI_RIGHT, 13 ); + if (s->generic.flags & QMF_HASFOCUS) { + if ((uis.realtime >> 8) & 1) { + UI_DrawChar(s->generic.x + RCOLUMN_OFFSET / 2, s->generic.y, s->generic.uiFlags | UI_RIGHT, 13); } } - UI_DrawString( s->generic.x + LCOLUMN_OFFSET, s->generic.y, - flags | UI_RIGHT | UI_ALTCOLOR, s->generic.name ); + UI_DrawString(s->generic.x + LCOLUMN_OFFSET, s->generic.y, + flags | UI_RIGHT | UI_ALTCOLOR, s->generic.name); - UI_DrawChar( s->generic.x + RCOLUMN_OFFSET, s->generic.y, flags | UI_LEFT, 128 ); + UI_DrawChar(s->generic.x + RCOLUMN_OFFSET, s->generic.y, flags | UI_LEFT, 128); - for( i = 0 ; i < SLIDER_RANGE ; i++ ) - UI_DrawChar( RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, 129 ); + for (i = 0; i < SLIDER_RANGE; i++) + UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, 129); - UI_DrawChar( RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, 130 ); + UI_DrawChar(RCOLUMN_OFFSET + s->generic.x + i * CHAR_WIDTH + CHAR_WIDTH, s->generic.y, flags | UI_LEFT, 130); - pos = ( s->curvalue - s->minvalue ) / ( s->maxvalue - s->minvalue ); - clamp( pos, 0, 1 ); + pos = (s->curvalue - s->minvalue) / (s->maxvalue - s->minvalue); + clamp(pos, 0, 1); - UI_DrawChar( CHAR_WIDTH + RCOLUMN_OFFSET + s->generic.x + ( SLIDER_RANGE - 1 ) * CHAR_WIDTH * pos, s->generic.y, flags | UI_LEFT, 131 ); + UI_DrawChar(CHAR_WIDTH + RCOLUMN_OFFSET + s->generic.x + (SLIDER_RANGE - 1) * CHAR_WIDTH * pos, s->generic.y, flags | UI_LEFT, 131); } /* @@ -1286,7 +1341,8 @@ SEPARATOR CONTROL Separator_Init ================= */ -static void Separator_Init( menuSeparator_t *s ) { +static void Separator_Init(menuSeparator_t *s) +{ s->generic.rect.x = s->generic.rect.y = 999999; s->generic.rect.width = s->generic.rect.height = -999999; } @@ -1296,9 +1352,10 @@ static void Separator_Init( menuSeparator_t *s ) { Separator_Draw ================= */ -static void Separator_Draw( menuSeparator_t *s ) { - if( s->generic.name ) - UI_DrawString( s->generic.x, s->generic.y, UI_RIGHT, s->generic.name ); +static void Separator_Draw(menuSeparator_t *s) +{ + if (s->generic.name) + UI_DrawString(s->generic.x, s->generic.y, UI_RIGHT, s->generic.name); } /* @@ -1314,10 +1371,11 @@ MISC Common_DoEnter ================= */ -static int Common_DoEnter( menuCommon_t *item ) { - if( item->activate ) { - menuSound_t sound = item->activate( item ); - if( sound != QMS_NOTHANDLED ) { +static int Common_DoEnter(menuCommon_t *item) +{ + if (item->activate) { + menuSound_t sound = item->activate(item); + if (sound != QMS_NOTHANDLED) { return sound; } } @@ -1331,35 +1389,39 @@ static int Common_DoEnter( menuCommon_t *item ) { Menu_AddItem ================= */ -void Menu_AddItem( menuFrameWork_t *menu, void *item ) { - if( menu->nitems >= MAXMENUITEMS ) { - Com_Error( ERR_FATAL, "Menu_AddItem: too many items" ); +void Menu_AddItem(menuFrameWork_t *menu, void *item) +{ + if (menu->nitems >= MAXMENUITEMS) { + Com_Error(ERR_FATAL, "Menu_AddItem: too many items"); } menu->items[menu->nitems++] = item; ((menuCommon_t *)item)->parent = menu; } -static void UI_ClearBounds( int mins[2], int maxs[2] ) { +static void UI_ClearBounds(int mins[2], int maxs[2]) +{ mins[0] = mins[1] = 9999; maxs[0] = maxs[1] = -9999; } -static void UI_AddRectToBounds( const vrect_t *rc, int mins[2], int maxs[2] ) { - if( mins[0] > rc->x ) { +static void UI_AddRectToBounds(const vrect_t *rc, int mins[2], int maxs[2]) +{ + if (mins[0] > rc->x) { mins[0] = rc->x; - } else if( maxs[0] < rc->x + rc->width ) { + } else if (maxs[0] < rc->x + rc->width) { maxs[0] = rc->x + rc->width; } - if( mins[1] > rc->y ) { + if (mins[1] > rc->y) { mins[1] = rc->y; - } else if( maxs[1] < rc->y + rc->height ) { + } else if (maxs[1] < rc->y + rc->height) { maxs[1] = rc->y + rc->height; } } -void Menu_Init( menuFrameWork_t *menu ) { +void Menu_Init(menuFrameWork_t *menu) +{ void *item; int i; int focus = 0; @@ -1368,24 +1430,24 @@ void Menu_Init( menuFrameWork_t *menu ) { menu->y1 = 0; menu->y2 = uis.height; - if( !menu->size ) { + if (!menu->size) { menu->size = Menu_Size; } - menu->size( menu ); + menu->size(menu); - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; focus |= ((menuCommon_t *)item)->flags & QMF_HASFOCUS; - switch( ((menuCommon_t *)item)->type ) { + switch (((menuCommon_t *)item)->type) { case MTYPE_FIELD: - Field_Init( item ); + Field_Init(item); break; case MTYPE_SLIDER: - Slider_Init( item ); + Slider_Init(item); break; case MTYPE_LIST: - MenuList_Init( item ); + MenuList_Init(item); break; case MTYPE_SPINCONTROL: case MTYPE_BITFIELD: @@ -1393,43 +1455,43 @@ void Menu_Init( menuFrameWork_t *menu ) { case MTYPE_VALUES: case MTYPE_STRINGS: case MTYPE_TOGGLE: - SpinControl_Init( item ); + SpinControl_Init(item); break; case MTYPE_ACTION: - Action_Init( item ); + Action_Init(item); break; case MTYPE_SEPARATOR: - Separator_Init( item ); + Separator_Init(item); break; case MTYPE_STATIC: - Static_Init( item ); + Static_Init(item); break; case MTYPE_KEYBIND: - Keybind_Init( item ); + Keybind_Init(item); break; case MTYPE_BITMAP: - Bitmap_Init( item ); + Bitmap_Init(item); break; default: - Com_Error( ERR_FATAL, "Menu_Init: unknown item type" ); + Com_Error(ERR_FATAL, "Menu_Init: unknown item type"); break; } } // set focus to the first item by default - if( !focus && menu->nitems ) { + if (!focus && menu->nitems) { item = menu->items[0]; ((menuCommon_t *)item)->flags |= QMF_HASFOCUS; } // calc menu bounding box - UI_ClearBounds( menu->mins, menu->maxs ); + UI_ClearBounds(menu->mins, menu->maxs); - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; rc = &((menuCommon_t *)item)->rect; - UI_AddRectToBounds( rc, menu->mins, menu->maxs ); + UI_AddRectToBounds(rc, menu->mins, menu->maxs); } // expand @@ -1439,26 +1501,27 @@ void Menu_Init( menuFrameWork_t *menu ) { menu->maxs[1] += MENU_SPACING; // clamp - if( menu->mins[0] < 0 ) menu->mins[0] = 0; - if( menu->mins[1] < 0 ) menu->mins[1] = 0; - if( menu->maxs[0] > uis.width ) menu->maxs[0] = uis.width; - if( menu->maxs[1] > uis.height ) menu->maxs[1] = uis.height; + if (menu->mins[0] < 0) menu->mins[0] = 0; + if (menu->mins[1] < 0) menu->mins[1] = 0; + if (menu->maxs[0] > uis.width) menu->maxs[0] = uis.width; + if (menu->maxs[1] > uis.height) menu->maxs[1] = uis.height; } -void Menu_Size( menuFrameWork_t *menu ) { +void Menu_Size(menuFrameWork_t *menu) +{ menuCommon_t *item; int x, y, w, h; int i, widest = -1; // count visible items - for( i = 0, h = 0; i < menu->nitems; i++ ) { + for (i = 0, h = 0; i < menu->nitems; i++) { item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { + if (item->flags & QMF_HIDDEN) { continue; } - if( item->type == MTYPE_BITMAP ) { - h += GENERIC_SPACING( item->height ); - if( widest < item->width ) { + if (item->type == MTYPE_BITMAP) { + h += GENERIC_SPACING(item->height); + if (widest < item->width) { widest = item->width; } } else { @@ -1467,75 +1530,75 @@ void Menu_Size( menuFrameWork_t *menu ) { } // account for banner - if( menu->banner ) { - h += GENERIC_SPACING( menu->banner_rc.height ); + if (menu->banner) { + h += GENERIC_SPACING(menu->banner_rc.height); } // set menu top/bottom - if( menu->transparent ) { - menu->y1 = ( uis.height - h ) / 2 - MENU_SPACING; - menu->y2 = ( uis.height + h ) / 2 + MENU_SPACING; + if (menu->transparent) { + menu->y1 = (uis.height - h) / 2 - MENU_SPACING; + menu->y2 = (uis.height + h) / 2 + MENU_SPACING; } else { menu->y1 = 0; menu->y2 = uis.height; } // set menu horizontal base - if( widest == -1 ) { + if (widest == -1) { x = uis.width / 2; } else { // if menu has bitmaps, it is expected to have plaque and logo // align them horizontally to avoid going off screen on small resolution - w = widest + CURSOR_WIDTH; - if( menu->plaque_rc.width > menu->logo_rc.width ) { + w = widest + CURSOR_WIDTH; + if (menu->plaque_rc.width > menu->logo_rc.width) { w += menu->plaque_rc.width; } else { w += menu->logo_rc.width; } - x = ( uis.width + w ) / 2 - widest; + x = (uis.width + w) / 2 - widest; } // set menu vertical base - y = ( uis.height - h ) / 2; + y = (uis.height - h) / 2; // banner is horizontally centered and // positioned on top of all menu items - if( menu->banner ) { - menu->banner_rc.x = ( uis.width - menu->banner_rc.width ) / 2; + if (menu->banner) { + menu->banner_rc.x = (uis.width - menu->banner_rc.width) / 2; menu->banner_rc.y = y; - y += GENERIC_SPACING( menu->banner_rc.height ); + y += GENERIC_SPACING(menu->banner_rc.height); } // plaque and logo are vertically centered and // positioned to the left of bitmaps and cursor h = 0; - if( menu->plaque ) { + if (menu->plaque) { h += menu->plaque_rc.height; } - if( menu->logo ) { + if (menu->logo) { h += menu->logo_rc.height + 5; } - if( menu->plaque ) { + if (menu->plaque) { menu->plaque_rc.x = x - CURSOR_WIDTH - menu->plaque_rc.width; - menu->plaque_rc.y = ( uis.height - h ) / 2; + menu->plaque_rc.y = (uis.height - h) / 2; } - if( menu->logo ) { + if (menu->logo) { menu->logo_rc.x = x - CURSOR_WIDTH - menu->logo_rc.width; - menu->logo_rc.y = ( uis.height + h ) / 2 - menu->logo_rc.height; + menu->logo_rc.y = (uis.height + h) / 2 - menu->logo_rc.height; } // align items - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { + if (item->flags & QMF_HIDDEN) { continue; } item->x = x; item->y = y; - if( item->type == MTYPE_BITMAP ) { - y += GENERIC_SPACING( item->height ); + if (item->type == MTYPE_BITMAP) { + y += GENERIC_SPACING(item->height); } else { y += MENU_SPACING; } @@ -1543,14 +1606,14 @@ void Menu_Size( menuFrameWork_t *menu ) { } - -menuCommon_t *Menu_ItemAtCursor( menuFrameWork_t *m ) { +menuCommon_t *Menu_ItemAtCursor(menuFrameWork_t *m) +{ menuCommon_t *item; int i; - for( i = 0; i < m->nitems; i++ ) { + for (i = 0; i < m->nitems; i++) { item = m->items[i]; - if( item->flags & QMF_HASFOCUS ) { + if (item->flags & QMF_HASFOCUS) { return item; } } @@ -1558,32 +1621,33 @@ menuCommon_t *Menu_ItemAtCursor( menuFrameWork_t *m ) { return NULL; } -void Menu_SetFocus( menuCommon_t *focus ) { +void Menu_SetFocus(menuCommon_t *focus) +{ menuFrameWork_t *menu; menuCommon_t *item; int i; - if( focus->flags & QMF_HASFOCUS ) { + if (focus->flags & QMF_HASFOCUS) { return; } menu = focus->parent; - for( i = 0; i < menu->nitems ; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = (menuCommon_t *)menu->items[i]; - if( item == focus ) { + if (item == focus) { item->flags |= QMF_HASFOCUS; - if( item->focus ) { - item->focus( item, qtrue ); - } else if( item->status ) { + if (item->focus) { + item->focus(item, qtrue); + } else if (item->status) { menu->status = item->status; } - } else if( item->flags & QMF_HASFOCUS ) { + } else if (item->flags & QMF_HASFOCUS) { item->flags &= ~QMF_HASFOCUS; - if( item->focus ) { - item->focus( item, qfalse ); - } else if( menu->status == item->status ) { + if (item->focus) { + item->focus(item, qfalse); + } else if (menu->status == item->status) { menu->status = NULL; } } @@ -1600,16 +1664,17 @@ to adjust the menu's cursor so that it's at the next available slot. ================= */ -menuSound_t Menu_AdjustCursor( menuFrameWork_t *m, int dir ) { +menuSound_t Menu_AdjustCursor(menuFrameWork_t *m, int dir) +{ menuCommon_t *item; int cursor, pos; int i; pos = 0; - for( i=0 ; i<m->nitems ; i++ ) { + for (i = 0; i < m->nitems; i++) { item = (menuCommon_t *)m->items[i]; - if( item->flags & QMF_HASFOCUS ) { + if (item->flags & QMF_HASFOCUS) { pos = i; break; } @@ -1619,29 +1684,29 @@ menuSound_t Menu_AdjustCursor( menuFrameWork_t *m, int dir ) { ** crawl in the direction indicated until we find a valid spot */ cursor = pos; - if( dir == 1 ) { + if (dir == 1) { do { cursor++; - if( cursor >= m->nitems ) + if (cursor >= m->nitems) cursor = 0; item = (menuCommon_t *)m->items[cursor]; - if( UI_IsItemSelectable( item ) ) + if (UI_IsItemSelectable(item)) break; - } while( cursor != pos ); + } while (cursor != pos); } else { do { cursor--; - if( cursor < 0 ) + if (cursor < 0) cursor = m->nitems - 1; item = (menuCommon_t *)m->items[cursor]; - if( UI_IsItemSelectable( item ) ) + if (UI_IsItemSelectable(item)) break; - } while( cursor != pos ); + } while (cursor != pos); } - Menu_SetFocus( item ); + Menu_SetFocus(item); return QMS_MOVE; } @@ -1651,60 +1716,61 @@ menuSound_t Menu_AdjustCursor( menuFrameWork_t *m, int dir ) { Menu_Draw ================= */ -void Menu_Draw( menuFrameWork_t *menu ) { +void Menu_Draw(menuFrameWork_t *menu) +{ void *item; int i; // // draw background // - if( menu->image ) { - R_DrawStretchPic( 0, menu->y1, uis.width, - menu->y2 - menu->y1, menu->image ); + if (menu->image) { + R_DrawStretchPic(0, menu->y1, uis.width, + menu->y2 - menu->y1, menu->image); } else { - R_DrawFill32( 0, menu->y1, uis.width, - menu->y2 - menu->y1, menu->color.u32 ); + R_DrawFill32(0, menu->y1, uis.width, + menu->y2 - menu->y1, menu->color.u32); } // // draw title bar // - if( menu->title ) { - UI_DrawString( uis.width / 2, menu->y1, - UI_CENTER|UI_ALTCOLOR, menu->title ); + if (menu->title) { + UI_DrawString(uis.width / 2, menu->y1, + UI_CENTER | UI_ALTCOLOR, menu->title); } // // draw banner, plaque and logo // - if( menu->banner ) { - R_DrawPic( menu->banner_rc.x, menu->banner_rc.y, menu->banner ); + if (menu->banner) { + R_DrawPic(menu->banner_rc.x, menu->banner_rc.y, menu->banner); } - if( menu->plaque ) { - R_DrawPic( menu->plaque_rc.x, menu->plaque_rc.y, menu->plaque ); + if (menu->plaque) { + R_DrawPic(menu->plaque_rc.x, menu->plaque_rc.y, menu->plaque); } - if( menu->logo ) { - R_DrawPic( menu->logo_rc.x, menu->logo_rc.y, menu->logo ); + if (menu->logo) { + R_DrawPic(menu->logo_rc.x, menu->logo_rc.y, menu->logo); } // // draw contents // - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - if( (( menuCommon_t * )item)->flags & QMF_HIDDEN ) { + if (((menuCommon_t *)item)->flags & QMF_HIDDEN) { continue; } - switch( (( menuCommon_t * )item)->type ) { + switch (((menuCommon_t *)item)->type) { case MTYPE_FIELD: - Field_Draw( item ); + Field_Draw(item); break; case MTYPE_SLIDER: - Slider_Draw( item ); + Slider_Draw(item); break; case MTYPE_LIST: - MenuList_Draw( item ); + MenuList_Draw(item); break; case MTYPE_SPINCONTROL: case MTYPE_BITFIELD: @@ -1712,133 +1778,139 @@ void Menu_Draw( menuFrameWork_t *menu ) { case MTYPE_VALUES: case MTYPE_STRINGS: case MTYPE_TOGGLE: - SpinControl_Draw( item ); + SpinControl_Draw(item); break; case MTYPE_ACTION: - Action_Draw( item ); + Action_Draw(item); break; case MTYPE_SEPARATOR: - Separator_Draw( item ); + Separator_Draw(item); break; case MTYPE_STATIC: - Static_Draw( item ); + Static_Draw(item); break; case MTYPE_KEYBIND: - Keybind_Draw( item ); + Keybind_Draw(item); break; case MTYPE_BITMAP: - Bitmap_Draw( item ); + Bitmap_Draw(item); break; default: - Com_Error( ERR_FATAL, "Menu_Draw: unknown item type" ); + Com_Error(ERR_FATAL, "Menu_Draw: unknown item type"); break; } - if( ui_debug->integer ) { - UI_DrawRect8( &(( menuCommon_t * )item)->rect, 1, 223 ); + if (ui_debug->integer) { + UI_DrawRect8(&((menuCommon_t *)item)->rect, 1, 223); } } // // draw status bar // - if( menu->status ) { - R_DrawFill8( 0, menu->y2 - CHAR_HEIGHT, uis.width, CHAR_HEIGHT, 4 ); - UI_DrawString( uis.width / 2, menu->y2 - CHAR_HEIGHT, - UI_CENTER, menu->status ); + if (menu->status) { + R_DrawFill8(0, menu->y2 - CHAR_HEIGHT, uis.width, CHAR_HEIGHT, 4); + UI_DrawString(uis.width / 2, menu->y2 - CHAR_HEIGHT, + UI_CENTER, menu->status); } } -menuSound_t Menu_SelectItem( menuFrameWork_t *s ) { +menuSound_t Menu_SelectItem(menuFrameWork_t *s) +{ menuCommon_t *item; - if( !( item = Menu_ItemAtCursor( s ) ) ) { + if (!(item = Menu_ItemAtCursor(s))) { return QMS_NOTHANDLED; } - switch( item->type ) { + switch (item->type) { //case MTYPE_SLIDER: - // return Slider_DoSlide( (menuSlider_t *)item, 1 ); + // return Slider_DoSlide((menuSlider_t *)item, 1); case MTYPE_SPINCONTROL: case MTYPE_BITFIELD: case MTYPE_PAIRS: case MTYPE_VALUES: case MTYPE_STRINGS: case MTYPE_TOGGLE: - return SpinControl_DoEnter( (menuSpinControl_t *)item ); + return SpinControl_DoEnter((menuSpinControl_t *)item); case MTYPE_KEYBIND: - return Keybind_DoEnter( ( menuKeybind_t * )item ); + return Keybind_DoEnter((menuKeybind_t *)item); case MTYPE_FIELD: case MTYPE_ACTION: case MTYPE_LIST: case MTYPE_BITMAP: - return Common_DoEnter( item ); + return Common_DoEnter(item); default: return QMS_NOTHANDLED; } } -menuSound_t Menu_SlideItem( menuFrameWork_t *s, int dir ) { +menuSound_t Menu_SlideItem(menuFrameWork_t *s, int dir) +{ menuCommon_t *item; - if( !( item = Menu_ItemAtCursor( s ) ) ) { + if (!(item = Menu_ItemAtCursor(s))) { return QMS_NOTHANDLED; } - switch( item->type ) { + switch (item->type) { case MTYPE_SLIDER: - return Slider_DoSlide( (menuSlider_t *)item, dir ); + return Slider_DoSlide((menuSlider_t *)item, dir); case MTYPE_SPINCONTROL: case MTYPE_BITFIELD: case MTYPE_PAIRS: case MTYPE_VALUES: case MTYPE_STRINGS: case MTYPE_TOGGLE: - return SpinControl_DoSlide( (menuSpinControl_t *)item, dir ); + return SpinControl_DoSlide((menuSpinControl_t *)item, dir); default: return QMS_NOTHANDLED; } } -menuSound_t Menu_KeyEvent( menuCommon_t *item, int key ) { - if( item->keydown ) { - menuSound_t sound = item->keydown( item, key ); - if( sound != QMS_NOTHANDLED ) { +menuSound_t Menu_KeyEvent(menuCommon_t *item, int key) +{ + if (item->keydown) { + menuSound_t sound = item->keydown(item, key); + if (sound != QMS_NOTHANDLED) { return sound; } } - switch( item->type ) { + switch (item->type) { case MTYPE_FIELD: - return Field_Key( ( menuField_t * )item, key ); + return Field_Key((menuField_t *)item, key); case MTYPE_LIST: - return MenuList_Key( ( menuList_t * )item, key ); + return MenuList_Key((menuList_t *)item, key); case MTYPE_SLIDER: - return Slider_Key( ( menuSlider_t * )item, key ); + return Slider_Key((menuSlider_t *)item, key); case MTYPE_KEYBIND: - return Keybind_Key( ( menuKeybind_t * )item, key ); + return Keybind_Key((menuKeybind_t *)item, key); default: return QMS_NOTHANDLED; } } -menuSound_t Menu_CharEvent( menuCommon_t *item, int key ) { - switch( item->type ) { +menuSound_t Menu_CharEvent(menuCommon_t *item, int key) +{ + switch (item->type) { case MTYPE_FIELD: - return Field_Char( (menuField_t *)item, key ); + return Field_Char((menuField_t *)item, key); default: return QMS_NOTHANDLED; } } -menuSound_t Menu_MouseMove( menuCommon_t *item ) { +menuSound_t Menu_MouseMove(menuCommon_t *item) +{ return QMS_NOTHANDLED; } -static menuSound_t Menu_DefaultKey( menuFrameWork_t *m, int key ) { +static menuSound_t Menu_DefaultKey(menuFrameWork_t *m, int key) +{ menuCommon_t *item; - - switch( key ) { + + switch (key) { case K_ESCAPE: UI_PopMenu(); return QMS_OUT; @@ -1846,89 +1918,91 @@ static menuSound_t Menu_DefaultKey( menuFrameWork_t *m, int key ) { case K_KP_UPARROW: case K_UPARROW: case 'k': - return Menu_AdjustCursor( m, -1 ); - + return Menu_AdjustCursor(m, -1); + case K_KP_DOWNARROW: case K_DOWNARROW: case K_TAB: case 'j': - return Menu_AdjustCursor( m, 1 ); + return Menu_AdjustCursor(m, 1); case K_KP_LEFTARROW: case K_LEFTARROW: case K_MWHEELDOWN: case 'h': - return Menu_SlideItem( m, -1 ); + return Menu_SlideItem(m, -1); case K_KP_RIGHTARROW: case K_RIGHTARROW: case K_MWHEELUP: case 'l': - return Menu_SlideItem( m, 1 ); + return Menu_SlideItem(m, 1); case K_MOUSE1: case K_MOUSE2: case K_MOUSE3: - item = Menu_HitTest( m ); - if( !item ) { + item = Menu_HitTest(m); + if (!item) { return QMS_NOTHANDLED; } - - if( !( item->flags & QMF_HASFOCUS ) ) { + + if (!(item->flags & QMF_HASFOCUS)) { return QMS_NOTHANDLED; } // fall through case K_KP_ENTER: case K_ENTER: - return Menu_SelectItem( m ); + return Menu_SelectItem(m); } return QMS_NOTHANDLED; } -menuSound_t Menu_Keydown( menuFrameWork_t *menu, int key ) { +menuSound_t Menu_Keydown(menuFrameWork_t *menu, int key) +{ menuCommon_t *item; menuSound_t sound; - if( menu->keywait ) { + if (menu->keywait) { } - if( menu->keydown ) { - sound = menu->keydown( menu, key ); - if( sound != QMS_NOTHANDLED ) { + if (menu->keydown) { + sound = menu->keydown(menu, key); + if (sound != QMS_NOTHANDLED) { return sound; } } - item = Menu_ItemAtCursor( menu ); - if( item ) { - sound = Menu_KeyEvent( item, key ); - if( sound != QMS_NOTHANDLED ) { + item = Menu_ItemAtCursor(menu); + if (item) { + sound = Menu_KeyEvent(item, key); + if (sound != QMS_NOTHANDLED) { return sound; } } - - sound = Menu_DefaultKey( menu, key ); + + sound = Menu_DefaultKey(menu, key); return sound; } -menuCommon_t *Menu_HitTest( menuFrameWork_t *menu ) { +menuCommon_t *Menu_HitTest(menuFrameWork_t *menu) +{ int i; menuCommon_t *item; - if( menu->keywait ) { + if (menu->keywait) { return NULL; } - - for( i = 0; i < menu->nitems; i++ ) { + + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { + if (item->flags & QMF_HIDDEN) { continue; } - if( UI_CursorInRect( &item->rect ) ) { + if (UI_CursorInRect(&item->rect)) { return item; } } @@ -1936,37 +2010,38 @@ menuCommon_t *Menu_HitTest( menuFrameWork_t *menu ) { return NULL; } -qboolean Menu_Push( menuFrameWork_t *menu ) { +qboolean Menu_Push(menuFrameWork_t *menu) +{ void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - switch( ((menuCommon_t *)item)->type ) { + switch (((menuCommon_t *)item)->type) { case MTYPE_SLIDER: - Slider_Push( item ); + Slider_Push(item); break; case MTYPE_BITFIELD: - BitField_Push( item ); + BitField_Push(item); break; case MTYPE_PAIRS: - Pairs_Push( item ); + Pairs_Push(item); break; case MTYPE_STRINGS: - Strings_Push( item ); + Strings_Push(item); break; case MTYPE_SPINCONTROL: - SpinControl_Push( item ); + SpinControl_Push(item); break; case MTYPE_TOGGLE: - Toggle_Push( item ); + Toggle_Push(item); break; case MTYPE_KEYBIND: - Keybind_Push( item ); + Keybind_Push(item); break; case MTYPE_FIELD: - Field_Push( item ); + Field_Push(item); break; default: break; @@ -1975,35 +2050,36 @@ qboolean Menu_Push( menuFrameWork_t *menu ) { return qtrue; } -void Menu_Pop( menuFrameWork_t *menu ) { +void Menu_Pop(menuFrameWork_t *menu) +{ void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - switch( ((menuCommon_t *)item)->type ) { + switch (((menuCommon_t *)item)->type) { case MTYPE_SLIDER: - Slider_Pop( item ); + Slider_Pop(item); break; case MTYPE_BITFIELD: - BitField_Pop( item ); + BitField_Pop(item); break; case MTYPE_PAIRS: - Pairs_Pop( item ); + Pairs_Pop(item); break; case MTYPE_STRINGS: - Strings_Pop( item ); + Strings_Pop(item); break; case MTYPE_SPINCONTROL: case MTYPE_TOGGLE: - SpinControl_Pop( item ); + SpinControl_Pop(item); break; case MTYPE_KEYBIND: - Keybind_Pop( item ); + Keybind_Pop(item); break; case MTYPE_FIELD: - Field_Pop( item ); + Field_Pop(item); break; default: break; @@ -2011,50 +2087,51 @@ void Menu_Pop( menuFrameWork_t *menu ) { } } -void Menu_Free( menuFrameWork_t *menu ) { +void Menu_Free(menuFrameWork_t *menu) +{ void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { + for (i = 0; i < menu->nitems; i++) { item = menu->items[i]; - switch( ((menuCommon_t *)item)->type ) { + switch (((menuCommon_t *)item)->type) { case MTYPE_ACTION: - Action_Free( item ); + Action_Free(item); break; case MTYPE_SLIDER: - Slider_Free( item ); + Slider_Free(item); break; case MTYPE_BITFIELD: case MTYPE_TOGGLE: - BitField_Free( item ); + BitField_Free(item); break; case MTYPE_PAIRS: - Pairs_Free( item ); + Pairs_Free(item); break; case MTYPE_SPINCONTROL: case MTYPE_STRINGS: - SpinControl_Free( item ); + SpinControl_Free(item); break; case MTYPE_KEYBIND: - Keybind_Free( item ); + Keybind_Free(item); break; case MTYPE_FIELD: - Field_Free( item ); + Field_Free(item); break; case MTYPE_SEPARATOR: - Z_Free( item ); + Z_Free(item); break; case MTYPE_BITMAP: - Bitmap_Free( item ); + Bitmap_Free(item); break; default: break; } } - Z_Free( menu->title ); - Z_Free( menu->name ); - Z_Free( menu ); + Z_Free(menu->title); + Z_Free(menu->name); + Z_Free(menu); } |