Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix focus handling (attempt 2) #154

Closed
wants to merge 19 commits into from
Closed

Fix focus handling (attempt 2) #154

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e379913
Make PKGBUILD much less flaky and ideompotent
iacore Jun 26, 2022
055e536
Only handle Capslock specially
iacore Mar 14, 2022
9bd0e6e
Refactor; make capslock work worse
iacore Mar 6, 2022
2bdb952
Modify .gitignore
iacore Mar 13, 2022
bffdd79
squashed focus-related commits
iacore Mar 14, 2022
9be9425
xfce4-terminal work well with all kinds with focus
iacore Mar 14, 2022
b1b8a61
WIP: SendEvent theater
iacore Mar 15, 2022
3df8fc6
send focus event later
iacore Mar 16, 2022
19974bf
Try to send correct focus events via different API calls
iacore Apr 1, 2022
a058ba5
Name msg_* properly
iacore Jun 20, 2022
93fe411
Focus window before clicked
iacore Jun 20, 2022
35bd333
Merge vmside.c from master branch. Fix severe logic bug.
iacore Jun 28, 2022
a521f5a
Merge branch 'patch-arch-build' into fix-focus-2
iacore Jun 28, 2022
835ecd2
Attempt to fix modifier key reversely stuck
iacore Jul 2, 2022
4fa451e
revert to parent
iacore Jul 2, 2022
e894a10
Disable focus detection on click for now
iacore Jul 3, 2022
5032d0a
Comment on X's focus and window hierarchy
iacore Jul 4, 2022
2019ae0
fix: Ungrab when focused in
iacore Jul 8, 2022
5a4f1aa
Ungrab pointer when any window is destroyed in the same VM
iacore Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,14 @@ tags
deb/
pkgs
debian/changelog.*
/PKGBUILD*
/gui-agent/qubes-gui
/gui-common/qubes-gui-runuser
/pkg/
*.tar.zst
/src/
/xf86-input-mfndev/compile
/xf86-input-mfndev/config.h.in
/xf86-input-mfndev/depcomp
/xf86-input-mfndev/ltmain.sh
/xf86-qubes-common/libxf86-qubes-common.so
3 changes: 3 additions & 0 deletions archlinux/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pkg/
src/
*.tar.zst
40 changes: 28 additions & 12 deletions archlinux/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pkgname=(qubes-vm-gui qubes-vm-pulseaudio)
pkgver=$(cat version)
pkgrel=10
epoch=
pkgdesc="The Qubes GUI Agent for AppVMs"
Expand All @@ -8,8 +7,8 @@ url="http://qubes-os.org/"
license=('GPL')
groups=()
makedepends=(pkg-config make gcc patch git automake autoconf libtool
'pulseaudio<=16.1'
xorg-server-devel xorg-util-macros libxcomposite libxt pixman lsb-release
'pulseaudio'
xorg-server-devel xorg-util-macros libxcomposite libxt pixman
qubes-vm-gui-common qubes-libvchan qubes-db-vm
)
checkdepends=()
Expand All @@ -21,21 +20,39 @@ backup=()
options=()
changelog=

source=(PKGBUILD-z-qubes-session.sh)
source=()
md5sums=()

noextract=()
md5sums=() #generate with 'makepkg -g'
pa_ver=$((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-")
pa_ver=16.1 #specify this manually please
# If using pkg-config, you must update libpulse first.
#pa_ver=$((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-")

export PA_VER_FULL=$pa_ver

if [ -e archlinux ] # on no, at repo root
then
echo Do not run 'makepkg' at repo root! >&2
cd archlinux
fi

pkgver=$(cat $startdir/../version)

clean() {
rm $srcdir/* -r || true
}

build() {

for source in Makefile appvm-scripts gui-common include pulse gui-agent common xf86-input-mfndev xf86-video-dummy xf86-qubes-common window-icon-updater version; do
(ln -s $srcdir/../$source $srcdir/$source)
rm $srcdir/PKGBUILD-z-qubes-session.sh || true
cp $startdir/PKGBUILD-z-qubes-session.sh $srcdir/
for source in Makefile appvm-scripts gui-common include pulse gui-agent common xf86-input-mfndev xf86-video-dummy xf86-qubes-common window-icon-updater version; do
rm $source -r || true
cp -r $startdir/../$source $source
done

pa_ver=$((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-")

rm -f pulse/pulsecore
rm -rf pulse/pulsecore
ln -s pulsecore-$pa_ver pulse/pulsecore

# Bug fixes : /var/run/console depends on pam_console, which is fedora specific
Expand Down Expand Up @@ -71,9 +88,8 @@ install -D $srcdir/PKGBUILD-z-qubes-session.sh $pkgdir/etc/X11/xinit/xinitrc.d/z
package_qubes-vm-pulseaudio() {

pkgdesc="Pulseaudio support for Qubes VM"
depends=('alsa-lib' 'alsa-utils' 'pulseaudio-alsa' 'pulseaudio<=16.1')
depends=('alsa-lib' 'alsa-utils' 'pulseaudio-alsa' 'pulseaudio')
install=PKGBUILD-pulseaudio.install
pa_ver=$((pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-")

make install-pulseaudio DESTDIR=$pkgdir PA_VER=$pa_ver LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/usr/lib

Expand Down
Loading