diff options
Diffstat (limited to 'source/ui_menu.c')
| -rw-r--r-- | source/ui_menu.c | 1616 |
1 files changed, 864 insertions, 752 deletions
diff --git a/source/ui_menu.c b/source/ui_menu.c index f39a868..a4cc243 100644 --- a/source/ui_menu.c +++ b/source/ui_menu.c @@ -46,13 +46,13 @@ Action_Init ================= */ static void Action_Init( menuAction_t *a ) { - if( !a->generic.name ) { - Com_Error( ERR_FATAL, "Action_Init: NULL a->generic.name" ); - } + if( !a->generic.name ) { + Com_Error( ERR_FATAL, "Action_Init: NULL a->generic.name" ); + } - 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 ); + 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 ); } @@ -62,15 +62,15 @@ Action_Draw ================= */ static void Action_Draw( menuAction_t *a ) { - int flags; + int flags; - flags = a->generic.uiFlags; - if( a->generic.flags & QMF_HASFOCUS ) { - flags |= UI_ALTCOLOR; - } + flags = a->generic.uiFlags; + if( a->generic.flags & QMF_HASFOCUS ) { + flags |= UI_ALTCOLOR; + } - UI_DrawString( a->generic.x, a->generic.y, NULL, - flags, a->generic.name ); + UI_DrawString( a->generic.x, a->generic.y, NULL, + flags, a->generic.name ); } /* @@ -87,19 +87,19 @@ Static_Init ================= */ static void Static_Init( menuStatic_t *s ) { - if( !s->generic.name ) { - Com_Error( ERR_FATAL, "Static_Init: NULL s->generic.name" ); - } + if( !s->generic.name ) { + Com_Error( ERR_FATAL, "Static_Init: NULL s->generic.name" ); + } - if( !s->maxChars ) { - s->maxChars = MAX_STRING_CHARS; - } + if( !s->maxChars ) { + s->maxChars = MAX_STRING_CHARS; + } - s->generic.rect.x = s->generic.x; - s->generic.rect.y = s->generic.y; + 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 ); } /* @@ -108,9 +108,9 @@ Static_Draw ================= */ static void Static_Draw( menuStatic_t *s ) { - UI_DrawString( s->generic.x, s->generic.y, - ( s->generic.flags & QMF_CUSTOM_COLOR ) ? s->generic.color : NULL, - s->generic.uiFlags, s->generic.name ); + UI_DrawString( s->generic.x, s->generic.y, + ( s->generic.flags & QMF_CUSTOM_COLOR ) ? s->generic.color : NULL, + s->generic.uiFlags, s->generic.name ); } /* @@ -133,20 +133,20 @@ Keybind_Init ================= */ static void Keybind_Init( menuKeybind_t *k ) { - if( !k->generic.name ) { - Com_Error( ERR_FATAL, "Keybind_Init: NULL k->generic.name" ); - } + 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; + 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 ) + - Q_DrawStrlen( k->binding ) * CHAR_WIDTH; + k->generic.rect.width += ( RCOLUMN_OFFSET - LCOLUMN_OFFSET ) + + Q_DrawStrlen( k->binding ) * CHAR_WIDTH; } /* @@ -155,38 +155,38 @@ Keybind_Draw ================= */ static void Keybind_Draw( menuKeybind_t *k ) { - char string[MAX_STRING_CHARS]; - byte *color; - int flags; - - color = NULL; - 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 ); - } - } else { - if( k->generic.parent->keywait ) { - color = colorGray; - flags = 0; - } - } - - UI_DrawString( k->generic.x + LCOLUMN_OFFSET, k->generic.y, color, - 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 ); - } else { - strcpy( string, "???" ); - } - - UI_DrawString( k->generic.x + RCOLUMN_OFFSET, k->generic.y, color, - k->generic.uiFlags | UI_LEFT, string ); + char string[MAX_STRING_CHARS]; + byte *color; + int flags; + + color = NULL; + 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 ); + } + } else { + if( k->generic.parent->keywait ) { + color = colorGray; + flags = 0; + } + } + + UI_DrawString( k->generic.x + LCOLUMN_OFFSET, k->generic.y, color, + 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 ); + } else { + strcpy( string, "???" ); + } + + UI_DrawString( k->generic.x + RCOLUMN_OFFSET, k->generic.y, color, + k->generic.uiFlags | UI_LEFT, string ); } static menuSound_t Keybind_DoEnter( menuKeybind_t *k ) { @@ -215,8 +215,8 @@ static void Keybind_Update( menuFrameWork_t *menu ) { menuKeybind_t *k; int i; - for( i = 0; i < menu->nitems; i++ ) { - k = menu->items[i]; + for( i = 0; i < menu->nitems; i++ ) { + k = menu->items[i]; if( k->generic.type == MTYPE_KEYBIND ) { Keybind_Push( k ); } @@ -277,20 +277,20 @@ Field_Init static void Field_Init( menuField_t *f ) { int w = f->field.visibleChars * CHAR_WIDTH; - 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 + w; - } else { + 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 + w; + } else { f->generic.rect.x = f->generic.x - w / 2; f->generic.rect.y = f->generic.y; f->generic.rect.width = w; f->generic.rect.height = CHAR_HEIGHT; - } + } } @@ -300,21 +300,21 @@ Field_Draw ================= */ static void Field_Draw( menuField_t *f ) { - int flags = f->generic.uiFlags; + int flags = f->generic.uiFlags; - if( f->generic.flags & QMF_HASFOCUS ) { - flags |= UI_DRAWCURSOR; - } + if( f->generic.flags & QMF_HASFOCUS ) { + flags |= UI_DRAWCURSOR; + } - if( f->generic.name ) { - UI_DrawString( f->generic.x + LCOLUMN_OFFSET, f->generic.y, NULL, - f->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, f->generic.name ); + if( f->generic.name ) { + UI_DrawString( f->generic.x + LCOLUMN_OFFSET, f->generic.y, NULL, + f->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, f->generic.name ); - ref.DrawFillEx( f->generic.x + RCOLUMN_OFFSET, f->generic.y - 1, - f->field.visibleChars * CHAR_WIDTH, CHAR_HEIGHT + 2, colorField ); + ref.DrawFillEx( f->generic.x + RCOLUMN_OFFSET, f->generic.y - 1, + f->field.visibleChars * CHAR_WIDTH, CHAR_HEIGHT + 2, colorField ); - 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 { ref.DrawFillEx( f->generic.rect.x, f->generic.rect.y - 1, f->generic.rect.width, CHAR_HEIGHT + 2, colorField ); @@ -330,10 +330,10 @@ Field_Key ================= */ static int Field_Key( menuField_t *f, int key ) { - qboolean ret; + qboolean ret; - ret = IF_KeyEvent( &f->field, key ); - return ret ? QMS_SILENT : QMS_NOTHANDLED; + ret = IF_KeyEvent( &f->field, key ); + return ret ? QMS_SILENT : QMS_NOTHANDLED; } /* @@ -342,20 +342,20 @@ Field_Char ================= */ static int Field_Char( menuField_t *f, int key ) { - int ret; + int ret; - if( f->generic.flags & QMF_NUMBERSONLY ) { - if( key < '0' || key > '9' ) { - return QMS_BEEP; - } - } + if( f->generic.flags & QMF_NUMBERSONLY ) { + if( key < '0' || key > '9' ) { + return QMS_BEEP; + } + } - ret = IF_CharEvent( &f->field, key ); + ret = IF_CharEvent( &f->field, key ); if( f->generic.change ) { f->generic.change( &f->generic ); } - return ret ? QMS_SILENT : QMS_NOTHANDLED; + return ret ? QMS_SILENT : QMS_NOTHANDLED; } /* @@ -394,32 +394,32 @@ SpinControl_Init ================= */ void SpinControl_Init( menuSpinControl_t *s ) { - char **n; - int maxLength, length; + 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; + 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 = Q_DrawStrlen( *n ); - - if( maxLength < length ) { - maxLength = length; - } - s->numItems++; - n++; - } + maxLength = 0; + s->numItems = 0; + n = s->itemnames; + while( *n ) { + length = Q_DrawStrlen( *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; } /* @@ -428,16 +428,16 @@ SpinControl_DoEnter ================= */ static int SpinControl_DoEnter( menuSpinControl_t *s ) { - s->curvalue++; + s->curvalue++; - if( s->curvalue >= s->numItems ) - s->curvalue = 0; + if( s->curvalue >= s->numItems ) + s->curvalue = 0; if( s->generic.change ) { s->generic.change( &s->generic ); } - return QMS_MOVE; + return QMS_MOVE; } /* @@ -446,19 +446,19 @@ SpinControl_DoSlide ================= */ static int SpinControl_DoSlide( menuSpinControl_t *s, int dir ) { - s->curvalue += dir; + s->curvalue += dir; - if( s->curvalue < 0 ) { - s->curvalue = s->numItems - 1; - } else if( s->curvalue >= s->numItems ) { - s->curvalue = 0; - } + if( s->curvalue < 0 ) { + s->curvalue = s->numItems - 1; + } else if( s->curvalue >= s->numItems ) { + s->curvalue = 0; + } if( s->generic.change ) { s->generic.change( &s->generic ); } - return QMS_MOVE; + return QMS_MOVE; } /* @@ -467,20 +467,99 @@ SpinControl_Draw ================= */ static void SpinControl_Draw( menuSpinControl_t *s ) { - UI_DrawString( s->generic.x + LCOLUMN_OFFSET, s->generic.y, NULL, - s->generic.uiFlags | UI_RIGHT | UI_ALTCOLOR, s->generic.name ); + UI_DrawString( s->generic.x + LCOLUMN_OFFSET, s->generic.y, NULL, + 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, NULL, - s->generic.uiFlags, s->itemnames[s->curvalue] ); + UI_DrawString( s->generic.x + RCOLUMN_OFFSET, s->generic.y, NULL, + s->generic.uiFlags, s->itemnames[s->curvalue] ); } +/* +=================================================================== + +BITFIELD CONTROL + +=================================================================== +*/ + +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 ) { + int val = s->cvar->integer; + + if( s->curvalue ^ s->negate ) { + val |= s->mask; + } else { + val &= ~s->mask; + } + Cvar_SetInteger( s->cvar, val, CVAR_SET_CONSOLE ); +} + +static void BitField_Free( menuSpinControl_t *s ) { + Z_Free( s->generic.name ); + Z_Free( s ); +} + +/* +=================================================================== + +PAIRS CONTROL + +=================================================================== +*/ + +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 ) ) { + s->curvalue = i; + break; + } + } +} + +static void Pairs_Pop( menuSpinControl_t *s ) { + Cvar_SetByVar( s->cvar, s->itemvalues[s->curvalue], CVAR_SET_CONSOLE ); +} + +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->itemnames ); + Z_Free( s->itemvalues ); + Z_Free( s ); +} + +/* +=================================================================== + +TOGGLE CONTROL + +=================================================================== +*/ + +static void Toggle_Push( menuSpinControl_t *s ) { + s->curvalue = ( s->cvar->integer ? 1 : 0 ) ^ s->negate; +} /* =================================================================== @@ -496,24 +575,24 @@ MenuList_ValidatePrestep ================= */ static void MenuList_ValidatePrestep( menuList_t *l ) { - if( l->prestep > l->numItems - l->maxItems ) { - l->prestep = l->numItems - l->maxItems; - } - if( l->prestep < 0 ) { - l->prestep = 0; - } + if( l->prestep > l->numItems - l->maxItems ) { + l->prestep = l->numItems - l->maxItems; + } + if( l->prestep < 0 ) { + l->prestep = 0; + } } 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 ) { - l->prestep = l->curvalue - l->maxItems + 1; - } - } else { - l->prestep = 0; - } + if( l->numItems > l->maxItems ) { + if( l->prestep > l->curvalue ) { + l->prestep = l->curvalue; + } else if( l->prestep < l->curvalue - l->maxItems + 1 ) { + l->prestep = l->curvalue - l->maxItems + 1; + } + } else { + l->prestep = 0; + } } /* @@ -522,36 +601,36 @@ MenuList_Init ================= */ void MenuList_Init( menuList_t *l ) { - int height; - int i; + int height; + int i; - height = l->generic.height; - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { - height -= MLIST_SPACING; - } + height = l->generic.height; + if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { + height -= MLIST_SPACING; + } - l->maxItems = 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.x = l->generic.x; + l->generic.rect.y = l->generic.y; - l->generic.rect.width = 0; - for( i = 0; i < l->numcolumns; i++ ) { - l->generic.rect.width += l->columns[i].width; - } + l->generic.rect.width = 0; + for( i = 0; i < l->numcolumns; i++ ) { + l->generic.rect.width += l->columns[i].width; + } -// if( !( l->mlFlags & MLF_HIDE_SCROLLBAR ) ) { -// rc->width += MLIST_SCROLLBAR_WIDTH; -// } +// if( !( l->mlFlags & MLF_HIDE_SCROLLBAR ) ) { +// rc->width += MLIST_SCROLLBAR_WIDTH; +// } - l->generic.rect.height = l->generic.height; + l->generic.rect.height = l->generic.height; if( l->sortdir && l->sort ) { - l->sort( l, l->sortcol ); + l->sort( l, l->sortcol ); } } @@ -561,16 +640,16 @@ MenuList_SetValue ================= */ void MenuList_SetValue( menuList_t *l, int value ) { - clamp( value, 0, l->numItems - 1 ); + clamp( value, 0, l->numItems - 1 ); if( value != l->curvalue ) { - l->curvalue = value; + l->curvalue = value; if( l->generic.change ) { l->generic.change( &l->generic ); } } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep( l ); } static int MenuList_SetColumn( menuList_t *l, int value ) { @@ -581,7 +660,7 @@ static int MenuList_SetColumn( menuList_t *l, int value ) { l->sortdir = 1; } if( l->sort ) { - l->sort( l, l->sortcol ); + l->sort( l, l->sortcol ); } return QMS_SILENT; } @@ -593,21 +672,21 @@ MenuList_Click ================= */ static int MenuList_Click( menuList_t *l ) { - int i, j; - vrect_t rect; + int i, j; + vrect_t rect; - if( !l->items ) { - return QMS_SILENT; - } + if( !l->items ) { + return QMS_SILENT; + } - rect.x = l->generic.rect.x; - rect.y = l->generic.rect.y; - rect.width = l->generic.rect.width; - rect.height = MLIST_SPACING; + rect.x = l->generic.rect.x; + rect.y = l->generic.rect.y; + rect.width = l->generic.rect.width; + rect.height = MLIST_SPACING; // click on header - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { - if( l->sortdir && UI_CursorInRect( &rect ) ) { + 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 ) ) { @@ -615,15 +694,15 @@ static int MenuList_Click( menuList_t *l ) { } rect.x += rect.width; } - return QMS_SILENT; + return QMS_SILENT; } - rect.y += MLIST_SPACING; - } + rect.y += MLIST_SPACING; + } // click on item - j = min( l->numItems, l->prestep + l->maxItems ); - for( i = l->prestep; i < j; i++ ) { - if( UI_CursorInRect( &rect ) ) { + 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 ) { @@ -638,11 +717,11 @@ static int MenuList_Click( menuList_t *l ) { return l->generic.change( &l->generic ); } return QMS_SILENT; - } - rect.y += MLIST_SPACING; - } + } + rect.y += MLIST_SPACING; + } - return QMS_SILENT; + return QMS_SILENT; } /* @@ -651,29 +730,29 @@ MenuList_Key ================= */ static int MenuList_Key( menuList_t *l, int key ) { - //int i; + //int i; - if( !l->items ) { - return QMS_NOTHANDLED; - } + if( !l->items ) { + return QMS_NOTHANDLED; + } 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 ); } - return QMS_NOTHANDLED; + return QMS_NOTHANDLED; } #if 0 - if( key > 32 && key < 127 ) { + 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 ) { - return QMS_NOTHANDLED; + return QMS_NOTHANDLED; } l->scratch[l->scratchCount++] = key; @@ -687,21 +766,21 @@ static int MenuList_Key( menuList_t *l, int key ) { 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 ); - return QMS_SILENT; - } - 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++; + } - return QMS_NOTHANDLED; - } + return QMS_NOTHANDLED; + } #endif l->scratchCount = 0; - switch( key ) { + switch( key ) { case K_LEFTARROW: case 'h': if( l->sortdir ) { @@ -720,89 +799,89 @@ static int MenuList_Key( menuList_t *l, int key ) { return MenuList_SetColumn( l, 0 ); } break; - case K_UPARROW: - case K_KP_UPARROW: + case K_UPARROW: + case K_KP_UPARROW: case 'k': - if( l->curvalue > 0 ) { - l->curvalue--; + if( l->curvalue > 0 ) { + l->curvalue--; if( l->generic.change ) { l->generic.change( &l->generic ); } - MenuList_AdjustPrestep( l ); - return QMS_MOVE; - } - return QMS_BEEP; + MenuList_AdjustPrestep( l ); + return QMS_MOVE; + } + return QMS_BEEP; - case K_DOWNARROW: - case K_KP_DOWNARROW: + case K_DOWNARROW: + case K_KP_DOWNARROW: case 'j': - if( l->curvalue < l->numItems - 1 ) { - l->curvalue++; + if( l->curvalue < l->numItems - 1 ) { + l->curvalue++; if( l->generic.change ) { l->generic.change( &l->generic ); } - MenuList_AdjustPrestep( l ); - return QMS_MOVE; - } - return QMS_BEEP; - - case K_HOME: - case K_KP_HOME: - l->prestep = 0; - l->curvalue = 0; + MenuList_AdjustPrestep( l ); + return QMS_MOVE; + } + return QMS_BEEP; + + case K_HOME: + case K_KP_HOME: + l->prestep = 0; + l->curvalue = 0; if( l->generic.change ) { l->generic.change( &l->generic ); } - return QMS_MOVE; - - case K_END: - case K_KP_END: - if( l->numItems > l->maxItems ) { - l->prestep = l->numItems - l->maxItems; - } - l->curvalue = l->numItems - 1; + return QMS_MOVE; + + case K_END: + case K_KP_END: + 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 ); } - return QMS_MOVE; - - case K_MWHEELUP: - if( Key_IsDown( K_CTRL ) ) { - l->prestep -= 4; - } else { - l->prestep -= 2; - } - MenuList_ValidatePrestep( l ); - return QMS_SILENT; - - case K_MWHEELDOWN: - if( Key_IsDown( K_CTRL ) ) { - l->prestep += 4; - } else { - l->prestep += 2; - } - MenuList_ValidatePrestep( l ); - return QMS_SILENT; - - case K_PGUP: - case K_KP_PGUP: - l->prestep -= l->maxItems; - MenuList_ValidatePrestep( l ); - return QMS_SILENT; - - case K_PGDN: - case K_KP_PGDN: - l->prestep += l->maxItems; - MenuList_ValidatePrestep( l ); - return QMS_SILENT; - - case K_MOUSE1: + return QMS_MOVE; + + case K_MWHEELUP: + if( Key_IsDown( K_CTRL ) ) { + l->prestep -= 4; + } else { + l->prestep -= 2; + } + MenuList_ValidatePrestep( l ); + return QMS_SILENT; + + case K_MWHEELDOWN: + if( Key_IsDown( K_CTRL ) ) { + l->prestep += 4; + } else { + l->prestep += 2; + } + MenuList_ValidatePrestep( l ); + return QMS_SILENT; + + case K_PGUP: + case K_KP_PGUP: + l->prestep -= l->maxItems; + MenuList_ValidatePrestep( l ); + return QMS_SILENT; + + case K_PGDN: + case K_KP_PGDN: + l->prestep += l->maxItems; + 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; + return QMS_NOTHANDLED; } /* @@ -811,26 +890,26 @@ MenuList_DrawString ================= */ static void MenuList_DrawString( int x, int y, int flags, - menuListColumn_t *column, - const char *string ) + menuListColumn_t *column, + const char *string ) { - clipRect_t rc; - - rc.left = x; - rc.right = x + column->width - 1; - rc.top = 0; - rc.bottom = 0; - - if( ( column->uiFlags & UI_CENTER ) == UI_CENTER ) { - x += column->width / 2; - } else if( column->uiFlags & UI_RIGHT ) { - x += column->width - MLIST_PRESTEP; - } else { - x += MLIST_PRESTEP; - } - - ref.SetClipRect( DRAW_CLIP_RIGHT|DRAW_CLIP_LEFT, &rc ); - UI_DrawString( x, y + 1, NULL, column->uiFlags | flags, string ); + clipRect_t rc; + + rc.left = x; + rc.right = x + column->width - 1; + rc.top = 0; + rc.bottom = 0; + + if( ( column->uiFlags & UI_CENTER ) == UI_CENTER ) { + x += column->width / 2; + } else if( column->uiFlags & UI_RIGHT ) { + x += column->width - MLIST_PRESTEP; + } else { + x += MLIST_PRESTEP; + } + + ref.SetClipRect( DRAW_CLIP_RIGHT|DRAW_CLIP_LEFT, &rc ); + UI_DrawString( x, y + 1, NULL, column->uiFlags | flags, string ); if( uis.glconfig.renderer == GL_RENDERER_SOFTWARE ) { ref.SetClipRect( DRAW_CLIP_MASK, &uis.clipRect ); } else { @@ -846,115 +925,115 @@ MenuList_Draw ================= */ static void MenuList_Draw( menuList_t *l ) { - char *s; - int x, y, xx, yy; - int i, j, k; - int width, height; - vrect_t rect; - float pageFrac, prestepFrac; - int barHeight; - - if( !l->items ) { - //return; - } - - x = l->generic.rect.x; - y = l->generic.rect.y; - width = l->generic.rect.width; - height = l->generic.rect.height; - - // draw header - if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { - xx = x; - for( j = 0; j < l->numcolumns; j++ ) { - ref.DrawFillEx( xx, y, l->columns[j].width - 1, + char *s; + int x, y, xx, yy; + int i, j, k; + int width, height; + vrect_t rect; + float pageFrac, prestepFrac; + int barHeight; + + if( !l->items ) { + //return; + } + + x = l->generic.rect.x; + y = l->generic.rect.y; + width = l->generic.rect.width; + height = l->generic.rect.height; + + // draw header + if( !( l->mlFlags & MLF_HIDE_HEADER ) ) { + xx = x; + for( j = 0; j < l->numcolumns; j++ ) { + ref.DrawFillEx( xx, y, l->columns[j].width - 1, MLIST_SPACING - 1, colorField ); - if( l->columns[j].name ) { - MenuList_DrawString( xx, y, l->sortcol == j && l->sortdir ? 0 : UI_ALTCOLOR, - &l->columns[j], l->columns[j].name ); - } - xx += l->columns[j].width; - } - y += MLIST_SPACING; - height -= MLIST_SPACING; - } - - 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; - - if( !( l->mlFlags & MLF_HIDE_BACKGROUND ) ) { - rect.x = x + width; - rect.y = yy; - rect.width = MLIST_SCROLLBAR_WIDTH - 1; - rect.height = barHeight; - - // draw scrollbar background - UIS_FillRectEx( &rect, colorField ); - } - - if( l->numItems > l->maxItems ) { - pageFrac = ( float )l->maxItems / l->numItems; - prestepFrac = ( float )l->prestep / l->numItems; - } else { - pageFrac = 1; - prestepFrac = 0; - } - - rect.x = x + width; - rect.y = yy + Q_rint( barHeight * prestepFrac ); - rect.width = MLIST_SCROLLBAR_WIDTH - 1; - rect.height = Q_rint( barHeight * pageFrac ); - - // draw scrollbar thumb - UIS_FillRectEx( &rect, colorField ); - - } - - xx = x; - for( j = 0; j < l->numcolumns; j++ ) { - ref.DrawFillEx( xx, y, l->columns[j].width - 1, - height, colorField ); - - xx += l->columns[j].width; - } - - yy = y; - 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 ) { - ref.DrawFillEx( x, yy, width - 1, MLIST_SPACING, colorField ); - } - - // draw contents - s = ( char * )l->items[i] + l->extrasize; - xx = x; - for( j = 0; j < l->numcolumns; j++ ) { - if( !*s ) { - break; - } - - MenuList_DrawString( xx, yy, 0, &l->columns[j], s ); - - xx += l->columns[j].width; - s += strlen( s ) + 1; - } - - yy += MLIST_SPACING; - } + if( l->columns[j].name ) { + MenuList_DrawString( xx, y, l->sortcol == j && l->sortdir ? 0 : UI_ALTCOLOR, + &l->columns[j], l->columns[j].name ); + } + xx += l->columns[j].width; + } + y += MLIST_SPACING; + height -= MLIST_SPACING; + } + + 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; + + if( !( l->mlFlags & MLF_HIDE_BACKGROUND ) ) { + rect.x = x + width; + rect.y = yy; + rect.width = MLIST_SCROLLBAR_WIDTH - 1; + rect.height = barHeight; + + // draw scrollbar background + UIS_FillRectEx( &rect, colorField ); + } + + if( l->numItems > l->maxItems ) { + pageFrac = ( float )l->maxItems / l->numItems; + prestepFrac = ( float )l->prestep / l->numItems; + } else { + pageFrac = 1; + prestepFrac = 0; + } + + rect.x = x + width; + rect.y = yy + Q_rint( barHeight * prestepFrac ); + rect.width = MLIST_SCROLLBAR_WIDTH - 1; + rect.height = Q_rint( barHeight * pageFrac ); + + // draw scrollbar thumb + UIS_FillRectEx( &rect, colorField ); + + } + + xx = x; + for( j = 0; j < l->numcolumns; j++ ) { + ref.DrawFillEx( xx, y, l->columns[j].width - 1, + height, colorField ); + + xx += l->columns[j].width; + } + + yy = y; + 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 ) { + ref.DrawFillEx( x, yy, width - 1, MLIST_SPACING, colorField ); + } + + // draw contents + s = ( char * )l->items[i] + l->extrasize; + xx = x; + for( j = 0; j < l->numcolumns; j++ ) { + if( !*s ) { + break; + } + + MenuList_DrawString( xx, yy, 0, &l->columns[j], s ); + + xx += l->columns[j].width; + s += strlen( s ) + 1; + } + + yy += MLIST_SPACING; + } } void MenuList_Sort( menuList_t *l, int offset, int (*cmpfunc)( const void *, const void * ) ) { void *n; int i; - if( !l->items ) { - return; - } + if( !l->items ) { + return; + } n = l->items[l->curvalue]; @@ -967,7 +1046,7 @@ void MenuList_Sort( menuList_t *l, int offset, int (*cmpfunc)( const void *, con } } - MenuList_AdjustPrestep( l ); + MenuList_AdjustPrestep( l ); } /* @@ -997,31 +1076,31 @@ static void Slider_Free( menuSlider_t *s ) { } static void Slider_Init( menuSlider_t *s ) { - int len = strlen( s->generic.name ) * CHAR_WIDTH; + 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.x = s->generic.x + LCOLUMN_OFFSET - len; + s->generic.rect.y = s->generic.y; - s->generic.rect.width = 32 + len + ( SLIDER_RANGE + 2 ) * CHAR_WIDTH; - s->generic.rect.height = CHAR_HEIGHT; + s->generic.rect.width = 32 + len + ( SLIDER_RANGE + 2 ) * CHAR_WIDTH; + s->generic.rect.height = CHAR_HEIGHT; - if( s->curvalue > s->maxvalue ) - s->curvalue = s->maxvalue; - else if( s->curvalue < s->minvalue ) - s->curvalue = s->minvalue; + if( s->curvalue > s->maxvalue ) + s->curvalue = s->maxvalue; + else if( s->curvalue < s->minvalue ) + s->curvalue = s->minvalue; } static int Slider_Key( menuSlider_t *s, int key ) { - switch( key ) { - case K_END: - s->curvalue = s->maxvalue; - return QMS_MOVE; - case K_HOME: - s->curvalue = s->minvalue; - return QMS_MOVE; - } + switch( key ) { + case K_END: + s->curvalue = s->maxvalue; + return QMS_MOVE; + case K_HOME: + s->curvalue = s->minvalue; + return QMS_MOVE; + } - return QMS_NOTHANDLED; + return QMS_NOTHANDLED; } @@ -1031,21 +1110,21 @@ Slider_DoSlide ================= */ static int Slider_DoSlide( menuSlider_t *s, int dir ) { - s->curvalue += dir; + s->curvalue += dir; - if( s->curvalue > s->maxvalue ) - s->curvalue = s->maxvalue; - else if( s->curvalue < s->minvalue ) - s->curvalue = s->minvalue; + if( s->curvalue > s->maxvalue ) + s->curvalue = s->maxvalue; + else if( s->curvalue < s->minvalue ) + s->curvalue = s->minvalue; if( s->generic.change ) { menuSound_t sound = s->generic.change( &s->generic ); - if( sound != QMS_NOTHANDLED ) { - return sound; - } + if( sound != QMS_NOTHANDLED ) { + return sound; + } } - return QMS_SILENT; + return QMS_SILENT; } /* @@ -1054,36 +1133,36 @@ Slider_Draw ================= */ static void Slider_Draw( menuSlider_t *s ) { - int i, flags; + 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, NULL, - flags | UI_RIGHT | UI_ALTCOLOR, s->generic.name ); + UI_DrawString( s->generic.x + LCOLUMN_OFFSET, s->generic.y, NULL, + 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 ); if( s->maxvalue <= s->minvalue ) { pos = 0; } else { - pos = ( s->curvalue - s->minvalue ) / + pos = ( s->curvalue - s->minvalue ) / ( float )( s->maxvalue - s->minvalue ); - clamp( pos, 0, 1 ); + 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 ); } /* @@ -1100,8 +1179,8 @@ Separator_Init ================= */ 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; + s->generic.rect.x = s->generic.rect.y = 999999; + s->generic.rect.width = s->generic.rect.height = -999999; } /* @@ -1110,8 +1189,8 @@ Separator_Draw ================= */ static void Separator_Draw( menuSeparator_t *s ) { - if( s->generic.name ) - UI_DrawString( s->generic.x, s->generic.y, NULL, UI_RIGHT, s->generic.name ); + if( s->generic.name ) + UI_DrawString( s->generic.x, s->generic.y, NULL, UI_RIGHT, s->generic.name ); } /* @@ -1131,11 +1210,11 @@ static int Common_DoEnter( menuCommon_t *item ) { if( item->activate ) { menuSound_t sound = item->activate( item ); if( sound != QMS_NOTHANDLED ) { - return sound; + return sound; } - } + } - return QMS_SILENT; + return QMS_SILENT; } @@ -1145,18 +1224,18 @@ Menu_AddItem ================= */ void Menu_AddItem( menuFrameWork_t *menu, void *item ) { - if( menu->nitems >= MAXMENUITEMS ) { + if( menu->nitems >= MAXMENUITEMS ) { Com_Error( ERR_FATAL, "Menu_AddItem: too many items" ); - return; - } + return; + } - menu->items[menu->nitems++] = item; - ((menuCommon_t *)item)->parent = menu; + menu->items[menu->nitems++] = item; + ((menuCommon_t *)item)->parent = menu; } void Menu_Init( menuFrameWork_t *menu ) { - void *item; - int i; + void *item; + int i; int focus = 0; if( !menu->size ) { @@ -1164,8 +1243,8 @@ void Menu_Init( menuFrameWork_t *menu ) { } menu->size( menu ); - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; focus |= ((menuCommon_t *)item)->flags & QMF_HASFOCUS; switch( ((menuCommon_t *)item)->type ) { @@ -1179,6 +1258,9 @@ void Menu_Init( menuFrameWork_t *menu ) { MenuList_Init( item ); break; case MTYPE_SPINCONTROL: + case MTYPE_BITFIELD: + case MTYPE_PAIRS: + case MTYPE_TOGGLE: SpinControl_Init( item ); break; case MTYPE_ACTION: @@ -1201,81 +1283,81 @@ void Menu_Init( menuFrameWork_t *menu ) { // set focus to the first item by default if( !focus && menu->nitems ) { - item = menu->items[0]; + item = menu->items[0]; ((menuCommon_t *)item)->flags |= QMF_HASFOCUS; } } void Menu_Size( menuFrameWork_t *menu ) { - menuCommon_t *item; + menuCommon_t *item; int x, y; - int i, count; + int i, count; // count visible items - for( i = 0, count = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { - continue; - } + for( i = 0, count = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; + if( item->flags & QMF_HIDDEN ) { + continue; + } count++; } - x = uis.width / 2; - y = ( uis.height - MENU_SPACING * count ) / 2; + x = uis.width / 2; + y = ( uis.height - MENU_SPACING * count ) / 2; // align items - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { - continue; - } + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; + if( item->flags & QMF_HIDDEN ) { + continue; + } item->x = x; item->y = y; - y += MENU_SPACING; + y += MENU_SPACING; } } menuCommon_t *Menu_ItemAtCursor( menuFrameWork_t *m ) { - menuCommon_t *item; - int i; + menuCommon_t *item; + int i; - for( i = 0; i < m->nitems; i++ ) { - item = m->items[i]; - if( item->flags & QMF_HASFOCUS ) { - return item; - } - } + for( i = 0; i < m->nitems; i++ ) { + item = m->items[i]; + if( item->flags & QMF_HASFOCUS ) { + return item; + } + } - return NULL; + return NULL; } void Menu_SetFocus( menuCommon_t *focus ) { - menuFrameWork_t *menu; - menuCommon_t *item; - int i; + menuFrameWork_t *menu; + menuCommon_t *item; + int i; - if( focus->flags & QMF_HASFOCUS ) { - return; - } + if( focus->flags & QMF_HASFOCUS ) { + return; + } - menu = focus->parent; + menu = focus->parent; - for( i = 0; i < menu->nitems ; i++ ) { - item = (menuCommon_t *)menu->items[i]; + for( i = 0; i < menu->nitems ; i++ ) { + item = (menuCommon_t *)menu->items[i]; - if( item == focus ) { - item->flags |= QMF_HASFOCUS; + if( item == focus ) { + item->flags |= QMF_HASFOCUS; if( item->focus ) { item->focus( item, qtrue ); } - } else if( item->flags & QMF_HASFOCUS ) { - item->flags &= ~QMF_HASFOCUS; + } else if( item->flags & QMF_HASFOCUS ) { + item->flags &= ~QMF_HASFOCUS; if( item->focus ) { item->focus( item, qfalse ); } - } - } + } + } } @@ -1289,49 +1371,49 @@ slot. ================= */ 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++ ) { - item = (menuCommon_t *)m->items[i]; - - if( item->flags & QMF_HASFOCUS ) { - pos = i; - break; - } - } - - /* - ** crawl in the direction indicated until we find a valid spot - */ - cursor = pos; - if( dir == 1 ) { - do { - cursor++; - if( cursor >= m->nitems ) - cursor = 0; + menuCommon_t *item; + int cursor, pos; + int i; + + pos = 0; + for( i=0 ; i<m->nitems ; i++ ) { + item = (menuCommon_t *)m->items[i]; - item = (menuCommon_t *)m->items[cursor]; - if( UI_IsItemSelectable( item ) ) - break; - } while( cursor != pos ); - } else { - do { - cursor--; - if( cursor < 0 ) - cursor = m->nitems - 1; + if( item->flags & QMF_HASFOCUS ) { + pos = i; + break; + } + } - item = (menuCommon_t *)m->items[cursor]; - if( UI_IsItemSelectable( item ) ) - break; - } while( cursor != pos ); - } + /* + ** crawl in the direction indicated until we find a valid spot + */ + cursor = pos; + if( dir == 1 ) { + do { + cursor++; + if( cursor >= m->nitems ) + cursor = 0; + + item = (menuCommon_t *)m->items[cursor]; + if( UI_IsItemSelectable( item ) ) + break; + } while( cursor != pos ); + } else { + do { + cursor--; + if( cursor < 0 ) + cursor = m->nitems - 1; + + item = (menuCommon_t *)m->items[cursor]; + if( UI_IsItemSelectable( item ) ) + break; + } while( cursor != pos ); + } - Menu_SetFocus( item ); + Menu_SetFocus( item ); - return QMS_MOVE; + return QMS_MOVE; } /* @@ -1340,244 +1422,251 @@ Menu_Draw ================= */ void Menu_Draw( menuFrameWork_t *menu ) { - void *item; - int i; + void *item; + int i; // // draw title bar // - if( menu->title ) { - UI_DrawString( uis.width / 2, 0, NULL, UI_CENTER|UI_ALTCOLOR, menu->title ); - } + if( menu->title ) { + UI_DrawString( uis.width / 2, 0, NULL, UI_CENTER|UI_ALTCOLOR, menu->title ); + } // // draw contents // - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; - if( (( menuCommon_t * )item)->flags & QMF_HIDDEN ) { - continue; - } - - switch( (( menuCommon_t * )item)->type ) { - case MTYPE_FIELD: - Field_Draw( item ); - break; - case MTYPE_SLIDER: - Slider_Draw( item ); - break; - case MTYPE_LIST: - MenuList_Draw( item ); - break; - case MTYPE_SPINCONTROL: - SpinControl_Draw( item ); - break; - case MTYPE_ACTION: - Action_Draw( item ); - break; - case MTYPE_SEPARATOR: - Separator_Draw( item ); - break; - case MTYPE_STATIC: - Static_Draw( item ); - break; - case MTYPE_KEYBIND: - Keybind_Draw( item ); - break; - default: - Com_Error( ERR_FATAL, "Menu_Draw: unknown item type" ); - break; - } - - if( ui_debug->integer ) { - UIS_DrawRect( &(( menuCommon_t * )item)->rect, 1, 223 ); - } - } + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; + if( (( menuCommon_t * )item)->flags & QMF_HIDDEN ) { + continue; + } + + switch( (( menuCommon_t * )item)->type ) { + case MTYPE_FIELD: + Field_Draw( item ); + break; + case MTYPE_SLIDER: + Slider_Draw( item ); + break; + case MTYPE_LIST: + MenuList_Draw( item ); + break; + case MTYPE_SPINCONTROL: + case MTYPE_BITFIELD: + case MTYPE_PAIRS: + case MTYPE_TOGGLE: + SpinControl_Draw( item ); + break; + case MTYPE_ACTION: + Action_Draw( item ); + break; + case MTYPE_SEPARATOR: + Separator_Draw( item ); + break; + case MTYPE_STATIC: + Static_Draw( item ); + break; + case MTYPE_KEYBIND: + Keybind_Draw( item ); + break; + default: + Com_Error( ERR_FATAL, "Menu_Draw: unknown item type" ); + break; + } + + if( ui_debug->integer ) { + UIS_DrawRect( &(( menuCommon_t * )item)->rect, 1, 223 ); + } + } // // draw status bar // - if( menu->status ) { - ref.DrawFill( 0, uis.height - 8, uis.width, 8, 4 ); - UI_DrawString( uis.width / 2, uis.height - 8, NULL, UI_CENTER, menu->status ); - } + if( menu->status ) { + ref.DrawFill( 0, uis.height - 8, uis.width, 8, 4 ); + UI_DrawString( uis.width / 2, uis.height - 8, NULL, UI_CENTER, menu->status ); + } } menuSound_t Menu_SelectItem( menuFrameWork_t *s ) { - menuCommon_t *item; - - if( !( item = Menu_ItemAtCursor( s ) ) ) { - return QMS_NOTHANDLED; - } - - switch( item->type ) { - //case MTYPE_SLIDER: - // return Slider_DoSlide( (menuSlider_t *)item, 1 ); - case MTYPE_SPINCONTROL: - return SpinControl_DoEnter( (menuSpinControl_t *)item ); - case MTYPE_KEYBIND: + menuCommon_t *item; + + if( !( item = Menu_ItemAtCursor( s ) ) ) { + return QMS_NOTHANDLED; + } + + switch( item->type ) { + //case MTYPE_SLIDER: + // return Slider_DoSlide( (menuSlider_t *)item, 1 ); + case MTYPE_SPINCONTROL: + case MTYPE_BITFIELD: + case MTYPE_PAIRS: + case MTYPE_TOGGLE: + return SpinControl_DoEnter( (menuSpinControl_t *)item ); + case MTYPE_KEYBIND: return Keybind_DoEnter( ( menuKeybind_t * )item ); - case MTYPE_FIELD: - case MTYPE_ACTION: - case MTYPE_BITMAP: - case MTYPE_LIST: - case MTYPE_IMAGELIST: - return Common_DoEnter( item ); + case MTYPE_FIELD: + case MTYPE_ACTION: + case MTYPE_LIST: + return Common_DoEnter( item ); default: - return QMS_NOTHANDLED; - } + return QMS_NOTHANDLED; + } } menuSound_t Menu_SlideItem( menuFrameWork_t *s, int dir ) { - menuCommon_t *item; + menuCommon_t *item; - if( !( item = Menu_ItemAtCursor( s ) ) ) { - return QMS_NOTHANDLED; - } + if( !( item = Menu_ItemAtCursor( s ) ) ) { + return QMS_NOTHANDLED; + } - switch( item->type ) { - case MTYPE_SLIDER: - return Slider_DoSlide( (menuSlider_t *)item, dir ); - case MTYPE_SPINCONTROL: - return SpinControl_DoSlide( (menuSpinControl_t *)item, dir ); + switch( item->type ) { + case MTYPE_SLIDER: + return Slider_DoSlide( (menuSlider_t *)item, dir ); + case MTYPE_SPINCONTROL: + case MTYPE_BITFIELD: + case MTYPE_PAIRS: + case MTYPE_TOGGLE: + return SpinControl_DoSlide( (menuSpinControl_t *)item, dir ); default: - return QMS_NOTHANDLED; - } + return QMS_NOTHANDLED; + } } menuSound_t Menu_KeyEvent( menuCommon_t *item, int key ) { if( item->keydown ) { - menuSound_t sound = item->keydown( item, key ); + menuSound_t sound = item->keydown( item, key ); if( sound != QMS_NOTHANDLED ) { return sound; } - } - - switch( item->type ) { - case MTYPE_FIELD: - return Field_Key( ( menuField_t * )item, key ); - case MTYPE_LIST: - return MenuList_Key( ( menuList_t * )item, key ); - case MTYPE_SLIDER: - return Slider_Key( ( menuSlider_t * )item, key ); - case MTYPE_KEYBIND: - return Keybind_Key( ( menuKeybind_t * )item, key ); + } + + switch( item->type ) { + case MTYPE_FIELD: + return Field_Key( ( menuField_t * )item, key ); + case MTYPE_LIST: + return MenuList_Key( ( menuList_t * )item, key ); + case MTYPE_SLIDER: + return Slider_Key( ( menuSlider_t * )item, key ); + case MTYPE_KEYBIND: + return Keybind_Key( ( menuKeybind_t * )item, key ); default: - return QMS_NOTHANDLED; - } + return QMS_NOTHANDLED; + } } menuSound_t Menu_CharEvent( menuCommon_t *item, int key ) { - switch( item->type ) { - case MTYPE_FIELD: - return Field_Char( (menuField_t *)item, key ); + switch( item->type ) { + case MTYPE_FIELD: + return Field_Char( (menuField_t *)item, key ); default: - return QMS_NOTHANDLED; - } + return QMS_NOTHANDLED; + } } menuSound_t Menu_MouseMove( menuCommon_t *item ) { - return QMS_NOTHANDLED; + return QMS_NOTHANDLED; } menuSound_t Menu_DefaultKey( menuFrameWork_t *m, int key ) { - menuCommon_t *item; - - switch( key ) { - case K_ESCAPE: - UI_PopMenu(); - return QMS_OUT; - - case K_KP_UPARROW: - case K_UPARROW: + menuCommon_t *item; + + switch( key ) { + case K_ESCAPE: + UI_PopMenu(); + return QMS_OUT; + + case K_KP_UPARROW: + case K_UPARROW: case 'k': - return Menu_AdjustCursor( m, -1 ); - - case K_KP_DOWNARROW: - case K_DOWNARROW: - case K_TAB: + 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 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 K_KP_RIGHTARROW: + case K_RIGHTARROW: + case K_MWHEELUP: case 'l': - return Menu_SlideItem( m, 1 ); - - case K_MOUSE1: - case K_MOUSE2: - case K_MOUSE3: - item = Menu_HitTest( m ); - if( !item ) { - return QMS_NOTHANDLED; - } - - if( !( item->flags & QMF_HASFOCUS ) ) { - return QMS_NOTHANDLED; - } - - // fall through - - case K_JOY1: - case K_JOY2: - case K_JOY3: - case K_JOY4: - case K_AUX1: - case K_AUX2: - case K_AUX3: - case K_AUX4: - case K_AUX5: - case K_AUX6: - case K_AUX7: - case K_AUX8: - case K_AUX9: - case K_AUX10: - case K_AUX11: - case K_AUX12: - case K_AUX13: - case K_AUX14: - case K_AUX15: - case K_AUX16: - case K_AUX17: - case K_AUX18: - case K_AUX19: - case K_AUX20: - case K_AUX21: - case K_AUX22: - case K_AUX23: - case K_AUX24: - case K_AUX25: - case K_AUX26: - case K_AUX27: - case K_AUX28: - case K_AUX29: - case K_AUX30: - case K_AUX31: - case K_AUX32: - case K_KP_ENTER: - case K_ENTER: - return Menu_SelectItem( m ); - } - - return QMS_NOTHANDLED; + return Menu_SlideItem( m, 1 ); + + case K_MOUSE1: + case K_MOUSE2: + case K_MOUSE3: + item = Menu_HitTest( m ); + if( !item ) { + return QMS_NOTHANDLED; + } + + if( !( item->flags & QMF_HASFOCUS ) ) { + return QMS_NOTHANDLED; + } + + // fall through + + case K_JOY1: + case K_JOY2: + case K_JOY3: + case K_JOY4: + case K_AUX1: + case K_AUX2: + case K_AUX3: + case K_AUX4: + case K_AUX5: + case K_AUX6: + case K_AUX7: + case K_AUX8: + case K_AUX9: + case K_AUX10: + case K_AUX11: + case K_AUX12: + case K_AUX13: + case K_AUX14: + case K_AUX15: + case K_AUX16: + case K_AUX17: + case K_AUX18: + case K_AUX19: + case K_AUX20: + case K_AUX21: + case K_AUX22: + case K_AUX23: + case K_AUX24: + case K_AUX25: + case K_AUX26: + case K_AUX27: + case K_AUX28: + case K_AUX29: + case K_AUX30: + case K_AUX31: + case K_AUX32: + case K_KP_ENTER: + case K_ENTER: + return Menu_SelectItem( m ); + } + + return QMS_NOTHANDLED; } menuSound_t Menu_Keydown( menuFrameWork_t *menu, int key ) { - menuCommon_t *item; + menuCommon_t *item; menuSound_t sound; if( menu->keywait ) { } - if( menu->keydown ) { + if( menu->keydown ) { sound = menu->keydown( menu, key ); if( sound != QMS_NOTHANDLED ) { return sound; @@ -1586,53 +1675,62 @@ menuSound_t Menu_Keydown( menuFrameWork_t *menu, int key ) { item = Menu_ItemAtCursor( menu ); if( item ) { - sound = Menu_KeyEvent( item, key ); + 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 ) { - int i; - menuCommon_t *item; + int i; + menuCommon_t *item; if( menu->keywait ) { return NULL; } - - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; - if( item->flags & QMF_HIDDEN ) { - continue; - } + + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; + if( item->flags & QMF_HIDDEN ) { + continue; + } - if( UI_CursorInRect( &item->rect ) ) { - return item; - } - } + if( UI_CursorInRect( &item->rect ) ) { + return item; + } + } - return NULL; + return NULL; } qboolean Menu_Push( menuFrameWork_t *menu ) { - void *item; + void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; switch( ((menuCommon_t *)item)->type ) { case MTYPE_SLIDER: Slider_Push( item ); break; + case MTYPE_BITFIELD: + BitField_Push( item ); + break; + case MTYPE_PAIRS: + Pairs_Push( item ); + break; case MTYPE_SPINCONTROL: SpinControl_Push( item ); break; + case MTYPE_TOGGLE: + Toggle_Push( item ); + break; case MTYPE_KEYBIND: Keybind_Push( item ); break; @@ -1644,17 +1742,24 @@ qboolean Menu_Push( menuFrameWork_t *menu ) { } void Menu_Pop( menuFrameWork_t *menu ) { - void *item; + void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; switch( ((menuCommon_t *)item)->type ) { case MTYPE_SLIDER: Slider_Pop( item ); break; + case MTYPE_BITFIELD: + BitField_Pop( item ); + break; + case MTYPE_PAIRS: + Pairs_Pop( item ); + break; case MTYPE_SPINCONTROL: + case MTYPE_TOGGLE: SpinControl_Pop( item ); break; default: @@ -1664,11 +1769,11 @@ void Menu_Pop( menuFrameWork_t *menu ) { } void Menu_Free( menuFrameWork_t *menu ) { - void *item; + void *item; int i; - for( i = 0; i < menu->nitems; i++ ) { - item = menu->items[i]; + for( i = 0; i < menu->nitems; i++ ) { + item = menu->items[i]; switch( ((menuCommon_t *)item)->type ) { case MTYPE_ACTION: @@ -1677,6 +1782,13 @@ void Menu_Free( menuFrameWork_t *menu ) { case MTYPE_SLIDER: Slider_Free( item ); break; + case MTYPE_BITFIELD: + case MTYPE_TOGGLE: + BitField_Free( item ); + break; + case MTYPE_PAIRS: + Pairs_Free( item ); + break; case MTYPE_SPINCONTROL: SpinControl_Free( item ); break; |