callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Replace direct calls of _gdk_event_func with _gdk_event_emit()

Browse Source 
For now that function just calls the event func.
This commit is contained in:
Benjamin Otte
2010-12-02 10:59:37 +01:00
parent b3e8504111
commit f9a9567731
7 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gdk/gdkevents.c
View File

@ -59,9 +59,16 @@ struct _GdkIOClosure
/* Private variable declarations /* Private variable declarations
*/ */
GdkEventFunc _gdk_event_func = NULL; /* Callback for events */ static GdkEventFunc _gdk_event_func = NULL; /* Callback for events */
gpointer _gdk_event_data = NULL; static gpointer _gdk_event_data = NULL;
GDestroyNotify _gdk_event_notify = NULL; static GDestroyNotify _gdk_event_notify = NULL;
void
_gdk_event_emit (GdkEvent *event)
{
if (_gdk_event_func)
(*_gdk_event_func) (event, _gdk_event_data);
}
/********************************************* /*********************************************
* Functions for maintaining the event queue * * Functions for maintaining the event queue *

5
gdk/gdkinternals.h
View File

@ -268,10 +268,6 @@ struct _GdkWindow
#define GDK_WINDOW_TYPE(d) (((GDK_WINDOW (d)))->window_type) #define GDK_WINDOW_TYPE(d) (((GDK_WINDOW (d)))->window_type)
#define GDK_WINDOW_DESTROYED(d) (GDK_WINDOW (d)->destroyed) #define GDK_WINDOW_DESTROYED(d) (GDK_WINDOW (d)->destroyed)
extern GdkEventFunc _gdk_event_func; /* Callback for events */
extern gpointer _gdk_event_data;
extern GDestroyNotify _gdk_event_notify;
extern GSList *_gdk_displays; extern GSList *_gdk_displays;
extern gchar *_gdk_display_name; extern gchar *_gdk_display_name;
extern gint _gdk_screen_number; extern gint _gdk_screen_number;
@ -281,6 +277,7 @@ extern gboolean _gdk_enable_multidevice;
void _gdk_events_queue (GdkDisplay *display); void _gdk_events_queue (GdkDisplay *display);
GdkEvent* _gdk_event_unqueue (GdkDisplay *display); GdkEvent* _gdk_event_unqueue (GdkDisplay *display);
void _gdk_event_emit (GdkEvent *event);
GList* _gdk_event_queue_find_first (GdkDisplay *display); GList* _gdk_event_queue_find_first (GdkDisplay *display);
void _gdk_event_queue_remove_link (GdkDisplay *display, void _gdk_event_queue_remove_link (GdkDisplay *display,
GList *node); GList *node);

4
gdk/gdkwindow.c
View File

@ -3944,7 +3944,7 @@ _gdk_window_process_updates_recurse (GdkWindow *window,
event.expose.region = expose_region; event.expose.region = expose_region;
cairo_region_get_extents (expose_region, &event.expose.area); cairo_region_get_extents (expose_region, &event.expose.area);
(*_gdk_event_func) (&event, _gdk_event_data); _gdk_event_emit (&event);
g_object_unref (window); g_object_unref (window);
} }
@ -3994,7 +3994,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
cairo_region_t *update_area = window->update_area; cairo_region_t *update_area = window->update_area;
window->update_area = NULL; window->update_area = NULL;
if (_gdk_event_func && gdk_window_is_viewable (window)) if (gdk_window_is_viewable (window))
{ {
cairo_region_t *expose_region; cairo_region_t *expose_region;
gboolean end_implicit; gboolean end_implicit;

10
gdk/quartz/GdkQuartzWindow.c
View File

@ -478,7 +478,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
gdk_event_set_device (event, gdk_drag_context_get_device (current_context)); gdk_event_set_device (event, gdk_drag_context_get_device (current_context));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);
@ -508,7 +508,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
gdk_event_set_device (event, gdk_drag_context_get_device (current_context)); gdk_event_set_device (event, gdk_drag_context_get_device (current_context));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);
@ -536,7 +536,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
gdk_event_set_device (event, gdk_drag_context_get_device (current_context)); gdk_event_set_device (event, gdk_drag_context_get_device (current_context));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);
@ -563,7 +563,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
gdk_event_set_device (event, gdk_drag_context_get_device (current_context)); gdk_event_set_device (event, gdk_drag_context_get_device (current_context));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);
@ -592,7 +592,7 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
gdk_event_set_device (event, gdk_event_set_device (event,
gdk_drag_context_get_device (_gdk_quartz_drag_source_context)); gdk_drag_context_get_device (_gdk_quartz_drag_source_context));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);

3
gdk/quartz/gdkeventloop-quartz.c
View File

@ -670,8 +670,7 @@ gdk_event_dispatch (GSource *source,
if (event) if (event)
{ {
if (_gdk_event_func) _gdk_event_emit (event);
(*_gdk_event_func) (event, _gdk_event_data);
gdk_event_free (event); gdk_event_free (event);
} }

10
gdk/win32/gdkevents-win32.c
View File

@ -3018,8 +3018,6 @@ gdk_event_translate (MSG *msg,
/* We need to render to clipboard immediately, don't call /* We need to render to clipboard immediately, don't call
* append_event() * append_event()
*/ */
if (_gdk_event_func)
{
event = gdk_event_new (GDK_SELECTION_REQUEST); event = gdk_event_new (GDK_SELECTION_REQUEST);
event->selection.window = window; event->selection.window = window;
event->selection.send_event = FALSE; event->selection.send_event = FALSE;
@ -3030,9 +3028,9 @@ gdk_event_translate (MSG *msg,
event->selection.time = msg->time; event->selection.time = msg->time;
fixup_event (event); fixup_event (event);
GDK_NOTE (EVENTS, g_print (" (calling gdk_event_func)")); GDK_NOTE (EVENTS, g_print (" (calling _gdk_event_emit)"));
GDK_NOTE (EVENTS, _gdk_win32_print_event (event)); GDK_NOTE (EVENTS, _gdk_win32_print_event (event));
(*_gdk_event_func) (event, _gdk_event_data); _gdk_event_emit (event);
gdk_event_free (event); gdk_event_free (event);
/* Now the clipboard owner should have rendered */ /* Now the clipboard owner should have rendered */
@ -3065,7 +3063,6 @@ gdk_event_translate (MSG *msg,
API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data)); API_CALL (SetClipboardData, (msg->wParam, _delayed_rendering_data));
_delayed_rendering_data = NULL; _delayed_rendering_data = NULL;
} }
}
break; break;
case WM_ACTIVATE: case WM_ACTIVATE:
@ -3222,8 +3219,7 @@ gdk_event_dispatch (GSource *source,
if (event) if (event)
{ {
if (_gdk_event_func) _gdk_event_emit (event);
(*_gdk_event_func) (event, _gdk_event_data);
gdk_event_free (event); gdk_event_free (event);

3
gdk/x11/gdkeventsource.c
View File

@ -318,8 +318,7 @@ gdk_event_source_dispatch (GSource *source,
if (event) if (event)
{ {
if (_gdk_event_func) _gdk_event_emit (event);
(*_gdk_event_func) (event, _gdk_event_data);
gdk_event_free (event); gdk_event_free (event);
} }