diff options
| author | Benjamin Otte <otte@redhat.com> | 2020-07-24 15:54:49 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2020-07-25 00:47:36 +0200 |
| commit | d7266b25ba5f2f21a5bd19d0fb88aca530e4d265 (patch) | |
| tree | 8dc515efd6e0c0b0da1d7e02049f284edd6050ff /gdk | |
| parent | 46423e614d4fcf142d9578d4788dde664ea280f9 (diff) | |
| download | gtk+-d7266b25ba5f2f21a5bd19d0fb88aca530e4d265.tar.gz | |
Replace "gint" with "int"
Diffstat (limited to 'gdk')
124 files changed, 1175 insertions, 1175 deletions
diff --git a/gdk/broadway/broadway-output.c b/gdk/broadway/broadway-output.c index 15d76cda75..896b25f590 100644 --- a/gdk/broadway/broadway-output.c +++ b/gdk/broadway/broadway-output.c @@ -310,7 +310,7 @@ broadway_output_set_transient_for (BroadwayOutput *output, append_uint16 (output, parent_id); } -static gint append_node_depth = -1; +static int append_node_depth = -1; static void append_type (BroadwayOutput *output, guint32 type, BroadwayNode *node) diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c index c444e4f14e..df6d25c066 100644 --- a/gdk/broadway/broadway-server.c +++ b/gdk/broadway/broadway-server.c @@ -63,7 +63,7 @@ struct _BroadwayServer { GList *surfaces; BroadwaySurface *root; gint32 focused_surface_id; /* -1 => none */ - gint show_keyboard; + int show_keyboard; guint32 next_texture_id; GHashTable *textures; @@ -970,7 +970,7 @@ broadway_server_get_screen_size (BroadwayServer *server, static void broadway_server_fake_roundtrip_reply (BroadwayServer *server, - gint id, + int id, guint32 tag) { BroadwayInputMsg msg; @@ -1001,7 +1001,7 @@ broadway_server_flush (BroadwayServer *server) void broadway_server_roundtrip (BroadwayServer *server, - gint id, + int id, guint32 tag) { if (server->output) @@ -1565,7 +1565,7 @@ broadway_server_query_mouse (BroadwayServer *server, void broadway_server_destroy_surface (BroadwayServer *server, - gint id) + int id) { BroadwaySurface *surface; @@ -1594,7 +1594,7 @@ broadway_server_destroy_surface (BroadwayServer *server, gboolean broadway_server_surface_show (BroadwayServer *server, - gint id) + int id) { BroadwaySurface *surface; gboolean sent = FALSE; @@ -1616,7 +1616,7 @@ broadway_server_surface_show (BroadwayServer *server, gboolean broadway_server_surface_hide (BroadwayServer *server, - gint id) + int id) { BroadwaySurface *surface; gboolean sent = FALSE; @@ -1646,7 +1646,7 @@ broadway_server_surface_hide (BroadwayServer *server, void broadway_server_surface_raise (BroadwayServer *server, - gint id) + int id) { BroadwaySurface *surface; @@ -1676,7 +1676,7 @@ broadway_server_set_show_keyboard (BroadwayServer *server, void broadway_server_surface_lower (BroadwayServer *server, - gint id) + int id) { BroadwaySurface *surface; @@ -1693,7 +1693,7 @@ broadway_server_surface_lower (BroadwayServer *server, void broadway_server_surface_set_transient_for (BroadwayServer *server, - gint id, gint parent) + int id, int parent) { BroadwaySurface *surface; @@ -1865,7 +1865,7 @@ decode_nodes (BroadwayServer *server, /* passes ownership of nodes */ void broadway_server_surface_update_nodes (BroadwayServer *server, - gint id, + int id, guint32 data[], int len, GHashTable *client_texture_map) @@ -1946,7 +1946,7 @@ broadway_server_release_texture (BroadwayServer *server, gboolean broadway_server_surface_move_resize (BroadwayServer *server, - gint id, + int id, gboolean with_move, int x, int y, @@ -1989,7 +1989,7 @@ broadway_server_surface_move_resize (BroadwayServer *server, void broadway_server_focus_surface (BroadwayServer *server, - gint new_focused_surface) + int new_focused_surface) { BroadwayInputMsg focus_msg; @@ -2010,8 +2010,8 @@ broadway_server_focus_surface (BroadwayServer *server, guint32 broadway_server_grab_pointer (BroadwayServer *server, - gint client_id, - gint id, + int client_id, + int id, gboolean owner_events, guint32 event_mask, guint32 time_) diff --git a/gdk/broadway/broadway-server.h b/gdk/broadway/broadway-server.h index 7c5d97e4aa..fd027a664e 100644 --- a/gdk/broadway/broadway-server.h +++ b/gdk/broadway/broadway-server.h @@ -60,7 +60,7 @@ gboolean broadway_server_has_client (BroadwayServer * void broadway_server_flush (BroadwayServer *server); void broadway_server_sync (BroadwayServer *server); void broadway_server_roundtrip (BroadwayServer *server, - gint id, + int id, guint32 tag); void broadway_server_get_screen_size (BroadwayServer *server, guint32 *width, @@ -76,8 +76,8 @@ void broadway_server_query_mouse (BroadwayServer * gint32 *root_y, guint32 *mask); guint32 broadway_server_grab_pointer (BroadwayServer *server, - gint client_id, - gint id, + int client_id, + int id, gboolean owner_events, guint32 event_mask, guint32 time_); @@ -93,23 +93,23 @@ guint32 broadway_server_new_surface (BroadwayServer * int width, int height); void broadway_server_destroy_surface (BroadwayServer *server, - gint id); + int id); gboolean broadway_server_surface_show (BroadwayServer *server, - gint id); + int id); gboolean broadway_server_surface_hide (BroadwayServer *server, - gint id); + int id); void broadway_server_surface_raise (BroadwayServer *server, - gint id); + int id); void broadway_server_surface_lower (BroadwayServer *server, - gint id); + int id); void broadway_server_surface_set_transient_for (BroadwayServer *server, - gint id, - gint parent); + int id, + int parent); gboolean broadway_server_surface_translate (BroadwayServer *server, - gint id, + int id, cairo_region_t *area, - gint dx, - gint dy); + int dx, + int dy); guint32 broadway_server_upload_texture (BroadwayServer *server, GBytes *texture); void broadway_server_release_texture (BroadwayServer *server, @@ -117,19 +117,19 @@ void broadway_server_release_texture (BroadwayServer * cairo_surface_t * broadway_server_create_surface (int width, int height); void broadway_server_surface_update_nodes (BroadwayServer *server, - gint id, + int id, guint32 data[], int len, GHashTable *client_texture_map); gboolean broadway_server_surface_move_resize (BroadwayServer *server, - gint id, + int id, gboolean with_move, int x, int y, int width, int height); void broadway_server_focus_surface (BroadwayServer *server, - gint new_focused_surface); + int new_focused_surface); #endif /* __BROADWAY_SERVER__ */ diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c index 6e235e1b52..2807e6d46a 100644 --- a/gdk/broadway/gdkbroadway-server.c +++ b/gdk/broadway/gdkbroadway-server.c @@ -501,7 +501,7 @@ _gdk_broadway_server_new_surface (GdkBroadwayServer *server, void _gdk_broadway_server_destroy_surface (GdkBroadwayServer *server, - gint id) + int id) { BroadwayRequestDestroySurface msg; @@ -512,7 +512,7 @@ _gdk_broadway_server_destroy_surface (GdkBroadwayServer *server, gboolean _gdk_broadway_server_surface_show (GdkBroadwayServer *server, - gint id) + int id) { BroadwayRequestShowSurface msg; @@ -525,7 +525,7 @@ _gdk_broadway_server_surface_show (GdkBroadwayServer *server, gboolean _gdk_broadway_server_surface_hide (GdkBroadwayServer *server, - gint id) + int id) { BroadwayRequestHideSurface msg; @@ -538,7 +538,7 @@ _gdk_broadway_server_surface_hide (GdkBroadwayServer *server, void _gdk_broadway_server_surface_focus (GdkBroadwayServer *server, - gint id) + int id) { BroadwayRequestFocusSurface msg; @@ -549,7 +549,7 @@ _gdk_broadway_server_surface_focus (GdkBroadwayServer *server, void _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server, - gint id, gint parent) + int id, int parent) { BroadwayRequestSetTransientFor msg; @@ -692,7 +692,7 @@ gdk_broadway_server_surface_set_nodes (GdkBroadwayServer *server, gboolean _gdk_broadway_server_surface_move_resize (GdkBroadwayServer *server, - gint id, + int id, gboolean with_move, int x, int y, @@ -716,7 +716,7 @@ _gdk_broadway_server_surface_move_resize (GdkBroadwayServer *server, GdkGrabStatus _gdk_broadway_server_grab_pointer (GdkBroadwayServer *server, - gint id, + int id, gboolean owner_events, guint32 event_mask, guint32 time_) diff --git a/gdk/broadway/gdkbroadway-server.h b/gdk/broadway/gdkbroadway-server.h index 8bdcbb45c1..0dd021103a 100644 --- a/gdk/broadway/gdkbroadway-server.h +++ b/gdk/broadway/gdkbroadway-server.h @@ -32,7 +32,7 @@ void _gdk_broadway_server_query_mouse (GdkBroadwaySer gint32 *root_y, guint32 *mask); GdkGrabStatus _gdk_broadway_server_grab_pointer (GdkBroadwayServer *server, - gint id, + int id, gboolean owner_events, guint32 event_mask, guint32 time_); @@ -45,23 +45,23 @@ guint32 _gdk_broadway_server_new_surface (GdkBroadwaySe int width, int height); void _gdk_broadway_server_destroy_surface (GdkBroadwayServer *server, - gint id); + int id); gboolean _gdk_broadway_server_surface_show (GdkBroadwayServer *server, - gint id); + int id); gboolean _gdk_broadway_server_surface_hide (GdkBroadwayServer *server, - gint id); + int id); void _gdk_broadway_server_surface_focus (GdkBroadwayServer *server, - gint id); + int id); void _gdk_broadway_server_surface_set_transient_for (GdkBroadwayServer *server, - gint id, - gint parent); + int id, + int parent); void _gdk_broadway_server_set_show_keyboard (GdkBroadwayServer *server, gboolean show_keyboard); gboolean _gdk_broadway_server_surface_translate (GdkBroadwayServer *server, - gint id, + int id, cairo_region_t *area, - gint dx, - gint dy); + int dx, + int dy); guint32 gdk_broadway_server_upload_texture (GdkBroadwayServer *server, GdkTexture *texture); void gdk_broadway_server_release_texture (GdkBroadwayServer *server, @@ -70,7 +70,7 @@ void gdk_broadway_server_surface_set_nodes (GdkBroadwaySe guint32 id, GArray *nodes); gboolean _gdk_broadway_server_surface_move_resize (GdkBroadwayServer *server, - gint id, + int id, gboolean with_move, int x, int y, diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c index 3c2e98dbcc..ae3b38fab5 100644 --- a/gdk/broadway/gdkeventsource.c +++ b/gdk/broadway/gdkeventsource.c @@ -25,7 +25,7 @@ #include <stdlib.h> static gboolean gdk_event_source_prepare (GSource *source, - gint *timeout); + int *timeout); static gboolean gdk_event_source_check (GSource *source); static gboolean gdk_event_source_dispatch (GSource *source, GSourceFunc callback, @@ -54,7 +54,7 @@ static GList *event_sources = NULL; static gboolean gdk_event_source_prepare (GSource *source, - gint *timeout) + int *timeout) { GdkDisplay *display = ((GdkEventSource*) source)->display; gboolean retval; diff --git a/gdk/broadway/gdkkeys-broadway.c b/gdk/broadway/gdkkeys-broadway.c index 60d8715663..5fe3719ac7 100644 --- a/gdk/broadway/gdkkeys-broadway.c +++ b/gdk/broadway/gdkkeys-broadway.c @@ -142,7 +142,7 @@ gdk_broadway_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { if (n_entries) *n_entries = 1; @@ -171,10 +171,10 @@ static gboolean gdk_broadway_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers) { if (keyval) diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h index 0a3b6d8b9d..98d02958c8 100644 --- a/gdk/broadway/gdkprivate-broadway.h +++ b/gdk/broadway/gdkprivate-broadway.h @@ -55,8 +55,8 @@ GdkDrag * _gdk_broadway_surface_drag_begin (GdkSurface *surface, double dy); void _gdk_broadway_surface_translate (GdkSurface *surface, cairo_region_t *area, - gint dx, - gint dy); + int dx, + int dy); gboolean _gdk_broadway_moveresize_handle_event (GdkDisplay *display, BroadwayInputMsg *msg); gboolean _gdk_broadway_moveresize_configure_done (GdkDisplay *display, @@ -69,13 +69,13 @@ void _gdk_broadway_surface_grab_check_unmap (GdkSurface *surface, gulong serial); void gdk_broadway_surface_move_resize (GdkSurface *surface, - gint x, - gint y, - gint width, - gint height); + int x, + int y, + int width, + int height); void _gdk_keymap_keys_changed (GdkDisplay *display); -gint _gdk_broadway_get_group_for_state (GdkDisplay *display, +int _gdk_broadway_get_group_for_state (GdkDisplay *display, GdkModifierType state); void _gdk_keymap_add_virtual_modifiers_compat (GdkKeymap *keymap, GdkModifierType *modifiers); diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c index 5b278ce7c3..8d7fb8d954 100644 --- a/gdk/broadway/gdksurface-broadway.c +++ b/gdk/broadway/gdksurface-broadway.c @@ -405,7 +405,7 @@ gdk_broadway_surface_hide (GdkSurface *surface) _gdk_surface_clear_update_area (surface); } -static gint +static int gdk_broadway_surface_get_scale_factor (GdkSurface *surface) { GdkBroadwayDisplay *broadway_display; @@ -456,10 +456,10 @@ sync_child_root_pos (GdkSurface *parent) static void gdk_broadway_surface_move_resize_internal (GdkSurface *surface, gboolean with_move, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { GdkBroadwaySurface *impl = GDK_BROADWAY_SURFACE (surface); GdkBroadwayDisplay *broadway_display; @@ -522,10 +522,10 @@ gdk_broadway_surface_move_resize_internal (GdkSurface *surface, void gdk_broadway_surface_move_resize (GdkSurface *surface, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { gdk_broadway_surface_move_resize_internal (surface, TRUE, x, y, @@ -534,8 +534,8 @@ gdk_broadway_surface_move_resize (GdkSurface *surface, static void gdk_broadway_surface_toplevel_resize (GdkSurface *surface, - gint width, - gint height) + int width, + int height) { gdk_broadway_surface_move_resize_internal (surface, FALSE, 0, 0, @@ -544,8 +544,8 @@ gdk_broadway_surface_toplevel_resize (GdkSurface *surface, static void gdk_broadway_surface_move (GdkSurface *surface, - gint x, - gint y) + int x, + int y) { gdk_broadway_surface_move_resize_internal (surface, TRUE, x, y, -1, -1); } @@ -696,10 +696,10 @@ gdk_broadway_surface_set_transient_for (GdkSurface *surface, static void gdk_broadway_surface_get_geometry (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height) + int *x, + int *y, + int *width, + int *height) { g_return_if_fail (GDK_IS_SURFACE (surface)); @@ -718,10 +718,10 @@ gdk_broadway_surface_get_geometry (GdkSurface *surface, static void gdk_broadway_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y) + int x, + int y, + int *root_x, + int *root_y) { GdkBroadwaySurface *impl; @@ -839,13 +839,13 @@ struct _MoveResizeData GdkSurface *moveresize_emulation_surface; gboolean is_resize; GdkSurfaceEdge resize_edge; - gint moveresize_button; - gint moveresize_x; - gint moveresize_y; - gint moveresize_orig_x; - gint moveresize_orig_y; - gint moveresize_orig_width; - gint moveresize_orig_height; + int moveresize_button; + int moveresize_x; + int moveresize_y; + int moveresize_orig_x; + int moveresize_orig_y; + int moveresize_orig_width; + int moveresize_orig_height; long moveresize_process_time; GdkSurfaceHints moveresize_geom_mask; GdkGeometry moveresize_geometry; @@ -876,17 +876,17 @@ get_move_resize_data (GdkDisplay *display, static void update_pos (MoveResizeData *mv_resize, - gint new_root_x, - gint new_root_y) + int new_root_x, + int new_root_y) { - gint dx, dy; + int dx, dy; dx = new_root_x - mv_resize->moveresize_x; dy = new_root_y - mv_resize->moveresize_y; if (mv_resize->is_resize) { - gint x, y, w, h; + int x, y, w, h; x = mv_resize->moveresize_orig_x; y = mv_resize->moveresize_orig_y; @@ -951,7 +951,7 @@ update_pos (MoveResizeData *mv_resize, } else { - gint x, y; + int x, y; x = mv_resize->moveresize_orig_x + dx; y = mv_resize->moveresize_orig_y + dy; @@ -1129,7 +1129,7 @@ create_moveresize_surface (MoveResizeData *mv_resize, static void calculate_unmoving_origin (MoveResizeData *mv_resize) { - gint x, y, width, height; + int x, y, width, height; if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY && mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC) @@ -403,7 +403,7 @@ gdk_unichar_direction (gunichar ch) PangoDirection gdk_find_base_dir (const gchar *text, - gint length) + int length) { PangoDirection dir = PANGO_DIRECTION_NEUTRAL; const gchar *p; diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c index a3410f6cd8..a466209939 100644 --- a/gdk/gdkapplaunchcontext.c +++ b/gdk/gdkapplaunchcontext.c @@ -205,7 +205,7 @@ gdk_app_launch_context_get_display (GdkAppLaunchContext *context) */ void gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context, - gint desktop) + int desktop) { g_return_if_fail (GDK_IS_APP_LAUNCH_CONTEXT (context)); diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h index 575a867501..73296592f4 100644 --- a/gdk/gdkapplaunchcontext.h +++ b/gdk/gdkapplaunchcontext.h @@ -43,7 +43,7 @@ GdkDisplay * gdk_app_launch_context_get_display (GdkAppLaunchContext * GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context, - gint desktop); + int desktop); GDK_AVAILABLE_IN_ALL void gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context, guint32 timestamp); diff --git a/gdk/gdkapplaunchcontextprivate.h b/gdk/gdkapplaunchcontextprivate.h index 9a2bb7199b..e4262f1b5f 100644 --- a/gdk/gdkapplaunchcontextprivate.h +++ b/gdk/gdkapplaunchcontextprivate.h @@ -35,7 +35,7 @@ struct _GdkAppLaunchContext GAppLaunchContext parent_instance; GdkDisplay *display; - gint workspace; + int workspace; guint32 timestamp; GIcon *icon; char *icon_name; diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c index e9fcdff086..908fc75af8 100644 --- a/gdk/gdkcairo.c +++ b/gdk/gdkcairo.c @@ -91,7 +91,7 @@ gdk_cairo_region (cairo_t *cr, const cairo_region_t *region) { cairo_rectangle_int_t box; - gint n_boxes, i; + int n_boxes, i; g_return_if_fail (cr != NULL); g_return_if_fail (region != NULL); @@ -109,7 +109,7 @@ void gdk_cairo_surface_paint_pixbuf (cairo_surface_t *surface, const GdkPixbuf *pixbuf) { - gint width, height; + int width, height; guchar *gdk_pixels, *cairo_pixels; int gdk_rowstride, cairo_stride; int n_channels; @@ -312,7 +312,7 @@ gdk_cairo_region_create_from_surface (cairo_surface_t *surface) GdkRectangle extents, rect; cairo_surface_t *image; cairo_t *cr; - gint x, y, stride; + int x, y, stride; guchar *data; _gdk_cairo_surface_extents (surface, &extents); @@ -347,7 +347,7 @@ gdk_cairo_region_create_from_surface (cairo_surface_t *surface) for (x = 0; x < extents.width; x++) { /* Search for a continuous range of "non transparent pixels"*/ - gint x0 = x; + int x0 = x; while (x < extents.width) { #if G_BYTE_ORDER == G_LITTLE_ENDIAN diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c index 4889d7b232..5cddd20c78 100644 --- a/gdk/gdkdevice.c +++ b/gdk/gdkdevice.c @@ -850,7 +850,7 @@ gdk_device_get_device_type (GdkDevice *device) * * Returns: the number of axes. **/ -gint +int gdk_device_get_n_axes (GdkDevice *device) { g_return_val_if_fail (GDK_IS_DEVICE (device), 0); @@ -877,7 +877,7 @@ gdk_device_get_axis (GdkDevice *device, GdkAxisUse use, gdouble *value) { - gint i; + int i; g_return_val_if_fail (GDK_IS_DEVICE (device), FALSE); g_return_val_if_fail (device->source != GDK_SOURCE_KEYBOARD, FALSE); @@ -980,7 +980,7 @@ gdk_device_ungrab (GdkDevice *device, void _gdk_device_reset_axes (GdkDevice *device) { - gint i; + int i; for (i = device->axes->len - 1; i >= 0; i--) g_array_remove_index (device->axes, i); @@ -1061,7 +1061,7 @@ find_axis_info (GArray *array, GdkAxisUse use) { GdkAxisInfo *info; - gint i; + int i; for (i = 0; i < GDK_AXIS_LAST; i++) { @@ -1089,7 +1089,7 @@ _gdk_device_translate_surface_coord (GdkDevice *device, gdouble x_min, y_min; gdouble x_resolution, y_resolution; gdouble device_aspect; - gint surface_width, surface_height; + int surface_width, surface_height; if (index_ >= device->axes->len) return FALSE; diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h index b9206fcbab..caa557c266 100644 --- a/gdk/gdkdevice.h +++ b/gdk/gdkdevice.h @@ -124,7 +124,7 @@ GdkSurface * gdk_device_get_surface_at_position (GdkDevice *device, double *win_y); GDK_AVAILABLE_IN_ALL -gint gdk_device_get_n_axes (GdkDevice *device); +int gdk_device_get_n_axes (GdkDevice *device); GDK_AVAILABLE_IN_ALL gboolean gdk_device_get_axis (GdkDevice *device, gdouble *axes, diff --git a/gdk/gdkdevicepad.c b/gdk/gdkdevicepad.c index aa0642e292..05b620a52b 100644 --- a/gdk/gdkdevicepad.c +++ b/gdk/gdkdevicepad.c @@ -73,7 +73,7 @@ gdk_device_pad_default_init (GdkDevicePadInterface *pad) * * Returns: The number of button/ring/strip groups in the pad. **/ -gint +int gdk_device_pad_get_n_groups (GdkDevicePad *pad) { GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad); @@ -92,9 +92,9 @@ gdk_device_pad_get_n_groups (GdkDevicePad *pad) * * Returns: The number of modes available in @group. **/ -gint +int gdk_device_pad_get_group_n_modes (GdkDevicePad *pad, - gint group_idx) + int group_idx) { GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad); @@ -113,7 +113,7 @@ gdk_device_pad_get_group_n_modes (GdkDevicePad *pad, * * Returns: The amount of elements of type @feature that this pad has. **/ -gint +int gdk_device_pad_get_n_features (GdkDevicePad *pad, GdkDevicePadFeature feature) { @@ -135,10 +135,10 @@ gdk_device_pad_get_n_features (GdkDevicePad *pad, * * Returns: The group number of the queried pad feature. **/ -gint +int gdk_device_pad_get_feature_group (GdkDevicePad *pad, GdkDevicePadFeature feature, - gint idx) + int idx) { GdkDevicePadInterface *iface = GDK_DEVICE_PAD_GET_IFACE (pad); diff --git a/gdk/gdkdevicepad.h b/gdk/gdkdevicepad.h index 475e51a45a..f8d6da1a76 100644 --- a/gdk/gdkdevicepad.h +++ b/gdk/gdkdevicepad.h @@ -54,20 +54,20 @@ GDK_AVAILABLE_IN_ALL GType gdk_device_pad_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL -gint gdk_device_pad_get_n_groups (GdkDevicePad *pad); +int gdk_device_pad_get_n_groups (GdkDevicePad *pad); GDK_AVAILABLE_IN_ALL -gint gdk_device_pad_get_group_n_modes (GdkDevicePad *pad, - gint group_idx); +int gdk_device_pad_get_group_n_modes (GdkDevicePad *pad, + int group_idx); GDK_AVAILABLE_IN_ALL -gint gdk_device_pad_get_n_features (GdkDevicePad *pad, +int gdk_device_pad_get_n_features (GdkDevicePad *pad, GdkDevicePadFeature feature); GDK_AVAILABLE_IN_ALL -gint gdk_device_pad_get_feature_group (GdkDevicePad *pad, +int gdk_device_pad_get_feature_group (GdkDevicePad *pad, GdkDevicePadFeature feature, - gint feature_idx); + int feature_idx); G_END_DECLS diff --git a/gdk/gdkdevicepadprivate.h b/gdk/gdkdevicepadprivate.h index a4f190066b..7a4371f9bd 100644 --- a/gdk/gdkdevicepadprivate.h +++ b/gdk/gdkdevicepadprivate.h @@ -29,15 +29,15 @@ G_BEGIN_DECLS struct _GdkDevicePadInterface { GTypeInterface parent_interface; - gint (* get_n_groups) (GdkDevicePad *pad); + int (* get_n_groups) (GdkDevicePad *pad); - gint (* get_group_n_modes) (GdkDevicePad *pad, - gint group); - gint (* get_n_features) (GdkDevicePad *pad, + int (* get_group_n_modes) (GdkDevicePad *pad, + int group); + int (* get_n_features) (GdkDevicePad *pad, GdkDevicePadFeature feature); - gint (* get_feature_group) (GdkDevicePad *pad, + int (* get_feature_group) (GdkDevicePad *pad, GdkDevicePadFeature feature, - gint idx); + int idx); }; G_END_DECLS diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h index 712ab70581..3c3140691a 100644 --- a/gdk/gdkdeviceprivate.h +++ b/gdk/gdkdeviceprivate.h @@ -130,7 +130,7 @@ gboolean _gdk_device_translate_axis (GdkDevice *device, gdouble *axis_value); GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device, - gint n_events); + int n_events); void _gdk_device_add_physical_device (GdkDevice *device, GdkDevice *physical); diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index a17305fcbe..db7dfa19ea 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -394,7 +394,7 @@ gdk_display_manager_open_display (GdkDisplayManager *manager, const gchar *backend_list; GdkDisplay *display; gchar **backends; - gint i, j; + int i, j; gboolean allow_any; if (allowed_backends == NULL) diff --git a/gdk/gdkdrag.c b/gdk/gdkdrag.c index 31f947d8b1..c1eac41ac4 100644 --- a/gdk/gdkdrag.c +++ b/gdk/gdkdrag.c @@ -722,8 +722,8 @@ gdk_drag_get_drag_surface (GdkDrag *drag) */ void gdk_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y) + int hot_x, + int hot_y) { g_return_if_fail (GDK_IS_DRAG (drag)); @@ -807,7 +807,7 @@ GdkCursor * gdk_drag_get_cursor (GdkDrag *drag, GdkDragAction action) { - gint i; + int i; for (i = 0 ; i < G_N_ELEMENTS (drag_cursors) - 1; i++) if (drag_cursors[i].action == action) diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h index a3aea2ad7e..070b0f812d 100644 --- a/gdk/gdkdrag.h +++ b/gdk/gdkdrag.h @@ -88,8 +88,8 @@ GdkSurface *gdk_drag_get_drag_surface (GdkDrag *drag); GDK_AVAILABLE_IN_ALL void gdk_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y); + int hot_x, + int hot_y); GDK_AVAILABLE_IN_ALL GdkContentProvider * diff --git a/gdk/gdkdragprivate.h b/gdk/gdkdragprivate.h index ec781204d5..2532caad8b 100644 --- a/gdk/gdkdragprivate.h +++ b/gdk/gdkdragprivate.h @@ -35,8 +35,8 @@ struct _GdkDragClass { GdkSurface* (*get_drag_surface) (GdkDrag *drag); void (*set_hotspot) (GdkDrag *drag, - gint hot_x, - gint hot_y); + int hot_x, + int hot_y); void (*drop_done) (GdkDrag *drag, gboolean success); diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index b6d952264d..264c62f06c 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -734,7 +734,7 @@ gdk_motion_event_push_history (GdkEvent *event, GdkMotionEvent *self = (GdkMotionEvent *) event; GdkTimeCoord hist; GdkDevice *device; - gint i, n_axes; + int i, n_axes; g_assert (GDK_IS_EVENT_TYPE (event, GDK_MOTION_NOTIFY)); g_assert (GDK_IS_EVENT_TYPE (history_event, GDK_MOTION_NOTIFY)); diff --git a/gdk/gdkframeclock.c b/gdk/gdkframeclock.c index 9a48df379e..cd10511545 100644 --- a/gdk/gdkframeclock.c +++ b/gdk/gdkframeclock.c @@ -94,10 +94,10 @@ static guint fps_counter; struct _GdkFrameClockPrivate { gint64 frame_counter; - gint n_timings; - gint current; + int n_timings; + int current; GdkFrameTimings *timings[FRAME_HISTORY_MAX_LENGTH]; - gint n_freeze_inhibitors; + int n_freeze_inhibitors; }; G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkFrameClock, gdk_frame_clock, G_TYPE_OBJECT) @@ -489,7 +489,7 @@ gdk_frame_clock_get_timings (GdkFrameClock *frame_clock, gint64 frame_counter) { GdkFrameClockPrivate *priv; - gint pos; + int pos; g_return_val_if_fail (GDK_IS_FRAME_CLOCK (frame_clock), NULL); diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index ec66950b70..fe2de4667e 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -85,7 +85,7 @@ static GSource *sleep_source; static gboolean sleep_source_prepare (GSource *source, - gint *timeout) + int *timeout) { sleep_source_prepare_time = g_source_get_time (source); *timeout = -1; diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h index c42728573e..a4d85365fd 100644 --- a/gdk/gdkinternals.h +++ b/gdk/gdkinternals.h @@ -271,20 +271,20 @@ void gdk_device_get_position (GdkDevice *device, void gdk_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y); + int x, + int y, + int *root_x, + int *root_y); void gdk_surface_get_origin (GdkSurface *surface, - gint *x, - gint *y); + int *x, + int *y); void gdk_surface_get_geometry (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height); + int *x, + int *y, + int *width, + int *height); GdkGLContext *gdk_surface_get_shared_data_gl_context (GdkSurface *surface); @@ -323,14 +323,14 @@ typedef struct _GdkGeometry GdkGeometry; struct _GdkGeometry { - gint min_width; - gint min_height; - gint max_width; - gint max_height; - gint base_width; - gint base_height; - gint width_inc; - gint height_inc; + int min_width; + int min_height; + int max_width; + int max_height; + int base_width; + int base_height; + int width_inc; + int height_inc; gdouble min_aspect; gdouble max_aspect; GdkGravity win_gravity; @@ -339,10 +339,10 @@ struct _GdkGeometry GDK_AVAILABLE_IN_ALL void gdk_surface_constrain_size (GdkGeometry *geometry, GdkSurfaceHints flags, - gint width, - gint height, - gint *new_width, - gint *new_height); + int width, + int height, + int *new_width, + int *new_height); /* * GdkSeatGrabPrepareFunc: @@ -376,16 +376,16 @@ GdkKeymap * gdk_display_get_keymap (GdkDisplay *display); void gdk_surface_begin_resize_drag (GdkSurface *surface, GdkSurfaceEdge edge, GdkDevice *device, - gint button, - gint x, - gint y, + int button, + int x, + int y, guint32 timestamp); void gdk_surface_begin_move_drag (GdkSurface *surface, GdkDevice *device, - gint button, - gint x, - gint y, + int button, + int x, + int y, guint32 timestamp); G_END_DECLS diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index 52bba82bb2..ac85d1da74 100644 --- a/gdk/gdkkeys.c +++ b/gdk/gdkkeys.c @@ -541,7 +541,7 @@ gboolean gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap, guint keyval, GdkKeymapKey **keys, - gint *n_keys) + int *n_keys) { GArray *array; @@ -621,7 +621,7 @@ gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { g_return_val_if_fail (GDK_IS_KEYMAP (keymap), FALSE); g_return_val_if_fail (n_entries != NULL, FALSE); @@ -723,10 +723,10 @@ gboolean gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers) { g_return_val_if_fail (GDK_IS_KEYMAP (keymap), FALSE); diff --git a/gdk/gdkkeysprivate.h b/gdk/gdkkeysprivate.h index 79ad146b14..db05785678 100644 --- a/gdk/gdkkeysprivate.h +++ b/gdk/gdkkeysprivate.h @@ -48,16 +48,16 @@ struct _GdkKeymapClass guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries); + int *n_entries); guint (* lookup_key) (GdkKeymap *keymap, const GdkKeymapKey *key); gboolean (* translate_keyboard_state) (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers); guint (* get_modifier_state) (GdkKeymap *keymap); @@ -94,20 +94,20 @@ guint gdk_keymap_lookup_key (GdkKeymap *keymap, gboolean gdk_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers); gboolean gdk_keymap_get_entries_for_keyval (GdkKeymap *keymap, guint keyval, GdkKeymapKey **keys, - gint *n_keys); + int *n_keys); gboolean gdk_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries); + int *n_entries); PangoDirection gdk_keymap_get_direction (GdkKeymap *keymap); gboolean gdk_keymap_have_bidi_layouts (GdkKeymap *keymap); diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c index 443afed7ba..38999a3af1 100644 --- a/gdk/gdkpango.c +++ b/gdk/gdkpango.c @@ -127,16 +127,16 @@ */ static cairo_region_t* layout_iter_get_line_clip_region (PangoLayoutIter *iter, - gint x_origin, - gint y_origin, - const gint *index_ranges, - gint n_ranges) + int x_origin, + int y_origin, + const int *index_ranges, + int n_ranges) { PangoLayoutLine *line; cairo_region_t *clip_region; PangoRectangle logical_rect; - gint baseline; - gint i; + int baseline; + int i; line = pango_layout_iter_get_line_readonly (iter); @@ -148,9 +148,9 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter, i = 0; while (i < n_ranges) { - gint *pixel_ranges = NULL; - gint n_pixel_ranges = 0; - gint j; + int *pixel_ranges = NULL; + int n_pixel_ranges = 0; + int j; /* Note that get_x_ranges returns layout coordinates */ @@ -212,10 +212,10 @@ layout_iter_get_line_clip_region (PangoLayoutIter *iter, **/ cairo_region_t* gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line, - gint x_origin, - gint y_origin, - const gint *index_ranges, - gint n_ranges) + int x_origin, + int y_origin, + const int *index_ranges, + int n_ranges) { cairo_region_t *clip_region; PangoLayoutIter *iter; @@ -256,10 +256,10 @@ gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line, **/ cairo_region_t* gdk_pango_layout_get_clip_region (PangoLayout *layout, - gint x_origin, - gint y_origin, - const gint *index_ranges, - gint n_ranges) + int x_origin, + int y_origin, + const int *index_ranges, + int n_ranges) { PangoLayoutIter *iter; cairo_region_t *clip_region; @@ -275,7 +275,7 @@ gdk_pango_layout_get_clip_region (PangoLayout *layout, { PangoRectangle logical_rect; cairo_region_t *line_region; - gint baseline; + int baseline; pango_layout_iter_get_line_extents (iter, NULL, &logical_rect); baseline = pango_layout_iter_get_baseline (iter); diff --git a/gdk/gdkpango.h b/gdk/gdkpango.h index 1378e7892a..5a674bc3d8 100644 --- a/gdk/gdkpango.h +++ b/gdk/gdkpango.h @@ -35,16 +35,16 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_pango_layout_line_get_clip_region (PangoLayoutLine *line, - gint x_origin, - gint y_origin, - const gint *index_ranges, - gint n_ranges); + int x_origin, + int y_origin, + const int *index_ranges, + int n_ranges); GDK_AVAILABLE_IN_ALL cairo_region_t *gdk_pango_layout_get_clip_region (PangoLayout *layout, - gint x_origin, - gint y_origin, - const gint *index_ranges, - gint n_ranges); + int x_origin, + int y_origin, + const int *index_ranges, + int n_ranges); G_END_DECLS diff --git a/gdk/gdkpipeiostream.c b/gdk/gdkpipeiostream.c index f0477d5dff..02147e4a12 100644 --- a/gdk/gdkpipeiostream.c +++ b/gdk/gdkpipeiostream.c @@ -34,7 +34,7 @@ typedef struct _GdkIOPipe GdkIOPipe; struct _GdkIOPipe { - gint ref_count; + int ref_count; GMutex mutex; GCond cond; diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index e90edc1f20..3b7c717bb9 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -169,10 +169,10 @@ convert_no_alpha (guchar *dest_data, */ GdkPixbuf * gdk_pixbuf_get_from_surface (cairo_surface_t *surface, - gint src_x, - gint src_y, - gint width, - gint height) + int src_x, + int src_y, + int width, + int height) { cairo_content_t content; GdkPixbuf *dest; diff --git a/gdk/gdkpixbuf.h b/gdk/gdkpixbuf.h index c2538c9633..65db8ebbc8 100644 --- a/gdk/gdkpixbuf.h +++ b/gdk/gdkpixbuf.h @@ -40,10 +40,10 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_pixbuf_get_from_surface (cairo_surface_t *surface, - gint src_x, - gint src_y, - gint width, - gint height); + int src_x, + int src_y, + int width, + int height); GDK_AVAILABLE_IN_ALL GdkPixbuf *gdk_pixbuf_get_from_texture (GdkTexture *texture); diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c index 641d093e6f..edae510625 100644 --- a/gdk/gdkrectangle.c +++ b/gdk/gdkrectangle.c @@ -67,7 +67,7 @@ gdk_rectangle_union (const GdkRectangle *src1, const GdkRectangle *src2, GdkRectangle *dest) { - gint dest_x, dest_y; + int dest_x, dest_y; g_return_if_fail (src1 != NULL); g_return_if_fail (src2 != NULL); @@ -102,9 +102,9 @@ gdk_rectangle_intersect (const GdkRectangle *src1, const GdkRectangle *src2, GdkRectangle *dest) { - gint dest_x, dest_y; - gint dest_x2, dest_y2; - gint return_val; + int dest_x, dest_y; + int dest_x2, dest_y2; + int return_val; g_return_val_if_fail (src1 != NULL, FALSE); g_return_val_if_fail (src2 != NULL, FALSE); diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 96302ea630..9840034514 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -140,7 +140,7 @@ static GdkMonitor * get_monitor_for_rect (GdkDisplay *display, const GdkRectangle *rect) { - gint biggest_area = G_MININT; + int biggest_area = G_MININT; GdkMonitor *best_monitor = NULL; GdkMonitor *monitor; GdkRectangle workarea; @@ -168,7 +168,7 @@ get_monitor_for_rect (GdkDisplay *display, return best_monitor; } -static gint +static int get_anchor_x_sign (GdkGravity anchor) { switch (anchor) @@ -192,7 +192,7 @@ get_anchor_x_sign (GdkGravity anchor) } } -static gint +static int get_anchor_y_sign (GdkGravity anchor) { switch (anchor) @@ -216,20 +216,20 @@ get_anchor_y_sign (GdkGravity anchor) } } -static gint -maybe_flip_position (gint bounds_pos, - gint bounds_size, - gint rect_pos, - gint rect_size, - gint surface_size, - gint rect_sign, - gint surface_sign, - gint offset, +static int +maybe_flip_position (int bounds_pos, + int bounds_size, + int rect_pos, + int rect_size, + int surface_size, + int rect_sign, + int surface_sign, + int offset, gboolean flip, gboolean *flipped) { - gint primary; - gint secondary; + int primary; + int secondary; *flipped = FALSE; primary = rect_pos + (1 + rect_sign) * rect_size / 2 + offset - (1 + surface_sign) * surface_size / 2; @@ -784,8 +784,8 @@ gdk_surface_new (GdkDisplay *display, **/ GdkSurface * gdk_surface_new_toplevel (GdkDisplay *display, - gint width, - gint height) + int width, + int height) { g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL); @@ -1556,10 +1556,10 @@ gdk_surface_thaw_toplevel_updates (GdkSurface *surface) void gdk_surface_constrain_size (GdkGeometry *geometry, GdkSurfaceHints flags, - gint width, - gint height, - gint *new_width, - gint *new_height) + int width, + int height, + int *new_width, + int *new_height) { /* This routine is partially borrowed from fvwm. * @@ -1569,16 +1569,16 @@ gdk_surface_constrain_size (GdkGeometry *geometry, * * which in turn borrows parts of the algorithm from uwm */ - gint min_width = 0; - gint min_height = 0; - gint base_width = 0; - gint base_height = 0; - gint xinc = 1; - gint yinc = 1; - gint max_width = G_MAXINT; - gint max_height = G_MAXINT; + int min_width = 0; + int min_height = 0; + int base_width = 0; + int base_height = 0; + int xinc = 1; + int yinc = 1; + int max_width = G_MAXINT; + int max_height = G_MAXINT; -#define FLOOR(value, base) ( ((gint) ((value) / (base))) * (base) ) +#define FLOOR(value, base) ( ((int) ((value) / (base))) * (base) ) if ((flags & GDK_HINT_BASE_SIZE) && (flags & GDK_HINT_MIN_SIZE)) { @@ -1635,7 +1635,7 @@ gdk_surface_constrain_size (GdkGeometry *geometry, geometry->min_aspect > 0 && geometry->max_aspect > 0) { - gint delta; + int delta; if (flags & GDK_HINT_BASE_SIZE) { @@ -1983,10 +1983,10 @@ gdk_surface_set_device_cursor (GdkSurface *surface, */ void gdk_surface_get_geometry (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height) + int *x, + int *y, + int *width, + int *height) { g_return_if_fail (GDK_IS_SURFACE (surface)); @@ -2047,8 +2047,8 @@ gdk_surface_get_height (GdkSurface *surface) */ void gdk_surface_get_origin (GdkSurface *surface, - gint *x, - gint *y) + int *x, + int *y) { g_return_if_fail (GDK_IS_SURFACE (surface)); @@ -2070,10 +2070,10 @@ gdk_surface_get_origin (GdkSurface *surface, */ void gdk_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y) + int x, + int y, + int *root_x, + int *root_y) { g_return_if_fail (GDK_IS_SURFACE (surface)); @@ -2528,7 +2528,7 @@ gdk_surface_get_frame_clock (GdkSurface *surface) * * Returns: the scale factor */ -gint +int gdk_surface_get_scale_factor (GdkSurface *surface) { GdkSurfaceClass *class; @@ -2554,7 +2554,7 @@ gdk_surface_get_unscaled_size (GdkSurface *surface, int *unscaled_height) { GdkSurfaceClass *class; - gint scale; + int scale; g_return_if_fail (GDK_IS_SURFACE (surface)); @@ -2637,10 +2637,10 @@ gdk_surface_set_opaque_region (GdkSurface *surface, */ void gdk_surface_set_shadow_width (GdkSurface *surface, - gint left, - gint right, - gint top, - gint bottom) + int left, + int right, + int top, + int bottom) { GdkSurfaceClass *class; diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h index 5b10920291..acd766b259 100644 --- a/gdk/gdksurface.h +++ b/gdk/gdksurface.h @@ -186,7 +186,7 @@ gboolean gdk_surface_translate_coordinates (GdkSurface *from, double *y); GDK_AVAILABLE_IN_ALL -gint gdk_surface_get_scale_factor (GdkSurface *surface); +int gdk_surface_get_scale_factor (GdkSurface *surface); GDK_AVAILABLE_IN_ALL void gdk_surface_get_device_position (GdkSurface *surface, @@ -222,10 +222,10 @@ void gdk_surface_set_opaque_region (GdkSurface *surface, GDK_AVAILABLE_IN_ALL void gdk_surface_set_shadow_width (GdkSurface *surface, - gint left, - gint right, - gint top, - gint bottom); + int left, + int right, + int top, + int bottom); GDK_AVAILABLE_IN_ALL GdkCairoContext *gdk_surface_create_cairo_context(GdkSurface *surface); diff --git a/gdk/gdksurfaceprivate.h b/gdk/gdksurfaceprivate.h index 2aa1828a35..b3a8457a58 100644 --- a/gdk/gdksurfaceprivate.h +++ b/gdk/gdksurfaceprivate.h @@ -45,8 +45,8 @@ struct _GdkSurface gpointer widget; - gint x; - gint y; + int x; + int y; guint8 resize_count; @@ -81,11 +81,11 @@ struct _GdkSurface guint update_and_descendants_freeze_count; - gint width, height; - gint shadow_top; - gint shadow_left; - gint shadow_right; - gint shadow_bottom; + int width, height; + int shadow_top; + int shadow_left; + int shadow_right; + int shadow_bottom; GdkCursor *cursor; GHashTable *device_cursor; @@ -114,15 +114,15 @@ struct _GdkSurfaceClass void (* hide) (GdkSurface *surface); void (* get_geometry) (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height); + int *x, + int *y, + int *width, + int *height); void (* get_root_coords) (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y); + int x, + int y, + int *root_x, + int *root_y); gboolean (* get_device_state) (GdkSurface *surface, GdkDevice *device, gdouble *x, @@ -155,7 +155,7 @@ struct _GdkSurfaceClass double dx, double dy); - gint (* get_scale_factor) (GdkSurface *surface); + int (* get_scale_factor) (GdkSurface *surface); void (* get_unscaled_size) (GdkSurface *surface, int *unscaled_width, int *unscaled_height); @@ -163,10 +163,10 @@ struct _GdkSurfaceClass void (* set_opaque_region) (GdkSurface *surface, cairo_region_t *region); void (* set_shadow_width) (GdkSurface *surface, - gint left, - gint right, - gint top, - gint bottom); + int left, + int right, + int top, + int bottom); GdkGLContext *(*create_gl_context) (GdkSurface *surface, gboolean attached, GdkGLContext *share, diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h index 9ad7879367..0a0068e181 100644 --- a/gdk/gdktypes.h +++ b/gdk/gdktypes.h @@ -62,8 +62,8 @@ G_BEGIN_DECLS */ struct _GdkPoint { - gint x; - gint y; + int x; + int y; }; typedef struct _GdkPoint GdkPoint; @@ -405,8 +405,8 @@ typedef struct _GdkKeymapKey GdkKeymapKey; struct _GdkKeymapKey { guint keycode; - gint group; - gint level; + int group; + int level; }; diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c index 6ba8780bc8..f226e9443c 100644 --- a/gdk/macos/GdkMacosWindow.c +++ b/gdk/macos/GdkMacosWindow.c @@ -609,7 +609,7 @@ { GdkMacosSurface *surface = gdk_surface; NSRect rect; - gint shadow_top; + int shadow_top; /* Allow the window to move up "shadow_top" more than normally allowed * by the default impl. This makes it possible to move windows with diff --git a/gdk/macos/gdkdisplaylinksource.c b/gdk/macos/gdkdisplaylinksource.c index ba8731de5a..36decbbaad 100644 --- a/gdk/macos/gdkdisplaylinksource.c +++ b/gdk/macos/gdkdisplaylinksource.c @@ -32,7 +32,7 @@ static gint64 host_to_frame_clock_time (gint64 host_time); static gboolean gdk_display_link_source_prepare (GSource *source, - gint *timeout_) + int *timeout_) { GdkDisplayLinkSource *impl = (GdkDisplayLinkSource *)source; gint64 now; diff --git a/gdk/macos/gdkmacosdevice.c b/gdk/macos/gdkmacosdevice.c index 8e621fa6fe..3b77c7a7d0 100644 --- a/gdk/macos/gdkmacosdevice.c +++ b/gdk/macos/gdkmacosdevice.c @@ -72,8 +72,8 @@ gdk_macos_device_surface_at_position (GdkDevice *device, GdkMacosDisplay *display; GdkMacosSurface *surface; NSPoint point; - gint x; - gint y; + int x; + int y; g_assert (GDK_IS_MACOS_DEVICE (device)); g_assert (win_x != NULL); diff --git a/gdk/macos/gdkmacosdisplay-settings.c b/gdk/macos/gdkmacosdisplay-settings.c index 558e0b81e0..cf3224b6db 100644 --- a/gdk/macos/gdkmacosdisplay-settings.c +++ b/gdk/macos/gdkmacosdisplay-settings.c @@ -78,7 +78,7 @@ _gdk_macos_settings_load (GdkMacosSettings *settings) settings->double_click_time = fval * 1000; name = [[NSFont systemFontOfSize:0] familyName]; - pt_size = (gint)[[NSFont userFontOfSize:0] pointSize]; + pt_size = (int)[[NSFont userFontOfSize:0] pointSize]; /* Let's try to use the "views" font size (12pt) by default. This is * used for lists/text/other "content" which is the largest parts of * apps, using the "regular control" size (13pt) looks a bit out of diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c index de1324c674..7cc70d921e 100644 --- a/gdk/macos/gdkmacosdrag.c +++ b/gdk/macos/gdkmacosdrag.c @@ -248,7 +248,7 @@ gdk_macos_drag_drop_performed (GdkDrag *drag, static void gdk_drag_get_current_actions (GdkModifierType state, - gint button, + int button, GdkDragAction actions, GdkDragAction *suggested_action, GdkDragAction *possible_actions) @@ -414,7 +414,7 @@ gdk_dnd_handle_key_event (GdkDrag *drag, GdkMacosDrag *self = GDK_MACOS_DRAG (drag); GdkModifierType state; GdkDevice *pointer; - gint dx, dy; + int dx, dy; dx = dy = 0; state = gdk_event_get_modifier_state (event); diff --git a/gdk/macos/gdkmacoseventsource.c b/gdk/macos/gdkmacoseventsource.c index f173433de4..b4ad1fe471 100644 --- a/gdk/macos/gdkmacoseventsource.c +++ b/gdk/macos/gdkmacoseventsource.c @@ -89,7 +89,7 @@ static gboolean run_loop_polling_async = FALSE; /* Between run_loop_before_waiting() and run_loop_after_waiting(); * max_prioritiy to pass to g_main_loop_check() */ -static gint run_loop_max_priority; +static int run_loop_max_priority; /* Timer that we've added to wake up the run loop when a GLib timeout */ @@ -148,7 +148,7 @@ static NSAutoreleasePool *autorelease_pool; * a run loop iteration, so we need to detect that and avoid triggering * our "run the GLib main looop while the run loop is active machinery. */ -static gint getting_events = 0; +static int getting_events = 0; /************************************************************ ********* Select Thread ********* @@ -199,7 +199,7 @@ static GPollFD *next_pollfds; static guint next_n_pollfds; /* Pipe used to wake up the select thread */ -static gint select_thread_wakeup_pipe[2]; +static int select_thread_wakeup_pipe[2]; /* Run loop source used to wake up the main thread */ static CFRunLoopSourceRef select_main_thread_source; @@ -365,7 +365,7 @@ dump_poll_result (GPollFD *ufds, guint nfds) { GString *s; - gint i; + int i; s = g_string_new (""); for (i = 0; i < nfds; i++) @@ -393,7 +393,7 @@ pollfds_equal (GPollFD *old_pollfds, GPollFD *new_pollfds, guint new_n_pollfds) { - gint i; + int i; if (old_n_pollfds != new_n_pollfds) return FALSE; @@ -417,15 +417,15 @@ pollfds_equal (GPollFD *old_pollfds, * 0: No file descriptors ready, asynchronous poll not needed * > 0: Number of file descriptors ready */ -static gint +static int select_thread_start_poll (GPollFD *ufds, guint nfds, - gint timeout) + int timeout) { - gint n_ready; + int n_ready; gboolean have_new_pollfds = FALSE; - gint poll_fd_index = -1; - gint i; + int poll_fd_index = -1; + int i; for (i = 0; i < nfds; i++) if (ufds[i].fd == -1) @@ -575,8 +575,8 @@ select_thread_start_poll (GPollFD *ufds, static int select_thread_collect_poll (GPollFD *ufds, guint nfds) { - gint i; - gint n_ready = 0; + int i; + int n_ready = 0; SELECT_THREAD_LOCK (); @@ -640,7 +640,7 @@ _gdk_macos_event_source_get_pending (void) static gboolean gdk_macos_event_source_prepare (GSource *source, - gint *timeout) + int *timeout) { GdkMacosEventSource *event_source = (GdkMacosEventSource *)source; gboolean retval; @@ -737,14 +737,14 @@ static GSourceFuncs event_funcs = { ********* Our Poll Function ********* ************************************************************/ -static gint +static int poll_func (GPollFD *ufds, guint nfds, - gint timeout_) + int timeout_) { NSEvent *event; NSDate *limit_date; - gint n_ready; + int n_ready; static GPollFD *last_ufds; @@ -808,12 +808,12 @@ poll_func (GPollFD *ufds, /* Wrapper around g_main_context_query() that handles reallocating * run_loop_pollfds up to the proper size */ -static gint +static int query_main_context (GMainContext *context, int max_priority, int *timeout) { - gint nfds; + int nfds; if (!run_loop_pollfds) { @@ -869,8 +869,8 @@ static void run_loop_before_sources (void) { GMainContext *context = g_main_context_default (); - gint max_priority; - gint nfds; + int max_priority; + int nfds; /* Before we let the CFRunLoop process sources, we want to check if there * are any pending GLib main loop sources more urgent than @@ -909,8 +909,8 @@ static void run_loop_before_waiting (void) { GMainContext *context = g_main_context_default (); - gint timeout; - gint n_ready; + int timeout; + int n_ready; /* At this point, the CFRunLoop is ready to wait. We start a GMain loop * iteration by calling the check() and query() stages. We start a diff --git a/gdk/macos/gdkmacoskeymap.c b/gdk/macos/gdkmacoskeymap.c index c638c75179..3265499200 100644 --- a/gdk/macos/gdkmacoskeymap.c +++ b/gdk/macos/gdkmacoskeymap.c @@ -394,12 +394,12 @@ gdk_macos_keymap_lookup_key (GdkKeymap *keymap, static guint translate_keysym (guint hardware_keycode, - gint group, + int group, GdkModifierType state, - gint *effective_group, - gint *effective_level) + int *effective_group, + int *effective_level) { - gint level; + int level; guint tmp_keyval; level = (state & GDK_SHIFT_MASK) ? 1 : 0; @@ -463,7 +463,7 @@ gdk_macos_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { GArray *keys_array; GArray *keyvals_array; @@ -527,10 +527,10 @@ static gboolean gdk_macos_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers) { guint tmp_keyval; diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h index f5a52db3cb..4d9aa4c053 100644 --- a/gdk/macos/gdkmacossurface-private.h +++ b/gdk/macos/gdkmacossurface-private.h @@ -81,10 +81,10 @@ const char *_gdk_macos_surface_get_title (GdkMacosSurface void _gdk_macos_surface_set_title (GdkMacosSurface *self, const gchar *title); void _gdk_macos_surface_get_shadow (GdkMacosSurface *self, - gint *top, - gint *right, - gint *bottom, - gint *left); + int *top, + int *right, + int *bottom, + int *left); NSView *_gdk_macos_surface_get_view (GdkMacosSurface *self); gboolean _gdk_macos_surface_get_modal_hint (GdkMacosSurface *self); void _gdk_macos_surface_set_modal_hint (GdkMacosSurface *self, diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c index 83fad33ffd..84c74b9d46 100644 --- a/gdk/macos/gdkmacossurface.c +++ b/gdk/macos/gdkmacossurface.c @@ -122,7 +122,7 @@ gdk_macos_surface_hide (GdkSurface *surface) _gdk_surface_clear_update_area (surface); } -static gint +static int gdk_macos_surface_get_scale_factor (GdkSurface *surface) { GdkMacosSurface *self = (GdkMacosSurface *)surface; @@ -541,10 +541,10 @@ _gdk_macos_surface_new (GdkMacosDisplay *display, void _gdk_macos_surface_get_shadow (GdkMacosSurface *self, - gint *top, - gint *right, - gint *bottom, - gint *left) + int *top, + int *right, + int *bottom, + int *left) { g_return_if_fail (GDK_IS_MACOS_SURFACE (self)); diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c index 66a461dd6c..3358a8184a 100644 --- a/gdk/wayland/gdkcursor-wayland.c +++ b/gdk/wayland/gdkcursor-wayland.c @@ -104,7 +104,7 @@ static const struct { static const gchar * name_fallback (const gchar *name) { - gint i; + int i; for (i = 0; i < G_N_ELEMENTS (name_map); i++) { diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index 524f17e277..13f03ca4b3 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -185,7 +185,7 @@ struct _GdkWaylandTabletData GdkWaylandTabletToolData *current_tool; - gint axis_indices[GDK_AXIS_LAST]; + int axis_indices[GDK_AXIS_LAST]; gdouble *axes; }; @@ -833,7 +833,7 @@ gdk_wayland_device_init (GdkWaylandDevice *device_core) _gdk_device_add_axis (device, GDK_AXIS_Y, 0, 0, 1); } -static gint +static int gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad) { GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad)); @@ -846,9 +846,9 @@ gdk_wayland_device_pad_get_n_groups (GdkDevicePad *pad) return g_list_length (data->mode_groups); } -static gint +static int gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad, - gint n_group) + int n_group) { GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad)); GdkWaylandTabletPadGroupData *group; @@ -865,7 +865,7 @@ gdk_wayland_device_pad_get_group_n_modes (GdkDevicePad *pad, return group->n_modes; } -static gint +static int gdk_wayland_device_pad_get_n_features (GdkDevicePad *pad, GdkDevicePadFeature feature) { @@ -889,16 +889,16 @@ gdk_wayland_device_pad_get_n_features (GdkDevicePad *pad, } } -static gint +static int gdk_wayland_device_pad_get_feature_group (GdkDevicePad *pad, GdkDevicePadFeature feature, - gint idx) + int idx) { GdkSeat *seat = gdk_device_get_seat (GDK_DEVICE (pad)); GdkWaylandTabletPadGroupData *group; GdkWaylandTabletPadData *data; GList *l; - gint i; + int i; data = gdk_wayland_seat_find_pad (GDK_WAYLAND_SEAT (seat), GDK_DEVICE (pad)); @@ -3344,7 +3344,7 @@ static void gdk_wayland_device_tablet_clone_tool_axes (GdkWaylandTabletData *tablet, GdkDeviceTool *tool) { - gint axis_pos; + int axis_pos; g_object_freeze_notify (G_OBJECT (tablet->stylus_device)); _gdk_device_reset_axes (tablet->stylus_device); @@ -3404,8 +3404,8 @@ gdk_wayland_mimic_device_axes (GdkDevice *logical, { gdouble axis_min, axis_max, axis_resolution; GdkAxisUse axis_use; - gint axis_count; - gint i; + int axis_count; + int i; g_object_freeze_notify (G_OBJECT (logical)); _gdk_device_reset_axes (logical); @@ -3607,7 +3607,7 @@ tablet_tool_handle_pressure (void *data, { GdkWaylandTabletToolData *tool = data; GdkWaylandTabletData *tablet = tool->current_tablet; - gint axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE]; + int axis_index = tablet->axis_indices[GDK_AXIS_PRESSURE]; _gdk_device_translate_axis (tablet->stylus_device, axis_index, pressure, &tablet->axes[axis_index]); @@ -3624,7 +3624,7 @@ tablet_tool_handle_distance (void *data, { GdkWaylandTabletToolData *tool = data; GdkWaylandTabletData *tablet = tool->current_tablet; - gint axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE]; + int axis_index = tablet->axis_indices[GDK_AXIS_DISTANCE]; _gdk_device_translate_axis (tablet->stylus_device, axis_index, distance, &tablet->axes[axis_index]); @@ -3642,8 +3642,8 @@ tablet_tool_handle_tilt (void *data, { GdkWaylandTabletToolData *tool = data; GdkWaylandTabletData *tablet = tool->current_tablet; - gint xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT]; - gint ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT]; + int xtilt_axis_index = tablet->axis_indices[GDK_AXIS_XTILT]; + int ytilt_axis_index = tablet->axis_indices[GDK_AXIS_YTILT]; _gdk_device_translate_axis (tablet->stylus_device, xtilt_axis_index, wl_fixed_to_double (xtilt), @@ -3701,7 +3701,7 @@ tablet_tool_handle_rotation (void *data, { GdkWaylandTabletToolData *tool = data; GdkWaylandTabletData *tablet = tool->current_tablet; - gint axis_index = tablet->axis_indices[GDK_AXIS_ROTATION]; + int axis_index = tablet->axis_indices[GDK_AXIS_ROTATION]; _gdk_device_translate_axis (tablet->stylus_device, axis_index, wl_fixed_to_double (degrees), @@ -3720,7 +3720,7 @@ tablet_tool_handle_slider (void *data, { GdkWaylandTabletToolData *tool = data; GdkWaylandTabletData *tablet = tool->current_tablet; - gint axis_index = tablet->axis_indices[GDK_AXIS_SLIDER]; + int axis_index = tablet->axis_indices[GDK_AXIS_SLIDER]; _gdk_device_translate_axis (tablet->stylus_device, axis_index, position, &tablet->axes[axis_index]); @@ -4175,7 +4175,7 @@ tablet_pad_handle_button (void *data, GdkWaylandTabletPadData *pad = data; GdkWaylandTabletPadGroupData *group; GdkEvent *event; - gint n_group; + int n_group; GDK_SEAT_NOTE (pad->seat, EVENTS, g_message ("tablet pad handle button, pad = %p, button = %d, state = %d", diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 45f937dfab..22623042eb 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -1072,7 +1072,7 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland, void gdk_wayland_display_set_cursor_theme (GdkDisplay *display, const gchar *name, - gint size) + int size) { GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display); struct wl_cursor_theme *theme; @@ -1473,7 +1473,7 @@ struct _TranslationEntry { GType type; union { const char *s; - gint i; + int i; gboolean b; } fallback; }; @@ -1798,7 +1798,7 @@ init_settings (GdkDisplay *display) GSettingsSchemaSource *source; GSettingsSchema *schema; GSettings *settings; - gint i; + int i; if (gdk_should_use_portal ()) { diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h index db5e6a4fb3..7321b34a4e 100644 --- a/gdk/wayland/gdkdisplay-wayland.h +++ b/gdk/wayland/gdkdisplay-wayland.h @@ -58,7 +58,7 @@ typedef struct _GdkWaylandSelection GdkWaylandSelection; typedef struct { gboolean antialias; gboolean hinting; - gint dpi; + int dpi; const gchar *rgba; const gchar *hintstyle; } GsdXftSettings; diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c index e09129f02f..05bf681717 100644 --- a/gdk/wayland/gdkdrag-wayland.c +++ b/gdk/wayland/gdkdrag-wayland.c @@ -51,8 +51,8 @@ struct _GdkWaylandDrag struct wl_data_source *data_source; struct wl_data_offer *offer; uint32_t serial; - gint hot_x; - gint hot_y; + int hot_x; + int hot_y; }; struct _GdkWaylandDragClass @@ -122,12 +122,12 @@ gdk_wayland_drag_get_drag_surface (GdkDrag *drag) static void gdk_wayland_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y) + int hot_x, + int hot_y) { GdkWaylandDrag *drag_wayland = GDK_WAYLAND_DRAG (drag); - gint prev_hot_x = drag_wayland->hot_x; - gint prev_hot_y = drag_wayland->hot_y; + int prev_hot_x = drag_wayland->hot_x; + int prev_hot_y = drag_wayland->hot_y; const GdkRectangle damage_rect = { .width = 1, .height = 1 }; drag_wayland->hot_x = hot_x; diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c index 8db92954e8..6f761f0ab7 100644 --- a/gdk/wayland/gdkeventsource.c +++ b/gdk/wayland/gdkeventsource.c @@ -33,7 +33,7 @@ typedef struct _GdkWaylandEventSource { static gboolean gdk_event_source_prepare (GSource *base, - gint *timeout) + int *timeout) { GdkWaylandEventSource *source = (GdkWaylandEventSource *) base; GdkWaylandDisplay *display = (GdkWaylandDisplay *) source->display; diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c index c60dada58b..38f346c75d 100644 --- a/gdk/wayland/gdkkeys-wayland.c +++ b/gdk/wayland/gdkkeys-wayland.c @@ -84,7 +84,7 @@ static PangoDirection gdk_wayland_keymap_get_direction (GdkKeymap *keymap) { GdkWaylandKeymap *keymap_wayland = GDK_WAYLAND_KEYMAP (keymap); - gint i; + int i; for (i = 0; i < xkb_keymap_num_layouts (keymap_wayland->xkb_keymap); i++) { @@ -138,16 +138,16 @@ gdk_wayland_keymap_get_entries_for_keyval (GdkKeymap *keymap, max_keycode = xkb_keymap_max_keycode (xkb_keymap); for (keycode = min_keycode; keycode < max_keycode; keycode++) { - gint num_layouts, layout; + int num_layouts, layout; num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, keycode); for (layout = 0; layout < num_layouts; layout++) { - gint num_levels, level; + int num_levels, level; num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, keycode, layout); for (level = 0; level < num_levels; level++) { const xkb_keysym_t *syms; - gint num_syms, sym; + int num_syms, sym; num_syms = xkb_keymap_key_get_syms_by_level (xkb_keymap, keycode, layout, level, &syms); for (sym = 0; sym < num_syms; sym++) { @@ -174,12 +174,12 @@ gdk_wayland_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { struct xkb_keymap *xkb_keymap = GDK_WAYLAND_KEYMAP (keymap)->xkb_keymap; - gint num_layouts, layout; - gint num_entries; - gint i; + int num_layouts, layout; + int num_entries; + int i; num_layouts = xkb_keymap_num_layouts_for_key (xkb_keymap, hardware_keycode); @@ -197,7 +197,7 @@ gdk_wayland_keymap_get_entries_for_keycode (GdkKeymap *keymap, i = 0; for (layout = 0; layout < num_layouts; layout++) { - gint num_levels, level; + int num_levels, level; num_levels = xkb_keymap_num_levels_for_key (xkb_keymap, hardware_keycode, layout); for (level = 0; level < num_levels; level++) { @@ -306,10 +306,10 @@ static gboolean gdk_wayland_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *effective_level, + int *effective_group, + int *effective_level, GdkModifierType *consumed_modifiers) { struct xkb_keymap *xkb_keymap; @@ -390,9 +390,9 @@ _gdk_wayland_keymap_init (GdkWaylandKeymap *keymap) static void update_direction (GdkWaylandKeymap *keymap) { - gint num_layouts; - gint i; - gint *rtl; + int num_layouts; + int i; + int *rtl; xkb_keycode_t min_keycode, max_keycode; guint key; gboolean have_rtl, have_ltr; @@ -400,7 +400,7 @@ update_direction (GdkWaylandKeymap *keymap) num_layouts = xkb_keymap_num_layouts (keymap->xkb_keymap); keymap->direction = g_renew (PangoDirection, keymap->direction, num_layouts); - rtl = g_newa (gint, num_layouts); + rtl = g_newa (int, num_layouts); for (i = 0; i < num_layouts; i++) rtl[i] = 0; @@ -408,15 +408,15 @@ update_direction (GdkWaylandKeymap *keymap) max_keycode = xkb_keymap_max_keycode (keymap->xkb_keymap); for (key = min_keycode; key < max_keycode; key++) { - gint layouts, layout; + int layouts, layout; layouts = xkb_keymap_num_layouts_for_key (keymap->xkb_keymap, key); g_assert (layouts <= num_layouts); for (layout = 0; layout < layouts; layout++) { const xkb_keysym_t *syms; - gint num_syms; - gint sym; + int num_syms; + int sym; num_syms = xkb_keymap_key_get_syms_by_level (keymap->xkb_keymap, key, layout, 0, &syms); for (sym = 0; sym < num_syms; sym++) diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index 46fec90c8e..65eb7f387d 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -288,10 +288,10 @@ static void gdk_wayland_surface_sync_opaque_region (GdkSurface *surface); static void unset_transient_for_exported (GdkSurface *surface); static void gdk_wayland_surface_move_resize (GdkSurface *surface, - gint x, - gint y, - gint width, - gint height); + int x, + int y, + int width, + int height); static void update_popup_layout_state (GdkSurface *surface, int x, @@ -2135,8 +2135,8 @@ update_popup_layout_state (GdkSurface *surface, int height, GdkPopupLayout *layout) { - gint surface_x, surface_y; - gint surface_width, surface_height; + int surface_x, surface_y; + int surface_width, surface_height; GdkRectangle best_rect; GdkRectangle flipped_rect; GdkGravity rect_anchor; @@ -2239,8 +2239,8 @@ create_dynamic_positioner (GdkSurface *surface, GdkRectangle geometry; uint32_t constraint_adjustment = ZXDG_POSITIONER_V6_CONSTRAINT_ADJUSTMENT_NONE; const GdkRectangle *anchor_rect; - gint real_anchor_rect_x, real_anchor_rect_y; - gint anchor_rect_width, anchor_rect_height; + int real_anchor_rect_x, real_anchor_rect_y; + int anchor_rect_width, anchor_rect_height; int rect_anchor_dx; int rect_anchor_dy; GdkGravity rect_anchor; @@ -2761,10 +2761,10 @@ gdk_wayland_surface_hide (GdkSurface *surface) static void gdk_wayland_surface_move_resize (GdkSurface *surface, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); @@ -3048,10 +3048,10 @@ gdk_wayland_surface_present_popup (GdkSurface *surface, static void gdk_wayland_surface_get_geometry (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height) + int *x, + int *y, + int *width, + int *height) { if (!GDK_SURFACE_DESTROYED (surface)) { @@ -3068,10 +3068,10 @@ gdk_wayland_surface_get_geometry (GdkSurface *surface, static void gdk_wayland_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y) + int x, + int y, + int *root_x, + int *root_y) { /* * Wayland does not have a global coordinate space shared between surfaces. In @@ -3826,7 +3826,7 @@ gdk_wayland_surface_destroy_notify (GdkSurface *surface) g_object_unref (surface); } -static gint +static int gdk_wayland_surface_get_scale_factor (GdkSurface *surface) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); @@ -3859,7 +3859,7 @@ gdk_wayland_surface_set_shadow_width (GdkSurface *surface, int bottom) { GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface); - gint new_width, new_height; + int new_width, new_height; if (GDK_SURFACE_DESTROYED (surface)) return; diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h index e07fe84915..373a2a8e46 100644 --- a/gdk/wayland/gdkwaylanddisplay.h +++ b/gdk/wayland/gdkwaylanddisplay.h @@ -52,7 +52,7 @@ struct wl_compositor *gdk_wayland_display_get_wl_compositor (GdkDisplay *dis GDK_AVAILABLE_IN_ALL void gdk_wayland_display_set_cursor_theme (GdkDisplay *display, const gchar *theme, - gint size); + int size); GDK_AVAILABLE_IN_ALL const gchar * gdk_wayland_display_get_startup_notification_id (GdkDisplay *display); GDK_AVAILABLE_IN_ALL diff --git a/gdk/win32/bdfcursor.c b/gdk/win32/bdfcursor.c index 606cd19eb3..7c091a1626 100644 --- a/gdk/win32/bdfcursor.c +++ b/gdk/win32/bdfcursor.c @@ -26,26 +26,26 @@ typedef struct { gchar *name; - gint id; + int id; gchar *bitmap; - gint hotx; - gint hoty; + int hotx; + int hoty; } font_info_t; typedef struct { gchar *name; - gint id; - gint width; - gint height; - gint hotx; - gint hoty; + int id; + int width; + int height; + int hotx; + int hoty; gchar *data; } cursor_info_t; static GSList *fonts = NULL; static GSList *cursors = NULL; -static gint dw,dh; +static int dw,dh; static gboolean debug = FALSE; @@ -97,17 +97,17 @@ cursor_info_t *ci; } } -static gint read_bdf_font(fname) +static int read_bdf_font(fname) gchar *fname; { FILE *f; gchar line[2048]; - gint rv = 0; + int rv = 0; gboolean startchar = FALSE, startbitmap = FALSE; gchar *charname,*p,*bitmap; - gint dx = 0,dy = 0; - gint w,h,x,y,py; - gint id,tmp; + int dx = 0,dy = 0; + int w,h,x,y,py; + int id,tmp; dw = 0; dh = 0; @@ -210,7 +210,7 @@ gchar *fname; return rv; } -static gint font_info_compare(fi, name) +static int font_info_compare(fi, name) font_info_t *fi; char *name; { @@ -303,8 +303,8 @@ int id; { static gchar cdata[8192]; gchar *p; - gint i; - gint c; + int i; + int c; gboolean flushed; sprintf(cdata, " { \"%s\", %d, %d, %d, %d, %d, \n \"", @@ -351,7 +351,7 @@ static int dump_cursors() GSList *ptr; FILE *f = stdout; - fprintf(f, "static const struct { const gchar *name; gint type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n"); + fprintf(f, "static const struct { const gchar *name; int type; guchar width; guchar height; guchar hotx; guchar hoty; guchar *data; } cursors[] = {\n"); for (ptr = cursors; ptr; ptr = ptr->next) { @@ -365,8 +365,8 @@ static int dump_cursors() return 0; } -gint main(argc, argv) -gint argc; +int main(argc, argv) +int argc; gchar **argv; { if (argc != 2) diff --git a/gdk/win32/gdkcairocontext-win32.c b/gdk/win32/gdkcairocontext-win32.c index 5ccc640774..41b54deb3d 100644 --- a/gdk/win32/gdkcairocontext-win32.c +++ b/gdk/win32/gdkcairocontext-win32.c @@ -33,7 +33,7 @@ G_DEFINE_TYPE (GdkWin32CairoContext, gdk_win32_cairo_context, GDK_TYPE_CAIRO_CON void gdk_win32_surface_get_queued_window_rect (GdkSurface *surface, - gint scale, + int scale, RECT *return_window_rect) { RECT window_rect; @@ -79,9 +79,9 @@ gdk_win32_surface_apply_queued_move_resize (GdkSurface *surface, static cairo_surface_t * create_cairo_surface_for_layered_window (GdkWin32Surface *impl, - gint width, - gint height, - gint scale) + int width, + int height, + int scale) { if (width > impl->dib_width || height > impl->dib_height) @@ -146,7 +146,7 @@ gdk_win32_cairo_context_begin_frame (GdkDrawContext *draw_context, GdkWin32Surface *impl; int scale; cairo_t *cr; - gint width, height; + int width, height; RECT queued_window_rect; surface = gdk_draw_context_get_surface (draw_context); @@ -236,7 +236,7 @@ gdk_win32_cairo_context_end_frame (GdkDrawContext *draw_context, { GdkWin32CairoContext *self = GDK_WIN32_CAIRO_CONTEXT (draw_context); GdkSurface *surface; - gint scale; + int scale; surface = gdk_draw_context_get_surface (draw_context); scale = gdk_surface_get_scale_factor (surface); diff --git a/gdk/win32/gdkcairocontext-win32.h b/gdk/win32/gdkcairocontext-win32.h index 69b5522ffe..99fbfd76f9 100644 --- a/gdk/win32/gdkcairocontext-win32.h +++ b/gdk/win32/gdkcairocontext-win32.h @@ -53,8 +53,8 @@ struct _GdkWin32CairoContext * around between repaints, and only re-allocate it * if it's too small. */ cairo_surface_t *db_surface; - gint db_width; - gint db_height; + int db_width; + int db_height; /* Surface for the window DC (in non-layered mode). * A reference of the cache surface (in layered mode). */ diff --git a/gdk/win32/gdkclipdrop-win32.c b/gdk/win32/gdkclipdrop-win32.c index 0755876d65..65e4fdb0d9 100644 --- a/gdk/win32/gdkclipdrop-win32.c +++ b/gdk/win32/gdkclipdrop-win32.c @@ -630,7 +630,7 @@ free_queue_item (GdkWin32ClipboardThreadQueueItem *item) GdkWin32ClipboardThreadAdvertise *adv; GdkWin32ClipboardThreadRetrieve *retr; GdkWin32ClipboardThreadStore *store; - gint i; + int i; switch (item->item_type) { @@ -706,7 +706,7 @@ static gboolean process_advertise (GdkWin32ClipboardThreadAdvertise *adv) { DWORD error_code; - gint i; + int i; if (g_get_monotonic_time () > adv->parent.end_time) { @@ -785,7 +785,7 @@ static gboolean process_store (GdkWin32ClipboardThreadStore *store) { DWORD error_code; - gint i; + int i; if (g_get_monotonic_time () > store->parent.end_time) { @@ -911,7 +911,7 @@ static gboolean process_retrieve (GdkWin32ClipboardThreadRetrieve *retr) { DWORD error_code; - gint i; + int i; UINT fmt, fmt_to_use; HANDLE hdata; GdkWin32ContentFormatPair *pair; @@ -1290,7 +1290,7 @@ inner_clipboard_window_procedure (HWND hwnd, if (API_CALL (OpenClipboard, (hwnd))) { - gint i; + int i; GdkWin32ContentFormatPair *pair; for (pair = NULL, i = 0; @@ -1310,7 +1310,7 @@ inner_clipboard_window_procedure (HWND hwnd, } case WM_RENDERFORMAT: { - gint i; + int i; GdkWin32ClipboardThreadRender *render; GdkWin32ClipboardThreadRender *returned_render; GdkWin32ContentFormatPair *pair; @@ -1880,7 +1880,7 @@ gchar * _gdk_win32_get_clipboard_format_name (UINT fmt, gboolean *is_predefined) { - gint registered_name_w_len = 1024; + int registered_name_w_len = 1024; wchar_t *registered_name_w = g_malloc (registered_name_w_len); gchar *registered_name = NULL; int gcfn_result; @@ -1959,7 +1959,7 @@ static GArray * get_compatibility_w32formats_for_contentformat (const gchar *contentformat) { GArray *result = NULL; - gint i; + int i; GdkWin32Clipdrop *clipdrop = _gdk_win32_clipdrop_get (); result = g_hash_table_lookup (clipdrop->compatibility_w32formats, contentformat); @@ -2021,7 +2021,7 @@ _gdk_win32_add_w32format_to_pairs (UINT w32format, const gchar *interned_w32format_name; GdkWin32ContentFormatPair pair; GArray *comp_pairs; - gint i, j; + int i, j; if (w32format_name != NULL) { @@ -2073,7 +2073,7 @@ _gdk_win32_add_w32format_to_pairs (UINT w32format, static void transmute_cf_unicodetext_to_utf8_string (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2113,7 +2113,7 @@ transmute_cf_unicodetext_to_utf8_string (const guchar *data, static void transmute_utf8_string_to_cf_unicodetext (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2121,7 +2121,7 @@ transmute_utf8_string_to_cf_unicodetext (const guchar *data, glong wclen; GError *err = NULL; glong size; - gint i; + int i; wchar_t *wcptr, *p; wcptr = g_utf8_to_utf16 ((char *) data, length, NULL, &wclen, &err); @@ -2188,7 +2188,7 @@ wchar_to_str (const wchar_t *wstr, static void transmute_utf8_string_to_cf_text (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2196,7 +2196,7 @@ transmute_utf8_string_to_cf_text (const guchar *data, glong rlen; GError *err = NULL; gsize size; - gint i; + int i; char *strptr, *p; wchar_t *wcptr; @@ -2274,7 +2274,7 @@ str_to_wchar (const char *str, static void transmute_cf_text_to_utf8_string (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2320,7 +2320,7 @@ transmute_cf_text_to_utf8_string (const guchar *data, static void transmute_cf_dib_to_image_bmp (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2354,8 +2354,8 @@ transmute_cf_dib_to_image_bmp (const guchar *data, BITMAPINFOHEADER *bi = (BITMAPINFOHEADER *) data; BITMAPFILEHEADER *bf; gpointer result; - gint data_length = length; - gint new_length; + int data_length = length; + int new_length; gboolean make_dibv5 = FALSE; BITMAPV5HEADER *bV5; guchar *p; @@ -2490,7 +2490,7 @@ transmute_cf_dib_to_image_bmp (const guchar *data, static void transmute_cf_shell_id_list_to_text_uri_list (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) @@ -2540,12 +2540,12 @@ transmute_cf_shell_id_list_to_text_uri_list (const guchar *data, void transmute_image_bmp_to_cf_dib (const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length, GDestroyNotify *set_data_destroy) { - gint size; + int size; guchar *ptr; g_return_if_fail (length >= sizeof (BITMAPFILEHEADER)); @@ -2630,7 +2630,7 @@ gboolean _gdk_win32_transmute_contentformat (const gchar *from_contentformat, UINT to_w32format, const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length) { @@ -2682,16 +2682,16 @@ _gdk_win32_transmute_contentformat (const gchar *from_contentformat, return TRUE; } -gint +int _gdk_win32_add_contentformat_to_pairs (const char *contentformat, GArray *array) { - gint added_count = 0; + int added_count = 0; wchar_t *contentformat_w; GdkWin32ContentFormatPair fmt; - gint i; + int i; GArray *comp_pairs; - gint starting_point; + int starting_point; const wchar_t *prefix = L"application/x.windows."; size_t prefix_len = wcslen (prefix); size_t offset = 0; @@ -2732,7 +2732,7 @@ _gdk_win32_add_contentformat_to_pairs (const char *contentformat, comp_pairs = get_compatibility_w32formats_for_contentformat (contentformat); for (i = 0; comp_pairs != NULL && i < comp_pairs->len; i++) { - gint j; + int j; fmt = g_array_index (comp_pairs, GdkWin32ContentFormatPair, i); @@ -2834,7 +2834,7 @@ clipboard_store_hdata_ready (GObject *clipboard, gpointer user_data) { GError *error = NULL; - gint i; + int i; gboolean no_other_streams; GdkWin32ClipboardHDataPrepAndStream *prep_and_stream = (GdkWin32ClipboardHDataPrepAndStream *) user_data; GdkWin32ClipboardStorePrep *prep = prep_and_stream->prep; diff --git a/gdk/win32/gdkclipdrop-win32.h b/gdk/win32/gdkclipdrop-win32.h index 418d52c36e..f28b0eec80 100644 --- a/gdk/win32/gdkclipdrop-win32.h +++ b/gdk/win32/gdkclipdrop-win32.h @@ -34,7 +34,7 @@ G_BEGIN_DECLS * Also remembers whether the data needs to be transmuted. */ typedef struct { - gint w32format; + int w32format; /* This is assumed to be an interned string, it will be * compared by simply comparing the pointer. */ @@ -208,7 +208,7 @@ struct _GdkWin32Clipdrop * anything in the queue. If there is, then the queue * processing (which requires expensice locks) can happen. */ - gint dnd_queue_counter; + int dnd_queue_counter; /* We don't actually support multiple simultaneous drags, * for obvious reasons (though this might change with @@ -243,7 +243,7 @@ gchar * _gdk_win32_get_clipboard_format_name (UINT void _gdk_win32_add_w32format_to_pairs (UINT format, GArray *array, GdkContentFormatsBuilder *builder); -gint _gdk_win32_add_contentformat_to_pairs (const char *target, +int _gdk_win32_add_contentformat_to_pairs (const char *target, GArray *array); void _gdk_win32_clipboard_default_output_done (GObject *clipboard, @@ -252,7 +252,7 @@ void _gdk_win32_clipboard_default_output_done (GObject gboolean _gdk_win32_transmute_contentformat (const gchar *from_contentformat, UINT to_w32format, const guchar *data, - gint length, + int length, guchar **set_data, gsize *set_data_length); diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index b1545a67ba..9184e6bcd3 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -381,12 +381,12 @@ gdk_win32_hcursor_get_handle (GdkWin32HCursor *cursor) } static HCURSOR -hcursor_from_x_cursor (gint i, +hcursor_from_x_cursor (int i, const gchar *name) { - gint j, x, y, ofs; + int j, x, y, ofs; HCURSOR rv; - gint w, h; + int w, h; guchar *and_plane, *xor_plane; w = GetSystemMetrics (SM_CXCURSOR); @@ -410,9 +410,9 @@ hcursor_from_x_cursor (gint i, for (x = 0; x < cursors[i].width && x < w ; x++, j++) { - gint pofs = ofs + x / 8; + int pofs = ofs + x / 8; guchar data = (cursors[i].data[j/4] & (0xc0 >> (2 * (j%4)))) >> (2 * (3 - (j%4))); - gint bit = 7 - (j % cursors[i].width) % 8; + int bit = 7 - (j % cursors[i].width) % 8; if (data) { @@ -510,10 +510,10 @@ win32_cursor_create_win32hcursor (GdkWin32Display *display, static Win32Cursor * win32_cursor_new (GdkWin32CursorLoadType load_type, gpointer resource_name, - gint width, - gint height, + int width, + int height, guint load_flags, - gint xcursor_number) + int xcursor_number) { Win32Cursor *result; @@ -545,7 +545,7 @@ win32_cursor_destroy (gpointer data) static void win32_cursor_theme_load_from (Win32CursorTheme *theme, - gint size, + int size, const gchar *dir) { GDir *gdir; @@ -600,11 +600,11 @@ win32_cursor_theme_load_from (Win32CursorTheme *theme, static void win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme, const gchar *name, - gint size) + int size) { gchar *theme_dir; const gchar * const *dirs; - gint i; + int i; dirs = g_get_system_data_dirs (); @@ -624,9 +624,9 @@ win32_cursor_theme_load_from_dirs (Win32CursorTheme *theme, static void win32_cursor_theme_load_system (Win32CursorTheme *theme, - gint size) + int size) { - gint i; + int i; HCURSOR shared_hcursor; HCURSOR x_hcursor; Win32Cursor *cursor; @@ -690,7 +690,7 @@ win32_cursor_theme_load_system (Win32CursorTheme *theme, Win32CursorTheme * win32_cursor_theme_load (const gchar *name, - gint size) + int size) { Win32CursorTheme *result = g_new0 (Win32CursorTheme, 1); @@ -801,7 +801,7 @@ static GdkWin32HCursor * win32hcursor_x_from_name (GdkWin32Display *display, const gchar *name) { - gint i; + int i; for (i = 0; i < G_N_ELEMENTS (cursors); i++) if (cursors[i].name == NULL || strcmp (cursors[i].name, name) == 0) @@ -856,7 +856,7 @@ win32hcursor_from_name (GdkWin32Display *display, static GdkWin32HCursor * create_blank_win32hcursor (GdkWin32Display *display) { - gint w, h; + int w, h; guchar *and_plane, *xor_plane; HCURSOR rv; @@ -901,8 +901,8 @@ gdk_win32hcursor_create_for_name (GdkWin32Display *display, static HICON pixbuf_to_hicon (GdkPixbuf *pixbuf, gboolean is_icon, - gint x, - gint y); + int x, + int y); static GdkWin32HCursor * gdk_win32hcursor_create_for_texture (GdkWin32Display *display, @@ -912,7 +912,7 @@ gdk_win32hcursor_create_for_texture (GdkWin32Display *display, { cairo_surface_t *surface; GdkPixbuf *pixbuf; - gint width, height; + int width, height; HICON icon; surface = gdk_texture_download_surface (texture); @@ -1015,7 +1015,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, } bmi; HDC hdc; guchar *pixels, *bits; - gint rowstride, x, y, w, h; + int rowstride, x, y, w, h; if (!GDI_CALL (GetIconInfo, (hicon, &ii))) return NULL; @@ -1113,7 +1113,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, { for (x = 0; x < w; x++) { - const gint bit = 7 - (x % 8); + const int bit = 7 - (x % 8); printf ("%c ", ((bits[bpl*y+x/8])&(1<<bit)) ? ' ' : 'X'); } printf ("\n"); @@ -1135,7 +1135,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, } for (x = 0; x < w; x++) { - const gint bit = 7 - (x % 8); + const int bit = 7 - (x % 8); if ((*andp) & (1<<bit)) { if ((*xorp) & (1<<bit)) @@ -1183,7 +1183,7 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon, */ static HBITMAP -create_alpha_bitmap (gint size, +create_alpha_bitmap (int size, guchar **outdata) { BITMAPV5HEADER bi; @@ -1221,9 +1221,9 @@ create_alpha_bitmap (gint size, } static HBITMAP -create_color_bitmap (gint size, +create_color_bitmap (int size, guchar **outdata, - gint bits) + int bits) { struct { BITMAPV4HEADER bmiHeader; @@ -1272,7 +1272,7 @@ pixbuf_to_hbitmaps_alpha_winxp (GdkPixbuf *pixbuf, HBITMAP hColorBitmap, hMaskBitmap; guchar *indata, *inrow; guchar *colordata, *colorrow, *maskdata, *maskbyte; - gint width, height, size, i, i_offset, j, j_offset, rowstride; + int width, height, size, i, i_offset, j, j_offset, rowstride; guint maskstride, mask_bit; width = gdk_pixbuf_get_width (pixbuf); /* width of icon */ @@ -1350,7 +1350,7 @@ pixbuf_to_hbitmaps_normal (GdkPixbuf *pixbuf, HBITMAP hColorBitmap, hMaskBitmap; guchar *indata, *inrow; guchar *colordata, *colorrow, *maskdata, *maskbyte; - gint width, height, size, i, i_offset, j, j_offset, rowstride, nc, bmstride; + int width, height, size, i, i_offset, j, j_offset, rowstride, nc, bmstride; gboolean has_alpha; guint maskstride, mask_bit; @@ -1432,8 +1432,8 @@ pixbuf_to_hbitmaps_normal (GdkPixbuf *pixbuf, static HICON pixbuf_to_hicon (GdkPixbuf *pixbuf, gboolean is_icon, - gint x, - gint y) + int x, + int y) { ICONINFO ii; HICON icon; @@ -1464,7 +1464,7 @@ _gdk_win32_texture_to_hicon (GdkTexture *texture) { cairo_surface_t *surface; GdkPixbuf *pixbuf; - gint width, height; + int width, height; HICON icon; surface = gdk_texture_download_surface (texture); @@ -1482,8 +1482,8 @@ _gdk_win32_texture_to_hicon (GdkTexture *texture) HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf, - gint x_hotspot, - gint y_hotspot) + int x_hotspot, + int y_hotspot) { return pixbuf_to_hicon (pixbuf, FALSE, x_hotspot, y_hotspot); } diff --git a/gdk/win32/gdkdevice-win32.c b/gdk/win32/gdkdevice-win32.c index 129c5a056f..0f83610952 100644 --- a/gdk/win32/gdkdevice-win32.c +++ b/gdk/win32/gdkdevice-win32.c @@ -89,7 +89,7 @@ gdk_device_win32_query_state (GdkDevice *device, { POINT point; HWND hwnd, hwndc; - gint scale; + int scale; if (window) { diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index 052c71bee6..124fcef2e7 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -193,9 +193,9 @@ _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab, { GdkDevice *device; GdkSurface *impl_surface; - gint root_x, root_y; + int root_x, root_y; gdouble temp_x, temp_y; - gint i; + int i; device = GDK_DEVICE (device_wintab); impl_surface = window; diff --git a/gdk/win32/gdkdevice-wintab.h b/gdk/win32/gdkdevice-wintab.h index f706dd91df..2679d73b80 100644 --- a/gdk/win32/gdkdevice-wintab.h +++ b/gdk/win32/gdkdevice-wintab.h @@ -40,8 +40,8 @@ struct _GdkDeviceWintab GdkDevice parent_instance; gboolean sends_core; - gint *last_axis_data; - gint button_state; + int *last_axis_data; + int button_state; /* WINTAB stuff: */ HCTX hctx; diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index b3f9e75b83..a2d26b0231 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -44,7 +44,7 @@ static GList *wintab_contexts = NULL; static GdkSurface *wintab_window = NULL; -extern gint _gdk_input_ignore_core; +extern int _gdk_input_ignore_core; typedef UINT (WINAPI *t_WTInfoA) (UINT a, UINT b, LPVOID c); typedef UINT (WINAPI *t_WTInfoW) (UINT a, UINT b, LPVOID c); @@ -627,7 +627,7 @@ wintab_init_check (GdkDeviceManagerWin32 *device_manager) num_axes += 2; } - device->last_axis_data = g_new (gint, num_axes); + device->last_axis_data = g_new (int, num_axes); GDK_NOTE (INPUT, g_print ("device: (%u) %s axes: %d\n", cursorix, @@ -778,7 +778,7 @@ _gdk_input_set_tablet_active (void) } static void -decode_tilt (gint *axis_data, +decode_tilt (int *axis_data, AXIS *axes, PACKET *packet) { @@ -878,7 +878,7 @@ gdk_input_other_event (GdkDisplay *display, GdkEvent *event; PACKET packet; - gint num_axes; + int num_axes; double x, y; guint translated_buttons, button_diff, button_mask; diff --git a/gdk/win32/gdkdevicemanager-win32.h b/gdk/win32/gdkdevicemanager-win32.h index f1382b4df8..003be32a44 100644 --- a/gdk/win32/gdkdevicemanager-win32.h +++ b/gdk/win32/gdkdevicemanager-win32.h @@ -46,7 +46,7 @@ struct _GdkDeviceManagerWin32 * of our context (WT_PROXIMITY). Bumped down when we either * receive a WT_PACKET, or a WT_CSRCHANGE. */ - gint dev_entered_proximity; + int dev_entered_proximity; }; struct _GdkDeviceManagerWin32Class diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c index 11fc4aecd7..53227c70ff 100644 --- a/gdk/win32/gdkdisplay-win32.c +++ b/gdk/win32/gdkdisplay-win32.c @@ -187,7 +187,7 @@ void _gdk_win32_display_init_monitors (GdkWin32Display *win32_display) { GPtrArray *new_monitors; - gint i; + int i; GdkWin32Monitor *primary_to_move = NULL; for (i = 0; i < g_list_model_get_n_items (win32_display->monitors); i++) @@ -340,10 +340,10 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display) void gdk_win32_display_set_cursor_theme (GdkDisplay *display, const gchar *name, - gint size) + int size) { - gint cursor_size; - gint w, h; + int cursor_size; + int w, h; Win32CursorTheme *theme; GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display); @@ -957,7 +957,7 @@ guint _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display, HMONITOR hmonitor, HWND hwnd, - gint *dpi) + int *dpi) { gboolean is_scale_acquired = FALSE; gboolean use_dpi_for_monitor = FALSE; diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h index 8fb5ec4cb5..02c217189f 100644 --- a/gdk/win32/gdkdisplay-win32.h +++ b/gdk/win32/gdkdisplay-win32.h @@ -129,7 +129,7 @@ void gdk_win32_display_check_composited (GdkWin32Display *display); guint _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display, HMONITOR hmonitor, HWND hwnd, - gint *dpi); + int *dpi); typedef struct _GdkWin32MessageFilter GdkWin32MessageFilter; diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 04169bedeb..20f8cb3f4b 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -225,7 +225,7 @@ typedef struct { IDropSource ids; IDropSourceNotify idsn; - gint ref_count; + int ref_count; GdkDrag *drag; /* These are thread-local @@ -1207,7 +1207,7 @@ query (LPDATAOBJECT This, GdkWin32ContentFormatPair **pair) { data_object *ctx = (data_object *) This; - gint i; + int i; if (pair) *pair = NULL; @@ -1633,8 +1633,8 @@ data_object_new (GdkDrag *drag) for (i = 0; i < n_mime_types; i++) { - gint added_count = 0; - gint j; + int added_count = 0; + int j; GDK_NOTE (DND, g_print ("DataObject supports contentformat 0x%p (%s)\n", mime_types[i], mime_types[i])); @@ -1790,8 +1790,8 @@ _gdk_win32_surface_drag_begin (GdkSurface *surface, * Unless, of course, we keep the LOCAL protocol around. */ typedef struct { - gint x; - gint y; + int x; + int y; HWND ignore; HWND result; } find_window_enum_arg; @@ -1834,8 +1834,8 @@ find_window_enum_proc (HWND hwnd, static HWND gdk_win32_drag_find_window (GdkDrag *drag, GdkSurface *drag_surface, - gint x_root, - gint y_root) + int x_root, + int y_root) { GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag); find_window_enum_arg a; @@ -1903,8 +1903,8 @@ _gdk_win32_get_drop_for_dest_window (HWND dest_window) static gboolean gdk_win32_local_drag_motion (GdkDrag *drag, HWND dest_window, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragAction possible_actions, DWORD key_state, guint32 time_) @@ -2087,7 +2087,7 @@ gdk_drag_anim_timeout (gpointer data) gint64 current_time; double f; double t; - gint x, y; + int x, y; if (!frame_clock) return G_SOURCE_REMOVE; @@ -2381,7 +2381,7 @@ gdk_dnd_handle_key_event (GdkDrag *drag, GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag); GdkModifierType state; GdkDevice *pointer; - gint dx, dy; + int dx, dy; GDK_NOTE (DND, g_print ("gdk_dnd_handle_key_event: 0x%p\n", drag)); @@ -2546,8 +2546,8 @@ gdk_win32_drag_get_drag_surface (GdkDrag *drag) static void gdk_win32_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y) + int hot_x, + int hot_y) { GdkWin32Drag *drag_win32 = GDK_WIN32_DRAG (drag); diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c index 8d4af3b420..8d0ba39431 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -83,8 +83,8 @@ struct _GdkWin32Drop GdkDragAction actions; guint scale; /* Temporarily caches the HiDPI scale */ - gint last_x; /* Coordinates from last event, in GDK space */ - gint last_y; + int last_x; /* Coordinates from last event, in GDK space */ + int last_y; DWORD last_key_state; /* Key state from last event */ /* Just like GdkDrop->formats, but an array, and with format IDs @@ -117,7 +117,7 @@ G_DEFINE_TYPE (GdkWin32Drop, gdk_win32_drop, GDK_TYPE_DROP) struct _drop_target_context { IDropTarget idt; - gint ref_count; + int ref_count; /* The drop object we create when a drag enters our surface. * The drop object is destroyed when the drag leaves. @@ -454,8 +454,8 @@ set_source_actions_helper (GdkDrop *drop, void _gdk_win32_local_drop_target_dragenter (GdkDrag *drag, GdkSurface *dest_surface, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState, guint32 time_, GdkDragAction *actions) @@ -514,8 +514,8 @@ idroptarget_dragenter (LPDROPTARGET This, GdkDrop *drop; GdkWin32Drop *drop_win32; GdkDisplay *display; - gint pt_x; - gint pt_y; + int pt_x; + int pt_y; GdkDrag *drag; GdkDragAction source_actions; GdkDragAction dest_actions; @@ -574,8 +574,8 @@ idroptarget_dragenter (LPDROPTARGET This, gboolean _gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState) { GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (drop); @@ -591,8 +591,8 @@ _gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop, void _gdk_win32_local_drop_target_dragover (GdkDrop *drop, GdkDrag *drag, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState, guint32 time_, GdkDragAction *actions) @@ -639,8 +639,8 @@ idroptarget_dragover (LPDROPTARGET This, { drop_target_context *ctx = (drop_target_context *) This; GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop); - gint pt_x = pt.x / drop_win32->scale + _gdk_offset_x; - gint pt_y = pt.y / drop_win32->scale + _gdk_offset_y; + int pt_x = pt.x / drop_win32->scale + _gdk_offset_x; + int pt_y = pt.y / drop_win32->scale + _gdk_offset_y; GdkDragAction source_actions; GdkDragAction dest_actions; @@ -743,8 +743,8 @@ idroptarget_drop (LPDROPTARGET This, { drop_target_context *ctx = (drop_target_context *) This; GdkWin32Drop *drop_win32 = GDK_WIN32_DROP (ctx->drop); - gint pt_x = pt.x / drop_win32->scale + _gdk_offset_x; - gint pt_y = pt.y / drop_win32->scale + _gdk_offset_y; + int pt_x = pt.x / drop_win32->scale + _gdk_offset_x; + int pt_y = pt.y / drop_win32->scale + _gdk_offset_y; GdkDragAction dest_action; GDK_NOTE (DND, g_print ("idroptarget_drop %p ", This)); @@ -930,7 +930,7 @@ close_it (gpointer data) static GdkWin32MessageFilterReturn gdk_dropfiles_filter (GdkWin32Display *display, MSG *msg, - gint *ret_valp, + int *ret_valp, gpointer data) { GdkSurface *window; @@ -939,7 +939,7 @@ gdk_dropfiles_filter (GdkWin32Display *display, GString *result; HANDLE hdrop; POINT pt; - gint nfiles, i; + int nfiles, i; gchar *fileName, *linkedFile; if (msg->message != WM_DROPFILES) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 377f4afbdf..0802fabdd3 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -100,9 +100,9 @@ #define SYNAPSIS_ICON_WINDOW_CLASS "SynTrackCursorWindowClass" static gboolean gdk_event_translate (MSG *msg, - gint *ret_valp); + int *ret_valp); static gboolean gdk_event_prepare (GSource *source, - gint *timeout); + int *timeout); static gboolean gdk_event_check (GSource *source); static gboolean gdk_event_dispatch (GSource *source, GSourceFunc callback, @@ -111,7 +111,7 @@ static gboolean gdk_event_dispatch (GSource *source, /* Private variable declarations */ -extern gint _gdk_input_ignore_core; +extern int _gdk_input_ignore_core; typedef struct { @@ -139,8 +139,8 @@ static GdkSurface *implicit_grab_surface = NULL; static GdkSurface *mouse_window = NULL; static GdkSurface *mouse_window_ignored_leave = NULL; -static gint current_x, current_y; -static gint current_root_x, current_root_y; +static int current_x, current_y; +static int current_root_x, current_root_y; static UINT got_gdk_events_message; static HWND modal_win32_dialog = NULL; @@ -250,7 +250,7 @@ inner_window_procedure (HWND hwnd, { MSG msg; DWORD pos; - gint ret_val = 0; + int ret_val = 0; msg.hwnd = hwnd; msg.message = message; @@ -687,10 +687,10 @@ get_active_group (void) return _gdk_win32_keymap_get_active_group (keymap); } -static gint +static int build_pointer_event_state (MSG *msg) { - gint state; + int state; state = 0; @@ -912,7 +912,7 @@ _gdk_win32_append_event (GdkEvent *event) static GdkWin32MessageFilterReturn apply_message_filters (GdkDisplay *display, MSG *msg, - gint *ret_valp, + int *ret_valp, GList **filters) { GdkWin32MessageFilterReturn result = GDK_WIN32_MESSAGE_FILTER_CONTINUE; @@ -1324,7 +1324,7 @@ _gdk_win32_hrgn_to_region (HRGN hrgn, RGNDATA *rgndata; RECT *rects; cairo_region_t *result; - gint nbytes; + int nbytes; guint i; if ((nbytes = GetRegionData (hrgn, 0, NULL)) == 0) @@ -1364,7 +1364,7 @@ _gdk_win32_hrgn_to_region (HRGN hrgn, static void adjust_drag (LONG *drag, LONG curr, - gint inc) + int inc) { if (*drag > curr) *drag = curr + ((*drag + inc/2 - curr) / inc) * inc; @@ -1482,7 +1482,7 @@ handle_nchittest (HWND hwnd, GdkSurface *window, gint16 screen_x, gint16 screen_y, - gint *ret_valp) + int *ret_valp) { RECT rect; GdkWin32Surface *impl; @@ -1569,7 +1569,7 @@ handle_dpi_changed (GdkSurface *window, static void generate_button_event (GdkEventType type, - gint button, + int button, GdkSurface *window, MSG *msg) { @@ -1820,7 +1820,7 @@ ensure_stacking_on_activate_app (MSG *msg, } static gboolean -handle_wm_sysmenu (GdkSurface *window, MSG *msg, gint *ret_valp) +handle_wm_sysmenu (GdkSurface *window, MSG *msg, int *ret_valp) { GdkWin32Surface *impl; LONG_PTR style, tmp_style; @@ -2006,8 +2006,8 @@ _gdk_win32_surface_fill_min_max_info (GdkSurface *window, GDK_BUTTON5_MASK) static gboolean -gdk_event_translate (MSG *msg, - gint *ret_valp) +gdk_event_translate (MSG *msg, + int *ret_valp) { RECT rect, *drag, orig_drag; POINT point; @@ -2021,7 +2021,7 @@ gdk_event_translate (MSG *msg, GdkEvent *event; wchar_t wbuf[100]; - gint ccount; + int ccount; GdkDisplay *display; GdkSurface *window = NULL; @@ -2036,7 +2036,7 @@ gdk_event_translate (MSG *msg, GdkDeviceGrabInfo *pointer_grab = NULL; GdkSurface *grab_window = NULL; - gint button; + int button; gchar buf[256]; gboolean return_val = FALSE; @@ -2308,7 +2308,7 @@ gdk_event_translate (MSG *msg, { if (both_shift_pressed[0] != 0 && both_shift_pressed[1] != 0) { - gint tmp_retval; + int tmp_retval; MSG fake_release = *msg; int pressed_shift = msg->lParam & 0xffffff; @@ -2508,7 +2508,7 @@ gdk_event_translate (MSG *msg, if (pointer_grab == NULL && implicit_grab_surface != NULL) { - gint state = build_pointer_event_state (msg); + int state = build_pointer_event_state (msg); /* We keep the implicit grab until no buttons at all are held down */ if ((state & GDK_ANY_BUTTON_MASK & ~(GDK_BUTTON1_MASK << (button - 1))) == 0) @@ -3602,7 +3602,7 @@ _gdk_win32_display_queue_events (GdkDisplay *display) static gboolean gdk_event_prepare (GSource *source, - gint *timeout) + int *timeout) { GdkWin32EventSource *event_source = (GdkWin32EventSource *)source; gboolean retval; diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c index 965f04a46a..9aee9b2391 100644 --- a/gdk/win32/gdkglcontext-win32.c +++ b/gdk/win32/gdkglcontext-win32.c @@ -276,17 +276,17 @@ _get_dummy_window_hwnd (GdkWGLDummy *dummy) NULL); } -static gint +static int _gdk_init_dummy_context (GdkWGLDummy *dummy); #define PIXEL_ATTRIBUTES 17 -static gint +static int _get_wgl_pfd (HDC hdc, PIXELFORMATDESCRIPTOR *pfd, GdkWin32Display *display) { - gint best_pf = 0; + int best_pf = 0; pfd->nSize = sizeof (PIXELFORMATDESCRIPTOR); @@ -294,9 +294,9 @@ _get_wgl_pfd (HDC hdc, { GdkWGLDummy dummy; UINT num_formats; - gint colorbits = GetDeviceCaps (hdc, BITSPIXEL); + int colorbits = GetDeviceCaps (hdc, BITSPIXEL); guint extra_fields = 1; - gint i = 0; + int i = 0; int pixelAttribs[PIXEL_ATTRIBUTES]; /* Save up the HDC and HGLRC that we are currently using, to restore back to it when we are done here */ @@ -384,12 +384,12 @@ _get_wgl_pfd (HDC hdc, /* in WGL, for many OpenGL items, we need a dummy WGL context, so create * one and cache it for later use */ -static gint +static int _gdk_init_dummy_context (GdkWGLDummy *dummy) { PIXELFORMATDESCRIPTOR pfd; gboolean set_pixel_format_result = FALSE; - gint best_idx = 0; + int best_idx = 0; _get_dummy_window_hwnd (dummy); @@ -419,7 +419,7 @@ static gboolean _gdk_win32_display_init_gl (GdkDisplay *display) { GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display); - gint best_idx = 0; + int best_idx = 0; GdkWGLDummy dummy; if (display_win32->have_wgl) @@ -628,7 +628,7 @@ gl_fail: static gboolean _set_pixformat_for_hdc (HDC hdc, - gint *best_idx, + int *best_idx, GdkWin32Display *display) { PIXELFORMATDESCRIPTOR pfd; @@ -658,13 +658,13 @@ gdk_win32_gl_context_realize (GdkGLContext *context, /* These are the real WGL context items that we will want to use later */ HGLRC hglrc; - gint pixel_format; + int pixel_format; gboolean debug_bit, compat_bit, legacy_bit; /* request flags and specific versions for core (3.2+) WGL context */ - gint flags = 0; - gint glver_major = 0; - gint glver_minor = 0; + int flags = 0; + int glver_major = 0; + int glver_minor = 0; GdkSurface *surface = gdk_gl_context_get_surface (context); GdkWin32Surface *impl = GDK_WIN32_SURFACE (surface); @@ -870,8 +870,8 @@ _gdk_win32_display_make_gl_context_current (GdkDisplay *display, */ gboolean gdk_win32_display_get_wgl_version (GdkDisplay *display, - gint *major, - gint *minor) + int *major, + int *minor) { g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c index 12e228be2c..1904876a12 100644 --- a/gdk/win32/gdkglobals-win32.c +++ b/gdk/win32/gdkglobals-win32.c @@ -30,20 +30,20 @@ GdkDisplay *_gdk_display = NULL; GdkDeviceManagerWin32 *_gdk_device_manager = NULL; -gint _gdk_offset_x, _gdk_offset_y; +int _gdk_offset_x, _gdk_offset_y; HDC _gdk_display_hdc; HINSTANCE _gdk_dll_hinstance; HINSTANCE _gdk_app_hmodule; -gint _gdk_input_ignore_core; +int _gdk_input_ignore_core; HKL _gdk_input_locale; gboolean _gdk_input_locale_is_ime = FALSE; UINT _gdk_input_codepage; -gint _gdk_input_ignore_wintab = FALSE; -gint _gdk_max_colors = 0; +int _gdk_input_ignore_wintab = FALSE; +int _gdk_max_colors = 0; GdkWin32ModalOpKind _modal_operation_in_progress = GDK_WIN32_MODAL_OP_NONE; HWND _modal_move_resize_window = NULL; @@ -51,4 +51,4 @@ HWND _modal_move_resize_window = NULL; /* The singleton clipdrop object pointer */ GdkWin32Clipdrop *_win32_clipdrop = NULL; -GThread *_win32_main_thread = NULL;
\ No newline at end of file +GThread *_win32_main_thread = NULL; diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index 972008492d..976003aea3 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -225,11 +225,11 @@ gdk_win32_keymap_finalize (GObject *object) static void print_keysym_tab (GdkWin32Keymap *keymap) { - gint li; + int li; GdkWin32KeyGroupOptions *options; - gint vk; + int vk; GdkWin32KeyLevelState level; - gint group_size = keymap->layout_handles->len; + int group_size = keymap->layout_handles->len; for (li = 0; li < group_size; li++) { @@ -258,7 +258,7 @@ print_keysym_tab (GdkWin32Keymap *keymap) static void handle_special (guint vk, guint *ksymp, - gint shift) + int shift) { switch (vk) @@ -554,9 +554,9 @@ _gdk_win32_keymap_get_decimal_mark (GdkWin32Keymap *keymap) } static gboolean -layouts_are_the_same (GArray *array, HKL *hkls, gint hkls_len) +layouts_are_the_same (GArray *array, HKL *hkls, int hkls_len) { - gint i; + int i; if (hkls_len != array->len) return FALSE; @@ -591,7 +591,7 @@ check_that_active_layout_is_in_sync (GdkWin32Keymap *keymap) } } -static gint +static int sort_key_nodes_by_gdk_keyval (gconstpointer a, gconstpointer b) { @@ -619,11 +619,11 @@ update_keymap (GdkKeymap *gdk_keymap) static HKL *hkls = NULL; gboolean no_list; static guint current_serial = 0; - gint i, group; + int i, group; GdkWin32KeyLevelState level; GdkWin32KeyGroupOptions *options; GdkWin32Keymap *keymap = GDK_WIN32_KEYMAP (gdk_keymap); - gint keysym_tab_size; + int keysym_tab_size; guchar key_state[KEY_STATE_SIZE]; guint scancode; @@ -760,7 +760,7 @@ update_keymap (GdkKeymap *gdk_keymap) ((vk == VK_DECIMAL) && (level == GDK_WIN32_LEVEL_NONE))) { wchar_t wcs[10]; - gint k; + int k; guint keysym; GdkWin32KeyNode dead_key; @@ -855,7 +855,7 @@ update_keymap (GdkKeymap *gdk_keymap) for (i = 0; i < options->dead_keys->len; i++) { wchar_t wcs[10]; - gint k; + int k; GdkWin32KeyNode *dead_key; GdkWin32KeyNode combo; @@ -1027,7 +1027,7 @@ gdk_win32_keymap_check_compose (GdkWin32Keymap *keymap, guint16 *output, gsize *output_len) { - gint partial_match; + int partial_match; guint8 active_group; gsize deadkey_i, node_i; GdkWin32KeyNode *dead_key; @@ -1149,7 +1149,7 @@ _gdk_win32_keymap_set_active_layout (GdkWin32Keymap *keymap, if (keymap != NULL && keymap->layout_handles->len > 0) { - gint group; + int group; for (group = 0; group < keymap->layout_handles->len; group++) if (g_array_index (keymap->layout_handles, HKL, group) == hkl) @@ -1235,7 +1235,7 @@ gdk_win32_keymap_have_bidi_layouts (GdkKeymap *gdk_keymap) GdkWin32Keymap *keymap; gboolean have_rtl = FALSE; gboolean have_ltr = FALSE; - gint group; + int group; GdkKeymap *default_keymap = gdk_display_get_keymap (gdk_display_get_default ()); if (gdk_keymap == NULL || gdk_keymap != default_keymap) @@ -1294,7 +1294,7 @@ gdk_win32_keymap_get_entries_for_keyval (GdkKeymap *gdk_keymap, /* Accept only the default keymap */ if (gdk_keymap == NULL || gdk_keymap == default_keymap) { - gint vk; + int vk; GdkWin32Keymap *keymap; if (gdk_keymap == NULL) @@ -1306,7 +1306,7 @@ gdk_win32_keymap_get_entries_for_keyval (GdkKeymap *gdk_keymap, for (vk = 0; vk < KEY_STATE_SIZE; vk++) { - gint group; + int group; for (group = 0; group < keymap->layout_handles->len; group++) { @@ -1356,11 +1356,11 @@ gdk_win32_keymap_get_entries_for_keycode (GdkKeymap *gdk_keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { GArray *key_array; GArray *keyval_array; - gint group; + int group; GdkWin32Keymap *keymap; GdkKeymap *default_keymap = gdk_display_get_keymap (gdk_display_get_default ()); @@ -1483,10 +1483,10 @@ static gboolean gdk_win32_keymap_translate_keyboard_state (GdkKeymap *gdk_keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers) { GdkWin32Keymap *keymap; diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index 4c9f5e7456..ea71f046b3 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -170,7 +170,7 @@ _gdk_win32_print_system_palette (void) g_free (pe); } -static gint +static int palette_size (HPALETTE hpal) { WORD npal = 0; @@ -185,7 +185,7 @@ void _gdk_win32_print_hpalette (HPALETTE hpal) { PALETTEENTRY *pe; - gint n, npal; + int n, npal; npal = palette_size (hpal); pe = g_new (PALETTEENTRY, npal); diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c index 1a6d571d0d..4171965fc7 100644 --- a/gdk/win32/gdkmonitor-win32.c +++ b/gdk/win32/gdkmonitor-win32.c @@ -396,7 +396,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors) UINT32 dispconf_path_count; fixedDISPLAYCONFIG_PATH_INFO *dispconf_paths; DISPLAYCONFIG_MODE_INFO *dispconf_modes; - gint path_index; + int path_index; user32 = LoadLibraryA ("user32.dll"); @@ -453,7 +453,7 @@ populate_monitor_devices_from_display_config (GPtrArray *monitors) for (path_index = 0; path_index < dispconf_path_count; path_index++) { fixedDISPLAYCONFIG_TARGET_DEVICE_NAME tdn; - gint i; + int i; GdkWin32Monitor *w32mon; GdkMonitor *mon; gchar *path, *path_lower; @@ -742,7 +742,7 @@ enum_monitor (HMONITOR hmonitor, static void prune_monitors (EnumMonitorData *data) { - gint i; + int i; for (i = 0; i < data->monitors->len; i++) { @@ -759,7 +759,7 @@ GPtrArray * _gdk_win32_display_get_monitor_list (GdkWin32Display *win32_display) { EnumMonitorData data; - gint i; + int i; data.display = win32_display; data.monitors = get_monitor_devices (win32_display); diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h index e9d92d0df6..86c0157369 100644 --- a/gdk/win32/gdkprivate-win32.h +++ b/gdk/win32/gdkprivate-win32.h @@ -163,22 +163,22 @@ gulong _gdk_win32_get_next_tick (gulong suggested_tick); void _gdk_surface_init_position (GdkSurface *window); void _gdk_surface_move_resize_child (GdkSurface *window, - gint x, - gint y, - gint width, - gint height); + int x, + int y, + int width, + int height); gboolean _gdk_win32_surface_enable_transparency (GdkSurface *window); /* GdkSurfaceImpl methods */ void _gdk_win32_surface_scroll (GdkSurface *window, - gint dx, - gint dy); + int dx, + int dy); void _gdk_win32_surface_move_region (GdkSurface *window, const cairo_region_t *region, - gint dx, - gint dy); + int dx, + int dy); void _gdk_win32_selection_init (void); @@ -189,8 +189,8 @@ void gdk_win32_handle_table_insert (HANDLE *handle, void gdk_win32_handle_table_remove (HANDLE handle); HRGN _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region, - gint x_origin, - gint y_origin); + int x_origin, + int y_origin); cairo_region_t *_gdk_win32_hrgn_to_region (HRGN hrgn, guint scale); @@ -270,13 +270,13 @@ extern GdkDeviceManagerWin32 *_gdk_device_manager; * to the left and/or above the primary monitor) to get GDK * coordinates, which should be non-negative on the whole screen. */ -extern gint _gdk_offset_x, _gdk_offset_y; +extern int _gdk_offset_x, _gdk_offset_y; extern HDC _gdk_display_hdc; extern HINSTANCE _gdk_dll_hinstance; extern HINSTANCE _gdk_app_hmodule; -extern gint _gdk_input_ignore_core; +extern int _gdk_input_ignore_core; /* These are thread specific, but GDK/win32 works OK only when invoked * from a single thread anyway. @@ -316,15 +316,15 @@ void _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind); /* Options */ extern gboolean _gdk_input_ignore_wintab; -extern gint _gdk_max_colors; +extern int _gdk_max_colors; /* Convert a pixbuf to an HICON (or HCURSOR). Supports alpha under * Windows XP, thresholds alpha otherwise. */ HICON _gdk_win32_texture_to_hicon (GdkTexture *texture); HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf, - gint x_hotspot, - gint y_hotspot); + int x_hotspot, + int y_hotspot); void _gdk_win32_display_init_cursors (GdkWin32Display *display); void _gdk_win32_display_finalize_cursors (GdkWin32Display *display); @@ -351,14 +351,14 @@ typedef struct _Win32Cursor Win32Cursor; struct _Win32Cursor { GdkWin32CursorLoadType load_type; gunichar2 *resource_name; - gint width; - gint height; + int width; + int height; guint load_flags; - gint xcursor_number; + int xcursor_number; }; Win32CursorTheme *win32_cursor_theme_load (const gchar *name, - gint size); + int size); Win32Cursor * win32_cursor_theme_get_cursor (Win32CursorTheme *theme, const gchar *name); void win32_cursor_theme_destroy (Win32CursorTheme *theme); @@ -420,8 +420,8 @@ gboolean _gdk_win32_get_window_rect (GdkSurface *window, void _gdk_win32_do_emit_configure_event (GdkSurface *window, RECT rect); void gdk_win32_surface_do_move_resize_drag (GdkSurface *window, - gint x, - gint y); + int x, + int y); void gdk_win32_surface_end_move_resize_drag (GdkSurface *window); gboolean _gdk_win32_surface_fill_min_max_info (GdkSurface *window, MINMAXINFO *mmi); diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c index 7fbf644b5e..a5c9ade81a 100644 --- a/gdk/win32/gdkproperty-win32.c +++ b/gdk/win32/gdkproperty-win32.c @@ -40,7 +40,7 @@ _get_system_font_name (HDC hdc) PangoFontDescription *font_desc; gchar *result, *font_desc_string; int logpixelsy; - gint font_size; + int font_size; ncm.cbSize = sizeof(NONCLIENTMETRICSW); if (!SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0)) @@ -107,21 +107,21 @@ _gdk_win32_get_setting (const gchar *name, */ if (strcmp ("gtk-double-click-time", name) == 0) { - gint i = GetDoubleClickTime (); + int i = GetDoubleClickTime (); GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i)); g_value_set_int (value, i); return TRUE; } else if (strcmp ("gtk-double-click-distance", name) == 0) { - gint i = MAX(GetSystemMetrics (SM_CXDOUBLECLK), GetSystemMetrics (SM_CYDOUBLECLK)); + int i = MAX(GetSystemMetrics (SM_CXDOUBLECLK), GetSystemMetrics (SM_CYDOUBLECLK)); GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i)); g_value_set_int (value, i); return TRUE; } else if (strcmp ("gtk-dnd-drag-threshold", name) == 0) { - gint i = MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG)); + int i = MAX(GetSystemMetrics (SM_CXDRAG), GetSystemMetrics (SM_CYDRAG)); GDK_NOTE(MISC, g_print("gdk_display_get_setting(\"%s\") : %d\n", name, i)); g_value_set_int (value, i); return TRUE; diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 3b26a475ab..428311904b 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -211,10 +211,10 @@ gdk_surface_win32_finalize (GObject *object) void _gdk_win32_get_window_client_area_rect (GdkSurface *window, - gint scale, + int scale, RECT *rect) { - gint x, y, width, height; + int x, y, width, height; x = y = 0; width = gdk_surface_get_width (window); @@ -488,10 +488,10 @@ _gdk_win32_display_create_surface (GdkDisplay *display, GdkSurface *surface; const gchar *title; wchar_t *wtitle; - gint window_width, window_height; - gint window_x, window_y; - gint offset_x = 0, offset_y = 0; - gint real_x = 0, real_y = 0; + int window_width, window_height; + int window_x, window_y; + int offset_x = 0, offset_y = 0; + int real_x = 0, real_y = 0; GdkFrameClock *frame_clock; g_return_val_if_fail (display == _gdk_display, NULL); @@ -750,8 +750,8 @@ gdk_win32_surface_destroy_notify (GdkSurface *window) static void get_outer_rect (GdkSurface *window, - gint width, - gint height, + int width, + int height, RECT *rect) { GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); @@ -765,16 +765,16 @@ get_outer_rect (GdkSurface *window, static void adjust_for_gravity_hints (GdkSurface *window, - RECT *outer_rect, - gint *x, - gint *y) + RECT *outer_rect, + int *x, + int *y) { GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); if (impl->hint_flags & GDK_HINT_WIN_GRAVITY) { #ifdef G_ENABLE_DEBUG - gint orig_x = *x, orig_y = *y; + int orig_x = *x, orig_y = *y; #endif switch (impl->hints.win_gravity) @@ -1106,7 +1106,7 @@ gdk_win32_surface_hide (GdkSurface *window) static void gdk_win32_surface_do_move (GdkSurface *window, - gint x, gint y) + int x, int y) { RECT outer_rect; GdkWin32Surface *impl; @@ -1143,7 +1143,7 @@ gdk_win32_surface_do_move (GdkSurface *window, void gdk_win32_surface_resize (GdkSurface *window, - gint width, gint height) + int width, int height) { RECT outer_rect; @@ -1182,10 +1182,10 @@ gdk_win32_surface_resize (GdkSurface *window, static void gdk_win32_surface_do_move_resize (GdkSurface *window, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { RECT outer_rect; GdkWin32Surface *impl; @@ -1233,10 +1233,10 @@ gdk_win32_surface_do_move_resize (GdkSurface *window, static void gdk_win32_surface_move_resize_internal (GdkSurface *window, gboolean with_move, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { GdkWin32Surface *surface = GDK_WIN32_SURFACE (window); @@ -1271,18 +1271,18 @@ gdk_win32_surface_move_resize_internal (GdkSurface *window, void gdk_win32_surface_move_resize (GdkSurface *window, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { gdk_win32_surface_move_resize_internal (window, TRUE, x, y, width, height); } void gdk_win32_surface_move (GdkSurface *surface, - gint x, - gint y) + int x, + int y) { gdk_win32_surface_move_resize_internal (surface, TRUE, x, y, -1, -1); } @@ -1706,10 +1706,10 @@ _gdk_modal_current (void) static void gdk_win32_surface_get_geometry (GdkSurface *window, - gint *x, - gint *y, - gint *width, - gint *height) + int *x, + int *y, + int *width, + int *height) { if (!GDK_SURFACE_DESTROYED (window)) { @@ -1772,13 +1772,13 @@ gdk_win32_surface_get_geometry (GdkSurface *window, static void gdk_win32_surface_get_root_coords (GdkSurface *window, - gint x, - gint y, - gint *root_x, - gint *root_y) + int x, + int y, + int *root_x, + int *root_y) { - gint tx; - gint ty; + int tx; + int ty; POINT pt; GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); @@ -2051,10 +2051,10 @@ calculate_aerosnap_regions (GdkW32DragMoveResizeContext *context) { GdkDisplay *display; GListModel *monitors; - gint monitor_idx, other_monitor_idx; + int monitor_idx, other_monitor_idx; GdkWin32Surface *impl = GDK_WIN32_SURFACE (context->window); #if defined(MORE_AEROSNAP_DEBUGGING) - gint i; + int i; #endif display = gdk_display_get_default (); @@ -2072,8 +2072,8 @@ calculate_aerosnap_regions (GdkW32DragMoveResizeContext *context) AeroSnapEdgeRegion snap_region; gboolean move_edge[4] = { TRUE, FALSE, TRUE, TRUE }; gboolean resize_edge[2] = { TRUE, TRUE }; - gint diff; - gint thickness, trigger_thickness; + int diff; + int thickness, trigger_thickness; GdkMonitor *monitor; monitor = g_list_model_get_item (monitors, monitor_idx); @@ -2306,9 +2306,9 @@ static void stash_window (GdkSurface *window, GdkWin32Surface *impl) { - gint x, y; - gint width, wwidth; - gint height, wheight; + int x, y; + int width, wwidth; + int height, wheight; WINDOWPLACEMENT placement; HMONITOR hmonitor; MONITORINFO hmonitor_info; @@ -2379,8 +2379,8 @@ static void snap_up (GdkSurface *window) { SHORT maxysize; - gint x, y; - gint width, height; + int x, y; + int width, height; GdkWin32Surface *impl; impl = GDK_WIN32_SURFACE (window); @@ -2475,7 +2475,7 @@ _gdk_win32_surface_handle_aerosnap (GdkSurface *window, GdkWin32Surface *impl; GdkDisplay *display; GListModel *monitors; - gint n_monitors; + int n_monitors; GdkSurfaceState surface_state = gdk_toplevel_get_state (GDK_TOPLEVEL (window)); gboolean minimized = surface_state & GDK_SURFACE_STATE_MINIMIZED; gboolean maximized = surface_state & GDK_SURFACE_STATE_MAXIMIZED; @@ -2563,7 +2563,7 @@ _gdk_win32_surface_handle_aerosnap (GdkSurface *window, else if (impl->snap_state == GDK_WIN32_AEROSNAP_STATE_HALFRIGHT) { GdkMonitor *other; - gint i; + int i; unsnap (window, monitor); for (i = 0; i < n_monitors; i++) @@ -2695,8 +2695,8 @@ ensure_snap_indicator_exists (GdkW32DragMoveResizeContext *context) static gboolean ensure_snap_indicator_surface (GdkW32DragMoveResizeContext *context, - gint width, - gint height, + int width, + int height, guint scale) { if (context->indicator_surface != NULL && @@ -2731,7 +2731,7 @@ adjust_indicator_rectangle (GdkRectangle *rect, gboolean inward) { gdouble inverter; - const gint gap = AEROSNAP_INDICATOR_EDGE_GAP; + const int gap = AEROSNAP_INDICATOR_EDGE_GAP; #if defined(MORE_AEROSNAP_DEBUGGING) GdkRectangle cache = *rect; #endif @@ -2755,10 +2755,10 @@ adjust_indicator_rectangle (GdkRectangle *rect, static void rounded_rectangle (cairo_t *cr, - gint x, - gint y, - gint width, - gint height, + int x, + int y, + int width, + int height, gdouble radius, gdouble line_width, GdkRGBA *fill, @@ -3194,8 +3194,8 @@ get_monitor_at_point (GdkDisplay *display, static void start_indicator (GdkSurface *window, GdkW32DragMoveResizeContext *context, - gint x, - gint y, + int x, + int y, GdkWin32AeroSnapState state) { GdkMonitor *monitor; @@ -3266,12 +3266,12 @@ stop_indicator (GdkSurface *window, SWP_NOSIZE | SWP_NOREDRAW | SWP_HIDEWINDOW | SWP_NOACTIVATE)); } -static gint -point_in_aerosnap_region (gint x, - gint y, +static int +point_in_aerosnap_region (int x, + int y, AeroSnapEdgeRegion *region) { - gint edge, trigger; + int edge, trigger; edge = (x >= region->edge.x && y >= region->edge.y && @@ -3287,15 +3287,15 @@ point_in_aerosnap_region (gint x, static void handle_aerosnap_move_resize (GdkSurface *window, GdkW32DragMoveResizeContext *context, - gint x, - gint y) + int x, + int y) { - gint i; + int i; AeroSnapEdgeRegion *reg; - gint maximize = 0; - gint halfleft = 0; - gint halfright = 0; - gint fullup = 0; + int maximize = 0; + int halfleft = 0; + int halfright = 0; + int fullup = 0; gboolean fullup_edge = FALSE; if (context->op == GDK_WIN32_DRAGOP_RESIZE) @@ -3505,9 +3505,9 @@ setup_drag_move_resize_context (GdkSurface *window, GdkW32WindowDragOp op, GdkSurfaceEdge edge, GdkDevice *device, - gint button, - gint x, - gint y, + int button, + int x, + int y, guint32 timestamp) { RECT rect; @@ -3515,7 +3515,7 @@ setup_drag_move_resize_context (GdkSurface *window, GdkSurface *pointer_window; GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); gboolean maximized = gdk_toplevel_get_state (GDK_TOPLEVEL (window)) & GDK_SURFACE_STATE_MAXIMIZED; - gint root_x, root_y; + int root_x, root_y; gdk_win32_surface_get_root_coords (window, x, y, &root_x, &root_y); @@ -3571,10 +3571,10 @@ setup_drag_move_resize_context (GdkSurface *window, impl->snap_state == GDK_WIN32_AEROSNAP_STATE_FULLUP)) { GdkMonitor *monitor; - gint wx, wy, wwidth, wheight; - gint swx, swy, swwidth, swheight; + int wx, wy, wwidth, wheight; + int swx, swy, swwidth, swheight; gboolean pointer_outside_of_window; - gint offsetx, offsety; + int offsetx, offsety; gboolean left_half; GdkDisplay *display; @@ -3632,8 +3632,8 @@ setup_drag_move_resize_context (GdkSurface *window, if (!pointer_outside_of_window && maximized) { WINDOWPLACEMENT placement; - gint unmax_width, unmax_height; - gint shadow_unmax_width, shadow_unmax_height; + int unmax_width, unmax_height; + int shadow_unmax_width, shadow_unmax_height; placement.length = sizeof (placement); API_CALL (GetWindowPlacement, (GDK_SURFACE_HWND (window), &placement)); @@ -3937,17 +3937,17 @@ _gdk_win32_update_layered_window_from_cache (GdkSurface *surface, void gdk_win32_surface_do_move_resize_drag (GdkSurface *window, - gint x, - gint y) + int x, + int y) { RECT rect; RECT new_rect; - gint diffy, diffx; + int diffy, diffx; MINMAXINFO mmi; GdkWin32Surface *impl; GdkW32DragMoveResizeContext *context; - gint width; - gint height; + int width; + int height; impl = GDK_WIN32_SURFACE (window); context = &impl->drag_move_resize_context; @@ -4289,7 +4289,7 @@ gdk_win32_surface_unmaximize (GdkSurface *window) static void gdk_win32_surface_fullscreen (GdkSurface *window) { - gint x, y, width, height; + int x, y, width, height; FullscreenInfo *fi; HMONITOR monitor; MONITORINFO mi; @@ -4465,7 +4465,7 @@ gdk_win32_surface_show_window_menu (GdkSurface *window, GdkEvent *event) { double event_x, event_y; - gint x, y; + int x, y; GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); switch ((int) event->event_type) @@ -4586,10 +4586,10 @@ GtkShowWindow (GdkSurface *window, static void gdk_win32_surface_set_shadow_width (GdkSurface *window, - gint left, - gint right, - gint top, - gint bottom) + int left, + int right, + int top, + int bottom) { GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); @@ -4614,7 +4614,7 @@ gdk_win32_surface_set_shadow_width (GdkSurface *window, } -gint +int _gdk_win32_surface_get_scale_factor (GdkSurface *window) { GdkDisplay *display; @@ -4663,8 +4663,8 @@ _gdk_win32_surface_get_scale_factor (GdkSurface *window) void _gdk_win32_surface_get_unscaled_size (GdkSurface *window, - gint *unscaled_width, - gint *unscaled_height) + int *unscaled_width, + int *unscaled_height) { GdkWin32Surface *impl = GDK_WIN32_SURFACE (window); diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h index c7bbba4858..84e7dbaee0 100644 --- a/gdk/win32/gdksurface-win32.h +++ b/gdk/win32/gdksurface-win32.h @@ -117,14 +117,14 @@ struct _GdkW32DragMoveResizeContext * The op will be canceled only when *this* button * is released. */ - gint button; + int button; /* Initial cursor position when the operation began. * Current cursor position is subtracted from it to find how far * to move window border(s). */ - gint start_root_x; - gint start_root_y; + int start_root_x; + int start_root_y; /* Initial window rectangle (position and size). * The window is resized/moved relative to this (see start_root_*). @@ -153,8 +153,8 @@ struct _GdkW32DragMoveResizeContext /* Used to draw the indicator */ cairo_surface_t *indicator_surface; - gint indicator_surface_width; - gint indicator_surface_height; + int indicator_surface_width; + int indicator_surface_height; /* Size/position of shape_indicator */ GdkRectangle indicator_window_rect; @@ -240,7 +240,7 @@ struct _GdkWin32Surface wchar_t leading_surrogate_keyup; /* Window size hints */ - gint hint_flags; + int hint_flags; GdkGeometry hints; /* Non-NULL for any window that is registered as a drop target. @@ -256,18 +256,18 @@ struct _GdkWin32Surface GdkSurface *transient_owner; GSList *transient_children; - gint num_transients; + int num_transients; gboolean changing_state; - gint initial_x; - gint initial_y; + int initial_x; + int initial_y; /* left/right/top/bottom width of the shadow/resize-grip around the window */ RECT margins; /* left+right and top+bottom from @margins */ - gint margins_x; - gint margins_y; + int margins_x; + int margins_y; /* Set to TRUE when GTK tells us that margins are 0 everywhere. * We don't actually set margins to 0, we just set this bit. @@ -304,8 +304,8 @@ struct _GdkWin32Surface * does not provide a way to query its size, * so we have to remember it ourselves. */ - gint dib_width; - gint dib_height; + int dib_width; + int dib_height; /* If the client wants uniformly-transparent window, * we remember the opacity value here and apply it @@ -348,9 +348,9 @@ struct _GdkWin32Surface LONG_PTR temp_styles; /* scale of window on HiDPI */ - gint surface_scale; - gint unscaled_width; - gint unscaled_height; + int surface_scale; + int unscaled_width; + int unscaled_height; }; struct _GdkWin32SurfaceClass @@ -362,10 +362,10 @@ GType _gdk_win32_surface_get_type (void); void _gdk_win32_surface_update_style_bits (GdkSurface *window); -gint _gdk_win32_surface_get_scale_factor (GdkSurface *window); +int _gdk_win32_surface_get_scale_factor (GdkSurface *window); void _gdk_win32_get_window_client_area_rect (GdkSurface *window, - gint scale, + int scale, RECT *rect); void _gdk_win32_update_layered_window_from_cache (GdkSurface *window, RECT *client_rect, @@ -374,18 +374,18 @@ void _gdk_win32_update_layered_window_from_cache (GdkSurface *window, gboolean do_paint); void gdk_win32_surface_move (GdkSurface *surface, - gint x, - gint y); + int x, + int y); void gdk_win32_surface_move_resize (GdkSurface *window, - gint x, - gint y, - gint width, - gint height); + int x, + int y, + int width, + int height); void gdk_win32_surface_get_queued_window_rect (GdkSurface *surface, - gint scale, + int scale, RECT *return_window_rect); void diff --git a/gdk/win32/gdkwin32display.h b/gdk/win32/gdkwin32display.h index 2f7af043be..6eebe6e76d 100644 --- a/gdk/win32/gdkwin32display.h +++ b/gdk/win32/gdkwin32display.h @@ -55,7 +55,7 @@ GType gdk_win32_display_get_type (void); GDK_AVAILABLE_IN_ALL void gdk_win32_display_set_cursor_theme (GdkDisplay *display, const gchar *name, - gint size); + int size); /** * GdkWin32MessageFilterReturn: @@ -88,7 +88,7 @@ typedef enum { */ typedef GdkWin32MessageFilterReturn (*GdkWin32MessageFilterFunc) (GdkWin32Display *display, MSG *message, - gint *return_value, + int *return_value, gpointer data); GDK_AVAILABLE_IN_ALL diff --git a/gdk/win32/gdkwin32dnd-private.h b/gdk/win32/gdkwin32dnd-private.h index 7fe9324466..c19a7deead 100644 --- a/gdk/win32/gdkwin32dnd-private.h +++ b/gdk/win32/gdkwin32dnd-private.h @@ -33,8 +33,8 @@ typedef struct _GdkWin32DragUtilityData GdkWin32DragUtilityData; */ struct _GdkWin32DragUtilityData { - gint last_x; /* Coordinates from last event, in GDK space */ - gint last_y; + int last_x; /* Coordinates from last event, in GDK space */ + int last_y; DWORD last_key_state; /* Key state from last event */ GdkWin32DndState state; }; @@ -74,10 +74,10 @@ struct _GdkWin32Drag GdkWin32DragUtilityData util_data; guint scale; /* Temporarily caches the HiDPI scale */ - gint hot_x; /* Hotspot offset from the top-left of the drag-window, scaled (can be added to GDK space coordinates) */ - gint hot_y; - gint start_x; /* Coordinates of the drag start, in GDK space */ - gint start_y; + int hot_x; /* Hotspot offset from the top-left of the drag-window, scaled (can be added to GDK space coordinates) */ + int hot_y; + int start_x; /* Coordinates of the drag start, in GDK space */ + int start_y; guint drag_status : 4; /* Current status of drag */ guint drop_failed : 1; /* Whether the drop was unsuccessful */ @@ -96,21 +96,21 @@ GdkDrag *_gdk_win32_find_drag_for_dest_window (HWND dest_window) GdkDrop *_gdk_win32_get_drop_for_dest_surface (GdkSurface *dest); gboolean _gdk_win32_local_drop_target_will_emit_motion (GdkDrop *drop, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState); void _gdk_win32_local_drop_target_dragenter (GdkDrag *drag, GdkSurface *dest_surface, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState, guint32 time_, GdkDragAction *actions); void _gdk_win32_local_drop_target_dragover (GdkDrop *drop, GdkDrag *drag, - gint x_root, - gint y_root, + int x_root, + int y_root, DWORD grfKeyState, guint32 time_, GdkDragAction *actions); diff --git a/gdk/win32/gdkwin32glcontext.h b/gdk/win32/gdkwin32glcontext.h index 6b55735a9d..825841a0bd 100644 --- a/gdk/win32/gdkwin32glcontext.h +++ b/gdk/win32/gdkwin32glcontext.h @@ -41,8 +41,8 @@ GType gdk_win32_gl_context_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL gboolean gdk_win32_display_get_wgl_version (GdkDisplay *display, - gint *major, - gint *minor); + int *major, + int *minor); G_END_DECLS diff --git a/gdk/win32/gdkwin32id.c b/gdk/win32/gdkwin32id.c index 8e62e9e34b..006e59fc7c 100644 --- a/gdk/win32/gdkwin32id.c +++ b/gdk/win32/gdkwin32id.c @@ -39,7 +39,7 @@ gdk_handle_hash (HANDLE *handle) #endif } -static gint +static int gdk_handle_equal (HANDLE *a, HANDLE *b) { diff --git a/gdk/win32/gdkwin32langnotification.c b/gdk/win32/gdkwin32langnotification.c index 94814ecd6a..2ea28e824f 100644 --- a/gdk/win32/gdkwin32langnotification.c +++ b/gdk/win32/gdkwin32langnotification.c @@ -28,7 +28,7 @@ struct _GdkWin32ALPNSink { ITfActiveLanguageProfileNotifySink itf_alpn_sink; - gint ref_count; + int ref_count; }; typedef struct _GdkWin32ALPNSink GdkWin32ALPNSink; diff --git a/gdk/win32/xcursors.h b/gdk/win32/xcursors.h index 4243a39f41..03e10d12e2 100644 --- a/gdk/win32/xcursors.h +++ b/gdk/win32/xcursors.h @@ -1,4 +1,4 @@ -static const struct { const gchar *name; const gchar *builtin; gint type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = { +static const struct { const gchar *name; const gchar *builtin; int type; guchar width; guchar height; guchar hotx; guchar hoty; gchar *data; } cursors[] = { { "X_cursor", NULL, 0, 16, 16, 7, 7, "\125\000\000\125\152\100\001\251\152\220\006\251\152\244\032\251" "\032\251\152\244\006\252\252\220\001\252\252\100\000\152\251\000" diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c index 1ef7697617..04433821de 100644 --- a/gdk/x11/gdkasync.c +++ b/gdk/x11/gdkasync.c @@ -78,7 +78,7 @@ struct _ChildInfoState guint current_child; guint n_children_found; - gint current_request; + int current_request; gboolean have_error; gboolean child_has_error; }; diff --git a/gdk/x11/gdkasync.h b/gdk/x11/gdkasync.h index f7be90fbff..009c2fae79 100644 --- a/gdk/x11/gdkasync.h +++ b/gdk/x11/gdkasync.h @@ -36,10 +36,10 @@ typedef void (*GdkRoundTripCallback) (GdkDisplay *display, struct _GdkChildInfoX11 { Window window; - gint x; - gint y; - gint width; - gint height; + int x; + int y; + int width; + int height; guint is_mapped : 1; guint has_wm_state : 1; guint window_class : 2; diff --git a/gdk/x11/gdkclipboard-x11.c b/gdk/x11/gdkclipboard-x11.c index bd46f24a15..af2434fbf4 100644 --- a/gdk/x11/gdkclipboard-x11.c +++ b/gdk/x11/gdkclipboard-x11.c @@ -141,7 +141,7 @@ static const struct { const char *mime_type; GInputStream * (* convert) (GdkX11Clipboard *, GInputStream *, const char *, int); const char *type; - gint format; + int format; } special_targets[] = { { "UTF8_STRING", "text/plain;charset=utf-8", no_convert, "UTF8_STRING", 8 }, { "COMPOUND_TEXT", "text/plain;charset=utf-8", text_list_convert, "COMPOUND_TEXT", 8 }, diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c index a050a70f7a..bb05c01baf 100644 --- a/gdk/x11/gdkcursor-x11.c +++ b/gdk/x11/gdkcursor-x11.c @@ -147,9 +147,9 @@ static const struct { static XcursorImage* create_cursor_image (GdkTexture *texture, - gint x, - gint y, - gint scale) + int x, + int y, + int scale) { XcursorImage *xcimage; @@ -187,7 +187,7 @@ gdk_x11_cursor_create_for_texture (GdkDisplay *display, static const gchar * name_fallback (const gchar *name) { - gint i; + int i; for (i = 0; i < G_N_ELEMENTS (name_map); i++) { @@ -241,7 +241,7 @@ static Cursor gdk_x11_cursor_create_for_name (GdkDisplay *display, const gchar *name) { - gint i; + int i; if (g_str_equal (name, "none")) return get_blank_cursor (display); @@ -280,12 +280,12 @@ gdk_x11_cursor_create_for_name (GdkDisplay *display, void gdk_x11_display_set_cursor_theme (GdkDisplay *display, const gchar *theme, - const gint size) + const int size) { #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2 Display *xdisplay; gchar *old_theme; - gint old_size; + int old_size; gpointer cursor, xcursor; GHashTableIter iter; diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c index fbc98b83a3..01736e6821 100644 --- a/gdk/x11/gdkdevice-xi2.c +++ b/gdk/x11/gdkdevice-xi2.c @@ -47,7 +47,7 @@ struct _GdkX11DeviceXI2 { GdkDevice parent_instance; - gint device_id; + int device_id; GArray *scroll_valuators; gdouble *last_axes; }; @@ -199,7 +199,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, { GdkDisplay *display; XIDeviceInfo *info; - gint i, j, ndevices; + int i, j, ndevices; Screen *xscreen; display = gdk_device_get_display (device); @@ -228,7 +228,7 @@ gdk_x11_device_xi2_get_state (GdkDevice *device, case GDK_AXIS_Y: case GDK_AXIS_IGNORE: { - gint root_x, root_y; + int root_x, root_y; /* FIXME: Maybe root coords caching should happen here */ gdk_surface_get_origin (surface, &root_x, &root_y); @@ -387,7 +387,7 @@ gdk_x11_device_xi2_grab (GdkDevice *device, XIEventMask mask; Window xwindow; Cursor xcursor; - gint status; + int status; display = gdk_device_get_display (device); device_manager_xi2 = GDK_X11_DEVICE_MANAGER_XI2 (GDK_X11_DISPLAY (display)->device_manager); @@ -498,7 +498,7 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice *device, } else { - gint width, height; + int width, height; GList *toplevels, *list; Window pointer_window; @@ -628,10 +628,10 @@ gdk_x11_device_xi2_surface_at_position (GdkDevice *device, guchar * _gdk_x11_device_xi2_translate_event_mask (GdkX11DeviceManagerXI2 *device_manager_xi2, GdkEventMask event_mask, - gint *len) + int *len) { guchar *mask; - gint minor; + int minor; g_object_get (device_manager_xi2, "minor", &minor, NULL); @@ -707,7 +707,7 @@ _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state, if (buttons_state) { - gint len, i; + int len, i; /* We're only interested in the first 3 buttons */ len = MIN (3, buttons_state->mask_len * 8); @@ -827,7 +827,7 @@ _gdk_device_xi2_unset_scroll_valuators (GdkX11DeviceXI2 *device) device->scroll_valuators->len); } -gint +int _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device) { g_return_val_if_fail (GDK_IS_X11_DEVICE_XI2 (device), 0); @@ -837,7 +837,7 @@ _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device) gdouble gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, - gint n_axis) + int n_axis) { if (n_axis >= gdk_device_get_n_axes (GDK_DEVICE (device))) return 0; @@ -851,7 +851,7 @@ gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, gdouble *axes, - gint n_axes) + int n_axes) { g_free (device->last_axes); diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c index 1478b9242a..5be86397e7 100644 --- a/gdk/x11/gdkdevicemanager-x11.c +++ b/gdk/x11/gdkdevicemanager-x11.c @@ -76,7 +76,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display) **/ GdkDevice * gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager, - gint device_id) + int device_id) { g_return_val_if_fail (GDK_IS_X11_DEVICE_MANAGER_XI2 (device_manager), NULL); @@ -92,7 +92,7 @@ gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager, * * Returns: the XInput2 device ID. **/ -gint +int gdk_x11_device_get_id (GdkDevice *device) { g_return_val_if_fail (GDK_IS_DEVICE (device), 0); diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c index de6feaad3d..ef63fb5c4d 100644 --- a/gdk/x11/gdkdevicemanager-xi2.c +++ b/gdk/x11/gdkdevicemanager-xi2.c @@ -88,9 +88,9 @@ struct _GdkX11DeviceManagerXI2 GList *devices; - gint opcode; - gint major; - gint minor; + int opcode; + int major; + int minor; }; struct _GdkX11DeviceManagerXI2Class @@ -211,7 +211,7 @@ translate_valuator_class (GdkDisplay *display, static gboolean initialized = FALSE; static Atom label_atoms [GDK_AXIS_LAST] = { 0 }; GdkAxisUse use = GDK_AXIS_IGNORE; - gint i; + int i; if (!initialized) { @@ -253,7 +253,7 @@ translate_device_classes (GdkDisplay *display, XIAnyClassInfo **classes, guint n_classes) { - gint i; + int i; g_object_freeze_notify (G_OBJECT (device)); @@ -317,7 +317,7 @@ static gboolean is_touch_device (XIAnyClassInfo **classes, guint n_classes, GdkInputSource *device_type, - gint *num_touches) + int *num_touches) { #ifdef XINPUT_2_2 guint i; @@ -473,7 +473,7 @@ create_device (GdkX11DeviceManagerXI2 *device_manager, GdkInputSource touch_source; GdkDeviceType type; GdkDevice *device; - gint num_touches = 0; + int num_touches = 0; gchar *vendor_id = NULL, *product_id = NULL; if (dev->use == XIMasterKeyboard || dev->use == XISlaveKeyboard) @@ -666,7 +666,7 @@ detach_from_seat (GdkDevice *device) static void remove_device (GdkX11DeviceManagerXI2 *device_manager, - gint device_id) + int device_id) { GdkDevice *device; @@ -893,7 +893,7 @@ handle_hierarchy_changed (GdkX11DeviceManagerXI2 *device_manager, Display *xdisplay; XIDeviceInfo *info; int ndevices; - gint i; + int i; display = device_manager->display; xdisplay = GDK_DISPLAY_XDISPLAY (display); @@ -1128,7 +1128,7 @@ handle_property_change (GdkX11DeviceManagerXI2 *device_manager, } static GdkCrossingMode -translate_crossing_mode (gint mode) +translate_crossing_mode (int mode) { switch (mode) { @@ -1149,7 +1149,7 @@ translate_crossing_mode (gint mode) } static GdkNotifyType -translate_notify_type (gint detail) +translate_notify_type (int detail) { switch (detail) { @@ -2025,7 +2025,7 @@ gdk_x11_device_manager_xi2_get_surface (GdkEventTranslator *translator, GdkDevice * _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *device_manager_xi2, - gint device_id) + int device_id) { return g_hash_table_lookup (device_manager_xi2->id_table, GINT_TO_POINTER (device_id)); diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index ca337066b8..ab9a1ee949 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -111,7 +111,7 @@ static GdkEvent * gdk_x11_display_translate_event (GdkEventTranslator *translato static void gdk_internal_connection_watch (Display *display, XPointer arg, - gint fd, + int fd, gboolean opening, XPointer *watch_data); @@ -119,8 +119,8 @@ typedef struct _GdkEventTypeX11 GdkEventTypeX11; struct _GdkEventTypeX11 { - gint base; - gint n_events; + int base; + int n_events; }; /* Note that we never *directly* use WM_LOCALE_NAME, WM_PROTOCOLS, @@ -441,7 +441,7 @@ gdk_check_wm_desktop_changed (GdkSurface *surface) GdkDisplay *display = GDK_SURFACE_DISPLAY (surface); Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; guchar *data; @@ -477,7 +477,7 @@ gdk_check_wm_state_changed (GdkSurface *surface) GdkX11Screen *screen = GDK_SURFACE_SCREEN (surface); Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; guchar *data; @@ -542,7 +542,7 @@ gdk_check_edge_constraints_changed (GdkSurface *surface) GdkDisplay *display = GDK_SURFACE_DISPLAY (surface); Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; guchar *data; @@ -923,8 +923,8 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator, !xevent->xconfigure.override_redirect && !GDK_SURFACE_DESTROYED (surface)) { - gint tx = 0; - gint ty = 0; + int tx = 0; + int ty = 0; Window child_window = 0; x = y = 0; @@ -1350,7 +1350,7 @@ set_sm_client_id (GdkDisplay *display, void gdk_display_setup_window_visual (GdkDisplay *display, - gint depth, + int depth, Visual *visual, Colormap colormap, gboolean rgba) @@ -1382,11 +1382,11 @@ gdk_x11_display_open (const gchar *display_name) Display *xdisplay; GdkDisplay *display; GdkX11Display *display_x11; - gint argc; + int argc; gchar *argv[1]; XClassHint *class_hint; - gint ignore; - gint maj, min; + int ignore; + int maj, min; char *cm_name; XInitThreads (); @@ -1549,8 +1549,8 @@ gdk_x11_display_open (const gchar *display_name) #ifdef HAVE_XKB { - gint xkb_major = XkbMajorVersion; - gint xkb_minor = XkbMinorVersion; + int xkb_major = XkbMajorVersion; + int xkb_minor = XkbMinorVersion; if (XkbLibraryVersion (&xkb_major, &xkb_minor)) { xkb_major = XkbMajorVersion; @@ -1665,7 +1665,7 @@ typedef struct _GdkInternalConnection GdkInternalConnection; struct _GdkInternalConnection { - gint fd; + int fd; GSource *source; Display *display; }; @@ -1723,7 +1723,7 @@ gdk_remove_connection_handler (GdkInternalConnection *connection) static void gdk_internal_connection_watch (Display *display, XPointer arg, - gint fd, + int fd, gboolean opening, XPointer *watch_data) { @@ -1779,7 +1779,7 @@ device_grab_update_callback (GdkDisplay *display, void _gdk_x11_display_update_grab_info (GdkDisplay *display, GdkDevice *device, - gint status) + int status) { if (status == GrabSuccess) _gdk_x11_roundtrip_async (display, device_grab_update_callback, device); @@ -2561,7 +2561,7 @@ gdk_x11_display_error_trap_push (GdkDisplay *display) g_slist_prepend (display_x11->error_traps, trap); } -static gint +static int gdk_x11_display_error_trap_pop_internal (GdkDisplay *display, gboolean need_code) { @@ -2649,7 +2649,7 @@ gdk_x11_display_error_trap_pop_internal (GdkDisplay *display, */ void gdk_x11_display_set_surface_scale (GdkDisplay *display, - gint scale) + int scale) { GdkX11Screen *x11_screen; gboolean need_reread_settings = FALSE; @@ -2694,7 +2694,7 @@ gdk_x11_display_set_surface_scale (GdkDisplay *display, * * Returns: X error code or 0 on success */ -gint +int gdk_x11_display_error_trap_pop (GdkDisplay *display) { g_return_val_if_fail (GDK_IS_X11_DISPLAY (display), Success); diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h index 39e9219d30..c3719e9ac5 100644 --- a/gdk/x11/gdkdisplay-x11.h +++ b/gdk/x11/gdkdisplay-x11.h @@ -48,7 +48,7 @@ struct _GdkX11Display GSource *event_source; - gint grab_count; + int grab_count; /* Visual infos for creating Windows */ int window_depth; @@ -56,7 +56,7 @@ struct _GdkX11Display Colormap window_colormap; /* Keyboard related information */ - gint xkb_event_type; + int xkb_event_type; gboolean use_xkb; /* Whether we were able to turn on detectable-autorepeat using @@ -69,14 +69,14 @@ struct _GdkX11Display guint keymap_serial; gboolean have_xfixes; - gint xfixes_event_base; + int xfixes_event_base; gboolean have_xcomposite; gboolean have_randr12; gboolean have_randr13; gboolean have_randr15; - gint xrandr_event_base; + int xrandr_event_base; /* If the SECURITY extension is in place, whether this client holds * a trusted authorization and so is allowed to make various requests @@ -120,16 +120,16 @@ struct _GdkX11Display guint have_shapes : 1; guint have_input_shapes : 1; - gint shape_event_base; + int shape_event_base; GSList *error_traps; - gint wm_moveresize_button; + int wm_moveresize_button; /* GLX information */ - gint glx_version; - gint glx_error_base; - gint glx_event_base; + int glx_version; + int glx_error_base; + int glx_event_base; /* Translation between X server time and system-local monotonic time */ gint64 server_time_query_time; @@ -152,8 +152,8 @@ struct _GdkX11Display guint has_async_glx_swap_buffers : 1; #ifdef HAVE_XDAMAGE - gint damage_event_base; - gint damage_error_base; + int damage_event_base; + int damage_error_base; guint have_damage; #endif }; diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index 5a08c3af64..5e8e03fccb 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -78,7 +78,7 @@ typedef enum typedef struct { guint32 xid; - gint x, y, width, height; + int x, y, width, height; gboolean mapped; gboolean shape_selected; gboolean shape_valid; @@ -90,7 +90,7 @@ struct _GdkSurfaceCache { GHashTable *child_hash; guint old_event_mask; GdkDisplay *display; - gint ref_count; + int ref_count; }; @@ -100,8 +100,8 @@ struct _GdkX11Drag GdkDragProtocol protocol; - gint start_x; /* Where the drag started */ - gint start_y; + int start_x; /* Where the drag started */ + int start_y; guint16 last_x; /* Coordinates from last event */ guint16 last_y; gulong timestamp; /* Timestamp we claimed the DND selection with */ @@ -118,8 +118,8 @@ struct _GdkX11Drag GdkDragAction actions; GdkDragAction current_action; - gint hot_x; - gint hot_y; + int hot_x; + int hot_y; Window dest_xid; /* The last window we looked up */ Window proxy_xid; /* The proxy window for dest_xid (or dest_xid if no proxying happens) */ @@ -136,8 +136,8 @@ struct _GdkX11DragClass }; typedef struct { - gint keysym; - gint modifiers; + int keysym; + int modifiers; } GrabKey; static GrabKey grab_keys[] = { @@ -186,14 +186,14 @@ gdk_x11_drag_init (GdkX11Drag *drag) static void gdk_x11_drag_finalize (GObject *object); static Window gdk_x11_drag_find_surface (GdkDrag *drag, GdkSurface *drag_surface, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragProtocol *protocol); static gboolean gdk_x11_drag_drag_motion (GdkDrag *drag, Window proxy_xid, GdkDragProtocol protocol, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragAction suggested_action, GdkDragAction possible_actions, guint32 time); @@ -201,8 +201,8 @@ static void gdk_x11_drag_drop (GdkDrag *drag, guint32 time_); static GdkSurface * gdk_x11_drag_get_drag_surface (GdkDrag *drag); static void gdk_x11_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y); + int hot_x, + int hot_y); static void gdk_x11_drag_drop_done (GdkDrag *drag, gboolean success); static void gdk_x11_drag_set_cursor (GdkDrag *drag, @@ -328,10 +328,10 @@ free_cache_child (GdkCacheChild *child, static void gdk_surface_cache_add (GdkSurfaceCache *cache, guint32 xid, - gint x, - gint y, - gint width, - gint height, + int x, + int y, + int width, + int height, gboolean mapped) { GdkCacheChild *child = g_new (GdkCacheChild, 1); @@ -531,7 +531,7 @@ gdk_surface_cache_new (GdkDisplay *display) GList *toplevel_windows, *list; GdkSurface *surface; GdkX11Surface *impl; - gint x, y, width, height; + int x, y, width, height; toplevel_windows = gdk_x11_display_get_toplevel_windows (display); for (list = toplevel_windows; list; list = list->next) @@ -649,8 +649,8 @@ gdk_surface_cache_get (GdkDisplay *display) static gboolean is_pointer_within_shape (GdkDisplay *display, GdkCacheChild *child, - gint x_pos, - gint y_pos) + int x_pos, + int y_pos) { if (!child->shape_selected) { @@ -696,8 +696,8 @@ static Window get_client_window_at_coords_recurse (GdkDisplay *display, Window win, gboolean is_toplevel, - gint x, - gint y) + int x, + int y) { GdkChildInfoX11 *children; unsigned int nchildren; @@ -749,8 +749,8 @@ get_client_window_at_coords_recurse (GdkDisplay *display, static Window get_client_window_at_coords (GdkSurfaceCache *cache, Window ignore, - gint x_root, - gint y_root) + int x_root, + int y_root) { GList *tmp_list; Window retval = None; @@ -815,14 +815,14 @@ static struct { { "XdndActionPrivate", GDK_ACTION_COPY }, }; -static const gint xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table); +static const int xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table); static GdkDragAction xdnd_action_from_atom (GdkDisplay *display, Atom xatom) { const char *name; - gint i; + int i; if (xatom == None) return 0; @@ -840,7 +840,7 @@ static Atom xdnd_action_to_atom (GdkDisplay *display, GdkDragAction action) { - gint i; + int i; for (i = 0; i < xdnd_n_actions; i++) if (action == xdnd_actions_table[i].action) @@ -938,8 +938,8 @@ xdnd_set_actions (GdkX11Drag *drag_x11) { GdkDrag *drag = GDK_DRAG (drag_x11); Atom *atomlist; - gint i; - gint n_atoms; + int i; + int n_atoms; guint actions; GdkDisplay *display = gdk_drag_get_display (drag); @@ -1143,8 +1143,8 @@ xdnd_send_drop (GdkX11Drag *drag_x11, static void xdnd_send_motion (GdkX11Drag *drag_x11, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragAction action, guint32 time) { @@ -1341,8 +1341,8 @@ drag_find_window_cache (GdkX11Drag *drag_x11, static Window gdk_x11_drag_find_surface (GdkDrag *drag, GdkSurface *drag_surface, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragProtocol *protocol) { GdkX11Screen *screen_x11; @@ -1406,8 +1406,8 @@ static gboolean gdk_x11_drag_drag_motion (GdkDrag *drag, Window proxy_xid, GdkDragProtocol protocol, - gint x_root, - gint y_root, + int x_root, + int y_root, GdkDragAction suggested_action, GdkDragAction possible_actions, guint32 time) @@ -1602,8 +1602,8 @@ gdk_x11_drag_get_drag_surface (GdkDrag *drag) static void gdk_x11_drag_set_hotspot (GdkDrag *drag, - gint hot_x, - gint hot_y) + int hot_x, + int hot_y) { GdkX11Drag *x11_drag = GDK_X11_DRAG (drag); @@ -1874,7 +1874,7 @@ drag_grab (GdkDrag *drag) GdkDisplay *display; Window root; GdkSeat *seat; - gint keycode, i; + int keycode, i; GdkCursor *cursor; if (!x11_drag->ipc_surface) @@ -1900,11 +1900,11 @@ drag_grab (GdkDrag *drag) for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) { - gint deviceid = gdk_x11_device_get_id (gdk_seat_get_keyboard (seat)); + int deviceid = gdk_x11_device_get_id (gdk_seat_get_keyboard (seat)); unsigned char mask[XIMaskLen(XI_LASTEVENT)]; XIGrabModifiers mods; XIEventMask evmask; - gint num_mods; + int num_mods; keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display), grab_keys[i].keysym); @@ -1946,7 +1946,7 @@ drag_ungrab (GdkDrag *drag) GdkDisplay *display; GdkDevice *keyboard; Window root; - gint keycode, i; + int keycode, i; if (!x11_drag->grab_seat) return; @@ -1961,7 +1961,7 @@ drag_ungrab (GdkDrag *drag) for (i = 0; i < G_N_ELEMENTS (grab_keys); ++i) { XIGrabModifiers mods; - gint num_mods; + int num_mods; keycode = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (display), grab_keys[i].keysym); @@ -2106,7 +2106,7 @@ gdk_x11_drag_drop_performed (GdkDrag *drag, static void gdk_drag_get_current_actions (GdkModifierType state, - gint button, + int button, GdkDragAction actions, GdkDragAction *suggested_action, GdkDragAction *possible_actions) @@ -2208,7 +2208,7 @@ gdk_dnd_handle_key_event (GdkDrag *drag, GdkX11Drag *x11_drag = GDK_X11_DRAG (drag); GdkModifierType state; GdkDevice *pointer; - gint dx, dy; + int dx, dy; dx = dy = 0; state = gdk_event_get_modifier_state (event); diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c index 68535043c2..628ac33d0e 100644 --- a/gdk/x11/gdkdrop-x11.c +++ b/gdk/x11/gdkdrop-x11.c @@ -280,14 +280,14 @@ static struct { { "XdndActionPrivate", GDK_ACTION_COPY }, }; -static const gint xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table); +static const int xdnd_n_actions = G_N_ELEMENTS (xdnd_actions_table); static GdkDragAction xdnd_action_from_atom (GdkDisplay *display, Atom xatom) { const char *name; - gint i; + int i; if (xatom == None) return 0; @@ -305,7 +305,7 @@ static Atom xdnd_action_to_atom (GdkDisplay *display, GdkDragAction action) { - gint i; + int i; for (i = 0; i < xdnd_n_actions; i++) if (action == xdnd_actions_table[i].action) @@ -343,7 +343,7 @@ gdk_x11_drop_read_actions (GdkDrop *drop) gulong nitems, after; guchar *data; Atom *atoms; - gint i; + int i; drag = gdk_drop_get_drag (drop); @@ -439,7 +439,7 @@ xdnd_enter_filter (GdkSurface *surface, GdkX11Drop *drop_x11; GdkDrag *drag; GdkSeat *seat; - gint i; + int i; Atom type; int format; gulong nitems, after; @@ -449,7 +449,7 @@ xdnd_enter_filter (GdkSurface *surface, GPtrArray *formats; Window source_window; gboolean get_types; - gint version; + int version; source_window = xevent->xclient.data.l[0]; get_types = ((xevent->xclient.data.l[1] & 1) != 0); diff --git a/gdk/x11/gdkeventsource.c b/gdk/x11/gdkeventsource.c index ad0d6e05ee..a5d17e232c 100644 --- a/gdk/x11/gdkeventsource.c +++ b/gdk/x11/gdkeventsource.c @@ -27,7 +27,7 @@ static gboolean gdk_event_source_prepare (GSource *source, - gint *timeout); + int *timeout); static gboolean gdk_event_source_check (GSource *source); static gboolean gdk_event_source_dispatch (GSource *source, GSourceFunc callback, @@ -340,7 +340,7 @@ gdk_check_xpending (GdkDisplay *display) static gboolean gdk_event_source_prepare (GSource *source, - gint *timeout) + int *timeout) { GdkDisplay *display = ((GdkEventSource*) source)->display; gboolean retval; @@ -488,7 +488,7 @@ gdk_x11_event_source_select_events (GdkEventSource *source, { unsigned int xmask = extra_x_mask; GList *list; - gint i; + int i; list = source->translators; diff --git a/gdk/x11/gdkglcontext-x11.c b/gdk/x11/gdkglcontext-x11.c index 0bd475908f..d3f6d7df42 100644 --- a/gdk/x11/gdkglcontext-x11.c +++ b/gdk/x11/gdkglcontext-x11.c @@ -1278,7 +1278,7 @@ get_cached_gl_visuals (GdkDisplay *display, int *system, int *rgba) { gboolean found; Atom type_return; - gint format_return; + int format_return; gulong nitems_return; gulong bytes_after_return; guchar *data = NULL; @@ -1521,8 +1521,8 @@ gdk_x11_display_make_gl_context_current (GdkDisplay *display, */ gboolean gdk_x11_display_get_glx_version (GdkDisplay *display, - gint *major, - gint *minor) + int *major, + int *minor) { g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE); diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 11ee46a4d2..dc4cd45e3c 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -63,10 +63,10 @@ struct _GdkX11Keymap { GdkKeymap parent_instance; - gint min_keycode; - gint max_keycode; + int min_keycode; + int max_keycode; KeySym* keymap; - gint keysyms_per_keycode; + int keysyms_per_keycode; XModifierKeymap* mod_keymap; guint lock_keysym; GdkModifierType group_switch_mask; @@ -176,7 +176,7 @@ update_modmap (Display *display, { NULL, 0, 0 } }; - gint i, j, k; + int i, j, k; if (!vmods[0].atom) for (i = 0; vmods[i].name; i++) @@ -254,17 +254,17 @@ get_xkb (GdkX11Keymap *keymap_x11) * otherwise we lose a whole group of keys */ #define KEYSYM_INDEX(keymap_impl, group, level) \ - (2 * ((group) % (gint)((keymap_impl->keysyms_per_keycode + 1) / 2)) + (level)) + (2 * ((group) % (int)((keymap_impl->keysyms_per_keycode + 1) / 2)) + (level)) #define KEYSYM_IS_KEYPAD(s) (((s) >= 0xff80 && (s) <= 0xffbd) || \ ((s) >= 0x11000000 && (s) <= 0x1100ffff)) -static gint +static int get_symbol (const KeySym *syms, GdkX11Keymap *keymap_x11, - gint group, - gint level) + int group, + int level) { - gint index; + int index; index = KEYSYM_INDEX(keymap_x11, group, level); if (index >= keymap_x11->keysyms_per_keycode) @@ -276,11 +276,11 @@ get_symbol (const KeySym *syms, static void set_symbol (KeySym *syms, GdkX11Keymap *keymap_x11, - gint group, - gint level, + int group, + int level, KeySym sym) { - gint index; + int index; index = KEYSYM_INDEX(keymap_x11, group, level); if (index >= keymap_x11->keysyms_per_keycode) @@ -302,9 +302,9 @@ update_keymaps (GdkX11Keymap *keymap_x11) if (keymap_x11->keymap == NULL || keymap_x11->current_serial != display_x11->keymap_serial) { - gint i; - gint map_size; - gint keycode; + int i; + int map_size; + int keycode; keymap_x11->current_serial = display_x11->keymap_serial; @@ -374,8 +374,8 @@ update_keymaps (GdkX11Keymap *keymap_x11) for (i = 0; i < map_size; i++) { /* Get the key code at this point in the map. */ - gint code = keymap_x11->mod_keymap->modifiermap[i]; - gint j; + int code = keymap_x11->mod_keymap->modifiermap[i]; + int j; KeySym *syms; guint mask; @@ -472,15 +472,15 @@ get_keymap (GdkX11Keymap *keymap_x11) #ifdef HAVE_XKB static PangoDirection get_direction (XkbDescRec *xkb, - gint group) + int group) { - gint code; + int code; - gint rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */ + int rtl_minus_ltr = 0; /* total number of RTL keysyms minus LTR ones */ for (code = xkb->min_key_code; code <= xkb->max_key_code; code++) { - gint level = 0; + int level = 0; KeySym sym = XkbKeySymEntry (xkb, code, level, group); PangoDirection dir = gdk_unichar_direction (gdk_keyval_to_unicode (sym)); @@ -511,7 +511,7 @@ get_direction (XkbDescRec *xkb, static PangoDirection get_direction_from_cache (GdkX11Keymap *keymap_x11, XkbDescPtr xkb, - gint group) + int group) { Atom group_atom = xkb->names->groups[group]; @@ -519,7 +519,7 @@ get_direction_from_cache (GdkX11Keymap *keymap_x11, DirectionCacheEntry *cache = keymap_x11->group_direction_cache; PangoDirection direction = PANGO_DIRECTION_NEUTRAL; - gint i; + int i; if (keymap_x11->have_direction) { @@ -550,7 +550,7 @@ get_direction_from_cache (GdkX11Keymap *keymap_x11, /* insert in cache */ if (!cache_hit) { - gint oldest = 0; + int oldest = 0; direction = get_direction (xkb, group); @@ -583,7 +583,7 @@ get_num_groups (GdkKeymap *keymap, static gboolean update_direction (GdkX11Keymap *keymap_x11, GdkDevice *keyboard, - gint group) + int group) { XkbDescPtr xkb = get_xkb (keymap_x11); Atom group_atom; @@ -615,8 +615,8 @@ update_direction (GdkX11Keymap *keymap_x11, static gboolean update_lock_state (GdkX11Keymap *keymap_x11, GdkDevice *keyboard, - gint locked_mods, - gint effective_mods) + int locked_mods, + int effective_mods) { XkbDescPtr xkb G_GNUC_UNUSED; gboolean have_lock_state; @@ -832,17 +832,17 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap, /* See sec 15.3.4 in XKB docs */ XkbDescRec *xkb = get_xkb (keymap_x11); - gint keycode; + int keycode; keycode = keymap_x11->min_keycode; while (keycode <= keymap_x11->max_keycode) { - gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode); /* "key width" */ - gint group = 0; - gint level = 0; - gint total_syms = XkbKeyNumSyms (xkb, keycode); - gint i = 0; + int max_shift_levels = XkbKeyGroupsWidth (xkb, keycode); /* "key width" */ + int group = 0; + int level = 0; + int total_syms = XkbKeyNumSyms (xkb, keycode); + int i = 0; KeySym *entry; /* entry is an array with all syms for group 0, all @@ -888,13 +888,13 @@ gdk_x11_keymap_get_entries_for_keyval (GdkKeymap *keymap, #endif { const KeySym *map = get_keymap (keymap_x11); - gint keycode; + int keycode; keycode = keymap_x11->min_keycode; while (keycode <= keymap_x11->max_keycode) { const KeySym *syms = map + (keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode; - gint i = 0; + int i = 0; while (i < keymap_x11->keysyms_per_keycode) { @@ -927,7 +927,7 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap *keymap, guint hardware_keycode, GdkKeymapKey **keys, guint **keyvals, - gint *n_entries) + int *n_entries) { GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap); GArray *key_array; @@ -963,11 +963,11 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap *keymap, /* See sec 15.3.4 in XKB docs */ XkbDescRec *xkb = get_xkb (keymap_x11); - gint max_shift_levels; - gint group = 0; - gint level = 0; - gint total_syms; - gint i = 0; + int max_shift_levels; + int group = 0; + int level = 0; + int total_syms; + int i = 0; KeySym *entry; max_shift_levels = XkbKeyGroupsWidth (xkb, hardware_keycode); /* "key width" */ @@ -1014,7 +1014,7 @@ gdk_x11_keymap_get_entries_for_keycode (GdkKeymap *keymap, { const KeySym *map = get_keymap (keymap_x11); const KeySym *syms; - gint i = 0; + int i = 0; syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode; @@ -1230,10 +1230,10 @@ MyEnhancedXkbTranslateKeyCode(register XkbDescPtr xkb, static guint translate_keysym (GdkX11Keymap *keymap_x11, guint hardware_keycode, - gint group, + int group, GdkModifierType state, - gint *effective_group, - gint *effective_level) + int *effective_group, + int *effective_level) { const KeySym *map = get_keymap (keymap_x11); const KeySym *syms = map + (hardware_keycode - keymap_x11->min_keycode) * keymap_x11->keysyms_per_keycode; @@ -1241,7 +1241,7 @@ translate_keysym (GdkX11Keymap *keymap_x11, #define SYM(k,g,l) get_symbol (syms, k,g,l) GdkModifierType shift_modifiers; - gint shift_level; + int shift_level; guint tmp_keyval; shift_modifiers = GDK_SHIFT_MASK; @@ -1299,10 +1299,10 @@ static gboolean gdk_x11_keymap_translate_keyboard_state (GdkKeymap *keymap, guint hardware_keycode, GdkModifierType state, - gint group, + int group, guint *keyval, - gint *effective_group, - gint *level, + int *effective_group, + int *level, GdkModifierType *consumed_modifiers) { GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap); @@ -1406,7 +1406,7 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap *keymap, * * Returns: the index of the active keyboard group for the event */ -gint +int gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap, guint state) { @@ -1478,7 +1478,7 @@ gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap, guint keycode) { GdkX11Keymap *keymap_x11 = GDK_X11_KEYMAP (keymap); - gint i; + int i; g_return_val_if_fail (GDK_IS_X11_KEYMAP (keymap), FALSE); diff --git a/gdk/x11/gdkkeys-x11.h b/gdk/x11/gdkkeys-x11.h index e56be6edca..db53da0dcc 100644 --- a/gdk/x11/gdkkeys-x11.h +++ b/gdk/x11/gdkkeys-x11.h @@ -39,7 +39,7 @@ typedef struct _GdkX11KeymapClass GdkX11KeymapClass; GType gdk_x11_keymap_get_type (void); -gint gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap, +int gdk_x11_keymap_get_group_for_state (GdkKeymap *keymap, guint state); gboolean gdk_x11_keymap_key_is_modifier (GdkKeymap *keymap, diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 62cbf7b654..4208ab881e 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -101,7 +101,7 @@ _gdk_x11_surfaceing_init (void) } GdkGrabStatus -_gdk_x11_convert_grab_status (gint status) +_gdk_x11_convert_grab_status (int status) { switch (status) { @@ -323,7 +323,7 @@ _gdk_x11_error_handler_pop (void) } } -gint +int _gdk_x11_display_send_xevent (GdkDisplay *display, Window window, gboolean propagate, @@ -348,15 +348,15 @@ _gdk_x11_display_send_xevent (GdkDisplay *display, void _gdk_x11_region_get_xrectangles (const cairo_region_t *region, - gint x_offset, - gint y_offset, - gint scale, + int x_offset, + int y_offset, + int scale, XRectangle **rects, - gint *n_rects) + int *n_rects) { XRectangle *rectangles; cairo_rectangle_int_t box; - gint i, n; + int i, n; n = cairo_region_num_rectangles (region); rectangles = g_new (XRectangle, n); diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h index 23540383cf..eca7e4fcbd 100644 --- a/gdk/x11/gdkprivate-x11.h +++ b/gdk/x11/gdkprivate-x11.h @@ -56,7 +56,7 @@ void _gdk_x11_error_handler_push (void); void _gdk_x11_error_handler_pop (void); void gdk_display_setup_window_visual (GdkDisplay *display, - gint depth, + int depth, Visual *visual, Colormap colormap, gboolean rgba); @@ -70,23 +70,23 @@ void _gdk_x11_display_add_window (GdkDisplay *display, void _gdk_x11_display_remove_window (GdkDisplay *display, XID xid); -gint _gdk_x11_display_send_xevent (GdkDisplay *display, - Window window, - gboolean propagate, - glong event_mask, - XEvent *event_send); +int _gdk_x11_display_send_xevent (GdkDisplay *display, + Window window, + gboolean propagate, + glong event_mask, + XEvent *event_send); cairo_region_t* _gdk_x11_xwindow_get_shape (Display *xdisplay, Window window, - gint scale, - gint shape_type); + int scale, + int shape_type); void _gdk_x11_region_get_xrectangles (const cairo_region_t *region, - gint x_offset, - gint y_offset, - gint scale, + int x_offset, + int y_offset, + int scale, XRectangle **rects, - gint *n_rects); + int *n_rects); gboolean _gdk_x11_moveresize_handle_event (const XEvent *event); gboolean _gdk_x11_moveresize_configure_done (GdkDisplay *display, @@ -114,7 +114,7 @@ gboolean _gdk_x11_display_is_root_window (GdkDisplay *display, void _gdk_x11_display_update_grab_info (GdkDisplay *display, GdkDevice *device, - gint status); + int status); void _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display, GdkDevice *device, guint32 time, @@ -124,11 +124,11 @@ void _gdk_x11_display_queue_events (GdkDisplay *display); GdkAppLaunchContext *_gdk_x11_display_get_app_launch_context (GdkDisplay *display); -gint _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, +int _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, const char *encoding, - gint format, + int format, const guchar *text, - gint length, + int length, gchar ***list); char * gdk_x11_utf8_to_string_target (const char *utf8_str, gboolean return_latin1); @@ -139,16 +139,16 @@ GdkX11DeviceManagerXI2 *_gdk_x11_device_manager_new (GdkDisplay *display); guchar * _gdk_x11_device_xi2_translate_event_mask (GdkX11DeviceManagerXI2 *device_manager_xi2, GdkEventMask event_mask, - gint *len); + int *len); guint _gdk_x11_device_xi2_translate_state (XIModifierState *mods_state, XIButtonState *buttons_state, XIGroupState *group_state); -gint _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device); +int _gdk_x11_device_xi2_get_id (GdkX11DeviceXI2 *device); void _gdk_device_xi2_unset_scroll_valuators (GdkX11DeviceXI2 *device); GdkDevice * _gdk_x11_device_manager_xi2_lookup (GdkX11DeviceManagerXI2 *device_manager_xi2, - gint device_id); + int device_id); void _gdk_x11_device_xi2_add_scroll_valuator (GdkX11DeviceXI2 *device, guint n_valuator, GdkScrollDirection direction, @@ -161,11 +161,11 @@ gboolean _gdk_x11_device_xi2_get_scroll_delta (GdkX11DeviceXI2 *device, void _gdk_device_xi2_reset_scroll_valuators (GdkX11DeviceXI2 *device); gdouble gdk_x11_device_xi2_get_last_axis_value (GdkX11DeviceXI2 *device, - gint n_axis); + int n_axis); void gdk_x11_device_xi2_store_axes (GdkX11DeviceXI2 *device, gdouble *axes, - gint n_axes); + int n_axes); gboolean _gdk_x11_display_supports_cursor_alpha (GdkDisplay *display); gboolean _gdk_x11_display_supports_cursor_color (GdkDisplay *display); @@ -187,7 +187,7 @@ GList * gdk_x11_display_get_toplevel_windows (GdkDisplay *display); void _gdk_x11_precache_atoms (GdkDisplay *display, const gchar * const *atom_names, - gint n_atoms); + int n_atoms); Atom _gdk_x11_get_xatom_for_display_printf (GdkDisplay *display, const gchar *format, @@ -232,10 +232,10 @@ GdkDrag * _gdk_x11_surface_drag_begin (GdkSurface *window, double dy); void gdk_x11_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y); + int x, + int y, + int *root_x, + int *root_y); void gdk_x11_surface_show (GdkSurface *surface, gboolean already_mapped); @@ -244,14 +244,14 @@ void gdk_x11_surface_set_opacity (GdkSurface *surface, double opacity); gboolean gdk_x11_surface_supports_edge_constraints (GdkSurface *surface); -GdkGrabStatus _gdk_x11_convert_grab_status (gint status); +GdkGrabStatus _gdk_x11_convert_grab_status (int status); cairo_surface_t * _gdk_x11_display_create_bitmap_surface (GdkDisplay *display, int width, int height); -extern const gint _gdk_x11_event_mask_table[]; -extern const gint _gdk_x11_event_mask_table_size; +extern const int _gdk_x11_event_mask_table[]; +extern const int _gdk_x11_event_mask_table_size; #define GDK_SCREEN_DISPLAY(screen) (GDK_X11_SCREEN (screen)->display) #define GDK_SCREEN_XROOTWIN(screen) (GDK_X11_SCREEN (screen)->xroot_window) diff --git a/gdk/x11/gdkproperty-x11.c b/gdk/x11/gdkproperty-x11.c index 4755d895a5..fd6ddca2fb 100644 --- a/gdk/x11/gdkproperty-x11.c +++ b/gdk/x11/gdkproperty-x11.c @@ -103,12 +103,12 @@ gdk_x11_get_xatom_by_name_for_display (GdkDisplay *display, void _gdk_x11_precache_atoms (GdkDisplay *display, const gchar * const *atom_names, - gint n_atoms) + int n_atoms) { Atom *xatoms; const char **xatom_names; - gint n_xatoms; - gint i; + int n_xatoms; + int i; xatoms = g_new (Atom, n_atoms); xatom_names = g_new (const char *, n_atoms); diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index 6f1aa1f9c8..8b875dfc58 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -106,7 +106,7 @@ static void gdk_x11_screen_finalize (GObject *object) { GdkX11Screen *x11_screen = GDK_X11_SCREEN (object); - gint i; + int i; /* Visual Part */ for (i = 0; i < x11_screen->nvisuals; i++) @@ -131,7 +131,7 @@ gdk_x11_screen_finalize (GObject *object) */ XID gdk_x11_screen_get_monitor_output (GdkX11Screen *x11_screen, - gint monitor_num) + int monitor_num) { GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display); GdkX11Monitor *monitor; @@ -874,7 +874,7 @@ init_multihead (GdkX11Screen *screen) GdkX11Screen * _gdk_x11_screen_new (GdkDisplay *display, - gint screen_number, + int screen_number, gboolean setup_display) { GdkX11Screen *x11_screen; @@ -913,7 +913,7 @@ _gdk_x11_screen_new (GdkDisplay *display, void _gdk_x11_screen_set_surface_scale (GdkX11Screen *x11_screen, - gint scale) + int scale) { GdkX11Display *x11_display = GDK_X11_DISPLAY (x11_screen->display); GList *toplevels, *l; @@ -995,17 +995,17 @@ _gdk_x11_screen_size_changed (GdkX11Screen *screen, void _gdk_x11_screen_get_edge_monitors (GdkX11Screen *x11_screen, - gint *top, - gint *bottom, - gint *left, - gint *right) + int *top, + int *bottom, + int *left, + int *right) { #ifdef HAVE_XFREE_XINERAMA - gint top_most_pos = HeightOfScreen (x11_screen->xscreen); - gint left_most_pos = WidthOfScreen (x11_screen->xscreen); - gint bottom_most_pos = 0; - gint right_most_pos = 0; - gint i; + int top_most_pos = HeightOfScreen (x11_screen->xscreen); + int left_most_pos = WidthOfScreen (x11_screen->xscreen); + int bottom_most_pos = 0; + int right_most_pos = 0; + int i; XineramaScreenInfo *x_monitors; int x_n_monitors; #endif @@ -1102,7 +1102,7 @@ get_net_supporting_wm_check (GdkX11Screen *screen, { GdkDisplay *display; Atom type; - gint format; + int format; gulong n_items; gulong bytes_after; guchar *data; @@ -1135,7 +1135,7 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen) GdkDisplay *display; Window window; GTimeVal tv; - gint error; + int error; display = x11_screen->display; @@ -1234,7 +1234,7 @@ gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *x11_screen, * refetch it. */ Atom type; - gint format; + int format; gulong bytes_after; x11_screen->need_refetch_net_supported = FALSE; @@ -1302,7 +1302,7 @@ gdk_x11_screen_get_window_manager_name (GdkX11Screen *x11_screen) if (x11_screen->wmspec_check_window != None) { Atom type; - gint format; + int format; gulong n_items; gulong bytes_after; gchar *name; @@ -1361,7 +1361,7 @@ get_netwm_cardinal_property (GdkX11Screen *x11_screen, { guint32 prop = 0; Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; guchar *data; diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h index 61a4ef1947..0d7bead87e 100644 --- a/gdk/x11/gdkscreen-x11.h +++ b/gdk/x11/gdkscreen-x11.h @@ -37,17 +37,17 @@ struct _GdkX11Screen Display *xdisplay; Screen *xscreen; Window xroot_window; - gint screen_num; + int screen_num; - gint surface_scale; + int surface_scale; gboolean fixed_surface_scale; /* Xft resources for the display, used for default values for * the Xft/ XSETTINGS */ - gint xft_hintstyle; - gint xft_rgba; - gint xft_dpi; + int xft_hintstyle; + int xft_rgba; + int xft_dpi; /* Window manager */ long last_wmspec_check_time; @@ -72,10 +72,10 @@ struct _GdkX11Screen guint xft_hinting : 1; /* Visual Part */ - gint nvisuals; + int nvisuals; GdkX11Visual **visuals; GdkX11Visual *system_visual; - gint available_depths[7]; + int available_depths[7]; GdkVisualType available_types[6]; gint16 navailable_depths; gint16 navailable_types; @@ -94,7 +94,7 @@ struct _GdkX11ScreenClass GType _gdk_x11_screen_get_type (void); GdkX11Screen *_gdk_x11_screen_new (GdkDisplay *display, - gint screen_number, + int screen_number, gboolean setup_display); void _gdk_x11_screen_update_visuals_for_gl (GdkX11Screen *screen); @@ -102,10 +102,10 @@ void _gdk_x11_screen_window_manager_changed (GdkX11Screen *screen); void _gdk_x11_screen_size_changed (GdkX11Screen *screen, const XEvent *event); void _gdk_x11_screen_get_edge_monitors (GdkX11Screen *screen, - gint *top, - gint *bottom, - gint *left, - gint *right); + int *top, + int *bottom, + int *left, + int *right); void _gdk_x11_screen_set_surface_scale (GdkX11Screen *x11_screen, int scale); gboolean _gdk_x11_screen_get_monitor_work_area (GdkX11Screen *screen, diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c index 544d0875dc..83cdd8c37a 100644 --- a/gdk/x11/gdkselection-x11.c +++ b/gdk/x11/gdkselection-x11.c @@ -53,17 +53,17 @@ * Returns: the number of strings stored in list, or 0, * if the conversion failed */ -gint +int gdk_x11_display_text_property_to_text_list (GdkDisplay *display, const char *encoding, - gint format, + int format, const guchar *text, - gint length, + int length, gchar ***list) { XTextProperty property; - gint count = 0; - gint res; + int count = 0; + int res; gchar **local_list; g_return_val_if_fail (GDK_IS_DISPLAY (display), 0); @@ -108,15 +108,15 @@ gdk_x11_free_text_list (gchar **list) XFreeStringList (list); } -static gint +static int make_list (const gchar *text, - gint length, + int length, gboolean latin1, gchar ***list) { GSList *strings = NULL; - gint n_strings = 0; - gint i; + int n_strings = 0; + int i; const gchar *p = text; const gchar *q; GSList *tmp_list; @@ -186,12 +186,12 @@ make_list (const gchar *text, return n_strings; } -gint +int _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, const char *encoding, - gint format, + int format, const guchar *text, - gint length, + int length, gchar ***list) { if (g_str_equal (encoding, "STRING")) @@ -205,11 +205,11 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, else { gchar **local_list; - gint local_count; - gint i; + int local_count; + int i; const gchar *charset = NULL; gboolean need_conversion = !g_get_charset (&charset); - gint count = 0; + int count = 0; GError *error = NULL; /* Probably COMPOUND text, we fall back to Xlib routines @@ -285,15 +285,15 @@ _gdk_x11_display_text_property_to_utf8_list (GdkDisplay *display, * * Returns: 0 upon success, non-zero upon failure */ -gint +int gdk_x11_display_string_to_compound_text (GdkDisplay *display, const char *str, const char **encoding, - gint *format, + int *format, guchar **ctext, - gint *length) + int *length) { - gint res; + int res; XTextProperty property; g_return_val_if_fail (GDK_IS_DISPLAY (display), 0); @@ -343,9 +343,9 @@ gboolean gdk_x11_display_utf8_to_compound_text (GdkDisplay *display, const char *str, const char **encoding, - gint *format, + int *format, guchar **ctext, - gint *length) + int *length) { gboolean need_conversion; const gchar *charset; diff --git a/gdk/x11/gdkselectioninputstream-x11.c b/gdk/x11/gdkselectioninputstream-x11.c index 99778c236d..6e10867abd 100644 --- a/gdk/x11/gdkselectioninputstream-x11.c +++ b/gdk/x11/gdkselectioninputstream-x11.c @@ -325,12 +325,12 @@ get_selection_property (Display *display, Window owner, Atom property, Atom *ret_type, - gint *ret_format) + int *ret_format) { gulong nitems; gulong nbytes; Atom prop_type; - gint prop_format; + int prop_format; guchar *data = NULL; if (XGetWindowProperty (display, owner, property, @@ -390,7 +390,7 @@ gdk_x11_selection_input_stream_xevent (GdkDisplay *display, Window xwindow; GBytes *bytes; Atom type; - gint format; + int format; xdisplay = gdk_x11_display_get_xdisplay (priv->display); xwindow = GDK_X11_DISPLAY (priv->display)->leader_window; diff --git a/gdk/x11/gdkselectionoutputstream-x11.c b/gdk/x11/gdkselectionoutputstream-x11.c index bdd4c57d08..b9aad4c3f3 100644 --- a/gdk/x11/gdkselectionoutputstream-x11.c +++ b/gdk/x11/gdkselectionoutputstream-x11.c @@ -846,7 +846,7 @@ static const struct { const char *x_target; const char *mime_type; const char *type; - gint format; + int format; MimeTypeHandleFunc handler; } special_targets[] = { { "UTF8_STRING", "text/plain;charset=utf-8", "UTF8_STRING", 8, handle_utf8 }, @@ -901,7 +901,7 @@ gdk_x11_selection_output_streams_request (GdkDisplay *display, gulong n_atoms; gulong nbytes; Atom prop_type; - gint prop_format; + int prop_format; Atom *atoms = NULL; int error; diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 2567d7e765..ec0c6d582a 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -96,7 +96,7 @@ const int _gdk_x11_event_mask_table[21] = ButtonPressMask /* SCROLL; on X mouse wheel events is treated as mouse button 4/5 */ }; -const gint _gdk_x11_event_mask_table_size = G_N_ELEMENTS (_gdk_x11_event_mask_table); +const int _gdk_x11_event_mask_table_size = G_N_ELEMENTS (_gdk_x11_event_mask_table); /* Forward declarations */ static void gdk_x11_surface_apply_fullscreen_mode (GdkSurface *surface); @@ -1197,7 +1197,7 @@ set_initial_hints (GdkSurface *surface) Window xwindow = GDK_SURFACE_XID (surface); GdkToplevelX11 *toplevel; Atom atoms[9]; - gint i; + int i; toplevel = _gdk_x11_surface_get_toplevel (surface); @@ -1379,8 +1379,8 @@ gdk_x11_surface_hide (GdkSurface *surface) static inline void x11_surface_move (GdkSurface *surface, - gint x, - gint y) + int x, + int y) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); @@ -1408,8 +1408,8 @@ x11_surface_move (GdkSurface *surface, static inline void x11_surface_resize (GdkSurface *surface, - gint width, - gint height) + int width, + int height) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); @@ -1443,10 +1443,10 @@ x11_surface_resize (GdkSurface *surface, static inline void x11_surface_move_resize (GdkSurface *surface, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); @@ -1496,10 +1496,10 @@ x11_surface_move_resize (GdkSurface *surface, static void gdk_x11_surface_move_resize (GdkSurface *surface, gboolean with_move, - gint x, - gint y, - gint width, - gint height) + int x, + int y, + int width, + int height) { if (with_move && (width < 0 && height < 0)) x11_surface_move (surface, x, y); @@ -1514,16 +1514,16 @@ gdk_x11_surface_move_resize (GdkSurface *surface, static void gdk_x11_surface_toplevel_resize (GdkSurface *surface, - gint width, - gint height) + int width, + int height) { x11_surface_resize (surface, width, height); } void gdk_x11_surface_move (GdkSurface *surface, - gint x, - gint y) + int x, + int y) { gdk_x11_surface_move_resize (surface, TRUE, x, y, -1, -1); } @@ -1804,7 +1804,7 @@ get_netwm_cardinal_property (GdkSurface *surface, GdkX11Screen *x11_screen = GDK_SURFACE_SCREEN (surface); guint32 prop = 0; Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; guchar *data; @@ -2334,8 +2334,8 @@ set_text_property (GdkDisplay *display, { gchar *prop_text = NULL; Atom prop_type; - gint prop_length; - gint prop_format; + int prop_length; + int prop_format; gboolean is_compound_text; if (utf8_is_latin1 (utf8_str)) @@ -2483,15 +2483,15 @@ _gdk_x11_surface_get_cursor (GdkSurface *surface) static void gdk_x11_surface_get_geometry (GdkSurface *surface, - gint *x, - gint *y, - gint *width, - gint *height) + int *x, + int *y, + int *width, + int *height) { GdkX11Surface *impl; Window root; - gint tx; - gint ty; + int tx; + int ty; guint twidth; guint theight; guint tborder_width; @@ -2518,15 +2518,15 @@ gdk_x11_surface_get_geometry (GdkSurface *surface, void gdk_x11_surface_get_root_coords (GdkSurface *surface, - gint x, - gint y, - gint *root_x, - gint *root_y) + int x, + int y, + int *root_x, + int *root_y) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); Window child; - gint tx; - gint ty; + int tx; + int ty; XTranslateCoordinates (GDK_SURFACE_XDISPLAY (surface), GDK_SURFACE_XID (surface), @@ -2558,10 +2558,10 @@ gdk_x11_surface_get_frame_extents (GdkSurface *surface, guint nvroots; gulong nitems_return; gulong bytes_after_return; - gint format_return; - gint i; + int format_return; + int i; guint ww, wh, wb, wd; - gint wx, wy; + int wx, wy; gboolean got_frame_extents = FALSE; g_return_if_fail (rect != NULL); @@ -2752,7 +2752,7 @@ gdk_x11_surface_set_input_region (GdkSurface *surface, } else { - gint n_rects = 0; + int n_rects = 0; XRectangle *xrects = NULL; _gdk_x11_region_get_xrectangles (input_region, @@ -3032,12 +3032,12 @@ gdk_x11_surface_set_icon_list (GdkSurface *surface, { gulong *data; gulong *p; - gint size; + int size; GList *l; - gint width, height; + int width, height; GdkTexture *texture; GdkDisplay *display; - gint i, n; + int i, n; if (GDK_SURFACE_DESTROYED (surface)) return; @@ -3206,8 +3206,8 @@ gdk_x11_surface_apply_fullscreen_mode (GdkSurface *surface) if (GDK_SURFACE_IS_MAPPED (surface)) { XClientMessageEvent xclient; - gint monitors[4]; - gint i; + int monitors[4]; + int i; memset (&xclient, 0, sizeof (xclient)); xclient.type = ClientMessage; @@ -3404,7 +3404,7 @@ gdk_surface_get_mwm_hints (GdkSurface *surface) Atom hints_atom = None; guchar *data; Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; @@ -3435,7 +3435,7 @@ gdk_surface_set_mwm_hints (GdkSurface *surface, guchar *data; MotifWmHints *hints; Atom type; - gint format; + int format; gulong nitems; gulong bytes_after; @@ -3591,13 +3591,13 @@ gdk_x11_surface_get_functions (GdkSurface *surface, cairo_region_t * _gdk_x11_xwindow_get_shape (Display *xdisplay, Window window, - gint scale, - gint shape_type) + int scale, + int shape_type) { cairo_region_t *shape; GdkRectangle *rl; XRectangle *xrl; - gint rn, ord, i; + int rn, ord, i; shape = NULL; rn = 0; @@ -3660,10 +3660,10 @@ _gdk_x11_xwindow_get_shape (Display *xdisplay, static void wmspec_send_message (GdkDisplay *display, GdkSurface *surface, - gint root_x, - gint root_y, - gint action, - gint button) + int root_x, + int root_y, + int action, + int button) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); XClientMessageEvent xclient; @@ -3716,11 +3716,11 @@ handle_wmspec_button_release (GdkDisplay *display, static void wmspec_moveresize (GdkSurface *surface, - gint direction, + int direction, GdkDevice *device, - gint button, - gint root_x, - gint root_y, + int button, + int root_x, + int root_y, guint32 timestamp) { GdkDisplay *display = GDK_SURFACE_DISPLAY (surface); @@ -3736,12 +3736,12 @@ static void wmspec_resize_drag (GdkSurface *surface, GdkSurfaceEdge edge, GdkDevice *device, - gint button, - gint root_x, - gint root_y, + int button, + int root_x, + int root_y, guint32 timestamp) { - gint direction; + int direction; if (button == 0) direction = _NET_WM_MOVERESIZE_SIZE_KEYBOARD; @@ -3803,13 +3803,13 @@ struct _MoveResizeData gboolean is_resize; GdkSurfaceEdge resize_edge; GdkDevice *device; - gint moveresize_button; - gint moveresize_x; - gint moveresize_y; - gint moveresize_orig_x; - gint moveresize_orig_y; - gint moveresize_orig_width; - gint moveresize_orig_height; + int moveresize_button; + int moveresize_x; + int moveresize_y; + int moveresize_orig_x; + int moveresize_orig_y; + int moveresize_orig_width; + int moveresize_orig_height; GdkSurfaceHints moveresize_geom_mask; GdkGeometry moveresize_geometry; Time moveresize_process_time; @@ -3845,7 +3845,7 @@ check_maximize (MoveResizeData *mv_resize, gdouble y_root) { GdkSurfaceState state; - gint y; + int y; if (mv_resize->is_resize) return; @@ -3867,7 +3867,7 @@ check_unmaximize (MoveResizeData *mv_resize, gdouble y_root) { GdkSurfaceState state; - gint dx, dy; + int dx, dy; if (mv_resize->is_resize) return; @@ -3886,10 +3886,10 @@ check_unmaximize (MoveResizeData *mv_resize, static void update_pos (MoveResizeData *mv_resize, - gint new_root_x, - gint new_root_y) + int new_root_x, + int new_root_y) { - gint dx, dy; + int dx, dy; check_unmaximize (mv_resize, new_root_x, new_root_y); dx = new_root_x - mv_resize->moveresize_x; @@ -3897,7 +3897,7 @@ update_pos (MoveResizeData *mv_resize, if (mv_resize->is_resize) { - gint x, y, w, h; + int x, y, w, h; x = mv_resize->moveresize_orig_x; y = mv_resize->moveresize_orig_y; @@ -3962,7 +3962,7 @@ update_pos (MoveResizeData *mv_resize, } else { - gint x, y; + int x, y; x = mv_resize->moveresize_orig_x + dx; y = mv_resize->moveresize_orig_y + dy; @@ -4104,7 +4104,7 @@ _gdk_x11_moveresize_handle_event (const XEvent *event) /* we just assume this is an XI2 event */ XIEvent *ev = (XIEvent *) event->xcookie.data; XIDeviceEvent *xev = (XIDeviceEvent *)ev; - gint state; + int state; switch (ev->evtype) { case XI_Motion: @@ -4202,7 +4202,7 @@ static void calculate_unmoving_origin (MoveResizeData *mv_resize) { GdkRectangle rect; - gint width, height; + int width, height; if (mv_resize->moveresize_geom_mask & GDK_HINT_WIN_GRAVITY && mv_resize->moveresize_geometry.win_gravity == GDK_GRAVITY_STATIC) @@ -4268,9 +4268,9 @@ static void emulate_resize_drag (GdkSurface *surface, GdkSurfaceEdge edge, GdkDevice *device, - gint button, - gint root_x, - gint root_y, + int button, + int root_x, + int root_y, guint32 timestamp) { MoveResizeData *mv_resize = get_move_resize_data (GDK_SURFACE_DISPLAY (surface), TRUE); @@ -4302,9 +4302,9 @@ emulate_resize_drag (GdkSurface *surface, static void emulate_move_drag (GdkSurface *surface, GdkDevice *device, - gint button, - gint root_x, - gint root_y, + int button, + int root_x, + int root_y, guint32 timestamp) { MoveResizeData *mv_resize = get_move_resize_data (GDK_SURFACE_DISPLAY (surface), TRUE); @@ -4378,7 +4378,7 @@ gdk_x11_toplevel_begin_move (GdkToplevel *toplevel, { GdkSurface *surface = GDK_SURFACE (toplevel); int root_x, root_y; - gint direction; + int direction; if (GDK_SURFACE_DESTROYED (surface)) return; @@ -4522,7 +4522,7 @@ gdk_x11_surface_get_xid (GdkSurface *surface) return GDK_X11_SURFACE (surface)->xid; } -static gint +static int gdk_x11_surface_get_scale_factor (GdkSurface *surface) { GdkX11Surface *impl = GDK_X11_SURFACE (surface); diff --git a/gdk/x11/gdksurface-x11.h b/gdk/x11/gdksurface-x11.h index 6fc7afd07d..eb23474afd 100644 --- a/gdk/x11/gdksurface-x11.h +++ b/gdk/x11/gdksurface-x11.h @@ -57,15 +57,15 @@ struct _GdkX11Surface guint frame_sync_enabled : 1; guint tracking_damage: 1; - gint surface_scale; + int surface_scale; /* Width and height not divided by surface_scale - this matters in the * corner-case where the window manager assigns us a size that isn't * a multiple of surface_scale - for example for a maximized window * with an odd-sized title-bar. */ - gint unscaled_width; - gint unscaled_height; + int unscaled_width; + int unscaled_height; cairo_surface_t *cairo_surface; @@ -184,8 +184,8 @@ gboolean _gdk_x11_surface_syncs_frames (GdkSurface *surface); void gdk_x11_surface_pre_damage (GdkSurface *surface); void gdk_x11_surface_move (GdkSurface *surface, - gint x, - gint y); + int x, + int y); void gdk_x11_surface_check_monitor (GdkSurface *surface, GdkMonitor *monitor); diff --git a/gdk/x11/gdktextlistconverter-x11.c b/gdk/x11/gdktextlistconverter-x11.c index 0e6999e7e4..fdd4228ad2 100644 --- a/gdk/x11/gdktextlistconverter-x11.c +++ b/gdk/x11/gdktextlistconverter-x11.c @@ -38,7 +38,7 @@ struct _GdkX11TextListConverter GdkDisplay *display; const char *encoding; /* interned */ - gint format; + int format; guint encoder : 1; }; @@ -82,7 +82,7 @@ gdk_x11_text_list_converter_decode (GdkX11TextListConverter *conv, gsize *bytes_written, GError **error) { - gint count; + int count; char **list; if (!(flags & G_CONVERTER_INPUT_AT_END)) @@ -132,7 +132,7 @@ char * gdk_x11_utf8_to_string_target (const char *utf8_str, gboolean return_latin1) { - gint len = strlen (utf8_str); + int len = strlen (utf8_str); GString *result = g_string_sized_new (len); const gchar *p = utf8_str; @@ -164,7 +164,7 @@ gdk_x11_utf8_to_string_target (const char *utf8_str, else { char buf[7]; - gint buflen; + int buflen; buflen = g_unichar_to_utf8 (ch, buf); g_string_append_len (result, buf, buflen); @@ -223,8 +223,8 @@ gdk_x11_text_list_converter_encode (GdkX11TextListConverter *conv, GConverterResult result; guchar *text; const char *encoding; - gint format; - gint new_length; + int format; + int new_length; char *tmp; tmp = g_strndup (inbuf, inbuf_size); diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c index c43c853def..ecb9ea6b6f 100644 --- a/gdk/x11/gdkvisual-x11.c +++ b/gdk/x11/gdkvisual-x11.c @@ -52,7 +52,7 @@ void _gdk_x11_screen_init_visuals (GdkX11Screen *x11_screen, gboolean setup_display) { - static const gint possible_depths[8] = { 32, 30, 24, 16, 15, 8, 4, 1 }; + static const int possible_depths[8] = { 32, 30, 24, 16, 15, 8, 4, 1 }; static const GdkVisualType possible_types[6] = { GDK_VISUAL_DIRECT_COLOR, diff --git a/gdk/x11/gdkvisual-x11.h b/gdk/x11/gdkvisual-x11.h index 7fbf9d20d4..7b1acb4e0c 100644 --- a/gdk/x11/gdkvisual-x11.h +++ b/gdk/x11/gdkvisual-x11.h @@ -57,10 +57,10 @@ struct _GdkX11Visual GObject parent_instance; GdkVisualType type; - gint depth; + int depth; GdkByteOrder byte_order; - gint colormap_size; - gint bits_per_rgb; + int colormap_size; + int bits_per_rgb; guint32 red_mask; guint32 green_mask; diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h index ae9e606303..956375dfab 100644 --- a/gdk/x11/gdkx11device.h +++ b/gdk/x11/gdkx11device.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL -gint gdk_x11_device_get_id (GdkDevice *device); +int gdk_x11_device_get_id (GdkDevice *device); G_END_DECLS diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h index f1c9ac62c9..6f07b331a2 100644 --- a/gdk/x11/gdkx11devicemanager.h +++ b/gdk/x11/gdkx11devicemanager.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL GdkDevice * gdk_x11_device_manager_lookup (GdkX11DeviceManagerXI2 *device_manager, - gint device_id); + int device_id); G_END_DECLS diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h index 78356d287f..0eb84a8025 100644 --- a/gdk/x11/gdkx11display.h +++ b/gdk/x11/gdkx11display.h @@ -92,7 +92,7 @@ void gdk_x11_display_set_program_class (GdkDisplay * GDK_AVAILABLE_IN_ALL void gdk_x11_display_set_cursor_theme (GdkDisplay *display, const gchar *theme, - const gint size); + const int size); GDK_AVAILABLE_IN_ALL void gdk_x11_display_broadcast_startup_message (GdkDisplay *display, @@ -115,13 +115,13 @@ void gdk_x11_display_ungrab (GdkDisplay *display); GDK_AVAILABLE_IN_ALL void gdk_x11_display_set_surface_scale (GdkDisplay *display, - gint scale); + int scale); GDK_AVAILABLE_IN_ALL void gdk_x11_display_error_trap_push (GdkDisplay *display); /* warn unused because you could use pop_ignored otherwise */ GDK_AVAILABLE_IN_ALL -G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop (GdkDisplay *display); +G_GNUC_WARN_UNUSED_RESULT int gdk_x11_display_error_trap_pop (GdkDisplay *display); GDK_AVAILABLE_IN_ALL void gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display); diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h index 4053ac4b4f..4a6e049f7e 100644 --- a/gdk/x11/gdkx11glcontext.h +++ b/gdk/x11/gdkx11glcontext.h @@ -41,8 +41,8 @@ GType gdk_x11_gl_context_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL gboolean gdk_x11_display_get_glx_version (GdkDisplay *display, - gint *major, - gint *minor); + int *major, + int *minor); G_END_DECLS diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h index b0a047d30f..f18ddfeef8 100644 --- a/gdk/x11/gdkx11screen.h +++ b/gdk/x11/gdkx11screen.h @@ -63,7 +63,7 @@ gboolean gdk_x11_screen_supports_net_wm_hint (GdkX11Screen *screen, GDK_AVAILABLE_IN_ALL XID gdk_x11_screen_get_monitor_output (GdkX11Screen *screen, - gint monitor_num); + int monitor_num); GDK_AVAILABLE_IN_ALL guint32 gdk_x11_screen_get_number_of_desktops (GdkX11Screen *screen); diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h index 3a078ffc68..7fd9f73892 100644 --- a/gdk/x11/gdkx11selection.h +++ b/gdk/x11/gdkx11selection.h @@ -37,28 +37,28 @@ G_BEGIN_DECLS GDK_AVAILABLE_IN_ALL -gint gdk_x11_display_text_property_to_text_list (GdkDisplay *display, +int gdk_x11_display_text_property_to_text_list (GdkDisplay *display, const char *encoding, - gint format, + int format, const guchar *text, - gint length, + int length, gchar ***list); GDK_AVAILABLE_IN_ALL void gdk_x11_free_text_list (gchar **list); GDK_AVAILABLE_IN_ALL -gint gdk_x11_display_string_to_compound_text (GdkDisplay *display, +int gdk_x11_display_string_to_compound_text (GdkDisplay *display, const char *str, const char **encoding, - gint *format, + int *format, guchar **ctext, - gint *length); + int *length); GDK_AVAILABLE_IN_ALL gboolean gdk_x11_display_utf8_to_compound_text (GdkDisplay *display, const char *str, const char **encoding, - gint *format, + int *format, guchar **ctext, - gint *length); + int *length); GDK_AVAILABLE_IN_ALL void gdk_x11_free_compound_text (guchar *ctext); diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c index 68b5f7d138..2d3709c97c 100644 --- a/gdk/x11/gdkxftdefaults.c +++ b/gdk/x11/gdkxftdefaults.c @@ -54,7 +54,7 @@ #include <gdkscreen-x11.h> #include <gdkprivate-x11.h> -static gint +static int parse_boolean (char *v) { gchar c0, c1; @@ -87,7 +87,7 @@ get_boolean_default (GdkX11Screen *x11_screen, { Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); gchar *v; - gint i; + int i; if (GDK_DISPLAY_DEBUG_CHECK (GDK_SCREEN_DISPLAY (x11_screen), DEFAULT_SETTINGS)) return FALSE; @@ -136,7 +136,7 @@ get_double_default (GdkX11Screen *x11_screen, static gboolean get_integer_default (GdkX11Screen *x11_screen, const gchar *option, - gint *value) + int *value) { Display *dpy = GDK_SCREEN_XDISPLAY (x11_screen); gchar *v, *e; |