mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for PR inclusion

Browse Source
This commit is contained in:
Richard Gill 2021-05-13 15:22:52 +02:00
parent 14531a23a5
commit 2b886bd2cd
3 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,4 +8,3 @@ docs/src
*.tmp *.tmp
*.swo *.swo
*.swp *.swp
.vscode

12
demo/xcb_cairo/main.c
View File

@ -4,11 +4,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
/*#include <limits.h>*/ #include <limits.h>
/*#include <math.h>*/ #include <math.h>
/*#include <sys/time.h>*/ #include <sys/time.h>
/*#include <unistd.h>*/ #include <unistd.h>
/*#include <time.h>*/ #include <time.h>
#define NK_INCLUDE_FIXED_TYPES #define NK_INCLUDE_FIXED_TYPES
#define NK_INCLUDE_STANDARD_IO #define NK_INCLUDE_STANDARD_IO
@ -17,7 +17,7 @@
#define NK_IMPLEMENTATION #define NK_IMPLEMENTATION
#include "../../nuklear.h" #include "../../nuklear.h"
#define NK_XCB_IMPLEMENTATION #define NK_XCB_CAIRO_IMPLEMENTATION
#include "nuklear_xcb.h" #include "nuklear_xcb.h"
static void die(const char *fmt, ...) static void die(const char *fmt, ...)

20
demo/xcb_cairo/nuklear_xcb.h
View File

@ -35,11 +35,6 @@
#ifndef NK_XCB_CAIRO_H #ifndef NK_XCB_CAIRO_H
#define NK_XCB_CAIRO_H #define NK_XCB_CAIRO_H
/* just to make my IDE happy */
#ifndef NK_NUKLEAR_H_
#include "../../nuklear.h"
#endif
struct nk_xcb_context; struct nk_xcb_context;
struct nk_cairo_context; struct nk_cairo_context;
@ -83,7 +78,7 @@ NK_API void nk_xcb_resize_cairo_surface(struct nk_xcb_context *xcb_ctx, void *su
* *
****************************************************************************/ ****************************************************************************/
/*#ifdef NK_XCB_CAIRO_IMPLEMENTATION*/ #ifdef NK_XCB_CAIRO_IMPLEMENTATION
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/xcb_util.h> #include <xcb/xcb_util.h>
@ -163,10 +158,7 @@ NK_API struct nk_xcb_context *nk_xcb_init(const char *title, int pos_x, int pos_
| XCB_EVENT_MASK_KEY_RELEASE | XCB_EVENT_MASK_KEY_RELEASE
| XCB_EVENT_MASK_BUTTON_PRESS | XCB_EVENT_MASK_BUTTON_PRESS
| XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_BUTTON_RELEASE
/*| XCB_EVENT_MASK_ENTER_WINDOW*/
/*| XCB_EVENT_MASK_LEAVE_WINDOW*/
| XCB_EVENT_MASK_POINTER_MOTION | XCB_EVENT_MASK_POINTER_MOTION
/*| XCB_EVENT_MASK_POINTER_MOTION_HINT*/
| XCB_EVENT_MASK_BUTTON_1_MOTION | XCB_EVENT_MASK_BUTTON_1_MOTION
| XCB_EVENT_MASK_BUTTON_2_MOTION | XCB_EVENT_MASK_BUTTON_2_MOTION
| XCB_EVENT_MASK_BUTTON_3_MOTION | XCB_EVENT_MASK_BUTTON_3_MOTION
@ -175,15 +167,7 @@ NK_API struct nk_xcb_context *nk_xcb_init(const char *title, int pos_x, int pos_
| XCB_EVENT_MASK_BUTTON_MOTION | XCB_EVENT_MASK_BUTTON_MOTION
| XCB_EVENT_MASK_KEYMAP_STATE | XCB_EVENT_MASK_KEYMAP_STATE
| XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_EXPOSURE
/*| XCB_EVENT_MASK_VISIBILITY_CHANGE*/
| XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_STRUCTURE_NOTIFY
/*| XCB_EVENT_MASK_RESIZE_REDIRECT*/
/*| XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY*/
/*| XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT*/
/*| XCB_EVENT_MASK_FOCUS_CHANGE*/
/*| XCB_EVENT_MASK_PROPERTY_CHANGE*/
/*| XCB_EVENT_MASK_COLOR_MAP_CHANGE*/
/*| XCB_EVENT_MASK_OWNER_GRAB_BUTTON*/
; ;
xcb_create_window(conn, XCB_COPY_FROM_PARENT, window, screen->root, xcb_create_window(conn, XCB_COPY_FROM_PARENT, window, screen->root,
pos_x, pos_y, width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, pos_x, pos_y, width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
@ -849,4 +833,4 @@ NK_API int nk_cairo_render(struct nk_cairo_context *cairo_ctx, struct nk_context
return nk_true; return nk_true;
} }
/*#endif /* NK_XCB_CAIRO_IMPLEMENTATION */ #endif /* NK_XCB_CAIRO_IMPLEMENTATION */