Controls menu now sorta works half-way. We still need to parse defaults.
This commit is contained in:
parent
66b629b83a
commit
a9e2a37f51
|
|
@ -24,8 +24,13 @@ CFrame ctrl_frAct;
|
|||
CListBox ctrl_lbActDesc;
|
||||
CListBox ctrl_lbActBind1;
|
||||
CListBox ctrl_lbActBind2;
|
||||
CListBox ctrl_lbActBind3;
|
||||
CScrollbar ctrl_sbControls;
|
||||
|
||||
CDialog mp_dgBind;
|
||||
|
||||
var int g_controlquery = -1;
|
||||
|
||||
void ctrl_btnok_start(void)
|
||||
{
|
||||
static void ctrl_btnok_end(void) {
|
||||
|
|
@ -62,14 +67,67 @@ void ctrl_sbcontrols_changed(int val)
|
|||
}
|
||||
void ctrl_lb_clicked(int val)
|
||||
{
|
||||
static float clicked_last;
|
||||
static int val_last;
|
||||
ctrl_lbActDesc.SetSelected(val);
|
||||
ctrl_lbActBind1.SetSelected(val);
|
||||
ctrl_lbActBind2.SetSelected(val);
|
||||
|
||||
if (ctrl_lbActBind3.GetItem(val) == "blank") {
|
||||
return;
|
||||
}
|
||||
|
||||
/* last item as last time */
|
||||
if (val_last == val) {
|
||||
/* double click timer */
|
||||
if (clicked_last > time) {
|
||||
g_controlquery = val;
|
||||
}
|
||||
}
|
||||
val_last = val;
|
||||
clicked_last = time + 0.5f;
|
||||
}
|
||||
|
||||
void menu_controls_update(void)
|
||||
{
|
||||
int c, j, k, i;
|
||||
|
||||
c = ctrl_lbActBind3.GetCount();
|
||||
|
||||
for (int i = 0; i < c; i++) {
|
||||
string cmd = ctrl_lbActBind3.GetItem(i);
|
||||
|
||||
if (cmd == " ") {
|
||||
continue;
|
||||
}
|
||||
|
||||
tokenize(findkeysforcommand(cmd));
|
||||
|
||||
/* clear */
|
||||
ctrl_lbActBind1.SetItem(i, " ");
|
||||
ctrl_lbActBind2.SetItem(i, " ");
|
||||
|
||||
/* we only support the first two bindings */
|
||||
for (j = 0; j < 2; ++j) {
|
||||
k = stof(argv(j));
|
||||
|
||||
if (k == -1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (j) {
|
||||
ctrl_lbActBind2.SetItem(i, keynumtostring(k));
|
||||
} else {
|
||||
ctrl_lbActBind1.SetItem(i, keynumtostring(k));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void menu_controls_init(void)
|
||||
{
|
||||
fn_controls = spawn(CWidget);
|
||||
mp_dgBind = spawn(CDialog);
|
||||
|
||||
ctrl_btnDefaults = spawn(CMainButton);
|
||||
ctrl_btnDefaults.SetImage(BTN_DEFAULTS);
|
||||
|
|
@ -118,6 +176,8 @@ void menu_controls_init(void)
|
|||
ctrl_lbActBind2.SetChanged(ctrl_lb_clicked);
|
||||
Widget_Add(fn_controls, ctrl_lbActBind2);
|
||||
|
||||
ctrl_lbActBind3 = spawn(CListBox);
|
||||
|
||||
ctrl_sbControls = spawn(CScrollbar);
|
||||
ctrl_sbControls.SetPos(589,156);
|
||||
ctrl_sbControls.SetHeight(258+6);
|
||||
|
|
@ -129,18 +189,21 @@ void menu_controls_init(void)
|
|||
string sTemp;
|
||||
filestream fs_actlst = fopen("gfx/shell/kb_act.lst", FILE_READ);
|
||||
|
||||
/* Count the valid entries */
|
||||
/* count the valid entries */
|
||||
if (fs_actlst >= 0) {
|
||||
while ((sTemp = fgets(fs_actlst))) {
|
||||
/* anything but 2 keywords == invalid */
|
||||
if (tokenize_console(sTemp) == 2) {
|
||||
if (argv(0) == "blank") {
|
||||
ctrl_lbActBind1.AddEntry(" ");
|
||||
} else if (argv(0) != "+voicerecord") {
|
||||
ctrl_lbActBind1.AddEntry(argv(0));
|
||||
/* in FTE that command is different */
|
||||
if (argv(0) == "+voicerecord") {
|
||||
ctrl_lbActBind3.AddEntry("+voip");
|
||||
} else {
|
||||
ctrl_lbActBind1.AddEntry("+voip");
|
||||
ctrl_lbActBind3.AddEntry(argv(0));
|
||||
}
|
||||
|
||||
ctrl_lbActDesc.AddEntry(argv(1));
|
||||
ctrl_lbActBind1.AddEntry(" ");
|
||||
ctrl_lbActBind2.AddEntry(" ");
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
|
@ -149,16 +212,55 @@ void menu_controls_init(void)
|
|||
error("Cannot parse gfx/shell/kb_act.lst!");
|
||||
}
|
||||
|
||||
menu_controls_update();
|
||||
ctrl_sbControls.SetMax(count);
|
||||
}
|
||||
|
||||
float g_ctrl_refresh;
|
||||
void menu_controls_draw(void)
|
||||
{
|
||||
|
||||
Widget_Draw(fn_controls);
|
||||
drawpic([g_menuofs[0]+45,g_menuofs[1]+45], g_bmp[HEAD_CONTROLS],[460,80], [1,1,1], 1.0f, 1);
|
||||
|
||||
WField_Static(50,236+32, m_reslbl[IDS_CONTROLS_KEYHELP], 169, 64, col_help,
|
||||
1.0f, 1, font_label);
|
||||
|
||||
if (g_controlquery >= 0) {
|
||||
mp_dgBind.Draw();
|
||||
WField_Static(162, 180, m_reslbl[IDS_BINDING_PROMPT], 320, 260,
|
||||
col_prompt_text, 1.0f, 2, font_label_p);
|
||||
WField_Static(162, 280, ctrl_lbActDesc.GetItem(g_controlquery), 320, 260,
|
||||
col_prompt_title, 1.0f, 2, font_label);
|
||||
}
|
||||
|
||||
if (g_ctrl_refresh < time) {
|
||||
menu_controls_update();
|
||||
g_ctrl_refresh = time + 0.5f;
|
||||
}
|
||||
}
|
||||
|
||||
void menu_controls_input(float evtype, float scanx, float chary, float devid)
|
||||
{
|
||||
/* this comes first, or else the dialog will skip immediately */
|
||||
if (g_controlquery >= 0) {
|
||||
switch (evtype) {
|
||||
case IE_KEYDOWN:
|
||||
if (scanx == K_ESCAPE) {
|
||||
g_controlquery = -1;
|
||||
} else if (scanx == K_BACKSPACE) {
|
||||
localcmd( sprintf( "unbind %s\n", ctrl_lbActBind1.GetItem(g_controlquery) ) );
|
||||
localcmd( sprintf( "unbind %s\n", ctrl_lbActBind2.GetItem(g_controlquery) ) );
|
||||
g_controlquery = -1;
|
||||
g_ctrl_refresh = time + 0.1f;
|
||||
} else if (scanx > 0) {
|
||||
localcmd(sprintf( "bind %s %s\n", keynumtostring(scanx), ctrl_lbActBind3.GetItem(g_controlquery)));
|
||||
g_controlquery = -1;
|
||||
g_ctrl_refresh = time + 0.1f;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Widget_Input(fn_controls, evtype, scanx, chary, devid);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ void mp_btncustomize_start(void)
|
|||
void menu_multiplayer_init(void)
|
||||
{
|
||||
fn_multiplayer = spawn(CWidget);
|
||||
mp_dgConnect = spawn(CDialog);
|
||||
mp_dgConnect = spawn(CDialog);
|
||||
|
||||
mp_btnQuickstart = spawn(CMainButton);
|
||||
mp_btnQuickstart.SetImage(BTN_QUICKSTART);
|
||||
|
|
|
|||
|
|
@ -35,6 +35,25 @@ int Util_CheckMouse(int x, int y, int sx, int sy) {
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
string Util_CmdToKey(string cmd)
|
||||
{
|
||||
float fBindKey = tokenize( findkeysforcommand( cmd ) );
|
||||
string sBindTx = "";
|
||||
float j, k;
|
||||
|
||||
for( j = 0; j < fBindKey; ++j ) {
|
||||
k = stof( argv( j ) );
|
||||
if( k != -1 ) {
|
||||
if( sBindTx != "" ) {
|
||||
sBindTx = strcat( sBindTx, ", " );
|
||||
}
|
||||
sBindTx = strcat( sBindTx, keynumtostring( k ) );
|
||||
}
|
||||
}
|
||||
|
||||
return sBindTx;
|
||||
}
|
||||
|
||||
float lerp( float fA, float fB, float fPercent ) {
|
||||
return ( fA * ( 1 - fPercent ) ) + ( fB * fPercent );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,11 +31,14 @@ class CListBox:CWidget
|
|||
|
||||
virtual void(string m) AddEntry;
|
||||
virtual void() Clear;
|
||||
virtual void(int w, int h) SetSize;
|
||||
virtual void(int, int) SetSize;
|
||||
virtual void(void(int val) func) SetChanged;
|
||||
virtual string(int) GetItem;
|
||||
virtual void(int, string) SetItem;
|
||||
virtual void(int i) SetSelected;
|
||||
virtual string() GetSelectedItem;
|
||||
virtual int() GetSelected;
|
||||
virtual int() GetCount;
|
||||
};
|
||||
|
||||
void CListBox::CListBox(void)
|
||||
|
|
@ -134,6 +137,17 @@ int CListBox::GetSelected(void)
|
|||
return m_selected;
|
||||
}
|
||||
|
||||
string CListBox::GetItem(int i)
|
||||
{
|
||||
return m_entries[i];
|
||||
}
|
||||
|
||||
void CListBox::SetItem(int i, string s)
|
||||
{
|
||||
m_entries[i] = s;
|
||||
}
|
||||
|
||||
|
||||
string CListBox::GetSelectedItem(void)
|
||||
{
|
||||
if (m_selected == -1) {
|
||||
|
|
@ -141,3 +155,8 @@ string CListBox::GetSelectedItem(void)
|
|||
}
|
||||
return m_entries[m_selected];
|
||||
}
|
||||
|
||||
int CListBox::GetCount(void)
|
||||
{
|
||||
return m_count;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue