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

Rename _gdk_event_mask_table to _gdk_x11_event_mask_table

Browse Source
This commit is contained in:
Matthias Clasen 2010-12-15 17:32:29 -05:00
parent 985eb14469
commit 28b7c6f05d
7 changed files with 91 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk/gdk.c
View File

@ -96,17 +96,12 @@ static const GDebugKey gdk_debug_keys[] = {
{"eventloop", GDK_DEBUG_EVENTLOOP} {"eventloop", GDK_DEBUG_EVENTLOOP}
}; };
static const int gdk_ndebug_keys = G_N_ELEMENTS (gdk_debug_keys);
#endif /* G_ENABLE_DEBUG */
#ifdef G_ENABLE_DEBUG
static gboolean static gboolean
gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data, GError **error) gdk_arg_debug_cb (const char *key, const char *value, gpointer user_data, GError **error)
{ {
guint debug_value = g_parse_debug_string (value, guint debug_value = g_parse_debug_string (value,
(GDebugKey *) gdk_debug_keys, (GDebugKey *) gdk_debug_keys,
gdk_ndebug_keys); G_N_ELEMENTS (gdk_debug_keys));
if (debug_value == 0 && value != NULL && strcmp (value, "") != 0) if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
{ {
@ -126,7 +121,7 @@ gdk_arg_no_debug_cb (const char *key, const char *value, gpointer user_data, GEr
{ {
guint debug_value = g_parse_debug_string (value, guint debug_value = g_parse_debug_string (value,
(GDebugKey *) gdk_debug_keys, (GDebugKey *) gdk_debug_keys,
gdk_ndebug_keys); G_N_ELEMENTS (gdk_debug_keys));
if (debug_value == 0 && value != NULL && strcmp (value, "") != 0) if (debug_value == 0 && value != NULL && strcmp (value, "") != 0)
{ {
@ -211,7 +206,7 @@ gdk_pre_parse_libgtk_only (void)
if (debug_string != NULL) if (debug_string != NULL)
_gdk_debug_flags = g_parse_debug_string (debug_string, _gdk_debug_flags = g_parse_debug_string (debug_string,
(GDebugKey *) gdk_debug_keys, (GDebugKey *) gdk_debug_keys,
gdk_ndebug_keys); G_N_ELEMENTS (gdk_debug_keys));
} }
#endif /* G_ENABLE_DEBUG */ #endif /* G_ENABLE_DEBUG */

9
gdk/x11/gdkdevice-core.c
View File

@ -19,6 +19,7 @@
#include "config.h" #include "config.h"
#include "glib.h"
#include "gdkdevice-core.h" #include "gdkdevice-core.h"
#include "gdkinternals.h" #include "gdkinternals.h"
@ -368,10 +369,10 @@ gdk_device_core_grab (GdkDevice *device,
xevent_mask = 0; xevent_mask = 0;
for (i = 0; i < _gdk_nenvent_masks; i++) for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
{ {
if (event_mask & (1 << (i + 1))) if (event_mask & (1 << (i + 1)))
xevent_mask |= _gdk_event_mask_table[i]; xevent_mask |= _gdk_x11_event_mask_table[i];
} }
/* We don't want to set a native motion hint mask, as we're emulating motion /* We don't want to set a native motion hint mask, as we're emulating motion
@ -589,10 +590,10 @@ gdk_device_core_select_window_events (GdkDevice *device,
/* Combine masks */ /* Combine masks */
event_mask |= window_mask; event_mask |= window_mask;
for (i = 0; i < _gdk_nenvent_masks; i++) for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
{ {
if (event_mask & (1 << (i + 1))) if (event_mask & (1 << (i + 1)))
xmask |= _gdk_event_mask_table[i]; xmask |= _gdk_x11_event_mask_table[i];
} }
if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window)) if (GDK_WINDOW_XID (window) != GDK_WINDOW_XROOTWIN (window))

4
gdk/x11/gdkeventsource.c
View File

@ -406,10 +406,10 @@ gdk_x11_event_source_select_events (GdkEventSource *source,
list = list->next; list = list->next;
} }
for (i = 0; i < _gdk_nenvent_masks; i++) for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
{ {
if (event_mask & (1 << (i + 1))) if (event_mask & (1 << (i + 1)))
xmask |= _gdk_event_mask_table[i]; xmask |= _gdk_x11_event_mask_table[i];
} }
XSelectInput (GDK_DISPLAY_XDISPLAY (source->display), window, xmask); XSelectInput (GDK_DISPLAY_XDISPLAY (source->display), window, xmask);

2
gdk/x11/gdkgeometry-x11.c
View File

@ -246,7 +246,7 @@ _get_scratch_gc (GdkWindow *window, cairo_region_t *clip_region)
&values); &values);
} }
_gdk_region_get_xrectangles (clip_region, _gdk_x11_region_get_xrectangles (clip_region,
0, 0, 0, 0,
&rectangles, &rectangles,
&n_rects); &n_rects);

2
gdk/x11/gdkmain-x11.c
View File

@ -500,7 +500,7 @@ _gdk_send_xevent (GdkDisplay *display,
} }
void void
_gdk_region_get_xrectangles (const cairo_region_t *region, _gdk_x11_region_get_xrectangles (const cairo_region_t *region,
gint x_offset, gint x_offset,
gint y_offset, gint y_offset,
XRectangle **rects, XRectangle **rects,

6
gdk/x11/gdkprivate-x11.h
View File

@ -113,7 +113,7 @@ cairo_region_t* _gdk_x11_xwindow_get_shape (Display *xdisplay,
Window window, Window window,
gint shape_type); gint shape_type);
void _gdk_region_get_xrectangles (const cairo_region_t *region, void _gdk_x11_region_get_xrectangles (const cairo_region_t *region,
gint x_offset, gint x_offset,
gint y_offset, gint y_offset,
XRectangle **rects, XRectangle **rects,
@ -209,8 +209,8 @@ cairo_surface_t * _gdk_x11_window_create_bitmap_surface (GdkWindow *window,
int height); int height);
extern gboolean _gdk_use_xshm; extern gboolean _gdk_use_xshm;
extern const int _gdk_nenvent_masks; extern const gint _gdk_x11_event_mask_table[];
extern const int _gdk_event_mask_table[]; extern const gint _gdk_x11_event_mask_table_size;
extern GdkAtom _gdk_selection_property; extern GdkAtom _gdk_selection_property;
extern gboolean _gdk_synchronize; extern gboolean _gdk_synchronize;

11
gdk/x11/gdkwindow-x11.c
View File

@ -72,7 +72,7 @@
#include <X11/extensions/Xdamage.h> #include <X11/extensions/Xdamage.h>
#endif #endif
const int _gdk_event_mask_table[21] = const int _gdk_x11_event_mask_table[21] =
{ {
ExposureMask, ExposureMask,
PointerMotionMask, PointerMotionMask,
@ -96,7 +96,8 @@ const int _gdk_event_mask_table[21] =
SubstructureNotifyMask, SubstructureNotifyMask,
ButtonPressMask /* SCROLL; on X mouse wheel events is treated as mouse button 4/5 */ ButtonPressMask /* SCROLL; on X mouse wheel events is treated as mouse button 4/5 */
}; };
const int _gdk_nenvent_masks = sizeof (_gdk_event_mask_table) / sizeof (int);
const gint _gdk_x11_event_mask_table_size = G_N_ELEMENTS (_gdk_x11_event_mask_table);
/* Forward declarations */ /* Forward declarations */
static void gdk_window_set_static_win_gravity (GdkWindow *window, static void gdk_window_set_static_win_gravity (GdkWindow *window,
@ -838,9 +839,9 @@ x_event_mask_to_gdk_event_mask (long mask)
GdkEventMask event_mask = 0; GdkEventMask event_mask = 0;
int i; int i;
for (i = 0; i < _gdk_nenvent_masks; i++) for (i = 0; i < _gdk_x11_event_mask_table_size; i++)
{ {
if (mask & _gdk_event_mask_table[i]) if (mask & _gdk_x11_event_mask_table[i])
event_mask |= 1 << (i + 1); event_mask |= 1 << (i + 1);
} }
@ -2883,7 +2884,7 @@ do_shape_combine_region (GdkWindow *window,
gint n_rects = 0; gint n_rects = 0;
XRectangle *xrects = NULL; XRectangle *xrects = NULL;
_gdk_region_get_xrectangles (shape_region, _gdk_x11_region_get_xrectangles (shape_region,
0, 0, 0, 0,
&xrects, &n_rects); &xrects, &n_rects);