bootstrap::xf86-input-mouse

Andy-Python-Programmer · Andy-Python-Programmer · commit c3f5944a04b3 · 2023-02-04T13:21:36.000+11:00
Signed-off-by: Andy-Python-Programmer &lt;andypythonappdeveloper@gmail.com&gt;
diff --git a/bootstrap/xorg.yml b/bootstrap/xorg.yml
@@ -659,6 +659,47 @@ packages:
         environ:
           DESTDIR: '@THIS_COLLECT_DIR@'
 
+  - name: xf86-input-mouse
+    source:
+      subdir: 'bundled'
+      git: 'https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse.git'
+      tag: 'xf86-input-mouse-1.9.4'
+      version: '1.9.4'
+      tools_required:
+        - host-autoconf-v2.69
+        - host-automake-v1.16
+        - host-libtool
+        - host-pkg-config
+        - host-xorg-macros
+      regenerate:
+        - args: ['./autogen.sh']
+          environ:
+            NOCONFIGURE: 'yes'
+    tools_required:
+      - host-gcc
+      - host-autoconf-v2.69
+      - host-automake-v1.16
+      - host-pkg-config
+    pkgs_required:
+      - mlibc
+      - xorg-server
+      - xorg-util-macros
+      - libx11
+    configure:
+      - args:
+        - '@THIS_SOURCE_DIR@/configure'
+        - '--host=x86_64-aero'
+        - '--prefix=/usr'
+        - '--sysconfdir=/etc'
+        - '--localstatedir=/var'
+        - '--disable-static'
+        - '--with-sysroot=@SYSROOT_DIR@' # Set libtool's lt_sysroot.
+    build:
+      - args: ['make', '-j@PARALLELISM@']
+      - args: ['make', 'install-strip']
+        environ:
+          DESTDIR: '@THIS_COLLECT_DIR@'
+
   # `libxfont` provides the core of the legacy X11 font system, handling the index
   # files
   - name: libxfont2
diff --git a/patches/mlibc/mlibc.patch b/patches/mlibc/mlibc.patch
@@ -1,22 +1,21 @@
-From 9f270baad38e7f90bd7c67780ae8f78d66c00de5 Mon Sep 17 00:00:00 2001
+From 9591f4a8fe0242eafb16c5816455f1d763b19b77 Mon Sep 17 00:00:00 2001
 From: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
-Date: Sun, 18 Dec 2022 14:31:45 +1100
+Date: Wed, 1 Feb 2023 16:53:35 +1100
 Subject: [PATCH] <xxx>
 
 ---
- .gitignore                              |   2 +
- options/ansi/generic/stdlib-stubs.cpp   | 185 +++++++++++++++++++++++-
- options/glibc/generic/execinfo.cpp      |   5 +-
- options/posix/generic/dlfcn-stubs.cpp   |   1 +
- options/posix/generic/termios-stubs.cpp |   5 +-
- options/rtdl/generic/linker.cpp         |   2 +-
- sysdeps/aero/generic/aero.cpp           |  71 +++++----
- sysdeps/aero/generic/filesystem.cpp     |  35 ++++-
- sysdeps/aero/generic/sockets.cpp        |  87 ++++++++++-
- sysdeps/aero/generic/time.cpp           |  24 +++
- sysdeps/aero/include/aero/syscall.h     |   9 ++
- sysdeps/aero/meson.build                |   1 +
- 12 files changed, 381 insertions(+), 46 deletions(-)
+ .gitignore                            |   2 +
+ options/ansi/generic/stdlib-stubs.cpp | 185 ++++++++++++++++++++++++--
+ options/glibc/generic/execinfo.cpp    |   5 +-
+ options/posix/generic/dlfcn-stubs.cpp |   1 +
+ options/rtdl/generic/linker.cpp       |   2 +-
+ sysdeps/aero/generic/aero.cpp         |  69 ++++++----
+ sysdeps/aero/generic/filesystem.cpp   |  35 ++++-
+ sysdeps/aero/generic/sockets.cpp      |  87 +++++++++++-
+ sysdeps/aero/generic/time.cpp         |  24 ++++
+ sysdeps/aero/include/aero/syscall.h   |   9 ++
+ sysdeps/aero/meson.build              |   1 +
+ 11 files changed, 374 insertions(+), 46 deletions(-)
  create mode 100644 sysdeps/aero/generic/time.cpp
 
 diff --git a/.gitignore b/.gitignore
