mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

input debug working, fixed frame waster in gui

master
Allen Webster 2016-06-07 13:22:42 -04:00
parent 48eeb211ae
commit e49249c7e4
5 changed files with 95 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
4coder_custom.h
View File

@ -31,6 +31,7 @@ typedef enum{
MDFR_CONTROL_INDEX, MDFR_CONTROL_INDEX,
MDFR_ALT_INDEX, MDFR_ALT_INDEX,
MDFR_CAPS_INDEX, MDFR_CAPS_INDEX,
MDFR_HOLD_INDEX,
// always last // always last
MDFR_INDEX_COUNT MDFR_INDEX_COUNT
} Key_Control; } Key_Control;

29
4ed.cpp
View File

@ -3559,9 +3559,36 @@ App_Step_Sig(app_step){
} }
} }
// NOTE(allen): Keyboard input to command coroutine. // NOTE(allen): Pass keyboard events to debug
Available_Input available_input = init_available_input(&key_summary, &input->mouse); Available_Input available_input = init_available_input(&key_summary, &input->mouse);
#if FRED_INTERNAL
{
Debug_Data *debug = &models->debug;
Key_Summary key_data = get_key_data(&available_input);
Debug_Input_Event *events = debug->input_events;
i32 count = key_data.count;
i32 preserved_inputs = ArrayCount(debug->input_events) - count;
memmove(events + count, events,
sizeof(Debug_Input_Event)*preserved_inputs);
for (i32 i = 0; i < key_data.count; ++i){
Key_Event_Data key = get_single_key(&key_data, i);
events[i].key = key.keycode;
events[i].is_hold = key.modifiers[MDFR_HOLD_INDEX];
events[i].is_ctrl = key.modifiers[MDFR_CONTROL_INDEX];
events[i].is_alt = key.modifiers[MDFR_ALT_INDEX];
events[i].is_shift = key.modifiers[MDFR_SHIFT_INDEX];
}
}
#endif
// NOTE(allen): Keyboard input to command coroutine.
if (models->command_coroutine != 0){ if (models->command_coroutine != 0){
Coroutine *command_coroutine = models->command_coroutine; Coroutine *command_coroutine = models->command_coroutine;
u32 get_flags = models->command_coroutine_flags[0]; u32 get_flags = models->command_coroutine_flags[0];

24
4ed_file_view.cpp
View File

@ -4466,6 +4466,7 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
} }
}break; }break;
#if FRED_INTERNAL
case VUI_Debug: case VUI_Debug:
{ {
view->current_scroll = &view->gui_scroll; view->current_scroll = &view->gui_scroll;
@ -4487,7 +4488,7 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
string.size = 0; string.size = 0;
u64 time = system->now_time_stamp(); u64 time = system->now_time_stamp();
append(&string, "last event time stamp: "); append(&string, "last redraw: ");
append_u64_to_str(&string, time); append_u64_to_str(&string, time);
gui_do_text_field(target, string, empty_str); gui_do_text_field(target, string, empty_str);
@ -4547,20 +4548,35 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
append(&string, " "); append(&string, " ");
} }
if (input_event->key >= ' ' && input_event->key <= '~'){ if (input_event->key > ' ' && input_event->key <= '~'){
append(&string, make_string(&input_event->key, 1)); append(&string, make_string(&input_event->key, 1));
} }
else if (input_event->key == ' '){
append(&string, "space");
}
else if (input_event->key == '\n'){
append(&string, "\\n");
}
else if (input_event->key == '\t'){
append(&string, "\\t");
}
else{ else{
String str; String str;
str.str = global_key_name(input_event->key, &str.size); str.str = global_key_name(input_event->key, &str.size);
str.memory_size = str.size + 1; if (str.str){
append(&string, str); str.memory_size = str.size + 1;
append(&string, str);
}
else{
append(&string, "unrecognized!");
}
} }
gui_do_text_field(target, string, empty_str); gui_do_text_field(target, string, empty_str);
} }
} }
}break; }break;
#endif
} }
} }
} }

13
4ed_gui.cpp
View File

