Fix: Added rfkill support as a feature flag (#298)

* Fix: Added rfkill as a feature flag

* Updated Makefile

* docs: update build instructions

* Remove rfkill feature from PKGBUILD

* updated flag to no_rfkill

* updated docs

---------

Co-authored-by: Ishan Joshi <[email protected]>

Author: manthanabc

INSTALL.md

@@ -6,6 +6,8 @@ We have packaged `swhkd-git`. `swhkd-bin` has been packaged separately by a user
 
 `swhkd` and `swhks` install to `/usr/local/bin/` by default. You can change this behaviour by editing the [Makefile](../Makefile) variable, `DESTDIR`, which acts as a prefix for all installed files. You can also specify it in the make command line, e.g. to install everything in `subdir`: `make DESTDIR="subdir" install`.
 
+Note: On some systems swhkd daemon might disable wifi due to issues with rfkill, you could pass `make NO_RFKILL_SW_SUPPORT=1` while buliding to disable rfkill support.
+
 # Dependencies:
 
 **Runtime:**

Makefile

@@ -9,6 +9,10 @@ MAN1_DIR := /usr/share/man/man1
 MAN5_DIR := /usr/share/man/man5
 VERSION = $(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/["]/, "", $$2); printf("%s",$$2) }' Cargo.toml)
 
+ifneq ($(NO_RFKILL_SW_SUPPORT),)
+	BUILDFLAGS += --features "no_rfkill"
+endif
+
 all: build
 
 build:

contrib/PKGBUILD

@@ -4,7 +4,7 @@
 
 _pkgname="swhkd"
 pkgname="${_pkgname}-git"
-pkgver=1.2.1.r17.g022466e
+pkgver=1.2.1.r92.ge972f55
 pkgrel=1
 arch=("x86_64")
 url="https://github.com/waycrate/swhkd"
@@ -21,7 +21,7 @@ sha256sums=("SKIP"
 build(){
 	cd "$_pkgname"
 	make setup
-	make
+	make NO_RFKILL_SW_SUPPORT=1
 }
 
 package() {

swhkd/Cargo.toml

@@ -12,6 +12,9 @@ authors = [
 [build-dependencies]
 flate2 = "1.0.24"
 
+[features]
+no_rfkill = []
+
 [dependencies]
 clap = { version = "4.1.0", features = ["derive"] }
 env_logger = "0.9.0"

swhkd/src/uinput.rs

@@ -3,10 +3,14 @@ use evdev::{
     AttributeSet, Key, RelativeAxisType, SwitchType,
 };
 
+#[cfg(not(feature = "no_rfkill"))]
 use nix::ioctl_none;
+#[cfg(not(feature = "no_rfkill"))]
 use std::fs::File;
+#[cfg(not(feature = "no_rfkill"))]
 use std::os::unix::io::AsRawFd;
 
+#[cfg(not(feature = "no_rfkill"))]
 ioctl_none!(rfkill_noinput, b'R', 1);
 
 pub fn create_uinput_device() -> Result<VirtualDevice, Box<dyn std::error::Error>> {
@@ -36,10 +40,15 @@ pub fn create_uinput_switches_device() -> Result<VirtualDevice, Box<dyn std::err
     // its default mode. Thus, we disable rfkill-input temporarily, hopefully
     // fast enough that it won't impact anyone. rfkill-input will be enabled
     // again when the file gets closed.
-    let rfkill_file = File::open("/dev/rfkill")?;
-    unsafe {
-        rfkill_noinput(rfkill_file.as_raw_fd())?;
+    // Implemented as feature for it causes issues with radio on some platforms.
+    #[cfg(not(feature = "no_rfkill"))]
+    {
+        let rfkill_file = File::open("/dev/rfkill")?;
+        unsafe {
+            rfkill_noinput(rfkill_file.as_raw_fd())?;
+        }
     }
+
     let device = VirtualDeviceBuilder::new()?
         .name("swhkd switches virtual output")
         .with_switches(&switches)?
@@ -622,6 +631,7 @@ pub fn get_all_switches() -> &'static [SwitchType] {
         SwitchType::SW_LID,
         SwitchType::SW_TABLET_MODE,
         SwitchType::SW_HEADPHONE_INSERT,
+        #[cfg(not(feature = "no_rfkill"))]
         SwitchType::SW_RFKILL_ALL,
         SwitchType::SW_MICROPHONE_INSERT,
         SwitchType::SW_DOCK,