forked from AuroraMiddleware/gtk
89fd6ad3de
Sun Nov 17 13:45:08 2002 Manish Singh <yosh@gimp.org>
* gdk/Makefile.am: add -DGDK_DISABLE_DEPRECATED
* gdk/gdk.c (gdk_exit): remove obsolete comment
* gdk/gdk.h: declare gdk_input_add_full if GTK_COMPILATION for
gtk_input_add_full
* gdk/gdkcolor.c (gdk_color_white, gdk_color_black): use
gdk_colormap_alloc_color instead of gdk_color_alloc
* gdk/gdkcolor.h: declare gdk_colormap_change if GDK_COMPILATION for
gdk_colors_store. Also, gdk_colors_{alloc,free} for
gdk_rgb_try_colormap
* gdk/gdkdrawable.h: declare gdk_draw_string if GTK_COMPILATION for
gtk_default_draw_string. Also, gdk_draw_text and gdk_draw_text_wc
if GDK_COMPILATION for the respective gdk_window_ and gdk_pixmap_
functions.
* gdk/gdkfont.c: #undef GDK_DISABLE_DEPRECATED, completely compat
code here
* gdk/gdkfont.h: allow the GdkFont structure and a few gdk_font_
functions for compat code in GDK_COMPILATION and GTK_COMPILATION.
* gdk/gdkrgb.c (gdk_rgb_cmap_fail, gdk_rgb_try_colormap): use
gdk_colormap_free_colors instead of gdk_colors_free.
* gdk/gdkrgb.c (gdk_draw_rgb_image_core): no need to set fg/bg
for own_gc, unused.
* gdk/gdkwindow.h: declare gdk_window_get_deskrelative_origin if
GTK_COMPILATION for gtk_handle_box_button_changed.
* gdk/x11/Makefile.am: add -DGDK_DISABLE_DEPRECATED, renmae
-DINSIDE_GDK_X11 to -DGDK_COMPILATION
* gdk/x11/gdkcolor-x11.c: remove duplicate doc string for
gdk_colormap_alloc_colors.
* gdk/x11/gdkfont-x11.c: #undef GDK_DISABLE_DEPRECATED, completely
compat code here
* gdk/x11/gdkx.h: use GDK_COMPILATION instead of INSIDE_GDK_X11,
allow a few gdk_x11_font_ functions if GDK_COMPILATION for compat
code
* gtk/Makefile.am: add -DGDK_DISABLE_DEPRECATED
* gtk/gtkclist.c
* gtk/gtkctree.c
* gtk/gtkpixmap.c
* gtk/gtkpreview.c
* gtk/gtktext.c: #undef GDK_DISABLE_DEPRECATED, deprecated widget
* gtk/gtkhandlebox.c (gtk_handle_box_motion): use
gdk_window_set_geometry_hints instead of gdk_window_set_hints.
* gtk/gtkmain.c (gtk_exit): call exit directly
* gtktipsquery.c (gtk_tips_query_real_start_query)
* gtk/gtktreeitem.c (gtk_tree_item_add_pixmaps): remove some
deprecated GDK usage.
201 lines
8.3 KiB
C
201 lines
8.3 KiB
C
/* GDK - The GIMP Drawing Kit
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
|
* file for a list of people on the GTK+ Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#ifndef __GDK_X_H__
|
|
#define __GDK_X_H__
|
|
|
|
#include <gdk/gdkprivate.h>
|
|
#include <gdk/gdkcursor.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
extern Display *gdk_display;
|
|
#endif
|
|
|
|
Display *gdk_x11_drawable_get_xdisplay (GdkDrawable *drawable);
|
|
XID gdk_x11_drawable_get_xid (GdkDrawable *drawable);
|
|
Display *gdk_x11_image_get_xdisplay (GdkImage *image);
|
|
XImage *gdk_x11_image_get_ximage (GdkImage *image);
|
|
Display *gdk_x11_colormap_get_xdisplay (GdkColormap *colormap);
|
|
Colormap gdk_x11_colormap_get_xcolormap (GdkColormap *colormap);
|
|
Display *gdk_x11_cursor_get_xdisplay (GdkCursor *cursor);
|
|
Cursor gdk_x11_cursor_get_xcursor (GdkCursor *cursor);
|
|
Display *gdk_x11_display_get_xdisplay (GdkDisplay *display);
|
|
Visual * gdk_x11_visual_get_xvisual (GdkVisual *visual);
|
|
Display *gdk_x11_gc_get_xdisplay (GdkGC *gc);
|
|
GC gdk_x11_gc_get_xgc (GdkGC *gc);
|
|
Screen * gdk_x11_screen_get_xscreen (GdkScreen *screen);
|
|
int gdk_x11_screen_get_screen_number (GdkScreen *screen);
|
|
|
|
const char* gdk_x11_screen_get_window_manager_name (GdkScreen *screen);
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
Window gdk_x11_get_default_root_xwindow (void);
|
|
Display *gdk_x11_get_default_xdisplay (void);
|
|
gint gdk_x11_get_default_screen (void);
|
|
#endif
|
|
|
|
#define GDK_COLORMAP_XDISPLAY(cmap) (gdk_x11_colormap_get_xdisplay (cmap))
|
|
#define GDK_COLORMAP_XCOLORMAP(cmap) (gdk_x11_colormap_get_xcolormap (cmap))
|
|
#define GDK_CURSOR_XDISPLAY(cursor) (gdk_x11_cursor_get_xdisplay (cursor))
|
|
#define GDK_CURSOR_XCURSOR(cursor) (gdk_x11_cursor_get_xcursor (cursor))
|
|
#define GDK_IMAGE_XDISPLAY(image) (gdk_x11_image_get_xdisplay (image))
|
|
#define GDK_IMAGE_XIMAGE(image) (gdk_x11_image_get_ximage (image))
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
#define GDK_DISPLAY() gdk_display
|
|
#endif
|
|
|
|
#ifdef GDK_COMPILATION
|
|
|
|
#include "gdkprivate-x11.h"
|
|
#include "gdkscreen-x11.h"
|
|
|
|
#define GDK_DISPLAY_XDISPLAY(display) (GDK_DISPLAY_X11(display)->xdisplay)
|
|
|
|
#define GDK_WINDOW_XDISPLAY(win) (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xdisplay)
|
|
#define GDK_WINDOW_XID(win) (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
|
|
#define GDK_PIXMAP_XDISPLAY(pix) (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->xdisplay)
|
|
#define GDK_PIXMAP_XID(pix) (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)pix)->impl)->xid)
|
|
#define GDK_DRAWABLE_XDISPLAY(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
|
|
#define GDK_DRAWABLE_XID(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
|
|
#define GDK_GC_XDISPLAY(gc) (GDK_SCREEN_XDISPLAY(GDK_GC_X11(gc)->screen))
|
|
#define GDK_GC_XGC(gc) (GDK_GC_X11(gc)->xgc)
|
|
#define GDK_SCREEN_XDISPLAY(screen) (GDK_SCREEN_X11 (screen)->xdisplay)
|
|
#define GDK_SCREEN_XSCREEN(screen) (GDK_SCREEN_X11 (screen)->xscreen)
|
|
#define GDK_SCREEN_XNUMBER(screen) (GDK_SCREEN_X11 (screen)->screen_num)
|
|
#define GDK_VISUAL_XVISUAL(vis) (((GdkVisualPrivate *) vis)->xvisual)
|
|
#define GDK_GC_GET_XGC(gc) (GDK_GC_X11(gc)->dirty_mask ? _gdk_x11_gc_flush (gc) : ((GdkGCX11 *)(gc))->xgc)
|
|
#define GDK_WINDOW_XWINDOW GDK_DRAWABLE_XID
|
|
|
|
#else /* GDK_COMPILATION */
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
#define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ())
|
|
#endif
|
|
|
|
#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display))
|
|
|
|
#define GDK_WINDOW_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (((GdkWindowObject *)win)->impl))
|
|
#define GDK_WINDOW_XID(win) (gdk_x11_drawable_get_xid (win))
|
|
#define GDK_WINDOW_XWINDOW(win) (gdk_x11_drawable_get_xid (win))
|
|
#define GDK_PIXMAP_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (((GdkPixmapObject *)win)->impl))
|
|
#define GDK_PIXMAP_XID(win) (gdk_x11_drawable_get_xid (win))
|
|
#define GDK_DRAWABLE_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (win))
|
|
#define GDK_DRAWABLE_XID(win) (gdk_x11_drawable_get_xid (win))
|
|
#define GDK_GC_XDISPLAY(gc) (gdk_x11_gc_get_xdisplay (gc))
|
|
#define GDK_GC_XGC(gc) (gdk_x11_gc_get_xgc (gc))
|
|
#define GDK_SCREEN_XDISPLAY(screen) (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
|
|
#define GDK_SCREEN_XSCREEN(screen) (gdk_x11_screen_get_xscreen (screen))
|
|
#define GDK_SCREEN_XNUMBER(screen) (gdk_x11_screen_get_screen_number (screen))
|
|
#define GDK_VISUAL_XVISUAL(visual) (gdk_x11_visual_get_xvisual (visual))
|
|
|
|
#endif /* GDK_COMPILATION */
|
|
|
|
GdkVisual* gdk_x11_screen_lookup_visual (GdkScreen *screen,
|
|
VisualID xvisualid);
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
GdkVisual* gdkx_visual_get (VisualID xvisualid);
|
|
#endif
|
|
|
|
#ifdef GDK_ENABLE_BROKEN
|
|
/* XXX: An X Colormap is useless unless we also have the visual. */
|
|
GdkColormap* gdkx_colormap_get (Colormap xcolormap);
|
|
#endif
|
|
|
|
GdkColormap *gdk_x11_colormap_foreign_new (GdkVisual *visual,
|
|
Colormap xcolormap);
|
|
|
|
/* Return the Gdk* for a particular XID */
|
|
gpointer gdk_xid_table_lookup_for_display (GdkDisplay *display,
|
|
XID xid);
|
|
guint32 gdk_x11_get_server_time (GdkWindow *window);
|
|
|
|
/* returns TRUE if we support the given WM spec feature */
|
|
gboolean gdk_x11_screen_supports_net_wm_hint (GdkScreen *screen,
|
|
GdkAtom property);
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
gpointer gdk_xid_table_lookup (XID xid);
|
|
gboolean gdk_net_wm_supports (GdkAtom property);
|
|
void gdk_x11_grab_server (void);
|
|
void gdk_x11_ungrab_server (void);
|
|
|
|
#endif
|
|
|
|
GdkDisplay *gdk_x11_lookup_xdisplay (Display *xdisplay);
|
|
|
|
|
|
/* Functions to get the X Atom equivalent to the GdkAtom */
|
|
Atom gdk_x11_atom_to_xatom_for_display (GdkDisplay *display,
|
|
GdkAtom atom);
|
|
GdkAtom gdk_x11_xatom_to_atom_for_display (GdkDisplay *display,
|
|
Atom xatom);
|
|
Atom gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display,
|
|
const gchar *atom_name);
|
|
G_CONST_RETURN gchar *gdk_x11_get_xatom_name_for_display (GdkDisplay *display,
|
|
Atom xatom);
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
Atom gdk_x11_atom_to_xatom (GdkAtom atom);
|
|
GdkAtom gdk_x11_xatom_to_atom (Atom xatom);
|
|
Atom gdk_x11_get_xatom_by_name (const gchar *atom_name);
|
|
G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom);
|
|
#endif
|
|
|
|
void gdk_x11_display_grab (GdkDisplay *display);
|
|
void gdk_x11_display_ungrab (GdkDisplay *display);
|
|
|
|
#if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)
|
|
|
|
gpointer gdk_x11_font_get_xfont (GdkFont *font);
|
|
#define GDK_FONT_XFONT(font) (gdk_x11_font_get_xfont (font))
|
|
|
|
#define gdk_font_lookup_for_display(display, xid) ((GdkFont*) gdk_xid_table_lookup_for_display (display, xid))
|
|
|
|
#endif /* !GDK_DISABLE_DEPRECATED || GDK_COMPILATION */
|
|
|
|
#ifndef GDK_DISABLE_DEPRECATED
|
|
|
|
Display * gdk_x11_font_get_xdisplay (GdkFont *font);
|
|
G_CONST_RETURN char *gdk_x11_font_get_name (GdkFont *font);
|
|
|
|
#define GDK_FONT_XDISPLAY(font) (gdk_x11_font_get_xdisplay (font))
|
|
|
|
#ifndef GDK_MULTIHEAD_SAFE
|
|
|
|
#define gdk_font_lookup(xid) ((GdkFont*) gdk_xid_table_lookup (xid))
|
|
|
|
#endif /* GDK_MULTIHEAD_SAFE */
|
|
#endif /* GDK_DISABLE_DEPRECATED */
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __GDK_X_H__ */
|