Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion demo/allegro5/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ int main(void)
al_register_event_source(event_queue, al_get_mouse_event_source());
al_register_event_source(event_queue, al_get_keyboard_event_source());

font = nk_allegro5_font_create_from_file("../../../extra_font/Roboto-Regular.ttf", 12, 0);
font = nk_allegro5_font_create_from_file("../../extra_font/Roboto-Regular.ttf", 12, 0);

ctx = nk_allegro5_init(font, display, WINDOW_WIDTH, WINDOW_HEIGHT);

Expand Down
2 changes: 1 addition & 1 deletion demo/allegro5/nuklear_allegro5.h
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ nk_allegro5_handle_event(ALLEGRO_EVENT *ev)

if (kc == ALLEGRO_KEY_LSHIFT || kc == ALLEGRO_KEY_RSHIFT) nk_input_key(ctx, NK_KEY_SHIFT, down);
else if (kc == ALLEGRO_KEY_DELETE) nk_input_key(ctx, NK_KEY_DEL, down);
else if (kc == ALLEGRO_KEY_ENTER) nk_input_key(ctx, NK_KEY_ENTER, down);
else if (kc == ALLEGRO_KEY_ENTER || kc == ALLEGRO_KEY_PAD_ENTER) nk_input_key(ctx, NK_KEY_ENTER, down);
else if (kc == ALLEGRO_KEY_TAB) nk_input_key(ctx, NK_KEY_TAB, down);
else if (kc == ALLEGRO_KEY_LEFT) nk_input_key(ctx, NK_KEY_LEFT, down);
else if (kc == ALLEGRO_KEY_RIGHT) nk_input_key(ctx, NK_KEY_RIGHT, down);
Expand Down
1 change: 1 addition & 0 deletions demo/d3d11/nuklear_d3d11.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ nk_d3d11_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&d3d11.ctx, NK_KEY_ENTER, down);
return 1;

Expand Down
1 change: 1 addition & 0 deletions demo/d3d12/nuklear_d3d12.h
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ nk_d3d12_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&d3d12.ctx, NK_KEY_ENTER, down);
return 1;

Expand Down
1 change: 1 addition & 0 deletions demo/d3d9/nuklear_d3d9.h
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ nk_d3d9_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&d3d9.ctx, NK_KEY_ENTER, down);
return 1;

