From 9088fbb6b99db62f8326c4c24254f2c13507e5a1 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 26 May 2021 22:43:17 -0700 Subject: [PATCH] postmarketos-mkinitfs: disable ps2mouse module when running directfb (MR 2201) On my librem 5 when using directfb in initfs, touch input is really inconsistent... the cursor seems to jump around and it's hard to enter keys in osk-sdl. This is completely 'fixed' by disabling the ps2mouse input module in dfb. I guess this might cause mice to stop working (?), but I can't think of any situation where someone would run osk-sdl in initfs on a device that has a ps2 mouse but no keyboard (which would make more sense to use for entry than the mouse..) --- main/postmarketos-mkinitfs/APKBUILD | 5 ++--- main/postmarketos-mkinitfs/init_functions.sh | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index dd8606606..2877f5463 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-mkinitfs pkgver=0.25 -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" depends=" @@ -51,11 +51,10 @@ package() { check() { /bin/busybox sh ./mkinitfs_test.sh } - sha512sums=" 4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules 1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in -6a36c2a7a3774b18557ae02c97d8e8a251dcdb0e297a2f7343baba2b475b47f369a1eaefecec221706ad2ea93e763e1c383c4b459eb9534d7f9229559027c941 init_functions.sh +e72adfb06745ad596a02837c8d52837490a7940f4d5589b8937155ee1be1bc4176d79d3f24c40882d20592d00c23c2daf3ef1ceba6ef05cadb76906084373f1b init_functions.sh 4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95 mkinitfs.sh 93dfd3516870d388d5d124c162c43a327aa716eeabbc8cbed3378711e9347ef76919c09dac051f833230caff7607008d4c38022cc1d910c7392012e22818e890 mkinitfs_functions.sh c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 404b30f5b..a218bfbb2 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -492,7 +492,9 @@ run_osk_sdl() { # Set up directfb and tslib # Note: linux_input module is disabled since it will try to take over # the touchscreen device from tslib (e.g. on the N900) - export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input" + # Note: ps2mouse module is disabled because it causes + # jerky/inconsistent touch input on some devices + export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input,disable-module=ps2mouse" export SDL_VIDEODRIVER="directfb" # SDL/directfb tries to use gles even though it's not # actually available, so disable it in osk-sdl