put text after #endif in comment

[~andy/gtk] / gdk / gdkprivate.h

diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index ee8456fb12c95d87407a29dd4e82c458d42b0855..6131cb55aee1e90dc136a27cf0474dda3495f03a 100644 (file)
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -12,8 +12,9 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 #ifndef __GDK_PRIVATE_H__
 #define __GDK_PRIVATE_H__
@@ -23,8 +24,6 @@
 #include <X11/Xutil.h>
 #include <gdk/gdktypes.h>
 
-#define DND_PROTOCOL_VERSION 0
-
 #define gdk_window_lookup(xid)    ((GdkWindow*) gdk_xid_table_lookup (xid))
 #define gdk_pixmap_lookup(xid)    ((GdkPixmap*) gdk_xid_table_lookup (xid))
 #define gdk_font_lookup(xid)      ((GdkFont*) gdk_xid_table_lookup (xid))
@@ -40,10 +39,12 @@ typedef struct _GdkWindowPrivate       GdkPixmapPrivate;
 typedef struct _GdkImagePrivate               GdkImagePrivate;
 typedef struct _GdkGCPrivate          GdkGCPrivate;
 typedef struct _GdkColormapPrivate     GdkColormapPrivate;
+typedef struct _GdkColorInfo           GdkColorInfo;
 typedef struct _GdkVisualPrivate       GdkVisualPrivate;
 typedef struct _GdkFontPrivate        GdkFontPrivate;
 typedef struct _GdkCursorPrivate       GdkCursorPrivate;
 typedef struct _GdkEventFilter        GdkEventFilter;
+typedef struct _GdkClientFilter               GdkClientFilter;
 typedef struct _GdkColorContextPrivate GdkColorContextPrivate;
 typedef struct _GdkRegionPrivate       GdkRegionPrivate;
 
@@ -62,24 +63,12 @@ struct _GdkWindowPrivate
   guint8 window_type;
   guint ref_count;
   guint destroyed : 2;
-  guint dnd_drag_enabled : 1,
-    dnd_drag_datashow : 1,
-    dnd_drag_destructive_op : 1,
-    dnd_drag_accepted : 1,
-    dnd_drop_enabled : 1,
-    dnd_drop_destructive_op : 1;
-  GdkAtom dnd_drag_data_type, *dnd_drag_data_typesavail;
-  guint dnd_drag_data_numtypesavail;
-  /* We have to turn on MotionMask/EnterWindowMask/LeaveWindowMask
-     during drags, then set it back to what it was after */
-  glong dnd_drag_savedeventmask, dnd_drag_eventmask;
-  GdkAtom *dnd_drop_data_typesavail;
-  guint dnd_drop_data_numtypesavail;
-  /* need to allow custom drag/drop cursors */
 
   gint extension_events;
 
   GList *filters;
+  GdkColormap *colormap;
+  GList *children;
 };
 
 struct _GdkImagePrivate
@@ -108,6 +97,16 @@ struct _GdkGCPrivate
   guint ref_count;
 };
 
+typedef enum {
+  GDK_COLOR_WRITEABLE = 1 << 0
+} GdkColorInfoFlags;
+
+struct _GdkColorInfo
+{
+  GdkColorInfoFlags flags;
+  guint ref_count;
+};
+
 struct _GdkColormapPrivate
 {
   GdkColormap colormap;
@@ -115,7 +114,11 @@ struct _GdkColormapPrivate
   Display *xdisplay;
   GdkVisual *visual;
   gint private_val;
-  gint next_color;
+
+  GHashTable *hash;
+  GdkColorInfo *info;
+  time_t last_sync_time;
+  
   guint ref_count;
 };
 
@@ -146,6 +149,7 @@ struct _GdkDndCursorInfo {
   Cursor         gdk_cursor_dragdefault, gdk_cursor_dragok;
   GdkWindow     *drag_pm_default, *drag_pm_ok;
   GdkPoint       default_hotspot, ok_hotspot;
+  GList *xids;
 };
 typedef struct _GdkDndCursorInfo GdkDndCursorInfo;
 
