Bläddra i källkod

add ctrl support for x11 demos

Jimmi Holst Christensen 6 år sedan
förälder
incheckning
7fafcb3ac7

+ 1 - 0
demo/x11/nuklear_xlib.h

@@ -704,6 +704,7 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt)
         int ret, down = (evt->type == KeyPress);
         KeySym *code = XGetKeyboardMapping(xlib.surf->dpy, (KeyCode)evt->xkey.keycode, 1, &ret);
         if (*code == XK_Shift_L || *code == XK_Shift_R) nk_input_key(ctx, NK_KEY_SHIFT, down);
+        else if (*code == XK_Control_L || *code == XK_Control_R) nk_input_key(ctx, NK_KEY_CTRL, down);
         else if (*code == XK_Delete)    nk_input_key(ctx, NK_KEY_DEL, down);
         else if (*code == XK_Return)    nk_input_key(ctx, NK_KEY_ENTER, down);
         else if (*code == XK_Tab)       nk_input_key(ctx, NK_KEY_TAB, down);

+ 1 - 0
demo/x11_opengl2/nuklear_xlib_gl2.h

@@ -249,6 +249,7 @@ nk_x11_handle_event(XEvent *evt)
         int ret, down = (evt->type == KeyPress);
         KeySym *code = XGetKeyboardMapping(x11.dpy, (KeyCode)evt->xkey.keycode, 1, &ret);
         if (*code == XK_Shift_L || *code == XK_Shift_R) nk_input_key(ctx, NK_KEY_SHIFT, down);
+        else if (*code == XK_Control_L || *code == XK_Control_R) nk_input_key(ctx, NK_KEY_CTRL, down);
         else if (*code == XK_Delete)    nk_input_key(ctx, NK_KEY_DEL, down);
         else if (*code == XK_Return)    nk_input_key(ctx, NK_KEY_ENTER, down);
         else if (*code == XK_Tab)       nk_input_key(ctx, NK_KEY_TAB, down);

+ 1 - 0
demo/x11_opengl3/nuklear_xlib_gl3.h

@@ -618,6 +618,7 @@ nk_x11_handle_event(XEvent *evt)
         int ret, down = (evt->type == KeyPress);
         KeySym *code = XGetKeyboardMapping(x11.dpy, (KeyCode)evt->xkey.keycode, 1, &ret);
         if (*code == XK_Shift_L || *code == XK_Shift_R) nk_input_key(ctx, NK_KEY_SHIFT, down);
+        else if (*code == XK_Control_L || *code == XK_Control_R) nk_input_key(ctx, NK_KEY_CTRL, down);
         else if (*code == XK_Delete)    nk_input_key(ctx, NK_KEY_DEL, down);
         else if (*code == XK_Return)    nk_input_key(ctx, NK_KEY_ENTER, down);
         else if (*code == XK_Tab)       nk_input_key(ctx, NK_KEY_TAB, down);

+ 1 - 0
demo/x11_rawfb/nuklear_xlib.h

@@ -175,6 +175,7 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt, struct r
         int ret, down = (evt->type == KeyPress);
         KeySym *code = XGetKeyboardMapping(xlib.dpy, (KeyCode)evt->xkey.keycode, 1, &ret);
         if (*code == XK_Shift_L || *code == XK_Shift_R) nk_input_key(&rawfb->ctx, NK_KEY_SHIFT, down);
+        else if (*code == XK_Control_L || *code == XK_Control_R) nk_input_key(&rawfb->ctx, NK_KEY_CTRL, down);
         else if (*code == XK_Delete)    nk_input_key(&rawfb->ctx, NK_KEY_DEL, down);
         else if (*code == XK_Return)    nk_input_key(&rawfb->ctx, NK_KEY_ENTER, down);
         else if (*code == XK_Tab)       nk_input_key(&rawfb->ctx, NK_KEY_TAB, down);

+ 1 - 0
demo/x11_xft/nuklear_xlib.h

@@ -782,6 +782,7 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt)
         int ret, down = (evt->type == KeyPress);
         KeySym *code = XGetKeyboardMapping(xlib.surf->dpy, (KeyCode)evt->xkey.keycode, 1, &ret);
         if (*code == XK_Shift_L || *code == XK_Shift_R) nk_input_key(ctx, NK_KEY_SHIFT, down);
+        else if (*code == XK_Control_L || *code == XK_Control_R) nk_input_key(ctx, NK_KEY_CTRL, down);
         else if (*code == XK_Delete)    nk_input_key(ctx, NK_KEY_DEL, down);
         else if (*code == XK_Return)    nk_input_key(ctx, NK_KEY_ENTER, down);
         else if (*code == XK_Tab)       nk_input_key(ctx, NK_KEY_TAB, down);