diff --git a/ChangeLog b/ChangeLog index ba8a0ec73..331ed5293 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Dec 14 01:28:23 2003 Matthias Clasen + + * gdk/x11/gdkprivate-x11.h: + * gdk/x11/gdkx.h: + * gdk/x11/gdkevents-x11.c (gdk_x11_register_standard_event_type): + Rename from _gdk_x11_register_event_type(), added API docs. + * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): + * gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): Adjust + all callers. (#121471, Bill Haneman) + Sat Dec 13 23:37:50 2003 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_pixbuf): Document that the clip mask diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ba8a0ec73..331ed5293 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Sun Dec 14 01:28:23 2003 Matthias Clasen + + * gdk/x11/gdkprivate-x11.h: + * gdk/x11/gdkx.h: + * gdk/x11/gdkevents-x11.c (gdk_x11_register_standard_event_type): + Rename from _gdk_x11_register_event_type(), added API docs. + * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): + * gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): Adjust + all callers. (#121471, Bill Haneman) + Sat Dec 13 23:37:50 2003 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_pixbuf): Document that the clip mask diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ba8a0ec73..331ed5293 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Sun Dec 14 01:28:23 2003 Matthias Clasen + + * gdk/x11/gdkprivate-x11.h: + * gdk/x11/gdkx.h: + * gdk/x11/gdkevents-x11.c (gdk_x11_register_standard_event_type): + Rename from _gdk_x11_register_event_type(), added API docs. + * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): + * gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): Adjust + all callers. (#121471, Bill Haneman) + Sat Dec 13 23:37:50 2003 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_pixbuf): Document that the clip mask diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ba8a0ec73..331ed5293 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Sun Dec 14 01:28:23 2003 Matthias Clasen + + * gdk/x11/gdkprivate-x11.h: + * gdk/x11/gdkx.h: + * gdk/x11/gdkevents-x11.c (gdk_x11_register_standard_event_type): + Rename from _gdk_x11_register_event_type(), added API docs. + * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): + * gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): Adjust + all callers. (#121471, Bill Haneman) + Sat Dec 13 23:37:50 2003 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_pixbuf): Document that the clip mask diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ba8a0ec73..331ed5293 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Sun Dec 14 01:28:23 2003 Matthias Clasen + + * gdk/x11/gdkprivate-x11.h: + * gdk/x11/gdkx.h: + * gdk/x11/gdkevents-x11.c (gdk_x11_register_standard_event_type): + Rename from _gdk_x11_register_event_type(), added API docs. + * gdk/x11/gdkinput-x11.c (_gdk_input_common_init): + * gdk/x11/gdkimage-x11.c (_gdk_windowing_image_init): Adjust + all callers. (#121471, Bill Haneman) + Sat Dec 13 23:37:50 2003 Matthias Clasen * gdk/gdkdraw.c (gdk_draw_pixbuf): Document that the clip mask diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 01fcf69d9..e4f09de20 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Sun Dec 14 01:25:49 2003 Matthias Clasen + + * gdk/gdk-sections.txt: Add gdk_x11_register_standard_event_type. + Sat Dec 13 22:37:46 2003 Matthias Clasen * gtk/Makefile.am (HTML_IMAGES): Add diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index dd4e96343..71f15987d 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -1207,6 +1207,7 @@ gdk_x11_cursor_get_xdisplay gdk_x11_display_get_xdisplay gdk_x11_display_grab gdk_x11_display_ungrab +gdk_x11_register_standard_event_type gdk_x11_drawable_get_xdisplay gdk_x11_drawable_get_xid gdk_x11_font_get_name diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index bc2a38de7..f19a7ff56 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -651,10 +651,31 @@ translate_key_event (GdkDisplay *display, return; } +/** + * gdk_x11_register_standard_event_type: + * @display: a #GdkDisplay + * @event_base: first event type code to register + * @n_events: number of event type codes to register + * + * Registers interest in receiving extension events with type codes + * between @event_base and event_base + n_events - 1. + * The registered events must have the window field in the same place + * as core X events (this is not the case for e.g. XKB extension events). + * + * If an event type is registered, events of this type will go through + * global and window-specific filters (see gdk_window_add_filter()). + * Unregistered events will only go through global filters. + * GDK may register the events of some X extensions on its own. + * + * This function should only be needed in unusual circumstances, e.g. + * when filtering XInput extension events on the root window. + * + * Since: 2.4 + **/ void -_gdk_x11_register_event_type (GdkDisplay *display, - gint event_base, - gint n_events) +gdk_x11_register_standard_event_type (GdkDisplay *display, + gint event_base, + gint n_events) { GdkEventTypeX11 *event_type; GdkDisplayX11 *display_x11; diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index dafb34d9f..29fc13bc7 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -213,8 +213,8 @@ _gdk_windowing_image_init (GdkDisplay *display) display_x11->have_shm_pixmaps = pixmaps; event_base = XShmGetEventBase (xdisplay); - _gdk_x11_register_event_type (display, - event_base, ShmNumberEvents); + gdk_x11_register_standard_event_type (display, + event_base, ShmNumberEvents); } else #endif /* USE_SHM */ diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c index adcf0da5c..674e905fc 100644 --- a/gdk/x11/gdkinput-x11.c +++ b/gdk/x11/gdkinput-x11.c @@ -394,8 +394,8 @@ _gdk_input_common_init (GdkDisplay *display, if (XQueryExtension (display_x11->xdisplay, "XInputExtension", &ignore, &event_base, &ignore)) { - _gdk_x11_register_event_type (display, - event_base, 9 /* Number of events */); + gdk_x11_register_standard_event_type (display, + event_base, 9 /* Number of events */); devices = XListInputDevices(display_x11->xdisplay, &num_devices); diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index 5ffe3982e..98efc5321 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -164,9 +164,6 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display, void _gdk_x11_precache_atoms (GdkDisplay *display, const gchar * const *atom_names, gint n_atoms); -void _gdk_x11_register_event_type (GdkDisplay *display, - gint event_base, - gint n_events); void _gdk_x11_events_init_screen (GdkScreen *screen); void _gdk_x11_events_uninit_screen (GdkScreen *screen); diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 7faf67e38..5ff0244c9 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -171,6 +171,9 @@ G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom); void gdk_x11_display_grab (GdkDisplay *display); void gdk_x11_display_ungrab (GdkDisplay *display); +void gdk_x11_register_standard_event_type (GdkDisplay *display, + gint event_base, + gint n_events); #if !defined(GDK_DISABLE_DEPRECATED) || defined(GDK_COMPILATION)