@ -490,8 +490,10 @@ gui_begin_list(GUI_Target *target, GUI_id id, i32 list_i,
} }
} }
if (list_i < list_min || list_i >= list_max){ if (list_max > 0){
result = 1; if (list_i < list_min || list_i >= list_max){
result = 1;
}
} }
if (result){ if (result){
@ -500,7 +502,12 @@ gui_begin_list(GUI_Target *target, GUI_id id, i32 list_i,
gui_update_adjustment(update, list_min); gui_update_adjustment(update, list_min);
} }
else if (list_i >= list_max){ else if (list_i >= list_max){
gui_update_adjustment(update, list_max - 1); if (list_max > 0){
gui_update_adjustment(update, list_max - 1);
}
else{
gui_update_adjustment(update, 0);
}
} }
if (target->has_list_index_position){ if (target->has_list_index_position){
gui_update_position(update, target->list_index_position); gui_update_position(update, target->list_index_position);

70
win32_4ed.cpp
View File

@ -1420,7 +1420,7 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
switch (uMsg){ switch (uMsg){
case WM_MENUCHAR: case WM_MENUCHAR:
case WM_SYSCHAR:break; case WM_SYSCHAR:break;
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_SYSKEYUP: case WM_SYSKEYUP:
case WM_KEYDOWN: case WM_KEYDOWN:
@ -1436,59 +1436,59 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
b8 *control_keys = 0; b8 *control_keys = 0;
controls = &win32vars.input_chunk.pers.controls; controls = &win32vars.input_chunk.pers.controls;
control_keys = win32vars.input_chunk.pers.control_keys; control_keys = win32vars.input_chunk.pers.control_keys;
b8 down = ((lParam & Bit_31)?(0):(1)); b8 down = ((lParam & Bit_31)?(0):(1));
b8 is_right = ((lParam & Bit_24)?(1):(0)); b8 is_right = ((lParam & Bit_24)?(1):(0));
if (wParam != 255){ if (wParam != 255){
switch (wParam){ switch (wParam){
case VK_SHIFT: case VK_SHIFT:
{ {
control_keys[MDFR_SHIFT_INDEX] = down; control_keys[MDFR_SHIFT_INDEX] = down;
}break; }break;
case VK_CONTROL: case VK_CONTROL:
{ {
if (is_right) controls->r_ctrl = down; if (is_right) controls->r_ctrl = down;
else controls->l_ctrl = down; else controls->l_ctrl = down;
}break; }break;
case VK_MENU: case VK_MENU:
{ {
if (is_right) controls->r_alt = down; if (is_right) controls->r_alt = down;
else controls->l_alt = down; else controls->l_alt = down;
}break; }break;
} }
b8 ctrl, alt; b8 ctrl, alt;
ctrl = (controls->r_ctrl || (controls->l_ctrl && !controls->r_alt)); ctrl = (controls->r_ctrl || (controls->l_ctrl && !controls->r_alt));
alt = (controls->l_alt || (controls->r_alt && !controls->l_ctrl)); alt = (controls->l_alt || (controls->r_alt && !controls->l_ctrl));
if (win32vars.lctrl_lalt_is_altgr){ if (win32vars.lctrl_lalt_is_altgr){
if (controls->l_alt && controls->l_ctrl){ if (controls->l_alt && controls->l_ctrl){
ctrl = 0; ctrl = 0;
alt = 0; alt = 0;
} }
} }
control_keys[MDFR_CONTROL_INDEX] = ctrl; control_keys[MDFR_CONTROL_INDEX] = ctrl;
control_keys[MDFR_ALT_INDEX] = alt; control_keys[MDFR_ALT_INDEX] = alt;
} }
}break; }break;
default: default:
b8 previous_state, current_state; b8 previous_state, current_state;
previous_state = ((lParam & Bit_30)?(1):(0)); previous_state = ((lParam & Bit_30)?(1):(0));
current_state = ((lParam & Bit_31)?(0):(1)); current_state = ((lParam & Bit_31)?(0):(1));
if (current_state){ if (current_state){
u8 key = keycode_lookup_table[(u8)wParam]; u8 key = keycode_lookup_table[(u8)wParam];
i32 *count = 0; i32 *count = 0;
Key_Event_Data *data = 0; Key_Event_Data *data = 0;
b8 *control_keys = 0; b8 *control_keys = 0;
i32 control_keys_size = 0; i32 control_keys_size = 0;
if (!previous_state){ if (!previous_state){
count = &win32vars.input_chunk.trans.key_data.press_count; count = &win32vars.input_chunk.trans.key_data.press_count;
data = win32vars.input_chunk.trans.key_data.press; data = win32vars.input_chunk.trans.key_data.press;
@ -1532,12 +1532,13 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
result2 = 0; result2 = 0;
} }
// TODO(allen): This is becoming a really major issue. Apparently // TODO(allen): This is becoming a really major issue.
// control + i outputs a '\t' which is VALID ascii according to this system. // Apparently control + i outputs a '\t' which is VALID ascii
// So it reports the key as '\t'. This wasn't an issue before because we were // according to this system. So it reports the key as '\t'.
// ignoring control when computing character_no_caps_lock which is what // This wasn't an issue before because we were ignoring control
// is used for commands. But that is incorrect for some keyboard layouts where // when computing character_no_caps_lock which is what is used
// control+alt is used to signal AltGr for important keys. // for commands. But that is incorrect for some keyboard layouts
// where control+alt is used to signal AltGr for important keys.
if (result1 && result2){ if (result1 && result2){
char c1 = char_to_upper((char)x1); char c1 = char_to_upper((char)x1);
char cParam = char_to_upper((char)wParam); char cParam = char_to_upper((char)wParam);
@ -1549,7 +1550,7 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
result1 = 0; result1 = 0;
} }
} }
if (result1){ if (result1){
x = x1; x = x1;
state[VK_CONTROL] = control_state; state[VK_CONTROL] = control_state;
@ -1595,6 +1596,7 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
data[*count].keycode = key; data[*count].keycode = key;
} }
memcpy(data[*count].modifiers, control_keys, control_keys_size); memcpy(data[*count].modifiers, control_keys, control_keys_size);
data[*count].modifiers[MDFR_HOLD_INDEX] = previous_state;
++(*count); ++(*count);
} }
} }
@ -1607,16 +1609,16 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
{ {
i32 new_x = LOWORD(lParam); i32 new_x = LOWORD(lParam);
i32 new_y = HIWORD(lParam); i32 new_y = HIWORD(lParam);
if (new_x != win32vars.input_chunk.pers.mouse_x if (new_x != win32vars.input_chunk.pers.mouse_x
|| new_y != win32vars.input_chunk.pers.mouse_y){ || new_y != win32vars.input_chunk.pers.mouse_y){
win32vars.input_chunk.pers.mouse_x = new_x; win32vars.input_chunk.pers.mouse_x = new_x;
win32vars.input_chunk.pers.mouse_y = new_y; win32vars.input_chunk.pers.mouse_y = new_y;
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
} }
}break; }break;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
@ -1628,58 +1630,58 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
win32vars.input_chunk.trans.mouse_wheel = -1; win32vars.input_chunk.trans.mouse_wheel = -1;
} }
}break; }break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.trans.mouse_l_press = 1; win32vars.input_chunk.trans.mouse_l_press = 1;
win32vars.input_chunk.pers.mouse_l = 1; win32vars.input_chunk.pers.mouse_l = 1;
}break; }break;
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.trans.mouse_r_press = 1; win32vars.input_chunk.trans.mouse_r_press = 1;
win32vars.input_chunk.pers.mouse_r = 1; win32vars.input_chunk.pers.mouse_r = 1;
}break; }break;
case WM_LBUTTONUP: case WM_LBUTTONUP:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.trans.mouse_l_release = 1; win32vars.input_chunk.trans.mouse_l_release = 1;
win32vars.input_chunk.pers.mouse_l = 0; win32vars.input_chunk.pers.mouse_l = 0;
}break; }break;
case WM_RBUTTONUP: case WM_RBUTTONUP:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.trans.mouse_r_release = 1; win32vars.input_chunk.trans.mouse_r_release = 1;
win32vars.input_chunk.pers.mouse_r = 0; win32vars.input_chunk.pers.mouse_r = 0;
}break; }break;
case WM_KILLFOCUS: case WM_KILLFOCUS:
case WM_SETFOCUS: case WM_SETFOCUS:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.pers.mouse_l = 0; win32vars.input_chunk.pers.mouse_l = 0;
win32vars.input_chunk.pers.mouse_r = 0; win32vars.input_chunk.pers.mouse_r = 0;
b8 *control_keys = win32vars.input_chunk.pers.control_keys; b8 *control_keys = win32vars.input_chunk.pers.control_keys;
for (int i = 0; i < MDFR_INDEX_COUNT; ++i) control_keys[i] = 0; for (int i = 0; i < MDFR_INDEX_COUNT; ++i) control_keys[i] = 0;
win32vars.input_chunk.pers.controls = control_keys_zero(); win32vars.input_chunk.pers.controls = control_keys_zero();
}break; }break;
case WM_SIZE: case WM_SIZE:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
if (win32vars.target.handle){ if (win32vars.target.handle){
i32 new_width = LOWORD(lParam); i32 new_width = LOWORD(lParam);
i32 new_height = HIWORD(lParam); i32 new_height = HIWORD(lParam);
Win32Resize(new_width, new_height); Win32Resize(new_width, new_height);
} }
}break; }break;
case WM_PAINT: case WM_PAINT:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
@ -1688,14 +1690,14 @@ Win32Callback(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam){
Win32RedrawScreen(hdc); Win32RedrawScreen(hdc);
EndPaint(hwnd, &ps); EndPaint(hwnd, &ps);
}break; }break;
case WM_CLOSE: case WM_CLOSE:
case WM_DESTROY: case WM_DESTROY:
{ {
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
win32vars.input_chunk.trans.trying_to_kill = 1; win32vars.input_chunk.trans.trying_to_kill = 1;
}break; }break;
case WM_4coder_ANIMATE: case WM_4coder_ANIMATE:
win32vars.got_useful_event = 1; win32vars.got_useful_event = 1;
break; break;