Expand Down
31 changes: 16 additions & 15 deletions demo/gdi/nuklear_gdi.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@ nk_create_image(struct nk_image * image, const char * frame_buffer, const int wi
image->region[1] = 0;
image->region[2] = width;
image->region[3] = height;

bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
bi.bmiHeader.biWidth = width;
bi.bmiHeader.biHeight = height;
bi.bmiHeader.biPlanes = 1;
bi.bmiHeader.biBitCount = 24;
bi.bmiHeader.biCompression = BI_RGB;
bi.bmiHeader.biSizeImage = row * height;

hbm = CreateDIBSection(NULL, &bi, DIB_RGB_COLORS, (void**)&lpBuf, NULL, 0);

pb = lpBuf + row * height;
for (v = 0; v < height; v++)
{
Expand All @@ -98,7 +98,7 @@ nk_create_image(struct nk_image * image, const char * frame_buffer, const int wi
pb[i + 2] = src[2];
src += 3;
}
}
}
SetDIBits(NULL, hbm, 0, height, lpBuf, &bi, DIB_RGB_COLORS);
image->handle.ptr = hbm;
}
Expand All @@ -122,10 +122,10 @@ nk_gdi_draw_image(short x, short y, unsigned short w, unsigned short h,
HBITMAP hbm = (HBITMAP)img.handle.ptr;
HDC hDCBits;
BITMAP bitmap;

if (!gdi.memory_dc || !hbm)
return;

hDCBits = CreateCompatibleDC(gdi.memory_dc);
GetObject(hbm, sizeof(BITMAP), (LPSTR)&bitmap);
SelectObject(hDCBits, hbm);
Expand Down Expand Up @@ -192,7 +192,7 @@ nk_gdi_stroke_rect(HDC dc, short x, short y, unsigned short w,
}
SelectObject(dc, br);

if (pen) {
if (pen) {
SelectObject(dc, GetStockObject(DC_PEN));
DeleteObject(pen);
}
Expand Down Expand Up @@ -470,7 +470,7 @@ nk_gdi_stroke_circle(HDC dc, short x, short y, unsigned short w,
pen = CreatePen(PS_SOLID, line_thickness, color);
SelectObject(dc, pen);
}

HGDIOBJ br = SelectObject(dc, GetStockObject(NULL_BRUSH));
SetDCBrushColor(dc, OPAQUE);
Ellipse(dc, x, y, x + w, y + h);
Expand Down Expand Up @@ -524,7 +524,7 @@ nk_gdi_draw_text(HDC dc, short x, short y, unsigned short w, unsigned short h,
wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0);
wstr = (WCHAR*)_alloca(wsize * sizeof(wchar_t));
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);

SetBkMode(dc, TRANSPARENT); /* Transparent Text Background */
SetBkColor(dc, convert_color(cbg));
SetTextColor(dc, convert_color(cfg));
Expand Down Expand Up @@ -599,14 +599,14 @@ nk_gdi_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
(void)usr;
if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL))
{
HGLOBAL mem = GetClipboardData(CF_UNICODETEXT);
HGLOBAL mem = GetClipboardData(CF_UNICODETEXT);
if (mem)
{
SIZE_T size = GlobalSize(mem) - 1;
if (size)
{
LPCWSTR wstr = (LPCWSTR)GlobalLock(mem);
if (wstr)
if (wstr)
{
int utf8size = WideCharToMultiByte(CP_UTF8, 0, wstr, (int)(size / sizeof(wchar_t)), NULL, 0, NULL, NULL);
if (utf8size)
Expand All @@ -619,7 +619,7 @@ nk_gdi_clipboard_paste(nk_handle usr, struct nk_text_edit *edit)
free(utf8);
}
}
GlobalUnlock(mem);
GlobalUnlock(mem);
}
}
}
Expand All @@ -643,9 +643,9 @@ nk_gdi_clipboard_copy(nk_handle usr, const char *text, int len)
{
MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize);
wstr[wsize] = 0;
GlobalUnlock(mem);
GlobalUnlock(mem);

SetClipboardData(CF_UNICODETEXT, mem);
SetClipboardData(CF_UNICODETEXT, mem);
}
}
}
Expand Down Expand Up @@ -734,6 +734,7 @@ nk_gdi_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&gdi.ctx, NK_KEY_ENTER, down);
return 1;

Expand Down Expand Up @@ -776,7 +777,7 @@ nk_gdi_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
case VK_PRIOR:
nk_input_key(&gdi.ctx, NK_KEY_SCROLL_UP, down);
return 1;

