Skip to content

Commit

Permalink
* Update to Weston 14.0
Browse files Browse the repository at this point in the history
* Add brightness control with ddccontrol
* Add brightness control with brightnessctl
* Add option to hide apps from /usr/share/applications
* Add option to hide volume icon
* Misc fixes and improvements
  • Loading branch information
varmd committed Sep 15, 2024
1 parent 877595f commit e8e875f
Show file tree
Hide file tree
Showing 12 changed files with 706 additions and 190 deletions.
4 changes: 2 additions & 2 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pkgname=wayward
pkgver=1.3.0
pkgrel=2
pkgver=1.4.0
pkgrel=4
pkgdesc="wayward - fast desktop shell for wayland and weston"
arch=('x86_64')
url="https://github.com/varmd/wayward"
Expand Down
37 changes: 35 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,47 @@ For shutdown and reboot icons to work install sudo and add to /etc/sudoers

## Hiding apps in the app panel

Edit weston.ini and add hide-apps to the shell section. For example
Edit weston.ini and add hide-apps to the shell section.

hide-apps=mpv,zathura,file-roller

## Hiding apps in the app panel

To hide apps from /usr/share/applications edit weston.ini and add the following to the shell section.

hide-all-apps=true

## Brightness control with ddccontrol

Since 1.4.0 it is possible to control monitor brightness with ddccontrol.
First install ddccontrol, and test to see if it is working with your monitor.
Then add the following to weston.ini, where example is the number from /dev/i2c-number
in the output of `ddccontrol -p`. Brightness can then be changed from the app panel.

enable-brightness-ddc=true
ddc-i2c-number=example

This feature is currently limited to desktops with a single monitor.

## Brightness control with brightnessctl

Since 1.4.0 it is possible to control laptop brightness with brightnessctl.
First install brightnessctl, and configure it to work with your laptop.
Then add the following to weston.ini, where example is the laptop backlight device name from `brightnessctl info`

enable-brightness-ctl=true
brightnessctl-device=example

## Changing wallpaper

Wallpapers are changed from weston.ini. See weston.ini documentation - https://www.mankier.com/5/weston.ini#Shell_Section-background-image

## Hiding sound control

To hide the sound control edit weston.ini and add the following to the shell section.

disable-sound-icons=true

## Pincodes

Since 1.2.5 it is now possible to set numeric, up to six digit, pincodes for the lock screen.
Expand All @@ -86,6 +118,8 @@ To set a pincode run as root wayward-set-pincode, and then restart weston. For e

## Changelog

1.4.0 - Update to Weston 14.0. Add brightness control with ddcontrol or brightnessctl.

1.3.0 - Update to Weston 13.0. Add red color option to the wayward-terminal. Add list of open apps without minimized apps.

1.2.5 - Add pincode to lock screen
Expand Down Expand Up @@ -114,7 +148,6 @@ To set a pincode run as root wayward-set-pincode, and then restart weston. For e
## Known issues and limitations

* If there are large number of applications in /usr/share/applications, app icons will overlap with system icons. This can be fixed by hiding apps in weston.ini.
* Misconfigured or broken audio such as AMD HDMI audio can cause crash on startup. As a workaround audio setup should be fixed. For example for AMD HDMI audio built-in soundcard can be used as a workaround - e.g by setting snd_hda_intel.index=1,0 if built in soundcard comes as second when running aplay -l
* Multimonitor support - not tested after removal of GTK
* Need to restart weston after a new app installation to see the new app icon in the panel.

Expand Down
2 changes: 1 addition & 1 deletion source/source/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

WESTON_VER=13
WESTON_VER=14

cd `dirname $0`

Expand Down
4 changes: 4 additions & 0 deletions source/source/icons/display-brightness-symbolic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions source/source/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ echo $1
echo $0

/usr/bin/install -Dm644 wayward "$1/usr/lib/weston/wayward"
/usr/bin/install -Dm644 wayward-lsdesktopf "$1/usr/lib/weston/wayward-lsdesktopf"
/usr/bin/install -Dm655 wayward-set-pincode "/usr/bin/wayward-set-pincode"
/usr/bin/install -Dm644 scripts/wayward-lsdesktopf "$1/usr/lib/weston/wayward-lsdesktopf"
/usr/bin/install -Dm644 scripts/wayward-get-brightness-ddc "$1/usr/lib/weston/wayward-get-brightness-ddc"
/usr/bin/install -Dm644 scripts/wayward-get-brightness-ctl "$1/usr/lib/weston/wayward-get-brightness-ctl"
/usr/bin/install -Dm655 wayward-set-pincode "$1/usr/bin/wayward-set-pincode"
/usr/bin/install -Dm644 shell_helper.so "$1/usr/lib/weston/shell_helper.so"
/usr/bin/install -Dm655 wayward-terminal "$1/usr/bin/wayward-terminal"
/usr/bin/install -Dm655 wayward-pincode "$1/usr/lib/weston/wayward-pincode"
Expand All @@ -25,5 +27,4 @@ rm -rf wayward-terminal
mkdir -p $1/usr/share/wayward
cp icons/* $1/usr/share/wayward/

#make
echo OOOK!
22 changes: 22 additions & 0 deletions source/source/scripts/wayward-get-brightness-ctl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

stringContains() { [ -z "${2##*$1*}" ]; }

if [[ -z "$1" ]]; then
echo "no brightnessctl device"
exit;
fi

OUT=`brightnessctl --device ${1} i 2>/dev/null`

OUT=${OUT##*Current}

OUT=${OUT##*\(}
OUT=${OUT%\%*}

BRIGHTNESS=$OUT

printf $BRIGHTNESS > $HOME/.cache/wayward-brightness

exit;

19 changes: 19 additions & 0 deletions source/source/scripts/wayward-get-brightness-ddc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

stringContains() { [ -z "${2##*$1*}" ]; }

if [[ -z "$1" ]]; then
echo "no i2c number"
exit;
fi

OUT=`ddccontrol -r 0x10 dev:/dev/i2c-${1} 2>/dev/null | grep -i Control `

OUT=${OUT##*Control}

OUT=${OUT#*/}
BRIGHTNESS=${OUT%/*}

printf $BRIGHTNESS > $HOME/.cache/wayward-brightness
exit;

File renamed without changes.
Loading

0 comments on commit e8e875f

Please sign in to comment.