Suppression des champs utilis�s par LIBART.

Ajour de quelques variables pour GL.

1 files changed, 6 insertions, 30 deletions

diff --git a/generic/WidgetInfo.h b/generic/WidgetInfo.h
index ba3e780..d7071b9 100644
--- a/generic/WidgetInfo.h
+++ b/generic/WidgetInfo.h
@@ -33,9 +33,6 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#ifdef SHM
-#include <X11/extensions/XShm.h>
-#endif
 #ifdef GLX
 #include <GL/glx.h>
 #endif
@@ -45,6 +42,7 @@
 #include "Types.h"
 #include "perfos.h"
 
+
 #ifndef NUM_ALPHA_STEPS
 #define NUM_ALPHA_STEPS		16
 #endif
@@ -56,18 +54,6 @@
 #define INTERNAL_NEED_REPICK	8
 
 
-#ifdef SHM
-/*
- * Data for local rendering mode.
- */
-typedef struct {
-  unsigned char	*buf;		/* 24-bit RGB buffer for rendering */
-  int		rowstride;	/* Rowstride for the buffer */
-  int		ox, oy, cx, cy;	/* Rectangle describing the rendering area */
-} RenderBuf;
-#endif
-
-
 /*
  * The following structure provides information about the selection and
  * the insertion cursor.  It is needed by only a few items, such as
@@ -191,30 +177,19 @@ typedef struct _WidgetInfo {
   Screen		*screen;
   ZnWindow		win;			/* The window of the widget. */
   ZnBool		realized;
-#ifdef LIBART
-#ifdef SHM
-  XImage		*draw_buffer_im;	/* Image for double buffering		*/
-  RenderBuf		buf;
-#endif
-#endif
 #ifdef GLX
   GLXContext		gl_context;
   XVisualInfo		*gl_visual;
+  ZnReal		max_line_width;
+  ZnReal		max_point_width;
 #endif
   Pixmap		draw_buffer;		/* Pixmap for double buffering		*/
   ZnBBox		damaged_area;		/* The current damaged rectangle	*/
   GC			gc;
   ZnBool		has_glx;		/* Tell if openGL can be used. */
-  ZnBool		has_x_shm;		/* Tell if the SHM X11 ext is avail.	*/
   ZnBool		has_x_shape;		/* Tell if the X shape ext. is avail.	*/
   ZnBool		has_x_input;		/* Tell if the X input ext. is avail.	*/
-  ZnBool		render;			/* Instruct to render to a local image,
-						 * using libart. */
-#ifdef LIBART
-#ifdef SHM
-  XShmSegmentInfo	x_shm_info;
-#endif
-#endif
+  ZnBool		render;
   int			events_flags;		/* NEED_REPICK et al */
   Window		real_top;
   Item			top_group;
@@ -222,7 +197,8 @@ typedef struct _WidgetInfo {
 						 * works. */
   ZnList		work_pts;		/* Temporary point lists. */
   ZnList		work_xpts;
-
+  ZnList		work_doubles;		/* Temporary number list. */
+  
   /* Text management */
   TextInfo		text_info;
   int			insert_on_time;