diff options
| author | Que Quotion | 2019-12-10 04:03:54 +0900 |
|---|---|---|
| committer | Que Quotion | 2019-12-10 04:03:54 +0900 |
| commit | 14e764cad9eaf4f441676eb12ae623e65dcccce3 (patch) | |
| tree | f2f8183456cda143ffd62fc1b5020c58bba04d03 | |
| parent | d16d0a8375730684710de3de36a2cc5a5193696d (diff) | |
| download | aur-14e764cad9eaf4f441676eb12ae623e65dcccce3.tar.gz | |
compton -> picom (except in dbus); drop obsession, add openbox autostart config; do not start compositor with session file
| -rw-r--r-- | .SRCINFO | 32 | ||||
| -rw-r--r-- | PKGBUILD | 36 | ||||
| -rw-r--r-- | autostart | 15 | ||||
| -rw-r--r-- | menu.xml | 3 | ||||
| -rwxr-xr-x | obsession | 7 | ||||
| -rw-r--r-- | obsession.desktop | 10 | ||||
| -rw-r--r-- | pantheon-openbox.desktop | 2 | ||||
| -rw-r--r-- | pantheon-openbox.session | 2 | ||||
| -rw-r--r-- | picom-dbus.desktop (renamed from compton-dbus.desktop) | 6 | ||||
| -rwxr-xr-x | picom-inverter (renamed from compton-inverter) | 22 | ||||
| -rw-r--r-- | rc.xml | 6 |
11 files changed, 68 insertions, 73 deletions
@@ -1,37 +1,35 @@ pkgbase = pantheon-lite - pkgdesc = Pantheon Lite Session (replaces Gala with Openbox & Compton) - pkgver = 4 + pkgdesc = Pantheon Lite Session (Gala replaced with openbox & picom) + pkgver = 5 pkgrel = 1 url = https://bbs.archlinux.org/viewtopic.php?pid=1402016#p1402016 arch = any groups = pantheon-qq license = GPL3 depends = openbox - depends = compton + depends = picom depends = pantheon-workarounds depends = pantheon-session depends = wingpanel-standalone-git optdepends = obconf: openbox configuration utility optdepends = elementary-os-openbox: Elementary theme for Openbox optdepends = hsetroot: Set X11 background - optdepends = xorg-xwininfo: set mousewheel transparency scrolling like compiz with compton-trans - optdepends = dbus: set window color inversion with compton-inverter (must enable dbus backend in compton) + optdepends = xorg-xwininfo: set mousewheel transparency scrolling like compiz with picom-trans + optdepends = dbus: set window color inversion with picom-inverter source = pantheon-openbox.desktop source = pantheon-openbox.session - source = compton-dbus.desktop - source = compton-inverter - source = obsession - source = obsession.desktop + source = picom-dbus.desktop + source = picom-inverter source = rc.xml source = menu.xml - sha512sums = 6cb25616a1fd238040f81eb8ed2c26f35fa9d9648c2b551df7e3bc2d56726d41d8bf08445b36cbb5b5f5412a4d2c06e09132d6cddcdba0d877d53a9fe97febab - sha512sums = b1b7d5e18795a727e4dc7430a1c7b3d417617cdd6dc0dc244ae27d8b358c5c8e1ab077a20b94743cfe0b6e1cec2f98f9fe69fcaee6776519cbc57dc1b80edfec - sha512sums = 0917b70b9811e8f4a61a5f962f9103c378385d58f2b5b62c770ed0d3f75874aa0678be468270c370248f5e24279208c38fabbff704da1ed9b67c07d8cb0becc2 - sha512sums = 8696b95b4f6b37c9edddcdbef95300d0651d56b12cf1238204874aa625a37c84a30b324b08bdfbe67735785eea2c448e09ad3e2028c0f6058b02b7d4cf665e7c - sha512sums = bced06b79cd47f2425943603dca42620cbd1c943ffbc228f470750efb08346a1570b8193a3ca310206b88a8e3f58c9d12cf03c3aa78791944cd070dbd8a0383f - sha512sums = c70588c4d844c8916a97c61fae40dab2a38527fa0d31c7261700766f2e784d642edccb1a64544b9dfdc0655dd5a6b872e9bf323029091656ae45b0924d15ea0e - sha512sums = d138b755854d2b6242d6ec10b9c92efdc8505764b7f678223cf9241deba6727cc73001bdde6a2b10377e15b459d5b978e17829a56b5bc28d7385eba766974284 - sha512sums = 500a6aea4fa1015cfffc37b8b2ec71c89e5be170197532848132e981dba6be8126f1e661e5be3ed9a19858a7af737c3ea989c0be605b0fbf3fe1d415b2e7042b + source = autostart + sha512sums = 1f950c641343e766cdd5b222dcac8f596e197fd5a9e3659a2bfce9da7020cf8575b0a64b9b7a0d810054303f03bb65f095222297682a5419eb6581517eb36e81 + sha512sums = d7fdf807af0452c35116a053e1ea858a3f38a0e5bf9f83efb567db7d75eb42307dbb63f8eb307cddc501dcfa90e9f287648ef29279dc8b56e5d3c212075ae9a2 + sha512sums = bff6d45fc78471ed9312d7be6381b541fa9a93adedef58f6ce7e09c2740e07c2a3fcf076dcaf25dd480a9164764933ba7850c7332e173acac161f36597d2786d + sha512sums = 3f1e515717bca482f4250645845baf73fadee81219684a6f3c5490f1cce48c129c5e0a32df55f26b556298e41545eca4b7d4bdea96556ca42380ff6d79acafbb + sha512sums = d93a0d7ddf70ee10d14b7f1e46257fb432cbfd9fcce7ab3b6bc3443876e0dad6453e0bcda3cf148e0dab47ce5d1d79ae22ef2921bbde46ff7f555a25a1e7bbae + sha512sums = 809ba5d0637a0ffbd0506b1b5d7e0500d5e53f06aae27d8180202c4d89d86d43661aac1dd78a3ecc5395385358c61da0b7e82857e41ab2e9be8dc6b56ba81dce + sha512sums = 3c8f56e6722903c4a4ce79ad58c3092023bf5835a59213ccfa5811b6729bcbaa4a65e6d3f86e350eba95706f54c1b90eefcd5fef570518392ac5f91cb6cfe7e8 pkgname = pantheon-lite @@ -3,38 +3,34 @@ # Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk> pkgname=pantheon-lite -pkgver=4 +pkgver=5 pkgrel=1 -pkgdesc='Pantheon Lite Session (replaces Gala with Openbox & Compton)' +pkgdesc='Pantheon Lite Session (Gala replaced with openbox & picom)' arch=('any') url='https://bbs.archlinux.org/viewtopic.php?pid=1402016#p1402016' license=('GPL3') groups=('pantheon-qq') -depends=('openbox' 'compton' pantheon-{workarounds,session} +depends=('openbox' 'picom' pantheon-{workarounds,session} 'wingpanel-standalone-git') optdepends=("obconf: openbox configuration utility" "elementary-os-openbox: Elementary theme for Openbox" "hsetroot: Set X11 background" - "xorg-xwininfo: set mousewheel transparency scrolling like compiz with compton-trans" - "dbus: set window color inversion with compton-inverter (must enable dbus backend in compton)") + "xorg-xwininfo: set mousewheel transparency scrolling like compiz with picom-trans" + "dbus: set window color inversion with picom-inverter") source=(pantheon-openbox.{desktop,session} - compton-{dbus.desktop,inverter} - obsession{,.desktop} - {rc,menu}.xml) -sha512sums=('6cb25616a1fd238040f81eb8ed2c26f35fa9d9648c2b551df7e3bc2d56726d41d8bf08445b36cbb5b5f5412a4d2c06e09132d6cddcdba0d877d53a9fe97febab' - 'b1b7d5e18795a727e4dc7430a1c7b3d417617cdd6dc0dc244ae27d8b358c5c8e1ab077a20b94743cfe0b6e1cec2f98f9fe69fcaee6776519cbc57dc1b80edfec' - '0917b70b9811e8f4a61a5f962f9103c378385d58f2b5b62c770ed0d3f75874aa0678be468270c370248f5e24279208c38fabbff704da1ed9b67c07d8cb0becc2' - '8696b95b4f6b37c9edddcdbef95300d0651d56b12cf1238204874aa625a37c84a30b324b08bdfbe67735785eea2c448e09ad3e2028c0f6058b02b7d4cf665e7c' - 'bced06b79cd47f2425943603dca42620cbd1c943ffbc228f470750efb08346a1570b8193a3ca310206b88a8e3f58c9d12cf03c3aa78791944cd070dbd8a0383f' - 'c70588c4d844c8916a97c61fae40dab2a38527fa0d31c7261700766f2e784d642edccb1a64544b9dfdc0655dd5a6b872e9bf323029091656ae45b0924d15ea0e' - 'd138b755854d2b6242d6ec10b9c92efdc8505764b7f678223cf9241deba6727cc73001bdde6a2b10377e15b459d5b978e17829a56b5bc28d7385eba766974284' - '500a6aea4fa1015cfffc37b8b2ec71c89e5be170197532848132e981dba6be8126f1e661e5be3ed9a19858a7af737c3ea989c0be605b0fbf3fe1d415b2e7042b') + picom-{dbus.desktop,inverter} + {rc,menu}.xml autostart) +sha512sums=('1f950c641343e766cdd5b222dcac8f596e197fd5a9e3659a2bfce9da7020cf8575b0a64b9b7a0d810054303f03bb65f095222297682a5419eb6581517eb36e81' + 'd7fdf807af0452c35116a053e1ea858a3f38a0e5bf9f83efb567db7d75eb42307dbb63f8eb307cddc501dcfa90e9f287648ef29279dc8b56e5d3c212075ae9a2' + 'bff6d45fc78471ed9312d7be6381b541fa9a93adedef58f6ce7e09c2740e07c2a3fcf076dcaf25dd480a9164764933ba7850c7332e173acac161f36597d2786d' + '3f1e515717bca482f4250645845baf73fadee81219684a6f3c5490f1cce48c129c5e0a32df55f26b556298e41545eca4b7d4bdea96556ca42380ff6d79acafbb' + 'd93a0d7ddf70ee10d14b7f1e46257fb432cbfd9fcce7ab3b6bc3443876e0dad6453e0bcda3cf148e0dab47ce5d1d79ae22ef2921bbde46ff7f555a25a1e7bbae' + '809ba5d0637a0ffbd0506b1b5d7e0500d5e53f06aae27d8180202c4d89d86d43661aac1dd78a3ecc5395385358c61da0b7e82857e41ab2e9be8dc6b56ba81dce' + '3c8f56e6722903c4a4ce79ad58c3092023bf5835a59213ccfa5811b6729bcbaa4a65e6d3f86e350eba95706f54c1b90eefcd5fef570518392ac5f91cb6cfe7e8') package() { install -Dm644 {,"${pkgdir}"/usr/share/xsessions/}pantheon-openbox.desktop install -Dm644 {,"${pkgdir}"/usr/share/gnome-session/sessions/}pantheon-openbox.session - install -Dm644 {,"${pkgdir}"/usr/share/applications/}compton-dbus.desktop - install -Dm755 {,"${pkgdir}"/usr/bin/}compton-inverter - install -Dm755 {,"${pkgdir}"/usr/bin/}obsession - install -Dm644 {,"${pkgdir}"/usr/share/applications/}obsession.desktop + install -Dm644 {,"${pkgdir}"/usr/share/applications/}picom-dbus.desktop + install -Dm755 {,"${pkgdir}"/usr/bin/}picom-inverter } diff --git a/autostart b/autostart new file mode 100644 index 000000000000..fe3ecb61c1e5 --- /dev/null +++ b/autostart @@ -0,0 +1,15 @@ +#Black void background +[[ -n "$(command -v hsetroot)" ]] && hsetroot -solid "#000000" & + +#Pantheon Lite components +if [[ echo "${XDG_CURRENT_DESKTOP}" == "Pantheon" ]]; then + + #Start a compositor; kill to reduce resource usage. + [[ -n "$(command -v picom)" ]] && picom --dbus & + + #Initiate wingpanel if cerbere failed + [[ -z "$(pidof wingpanel)" ]] && wingpanel & + + #Initiate plank if cerbere failed + [[ -z "$(pidof plank)" ]] && plank & +fi @@ -8,6 +8,9 @@ <item label="Reconfigure Openbox"> <action name="Reconfigure" /> </item> + <item label="Restart Openbox"> + <action name="Restart"/> + </item <separator /> <item label="Log Out"> <action name="Exit"> diff --git a/obsession b/obsession deleted file mode 100755 index ac8c1c76fa53..000000000000 --- a/obsession +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -#An additional script for setting certain options - -[[ $(pidof openbox) ]] || exit - -#Default, empty background comes out gray. Black is cooler. -[[ -n "$(command -v hsetroot)" ]] && exec hsetroot -solid "#000000" diff --git a/obsession.desktop b/obsession.desktop deleted file mode 100644 index 32b7a891bc0f..000000000000 --- a/obsession.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Openbox Session Settings -Exec=obsession -Icon=openbox -NoDisplay=true -# name we put on the WM spec check window -X-GNOME-WMName=Openbox -# gnome-session autostart -X-GNOME-Autostart-Phase=WindowManager diff --git a/pantheon-openbox.desktop b/pantheon-openbox.desktop index 7b672387cac4..d681a51003ef 100644 --- a/pantheon-openbox.desktop +++ b/pantheon-openbox.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Pantheon Lite -Comment=This session provides elementary-lite experience +Comment=Replace gala with openbox (& picom) Exec=/usr/bin/pantheon-session-qq lite TryExec=openbox Icon=/usr/share/pixmaps/openbox.png diff --git a/pantheon-openbox.session b/pantheon-openbox.session index d74ad32419bc..67cc898ffa10 100644 --- a/pantheon-openbox.session +++ b/pantheon-openbox.session @@ -1,5 +1,5 @@ [GNOME Session] Name=Pantheon -RequiredComponents=openbox;compton-dbus;obsession;io.elementary.cerbere; +RequiredComponents=openbox;io.elementary.cerbere; FallbackSession=openbox DesktopNames=Pantheon diff --git a/compton-dbus.desktop b/picom-dbus.desktop index 3a4b45a9cad5..5a6903698e94 100644 --- a/compton-dbus.desktop +++ b/picom-dbus.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Version=1.0 Type=Application -Name=compton +Name=picom (dbus enabled) GenericName=X compositor Comment=A X compositor Categories=Utility; -TryExec=compton -Exec=compton --dbus +TryExec=picom +Exec=picom --dbus # Icon=xcompmgr # Thanks to quequotion for providing this file! diff --git a/compton-inverter b/picom-inverter index 8a57037b3d74..618d4130bd1e 100755 --- a/compton-inverter +++ b/picom-inverter @@ -1,15 +1,15 @@ #!/bin/sh -# === Verify `compton --dbus` status === +# === Verify `picom --dbus` status === if [ -z "$(dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames | grep compton)" ]; then echo "compton DBus interface unavailable" - if [ -n "$(pgrep compton)" ]; then - echo "compton running without dbus interface" - #killall compton & # Causes all windows to flicker away and come back ugly. - #compton --dbus & # Causes all windows to flicker away and come back beautiful + if [ -n "$(pgrep picom)" ]; then + echo "picom running without dbus interface" + #killall picom & # Causes all windows to flicker away and come back ugly. + #picom --dbus & # Causes all windows to flicker away and come back beautiful else - echo "compton not running" + echo "picom not running" fi exit 1; fi @@ -32,7 +32,7 @@ fi service="com.github.chjj.compton.${dpy}" interface="com.github.chjj.compton" -compton_dbus="dbus-send --print-reply --dest="${service}" / "${interface}"." +picom_dbus="dbus-send --print-reply --dest="${service}" / "${interface}"." type_win='uint32' type_enum='uint16' @@ -43,8 +43,8 @@ if [ -z "$1" -o "$1" = "selected" ]; then window=$(xwininfo -frame | sed -n 's/^xwininfo: Window id: \(0x[[:xdigit:]][[:xdigit:]]*\).*/\1/p') # Select window by mouse elif [ "$1" = "focused" ]; then # Ensure we are tracking focus - ${compton_dbus}opts_set string:track_focus boolean:true & - window=$(${compton_dbus}find_win string:focused | $SED -n 's/^[[:space:]]*'${type_win}'[[:space:]]*\([[:digit:]]*\).*/\1/p') # Query compton for the active window + ${picom_dbus}opts_set string:track_focus boolean:true & + window=$(${picom_dbus}find_win string:focused | $SED -n 's/^[[:space:]]*'${type_win}'[[:space:]]*\([[:digit:]]*\).*/\1/p') # Query picom for the active window elif echo "$1" | grep -Eiq '^([[:digit:]][[:digit:]]*|0x[[:xdigit:]][[:xdigit:]]*)$'; then window="$1" # Accept user-specified window-id if the format is correct else @@ -53,13 +53,13 @@ fi # Color invert the selected or focused window if [ -n "$window" ]; then - invert_status="$(${compton_dbus}win_get "${type_win}:${window}" string:invert_color | $SED -n 's/^[[:space:]]*boolean[[:space:]]*\([[:alpha:]]*\).*/\1/p')" + invert_status="$(${picom_dbus}win_get "${type_win}:${window}" string:invert_color | $SED -n 's/^[[:space:]]*boolean[[:space:]]*\([[:alpha:]]*\).*/\1/p')" if [ "$invert_status" = true ]; then invert=0 # Set the window to have normal color else invert=1 # Set the window to have inverted color fi - ${compton_dbus}win_set "${type_win}:${window}" string:invert_color_force "${type_enum}:${invert}" & + ${picom_dbus}win_set "${type_win}:${window}" string:invert_color_force "${type_enum}:${invert}" & else echo "Cannot find $1 window." exit 1; @@ -296,7 +296,7 @@ </keybind> <keybind key="W-n"> <action name="Execute"> - <command>compton-inverter focused</command> + <command>picom-inverter focused</command> </action> </keybind> </keyboard> @@ -338,12 +338,12 @@ </mousebind> <mousebind action="Click" button="A-Up"> <action name="Execute"> - <command>compton-trans -c +5</command> + <command>picom-trans -c +5</command> </action> </mousebind> <mousebind action="Click" button="A-Down"> <action name="Execute"> - <command>compton-trans -c -5</command> + <command>picom-trans -c -5</command> </action> </mousebind> <mousebind action="Click" button="Button6"> |