From adc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue, 25 Nov 2003 19:29:01 +0000
Subject: XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

---
 hw/xwin/winwindow.h | 59 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 21 deletions(-)

(limited to 'hw/xwin/winwindow.h')

diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h
index d828b4c70..8153b5600 100644
--- a/hw/xwin/winwindow.h
+++ b/hw/xwin/winwindow.h
@@ -27,7 +27,7 @@
  *
  * Authors:	Kensuke Matsuzaki
  */
-/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.1 2003/02/12 15:01:38 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.4 2003/10/08 11:13:03 eich Exp $ */
 
 
 #ifndef _WINWINDOW_H_
@@ -41,20 +41,23 @@
 #endif
 
 /* Constant strings */
-#define WINDOW_CLASS		"cygwin/xfree86 rl"
-#define WINDOW_TITLE		"Cygwin/XFree86 rl"
-#define WIN_SCR_PROP		"cyg_screen_prop_rl"
+#define WINDOW_CLASS		"cygwin/xfree86"
+#define WINDOW_TITLE		"Cygwin/XFree86 - %s:%d"
+#define WINDOW_TITLE_XDMCP	"Cygwin/XFree86 - %s"
+#define WIN_SCR_PROP		"cyg_screen_prop rl"
 #define WINDOW_CLASS_X		"cygwin/xfree86 X rl"
-#define WINDOW_TITLE_X		"Cygwin/XFree86 X rl"
+#define WINDOW_TITLE_X		"Cygwin/XFree86 X"
 #define WIN_WINDOW_PROP		"cyg_window_prop_rl"
 #define WIN_MSG_QUEUE_FNAME	"/dev/windows"
-#define WIN_LOG_FNAME		"/tmp/XWinrl.log"
+#define WIN_LOG_FNAME		"/tmp/XWin.log"
 #define WIN_WID_PROP		"cyg_wid_prop_rl"
 #define WIN_NEEDMANAGE_PROP	"cyg_override_redirect_prop_rl"
+#define WIN_HWND_CACHE          "cyg_privmap_rl"
 #define CYGMULTIWINDOW_DEBUG    NO
 
 typedef struct _winPrivScreenRec *winPrivScreenPtr;
 
+
 /*
  * Window privates
  */
@@ -70,6 +73,8 @@ typedef struct
   int			iWidth;
   int			iHeight;
   Bool			fXKilled;
+  Bool                  fNeedRestore;
+  POINT                 ptRestore;
 } winPrivWinRec, *winPrivWinPtr;
 
 typedef struct _winWMMessageRec{
@@ -81,19 +86,22 @@ typedef struct _winWMMessageRec{
   int			iWidth, iHeight;
 } winWMMessageRec, *winWMMessagePtr;
 
+
 /*
  * winrootlesswm.c
  */
-#define		WM_WM_MOVE	(WM_USER + 1)
-#define		WM_WM_SIZE	(WM_USER + 2)
-#define		WM_WM_RAISE	(WM_USER + 3)
-#define		WM_WM_LOWER	(WM_USER + 4)
-#define		WM_WM_MAP	(WM_USER + 5)
-#define		WM_WM_UNMAP	(WM_USER + 6)
-#define		WM_WM_KILL	(WM_USER + 7)
-#define		WM_WM_ACTIVATE	(WM_USER + 8)
 
-#define		WMMSG_MSG	10
+#define		WM_WM_MOVE		(WM_USER + 1)
+#define		WM_WM_SIZE		(WM_USER + 2)
+#define		WM_WM_RAISE		(WM_USER + 3)
+#define		WM_WM_LOWER		(WM_USER + 4)
+#define		WM_WM_MAP		(WM_USER + 5)
+#define		WM_WM_UNMAP		(WM_USER + 6)
+#define		WM_WM_KILL		(WM_USER + 7)
+#define		WM_WM_ACTIVATE		(WM_USER + 8)
+#define	        WM_WM_NAME_EVENT	(WM_USER + 9)
+#define	        WM_WM_HINTS_EVENT	(WM_USER + 10)
+#define		WM_WM_CHANGE_STATE	(WM_USER + 11)
 
 
 /*
@@ -106,13 +114,22 @@ winSendMessageToWM (void *pWMInfo, winWMMessagePtr msg);
 Bool
 winInitWM (void **ppWMInfo,
 	   pthread_t *ptWMProc,
-#if 0
-	   pthread_cond_t *ppcServerStarted,
-#endif
+	   pthread_t *ptXMsgProc,
 	   pthread_mutex_t *ppmServerStarted,
-#if 0
-	   Bool *pfServerStarted,
-#endif
 	   int dwScreen);
 
+void
+winDeinitMultiWindowWM ();
+
+void
+winMinimizeWindow (Window id);
+
+
+/*
+ * winmultiwindowicons.c
+ */
+
+void
+winUpdateIcon (Window id);
+
 #endif
-- 
cgit v1.2.3