case 'A':
if (ctrl) {
nk_input_key(&gdi.ctx, NK_KEY_TEXT_SELECT_ALL, down);
Expand Down
5 changes: 3 additions & 2 deletions demo/gdi_native_nuklear/nuklear_gdi.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
* Nuklear - 1.32.0 - public domain
* no warrenty implied; use at your own risk.
* authored from 2015-2016 by Micha Mettke
*
*
* Modified GDI backend 2022
* Now based on a context that is required for each API function call.
* Removes the global state --> you can have multiple windows :-)
*
*
*/
/*
* ==============================================================
Expand Down Expand Up @@ -698,6 +698,7 @@ nk_gdi_handle_event(nk_gdi_ctx gdi, HWND wnd, UINT msg, WPARAM wparam, LPARAM lp
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&gdi->ctx, NK_KEY_ENTER, down);
return 1;

Expand Down
33 changes: 17 additions & 16 deletions demo/gdip/nuklear_gdip.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ typedef enum {
StringFormatFlagsMeasureTrailingSpaces = 0x00000800,
StringFormatFlagsNoWrap = 0x00001000,
StringFormatFlagsLineLimit = 0x00002000,
StringFormatFlagsNoClip = 0x00004000
StringFormatFlagsNoClip = 0x00004000
} StringFormatFlags;

typedef enum
Expand Down Expand Up @@ -272,25 +272,25 @@ GdipSetStringFormatFlags(GpStringFormat *format, INT flags);
GpStatus WINGDIPAPI
GdipDeleteStringFormat(GpStringFormat *format);

GpStatus WINGDIPAPI
GdipPrivateAddMemoryFont(GpFontCollection* fontCollection,
GpStatus WINGDIPAPI
GdipPrivateAddMemoryFont(GpFontCollection* fontCollection,
GDIPCONST void* memory, INT length);

GpStatus WINGDIPAPI
GdipPrivateAddFontFile(GpFontCollection* fontCollection,
GpStatus WINGDIPAPI
GdipPrivateAddFontFile(GpFontCollection* fontCollection,
GDIPCONST WCHAR* filename);

GpStatus WINGDIPAPI
GpStatus WINGDIPAPI
GdipNewPrivateFontCollection(GpFontCollection** fontCollection);

GpStatus WINGDIPAPI
GpStatus WINGDIPAPI
GdipDeletePrivateFontCollection(GpFontCollection** fontCollection);

GpStatus WINGDIPAPI
GdipGetFontCollectionFamilyList(GpFontCollection* fontCollection,
GpStatus WINGDIPAPI
GdipGetFontCollectionFamilyList(GpFontCollection* fontCollection,
INT numSought, GpFontFamily* gpfamilies[], INT* numFound);

GpStatus WINGDIPAPI
GpStatus WINGDIPAPI
GdipGetFontCollectionFamilyCount(GpFontCollection* fontCollection, INT* numFound);


Expand Down Expand Up @@ -374,8 +374,8 @@ GdipGraphicsClear(GpGraphics *graphics, ARGB color);
GpStatus WINGDIPAPI
GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, INT y);

GpStatus WINGDIPAPI
GdipDrawImageRectI(GpGraphics *graphics, GpImage *image, INT x, INT y,
GpStatus WINGDIPAPI
GdipDrawImageRectI(GpGraphics *graphics, GpImage *image, INT x, INT y,
INT width, INT height);

GpStatus WINGDIPAPI
Expand Down Expand Up @@ -673,7 +673,7 @@ nk_gdip_load_image_from_memory(const void *membuf, nk_uint membufSize)
IStream *stream = SHCreateMemStream((const BYTE*)membuf, membufSize);
if (!stream)
return nk_image_id(0);

status = GdipLoadImageFromStream(stream, &image);
stream->lpVtbl->Release(stream);

Expand Down Expand Up @@ -709,7 +709,7 @@ nk_gdipfont_create(const char *name, int size)
return font;
}

GpFontCollection*
GpFontCollection*
nk_gdip_getCurFontCollection(){
return gdip.fontCollection[gdip.curFontCollection];
}
Expand Down Expand Up @@ -744,7 +744,7 @@ nk_gdipfont_create_from_file(const WCHAR* filename, int size)
{
if( !nk_gdip_getCurFontCollection() )
if( GdipNewPrivateFontCollection(&gdip.fontCollection[gdip.curFontCollection]) ) return NULL;
if( GdipPrivateAddFontFile(nk_gdip_getCurFontCollection(), filename) ) return NULL;
if( GdipPrivateAddFontFile(nk_gdip_getCurFontCollection(), filename) ) return NULL;
return nk_gdipfont_create_from_collection(size);
}

Expand Down Expand Up @@ -849,7 +849,7 @@ nk_gdip_init(HWND hwnd, unsigned int width, unsigned int height)
GdipCreatePen1(0, 1.0f, UnitPixel, &gdip.pen);
GdipCreateSolidFill(0, &gdip.brush);
GdipStringFormatGetGenericTypographic(&gdip.format);
GdipSetStringFormatFlags(gdip.format, StringFormatFlagsNoFitBlackBox |
GdipSetStringFormatFlags(gdip.format, StringFormatFlagsNoFitBlackBox |
StringFormatFlagsMeasureTrailingSpaces | StringFormatFlagsNoWrap |
StringFormatFlagsNoClip);

Expand Down Expand Up @@ -924,6 +924,7 @@ nk_gdip_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam)
return 1;

case VK_RETURN:
case VK_SEPARATOR:
nk_input_key(&gdip.ctx, NK_KEY_ENTER, down);
return 1;

Expand Down
2 changes: 1 addition & 1 deletion demo/glfw_opengl2/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
/* #define INCLUDE_CALCULATOR */
/* #define INCLUDE_CANVAS */
/* #define INCLUDE_FILE_BROWSER */
/* #define INCLUDE_OVERVIEW */
#define INCLUDE_OVERVIEW
/* #define INCLUDE_CONFIGURATOR */
/* #define INCLUDE_NODE_EDITOR */

