NeroReflex/ROGueENEMY
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

do not fail on no fd

Browse source
This commit is contained in:
Denis 2023-12-24 00:08:18 +01:00
parent 458ef9f07d
commit f351427a05
No known key found for this signature in database
GPG key ID: DD9B63F805CF5C03
3 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
dev_out.c
View file

@ -485,7 +485,7 @@ void *dev_out_thread_func(void *ptr) {
} else if ((current_mouse_fd > 0) && (mouse_time_diff_usecs >= mouse_report_timing_us)) { } else if ((current_mouse_fd > 0) && (mouse_time_diff_usecs >= mouse_report_timing_us)) {
mouse_last_hid_report_sent = now; mouse_last_hid_report_sent = now;
virt_mouse_send(&mouse_data, &dev_out_data->dev_stats.mouse, &now); virt_mouse_send(&mouse_data, &dev_out_data->dev_stats.mouse, NULL);
// reset mouse movements now // reset mouse movements now
dev_out_data->dev_stats.mouse.x = 0; dev_out_data->dev_stats.mouse.x = 0;
@ -496,7 +496,7 @@ void *dev_out_thread_func(void *ptr) {
} else if ((current_keyboard_fd > 0) && (kbd_time_diff_usecs >= kbd_report_timing_us)) { } else if ((current_keyboard_fd > 0) && (kbd_time_diff_usecs >= kbd_report_timing_us)) {
keyboard_last_hid_report_sent = now; keyboard_last_hid_report_sent = now;
virt_kbd_send(&keyboard_data, &dev_out_data->dev_stats.kbd, &now); virt_kbd_send(&keyboard_data, &dev_out_data->dev_stats.kbd, NULL);
// this does reset the for, ensuring every other device has nothing to say // this does reset the for, ensuring every other device has nothing to say
continue; continue;
@ -525,7 +525,7 @@ void *dev_out_thread_func(void *ptr) {
FD_SET(current_mouse_fd, &read_fds); FD_SET(current_mouse_fd, &read_fds);
} }
if (current_mouse_fd > 0) { if (current_keyboard_fd > 0) {
FD_SET(current_keyboard_fd, &read_fds); FD_SET(current_keyboard_fd, &read_fds);
} }
@ -533,12 +533,23 @@ void *dev_out_thread_func(void *ptr) {
FD_SET(current_gamepad_fd, &read_fds); FD_SET(current_gamepad_fd, &read_fds);
} }
const int64_t timeout_gamepad_time_diff_usecs = gamepad_report_timing_us - gamepad_time_diff_usecs; const int64_t timeout_gamepad_time_diff_usecs = (current_gamepad_fd > 0) ? gamepad_report_timing_us - gamepad_time_diff_usecs : 5000;
const int64_t timeout_mouse_time_diff_usecs = mouse_report_timing_us - mouse_time_diff_usecs; const int64_t timeout_mouse_time_diff_usecs = (current_mouse_fd > 0) ? mouse_report_timing_us - mouse_time_diff_usecs : 5000;
const int64_t timeout_kbd_time_diff_usecs = kbd_report_timing_us - kbd_time_diff_usecs; const int64_t timeout_kbd_time_diff_usecs = (current_keyboard_fd > 0) ? kbd_report_timing_us - kbd_time_diff_usecs : 5000;
int64_t next_timing_out_device_diff_usecs = timeout_kbd_time_diff_usecs < timeout_mouse_time_diff_usecs ? timeout_kbd_time_diff_usecs : timeout_mouse_time_diff_usecs; int64_t next_timing_out_device_diff_usecs = 5000;
next_timing_out_device_diff_usecs = next_timing_out_device_diff_usecs < timeout_gamepad_time_diff_usecs ? next_timing_out_device_diff_usecs : timeout_gamepad_time_diff_usecs;
if ((timeout_kbd_time_diff_usecs > 0) && (timeout_kbd_time_diff_usecs < next_timing_out_device_diff_usecs)) {
next_timing_out_device_diff_usecs = timeout_kbd_time_diff_usecs;
}
if ((timeout_mouse_time_diff_usecs > 0) && (timeout_mouse_time_diff_usecs < next_timing_out_device_diff_usecs)) {
next_timing_out_device_diff_usecs = timeout_mouse_time_diff_usecs;
}
if ((timeout_gamepad_time_diff_usecs > 0) && (timeout_gamepad_time_diff_usecs < next_timing_out_device_diff_usecs)) {
next_timing_out_device_diff_usecs = timeout_gamepad_time_diff_usecs;
}
// calculate the shortest timeout between one of the multiple device will needs to send out its hid report // calculate the shortest timeout between one of the multiple device will needs to send out its hid report
struct timeval timeout = { struct timeval timeout = {
@ -547,7 +558,7 @@ void *dev_out_thread_func(void *ptr) {
}; };
int ready_fds = select(FD_SETSIZE, &read_fds, NULL, NULL, &timeout); int ready_fds = select(FD_SETSIZE, &read_fds, NULL, NULL, &timeout);
gamepad_status_qam_quirk_ext_time(&dev_out_data->dev_stats.gamepad, &now); gamepad_status_qam_quirk_ext_time(&dev_out_data->dev_stats.gamepad);
if (ready_fds == -1) { if (ready_fds == -1) {
const int err = errno; const int err = errno;

8
devices_status.c
View file

@ -163,13 +163,15 @@ void gamepad_status_qam_quirk(gamepad_status_t *const gamepad_stats) {
} }
} }
void gamepad_status_qam_quirk_ext_time(gamepad_status_t *const gamepad_stats, struct timeval *now) { void gamepad_status_qam_quirk_ext_time(gamepad_status_t *const gamepad_stats) {
static struct timeval press_time; static struct timeval press_time;
if (gamepad_stats->flags & GAMEPAD_STATUS_FLAGS_PRESS_AND_REALEASE_CENTER) { if (gamepad_stats->flags & GAMEPAD_STATUS_FLAGS_PRESS_AND_REALEASE_CENTER) {
struct timeval now;
gettimeofday(&now, NULL);
// Calculate elapsed time in milliseconds // Calculate elapsed time in milliseconds
const int64_t elapsed_time = (now->tv_sec - press_time.tv_sec) * 1000 + const int64_t elapsed_time = (now.tv_sec - press_time.tv_sec) * 1000 +
(now->tv_usec - press_time.tv_usec) / 1000; (now.tv_usec - press_time.tv_usec) / 1000;
if (gamepad_stats->center) { if (gamepad_stats->center) {
// If the center button is pressed and at least X ms have passed // If the center button is pressed and at least X ms have passed

2
devices_status.h
View file

@ -113,4 +113,4 @@ void devices_status_init(devices_status_t *const stats);
void gamepad_status_qam_quirk(gamepad_status_t *const gamepad_stats); void gamepad_status_qam_quirk(gamepad_status_t *const gamepad_stats);
void gamepad_status_qam_quirk_ext_time(gamepad_status_t *const gamepad_stats, struct timeval *now); void gamepad_status_qam_quirk_ext_time(gamepad_status_t *const gamepad_stats);