summaryrefslogtreecommitdiff
path: root/gdk/broadway
diff options
context:
space:
mode:
Diffstat (limited to 'gdk/broadway')
-rw-r--r--gdk/broadway/broadway-output.c2
-rw-r--r--gdk/broadway/broadway-server.c28
-rw-r--r--gdk/broadway/broadway-server.h32
-rw-r--r--gdk/broadway/gdkbroadway-server.c14
-rw-r--r--gdk/broadway/gdkbroadway-server.h22
-rw-r--r--gdk/broadway/gdkeventsource.c4
-rw-r--r--gdk/broadway/gdkkeys-broadway.c8
-rw-r--r--gdk/broadway/gdkprivate-broadway.h14
-rw-r--r--gdk/broadway/gdksurface-broadway.c68
9 files changed, 96 insertions, 96 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)
View Lorry Controller Status