Re: PATCH: Fix mwextwm mode to build again

2009-01-23 Thread Jon TURNEY 

Yaakov (Cygwin/X) wrote:

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Jon TURNEY wrote:

This fixes multiwindow external window manager('-mwextwm') mode to build
again.

Note this depends on Apple's Xplugin.h to build the rootless extension
(just for some typedefs I think), which is no longer included in the
X.Org tree, as an old version once was.


Thank you Jon and Colin for the patch.  A few questions:

1) The ROOTLESS_WORKAROUND define only affects one place, namely
miext/damage/damage.c:getDrawableDamageRef().  What does this do
exactly, and what affect may it have on modes other than -mwextwm?


$ git blame miext/damage/damage.c -L /ROOTLESS/,+3
d7fef522 (Kevin E Martin 2004-09-02 04:04:47 + 93) #ifdef 
ROOTLESS_WORKAROUND
b2135e58 (Kevin E Martin 2004-09-03 16:18:23 + 94)   
((WindowPtr)pDrawable)-viewable

d7fef522 (Kevin E Martin 2004-09-02 04:04:47 + 95) #endif

$ git log -1 d7fef522
commit d7fef52254126aa5897a5c58faeda1f61d5b13d8
Author: Kevin E Martin k...@kem.org
Date:   Thu Sep 2 04:04:47 2004 +

Workaround for servers using rootless layer with damage (Bug #1168, Torrey
T. Lyons).

$ git log -1 b2135e58
commit b2135e589baeb2ea26da50b9167feaea23bcce3c
Author: Kevin E Martin k...@kem.org
Date:   Fri Sep 3 16:18:23 2004 +

First set of documentation updates.
Include more correct fix for rootless interaction with damage (Bug #1168,
Keith Packard).

http://bugs.freedesktop.org/show_bug.cgi?id=1168


2) Why delete the RootlessAccelInit call in
hw/xwin/winscrinit.c:winFinishScreenInitFB()?


As I recall, that code has been disabled in the 1.5.x tree, so we can't call 
it.  I think I noticed that it's recently been turned back on by the Apple 
guys in git master.



--
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple
Problem reports:   http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ:   http://x.cygwin.com/docs/faq/

Re: PATCH: Fix mwextwm mode to build again

2009-01-19 Thread Yaakov (Cygwin/X) 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Jon TURNEY wrote:
 This fixes multiwindow external window manager('-mwextwm') mode to build
 again.
 
 Note this depends on Apple's Xplugin.h to build the rootless extension
 (just for some typedefs I think), which is no longer included in the
 X.Org tree, as an old version once was.

Thank you Jon and Colin for the patch.  A few questions:

1) The ROOTLESS_WORKAROUND define only affects one place, namely
miext/damage/damage.c:getDrawableDamageRef().  What does this do
exactly, and what affect may it have on modes other than -mwextwm?

2) Why delete the RootlessAccelInit call in
hw/xwin/winscrinit.c:winFinishScreenInitFB()?


Yaakov
Cygwin/X
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEAREIAAYFAkl0RNUACgkQpiWmPGlmQSN7pgCg13w5SZPHDfDhU3EkMO25T8iE
TKsAn0yAQWLJaq4g9W8iifDBviEiWBXQ
=ADGO
-END PGP SIGNATURE-

--
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple
Problem reports:   http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ:   http://x.cygwin.com/docs/faq/

Re: PATCH: Fix mwextwm mode to build again

2009-01-19 Thread Yaakov (Cygwin/X) 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Jon TURNEY wrote:
 This fixes multiwindow external window manager('-mwextwm') mode to build
 again.

I fixed xwinwm-0.0.5 for gcc-3.4, which is the other half needed for
this to work.  I'll ITA this accordingly.


Yaakov
Cygwin/X
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEAREIAAYFAkl00QgACgkQpiWmPGlmQSMyewCdH2D5cguEkDA7Ci4MUQ0oVuPt
wHsAn1yDhfSA3IPmmDRHbLLoXgv7P1gP
=933M
-END PGP SIGNATURE-

--
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple
Problem reports:   http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ:   http://x.cygwin.com/docs/faq/

Re: PATCH: Fix mwextwm mode to build again

2008-12-02 Thread Jon TURNEY 

Colin Harrison wrote:

Hi,


Jon TURNEY wrote
Based on somebody else's patch, I'm can't remember who's...


I'll give you one guess.


Sorry.  I managed to confuse myself somehow.


--
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple
Problem reports:   http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ:   http://x.cygwin.com/docs/faq/

Re: PATCH: Fix mwextwm mode to build again

2008-11-29 Thread Colin Harrison 
Hi,

 Jon TURNEY wrote
 Based on somebody else's patch, I'm can't remember who's...

I'll give you one guess.

I used to post patches here. But I got annoyed by The Man too many times.
He didn't like any patches that could, by conditionals, be shared by any
other Windows X server project. 
Looks like He got them anyway :)

Hopefully always off-message...
Colin Harrison


--
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple
Problem reports:   http://cygwin.com/problems.html
Documentation: http://x.cygwin.com/docs/
FAQ:   http://x.cygwin.com/docs/faq/

PATCH: Fix mwextwm mode to build again

2008-11-28 Thread Jon TURNEY 

This fixes multiwindow external window manager('-mwextwm') mode to build again.


Note this depends on Apple's Xplugin.h to build the rootless extension (just 
for some typedefs I think), which is no longer included in the X.Org tree, as 
an old version once was.