@@ -160,6 +164,12 @@ struct _GdkDndGlobals {
   gboolean       drag_really, drag_perhaps, dnd_grabbed;
   Window         dnd_drag_target;
   GdkPoint       drag_dropcoords;
+
+  GdkPoint dnd_drag_start, dnd_drag_oldpos;
+  GdkRectangle dnd_drag_dropzone;
+  GdkWindowPrivate *real_sw;
+  Window dnd_drag_curwin;
+  Time last_drop_time; /* An incredible hack, sosumi miguel */
 };
 typedef struct _GdkDndGlobals GdkDndGlobals;
 
@@ -168,16 +178,23 @@ struct _GdkEventFilter {
   gpointer data;
 };
 
+struct _GdkClientFilter {
+  GdkAtom       type;
+  GdkFilterFunc function;
+  gpointer      data;
+};
+
 #ifdef USE_XIM
 
+typedef struct _GdkICPrivate GdkICPrivate;
+
 struct _GdkICPrivate
 {
   XIC xic;
-  GdkIMStyle style;
+  GdkICAttr *attr;
+  GdkICAttributesType mask;
 };
 
-typedef struct _GdkICPrivate GdkICPrivate;
-
 #endif /* USE_XIM */
 
 struct _GdkColorContextPrivate
@@ -194,15 +211,16 @@ struct _GdkRegionPrivate
 };
 
 typedef enum {
-  GDK_DEBUG_MISC = 1<<0,
-  GDK_DEBUG_EVENTS = 1 << 1,
-  GDK_DEBUG_DND = 1<<2,
-  GDK_DEBUG_COLOR_CONTEXT = 1<<3,
-  GDK_DEBUG_XIM = 1<<4
+  GDK_DEBUG_MISC          = 1 << 0,
+  GDK_DEBUG_EVENTS        = 1 << 1,
+  GDK_DEBUG_DND           = 1 << 2,
+  GDK_DEBUG_COLOR_CONTEXT = 1 << 3,
+  GDK_DEBUG_XIM           = 1 << 4
 } GdkDebugFlag;
 
 void gdk_window_init (void);
 void gdk_visual_init (void);
+void gdk_dnd_init    (void);
 
 void gdk_image_init  (void);
 void gdk_image_exit (void);
@@ -218,6 +236,9 @@ void         gdk_xid_table_insert (XID      *xid,
 void    gdk_xid_table_remove (XID       xid);
 gpointer gdk_xid_table_lookup (XID      xid);
 
+gint gdk_send_xevent (Window window, gboolean propagate, glong event_mask,
+                     XEvent *event_send);
+
 /* If you pass x = y = -1, it queries the pointer
    to find out where it currently is.
    If you pass x = y = -2, it does anything necessary
@@ -228,6 +249,9 @@ void gdk_dnd_display_drag_cursor(gint x,
                                 gboolean drag_ok,
                                 gboolean change_made);
 
+/* Please see gdkwindow.c for comments on how to use */ 
+Window gdk_window_xid_at(Window base, gint bx, gint by, gint x, gint y, GList *excludes, gboolean excl_child);
+Window gdk_window_xid_at_coords(gint x, gint y, GList *excludes, gboolean excl_child);
 
 extern gint             gdk_debug_level;
 extern gint             gdk_show_events;
@@ -246,12 +270,28 @@ extern Atom                gdk_wm_window_protocols[];
 extern Atom             gdk_selection_property;
 extern GdkDndGlobals    gdk_dnd;
 extern GdkWindow       *selection_owner[];
-extern gchar           *gdk_progname;
 extern gchar           *gdk_progclass;
 extern gint             gdk_error_code;
 extern gint             gdk_error_warnings;
 extern gint              gdk_null_window_warnings;
 extern GList            *gdk_default_filters;
+extern gboolean          gdk_using_threads;
+
+/* Threading stuff */
+#ifdef USE_PTHREADS
+extern gint              gdk_threads_pipe[2];
+extern gboolean          gdk_select_waiting;
+#endif
+
+#ifdef USE_XIM
+/* XIM support */
+gint   gdk_im_open              (void);
+void   gdk_im_close             (void);
+void   gdk_ic_cleanup           (void);
+
+extern GdkICPrivate *gdk_xim_ic;               /* currently using IC */
+extern GdkWindow *gdk_xim_window;              /* currently using Window */
+#endif /* USE_XIM */
 
 /* Debugging support */