Skip to content

demo/xcb_cairo/nuklear_xcb.h: do not discard xcb_client_message_event_t #860

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
Shamar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

demo/xcb_cairo/nuklear_xcb.h: do not discard xcb_client_message_event_t #860

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
12 changes: 11 additions & 1 deletion demo/xcb_cairo/nuklear_xcb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ struct nk_cairo_context;
enum nk_xcb_event_type {
NK_XCB_EVENT_PAINT = 0x02,
NK_XCB_EVENT_RESIZED = 0x04,
NK_XCB_EVENT_STOP = 0x08
NK_XCB_EVENT_STOP = 0x08,
NK_XCB_CLIENT_MESSAGE = 0x10
};

/* Xcb part: work on windows */
Expand Down Expand Up @@ -155,6 +156,7 @@ struct nk_xcb_context {
int events;
xcb_intern_atom_reply_t* del_atom;
int width, height;
xcb_client_message_event_t last_client_message;
};

NK_API struct nk_xcb_context *nk_xcb_init(const char *title, int pos_x, int pos_y, int width, int height)
Expand Down Expand Up @@ -236,6 +238,8 @@ NK_API void nk_xcb_free(struct nk_xcb_context *xcb_ctx)
free(xcb_ctx);
}

static const xcb_client_message_event_t EMPTY_CLIENT_MESSAGE;

NK_API int nk_xcb_handle_event(struct nk_xcb_context *xcb_ctx, struct nk_context *nk_ctx)
{
int events = 0;
Expand All @@ -251,6 +255,7 @@ NK_API int nk_xcb_handle_event(struct nk_xcb_context *xcb_ctx, struct nk_context

event = xcb_wait_for_event(xcb_ctx->conn);

xcb_ctx->last_client_message = EMPTY_CLIENT_MESSAGE;
nk_input_begin(nk_ctx);
do {
switch (XCB_EVENT_RESPONSE_TYPE(event)) {
Expand Down Expand Up @@ -424,6 +429,11 @@ NK_API int nk_xcb_handle_event(struct nk_xcb_context *xcb_ctx, struct nk_context
{
events = NK_XCB_EVENT_STOP;
}
else
{
xcb_ctx->last_client_message = *cm;
events = NK_XCB_CLIENT_MESSAGE;
}
}
break;
default:
Expand Down