gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Really check for XShm

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@18369 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2004-01-11 04:05:43 +00:00
parent 8600ffe85d
commit 9e93daff9e
4 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,9 +1,17 @@
2004-01-10 Adam Fedor <fedor@gnu.org>
* configure.ac: Check if XShm is really implemented (it isn't on
Cygwin even though the headers are there).
* Source/x11/XGServerEvent.m ([XGServer -processEvent:event]):
ifdef around XShm call.
2004-01-10 Adam Fedor <fedor@gnu.org>
* Prevent orderwindow:relativeTo: from making a window key.
* Headers/x11/XGGeneric.h: Add Ivar.
* Source/x11/XGServerEvent.m (-_handleTakeFocusAtom:forContext:):
Don't take focus if we ordered this window previously.
* Source/x11/XGServerWindow.m ([XGServer -orderwindow:::]):
Set desiredOrderWindow.
([XGServer -setinputfocus:]): Reset it.

4
Source/x11/XGServerEvent.m
View file

@ -1235,7 +1235,7 @@ static inline int check_modifier (XEvent *xEvent, KeyCode key_code)
// We shouldn't get here unless we forgot to trap an event above
default:
#ifdef XSHM
if (xEvent.type == XShmGetEventBase(dpy)+ShmCompletion
&& [gcontext respondsToSelector: @selector(gotShmCompletion:)])
{
@ -1243,7 +1243,7 @@ static inline int check_modifier (XEvent *xEvent, KeyCode key_code)
((XShmCompletionEvent *)&xEvent)->drawable];
break;
}
#endif
NSLog(@"Received an untrapped event\n");
break;
}

14
configure vendored
View file

@ -5618,6 +5618,7 @@ done
save_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS"
have_xshm=no
for ac_header in X11/extensions/XShm.h
do
@ -5665,11 +5666,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define XSHM 1
_ACEOF
have_xshm=yes
fi
done
@ -5758,6 +5755,13 @@ _ACEOF
fi
done
if test "$ac_cv_header_X11_extensions_XShm_h" = yes -a "$ac_cv_func_shmctl" = yes; then
cat >>confdefs.h <<\_ACEOF
#define XSHM 1
_ACEOF
fi
CPPFLAGS="$save_CPPFLAGS"
#--------------------------------------------------------------------

6
configure.ac
View file

@ -292,10 +292,14 @@ AC_HAVE_FUNCS(usleep)
save_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="$CPPFLAGS $GRAPHIC_CFLAGS"
have_xshm=no
AC_CHECK_HEADERS(X11/extensions/XShm.h,
AC_DEFINE(XSHM,1,[Define if you have X11/extensions/XShm.h]),,
have_xshm=yes,,
[#include <X11/Xlib.h>])
AC_CHECK_FUNCS(shmctl)
if test "$ac_cv_header_X11_extensions_XShm_h" = yes -a "$ac_cv_func_shmctl" = yes; then
AC_DEFINE(XSHM,1,[Define if you have X11 XShm extensions])
fi
CPPFLAGS="$save_CPPFLAGS"
#--------------------------------------------------------------------