Google can find you a copy.

Cygwin: Fix multiwindow extwm mode to build again

Note: this depends on the rootless extension, which in turn depends on Apple's 
Xplugin.h :D

I'm sure there is a better way of doing this configure.ac stuff

Based on somebody else's patch, I'm can't remember who's...

---
 xserver/configure.ac  |   20 
 xserver/hw/xwin/Makefile.am   |2 +-
 xserver/hw/xwin/winmultiwindowwm.c|2 +-
 xserver/hw/xwin/winscrinit.c  |   16 
 xserver/hw/xwin/winwin32rootless.c|2 +-
 xserver/hw/xwin/winwin32rootlesswndproc.c |2 +-
 xserver/hw/xwin/winwindowswm.c|3 ++-
 xserver/miext/Makefile.am |2 +-
 xserver/miext/rootless/rootlessConfig.h   |2 +-
 xserver/miext/rootless/rootlessWindow.c   |9 +++--
 10 files changed, 31 insertions(+), 29 deletions(-)

Index: xorg-server-1.5.3/xserver/configure.ac
===
--- xorg-server-1.5.3.orig/xserver/configure.ac
+++ xorg-server-1.5.3/xserver/configure.ac
@@ -1667,7 +1667,6 @@ if test x$XWIN = xyes; then
XWIN_SERVER_NAME=XWin
PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau xfont])
AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for 
signaling new win32 messages])
-   AC_DEFINE(ROOTLESS,1,[Build Rootless code])
CFLAGS=$CFLAGS -DFD_SETSIZE=256
;;
mingw*)
@@ -1708,7 +1707,12 @@ if test x$XWIN = xyes; then
 fi
 AM_CONDITIONAL(XWIN, [test x$XWIN = xyes])
 AM_CONDITIONAL(XWIN_MULTIWINDOW, [test x$XWIN = xyes])
-AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test x$XWIN = xyes  false])
+dnl if we have windowswmproto, build rootless extension and with multiwindow 
extwm enabled
+if test x$XWIN = xyes; then
+   PKG_CHECK_MODULES(WINDOWSWM, [windowswmproto], [windowswm=yes], 
[windowswm=no] )
+   AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+fi
+AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test x$windowswm = xyes])
 AM_CONDITIONAL(XWIN_CLIPBOARD, [test x$XWIN = xyes])
 AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test x$XWIN = xyes  false])
 AM_CONDITIONAL(XWIN_NATIVEGDI, [test x$XWIN = xyes  false])
@@ -1741,8 +1745,8 @@ if test x$XQUARTZ = xyes; then
AC_SUBST([DARWIN_LIBS])
 
AC_CHECK_LIB([Xplugin],[xp_init],[:])
-
-   CFLAGS=${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA
+   AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+   CFLAGS=${CFLAGS} -DNO_ALLOCA
 
if test x$XF86MISC = xyes || test x$XF86MISC = xauto; then
AC_MSG_NOTICE([Disabling XF86Misc extension])
@@ -1994,6 +1998,14 @@ AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [te
 AM_CONDITIONAL(XEPHYR_HAS_DRI, [test x$XEPHYR_DRI = xyes])
 AM_CONDITIONAL(XFAKESERVER, [test x$KDRIVE = xyes  test x$XFAKE = xyes])
 
+dnl if server is rootless, we want to build the rootless code
+MIEXT_ROOTLESS_INC='-I$(top_srcdir)/miext/rootless'
+MIEXT_ROOTLESS_LIB='$(top_builddir)/miext/rootless/librootless.la'
+if [ test -n $ROOTLESS ] ; then
+   CFLAGS=${CFLAGS} -DROOTLESS_WORKAROUND
+fi
+AM_CONDITIONAL(WANT_ROOTLESS, [test x$ROOTLESS = xyes])
+
 dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest 
servers)
 AC_DEFINE(__XKBDEFRULES__, xorg, [Default XKB rules])
 AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
Index: xorg-server-1.5.3/xserver/hw/xwin/Makefile.am
===
--- xorg-server-1.5.3.orig/xserver/hw/xwin/Makefile.am
+++ xorg-server-1.5.3/xserver/hw/xwin/Makefile.am
@@ -154,7 +154,7 @@ XWin_SOURCES = $(SRCS)
 INCLUDES = -I$(top_srcdir)/miext/rootless
 
 XWin_DEPENDENCIES = $(XWIN_LIBS)
-XWin_LDADD = $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) 
$(XWIN_GL_LIBS)
+XWin_LDADD = $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) 
$(XWIN_GL_LIBS) $(top_builddir)/miext/rootless/librootless.la
 XWin_LDFLAGS = -mwindows
 
 .rc.o:
Index: xorg-server-1.5.3/xserver/hw/xwin/winmultiwindowwm.c
===
--- xorg-server-1.5.3.orig/xserver/hw/xwin/winmultiwindowwm.c
+++ xorg-server-1.5.3/xserver/hw/xwin/winmultiwindowwm.c
@@ -64,7 +64,7 @@
 #include window.h
 #include windowstr.h
 #ifdef XWIN_MULTIWINDOWEXTWM
-#include windowswmstr.h
+#include X11/extensions/windowswmstr.h
 #endif
 
 extern void winDebug(const char *format, ...);
Index: xorg-server-1.5.3/xserver/hw/xwin/winscrinit.c
===
--- xorg-server-1.5.3.orig/xserver/hw/xwin/winscrinit.c
+++