tschwery/alock
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for #20, not beeing able to use the xf86-misc extensions shouldn't make

Browse source 
alock stop working. background: xorg removed xf86-misc and
'AllowDeactivateGrabs' etc. :

    http://cgit.freedesktop.org/xorg/xserver/commit/?id=22e64108ec63ba77779891f8df237913ef9ca731

small changes in 'configure'

--HG--
extra : convert_revision : svn%3Aeebe1cee-a9af-4fe4-bd26-ad572b19c5ab/trunk%4094
This commit is contained in:
mathias.gumz 2009-05-03 12:29:15 +00:00
parent 28ece1b00c
commit 2fd9ba01d6
3 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.txt
View file

@ -1,5 +1,11 @@
Version 1.0 Version 1.0
---------------------------------------------------------------------- ----------------------------------------------------------------------
2009-05-03:
* fix for #20, not beeing able to use the xf86-misc extensions shouldn't
make alock stop working. background: xorg removed xf86-misc and
'AllowDeactivateGrabs' etc.
* typos and minor stuff in 'configure'
2009-02-25: 2009-02-25:
* fix for #5, avoid beeing bypassed by disabling 'AllowClosedownGrabs' * fix for #5, avoid beeing bypassed by disabling 'AllowClosedownGrabs'
and 'AllowDeactivateGrabs' and 'AllowDeactivateGrabs'

24
configure vendored
View file

@ -89,7 +89,7 @@ EOF
else else
echo "no." echo "no."
echo "error, can't compile with imlib2 support. check 'config.log'" echo "error, can't compile with imlib2 support. check 'config.log'"
echo "for further detailts." echo "for further details."
exit 1 exit 1
fi fi
else else
@ -121,14 +121,13 @@ EOF
echo "CFLAGS_XRENDER:=" >&4 echo "CFLAGS_XRENDER:=" >&4
echo "LDFLAGS_XRENDER:=-lXrender" >&4 echo "LDFLAGS_XRENDER:=-lXrender" >&4
echo "" >&4 echo "" >&4
else return
echo "no."
exit 1
fi fi
else
echo "no."
exit 1
fi fi
echo "no."
echo "error, can't compile/link with xrender support."
echo "check 'config.log' for further details."
exit 1
} }
check_xcursor() { check_xcursor() {
@ -155,14 +154,13 @@ EOF
echo "LDFLAGS_XCURSOR:=" >&4 echo "LDFLAGS_XCURSOR:=" >&4
echo "LIBS_XCURSOR:=-lXcursor" >&4 echo "LIBS_XCURSOR:=-lXcursor" >&4
echo "" >&4 echo "" >&4
else return
echo "no."
exit 1
fi fi
else
echo "no."
exit 1
fi fi
echo "no."
echo "error, can't compile/link with xcursor support."
echo "check 'config.log' for further details."
exit 1
} }
check_xf86misc() { check_xf86misc() {

27
src/alock.c
View file

@ -406,8 +406,8 @@ int main(int argc, char **argv) {
struct aOpts opts; struct aOpts opts;
#if HAVE_XF86MISC #if HAVE_XF86MISC
int xf86misc_major = 0; int xf86misc_major = -1;
int xf86misc_minor = 0; int xf86misc_minor = -1;
#endif #endif
int arg = 0; int arg = 0;
@ -589,21 +589,18 @@ int main(int argc, char **argv) {
#if HAVE_XF86MISC #if HAVE_XF86MISC
{ {
if (XF86MiscQueryVersion(xinfo.display, &xf86misc_major, &xf86misc_minor) == False) { if (XF86MiscQueryVersion(xinfo.display, &xf86misc_major, &xf86misc_minor) == True) {
printf("%s", "alock: failed to call XF86MiscQueryVersion.\n"); if (xf86misc_major >= 0 &&
exit(EXIT_FAILURE); xf86misc_minor >= 5 &&
XF86MiscSetGrabKeysState(xinfo.display, False) == MiscExtGrabStateLocked) {
printf("%s", "alock: cant disable xserver hotkeys to remove grabs.\n");
exit(EXIT_FAILURE);
}
printf("%s", "disabled AllowDeactivateGrabs and AllowClosedownGrabs\n.");
} }
if (xf86misc_major >= 0 &&
xf86misc_minor >= 5 &&
XF86MiscSetGrabKeysState(xinfo.display, False) == MiscExtGrabStateLocked) {
printf("%s", "alock: cant disable xserver hotkeys to remove grabs.\n");
exit(EXIT_FAILURE);
}
printf("%s", "disabled AllowDeactivateGrabs and AllowClosedownGrabs\n.");
} }
#endif #endif