[xorg-commit-diffs] xc/programs/Xserver/GL/windows Imakefile, 1.1.2.5, 1.1.2.6 glwindows.h, 1.1.2.2, 1.1.2.3 indirect.c, 1.1.2.21, 1.1.2.22 wincursor.c, 1.1.2.3, NONE

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xorg/xc/programs/Xserver/GL/windows
In directory pdx:/tmp/cvs-serv12176

Modified Files:
      Tag: CYGWIN
	Imakefile glwindows.h indirect.c 
Removed Files:
      Tag: CYGWIN
	wincursor.c 
Log Message:
removed code for hardware cursor since it's now in hw/xwin


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/Attic/Imakefile,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/Imakefile	22 Mar 2004 13:43:35 -0000	1.1.2.5
+++ b/Imakefile	22 Apr 2004 20:23:45 -0000	1.1.2.6
@@ -2,8 +2,8 @@
 
 LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx)
 
-         SRCS = compsize.c indirect.c glwrap.c wincursor.c
-         OBJS = compsize.o indirect.o glwrap.o wincursor.o
+         SRCS = compsize.c indirect.c glwrap.c
+         OBJS = compsize.o indirect.o glwrap.o
 
      INCLUDES = -I. -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
                 -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \

Index: glwindows.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/Attic/glwindows.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- a/glwindows.h	22 Mar 2004 15:05:18 -0000	1.1.2.2
+++ b/glwindows.h	22 Apr 2004 20:23:45 -0000	1.1.2.3
@@ -5,7 +5,6 @@
 #include <glxext.h>
 
 #include <mipointrst.h>
-#include <cursorstr.h>
 #include <miscstruct.h>
 #include <windowstr.h>
 #include <resource.h>
@@ -35,23 +34,10 @@
 extern glWinDebugSettingsRec glWinDebugSettings;
 
 typedef struct {
-    /* from GetSystemMetrics */
-    int sm_cx;
-    int sm_cy;
-
-    BOOL visible;
-    HCURSOR handle;
-    QueryBestSizeProcPtr QueryBestSize;
-    miPointerSpriteFuncPtr spriteFuncs;
-} glWinCursorRec;
-
-typedef struct {
     int num_vis;
     __GLXvisualConfig *glx_vis;
     void **priv;
 
-    glWinCursorRec cursor;
-
     /* wrapped screen functions */
     RealizeWindowProcPtr RealizeWindow;
     UnrealizeWindowProcPtr UnrealizeWindow;
@@ -69,5 +55,3 @@
 #define GLWIN_DEBUG_MSG(a, ...)
 #endif
 
-extern Bool glWinInitCursor (ScreenPtr pScreen);
-

Index: indirect.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/windows/Attic/indirect.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- a/indirect.c	22 Mar 2004 15:05:18 -0000	1.1.2.21
+++ b/indirect.c	22 Apr 2004 20:23:45 -0000	1.1.2.22
@@ -1338,8 +1338,6 @@
     screenPriv->CopyWindow = pScreen->CopyWindow;
     pScreen->CopyWindow = glWinCopyWindow;
 
-    glWinInitCursor(pScreen);
-
     return TRUE;
 }
 

--- wincursor.c DELETED ---