mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-27 22:20:24 +00:00
1bbf2ac7ee
Fri Sep 7 11:51:44 2001 Owen Taylor <otaylor@redhat.com> Make gdkx.h the only installed header from gdk/x11. All structures in gdk/x11 are opaque. * gdk/x11/Makefile.am gdk/x11/gdkx.h gdk/x11/gdkprivate-x11.h: Don't install gdk{drawable,pixmap,window}-x11.h. * gdk/x11/{gdkcolormap-x11.c, gdkfont-x11.c, gdkx.h, gdkvisual-x11.c: Move GdkColormapPrivateX11, GdkFontPrivateX GdkImagePrivateX11, GdkVisualClass into C files. * gdk/gdkpixmap-x11.[ch]: Make gdk_pixmap_impl_get_type() static. * gdk/x11/{gdkcolor-x11.c, gdkcursor-x11.c, gdkdrawable-x11.c, gdkfont-x11.c, gdkgc-x11.c, gdkx.h, gdkimage-x11,gdkvisual-x11.c} Add public functions to replace previously exported direct structure access. gdk_x11_colormap_get_{xdisplay,xcolormap} gdk_x11_cursor_get_{xdisplay,xcursor}, gdk_x11_drawable_get_{xdisplay,xcursor,gdk_x11_visual_get_xvisual, gdk_x11_font_get_{xdisplay,xfont}, gdk_x11_image_get_{xdisplay,ximage}, gdk_x11_gc_get_{xdisplay,ximage} * gdk/gdkprivate.h gdk/gdkinternals.h: Move GdkColorInfo, GdkEventFilter, GdkClientFilter, GdkFontPrivate to gdkinternals. Fix a number of variables and functions that were exported "accidentally" from GDK. * gdk/**.[ch]: gdk => _gdk for gdk_visual_init, gdk_events_init, gdk_input_init, gdk_dnd_init, gdk_image_exit, gdk_input_exit, gdk_windowing_exit, gdk_event_func, gdk_event_data, gdk_event_notify, gdk_queued_events, gdk_queued_tail, gdk_event_new, gdk_events_queue, gdk_events_unqueue, gdk_event_queue_find_first, gdk_event_queue_remove_link, gdk_event_queue_append, gdk_event_button_generate, gdk_debug_flags, gdk_default_filters, gdk_parent_root. * gdk/x11/{gdkevents-x11.c, gdkglobals-x11.c, gdkimage-x11.c, gdkmain-x11.c, gdkprivate-x11.h, gdk/x11/gdkwindow-x11.c}: gdk => _gdk for gdk_event_mask_table, gkd_nevent_masks, gdk_wm_window_protocols, gdk_leader_window, gdk_xgrab_window, gdk_use_xshm, gdk_input_ignore_core. * gdk/x11/xsettings-common.h (xsettings_list_insert): Add #defines to namespace functions into the private _gdk_ namespace. * gdk/gdkwindow.[ch] gdk/x11/gdkx.h: Add gdk_get_default_root_window () to replace gdk_parent_root exported variable. Adjust and deprecate GDK_ROOT_PARENT(). * demos/{testpixbuf-drawable.c,testpixbuf-save.c}: Fix GDK_ROOT_PARENT usage, remove includes of port-specific headers. * gdk/{win32,x11,fb}/gdkinput*.[ch]: s/gdk/_gdk/ for _gdk_input_gxid_host, _gdk_input_gxid_port, _gdk_input_ignore_core, gdk_input_devices, _gdk_input_windows, gdk_init_input_core. * gdk/x11/{gdkevents-x11.,c gdkglobals-x11.c, gdkmain-x11.c} docs/Changes-2.0.txt: Remove gdk_wm_protocols, gdk_wm_delete_window functions, gdk_wm_take_focus, use gdk_atom_intern() instead. * gdk/linux-fb/{gdkselection-fb.c, gdkmain-fb.c, gdkprivatefb.h} gdk/win32/{gdkselection-win32.c, gdkmgdkwin32.h, gdkprivate-win32.h} gdk/x11/{gdkselection-x11.c gdkx.h, gtkprivate-x11.h} gtk/gtkselection.c Unexport gdk_selection_property, just use gdk_atom_intern ("GDK_SELECTION"). * gdk/x11/{gdkprivate-x11.h,gdkdrawable-x11h,gdkgc-x11.c,gdkx.h}: Unexport gdk_drawable_impl_x11_get_type, gdk_gc_x11_get_type, GDK_GC_X11 cast macros, GdkGCX11 structures, GdkCursorPrivate, GdkVisualprivate, gdk_x11_gc_flush. Make a number of public exports of variables into functions to increase encapsulation. * gdk/gdkinternals.h gdk/gdkinput.h gdk/gdkevents.h gdk/linux-fb/gdkmouse-fb.c: gdk_core_pointer => _gdk_core_pointer, move to gdkinternals.h. Add gdk_device_get_core_pointer (). * gdk/gdkprivate.h gdk/gdkpango.c gdk/gdkinternals.h docs/Changes-2.0.txt: Unexport gdk_parent_root, gdk_error_code, gdk_error_warnings. * gdk/x11/{gdkcolormap-x11.c, gdkmain-x11.c, gdkx.h} docs/Changes-2.0.txt: s/gdk_screen/_gdk_screen/, add gdk_x11_get_default_screen() s/gdk_root_window/_gdk_root_window/, add gdk_x11_get_default_root_xwindow() Add gdk_x11_get_default_xdisplay(). * gdk/gdk.h gdk/gdk.c linux-fb/gdkfb.h linux-fb/gdkglobals-fb.c win32/gdkwin32.h x11/gdkglobals-x11.c gdk/x11/gdkmain-x11.c gdk/x11/gdkx.h: gdk/gdk.def: Add gdk_get/set_program_class, Don't export gdk_progclass, move --class command line option and handling to common portion of GDK. Miscellaneous fixes: * gdk/x11/gdkwindow-x11.c (gdk_window_set_icon_list): Fix g_return_val_if_fail that should have been g_return_if_fail. * gdk/gdkinternals.h gdk/gdkprivate.h: Move gdk_synthesize_window_state() to the semi-public gdkprivate.h. * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Remove uneeded X11 dependency. * gdk/linux-fb/gdkmain-fb.c gdk/win32/gdkmain-win32.c gdk/TODO: Remove unused gdk_key_repeat_disable/restore. * linux-fb/gdkglobals-fb.c win32/gdkglobals-win32.c x11/gdkglobals-x11.c x11/gdkprivate-x11.h gdk/gdk.def: Remove unused gdk_null_window_warnings variable. * gdk/Makefile.am (DIST_SUBDIRS) nanox/*: cvs remove nanox; it can be retrieved from the repository; it is too far from functional to be worth having people check out; it would be easier to start from scratch, I suspect. * gdk/x11/gdkpixmap-x11.c: Fix lvalue usage of GDK_PIXMAP_XID(). * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: Fix some accidentally global variables and unused global variables. * gdk/x11/gdkkeys-x11.c gdk/gdkrgb.c gdk/gdkwindow.c gdk/x11/gdkpango-x11.c gdk/x11/gdkselection-x11.c: Fix some accidentally global variables and unused global variables. Add some space for future expansion to multihead. * gdk/gdkdrawable.h: Add four reserved function pointers for future expansion of GdkDrawableClass. * gtk/gtkwindow.h gtk/gtkinvisible.h: Add reserved pointer where we can put a GdkScreen * later.
340 lines
9.2 KiB
Plaintext
340 lines
9.2 KiB
Plaintext
General
|
|
=======
|
|
|
|
- gdk_pointer_grab() and gdk_keyboard_grab() are logically member
|
|
functions of GdkWindow.
|
|
|
|
X specific Functions that need to be moved out of the common header files
|
|
=========================================================================
|
|
|
|
|
|
Dir structure for ports
|
|
=======================
|
|
|
|
The directory structure here is:
|
|
|
|
gdk/
|
|
gdk/x11
|
|
gdk/win32
|
|
...
|
|
|
|
The gdk/ directory directly contains all public
|
|
header files (that are not specific to one
|
|
windowing system).
|
|
|
|
There, in general should be no system dependency
|
|
|
|
For each set of functionality, there are the following
|
|
files:
|
|
|
|
gdkwindow.h: public header file
|
|
gdkwindow.c: common implementation
|
|
x11/gdkwindow.i: functionality specific to X11
|
|
win32/gdkwindow.i: functionality specific to win32
|
|
|
|
The gdkwindow.c file looks like:
|
|
|
|
====
|
|
#include "gdkwindow.h"
|
|
|
|
#ifdef GDK_WINDOWING_X11
|
|
#include "x11/gdkwindow.i"
|
|
#elif defined(GDK_WINDOW_WIN32)
|
|
#include "win32/gdkwindow.i"
|
|
fo#endif
|
|
|
|
[ generic implementation bits ]
|
|
====
|
|
|
|
x11/gdkwindow.i should only assume that gdkwindow.h has been
|
|
included and included all other dependencies explicitely.
|
|
|
|
The x11/ directory will contain:
|
|
|
|
.i files
|
|
.c files specific to X
|
|
.h files specific to X
|
|
|
|
And a Makefile.am that takes care of distributing the
|
|
files in the directory, and also for building any
|
|
X-specific utilities. (Such as the gxid daemon).
|
|
|
|
|
|
Port Status for Files
|
|
=====================
|
|
|
|
gdk
|
|
|
|
Much of the contents have been moved to x11/gtkmain.c.
|
|
I've added a little argument-parsing abstraction.
|
|
(Currently called gdk_arg_context_*) that allows
|
|
arguments from multiple places to be combined - that
|
|
probably needs to be either fixed up and moved into
|
|
GLib or replaced with some existing solution like
|
|
popt.
|
|
|
|
gdkcc
|
|
|
|
This will be removed for GTK+-1.4. Right now, it has been moved
|
|
completely into the x11/ directory to avoid having to port it.
|
|
|
|
gdkcolor
|
|
|
|
There are a few common utility functions, and the rest
|
|
is in the port-specific files.
|
|
|
|
gdkcursor
|
|
|
|
No shared code - completely port-specific.
|
|
|
|
gdkdnd
|
|
|
|
No shared code - completely arch-specific. It's possible that some
|
|
common code for handling GdkDragContext could exist, but the
|
|
GdkDragContextPrivate will be different on each port.
|
|
|
|
gdkdrawable
|
|
|
|
Pretty much done. GdkDrawable is completely virtualized.
|
|
|
|
gdkevents
|
|
|
|
There are a few common utility functions, and the rest
|
|
is in the port-specific files.
|
|
|
|
gdkfont
|
|
|
|
Pretty much done for now - gdkfont.c contains a number of functions
|
|
reimplemented as utility functions, and the rest is
|
|
ports-specific. It will be obsoleted by pango before 1.4.
|
|
|
|
gdkgc
|
|
|
|
GdkGC is virtualized to go along with GdkDrawable. There are
|
|
a couple of functions I punted on for now and moved into the
|
|
port-specific files - the clipmask functions (because gdkregion
|
|
is not finalized) and also gdk_gc_copy, which I'm not sure
|
|
I like enough to put into the vtable.
|
|
|
|
gdkim
|
|
|
|
All in the port-specific directories. The abstraction here probably
|
|
will be changed at some point to something more convenient and
|
|
more Unicode-based.
|
|
|
|
gdkimage
|
|
|
|
GdkImage is virtualized - all of the code except for ref/unref
|
|
is in the port-specific files.
|
|
|
|
gdkinput
|
|
|
|
Right now all the code is port-specific. It should be possible
|
|
to share the code in gdkinputnone.c, but probably not worth it;
|
|
I'd like to get rid of the gdk_input_vtable in X11 code -
|
|
it doesn't make sense since you can't switch the type of input
|
|
on the fly.
|
|
|
|
gdkpixmap
|
|
|
|
All moved into the port-specific file for now. The xpm loader
|
|
should be changed to render with GdkRGB, and thus be
|
|
windowing-system independent, but that requires
|
|
first making GdkRGB able to render onto any arbitrary visual.
|
|
|
|
gdkproperty
|
|
|
|
All port-specific. Possibly should be X-specific with a higher-level
|
|
clipboard API on top of it.
|
|
|
|
gdkregion
|
|
|
|
Right now punted to being port-specific, but that probably needs
|
|
to change with the virtualized drawables and GC's.
|
|
|
|
gdkrgb
|
|
|
|
With a few changes to debugging code, it was already port-independent.
|
|
|
|
gdkselection
|
|
|
|
Completely port specific. (In fact, really doesn't make sense
|
|
on anything other than X; a higher-level clipboard facility
|
|
should be provided somewhere, though.)
|
|
|
|
gdkvisual
|
|
|
|
Completely port-specific. (The concepts are rather X-specific)
|
|
|
|
gdkwindow
|
|
|
|
The window-private data is split between windowing-system independent
|
|
parts and windowing system dependent parts. There are a few
|
|
functions in gdk/gdkwindow.c and the rest is moved off
|
|
into x11/gdkwindow-x11.c
|
|
|
|
Virtualization
|
|
==============
|
|
|
|
The concept of virtualization is that calls to draw
|
|
on a drawable are dispatched through a function table.
|
|
This potentially allows for:
|
|
|
|
Postscript drawables
|
|
metafiles
|
|
|
|
It also provides a nice clean framework for multi-windowing
|
|
support - instead of reimplementing a whole bunch of function
|
|
calls, one provides an implementaiton for the vtables.
|
|
|
|
X works in this way internally - per-screen functions are
|
|
virtualized inside a screen structure, and drawing functions
|
|
are virtualized inside the GC structure.
|
|
|
|
For the virtualization of drawing, clearly GdkDrawable needs
|
|
to be virtualized. Beyond that, one has to decide on
|
|
a case-by-case basis whether a particular structure is
|
|
drawing-mode independent (like GdkRectangle) or not.
|
|
|
|
The most important GDK structures that are involved drawing are:
|
|
|
|
GdkColor
|
|
GdkGC
|
|
GdkFont
|
|
GdkRegion
|
|
|
|
The whole font aspect of Gdk is going to get heavily
|
|
reworked with the introduction of "Pango".
|
|
GdkRegion almost certainly needs to be virtualized,
|
|
if you, way, want to do postscript drawables.
|
|
|
|
While doing so, the API of GdkRegion should be
|
|
changed so that the region operations take 3 parameters
|
|
instead of returning a newly created region.
|
|
|
|
|
|
Drawable operations:
|
|
destroy
|
|
create_gc
|
|
get_values
|
|
set_values
|
|
set_dashes
|
|
copy
|
|
|
|
GC Operations:
|
|
draw_point
|
|
draw_line
|
|
draw_rectangle
|
|
draw_arc
|
|
draw_polygon
|
|
draw_string
|
|
draw_text
|
|
draw_text_wc
|
|
draw_pixmap
|
|
draw_bitmap
|
|
draw_image
|
|
draw_points
|
|
draw_segments
|
|
draw_lines
|
|
|
|
|
|
Adding multi-screen, display support.
|
|
=====================================
|
|
|
|
The following functions need to have per-display variants:
|
|
|
|
void gdk_pointer_ungrab (guint32 time);
|
|
void gdk_keyboard_ungrab (guint32 time);
|
|
gint gdk_pointer_is_grabbed (void);
|
|
|
|
gint gdk_screen_width (void);
|
|
gint gdk_screen_height (void);
|
|
|
|
gint gdk_screen_width_mm (void);
|
|
gint gdk_screen_height_mm (void);
|
|
|
|
void gdk_beep (void);
|
|
|
|
gint gdk_visual_get_best_depth (void);
|
|
GdkVisualType gdk_visual_get_best_type (void);
|
|
GdkVisual* gdk_visual_get_system (void);
|
|
GdkVisual* gdk_visual_get_best (void);
|
|
GdkVisual* gdk_visual_get_best_with_depth (gint depth);
|
|
GdkVisual* gdk_visual_get_best_with_type (GdkVisualType visual_type);
|
|
GdkVisual* gdk_visual_get_best_with_both (gint depth,
|
|
GdkVisualType visual_type);
|
|
|
|
void gdk_query_depths (gint **depths,
|
|
gint *count);
|
|
void gdk_query_visual_types (GdkVisualType **visual_types,
|
|
gint *count);
|
|
|
|
GList* gdk_list_visuals (void);
|
|
|
|
void gdk_add_client_message_filter (GdkAtom message_type,
|
|
GdkFilterFunc func,
|
|
gpointer data);
|
|
|
|
guint32 gdk_drag_get_protocol (guint32 xid,
|
|
GdkDragProtocol *protocol);
|
|
|
|
GdkCursor* gdk_cursor_new (GdkCursorType cursor_type);
|
|
GdkCursor* gdk_cursor_new_from_pixmap (GdkPixmap *source,
|
|
GdkPixmap *mask,
|
|
GdkColor *fg,
|
|
GdkColor *bg,
|
|
gint x,
|
|
gint y);
|
|
GdkColormap* gdk_colormap_get_system (void);
|
|
gint gdk_colormap_get_system_size (void);
|
|
|
|
GdkFont* gdk_font_load (const gchar *font_name);
|
|
GdkFont* gdk_fontset_load (gchar *fontset_name);
|
|
|
|
gint gdk_selection_owner_set (GdkWindow *owner,
|
|
GdkAtom selection,
|
|
guint32 time,
|
|
gint send_event);
|
|
GdkWindow* gdk_selection_owner_get (GdkAtom selection);
|
|
|
|
void gdk_selection_send_notify (guint32 requestor,
|
|
GdkAtom selection,
|
|
GdkAtom target,
|
|
GdkAtom property,
|
|
guint32 time);
|
|
gint gdk_text_property_to_text_list (GdkAtom encoding, gint format,
|
|
guchar *text, gint length,
|
|
gchar ***list);
|
|
void gdk_free_text_list (gchar **list);
|
|
gint gdk_string_to_compound_text (gchar *str,
|
|
GdkAtom *encoding, gint *format,
|
|
guchar **ctext, gint *length);
|
|
void gdk_free_compound_text (guchar *ctext);
|
|
GdkAtom gdk_atom_intern (const gchar *atom_name,
|
|
gint only_if_exists);
|
|
gchar* gdk_atom_name (GdkAtom atom);
|
|
GList *gdk_input_list_devices (void);
|
|
void gdk_input_set_source (guint32 deviceid,
|
|
GdkInputSource source);
|
|
gint gdk_input_set_mode (guint32 deviceid,
|
|
GdkInputMode mode);
|
|
void gdk_input_set_axes (guint32 deviceid,
|
|
GdkAxisUse *axes);
|
|
void gdk_input_set_key (guint32 deviceid,
|
|
guint index,
|
|
guint keyval,
|
|
GdkModifierType modifiers);
|
|
gint gdk_im_ready (void);
|
|
void gdk_im_end (void);
|
|
GdkIC* gdk_ic_new (GdkICAttr *attr,
|
|
GdkICAttributesType mask);
|
|
GdkRegion* gdk_region_new (void);
|
|
void gdk_event_send_clientmessage_toall (GdkEvent *event);
|
|
gboolean gdk_event_send_client_message (GdkEvent *event,
|
|
guint32 xid);
|
|
|
|
And maybe:
|
|
|
|
void gdk_error_trap_push (void);
|
|
gint gdk_error_trap_pop (void);
|