From f907b7817b7573be1ea30a7f479866f065fbcd6e Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 4 May 2024 17:01:29 +0600 Subject: [PATCH 01/10] Microtouch support (working at least for MS-DOS, Windows 95 and Windows NT 3.5) --- src/device/CMakeLists.txt | 3 +- src/device/mouse.c | 1 + src/device/mouse_microtouch_touchscreen.c | 279 ++++++++++++++++++++++ src/include/86box/mouse.h | 1 + src/qt/qt_rendererstack.cpp | 2 +- 5 files changed, 284 insertions(+), 2 deletions(-) create mode 100644 src/device/mouse_microtouch_touchscreen.c diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index c0719af2a..e48f30d0f 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -23,7 +23,8 @@ add_library(dev OBJECT bugger.c cassette.c cartridge.c hasp.c hwm.c hwm_lm75.c h keyboard_at.c mouse.c mouse_bus.c mouse_serial.c mouse_ps2.c nec_mate_unk.c phoenix_486_jumper.c serial_passthrough.c - novell_cardkey.c) + novell_cardkey.c + mouse_microtouch_touchscreen.c) if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_link_libraries(86Box atomic) diff --git a/src/device/mouse.c b/src/device/mouse.c index da4ed1c04..8fd783ee2 100644 --- a/src/device/mouse.c +++ b/src/device/mouse.c @@ -98,6 +98,7 @@ static mouse_t mouse_devices[] = { { &mouse_wacom_device }, { &mouse_wacom_artpad_device }, #endif + { &mouse_mtouch_device }, { NULL } // clang-format on }; diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c new file mode 100644 index 000000000..50323210a --- /dev/null +++ b/src/device/mouse_microtouch_touchscreen.c @@ -0,0 +1,279 @@ + +/* TODO: + MN, SS, SF commands (sensitivity-related). + GP/SP commands (formats are not documented at all). + GF, FQF, FQP (what are those for?) +*/ +#include +#include +#include +#include +#include +#include +#include +#include <86box/86box.h> +#include <86box/device.h> +#include <86box/timer.h> +#include <86box/mouse.h> +#include <86box/serial.h> +#include <86box/plat.h> +#include <86box/fifo8.h> +#include <86box/fifo.h> + +enum mtouch_modes +{ + MODE_TABLET = 1, + MODE_RAW = 2 +}; + +typedef struct mouse_microtouch_t { + double abs_x; + double abs_y; + int oldb; + int b; + char cmd[512]; + int bits; + int baud_rate_sel; + int cmd_pos; + int mode; + double rate; + bool soh; + bool in_reset; + serial_t *serial; + Fifo8 resp; + pc_timer_t host_to_serial_timer; + pc_timer_t reset_timer; +} mouse_microtouch_t; + +static mouse_microtouch_t* mtouch_inst = NULL; + +void microtouch_reset_complete(void *priv) +{ + mouse_microtouch_t *mtouch = (mouse_microtouch_t*)priv; + + mtouch->in_reset = false; + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); +} + +void microtouch_process_commands(mouse_microtouch_t* mtouch) +{ + int i = 0; + mtouch->cmd[strcspn(mtouch->cmd, "\r")] = '\0'; + mtouch->cmd_pos = 0; + pclog("Command received: %s\n", mtouch->cmd); + for (i = 0; i < strlen(mtouch->cmd); i++) { + mtouch->cmd[i] = toupper(mtouch->cmd[i]); + } + /* Re-enable and finish this if actually needed by TouchPen. */ + if (mtouch->cmd[0] == 'Z' || (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O')) { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "QM****00\r", sizeof("QM****00\r") - 1); + } + if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "Q10200\r", sizeof("Q10200\r") - 1); + } + if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { + mtouch->mode = MODE_TABLET; + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'R') { + mtouch->in_reset = true; + mtouch->mode = MODE_TABLET; + timer_on_auto(&mtouch->reset_timer, 500. * 1000.); + } + if (mtouch->cmd[0] == 'A' && (mtouch->cmd[1] == 'D' || mtouch->cmd[1] == 'E')) { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'N' && mtouch->cmd[1] == 'M') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + } + if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'Q') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + } + if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'F') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + } +} + +void mtouch_write_to_host(void *priv) +{ + mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; + if ((dev->serial->type >= SERIAL_16550) && dev->serial->fifo_enabled) { + if (fifo_get_full(dev->serial->rcvr_fifo)) { + goto no_write_to_machine; + } + } else { + if (dev->serial->lsr & 1) { + goto no_write_to_machine; + } + } + + if (dev->in_reset) + goto no_write_to_machine; + + if (fifo8_num_used(&dev->resp)) { + serial_write_fifo(dev->serial, fifo8_pop(&dev->resp)); + } + +no_write_to_machine: + timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) 9600.0) * (double) (1 + 8 + 1)); +} + +void mtouch_write(serial_t* serial, void* priv, uint8_t data) +{ + mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; + if (!dev->soh && data == 0x11) { + pclog("\n"); + } + if (data == '\x1'){ + dev->soh = 1; + } else if (dev->soh) { + if (data != '\r') { + dev->cmd[dev->cmd_pos++] = data; + } else { + dev->cmd[dev->cmd_pos++] = data; + microtouch_process_commands(dev); + } + } +} + +static int +mtouch_poll(void *priv) +{ + mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; + + if (dev->mode != MODE_RAW && fifo8_num_free(&dev->resp) >= 10) { + unsigned int abs_x_int = 0, abs_y_int = 0; + double abs_x; + double abs_y; + int b = mouse_get_buttons_ex(); + mouse_get_abs_coords(&abs_x, &abs_y); + dev->b |= b & 1; + 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 (b & 1) { + dev->abs_x = abs_x; + dev->abs_y = abs_y; + dev->b |= 1; + + abs_x_int = abs_x * 16383; + abs_y_int = 16383 - abs_y * 16383; + + fifo8_push(&dev->resp, 0b11000000); + fifo8_push(&dev->resp, abs_x_int & 0b1111111); + fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, abs_y_int & 0b1111111); + fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); + } else if ((dev->b & 1) && !(b & 1)) { + dev->b &= ~1; + abs_x_int = dev->abs_x * 16383; + abs_y_int = 16383 - dev->abs_y * 16383; + fifo8_push(&dev->resp, 0b11000000); + fifo8_push(&dev->resp, abs_x_int & 0b1111111); + fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, abs_y_int & 0b1111111); + fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, 0b10000000); + fifo8_push(&dev->resp, abs_x_int & 0b1111111); + fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); + fifo8_push(&dev->resp, abs_y_int & 0b1111111); + fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); + } + } + return 0; +} + +static void mtouch_poll_global(void) +{ + mtouch_poll(mtouch_inst); +} + +void* mtouch_init(const device_t* info) +{ + mouse_microtouch_t *dev = calloc(1, sizeof(mouse_microtouch_t)); + + dev->serial = serial_attach(device_get_config_int("port"), NULL, mtouch_write, dev); + fifo8_create(&dev->resp, 512); + timer_add(&dev->host_to_serial_timer, mtouch_write_to_host, dev, 0); + timer_add(&dev->reset_timer, microtouch_reset_complete, dev, 0); + timer_on_auto(&dev->host_to_serial_timer, (1000000. / 9600.) * 10); + dev->mode = MODE_TABLET; + mouse_input_mode = 1; + mouse_set_buttons(2); + mouse_set_poll_ex(mtouch_poll_global); + + mtouch_inst = dev; + + return dev; +} + +void mtouch_close(void* priv) +{ + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; + + fifo8_destroy(&dev->resp); + /* Detach serial port from the mouse. */ + if (dev && dev->serial && dev->serial->sd) + memset(dev->serial->sd, 0, sizeof(serial_device_t)); + + free(dev); + mtouch_inst = NULL; +} + +static const device_config_t mtouch_config[] = { + // clang-format off + { + .name = "port", + .description = "Serial Port", + .type = CONFIG_SELECTION, + .default_string = "", + .default_int = 0, + .file_filter = "", + .spinner = { 0 }, + .selection = { + { .description = "COM1", .value = 0 }, + { .description = "COM2", .value = 1 }, + { .description = "COM3", .value = 2 }, + { .description = "COM4", .value = 3 }, + { .description = "" } + } + }, + { .name = "", .description = "", .type = CONFIG_END } + // clang-format on +}; + +const device_t mouse_mtouch_device = { + .name = "3M MicroTouch SMT3", + .internal_name = "microtouch_touchpen", + .flags = DEVICE_COM, + .local = 0, + .init = mtouch_init, + .close = mtouch_close, + .reset = NULL, + { .poll = mtouch_poll }, + .speed_changed = NULL, + .force_redraw = NULL, + .config = mtouch_config +}; + diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h index 786b86f41..e9c1d9b4d 100644 --- a/src/include/86box/mouse.h +++ b/src/include/86box/mouse.h @@ -73,6 +73,7 @@ extern const device_t mouse_ltserial_device; extern const device_t mouse_ps2_device; extern const device_t mouse_wacom_device; extern const device_t mouse_wacom_artpad_device; +extern const device_t mouse_mtouch_device; #endif extern void mouse_clear_x(void); diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index bc4cb9c13..590c025e8 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -250,7 +250,7 @@ RendererStack::enterEvent(QEvent *event) mousedata.mouse_tablet_in_proximity = 1; if (mouse_input_mode == 1) - QApplication::setOverrideCursor(Qt::BlankCursor); + QApplication::setOverrideCursor(Qt::CrossCursor); } void From 7277316c1b7ea38ab5562da0b5a0a4721c5a8532 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sat, 4 May 2024 23:36:09 +0600 Subject: [PATCH 02/10] Cursor override fixes and preparation for overscan checking --- src/qt/qt_mainwindow.cpp | 3 ++- src/qt/qt_rendererstack.cpp | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index c48dfd052..112d1cf23 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -205,7 +205,8 @@ MainWindow::MainWindow(QWidget *parent) connect(this, &MainWindow::hardResetCompleted, this, [this]() { ui->actionMCA_devices->setVisible(machine_has_bus(machine, MACHINE_BUS_MCA)); - QApplication::setOverrideCursor(Qt::ArrowCursor); + while (QApplication::overrideCursor()) + QApplication::restoreOverrideCursor(); #ifdef USE_WACOM ui->menuTablet_tool->menuAction()->setVisible(mouse_input_mode >= 1); #else diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index 590c025e8..d043f823c 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -114,7 +114,8 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index) RendererStack::~RendererStack() { - QApplication::restoreOverrideCursor(); + while (QApplication::overrideCursor()) + QApplication::restoreOverrideCursor(); delete ui; } @@ -123,7 +124,7 @@ qt_mouse_capture(int on) { if (!on) { mouse_capture = 0; - if (QApplication::overrideCursor()) QApplication::restoreOverrideCursor(); + while (QApplication::overrideCursor()) QApplication::restoreOverrideCursor(); #ifdef __APPLE__ CGAssociateMouseAndMouseCursorPosition(true); #endif @@ -247,7 +248,7 @@ RendererStack::enterEvent(QEnterEvent *event) RendererStack::enterEvent(QEvent *event) #endif { - mousedata.mouse_tablet_in_proximity = 1; + mousedata.mouse_tablet_in_proximity = m_monitor_index + 1; if (mouse_input_mode == 1) QApplication::setOverrideCursor(Qt::CrossCursor); @@ -258,8 +259,10 @@ RendererStack::leaveEvent(QEvent *event) { mousedata.mouse_tablet_in_proximity = 0; - if (mouse_input_mode == 1 && QApplication::overrideCursor()) - QApplication::restoreOverrideCursor(); + if (mouse_input_mode == 1 && QApplication::overrideCursor()) { + while (QApplication::overrideCursor()) + QApplication::restoreOverrideCursor(); + } if (QApplication::platformName().contains("wayland")) { event->accept(); return; From 754f304deb86299f64e284e7db7da1d46806c993 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 5 May 2024 13:06:35 +0600 Subject: [PATCH 03/10] Overscan handling --- src/device/mouse_microtouch_touchscreen.c | 37 ++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 50323210a..e063260ea 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -19,6 +19,7 @@ #include <86box/plat.h> #include <86box/fifo8.h> #include <86box/fifo.h> +#include <86box/video.h> /* Needed to account for overscan. */ enum mtouch_modes { @@ -65,7 +66,6 @@ void microtouch_process_commands(mouse_microtouch_t* mtouch) for (i = 0; i < strlen(mtouch->cmd); i++) { mtouch->cmd[i] = toupper(mtouch->cmd[i]); } - /* Re-enable and finish this if actually needed by TouchPen. */ if (mtouch->cmd[0] == 'Z' || (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O')) { fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); @@ -87,6 +87,18 @@ void microtouch_process_commands(mouse_microtouch_t* mtouch) fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); } + if (mtouch->cmd[0] == 'P' && mtouch->cmd[1] == 'F') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'P' && mtouch->cmd[1] == 'O') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } if (mtouch->cmd[0] == 'R') { mtouch->in_reset = true; mtouch->mode = MODE_TABLET; @@ -172,6 +184,29 @@ mtouch_poll(void *priv) abs_x = 0.0; if (abs_y <= 0.0) abs_y = 0.0; + if (enable_overscan) { + int index = mouse_tablet_in_proximity - 1; + if (mouse_tablet_in_proximity == -1) + mouse_tablet_in_proximity = 0; + + abs_x *= monitors[index].mon_unscaled_size_x - 1; + abs_y *= monitors[index].mon_efscrnsz_y - 1; + + if (abs_x <= (monitors[index].mon_overscan_x / 2.)) { + abs_x = (monitors[index].mon_overscan_x / 2.); + } + if (abs_y <= (monitors[index].mon_overscan_y / 2.)) { + abs_y = (monitors[index].mon_overscan_y / 2.); + } + abs_x -= (monitors[index].mon_overscan_x / 2.); + abs_y -= (monitors[index].mon_overscan_y / 2.); + abs_x = abs_x / (double)monitors[index].mon_xsize; + 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 (b & 1) { dev->abs_x = abs_x; dev->abs_y = abs_y; From d9fa8bbb4a1eab05b04ea536f300c6d4fc8bd056 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 5 May 2024 14:25:31 +0600 Subject: [PATCH 04/10] Implement calibration --- src/device/mouse_microtouch_touchscreen.c | 48 +++++++++++++++++------ 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index e063260ea..14d400fbc 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -37,6 +37,7 @@ typedef struct mouse_microtouch_t { int baud_rate_sel; int cmd_pos; int mode; + uint8_t cal_cntr; double rate; bool soh; bool in_reset; @@ -57,6 +58,17 @@ void microtouch_reset_complete(void *priv) fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); } +void microtouch_calibrate_timer(void *priv) +{ + mouse_microtouch_t *mtouch = (mouse_microtouch_t*)priv; + + if (!fifo8_num_used(&mtouch->resp)) { + mtouch->cal_cntr--; + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + } +} + void microtouch_process_commands(mouse_microtouch_t* mtouch) { int i = 0; @@ -83,22 +95,16 @@ void microtouch_process_commands(mouse_microtouch_t* mtouch) fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); } + if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { + mtouch->mode = MODE_RAW; + mtouch->cal_cntr = 0; + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); } - if (mtouch->cmd[0] == 'P' && mtouch->cmd[1] == 'F') { - fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); - } - if (mtouch->cmd[0] == 'P' && mtouch->cmd[1] == 'O') { - fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); - } - if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { - fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); - } if (mtouch->cmd[0] == 'R') { mtouch->in_reset = true; mtouch->mode = MODE_TABLET; @@ -120,6 +126,15 @@ void microtouch_process_commands(mouse_microtouch_t* mtouch) fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); } + if (mtouch->cmd[0] == 'P') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + } + if (mtouch->cmd[0] == 'C' && (mtouch->cmd[1] == 'N' || mtouch->cmd[1] == 'X')) { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + mtouch->cal_cntr = 2; + } } void mtouch_write_to_host(void *priv) @@ -207,6 +222,15 @@ mtouch_poll(void *priv) if (abs_y >= 1.0) abs_y = 1.0; } + if (dev->cal_cntr && (!(dev->b & 1) && (b & 1))) { + dev->b |= 1; + } else if (dev->cal_cntr && ((dev->b & 1) && !(b & 1))) { + dev->b &= ~1; + microtouch_calibrate_timer(dev); + } + if (dev->cal_cntr) { + return 0; + } if (b & 1) { dev->abs_x = abs_x; dev->abs_y = abs_y; From 34ec412bae9694619da6c42a7270f9cbed1a0539 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 5 May 2024 14:36:42 +0600 Subject: [PATCH 05/10] Cleanups and copyright text --- src/device/mouse_microtouch_touchscreen.c | 29 ++++++++++++++--------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 14d400fbc..568b6b15b 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -1,15 +1,28 @@ +/* + * 86Box A hypervisor and IBM PC system emulator that specializes in + * running old operating systems and software designed for IBM + * PC systems and compatibles from 1981 through fairly recent + * system designs based on the PCI bus. + * + * This file is part of the 86Box distribution. + * + * 3M MicroTouch SMT3 emulation. + * + * + * + * Authors: Cacodemon345 + * + * Copyright 2024 Cacodemon345 + */ /* TODO: - MN, SS, SF commands (sensitivity-related). - GP/SP commands (formats are not documented at all). - GF, FQF, FQP (what are those for?) + GP/SP commands (formats are not documented at all, like anywhere). */ #include #include #include #include #include -#include #include #include <86box/86box.h> #include <86box/device.h> @@ -30,15 +43,11 @@ enum mtouch_modes typedef struct mouse_microtouch_t { double abs_x; double abs_y; - int oldb; int b; char cmd[512]; - int bits; - int baud_rate_sel; int cmd_pos; int mode; uint8_t cal_cntr; - double rate; bool soh; bool in_reset; serial_t *serial; @@ -108,6 +117,7 @@ void microtouch_process_commands(mouse_microtouch_t* mtouch) if (mtouch->cmd[0] == 'R') { mtouch->in_reset = true; mtouch->mode = MODE_TABLET; + mtouch->cal_cntr = 0; timer_on_auto(&mtouch->reset_timer, 500. * 1000.); } if (mtouch->cmd[0] == 'A' && (mtouch->cmd[1] == 'D' || mtouch->cmd[1] == 'E')) { @@ -164,9 +174,6 @@ no_write_to_machine: void mtouch_write(serial_t* serial, void* priv, uint8_t data) { mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; - if (!dev->soh && data == 0x11) { - pclog("\n"); - } if (data == '\x1'){ dev->soh = 1; } else if (dev->soh) { From 4fe7090047b47fc83fb540d2023c5a01172411ba Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Sun, 5 May 2024 14:55:42 +0600 Subject: [PATCH 06/10] Apply clang-format --- src/device/mouse_microtouch_touchscreen.c | 124 ++++++++++++---------- 1 file changed, 65 insertions(+), 59 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 568b6b15b..703a372c6 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -15,7 +15,7 @@ * Copyright 2024 Cacodemon345 */ -/* TODO: +/* TODO: GP/SP commands (formats are not documented at all, like anywhere). */ #include @@ -34,122 +34,125 @@ #include <86box/fifo.h> #include <86box/video.h> /* Needed to account for overscan. */ -enum mtouch_modes -{ +enum mtouch_modes { MODE_TABLET = 1, - MODE_RAW = 2 + MODE_RAW = 2 }; typedef struct mouse_microtouch_t { - double abs_x; - double abs_y; - int b; - char cmd[512]; - int cmd_pos; - int mode; - uint8_t cal_cntr; - bool soh; - bool in_reset; - serial_t *serial; - Fifo8 resp; - pc_timer_t host_to_serial_timer; - pc_timer_t reset_timer; + double abs_x; + double abs_y; + int b; + char cmd[512]; + int cmd_pos; + int mode; + uint8_t cal_cntr; + bool soh; + bool in_reset; + serial_t *serial; + Fifo8 resp; + pc_timer_t host_to_serial_timer; + pc_timer_t reset_timer; } mouse_microtouch_t; -static mouse_microtouch_t* mtouch_inst = NULL; +static mouse_microtouch_t *mtouch_inst = NULL; -void microtouch_reset_complete(void *priv) +void +microtouch_reset_complete(void *priv) { - mouse_microtouch_t *mtouch = (mouse_microtouch_t*)priv; + mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; - mtouch->in_reset = false; + mtouch->in_reset = false; fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } -void microtouch_calibrate_timer(void *priv) +void +microtouch_calibrate_timer(void *priv) { - mouse_microtouch_t *mtouch = (mouse_microtouch_t*)priv; + mouse_microtouch_t *mtouch = (mouse_microtouch_t *) priv; if (!fifo8_num_used(&mtouch->resp)) { mtouch->cal_cntr--; fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "1\r", 2); } } -void microtouch_process_commands(mouse_microtouch_t* mtouch) +void +microtouch_process_commands(mouse_microtouch_t *mtouch) { - int i = 0; + int i = 0; mtouch->cmd[strcspn(mtouch->cmd, "\r")] = '\0'; - mtouch->cmd_pos = 0; + mtouch->cmd_pos = 0; pclog("Command received: %s\n", mtouch->cmd); for (i = 0; i < strlen(mtouch->cmd); i++) { mtouch->cmd[i] = toupper(mtouch->cmd[i]); } if (mtouch->cmd[0] == 'Z' || (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O')) { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "QM****00\r", sizeof("QM****00\r") - 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "QM****00\r", sizeof("QM****00\r") - 1); } if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "Q10200\r", sizeof("Q10200\r") - 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "Q10200\r", sizeof("Q10200\r") - 1); } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { mtouch->mode = MODE_TABLET; fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'R') { - mtouch->mode = MODE_RAW; + mtouch->mode = MODE_RAW; mtouch->cal_cntr = 0; fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'M' && mtouch->cmd[1] == 'S') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'R') { mtouch->in_reset = true; - mtouch->mode = MODE_TABLET; + mtouch->mode = MODE_TABLET; mtouch->cal_cntr = 0; timer_on_auto(&mtouch->reset_timer, 500. * 1000.); } if (mtouch->cmd[0] == 'A' && (mtouch->cmd[1] == 'D' || mtouch->cmd[1] == 'E')) { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'N' && mtouch->cmd[1] == 'M') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "1\r", 2); } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'Q') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "1\r", 2); } if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'F') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "1\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "1\r", 2); } if (mtouch->cmd[0] == 'P') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'C' && (mtouch->cmd[1] == 'N' || mtouch->cmd[1] == 'X')) { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t*) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); mtouch->cal_cntr = 2; } } -void mtouch_write_to_host(void *priv) +void +mtouch_write_to_host(void *priv) { - mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; if ((dev->serial->type >= SERIAL_16550) && dev->serial->fifo_enabled) { if (fifo_get_full(dev->serial->rcvr_fifo)) { goto no_write_to_machine; @@ -171,10 +174,11 @@ no_write_to_machine: timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / (double) 9600.0) * (double) (1 + 8 + 1)); } -void mtouch_write(serial_t* serial, void* priv, uint8_t data) +void +mtouch_write(serial_t *serial, void *priv, uint8_t data) { - mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; - if (data == '\x1'){ + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; + if (data == '\x1') { dev->soh = 1; } else if (dev->soh) { if (data != '\r') { @@ -189,13 +193,13 @@ void mtouch_write(serial_t* serial, void* priv, uint8_t data) static int mtouch_poll(void *priv) { - mouse_microtouch_t *dev = (mouse_microtouch_t*)priv; + mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; if (dev->mode != MODE_RAW && fifo8_num_free(&dev->resp) >= 10) { unsigned int abs_x_int = 0, abs_y_int = 0; - double abs_x; - double abs_y; - int b = mouse_get_buttons_ex(); + double abs_x; + double abs_y; + int b = mouse_get_buttons_ex(); mouse_get_abs_coords(&abs_x, &abs_y); dev->b |= b & 1; if (abs_x >= 1.0) @@ -222,8 +226,8 @@ mtouch_poll(void *priv) } abs_x -= (monitors[index].mon_overscan_x / 2.); abs_y -= (monitors[index].mon_overscan_y / 2.); - abs_x = abs_x / (double)monitors[index].mon_xsize; - abs_y = abs_y / (double)monitors[index].mon_ysize; + abs_x = abs_x / (double) monitors[index].mon_xsize; + abs_y = abs_y / (double) monitors[index].mon_ysize; if (abs_x >= 1.0) abs_x = 1.0; if (abs_y >= 1.0) @@ -242,7 +246,7 @@ mtouch_poll(void *priv) dev->abs_x = abs_x; dev->abs_y = abs_y; dev->b |= 1; - + abs_x_int = abs_x * 16383; abs_y_int = 16383 - abs_y * 16383; @@ -270,12 +274,14 @@ mtouch_poll(void *priv) return 0; } -static void mtouch_poll_global(void) +static void +mtouch_poll_global(void) { mtouch_poll(mtouch_inst); } -void* mtouch_init(const device_t* info) +void * +mtouch_init(const device_t *info) { mouse_microtouch_t *dev = calloc(1, sizeof(mouse_microtouch_t)); @@ -284,7 +290,7 @@ void* mtouch_init(const device_t* info) timer_add(&dev->host_to_serial_timer, mtouch_write_to_host, dev, 0); timer_add(&dev->reset_timer, microtouch_reset_complete, dev, 0); timer_on_auto(&dev->host_to_serial_timer, (1000000. / 9600.) * 10); - dev->mode = MODE_TABLET; + dev->mode = MODE_TABLET; mouse_input_mode = 1; mouse_set_buttons(2); mouse_set_poll_ex(mtouch_poll_global); @@ -294,7 +300,8 @@ void* mtouch_init(const device_t* info) return dev; } -void mtouch_close(void* priv) +void +mtouch_close(void *priv) { mouse_microtouch_t *dev = (mouse_microtouch_t *) priv; @@ -342,4 +349,3 @@ const device_t mouse_mtouch_device = { .force_redraw = NULL, .config = mtouch_config }; - From fe5ce508639ec7c7134d1c6d692a0c638afb1ae2 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 6 May 2024 16:42:42 +0600 Subject: [PATCH 07/10] Stubbed Get Parameter Block command --- src/device/mouse_microtouch_touchscreen.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 703a372c6..954d10ee4 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -147,6 +147,13 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); mtouch->cal_cntr = 2; } + if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "A\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); + } } void From 9faf4dc7650ecd8e22b1a36b93b4315966070e53 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Tue, 7 May 2024 00:21:52 +0600 Subject: [PATCH 08/10] Stubbed Set Parameter Block command --- src/device/mouse_microtouch_touchscreen.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 954d10ee4..ca0f16dd4 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -150,10 +150,14 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) if (mtouch->cmd[0] == 'G' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t *) "A\r", 2); - fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0000000000000000000000000\r", sizeof("0000000000000000000000000\r") - 1); fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } + if (mtouch->cmd[0] == 'S' && mtouch->cmd[1] == 'P' && mtouch->cmd[2] == '1') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "A\r", 2); + } } void From c71ca84d815e8c8d2c319e5128b5789d798d9a94 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Tue, 7 May 2024 15:49:28 +0600 Subject: [PATCH 09/10] Emulate a TouchPen instead --- src/device/mouse_microtouch_touchscreen.c | 36 +++++++++++++++-------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index ca0f16dd4..788413ffc 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -46,7 +46,7 @@ typedef struct mouse_microtouch_t { char cmd[512]; int cmd_pos; int mode; - uint8_t cal_cntr; + uint8_t cal_cntr, pen_mode; bool soh; bool in_reset; serial_t *serial; @@ -89,17 +89,22 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) for (i = 0; i < strlen(mtouch->cmd); i++) { mtouch->cmd[i] = toupper(mtouch->cmd[i]); } - if (mtouch->cmd[0] == 'Z' || (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O')) { + if (mtouch->cmd[0] == 'Z') { + fifo8_push(&mtouch->resp, 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); + } + if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'O') { + mtouch->pen_mode = 1; fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } if (mtouch->cmd[0] == 'U' && mtouch->cmd[1] == 'T') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t *) "QM****00\r", sizeof("QM****00\r") - 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "TP****00\r", sizeof("TP****00\r") - 1); } if (mtouch->cmd[0] == 'O' && mtouch->cmd[1] == 'I') { fifo8_push(&mtouch->resp, 1); - fifo8_push_all(&mtouch->resp, (uint8_t *) "Q10200\r", sizeof("Q10200\r") - 1); + fifo8_push_all(&mtouch->resp, (uint8_t *) "P50200\r", sizeof("P50200\r") - 1); } if (mtouch->cmd[0] == 'F' && mtouch->cmd[1] == 'T') { mtouch->mode = MODE_TABLET; @@ -120,6 +125,7 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) mtouch->in_reset = true; mtouch->mode = MODE_TABLET; mtouch->cal_cntr = 0; + mtouch->pen_mode = 3; timer_on_auto(&mtouch->reset_timer, 500. * 1000.); } if (mtouch->cmd[0] == 'A' && (mtouch->cmd[1] == 'D' || mtouch->cmd[1] == 'E')) { @@ -139,6 +145,8 @@ microtouch_process_commands(mouse_microtouch_t *mtouch) fifo8_push_all(&mtouch->resp, (uint8_t *) "1\r", 2); } if (mtouch->cmd[0] == 'P') { + if (mtouch->cmd[1] == 'F') mtouch->pen_mode = 3; + else if (mtouch->cmd[1] == 'O') mtouch->pen_mode = 2; fifo8_push(&mtouch->resp, 1); fifo8_push_all(&mtouch->resp, (uint8_t *) "0\r", 2); } @@ -212,7 +220,8 @@ mtouch_poll(void *priv) double abs_y; int b = mouse_get_buttons_ex(); mouse_get_abs_coords(&abs_x, &abs_y); - dev->b |= b & 1; + dev->b |= !!(b & 3); + if (abs_x >= 1.0) abs_x = 1.0; if (abs_y >= 1.0) @@ -244,16 +253,16 @@ mtouch_poll(void *priv) if (abs_y >= 1.0) abs_y = 1.0; } - if (dev->cal_cntr && (!(dev->b & 1) && (b & 1))) { + if (dev->cal_cntr && (!(dev->b & 1) && !!(b & 3))) { dev->b |= 1; - } else if (dev->cal_cntr && ((dev->b & 1) && !(b & 1))) { + } else if (dev->cal_cntr && ((dev->b & 1) && !!(b & 3))) { dev->b &= ~1; microtouch_calibrate_timer(dev); } if (dev->cal_cntr) { return 0; } - if (b & 1) { + if (!!(b & 3)) { dev->abs_x = abs_x; dev->abs_y = abs_y; dev->b |= 1; @@ -261,21 +270,21 @@ mtouch_poll(void *priv) abs_x_int = abs_x * 16383; abs_y_int = 16383 - abs_y * 16383; - fifo8_push(&dev->resp, 0b11000000); + fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode & 2) ? ((1 << 5) | ((b & 3))) : 0)); fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111); fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); - } else if ((dev->b & 1) && !(b & 1)) { + } else if ((dev->b & 1) && !(b & 3)) { dev->b &= ~1; abs_x_int = dev->abs_x * 16383; abs_y_int = 16383 - dev->abs_y * 16383; - fifo8_push(&dev->resp, 0b11000000); + fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode & 2) ? ((1 << 5)) : 0)); fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111); fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); - fifo8_push(&dev->resp, 0b10000000); + fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode & 2) ? ((1 << 5)) : 0)); fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111); @@ -302,6 +311,7 @@ mtouch_init(const device_t *info) timer_add(&dev->reset_timer, microtouch_reset_complete, dev, 0); timer_on_auto(&dev->host_to_serial_timer, (1000000. / 9600.) * 10); dev->mode = MODE_TABLET; + dev->pen_mode = 3; mouse_input_mode = 1; mouse_set_buttons(2); mouse_set_poll_ex(mtouch_poll_global); @@ -348,7 +358,7 @@ static const device_config_t mtouch_config[] = { }; const device_t mouse_mtouch_device = { - .name = "3M MicroTouch SMT3", + .name = "3M MicroTouch TouchPen 4", .internal_name = "microtouch_touchpen", .flags = DEVICE_COM, .local = 0, From ef7b4044ef812420b54f29141fdce8f3410fa431 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 20 May 2024 13:05:35 +0600 Subject: [PATCH 10/10] Report finger touches if in Pen or Finger mode --- src/device/mouse_microtouch_touchscreen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/device/mouse_microtouch_touchscreen.c b/src/device/mouse_microtouch_touchscreen.c index 788413ffc..db889249e 100644 --- a/src/device/mouse_microtouch_touchscreen.c +++ b/src/device/mouse_microtouch_touchscreen.c @@ -270,7 +270,7 @@ mtouch_poll(void *priv) abs_x_int = abs_x * 16383; abs_y_int = 16383 - abs_y * 16383; - 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, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111); @@ -279,12 +279,12 @@ mtouch_poll(void *priv) dev->b &= ~1; abs_x_int = dev->abs_x * 16383; abs_y_int = 16383 - dev->abs_y * 16383; - fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode & 2) ? ((1 << 5)) : 0)); + fifo8_push(&dev->resp, 0b11000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111); fifo8_push(&dev->resp, (abs_y_int >> 7) & 0b1111111); - fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode & 2) ? ((1 << 5)) : 0)); + fifo8_push(&dev->resp, 0b10000000 | ((dev->pen_mode == 2) ? ((1 << 5)) : 0)); fifo8_push(&dev->resp, abs_x_int & 0b1111111); fifo8_push(&dev->resp, (abs_x_int >> 7) & 0b1111111); fifo8_push(&dev->resp, abs_y_int & 0b1111111);