--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glyphs-x.h	Mon Aug 13 11:28:15 2007 +0200
@@ -0,0 +1,145 @@
+/* X-specific glyphs and related.
+   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1995 Board of Trustees, University of Illinois.
+   Copyright (C) 1995, 1996 Ben Wing
+   Copyright (C) 1995 Sun Microsystems, Inc.
+
+This file is part of XEmacs.
+
+XEmacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+XEmacs is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Synched up with:  Not in FSF. */
+
+#ifndef _XEMACS_GLYPHS_X_H_
+#define _XEMACS_GLYPHS_X_H_
+
+#include "glyphs.h"
+
+#ifdef HAVE_X_WINDOWS
+
+#include "xintrinsic.h"
+#include "../lwlib/lwlib.h"
+
+/****************************************************************************
+ *                         Image-Instance Object                            *
+ ****************************************************************************/
+
+struct x_image_instance_data
+{
+  Pixmap* pixmaps;
+  Cursor cursor;
+
+  /* If depth>0, then that means that other colors were allocated when
+     this pixmap was loaded.  These are they; we need to free them when
+     finalizing the image instance. */
+  Colormap colormap;
+  unsigned long *pixels;
+  int npixels;
+
+  /* Should we hang on to the extra info from the XpmAttributes, like
+     the textual color table and the comments?   Is that useful? */
+};
+
+#define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data)
+
+#define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmaps[0])
+#define IMAGE_INSTANCE_X_PIXMAP_SLICE(i,slice) \
+     (X_IMAGE_INSTANCE_DATA (i)->pixmaps[slice])
+#define IMAGE_INSTANCE_X_PIXMAP_SLICES(i) \
+     (X_IMAGE_INSTANCE_DATA (i)->pixmaps)
+#define IMAGE_INSTANCE_X_MASK(i) \
+	(Pixmap)(IMAGE_INSTANCE_PIXMAP_MASK (i))
+#define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor)
+#define IMAGE_INSTANCE_X_COLORMAP(i) (X_IMAGE_INSTANCE_DATA (i)->colormap)
+#define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels)
+#define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels)
+
+#define XIMAGE_INSTANCE_X_PIXMAP(i) \
+  IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_PIXMAP_SLICES(i) \
+  IMAGE_INSTANCE_X_PIXMAP_SLICES (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_PIXMAP_SLICE(i) \
+  IMAGE_INSTANCE_X_PIXMAP_SLICE (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_MASK(i) \
+  IMAGE_INSTANCE_X_MASK (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_CURSOR(i) \
+  IMAGE_INSTANCE_X_CURSOR (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_PIXELS(i) \
+  IMAGE_INSTANCE_X_PIXELS (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_NPIXELS(i) \
+  IMAGE_INSTANCE_X_NPIXELS (XIMAGE_INSTANCE (i))
+
+/****************************************************************************
+ *                            Subwindow Object                              *
+ ****************************************************************************/
+
+struct x_subwindow_data
+{
+  union
+  {
+    struct
+    {
+      Display *display;
+      Window parent_window;
+      Window clip_window;
+    } sub;
+    struct 
+    {
+      Widget clip_window;
+      Position x_offset;
+      Position y_offset;
+      LWLIB_ID	id;
+    } wid;
+  } data;
+};
+
+#define X_SUBWINDOW_INSTANCE_DATA(i) ((struct x_subwindow_data *) (i)->data)
+
+#define IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.display)
+#define IMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window)
+#define IMAGE_INSTANCE_X_CLIPWINDOW(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window)
+#define IMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset)
+#define IMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset)
+#define IMAGE_INSTANCE_X_WIDGET_LWID(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id)
+#define IMAGE_INSTANCE_X_CLIPWIDGET(i) \
+  (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window)
+#define XIMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \
+  IMAGE_INSTANCE_X_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \
+  IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \
+  IMAGE_INSTANCE_X_WIDGET_XOFFSET (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \
+  IMAGE_INSTANCE_X_WIDGET_YOFFSET (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_WIDGET_LWID(i) \
+  IMAGE_INSTANCE_X_WIDGET_LWID (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_CLIPWIDGET(i) \
+  IMAGE_INSTANCE_X_CLIPWIDGET (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_X_CLIPWINDOW(i) \
+  IMAGE_INSTANCE_X_CLIPWINDOW (XIMAGE_INSTANCE (i))
+#define IMAGE_INSTANCE_X_SUBWINDOW_ID(i) \
+  ((Window) IMAGE_INSTANCE_SUBWINDOW_ID (i))
+#define IMAGE_INSTANCE_X_WIDGET_ID(i) \
+  ((Widget) IMAGE_INSTANCE_SUBWINDOW_ID (i))
+
+#endif /* HAVE_X_WINDOWS */
+#endif /* _XEMACS_GLYPHS_X_H_ */