Expand Down
4 changes: 3 additions & 1 deletion demo/glfw_opengl2/nuklear_glfw_gl2.h
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,9 @@ nk_glfw3_new_frame(void)
glfwSetInputMode(glfw.win, GLFW_CURSOR, GLFW_CURSOR_NORMAL);

nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);

nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);
Expand Down
4 changes: 3 additions & 1 deletion demo/glfw_opengl3/nuklear_glfw_gl3.h
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,9 @@ nk_glfw3_new_frame(struct nk_glfw* glfw)
#endif

nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);

nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);
Expand Down
2 changes: 1 addition & 1 deletion demo/glfw_opengl4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BIN = demo

# Flags
CFLAGS += -std=c89 -Wall -Wextra -pedantic
CFLAGS += -g -std=c89 -Wall -Wextra -pedantic

SRC = main.c
OBJ = $(SRC:.c=.o)
Expand Down
4 changes: 3 additions & 1 deletion demo/glfw_opengl4/nuklear_glfw_gl4.h
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,9 @@ nk_glfw3_new_frame(void)
#endif

nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);

nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);
Expand Down
2 changes: 1 addition & 1 deletion demo/glfw_vulkan/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/*#define INCLUDE_STYLE */
/*#define INCLUDE_CALCULATOR */
/*#define INCLUDE_CANVAS */
/*#define INCLUDE_OVERVIEW*/
#define INCLUDE_OVERVIEW
/*#define INCLUDE_CONFIGURATOR */
/*#define INCLUDE_NODE_EDITOR */

Expand Down
4 changes: 3 additions & 1 deletion demo/glfw_vulkan/nuklear_glfw_vulkan.h
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,9 @@ NK_API void nk_glfw3_new_frame(void) {
nk_input_key(ctx, NK_KEY_DEL,
glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_ENTER,
glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);

nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
nk_input_key(ctx, NK_KEY_BACKSPACE,
glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
Expand Down
2 changes: 1 addition & 1 deletion demo/sfml_opengl2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else
ifeq ($(UNAME_S),Darwin)
LIBS = -lsfml-window -lsfml-system -pthread -framework OpenGL
else
LIBS = -DSFML_STATIC -lsfml-window-s -lsfml-system-s -pthread -ludev -lGL -lX11 -lXrandr
LIBS = -DSFML_STATIC -lsfml-window -lsfml-system -pthread -ludev -lGL -lX11 -lXrandr
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion demo/sfml_opengl2/nuklear_sfml_gl2.h
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ nk_sfml_handle_event(sf::Event* evt)
nk_input_key(ctx, NK_KEY_SHIFT, down);
else if(key == sf::Keyboard::Delete)
nk_input_key(ctx, NK_KEY_DEL, down);
else if(key == sf::Keyboard::Return)
else if(key == sf::Keyboard::Enter)
nk_input_key(ctx, NK_KEY_ENTER, down);
else if(key == sf::Keyboard::Tab)
nk_input_key(ctx, NK_KEY_TAB, down);
Expand Down
2 changes: 1 addition & 1 deletion demo/sfml_opengl3/nuklear_sfml_gl3.h
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ nk_sfml_handle_event(sf::Event* evt)
nk_input_key(ctx, NK_KEY_SHIFT, down);
else if(key == sf::Keyboard::Delete)
nk_input_key(ctx, NK_KEY_DEL, down);
else if(key == sf::Keyboard::Return)
else if(key == sf::Keyboard::Enter)
nk_input_key(ctx, NK_KEY_ENTER, down);
else if(key == sf::Keyboard::Tab)
nk_input_key(ctx, NK_KEY_TAB, down);
Expand Down
2 changes: 1 addition & 1 deletion demo/x11/nuklear_xlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ nk_xlib_handle_event(Display *dpy, int screen, Window win, XEvent *evt)
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_Return || *code == XK_KP_Enter) nk_input_key(ctx, NK_KEY_ENTER, down);
else if (*code == XK_Tab) nk_input_key(ctx, NK_KEY_TAB, down);
else if (*code == XK_Left) nk_input_key(ctx, NK_KEY_LEFT, down);
else if (*code == XK_Right) nk_input_key(ctx, NK_KEY_RIGHT, down);
Expand Down
Loading