edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed so that menus doesn't use inp_get_event. fixes the gui key binder

Browse source
This commit is contained in:
Magnus Auvinen 2008-08-30 09:28:31 +00:00
parent 9672fe674f
commit dfe7cb1579
4 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/components/chat.cpp
View file

@ -52,7 +52,9 @@ bool CHAT::on_input(INPUT_EVENT e)
if(mode == MODE_NONE)
return false;
if(e.flags&INPFLAG_PRESS && (e.key == KEY_ENTER || e.key == KEY_KP_ENTER))
if(e.flags&INPFLAG_PRESS && e.key == KEY_ESC)
mode = MODE_NONE;
else if(e.flags&INPFLAG_PRESS && (e.key == KEY_ENTER || e.key == KEY_KP_ENTER))
{
if(input.get_string()[0])
gameclient.chat->say(mode == MODE_ALL ? 0 : 1, input.get_string());

24
src/game/client/components/menus.cpp
View file

@ -38,6 +38,10 @@ vec4 MENUS::color_tabbar_inactive_ingame;
vec4 MENUS::color_tabbar_active_ingame;
INPUT_EVENT MENUS::inputevents[MAX_INPUTEVENTS];
int MENUS::num_inputevents;
MENUS::MENUS()
{
popup = POPUP_NONE;
@ -46,6 +50,7 @@ MENUS::MENUS()
need_restart = false;
menu_active = true;
num_inputevents = 0;
}
vec4 MENUS::button_color_mul(const void *id)
@ -188,9 +193,9 @@ int MENUS::ui_do_edit_box(void *id, const RECT *rect, char *str, int str_size, f
}
}
for(int i = 0; i < inp_num_events(); i++)
for(int i = 0; i < num_inputevents; i++)
{
INPUT_EVENT e = inp_get_event(i);
INPUT_EVENT e = inputevents[i];
char c = e.ch;
int k = e.key;
@ -403,15 +408,15 @@ int MENUS::ui_do_key_reader(void *id, const RECT *rect, int key)
if(ui_active_item() == id)
{
for(int i = 0; i < inp_num_events(); i++)
for(int i = 0; i < num_inputevents; i++)
{
INPUT_EVENT e = inp_get_event(i);
INPUT_EVENT e = inputevents[i];
if(e.flags&INPFLAG_PRESS && e.key && e.key != KEY_ESC)
{
new_key = e.key;
ui_set_active_item(0);
mouse_released = false;
inp_clear_events();
num_inputevents = 0;
break;
}
}
@ -955,8 +960,6 @@ bool MENUS::on_mousemove(float x, float y)
bool MENUS::on_input(INPUT_EVENT e)
{
// if(e.)
//
if(e.flags&INPFLAG_PRESS && e.key == KEY_ESC)
{
menu_active = !menu_active;
@ -964,7 +967,11 @@ bool MENUS::on_input(INPUT_EVENT e)
}
if(menu_active)
{
if(num_inputevents < MAX_INPUTEVENTS)
inputevents[num_inputevents++] = e;
return true;
}
return false;
}
@ -1002,7 +1009,7 @@ void MENUS::on_render()
if(!menu_active)
return;
// update colors
vec3 rgb = hsl_to_rgb(vec3(config.ui_color_hue/255.0f, config.ui_color_sat/255.0f, config.ui_color_lht/255.0f));
gui_color = vec4(rgb.r, rgb.g, rgb.b, config.ui_color_alpha/255.0f);
@ -1059,4 +1066,5 @@ void MENUS::on_render()
gfx_text_ex(&cursor, buf, -1);
}
num_inputevents = 0;
}

5
src/game/client/components/menus.hpp
View file

@ -60,6 +60,11 @@ class MENUS : public COMPONENT
int active_page;
bool menu_active;
vec2 mouse_pos;
// TODO: this is a bit ugly but.. well.. yeah
enum { MAX_INPUTEVENTS = 32 };
static INPUT_EVENT inputevents[MAX_INPUTEVENTS];
static int num_inputevents;
// for graphic settings
bool need_restart;

2
src/game/client/gameclient.cpp
View file

@ -102,9 +102,9 @@ void GAMECLIENT::on_init()
// build the input stack
input.add(console);
input.add(chat); // chat has higher prio due to tha you can quit it by pressing esc
input.add(motd); // for pressing esc to remove it
input.add(menus);
input.add(chat);
input.add(&emoticon);
input.add(controls);
input.add(binds);