mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-17 23:10:22 +00:00
e9b6bfcc01
Mon Nov 8 14:47:04 1999 Owen Taylor <otaylor@redhat.com>
Move all X specific code into the x11/ directory.
Aside from shuffling things around, did the following:
* gdk/gdkprivate.h gdk/gdk.h gdk/x11/gdkmain-x11.h: Add
gdk_arg_context_* - a simple argument parsing system
in the style of popt.
* gdk/gdkdrawable.[ch] gdk/gdkprivate.h gdk/gdkwindow.[ch]
gdk/x11/gdkprivate-x11.h:
Remove X specific stuff from GdkDrawable and GdkWindowPrivate -
add ->klass and ->klass_data fields. The klass_data
field points to an auxilliary structure that is
windowing system dependent.
* gdk/gdkfont.c: Make most of the measurement functions
simply wrappers around gdk_text_extents().
* gdk/gdkfont.c gdk/gdkprivate.h gdk/x11/gdkfont-x11.c: Add a
_gdk_font_strlen() function that hides the weird
behavior in gtk+-1.[02] where a string is interpreted
differently for 8-bit and 16-bit fonts.
* gdk/gdkevents.c: Add a new function gdk_event_button_generate()
to store common code for synthesizing double/triple
press events.
* gdk/gdkgc.[ch]: Virtualize in the same way as gdkdrawable.h.
Make all the function that modify an existing GC
simply wrappers around gdk_gc_set_values().
* gdk/gdkcc.[ch]: Moved into x11/ directory in preparation
for throwing out later.
* gdk/gdkfont.c gdk/gdkimage.c gdk/gdkcolor.c: Change GdkFontPrivate,
GdkImagePrivate and GdkColormapPrivate to have a
windowing system dependent part (GdkFontPrivateX etc.)
that "derives" from the system-independent part.
* configure.in gdk/x11/Makefile.in gdk/x11/gdkinput*.c:
Got rid of the included-source-files for XInput in
favor of automake conditionals. (Which didn't exist
when XInput support was originally added.)
* gdk/gdkrgb.c: Remove the visual id from the debugging
statements since that is X11 specific; print out
type/depth info instead.
159 lines
3.7 KiB
C
159 lines
3.7 KiB
C
#ifndef __GDK_PRIVATE_X11_H__
|
|
#define __GDK_PRIVATE_X11_H__
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
#include <gdk/gdkfont.h>
|
|
#include <gdk/gdkprivate.h>
|
|
#include <gdk/gdkcursor.h>
|
|
|
|
typedef struct _GdkGCXData GdkGCXData;
|
|
typedef struct _GdkDrawableXData GdkDrawableXData;
|
|
typedef struct _GdkColormapPrivateX GdkColormapPrivateX;
|
|
typedef struct _GdkCursorPrivate GdkCursorPrivate;
|
|
typedef struct _GdkFontPrivateX GdkFontPrivateX;
|
|
typedef struct _GdkImagePrivateX GdkImagePrivateX;
|
|
typedef struct _GdkVisualPrivate GdkVisualPrivate;
|
|
typedef struct _GdkRegionPrivate GdkRegionPrivate;
|
|
|
|
#ifdef USE_XIM
|
|
typedef struct _GdkICPrivate GdkICPrivate;
|
|
#endif /* USE_XIM */
|
|
|
|
#define GDK_DRAWABLE_XDATA(win) ((GdkDrawableXData *)(((GdkDrawablePrivate*)(win))->klass_data))
|
|
#define GDK_GC_XDATA(gc) ((GdkGCXData *)(((GdkGCPrivate*)(gc))->klass_data))
|
|
|
|
struct _GdkGCXData
|
|
{
|
|
GC xgc;
|
|
Display *xdisplay;
|
|
};
|
|
|
|
struct _GdkDrawableXData
|
|
{
|
|
Window xid;
|
|
Display *xdisplay;
|
|
};
|
|
|
|
struct _GdkCursorPrivate
|
|
{
|
|
GdkCursor cursor;
|
|
Cursor xcursor;
|
|
Display *xdisplay;
|
|
};
|
|
|
|
struct _GdkFontPrivateX
|
|
{
|
|
GdkFontPrivate base;
|
|
/* XFontStruct *xfont; */
|
|
/* generic pointer point to XFontStruct or XFontSet */
|
|
gpointer xfont;
|
|
Display *xdisplay;
|
|
|
|
GSList *names;
|
|
};
|
|
|
|
struct _GdkVisualPrivate
|
|
{
|
|
GdkVisual visual;
|
|
Visual *xvisual;
|
|
};
|
|
|
|
struct _GdkColormapPrivateX
|
|
{
|
|
GdkColormapPrivate base;
|
|
|
|
Colormap xcolormap;
|
|
Display *xdisplay;
|
|
gint private_val;
|
|
|
|
GHashTable *hash;
|
|
GdkColorInfo *info;
|
|
time_t last_sync_time;
|
|
};
|
|
|
|
struct _GdkImagePrivateX
|
|
{
|
|
GdkImagePrivate base;
|
|
|
|
XImage *ximage;
|
|
Display *xdisplay;
|
|
gpointer x_shm_info;
|
|
};
|
|
|
|
struct _GdkRegionPrivate
|
|
{
|
|
GdkRegion region;
|
|
Region xregion;
|
|
};
|
|
|
|
|
|
#ifdef USE_XIM
|
|
|
|
struct _GdkICPrivate
|
|
{
|
|
XIC xic;
|
|
GdkICAttr *attr;
|
|
GdkICAttributesType mask;
|
|
};
|
|
|
|
#endif /* USE_XIM */
|
|
|
|
void gdk_xid_table_insert (XID *xid,
|
|
gpointer data);
|
|
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);
|
|
GdkGC * _gdk_x11_gc_new (GdkDrawable *drawable,
|
|
GdkGCValues *values,
|
|
GdkGCValuesMask values_mask);
|
|
GdkColormap * gdk_colormap_lookup (Colormap xcolormap);
|
|
GdkVisual * gdk_visual_lookup (Visual *xvisual);
|
|
|
|
/* 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 GdkDrawableClass _gdk_x11_drawable_class;
|
|
extern gboolean gdk_use_xshm;
|
|
extern gchar *gdk_display_name;
|
|
extern Display *gdk_display;
|
|
extern Window gdk_root_window;
|
|
extern Window gdk_leader_window;
|
|
extern Atom gdk_wm_delete_window;
|
|
extern Atom gdk_wm_take_focus;
|
|
extern Atom gdk_wm_protocols;
|
|
extern Atom gdk_wm_window_protocols[];
|
|
extern Atom gdk_selection_property;
|
|
extern GdkWindow *selection_owner[];
|
|
extern gchar *gdk_progclass;
|
|
extern gboolean gdk_null_window_warnings;
|
|
extern const int gdk_nevent_masks;
|
|
extern const int gdk_event_mask_table[];
|
|
|
|
extern GdkWindowPrivate *gdk_xgrab_window; /* Window that currently holds the
|
|
* x pointer grab
|
|
*/
|
|
|
|
#ifdef USE_XIM
|
|
extern GdkICPrivate *gdk_xim_ic; /* currently using IC */
|
|
extern GdkWindow *gdk_xim_window; /* currently using Window */
|
|
#endif /* USE_XIM */
|
|
|
|
|
|
#endif /* __GDK_PRIVATE_X11_H__ */
|
|
|