drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

libratbag: drop everything related to simple key action modifiers

Browse Source 
Macros can be used for that instead, drivers can adapt them as needed.
Simple key actions will stay here for now, but I plan to completely
replace them with macros eventually.
This commit is contained in:
Yaroslav Chvanov
2023-09-25 18:50:54 +03:00
parent d155bd27ec
commit 2b878fd06a
5 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libratbag.c
View File

@@ -1380,24 +1380,16 @@ ratbag_button_set_special(struct ratbag_button *button,
}
LIBRATBAG_EXPORT unsigned int
ratbag_button_get_key(const struct ratbag_button *button,
unsigned int *modifiers,
size_t *sz)
ratbag_button_get_key(const struct ratbag_button *button)
{
if (button->action.type != RATBAG_BUTTON_ACTION_TYPE_KEY)
return 0;
/* FIXME: modifiers */
if (sz != NULL)
*sz = 0;
return button->action.action.key.key;
}
LIBRATBAG_EXPORT enum ratbag_error_code
ratbag_button_set_key(struct ratbag_button *button,
unsigned int key,
unsigned int *modifiers,
size_t sz)
ratbag_button_set_key(struct ratbag_button *button, unsigned int key)
{
struct ratbag_button_action action = {0};
@@ -1407,8 +1399,6 @@ ratbag_button_set_key(struct ratbag_button *button,
RATBAG_BUTTON_ACTION_TYPE_KEY))
return RATBAG_ERROR_CAPABILITY;
/* FIXME: modifiers */
action.type = RATBAG_BUTTON_ACTION_TYPE_KEY;
action.action.key.key = key;

22
src/libratbag.h
View File

@@ -1514,41 +1514,27 @@ ratbag_button_set_special(struct ratbag_button *button,
* this function returns 0 and leaves modifiers and sz untouched.
*
* @param button A previously initialized ratbag button
* @param[out] modifiers Will be filled with the modifiers required for this
* action. The modifiers are as defined in linux/input-event-codes.h.
* @param[in,out] sz Takes the size of the modifiers array and returns the
* number of modifiers filled in. sz may be 0 if no modifiers are required.
*
* @note The caller must ensure that modifiers is large enough to accommodate
* for the key combination.
*
* @return The button number
* @return The key code as defined in linux/input-event-codes.h.
*/
unsigned int
ratbag_button_get_key(const struct ratbag_button *button,
unsigned int *modifiers,
size_t *sz);
ratbag_button_get_key(const struct ratbag_button *button);
/**
* @ingroup button
*
* @param button A previously initialized ratbag button
* @param key The button number to assign to this button, one of BTN_* as
* @param key The key number to assign to this button, one of KEY_* as
* defined in linux/input-event-codes.h
* @param modifiers The modifiers required for this action. The
* modifiers are as defined in linux/input-event-codes.h, in the order they
* should be pressed.
* @param sz The size of the modifiers array. sz may be 0 if no modifiers
* are required.
*
* @return 0 on success or an error code otherwise. On success, the button's
* action is set to @ref RATBAG_BUTTON_ACTION_TYPE_KEY.
*/
enum ratbag_error_code
ratbag_button_set_key(struct ratbag_button *button,
unsigned int key,
unsigned int *modifiers,
size_t sz);
ratbag_button_set_key(struct ratbag_button *button, unsigned int key);
/**
* @ingroup button