claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code style cleanups, optimize if statement order

Browse Source
This commit is contained in:
Jos van Mourik
2024-09-15 01:56:45 +02:00
parent 95844896a0
commit 22240a5925
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/device/mouse_microtouch_touchscreen.c
View File

@@ -259,26 +259,25 @@ static int
mtouch_poll(void *priv) mtouch_poll(void *priv)
{ {
mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) {
return 0;
}
double abs_x; double abs_x;
double abs_y; double abs_y;
int b = mouse_get_buttons_ex(); int b = mouse_get_buttons_ex();
char buffer[10]; char buffer[10];
if (fifo8_num_free(&dev->resp) <= 256 - 10 || dev->mode == MODE_INACTIVE) {
return 0;
}
if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */
if (!b && dev->b) {
microtouch_calibrate_timer(dev);
}
dev->b = b; /* Save buttonpress */
return 0;
}
mouse_get_abs_coords(&abs_x, &abs_y); mouse_get_abs_coords(&abs_x, &abs_y);
if (abs_x >= 1.0)
abs_x = 1.0;
if (abs_y >= 1.0)
abs_y = 1.0;
if (abs_x <= 0.0)
abs_x = 0.0;
if (abs_y <= 0.0)
abs_y = 0.0;
if (enable_overscan) { if (enable_overscan) {
int index = mouse_tablet_in_proximity - 1; int index = mouse_tablet_in_proximity - 1;
if (mouse_tablet_in_proximity == -1) { if (mouse_tablet_in_proximity == -1) {
@@ -298,19 +297,12 @@ mtouch_poll(void *priv)
abs_y -= (monitors[index].mon_overscan_y / 2.); abs_y -= (monitors[index].mon_overscan_y / 2.);
abs_x = abs_x / (double) monitors[index].mon_xsize; abs_x = abs_x / (double) monitors[index].mon_xsize;
abs_y = abs_y / (double) monitors[index].mon_ysize; abs_y = abs_y / (double) monitors[index].mon_ysize;
if (abs_x >= 1.0)
abs_x = 1.0;
if (abs_y >= 1.0)
abs_y = 1.0;
} }
if (dev->cal_cntr || (!b && !dev->b)) { /* Calibration or no buttonpress */ if (abs_x >= 1.0) abs_x = 1.0;
if (!b && dev->b) { if (abs_y >= 1.0) abs_y = 1.0;
microtouch_calibrate_timer(dev); if (abs_x <= 0.0) abs_x = 0.0;
} if (abs_y <= 0.0) abs_y = 0.0;
dev->b = b; /* Save buttonpress */
return 0;
}
if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) { if (dev->format == FORMAT_DEC || dev->format == FORMAT_HEX) {
if (b) { if (b) {
@@ -342,7 +334,7 @@ mtouch_poll(void *priv)
} }
} }
else if (dev->format == FORMAT_TABLET) { if (dev->format == FORMAT_TABLET) {
if (b) { /* Touchdown/Continuation */ if (b) { /* Touchdown/Continuation */
fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((b & 3))) : 0)); fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5) | ((b & 3))) : 0));
fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111); fifo8_push(&dev->resp, (uint16_t)(16383 * abs_x) & 0b1111111);
@@ -393,8 +385,7 @@ mtouch_init(const device_t *info)
if (dev->id < 2) { /* legacy controllers */ if (dev->id < 2) { /* legacy controllers */
dev->format = FORMAT_DEC; dev->format = FORMAT_DEC;
mouse_set_sample_rate(106); mouse_set_sample_rate(106);
} } else {
else {
dev->format = FORMAT_TABLET; dev->format = FORMAT_TABLET;
mouse_set_sample_rate(192); mouse_set_sample_rate(192);
} }
@@ -402,7 +393,6 @@ mtouch_init(const device_t *info)
mouse_input_mode = device_get_config_int("crosshair") + 1; mouse_input_mode = device_get_config_int("crosshair") + 1;
mouse_set_buttons(2); mouse_set_buttons(2);
mouse_set_poll_ex(mtouch_poll_global); mouse_set_poll_ex(mtouch_poll_global);
mtouch_inst = dev; mtouch_inst = dev;
return dev; return dev;
@@ -415,8 +405,9 @@ mtouch_close(void *priv)
fifo8_destroy(&dev->resp); fifo8_destroy(&dev->resp);
/* Detach serial port from the mouse. */ /* Detach serial port from the mouse. */
if (dev && dev->serial && dev->serial->sd) if (dev && dev->serial && dev->serial->sd) {
memset(dev->serial->sd, 0, sizeof(serial_device_t)); memset(dev->serial->sd, 0, sizeof(serial_device_t));
}
free(dev); free(dev);
mtouch_inst = NULL; mtouch_inst = NULL;