mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: move function to config

Browse source 
This function is only about rc, so fits better
in config.
This commit is contained in:
Jens Peters 2024-01-17 19:01:06 +01:00 • committed by Johan Malm
parent 241fcb0bde
commit 6def1319d1
5 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/config/tablet.h
View file

@ -22,5 +22,6 @@ enum rotation tablet_parse_rotation(int value);
uint32_t tablet_button_from_str(const char *button); uint32_t tablet_button_from_str(const char *button);
void tablet_button_mapping_add(uint32_t from, uint32_t to); void tablet_button_mapping_add(uint32_t from, uint32_t to);
void tablet_load_default_button_mappings(void); void tablet_load_default_button_mappings(void);
uint32_t tablet_get_mapped_button(uint32_t src_button);
#endif /* LABWC_TABLET_CONFIG_H */ #endif /* LABWC_TABLET_CONFIG_H */

1
include/input/tablet.h
View file

@ -21,7 +21,6 @@ struct drawing_tablet {
} handlers; } handlers;
}; };
uint32_t tablet_get_mapped_button(uint32_t src_button);
void tablet_init(struct seat *seat, struct wlr_input_device *wlr_input_device); void tablet_init(struct seat *seat, struct wlr_input_device *wlr_input_device);
#endif /* LABWC_TABLET_H */ #endif /* LABWC_TABLET_H */

14
src/config/tablet.c
View file

@ -105,3 +105,17 @@ tablet_load_default_button_mappings(void)
tablet_button_mapping_add(BTN_STYLUS, BTN_RIGHT); tablet_button_mapping_add(BTN_STYLUS, BTN_RIGHT);
tablet_button_mapping_add(BTN_STYLUS2, BTN_MIDDLE); tablet_button_mapping_add(BTN_STYLUS2, BTN_MIDDLE);
} }
uint32_t
tablet_get_mapped_button(uint32_t src_button)
{
struct button_map_entry *map_entry;
for (size_t i = 0; i < rc.tablet.button_map_count; i++) {
map_entry = &rc.tablet.button_map[i];
if (map_entry->from == src_button) {
return map_entry->to;
}
}
wlr_log(WLR_DEBUG, "no button map target for 0x%x", src_button);
return 0;
}

14
src/input/tablet.c
View file

@ -86,20 +86,6 @@ handle_axis(struct wl_listener *listener, void *data)
// Ignore other events // Ignore other events
} }
uint32_t
tablet_get_mapped_button(uint32_t src_button)
{
struct button_map_entry *map_entry;
for (size_t i = 0; i < rc.tablet.button_map_count; i++) {
map_entry = &rc.tablet.button_map[i];
if (map_entry->from == src_button) {
return map_entry->to;
}
}
wlr_log(WLR_DEBUG, "no button map target for 0x%x", src_button);
return 0;
}
static void static void
handle_tip(struct wl_listener *listener, void *data) handle_tip(struct wl_listener *listener, void *data)
{ {

1
src/input/tablet_pad.c
View file

@ -7,7 +7,6 @@
#include "common/mem.h" #include "common/mem.h"
#include "config/rcxml.h" #include "config/rcxml.h"
#include "input/cursor.h" #include "input/cursor.h"
#include "input/tablet.h"
#include "input/tablet_pad.h" #include "input/tablet_pad.h"
static void static void