Skip to content
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

Jump to bottom

Fixes modifiers type signature in input_key callback #276

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Fixes modifiers type signature in input_key callback #276

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
2 changes: 1 addition & 1 deletion src/frameserver/terminal/default/arcterm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ static void on_mouse_button(struct tui_context* c,
}

static void on_key(struct tui_context* c, uint32_t keysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
trace("on_key(%"PRIu32",%"PRIu8",%"PRIu16")", keysym, scancode, subid);
if (term.pipe)
Expand Down
2 changes: 1 addition & 1 deletion src/frameserver/terminal/default/st/tui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ static void on_mouse_button(
}

static void on_key(struct tui_context* c, uint32_t symest,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
char *str = NULL;
if (mods & TUIM_SHIFT){
Expand Down
2 changes: 1 addition & 1 deletion src/shmif/arcan_tui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ struct tui_cbcfg {
*
*/
void (*input_key)(struct tui_context*, uint32_t symest,
uint8_t scancode, uint8_t mods, uint16_t subid, void* tag);
uint8_t scancode, uint16_t mods, uint16_t subid, void* tag);

/*
* other input- that wasn't handled in the other callbacks
Expand Down
2 changes: 1 addition & 1 deletion src/shmif/tui/lua/tui_lua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ static void on_mouse_button(struct tui_context* T,
}

static void on_key(struct tui_context* T, uint32_t xkeysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
SETUP_HREF("key",);
lua_pushnumber(L, subid);
Expand Down
2 changes: 1 addition & 1 deletion src/shmif/tui/widgets/bufferwnd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ static void step_cursor_e(struct tui_context* T, struct bufferwnd_meta* M)
}

static void on_key_input(struct tui_context* T, uint32_t keysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
{
struct bufferwnd_meta* M = tag;
/* might want to provide the label based approach to these as well, UP/DOWN
Expand Down
2 changes: 1 addition & 1 deletion src/shmif/tui/widgets/listwnd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ static bool on_label_input(
}

static void key_input(struct tui_context* T, uint32_t keysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
{
struct listwnd_meta* M = tag;
for (size_t i = 0; i < COUNT_OF(labels); i++){
Expand Down
2 changes: 1 addition & 1 deletion src/shmif/tui/widgets/readline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ static void synch_completion(struct tui_context* T, struct readline_meta* M)
}

void on_key_input(struct tui_context* T,
uint32_t keysym, uint8_t scancode, uint8_t mods, uint16_t subid, void* tag)
uint32_t keysym, uint8_t scancode, uint16_t mods, uint16_t subid, void* tag)
{
struct readline_meta* M;
if (!validate_context(T, &M))
Expand Down
2 changes: 1 addition & 1 deletion tests/frameservers/tui_media/tui_media.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static void fill(struct tui_context* c)
}

static void on_key(struct tui_context* c, uint32_t xkeysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", xkeysym, scancode, subid);
/* FIXME: move subwindow around */
Expand Down
2 changes: 1 addition & 1 deletion tests/frameservers/tui_test/tui_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static void on_mouse(struct tui_context* c,
}

static void on_key(struct tui_context* c, uint32_t xkeysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", xkeysym, scancode, subid);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/frameservers/tui_text/tui_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static void on_mouse(struct tui_context* c,
}

static void on_key(struct tui_context* c, uint32_t keysym,
uint8_t scancode, uint8_t mods, uint16_t subid, void* t)
uint8_t scancode, uint16_t mods, uint16_t subid, void* t)
{
trace("unknown_key(%"PRIu32",%"PRIu8",%"PRIu16")", keysym, scancode, subid);
struct data_buffer* T = t;
Expand Down
Loading