@@ -283,36 +282,32 @@ index 2e2d3f1..3ff5fef 100644
  constexpr bool eagerBinding = true;
  
 diff --git a/sysdeps/aero/generic/aero.cpp b/sysdeps/aero/generic/aero.cpp
-index 29fb961..ee09678 100644
+index 29fb961..b5945a8 100644
 --- a/sysdeps/aero/generic/aero.cpp
 +++ b/sysdeps/aero/generic/aero.cpp
-@@ -62,6 +62,16 @@ static frg::vector<Slice, MemoryAllocator> create_slice(char *const arg[]) {
+@@ -62,29 +62,33 @@ static frg::vector<Slice, MemoryAllocator> create_slice(char *const arg[]) {
  }
  
  namespace mlibc {
+-int sys_futex_tid() {
+-    // SAFETY: gettid does not return any errors (ie. the call is always
+-    // successful).
+-    return syscall(SYS_GETTID);
+-}
+-
+-int sys_futex_wait(int *pointer, int expected, const struct timespec *time) {
+-    auto result = syscall(SYS_FUTEX_WAIT, pointer, expected, time);
 +int sys_uname(struct utsname *buf) {
 +    auto result = syscall(SYS_UNAME, buf);
-+
-+    if (result < 0) {
-+        return -result;
-+    }
-+
+ 
+     if (result < 0) {
+         return -result;
+     }
+ 
 +    return result;
 +}
 +
- int sys_futex_tid() {
-     // SAFETY: gettid does not return any errors (ie. the call is always
-     // successful).
-@@ -69,22 +79,22 @@ int sys_futex_tid() {
- }
- 
- int sys_futex_wait(int *pointer, int expected, const struct timespec *time) {
--    auto result = syscall(SYS_FUTEX_WAIT, pointer, expected, time);
--
--    if (result < 0) {
--        return -result;
--    }
--
++int sys_futex_wait(int *pointer, int expected, const struct timespec *time) {
 +    // auto result = syscall(SYS_FUTEX_WAIT, pointer, expected, time);
 +    //
 +    // if (result < 0) {
@@ -338,7 +333,7 @@ index 29fb961..ee09678 100644
      return 0;
  }
  
-@@ -124,7 +134,9 @@ int sys_anon_free(void *pointer, size_t size) {
+@@ -124,7 +128,9 @@ int sys_anon_free(void *pointer, size_t size) {
  }
  
  void sys_libc_panic() {
@@ -349,7 +344,7 @@ index 29fb961..ee09678 100644
      sys_exit(1);
  }
  
-@@ -140,8 +152,15 @@ void sys_exit(int status) {
+@@ -140,8 +146,15 @@ void sys_exit(int status) {
  
  pid_t sys_getpid() {
      auto result = syscall(SYS_GETPID);
@@ -366,7 +361,7 @@ index 29fb961..ee09678 100644
      return result;
  }
  
-@@ -162,11 +181,6 @@ pid_t sys_getpgid(pid_t pid, pid_t *pgid) {
+@@ -162,11 +175,6 @@ pid_t sys_getpgid(pid_t pid, pid_t *pgid) {
      return 0;
  }
  
@@ -378,7 +373,7 @@ index 29fb961..ee09678 100644
  int sys_clock_get(int clock, time_t *secs, long *nanos) {
      struct timespec ts;
      auto result = syscall(SYS_GETTIME, clock, &ts);
-@@ -233,7 +247,11 @@ uid_t sys_geteuid() {
+@@ -233,7 +241,11 @@ uid_t sys_geteuid() {
      return 0;
  }
  
@@ -391,7 +386,7 @@ index 29fb961..ee09678 100644
  int sys_seteuid(uid_t euid) UNIMPLEMENTED("sys_seteuid")
  
  gid_t sys_getgid() {
-@@ -256,16 +274,19 @@ int sys_setegid(gid_t egid) {
+@@ -256,16 +268,19 @@ int sys_setegid(gid_t egid) {
      return 0;
  }
  
@@ -647,5 +642,5 @@ index a807b37..878c216 100644
  
  if not no_headers
 -- 
-2.38.1
+2.39.1
 
diff --git a/patches/xf86-input-mouse/xf86-input-mouse.patch b/patches/xf86-input-mouse/xf86-input-mouse.patch
@@ -0,0 +1,164 @@
+From 560b74fa3e234dced21e0bbf03ea444197b7da15 Mon Sep 17 00:00:00 2001
+From: Andy-Python-Programmer <andypythonappdeveloper@gmail.com>
+Date: Sat, 4 Feb 2023 13:21:25 +1100
+Subject: [PATCH xf86-input-mouse] <xxx>
+
+---
+ configure.ac     |   3 ++
+ src/Makefile.am  |   2 +-
+ src/aero_mouse.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 119 insertions(+), 1 deletion(-)
+ create mode 100644 src/aero_mouse.c
+
+diff --git a/configure.ac b/configure.ac
+index 6c453cd..a3dd16d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,6 +81,9 @@ case $host_os in
+   solaris*)
+     OS_MOUSE_NAME=sun
+     ;;
++  aero*)
++    OS_MOUSE_NAME=aero
++    ;;
+   gnu*)
+     OS_MOUSE_NAME=hurd
+     ;;
+diff --git a/src/Makefile.am b/src/Makefile.am
+index aad8d0e..6de4354 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,7 +32,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS)
+ 
+ # We have to list all the mouse drivers here, even if we don't build them, so
+ # they get included in distcheck.
+-OS_SRCS = bsd_mouse.c hurd_mouse.c lnx_mouse.c sun_mouse.c
++OS_SRCS = bsd_mouse.c hurd_mouse.c lnx_mouse.c sun_mouse.c aero_mouse.c
+ 
+ @DRIVER_NAME@_drv_la_SOURCES = \
+ 	mouse.c \
+diff --git a/src/aero_mouse.c b/src/aero_mouse.c
+new file mode 100644
+index 0000000..de18985
+--- /dev/null
++++ b/src/aero_mouse.c
+@@ -0,0 +1,115 @@
++#include "mouse.h"
++#include <fcntl.h>
++#include <stddef.h>
++#include <unistd.h>
++#include <stdio.h>
++#include <stdint.h>
++#include <sys/stat.h>
++
++#include "xf86_OSlib.h"
++
++#define MOUSE_FLAG_LB (1 << 0)
++#define MOUSE_FLAG_RB (1 << 1)
++#define MOUSE_FLAG_MB (1 << 2)
++
++#define DEVPATH "/dev/mouse0"
++
++struct mouse_packet {
++    int16_t x;
++    int16_t y;
++
++    uint8_t flags;
++};
++
++static void MouseReadInput(InputInfoPtr pInfo) {
++    MouseDevPtr mouse = pInfo->private;
++
++    struct mouse_packet packet;
++    
++    for (;;) {
++        size_t result = read(pInfo->fd, &packet, sizeof(struct mouse_packet));
++
++        if (result != sizeof(struct mouse_packet)) {
++            break; 
++        }
++        
++        int b = mouse->lastButtons;
++        b &= ~0x7;
++
++        b |= (packet.flags & MOUSE_FLAG_RB) ? 1 : 0;
++        b |= (packet.flags & MOUSE_FLAG_MB) ? 2 : 0;
++        b |= (packet.flags & MOUSE_FLAG_LB) ? 4 : 0;
++
++        mouse->PostEvent(pInfo, b, packet.x, -packet.y, 0, 0);
++    }
++}
++
++static Bool OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags) {
++    MouseDevPtr mouse = pInfo->private;
++    mouse->protocol = protocol;
++
++    xf86ProcessCommonOptions(pInfo, pInfo->options);
++
++    pInfo->fd = xf86OpenSerial(pInfo->options);
++    if (pInfo->fd == -1) {
++        xf86Msg(X_ERROR, "%s: cannot open %s\n", pInfo->name, DEVPATH);
++        return FALSE;
++    }
++
++    mouse->CommonOptions(pInfo);
++    pInfo->read_input = MouseReadInput;
++    return TRUE;
++}
++
++static const char *internalNames[] = {
++    "Aero",
++    NULL
++};
++
++static const char ** BuiltinNames(void) {
++    return internalNames;
++}
++
++static Bool CheckProtocol(const char *protocol) {
++    for (int i = 0; internalNames[i]; i++) {
++        if (xf86NameCmp(protocol, internalNames[i]) == 0)
++            return TRUE;
++    }
++
++    return FALSE;
++}
++
++static const char *FindDevice(InputInfoPtr pInfo, const char *protocol, int flags) {
++    struct stat st;
++
++    if (stat(DEVPATH, &st) == -1)
++        return NULL;
++
++    pInfo->options = xf86AddNewOption(pInfo->options, "Device", DEVPATH);
++    return DEVPATH;
++}
++
++static const char *DefaultProtocol(void) {
++    return "Aero";
++}
++
++static int SupportedInterfaces(void) {
++    return MSE_PS2;
++}
++
++OSMouseInfoPtr OSMouseInit(int flags) {
++    OSMouseInfoPtr p;
++
++    p = calloc(sizeof(OSMouseInfoRec), 1);
++    if (p == NULL)
++        return NULL;
++
++    p->SupportedInterfaces = SupportedInterfaces;
++    p->BuiltinNames = BuiltinNames;
++    p->FindDevice = FindDevice;
++    p->DefaultProtocol = DefaultProtocol;
++    p->CheckProtocol = CheckProtocol;
++    p->PreInit = OsMousePreInit;
++
++    return p;
++}
+\ No newline at end of file
+-- 
+2.39.1
+
diff --git a/src/aero_kernel/src/drivers/keyboard.rs b/src/aero_kernel/src/drivers/keyboard.rs
@@ -280,9 +280,9 @@ pub fn ps2_keyboard_init() {
 
         let mut config = ConfigFlags::from_bits_truncate(io::inb(0x60));
 
-        config.remove(ConfigFlags::FIRST_DISABLED);
+        config.remove(ConfigFlags::FIRST_DISABLED | ConfigFlags::SECOND_DISABLED);
         config.remove(ConfigFlags::FIRST_TRANSLATE); // Use scancode set 2
-        config.insert(ConfigFlags::FIRST_INTERRUPT);
+        config.insert(ConfigFlags::FIRST_INTERRUPT | ConfigFlags::SECOND_INTERRUPT);
 
         io::outb(0x64, 0x60); // command: write config
         io::outb(0x60, config.bits());
@@ -295,6 +295,8 @@ pub fn ps2_keyboard_init() {
 
     apic::io_apic_setup_legacy_irq(1, keyboard_vector, 1);
 
+    super::mouse::ps2_mouse_init();
+
     // TODO: Move this into /dev/input instead
     // TODO: Add support for multiple keyboards
     register_keyboard_listener(KEYBOARD.as_ref().clone());
diff --git a/src/aero_kernel/src/drivers/mod.rs b/src/aero_kernel/src/drivers/mod.rs
@@ -28,6 +28,7 @@ pub mod keyboard;
 #[cfg(target_arch = "x86_64")]
 pub mod lai;
 // FIXME: aarch64 port
+pub mod mouse;
 #[cfg(target_arch = "x86_64")]
 pub mod pci;
 pub mod pty;
diff --git a/src/aero_kernel/src/drivers/mouse.rs b/src/aero_kernel/src/drivers/mouse.rs
diff --git a/src/aero_kernel/src/userland/task.rs b/src/aero_kernel/src/userland/task.rs
