Fix grabbing input device and fix brightness ( at least for the nia )

Szybet · Oct 7, 2023 · ec015f7 · ec015f7
1 parent 665f98a
commit ec015f7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/koreader/ffi/linux_input_h.lua b/koreader/ffi/linux_input_h.lua
@@ -1,7 +1,8 @@
 local ffi = require("ffi")
 
+-- I removed grabber
+
 ffi.cdef[[
-static const int EVIOCGRAB = 1074021776;
 static const int EVIOCGREP = 2148025603;
 static const int EVIOCSREP = 1074283779;
 static const int EV_SYN = 0;

diff --git a/koreader/frontend/device/kobo/device.lua b/koreader/frontend/device/kobo/device.lua
@@ -395,6 +395,13 @@ local KoboLuna = Kobo:extend{
     isMk7 = yes,
     canToggleChargingLED = yes,
     hasFrontlight = yes,
+        frontlight_settings = {
+        frontlight_white = "/sys/class/backlight/mxc_msp430.0/brightness",
+        frontlight_mixer = "/sys/class/backlight/lm3630a_led/color",
+        nl_min = 0,
+        nl_max = 100,
+        nl_inverted = false,
+    },
     touch_phoenix_protocol = true,
     display_dpi = 212,
     hasReliableMxcWaitFor = no, -- Board is similar to the Libra 2, but it's such an unpopular device that reports are scarce.

diff --git a/koreader/frontend/device/kobo/powerd.lua b/koreader/frontend/device/kobo/powerd.lua
@@ -159,9 +159,6 @@ function KoboPowerD:init()
             if self.device:hasNaturalLightMixer() then
                 local kobolight = require("ffi/kobolight")
                 local ok, light = pcall(kobolight.open)
-                if ok then
-                    self.device.frontlight_settings.frontlight_ioctl = light
-                end
             end
             self.fl = SysfsLight:new(self.device.frontlight_settings)
             self.fl_warmth = 0
@@ -193,6 +190,7 @@ function KoboPowerD:init()
             -- we jump through a couple of hoops in turnOnFrontlightHW to recover from the first quirky toggle...
         end
     end
+    self.fl = SysfsLight:new(self.device.frontlight_settings)
 end
 
 function KoboPowerD:saveSettings()

diff --git a/koreader/frontend/device/sysfs_light.lua b/koreader/frontend/device/sysfs_light.lua
@@ -70,11 +70,7 @@ function SysfsLight:setNaturalBrightness(brightness, warmth)
     if self.frontlight_mixer then
         if set_brightness then
             -- Prefer the ioctl, as it's much lower latency.
-            if self.frontlight_ioctl then
-                self.frontlight_ioctl:setBrightness(brightness)
-            else
                 ffiUtil.writeToSysfs(brightness, self.frontlight_white)
-            end
         end
         -- The mixer might be using inverted values... (cold is nl_max, warm is nl_min)
         if set_warmth then

diff --git a/koreader/koreader.sh b/koreader/koreader.sh
@@ -20,6 +20,9 @@ export EXT_FONT_DIR="/system-lib/qt/lib/fonts/"
 
 export LD_LIBRARY_PATH="/system-lib/lib/:/app-bin/koreader/libs/"
 
+# Prevent grab
+export KO_DONT_GRAB_INPUT="true"
+
 # check whether PLATFORM & PRODUCT have a value assigned by rcS
 if [ -z "${PRODUCT}" ]; then
     # shellcheck disable=SC2046