Verified Commit 9daf8a38 authored by Iain Lane's avatar Iain Lane

debian/patches/*: Update to master at 31816477

These are patches which will go into 3.32.1.

Also refreshes all other patches.
parent a95984a9
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 6 Mar 2019 23:51:41 +0100
Subject: bell: Always flash window instead of frame
Traditionally visual alerts were implemented by flashing the focus
window's frame. As that only works for windows that we decorate,
flashing the whole window was added as a fallback for client-decorated
windows.
However that introduces some confusing inconsistency, better to just
always flash the entire window.
https://gitlab.gnome.org/GNOME/mutter/issues/491
Origin: upstream, commit:8d62da2dc4c710246425ea89c09f41e7713371f
Applied-Upstream: 3.32.1
---
src/core/bell.c | 66 +++------------------------------------------------------
1 file changed, 3 insertions(+), 63 deletions(-)
diff --git a/src/core/bell.c b/src/core/bell.c
index cd96275..aa334d6 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -34,10 +34,8 @@
* function then checks what kind of visual flash you like, and calls either
* bell_flash_fullscreen()-- which calls bell_flash_screen() to do
* its work-- or bell_flash_frame(), which flashes the focussed window
- * using bell_flash_window_frame(), unless there is no such window, in
- * which case it flashes the screen instead. bell_flash_window_frame()
- * flashes the frame and calls bell_unflash_frame() as a timeout to
- * remove the flash.
+ * using bell_flash_window(), unless there is no such window, in
+ * which case it flashes the screen instead.
*
* The visual bell was the result of a discussion in Bugzilla here:
* <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
@@ -135,62 +133,6 @@ bell_flash_fullscreen (MetaDisplay *display)
meta_compositor_flash_display (display->compositor, display);
}
-/**
- * bell_unflash_frame:
- * @data: The frame to unflash, cast to a gpointer so it can go into
- * a callback function.
- *
- * Makes a frame be not flashed; this is the timeout half of
- * bell_flash_window_frame(). This is done simply by clearing the
- * flash flag and queuing a redraw of the frame.
- *
- * If the configure script found we had no XKB, this does not exist.
- *
- * Returns: Always FALSE, so we don't get called again.
- */
-
-/*
- * Bug: This is the parallel to bell_flash_window_frame(), so it should
- * really be called meta_bell_unflash_window_frame().
- */
-static gboolean
-bell_unflash_frame (gpointer data)
-{
- MetaFrame *frame = (MetaFrame *) data;
- frame->is_flashing = 0;
- meta_frame_queue_draw (frame);
- return FALSE;
-}
-
-/**
- * bell_flash_window_frame:
- * @window: The window to flash
- *
- * Makes a frame flash and then return to normal shortly afterwards.
- * This is done by setting a flag so that the theme
- * code will temporarily draw the frame as focussed if it's unfocussed and
- * vice versa, and then queueing a redraw. Lastly, we create a timeout so
- * that the flag can be unset and the frame re-redrawn.
- *
- * If the configure script found we had no XKB, this does not exist.
- */
-static void
-bell_flash_window_frame (MetaWindow *window)
-{
- guint id;
- g_assert (window->frame != NULL);
- window->frame->is_flashing = 1;
- meta_frame_queue_draw (window->frame);
- /* Since this idle is added after the Clutter clock source, with
- * the same priority, it will be executed after it as well, so
- * we are guaranteed to get at least one frame drawn in the
- * flashed state, no matter how loaded we are.
- */
- id = g_timeout_add_full (META_PRIORITY_REDRAW, 100,
- bell_unflash_frame, window->frame, NULL);
- g_source_set_name_by_id (id, "[mutter] bell_unflash_frame");
-}
-
static void
bell_flash_window (MetaWindow *window)
{
@@ -209,9 +151,7 @@ static void
bell_flash_frame (MetaDisplay *display,
MetaWindow *window)
{
- if (window && window->frame)
- bell_flash_window_frame (window);
- else if (window)
+ if (window)
bell_flash_window (window);
else
bell_flash_fullscreen (display);
From: Pablo Barciela <scow@riseup.net>
Date: Sun, 3 Mar 2019 16:05:55 +0100
Subject: boxes: Actually check for rectangle containment
Fixes condition duplicated:
/* If a contains b, just remove b */
if (meta_rectangle_contains_rect (a, b))
{
delete_me = other;
}
/* If b contains a, just remove a */
else if (meta_rectangle_contains_rect (a, b))
{
delete_me = compare;
}
Closes https://gitlab.gnome.org/GNOME/mutter/issues/480
Origin: upstream, commit:18164779c07c12c5acfcddde7834980c7521aac
Applied-Upstream: 3.32.1
---
src/core/boxes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/boxes.c b/src/core/boxes.c
index 4ab07d2..87f2d5d 100644
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -468,7 +468,7 @@ merge_spanning_rects_in_region (GList *region)
delete_me = other;
}
/* If b contains a, just remove a */
- else if (meta_rectangle_contains_rect (a, b))
+ else if (meta_rectangle_contains_rect (b, a))
{
delete_me = compare;
}
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 6 Mar 2019 18:50:33 +0100
Subject: cogl: Introspect CoglTexture2D(Sliced)
gnome-shell cannot use CoglTexture if gjs can't tell that an object
in question implements the CoglTexture interface.
https://gitlab.gnome.org/GNOME/gnome-shell/issues/1020
https://gitlab.gnome.org/GNOME/mutter/merge_requests/482
Origin: upstream, commit:aca31c81494435a6c3f2266b664bfc727a23fbe
Applied-Upstream: 3.32.1
---
cogl/cogl/cogl-texture-2d-sliced.h | 6 +++---
cogl/cogl/cogl-texture-2d.h | 12 +++++++++---
cogl/cogl/meson.build | 4 ++--
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/cogl/cogl/cogl-texture-2d-sliced.h b/cogl/cogl/cogl-texture-2d-sliced.h
index 8d43fc5..12ce710 100644
--- a/cogl/cogl/cogl-texture-2d-sliced.h
+++ b/cogl/cogl/cogl-texture-2d-sliced.h
@@ -78,7 +78,7 @@ typedef struct _CoglTexture2DSliced CoglTexture2DSliced;
GType cogl_texture_2d_sliced_get_gtype (void);
/**
- * cogl_texture_2d_sliced_new_with_size:
+ * cogl_texture_2d_sliced_new_with_size: (skip)
* @ctx: A #CoglContext
* @width: The virtual width of your sliced texture.
* @height: The virtual height of your sliced texture.
@@ -125,7 +125,7 @@ cogl_texture_2d_sliced_new_with_size (CoglContext *ctx,
int max_waste);
/**
- * cogl_texture_2d_sliced_new_from_file:
+ * cogl_texture_2d_sliced_new_from_file: (skip)
* @ctx: A #CoglContext
* @filename: the file to load
* @max_waste: The threshold of how wide a strip of wasted texels
@@ -173,7 +173,7 @@ cogl_texture_2d_sliced_new_from_file (CoglContext *ctx,
CoglError **error);
/**
- * cogl_texture_2d_sliced_new_from_data:
+ * cogl_texture_2d_sliced_new_from_data: (skip)
* @ctx: A #CoglContext
* @width: width of texture in pixels
* @height: height of texture in pixels
diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h
index 85cadba..29b8b2d 100644
--- a/cogl/cogl/cogl-texture-2d.h
+++ b/cogl/cogl/cogl-texture-2d.h
@@ -86,7 +86,7 @@ gboolean
cogl_is_texture_2d (void *object);
/**
- * cogl_texture_2d_new_with_size:
+ * cogl_texture_2d_new_with_size: (skip)
* @ctx: A #CoglContext
* @width: Width of the texture to allocate
* @height: Height of the texture to allocate
@@ -120,7 +120,7 @@ cogl_texture_2d_new_with_size (CoglContext *ctx,
int height);
/**
- * cogl_texture_2d_new_from_file:
+ * cogl_texture_2d_new_from_file: (skip)
* @ctx: A #CoglContext
* @filename: the file to load
* @error: A #CoglError to catch exceptional errors or %NULL
@@ -154,7 +154,7 @@ cogl_texture_2d_new_from_file (CoglContext *ctx,
CoglError **error);
/**
- * cogl_texture_2d_new_from_data:
+ * cogl_texture_2d_new_from_data: (skip)
* @ctx: A #CoglContext
* @width: width of texture in pixels
* @height: height of texture in pixels
@@ -231,6 +231,9 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
CoglTexture2D *
cogl_texture_2d_new_from_bitmap (CoglBitmap *bitmap);
+/**
+ * cogl_egl_texture_2d_new_from_image: (skip)
+ */
#if defined (COGL_HAS_EGL_SUPPORT) && defined (EGL_KHR_image_base)
/* NB: The reason we require the width, height and format to be passed
* even though they may seem redundant is because GLES 1/2 don't
@@ -247,6 +250,9 @@ typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d,
gpointer user_data,
GError **error);
+/**
+ * cogl_texture_2d_new_from_egl_image_external: (skip)
+ */
CoglTexture2D *
cogl_texture_2d_new_from_egl_image_external (CoglContext *ctx,
int width,
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 5d80e87..626e8fa 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -89,6 +89,8 @@ cogl_headers = [
'cogl-pipeline-layer-state.h',
'cogl-primitives.h',
'cogl-texture.h',
+ 'cogl-texture-2d.h',
+ 'cogl-texture-2d-sliced.h',
'cogl-types.h',
'cogl.h',
]
@@ -117,10 +119,8 @@ cogl_nonintrospected_headers = [
'cogl-matrix-stack.h',
'cogl-poll.h',
'cogl-texture-3d.h',
- 'cogl-texture-2d.h',
'cogl-texture-2d-gl.h',
'cogl-texture-rectangle.h',
- 'cogl-texture-2d-sliced.h',
'cogl-sub-texture.h',
'cogl-atlas-texture.h',
'cogl-meta-texture.h',
From: Adam Jackson <ajax@redhat.com>
Date: Wed, 6 Mar 2019 12:15:40 -0500
Subject: cogl: Remove unused CoglTextureDriver::try_setting_gl_border_color
https://gitlab.gnome.org/GNOME/mutter/merge_requests/480
Origin: upstream, commit:555a2c8eba115425a81d7b84f3ca2163493c0d4
Applied-Upstream: 3.32.1
---
cogl/cogl/cogl-texture-driver.h | 9 ---------
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 14 --------------
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c | 10 ----------
3 files changed, 33 deletions(-)
diff --git a/cogl/cogl/cogl-texture-driver.h b/cogl/cogl/cogl-texture-driver.h
index f77c548..a6e7d4f 100644
--- a/cogl/cogl/cogl-texture-driver.h
+++ b/cogl/cogl/cogl-texture-driver.h
@@ -171,15 +171,6 @@ struct _CoglTextureDriver
int height,
int depth);
- /*
- * This driver abstraction is needed because GLES doesn't support setting
- * a texture border color.
- */
- void
- (* try_setting_gl_border_color) (CoglContext *ctx,
- GLuint gl_target,
- const GLfloat *transparent_color);
-
/*
* It may depend on the driver as to what texture targets may be used when
* creating a foreign texture. E.g. OpenGL supports ARB_texture_rectangle
diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
index fbb55de..35b87f7 100644
--- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
@@ -485,19 +485,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
return new_width != 0;
}
-static void
-_cogl_texture_driver_try_setting_gl_border_color
- (CoglContext *ctx,
- GLuint gl_target,
- const GLfloat *transparent_color)
-{
- /* Use a transparent border color so that we can leave the
- color buffer alone when using texture co-ordinates
- outside of the texture */
- GE( ctx, glTexParameterfv (gl_target, GL_TEXTURE_BORDER_COLOR,
- transparent_color) );
-}
-
static gboolean
_cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
GLenum gl_target)
@@ -541,7 +528,6 @@ _cogl_texture_driver_gl =
_cogl_texture_driver_gl_get_tex_image,
_cogl_texture_driver_size_supported,
_cogl_texture_driver_size_supported_3d,
- _cogl_texture_driver_try_setting_gl_border_color,
_cogl_texture_driver_allows_foreign_gl_target,
_cogl_texture_driver_find_best_gl_get_data_format
};
diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
index 17f529e..f773f93 100644
--- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
@@ -590,15 +590,6 @@ _cogl_texture_driver_size_supported (CoglContext *ctx,
return width <= max_size && height <= max_size;
}
-static void
-_cogl_texture_driver_try_setting_gl_border_color
- (CoglContext *ctx,
- GLuint gl_target,
- const GLfloat *transparent_color)
-{
- /* FAIL! */
-}
-
static gboolean
_cogl_texture_driver_allows_foreign_gl_target (CoglContext *ctx,
GLenum gl_target)
@@ -636,7 +627,6 @@ _cogl_texture_driver_gles =
_cogl_texture_driver_gl_get_tex_image,
_cogl_texture_driver_size_supported,
_cogl_texture_driver_size_supported_3d,
- _cogl_texture_driver_try_setting_gl_border_color,
_cogl_texture_driver_allows_foreign_gl_target,
_cogl_texture_driver_find_best_gl_get_data_format
};
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 6 Mar 2019 23:56:33 +0100
Subject: frame: Remove flashing support
It's now unused.
https://gitlab.gnome.org/GNOME/mutter/issues/491
Origin: upstream, commit:bd33e7b0027f51307657938db3b4cc1a8d03dde
Applied-Upstream: 3.32.1
---
src/core/bell.c | 16 ----------------
src/core/bell.h | 11 -----------
src/core/frame.c | 6 ------
src/core/frame.h | 1 -
src/meta/common.h | 8 +++-----
src/ui/theme.c | 2 --
6 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/src/core/bell.c b/src/core/bell.c
index aa334d6..d7000b2 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -207,19 +207,3 @@ meta_bell_notify (MetaDisplay *display,
return TRUE;
}
-
-/**
- * meta_bell_notify_frame_destroy:
- * @frame: The frame which is being destroyed
- *
- * Deals with a frame being destroyed. This is important because if we're
- * using a visual bell, we might be flashing the edges of the frame, and
- * so we'd have a timeout function waiting ready to un-flash them. If the
- * frame's going away, we can tell the timeout not to bother.
- */
-void
-meta_bell_notify_frame_destroy (MetaFrame *frame)
-{
- if (frame->is_flashing)
- g_source_remove_by_funcs_user_data (&g_timeout_funcs, frame);
-}
diff --git a/src/core/bell.h b/src/core/bell.h
index 9205b08..f86cbb7 100644
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -41,14 +41,3 @@ MetaBell * meta_bell_new (MetaDisplay *display);
*/
gboolean meta_bell_notify (MetaDisplay *display,
MetaWindow *window);
-
-/**
- * meta_bell_notify_frame_destroy:
- * @frame: The frame which is being destroyed
- *
- * Deals with a frame being destroyed. This is important because if we're
- * using a visual bell, we might be flashing the edges of the frame, and
- * so we'd have a timeout function waiting ready to un-flash them. If the
- * frame's going away, we can tell the timeout not to bother.
- */
-void meta_bell_notify_frame_destroy (MetaFrame *frame);
diff --git a/src/core/frame.c b/src/core/frame.c
index 7eea0a3..7699461 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -60,7 +60,6 @@ meta_window_ensure_frame (MetaWindow *window)
frame->right_width = 0;
frame->current_cursor = 0;
- frame->is_flashing = FALSE;
frame->borders_cached = FALSE;
meta_verbose ("Frame geometry %d,%d %dx%d\n",
@@ -177,8 +176,6 @@ meta_window_destroy_frame (MetaWindow *window)
meta_frame_calc_borders (frame, &borders);
- meta_bell_notify_frame_destroy (frame);
-
/* Unparent the client window; it may be destroyed,
* thus the error trap.
*/
@@ -298,9 +295,6 @@ meta_frame_get_flags (MetaFrame *frame)
if (frame->window->fullscreen)
flags |= META_FRAME_FULLSCREEN;
- if (frame->is_flashing)
- flags |= META_FRAME_IS_FLASHING;
-
if (frame->window->wm_state_above)
flags |= META_FRAME_ABOVE;
diff --git a/src/core/frame.h b/src/core/frame.h
index 73a7b4b..c0bacbe 100644
--- a/src/core/frame.h
+++ b/src/core/frame.h
@@ -49,7 +49,6 @@ struct _MetaFrame
int bottom_height;
guint need_reapply_frame_shape : 1;
- guint is_flashing : 1; /* used by the visual bell flash */
guint borders_cached : 1;
MetaUIFrame *ui_frame;
diff --git a/src/meta/common.h b/src/meta/common.h
index 02e2802..670097b 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -63,7 +63,6 @@
* @META_FRAME_ALLOWS_SHADE: frame allows shade
* @META_FRAME_ALLOWS_MOVE: frame allows move
* @META_FRAME_FULLSCREEN: frame allows fullscreen
- * @META_FRAME_IS_FLASHING: frame is flashing
* @META_FRAME_ABOVE: frame is above
* @META_FRAME_TILED_LEFT: frame is tiled to the left
* @META_FRAME_TILED_RIGHT: frame is tiled to the right
@@ -83,10 +82,9 @@ typedef enum
META_FRAME_ALLOWS_SHADE = 1 << 10,
META_FRAME_ALLOWS_MOVE = 1 << 11,
META_FRAME_FULLSCREEN = 1 << 12,
- META_FRAME_IS_FLASHING = 1 << 13,
- META_FRAME_ABOVE = 1 << 14,
- META_FRAME_TILED_LEFT = 1 << 15,
- META_FRAME_TILED_RIGHT = 1 << 16
+ META_FRAME_ABOVE = 1 << 13,
+ META_FRAME_TILED_LEFT = 1 << 14,
+ META_FRAME_TILED_RIGHT = 1 << 15
} MetaFrameFlags;
/**
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 53d7ef5..b7618d9 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -1186,8 +1186,6 @@ meta_style_info_set_flags (MetaStyleInfo *style_info,
int i;
backdrop = !(flags & META_FRAME_HAS_FOCUS);
- if (flags & META_FRAME_IS_FLASHING)
- backdrop = !backdrop;
if (flags & META_FRAME_MAXIMIZED)
class_name = "maximized";
From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 6 Mar 2019 14:07:02 +0100
Subject: keybindings: Fix theoretical memory leak while ungrabbing
In the unlikely event that one tries to ungrab an action which does not
exist, a small leak could occur. Fix this by using g_autofree.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/478
Origin: upstream, commit:0ceeb28481ec74073241d0c2f6af8795f070905
Applied-Upstream: 3.32.1
---
src/core/keybindings.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 5ffe411..478d4d8 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1654,7 +1654,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
MetaKeyBindingManager *keys = &display->key_binding_manager;
MetaKeyBinding *binding;
MetaKeyGrab *grab;
- char *key;
+ g_autofree char *key = NULL;
MetaResolvedKeyCombo resolved_combo = { NULL, 0 };
g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
@@ -1683,7 +1683,6 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
}
g_hash_table_remove (external_grabs, key);
- g_free (key);
resolved_key_combo_reset (&resolved_combo);
return TRUE;
......@@ -44,7 +44,7 @@ index d76b865..a6c22ff 100644
input: 'cogl-config.h.meson',
output: 'cogl-config.h',
diff --git a/meson.build b/meson.build
index fc0d34d..a37e72e 100644
index dc210e6..cafbde4 100644
--- a/meson.build
+++ b/meson.build
@@ -210,6 +210,8 @@ if have_wayland_eglstream
......
From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
Date: Tue, 5 Mar 2019 01:26:35 +0100
Subject: meta-monitor: Remove useless variable
Since commit f76b3edf9cdf, the variable is never set to TRUE and
we can simply remove it.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/475
Origin: upstream, commit:2504ae91770a1d6524a136f56ab437d4455a626
Applied-Upstream: 3.32.1
---
src/backends/meta-monitor.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
index 3ff18a5..1a32e4c 100644
--- a/src/backends/meta-monitor.c
+++ b/src/backends/meta-monitor.c
@@ -1587,7 +1587,6 @@ get_closest_scale_factor_for_resolution (float width,
float scaled_w;
float best_scale;
int base_scaled_w;
- gboolean limit_exceeded;
gboolean found_one;
best_scale = 0;
@@ -1604,7 +1603,6 @@ get_closest_scale_factor_for_resolution (float width,
i = 0;
found_one = FALSE;
- limit_exceeded = FALSE;
base_scaled_w = floorf (scaled_w);
do
@@ -1637,7 +1635,7 @@ get_closest_scale_factor_for_resolution (float width,
i++;
}
- while (!found_one && !limit_exceeded);
+ while (!found_one);
out:
return best_scale;
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Fri, 8 Mar 2019 18:13:00 +0000
Subject: monitor: Fix indentation style on calculate_crtc_pos and friends
https://gitlab.gnome.org/GNOME/mutter/merge_requests/488
Origin: upstream, commit:2525f286d3a6687b6d78b038f795d0c1a4f4cb0
Applied-Upstream: 3.32.1
---
src/backends/meta-monitor.c | 36 ++++++++++++++++++------------------
src/backends/meta-monitor.h | 24 ++++++++++++------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c
index b2f500f..1c6e844 100644
--- a/src/backends/meta-monitor.c
+++ b/src/backends/meta-monitor.c
@@ -615,12 +615,12 @@ meta_monitor_normal_get_suggested_position (MetaMonitor *monitor,
}
static void
-meta_monitor_normal_calculate_crtc_pos (MetaMonitor *monitor,
- MetaMonitorMode *monitor_mode,
- MetaOutput *output,
- MetaMonitorTransform crtc_transform,
- int *out_x,
- int *out_y)
+meta_monitor_normal_calculate_crtc_pos (MetaMonitor *monitor,
+ MetaMonitorMode *monitor_mode,
+ MetaOutput *output,
+ MetaMonitorTransform crtc_transform,
+ int *out_x,
+ int *out_y)
{
*out_x = 0;
*out_y = 0;
@@ -1267,12 +1267,12 @@ meta_monitor_tiled_get_suggested_position (MetaMonitor *monitor,
}
static void
-meta_monitor_tiled_calculate_crtc_pos (MetaMonitor *monitor,
- MetaMonitorMode *monitor_mode,
- MetaOutput *output,
- MetaMonitorTransform crtc_transform,
- int *out_x,
- int *out_y)
+meta_monitor_tiled_calculate_crtc_pos (MetaMonitor *monitor,
+ MetaMonitorMode *monitor_mode,
+ MetaOutput *output,
+ MetaMonitorTransform crtc_transform,
+ int *out_x,
+ int *out_y)
{
MetaMonitorModeTiled *mode_tiled = (MetaMonitorModeTiled *) monitor_mode;
@@ -1461,12 +1461,12 @@ meta_monitor_get_modes (MetaMonitor *monitor)
}
void
-meta_monitor_calculate_crtc_pos (MetaMonitor *monitor,
- MetaMonitorMode *monitor_mode,
- MetaOutput *output,
- MetaMonitorTransform crtc_transform,
- int *out_x,
- int *out_y)
+meta_monitor_calculate_crtc_pos (MetaMonitor *monitor,
+ MetaMonitorMode *monitor_mode,
+ MetaOutput *output,
+ MetaMonitorTransform crtc_transform,
+ int *out_x,
+ int *out_y)
{
META_MONITOR_GET_CLASS (monitor)->calculate_crtc_pos (monitor,
monitor_mode,
diff --git a/src/backends/meta-monitor.h b/src/backends/meta-monitor.h
index b24b1a5..c3ba4cf 100644
--- a/src/backends/meta-monitor.h
+++ b/src/backends/meta-monitor.h
@@ -74,12 +74,12 @@ struct _MetaMonitorClass
MetaOutput * (* get_main_output) (MetaMonitor *monitor);
void (* derive_layout) (MetaMonitor *monitor,
MetaRectangle *layout);
- void (* calculate_crtc_pos) (MetaMonitor *monitor,
- MetaMonitorMode *monitor_mode,
- MetaOutput *output,
- MetaMonitorTransform crtc_transform,
- int *out_x,
- int *out_y);
+ void (* calculate_crtc_pos) (MetaMonitor *monitor,
+ MetaMonitorMode *monitor_mode,
+ MetaOutput *output,
+ MetaMonitorTransform crtc_transform,
+ int *out_x,
+ int *out_y);
gboolean (* get_suggested_position) (MetaMonitor *monitor,
int *width,
int *height);
@@ -214,12 +214,12 @@ META_EXPORT_TEST
GList * meta_monitor_get_modes (MetaMonitor *monitor);
META_EXPORT_TEST
-void meta_monitor_calculate_crtc_pos (MetaMonitor *monitor,
- MetaMonitorMode *monitor_mode,
- MetaOutput *output,
- MetaMonitorTransform crtc_transform,
- int *out_x,
- int *out_y);
+void meta_monitor_calculate_crtc_pos (MetaMonitor *monitor,
+ MetaMonitorMode *monitor_mode,
+ MetaOutput *output,
+ MetaMonitorTransform crtc_transform,
+ int *out_x,
+ int *out_y);
META_EXPORT_TEST
float meta_monitor_calculate_mode_scale (MetaMonitor *monitor,