Skip to content

keys: Capture F1-F12, and ALT keys #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobLoach wants to merge 1 commit into
base: master
Choose a base branch
from
Open

keys: Capture F1-F12, and ALT keys #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion demo/allegro5/nuklear_allegro5.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,10 +420,23 @@ nk_allegro5_handle_event(ALLEGRO_EVENT *ev)
int down = ev->type == ALLEGRO_EVENT_KEY_DOWN;

/* do we need this? */
if (kc == ALLEGRO_KEY_LSHIFT || kc == ALLEGRO_KEY_RSHIFT) nk_input_key(ctx, NK_KEY_SHIFT, down);
if (kc == ALLEGRO_KEY_ALT || kc == ALLEGRO_KEY_ALTGR) nk_input_key(ctx, NK_KEY_ALT, down);
else if (kc == ALLEGRO_KEY_LSHIFT || kc == ALLEGRO_KEY_RSHIFT) nk_input_key(ctx, NK_KEY_SHIFT, down);
else if (kc == ALLEGRO_KEY_ESCAPE) nk_input_key(ctx, NK_KEY_TEXT_RESET_MODE, down);
else if (kc == ALLEGRO_KEY_PGUP) nk_input_key(ctx, NK_KEY_SCROLL_UP, down);
else if (kc == ALLEGRO_KEY_PGDN) nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down);
else if (kc == ALLEGRO_KEY_F1) nk_input_key(ctx, NK_KEY_F1, down);
else if (kc == ALLEGRO_KEY_F2) nk_input_key(ctx, NK_KEY_F2, down);
else if (kc == ALLEGRO_KEY_F3) nk_input_key(ctx, NK_KEY_F3, down);
else if (kc == ALLEGRO_KEY_F4) nk_input_key(ctx, NK_KEY_F4, down);
else if (kc == ALLEGRO_KEY_F5) nk_input_key(ctx, NK_KEY_F5, down);
else if (kc == ALLEGRO_KEY_F6) nk_input_key(ctx, NK_KEY_F6, down);
else if (kc == ALLEGRO_KEY_F7) nk_input_key(ctx, NK_KEY_F7, down);
else if (kc == ALLEGRO_KEY_F8) nk_input_key(ctx, NK_KEY_F8, down);
else if (kc == ALLEGRO_KEY_F9) nk_input_key(ctx, NK_KEY_F9, down);
else if (kc == ALLEGRO_KEY_F10) nk_input_key(ctx, NK_KEY_F10, down);
else if (kc == ALLEGRO_KEY_F11) nk_input_key(ctx, NK_KEY_F11, down);
else if (kc == ALLEGRO_KEY_F12) nk_input_key(ctx, NK_KEY_F12, down);
else if (kc == ALLEGRO_KEY_INSERT) {
if (down) insert_toggle = !insert_toggle;
if (insert_toggle) {
Expand Down
41 changes: 41 additions & 0 deletions demo/d3d11/nuklear_d3d11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,47 @@ nk_d3d11_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
nk_input_key(&d3d11.ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&d3d11.ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&d3d11.ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&d3d11.ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&d3d11.ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&d3d11.ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&d3d11.ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&d3d11.ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&d3d11.ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&d3d11.ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&d3d11.ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&d3d11.ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&d3d11.ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&d3d11.ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
41 changes: 41 additions & 0 deletions demo/d3d12/nuklear_d3d12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,47 @@ nk_d3d12_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
nk_input_key(&d3d12.ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&d3d12.ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&d3d12.ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&d3d12.ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&d3d12.ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&d3d12.ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&d3d12.ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&d3d12.ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&d3d12.ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&d3d12.ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&d3d12.ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&d3d12.ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&d3d12.ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&d3d12.ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
41 changes: 41 additions & 0 deletions demo/d3d9/nuklear_d3d9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,47 @@ nk_d3d9_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
nk_input_key(&d3d9.ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&d3d9.ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&d3d9.ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&d3d9.ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&d3d9.ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&d3d9.ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&d3d9.ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&d3d9.ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&d3d9.ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&d3d9.ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&d3d9.ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&d3d9.ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&d3d9.ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&d3d9.ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
41 changes: 41 additions & 0 deletions demo/gdi/nuklear_gdi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,47 @@ nk_gdi_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
nk_input_key(&gdi.ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&gdi.ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&gdi.ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&gdi.ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&gdi.ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&gdi.ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&gdi.ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&gdi.ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&gdi.ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&gdi.ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&gdi.ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&gdi.ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&gdi.ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&gdi.ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
41 changes: 41 additions & 0 deletions demo/gdi_native_nuklear/nuklear_gdi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,47 @@ nk_gdi_handle_event(nk_gdi_ctx gdi, HWND wnd, UINT msg, WPARAM wparam, LPARAM lp
nk_input_key(&gdi->ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&gdi->ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&gdi->ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&gdi->ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&gdi->ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&gdi->ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&gdi->ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&gdi->ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&gdi->ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&gdi->ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&gdi->ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&gdi->ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&gdi->ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&gdi->ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
41 changes: 41 additions & 0 deletions demo/gdip/nuklear_gdip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,47 @@ nk_gdip_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
nk_input_key(&gdip.ctx, NK_KEY_TEXT_RESET_MODE, down);
return 1;

case VK_MENU:
nk_input_key(&gdip.ctx, NK_KEY_ALT, down);
return 1;

case VK_F1:
nk_input_key(&gdip.ctx, NK_KEY_F1, down);
return 1;
case VK_F2:
nk_input_key(&gdip.ctx, NK_KEY_F2, down);
return 1;
case VK_F3:
nk_input_key(&gdip.ctx, NK_KEY_F3, down);
return 1;
case VK_F4:
nk_input_key(&gdip.ctx, NK_KEY_F4, down);
return 1;
case VK_F5:
nk_input_key(&gdip.ctx, NK_KEY_F5, down);
return 1;
case VK_F6:
nk_input_key(&gdip.ctx, NK_KEY_F6, down);
return 1;
case VK_F7:
nk_input_key(&gdip.ctx, NK_KEY_F7, down);
return 1;
case VK_F8:
nk_input_key(&gdip.ctx, NK_KEY_F8, down);
return 1;
case VK_F9:
nk_input_key(&gdip.ctx, NK_KEY_F9, down);
return 1;
case VK_F10:
nk_input_key(&gdip.ctx, NK_KEY_F10, down);
return 1;
case VK_F11:
nk_input_key(&gdip.ctx, NK_KEY_F11, down);
return 1;
case VK_F12:
nk_input_key(&gdip.ctx, NK_KEY_F12, down);
return 1;

case VK_INSERT:
/* Only switch on release to avoid repeat issues
* kind of confusing since we have to negate it but we're already
Expand Down
27 changes: 27 additions & 0 deletions demo/glfw_opengl2/nuklear_glfw_gl2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,22 @@ nk_glfw3_key_callback(GLFWwindow *win, int key, int scancode, int action, int mo
case GLFW_KEY_RIGHT: glfw.key_events[NK_KEY_RIGHT] = a; break;
case GLFW_KEY_ESCAPE: glfw.key_events[NK_KEY_TEXT_RESET_MODE] = a; break;

case GLFW_KEY_LEFT_ALT:
case GLFW_KEY_RIGHT_ALT: glfw.key_events[NK_KEY_ALT] = a; break;
case GLFW_KEY_PAGE_UP: glfw.key_events[NK_KEY_SCROLL_UP] = a; break;
case GLFW_KEY_PAGE_DOWN: glfw.key_events[NK_KEY_SCROLL_DOWN] = a; break;
case GLFW_KEY_F1: glfw.key_events[NK_KEY_F1] = a; break;
case GLFW_KEY_F2: glfw.key_events[NK_KEY_F2] = a; break;
case GLFW_KEY_F3: glfw.key_events[NK_KEY_F3] = a; break;
case GLFW_KEY_F4: glfw.key_events[NK_KEY_F4] = a; break;
case GLFW_KEY_F5: glfw.key_events[NK_KEY_F5] = a; break;
case GLFW_KEY_F6: glfw.key_events[NK_KEY_F6] = a; break;
case GLFW_KEY_F7: glfw.key_events[NK_KEY_F7] = a; break;
case GLFW_KEY_F8: glfw.key_events[NK_KEY_F8] = a; break;
case GLFW_KEY_F9: glfw.key_events[NK_KEY_F9] = a; break;
case GLFW_KEY_F10: glfw.key_events[NK_KEY_F10] = a; break;
case GLFW_KEY_F11: glfw.key_events[NK_KEY_F11] = a; break;
case GLFW_KEY_F12: glfw.key_events[NK_KEY_F12] = a; break;

/* have to add all keys used for nuklear to get correct repeat behavior
* NOTE these are scancodes so your custom layout won't matter unfortunately
Expand Down Expand Up @@ -407,8 +421,21 @@ nk_glfw3_new_frame(void)
if (k_state[NK_KEY_BACKSPACE] >= 0) nk_input_key(ctx, NK_KEY_BACKSPACE, k_state[NK_KEY_BACKSPACE]);
if (k_state[NK_KEY_UP] >= 0) nk_input_key(ctx, NK_KEY_UP, k_state[NK_KEY_UP]);
if (k_state[NK_KEY_DOWN] >= 0) nk_input_key(ctx, NK_KEY_DOWN, k_state[NK_KEY_DOWN]);
if (k_state[NK_KEY_ALT] >= 0) nk_input_key(ctx, NK_KEY_ALT, k_state[NK_KEY_ALT]);
if (k_state[NK_KEY_SCROLL_UP] >= 0) nk_input_key(ctx, NK_KEY_SCROLL_UP, k_state[NK_KEY_SCROLL_UP]);
if (k_state[NK_KEY_SCROLL_DOWN] >= 0) nk_input_key(ctx, NK_KEY_SCROLL_DOWN, k_state[NK_KEY_SCROLL_DOWN]);
if (k_state[NK_KEY_F1] >= 0) nk_input_key(ctx, NK_KEY_F1, k_state[NK_KEY_F1]);
if (k_state[NK_KEY_F2] >= 0) nk_input_key(ctx, NK_KEY_F2, k_state[NK_KEY_F2]);
if (k_state[NK_KEY_F3] >= 0) nk_input_key(ctx, NK_KEY_F3, k_state[NK_KEY_F3]);
if (k_state[NK_KEY_F4] >= 0) nk_input_key(ctx, NK_KEY_F4, k_state[NK_KEY_F4]);
if (k_state[NK_KEY_F5] >= 0) nk_input_key(ctx, NK_KEY_F5, k_state[NK_KEY_F5]);
if (k_state[NK_KEY_F6] >= 0) nk_input_key(ctx, NK_KEY_F6, k_state[NK_KEY_F6]);
if (k_state[NK_KEY_F7] >= 0) nk_input_key(ctx, NK_KEY_F7, k_state[NK_KEY_F7]);
if (k_state[NK_KEY_F8] >= 0) nk_input_key(ctx, NK_KEY_F8, k_state[NK_KEY_F8]);
if (k_state[NK_KEY_F9] >= 0) nk_input_key(ctx, NK_KEY_F9, k_state[NK_KEY_F9]);
if (k_state[NK_KEY_F10] >= 0) nk_input_key(ctx, NK_KEY_F10, k_state[NK_KEY_F10]);
if (k_state[NK_KEY_F11] >= 0) nk_input_key(ctx, NK_KEY_F11, k_state[NK_KEY_F11]);
if (k_state[NK_KEY_F12] >= 0) nk_input_key(ctx, NK_KEY_F12, k_state[NK_KEY_F12]);

if (k_state[NK_KEY_TEXT_INSERT_MODE] >= 0) nk_input_key(ctx, NK_KEY_TEXT_INSERT_MODE, k_state[NK_KEY_TEXT_INSERT_MODE]);
if (k_state[NK_KEY_TEXT_REPLACE_MODE] >= 0) nk_input_key(ctx, NK_KEY_TEXT_REPLACE_MODE, k_state[NK_KEY_TEXT_REPLACE_MODE]);
Expand Down
Loading
Loading