drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[MERGE][Core] Pointing Device Modes (21426)

Browse source
This commit is contained in:
Drashna Jael're 2024-01-31 14:52:03 -08:00
parent ed6ec8b4f9
commit 1648a63812
Signed by: drashna
GPG key ID: DBA1FD3A860D1B11
22 changed files with 1932 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

47
quantum/pointing_device/pointing_device.c
View file

@ -198,6 +198,7 @@ __attribute__((weak)) bool pointing_device_send(void) {
uint8_t buttons = local_mouse_report.buttons;
memset(&local_mouse_report, 0, sizeof(local_mouse_report));
local_mouse_report.buttons = buttons;
memcpy(&old_report, &local_mouse_report, sizeof(local_mouse_report));
return should_send_report || buttons;
@ -303,7 +304,7 @@ __attribute__((weak)) bool pointing_device_task(void) {
local_mouse_report = pointing_device_adjust_by_defines_right(local_mouse_report);
shared_mouse_report = pointing_device_adjust_by_defines(shared_mouse_report);
}
local_mouse_report = is_keyboard_left() ? pointing_device_task_combined_kb(local_mouse_report, shared_mouse_report) : pointing_device_task_combined_kb(shared_mouse_report, local_mouse_report);
local_mouse_report = is_keyboard_left() ? pointing_device_task_combined(local_mouse_report, shared_mouse_report) : pointing_device_task_combined(shared_mouse_report, local_mouse_report);
#else
local_mouse_report = pointing_device_adjust_by_defines(local_mouse_report);
local_mouse_report = pointing_device_task_kb(local_mouse_report);
@ -311,6 +312,10 @@ __attribute__((weak)) bool pointing_device_task(void) {
// automatic mouse layer function
#ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE
pointing_device_task_auto_mouse(local_mouse_report);
#endif
// pointing device modes handling for single pointing device
#if defined(POINTING_DEVICE_MODES_ENABLE) && !(defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED))
local_mouse_report = pointing_device_modes_task(local_mouse_report);
#endif
// combine with mouse report to ensure that the combined is sent correctly
#ifdef MOUSEKEY_ENABLE
@ -486,6 +491,44 @@ report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_repo
return mouse_report;
}
/**
* @brief Handle core combined pointing device tasks
*
* Takes 2 report_mouse_t structs allowing individual modification of either side and then returns pointing_device_task_combined_kb.
*
* NOTE: Only available when using both SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
*
* @param[in] left_report report_mouse_t
* @param[in] right_report report_mouse_t
* @return pointing_device_task_combined_kb(left_report, right_report) by default
*/
report_mouse_t pointing_device_task_combined(report_mouse_t left_report, report_mouse_t right_report) {
# ifdef POINTING_DEVICE_MODES_ENABLE
# if POINTING_MODES_SINGLE_CONTROL
// only one side controlled at any one time
switch (get_pointing_mode_device()) {
case PM_RIGHT_DEVICE:
right_report = pointing_device_modes_task(right_report);
break;
default:
left_report = pointing_device_modes_task(left_report);
}
# else
// both sides controlled independently
// save current device id
uint8_t current_device = get_pointing_mode_device();
set_pointing_mode_device(PM_RIGHT_DEVICE);
right_report = pointing_device_modes_task(right_report);
set_pointing_mode_device(PM_LEFT_DEVICE);
left_report = pointing_device_modes_task(left_report);
// set device id back
set_pointing_mode_device(current_device);
# endif
# endif
return pointing_device_task_combined_kb(left_report, right_report);
}
/**
* @brief Weak function allowing for keyboard level mouse report modification
*
@ -515,7 +558,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mou
__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) {
return pointing_device_combine_reports(left_report, right_report);
}
#endif
#endif // defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
__attribute__((weak)) void pointing_device_keycode_handler(uint16_t keycode, bool pressed) {
if IS_MOUSEKEY_BUTTON (keycode) {