summaryrefslogtreecommitdiff
path: root/gdk/x11/gdksurface-x11.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/x11/gdksurface-x11.c')
-rw-r--r--gdk/x11/gdksurface-x11.c166
1 files changed, 83 insertions, 83 deletions
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);
View Lorry Controller Status