[xorg-commit-diffs] xc/programs/Xserver/hw/xwin Imakefile,
1.1.4.1.2.15, 1.1.4.1.2.16 win.h, 1.1.4.1.2.29,
1.1.4.1.2.30 wincursor.c, 1.1.4.1.2.4,
1.1.4.1.2.5 winmultiwindowwndproc.c, 1.1.6.17,
1.1.6.18 winpriv.c, 1.1.2.5, 1.1.2.6 winscrinit.c,
1.1.4.1.2.17, 1.1.4.1.2.18 winwin32rootlesswndproc.c, 1.1.2.10,
1.1.2.11
Kensuke Matsuzaki
xorg-commit at pdx.freedesktop.org
Fri Apr 23 17:43:10 EST 2004
Committed by: zakki
Update of /cvs/xorg/xc/programs/Xserver/hw/xwin
In directory pdx:/tmp/cvs-serv11476
Modified Files:
Tag: CYGWIN
Imakefile win.h wincursor.c winmultiwindowwndproc.c winpriv.c
winscrinit.c winwin32rootlesswndproc.c
Log Message:
MWExtWM uses common hardware(windows) cursor code too, and winwin32rootlesscursor.c is removed.
Clean up unused variables.
Modify comment(winMWExtWM* -> win*).
Fix the problem that cursor doesn't change when cursor move in a window.
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Imakefile,v
retrieving revision 1.1.4.1.2.15
retrieving revision 1.1.4.1.2.16
diff -u -d -r1.1.4.1.2.15 -r1.1.4.1.2.16
--- a/Imakefile 14 Apr 2004 00:01:22 -0000 1.1.4.1.2.15
+++ b/Imakefile 23 Apr 2004 07:43:06 -0000 1.1.4.1.2.16
@@ -35,7 +35,6 @@
#if BuildXWinMultiWindowExtWM
SRCS_MULTIWINDOWEXTWM = \
winwin32rootless.c \
- winwin32rootlesscursor.c \
winwin32rootlesswindow.c \
winwin32rootlesswndproc.c \
winwindowswm.c
@@ -156,7 +155,6 @@
#if BuildXWinMultiWindowExtWM
OBJS_MULTIWINDOWEXTWM = \
winwin32rootless.o \
- winwin32rootlesscursor.o \
winwin32rootlesswindow.o \
winwin32rootlesswndproc.o \
winwindowswm.o
Index: win.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/win.h,v
retrieving revision 1.1.4.1.2.29
retrieving revision 1.1.4.1.2.30
diff -u -d -r1.1.4.1.2.29 -r1.1.4.1.2.30
--- a/win.h 22 Apr 2004 20:08:40 -0000 1.1.4.1.2.29
+++ b/win.h 23 Apr 2004 07:43:06 -0000 1.1.4.1.2.30
@@ -504,14 +504,7 @@
#ifdef XWIN_MULTIWINDOWEXTWM
/* Privates used by multi-window external window manager */
RootlessFrameID widTop;
- QueryBestSizeProcPtr QueryBestSize;
- miPointerSpriteFuncPtr spriteFuncs;
- HCURSOR hCursor;
- Bool fCursorVisible;
- int nCX;
- int nCY;
- Bool fRestacking;
- Bool fWindowOrderChanged;
+ Bool fRestacking;
#endif
#ifdef XWIN_MULTIWINDOW
@@ -1385,16 +1378,6 @@
#ifdef XWIN_MULTIWINDOWEXTWM
/*
- * winwin32rootlesscursor.c
- */
-
-Bool
-winMWExtWMInitCursor (ScreenPtr pScreen);
-#endif
-
-
-#ifdef XWIN_MULTIWINDOWEXTWM
-/*
* winwin32rootlesswndproc.c
*/
Index: wincursor.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/wincursor.c,v
retrieving revision 1.1.4.1.2.4
retrieving revision 1.1.4.1.2.5
diff -u -d -r1.1.4.1.2.4 -r1.1.4.1.2.5
--- a/wincursor.c 22 Apr 2004 20:08:40 -0000 1.1.4.1.2.4
+++ b/wincursor.c 23 Apr 2004 07:43:06 -0000 1.1.4.1.2.5
@@ -268,7 +268,7 @@
*/
/*
- * winMWExtWMRealizeCursor
+ * winRealizeCursor
* Convert the X cursor representation to native format if possible.
*/
static Bool
@@ -286,7 +286,7 @@
/*
- * winMWExtWMUnrealizeCursor
+ * winUnrealizeCursor
* Free the storage space associated with a realized cursor.
*/
static Bool
@@ -298,7 +298,7 @@
/*
- * winMWExtWMSetCursor
+ * winSetCursor
* Set the cursor sprite and position.
*/
static void
@@ -337,7 +337,7 @@
/*
- * winMWExtWMReallySetCursor
+ * winReallySetCursor
* Not needed for xpr. Cursor is set from the X server thread.
*/
void
@@ -373,7 +373,7 @@
*/
/*
- * winMWExtWMCursorQueryBestSize
+ * winCursorQueryBestSize
* Handle queries for best cursor size
*/
static void
Index: winmultiwindowwndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v
retrieving revision 1.1.6.17
retrieving revision 1.1.6.18
diff -u -d -r1.1.6.17 -r1.1.6.18
--- a/winmultiwindowwndproc.c 14 Apr 2004 06:12:44 -0000 1.1.6.17
+++ b/winmultiwindowwndproc.c 23 Apr 2004 07:43:06 -0000 1.1.6.18
@@ -42,6 +42,7 @@
extern Bool g_fCursor;
extern Bool g_fKeyboardHookLL;
+extern Bool g_fSoftwareCursor;
/*
@@ -978,6 +979,14 @@
}
break;
+ case WM_SETCURSOR:
+ if (LOWORD(lParam) == HTCLIENT)
+ {
+ if (!g_fSoftwareCursor) SetCursor (s_pScreenPriv->cursor.handle);
+ return TRUE;
+ }
+ break;
+
default:
break;
}
Index: winpriv.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winpriv.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- a/winpriv.c 14 Mar 2004 19:30:25 -0000 1.1.2.5
+++ b/winpriv.c 23 Apr 2004 07:43:06 -0000 1.1.2.6
@@ -92,7 +92,7 @@
{
/* copy size and window handle */
pWinInfo->rect = rect_extends;
- pWinInfo->rect = rect;
+ pWinInfo->hwnd = pRLWinPriv->hWnd;
}
return;
}
Index: winscrinit.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/winscrinit.c,v
retrieving revision 1.1.4.1.2.17
retrieving revision 1.1.4.1.2.18
diff -u -d -r1.1.4.1.2.17 -r1.1.4.1.2.18
--- a/winscrinit.c 22 Apr 2004 20:16:51 -0000 1.1.4.1.2.17
+++ b/winscrinit.c 23 Apr 2004 07:43:06 -0000 1.1.4.1.2.18
@@ -443,11 +443,7 @@
rootless_CompositePixels_threshold = 0;
/* FIXME: How many? Profiling needed? */
rootless_CopyWindow_threshold = 1;
-
- if (!winMWExtWMInitCursor (pScreen))
- {
- return FALSE;
- }
+
winWindowsWMExtensionInit ();
}
#endif
@@ -569,9 +565,6 @@
#endif
#ifdef XWIN_MULTIWINDOWEXTWM
- /* Set the WindowOrderChanged flag to false */
- pScreenPriv->fWindowOrderChanged = FALSE;
-
pScreenPriv->fRestacking = FALSE;
#endif
Index: winwin32rootlesswndproc.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xwin/Attic/winwin32rootlesswndproc.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- a/winwin32rootlesswndproc.c 13 Apr 2004 07:05:36 -0000 1.1.2.10
+++ b/winwin32rootlesswndproc.c 23 Apr 2004 07:43:06 -0000 1.1.2.11
@@ -55,6 +55,7 @@
extern HICON g_hiconX;
extern Bool g_fNoConfigureWindow;
+extern Bool g_fSoftwareCursor;
/*
@@ -868,8 +869,6 @@
ErrorF ("winMWExtWMWindowProc - WM_SHOWWINDOW - %d ms\n",
(unsigned int)GetTickCount ());
#endif
- if (pScreenPriv != NULL)
- pScreenPriv->fWindowOrderChanged = TRUE;
break;
case WM_SIZING:
@@ -906,7 +905,6 @@
&& !(pWinPos->flags & SWP_NOZORDER)
&& !(pWinPos->flags & SWP_SHOWWINDOW))
{
- pScreenPriv->fWindowOrderChanged = TRUE;
if (pWinPos->hwndInsertAfter == HWND_TOP
||pWinPos->hwndInsertAfter == HWND_TOPMOST
||pWinPos->hwndInsertAfter == HWND_NOTOPMOST)
@@ -921,6 +919,7 @@
}
else
{
+ /* Check if this window is top of X windows. */
HWND hWndAbove = NULL;
DWORD dwCurrentProcessID = GetCurrentProcessId ();
DWORD dwWindowProcessID = 0;
@@ -929,6 +928,7 @@
hWndAbove != NULL;
hWndAbove = GetNextWindow (hWndAbove, GW_HWNDPREV))
{
+ /* Ignore other XWin process's window */
GetWindowThreadProcessId (hWndAbove, &dwWindowProcessID);
if ((dwWindowProcessID == dwCurrentProcessID)
@@ -936,6 +936,8 @@
&& !IsIconic (hwnd) ) /* ignore minimized windows */
break;
}
+ /* If this is top of X windows in Windows stack,
+ raise it in X stack. */
if (hWndAbove == NULL)
{
vlist[0] = Above;
@@ -1039,9 +1041,6 @@
#endif
if (g_fNoConfigureWindow) break;
- if (pScreenPriv != NULL)
- pScreenPriv->fWindowOrderChanged = TRUE;
-
/* Branch on type of resizing occurring */
switch (wParam)
{
@@ -1122,7 +1121,7 @@
case WM_SETCURSOR:
if (LOWORD(lParam) == HTCLIENT)
{
- SetCursor (pScreenPriv->hCursor);
+ if (!g_fSoftwareCursor) SetCursor (pScreenPriv->cursor.handle);
return TRUE;
}
break;
More information about the xorg-commit-diffs
mailing list