summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-06-28 14:58:39 +0300
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-06-28 14:58:39 +0300
commit465d29eb1265acfe9467f909bf1f213b6b169899 (patch)
tree333e1751428d57e0dd4cd1868358575cd3a1fce1
parent411a08fcae376a7e968c152cb7527711b631791c (diff)
downloadmetacity-465d29eb1265acfe9467f909bf1f213b6b169899.tar.gz
compositor: rename window_shape_changed
-rw-r--r--src/compositor/meta-compositor-none.c6
-rw-r--r--src/compositor/meta-compositor-private.h4
-rw-r--r--src/compositor/meta-compositor-vulkan.c6
-rw-r--r--src/compositor/meta-compositor-xrender.c6
-rw-r--r--src/compositor/meta-compositor.c6
-rw-r--r--src/core/window.c2
-rw-r--r--src/include/meta-compositor.h4
7 files changed, 17 insertions, 17 deletions
diff --git a/src/compositor/meta-compositor-none.c b/src/compositor/meta-compositor-none.c
index 4cdcd409..658c13df 100644
--- a/src/compositor/meta-compositor-none.c
+++ b/src/compositor/meta-compositor-none.c
@@ -72,8 +72,8 @@ meta_compositor_none_window_opaque_region_changed (MetaCompositor *compositor,
}
static void
-meta_compositor_none_window_shape_changed (MetaCompositor *compositor,
- MetaWindow *window)
+meta_compositor_none_window_shape_region_changed (MetaCompositor *compositor,
+ MetaWindow *window)
{
}
@@ -146,7 +146,7 @@ meta_compositor_none_class_init (MetaCompositorNoneClass *none_class)
compositor_class->hide_window = meta_compositor_none_hide_window;
compositor_class->window_opacity_changed = meta_compositor_none_window_opacity_changed;
compositor_class->window_opaque_region_changed = meta_compositor_none_window_opaque_region_changed;
- compositor_class->window_shape_changed = meta_compositor_none_window_shape_changed;
+ compositor_class->window_shape_region_changed = meta_compositor_none_window_shape_region_changed;
compositor_class->set_updates_frozen = meta_compositor_none_set_updates_frozen;
compositor_class->process_event = meta_compositor_none_process_event;
compositor_class->get_window_surface = meta_compositor_none_get_window_surface;
diff --git a/src/compositor/meta-compositor-private.h b/src/compositor/meta-compositor-private.h
index 42e126a4..c09f23cf 100644
--- a/src/compositor/meta-compositor-private.h
+++ b/src/compositor/meta-compositor-private.h
@@ -50,8 +50,8 @@ struct _MetaCompositorClass
void (* window_opaque_region_changed) (MetaCompositor *compositor,
MetaWindow *window);
- void (* window_shape_changed) (MetaCompositor *compositor,
- MetaWindow *window);
+ void (* window_shape_region_changed) (MetaCompositor *compositor,
+ MetaWindow *window);
void (* set_updates_frozen) (MetaCompositor *compositor,
MetaWindow *window,
diff --git a/src/compositor/meta-compositor-vulkan.c b/src/compositor/meta-compositor-vulkan.c
index 213f615b..2c6fd528 100644
--- a/src/compositor/meta-compositor-vulkan.c
+++ b/src/compositor/meta-compositor-vulkan.c
@@ -1258,8 +1258,8 @@ meta_compositor_vulkan_window_opaque_region_changed (MetaCompositor *compositor,
}
static void
-meta_compositor_vulkan_window_shape_changed (MetaCompositor *compositor,
- MetaWindow *window)
+meta_compositor_vulkan_window_shape_region_changed (MetaCompositor *compositor,
+ MetaWindow *window)
{
}
@@ -1336,7 +1336,7 @@ meta_compositor_vulkan_class_init (MetaCompositorVulkanClass *vulkan_class)
compositor_class->hide_window = meta_compositor_vulkan_hide_window;
compositor_class->window_opacity_changed = meta_compositor_vulkan_window_opacity_changed;
compositor_class->window_opaque_region_changed = meta_compositor_vulkan_window_opaque_region_changed;
- compositor_class->window_shape_changed = meta_compositor_vulkan_window_shape_changed;
+ compositor_class->window_shape_region_changed = meta_compositor_vulkan_window_shape_region_changed;
compositor_class->set_updates_frozen = meta_compositor_vulkan_set_updates_frozen;
compositor_class->process_event = meta_compositor_vulkan_process_event;
compositor_class->get_window_surface = meta_compositor_vulkan_get_window_surface;
diff --git a/src/compositor/meta-compositor-xrender.c b/src/compositor/meta-compositor-xrender.c
index 4cfe033e..2123dc9e 100644
--- a/src/compositor/meta-compositor-xrender.c
+++ b/src/compositor/meta-compositor-xrender.c
@@ -2635,8 +2635,8 @@ meta_compositor_xrender_window_opaque_region_changed (MetaCompositor *compositor
}
static void
-meta_compositor_xrender_window_shape_changed (MetaCompositor *compositor,
- MetaWindow *window)
+meta_compositor_xrender_window_shape_region_changed (MetaCompositor *compositor,
+ MetaWindow *window)
{
MetaCompositorXRender *xrender;
MetaCompWindow *cw;
@@ -3103,7 +3103,7 @@ meta_compositor_xrender_class_init (MetaCompositorXRenderClass *xrender_class)
compositor_class->hide_window = meta_compositor_xrender_hide_window;
compositor_class->window_opacity_changed = meta_compositor_xrender_window_opacity_changed;
compositor_class->window_opaque_region_changed = meta_compositor_xrender_window_opaque_region_changed;
- compositor_class->window_shape_changed = meta_compositor_xrender_window_shape_changed;
+ compositor_class->window_shape_region_changed = meta_compositor_xrender_window_shape_region_changed;
compositor_class->set_updates_frozen = meta_compositor_xrender_set_updates_frozen;
compositor_class->process_event = meta_compositor_xrender_process_event;
compositor_class->get_window_surface = meta_compositor_xrender_get_window_surface;
diff --git a/src/compositor/meta-compositor.c b/src/compositor/meta-compositor.c
index d5899417..7a2f23fd 100644
--- a/src/compositor/meta-compositor.c
+++ b/src/compositor/meta-compositor.c
@@ -385,14 +385,14 @@ meta_compositor_window_opaque_region_changed (MetaCompositor *compositor,
}
void
-meta_compositor_window_shape_changed (MetaCompositor *compositor,
- MetaWindow *window)
+meta_compositor_window_shape_region_changed (MetaCompositor *compositor,
+ MetaWindow *window)
{
MetaCompositorClass *compositor_class;
compositor_class = META_COMPOSITOR_GET_CLASS (compositor);
- compositor_class->window_shape_changed (compositor, window);
+ compositor_class->window_shape_region_changed (compositor, window);
}
void
diff --git a/src/core/window.c b/src/core/window.c
index 839dc618..cfca6fce 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -9159,7 +9159,7 @@ meta_window_update_shape_region (MetaWindow *window)
g_clear_pointer (&window->shape_region, cairo_region_destroy);
window->shape_region = shape_region;
- meta_compositor_window_shape_changed (window->display->compositor, window);
+ meta_compositor_window_shape_region_changed (window->display->compositor, window);
}
static void
diff --git a/src/include/meta-compositor.h b/src/include/meta-compositor.h
index b74d1d8a..79ad2e0c 100644
--- a/src/include/meta-compositor.h
+++ b/src/include/meta-compositor.h
@@ -70,8 +70,8 @@ void meta_compositor_window_opacity_changed (MetaCompositor *com
void meta_compositor_window_opaque_region_changed (MetaCompositor *compositor,
MetaWindow *window);
-void meta_compositor_window_shape_changed (MetaCompositor *compositor,
- MetaWindow *window);
+void meta_compositor_window_shape_region_changed (MetaCompositor *compositor,
+ MetaWindow *window);
void meta_compositor_set_updates_frozen (MetaCompositor *compositor,
MetaWindow *window,