[gtk+/wip/william/deprecations: 1/5] mir: more deprecations
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/william/deprecations: 1/5] mir: more deprecations
- Date: Mon, 27 Feb 2017 23:33:24 +0000 (UTC)
commit b49a676929d543474416a5a17dd1d0a5e7b9f8fe
Author: William Hua <william hua canonical com>
Date: Mon Feb 27 12:08:39 2017 -0500
mir: more deprecations
gdk/mir/gdkmir-private.h | 4 ++--
gdk/mir/gdkmireventsource.c | 26 +++++++++++++-------------
gdk/mir/gdkmirwindowimpl.c | 26 +++++++++++++-------------
3 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/gdk/mir/gdkmir-private.h b/gdk/mir/gdkmir-private.h
index 8b8835a..279b807 100644
--- a/gdk/mir/gdkmir-private.h
+++ b/gdk/mir/gdkmir-private.h
@@ -87,9 +87,9 @@ MirWindow *_gdk_mir_window_get_mir_window (GdkWindow *window);
GdkWindowImpl *_gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window);
-void _gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl, MirWindowState state);
+void _gdk_mir_window_impl_set_window_state (GdkMirWindowImpl *impl, MirWindowState state);
-void _gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl, MirWindowType type);
+void _gdk_mir_window_impl_set_window_type (GdkMirWindowImpl *impl, MirWindowType type);
void _gdk_mir_window_set_surface_output (GdkWindow *window, gdouble scale);
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index 0fe43cc..20e3e85 100644
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -452,38 +452,38 @@ handle_window_event (GdkWindow *window,
switch (mir_window_event_get_attribute (event))
{
- case mir_surface_attrib_type:
- _gdk_mir_window_impl_set_surface_type (impl, mir_window_event_get_attribute_value (event));
+ case mir_window_attrib_type:
+ _gdk_mir_window_impl_set_window_type (impl, mir_window_event_get_attribute_value (event));
break;
- case mir_surface_attrib_state:
+ case mir_window_attrib_state:
state = mir_window_event_get_attribute_value (event);
- _gdk_mir_window_impl_set_surface_state (impl, state);
+ _gdk_mir_window_impl_set_window_state (impl, state);
switch (state)
{
- case mir_surface_state_restored:
- case mir_surface_state_hidden:
+ case mir_window_state_restored:
+ case mir_window_state_hidden:
gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_ICONIFIED |
GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_FULLSCREEN,
0);
break;
- case mir_surface_state_minimized:
+ case mir_window_state_minimized:
gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_MAXIMIZED |
GDK_WINDOW_STATE_FULLSCREEN,
GDK_WINDOW_STATE_ICONIFIED);
break;
- case mir_surface_state_maximized:
- case mir_surface_state_vertmaximized:
- case mir_surface_state_horizmaximized:
+ case mir_window_state_maximized:
+ case mir_window_state_vertmaximized:
+ case mir_window_state_horizmaximized:
gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_ICONIFIED |
GDK_WINDOW_STATE_FULLSCREEN,
GDK_WINDOW_STATE_MAXIMIZED);
break;
- case mir_surface_state_fullscreen:
+ case mir_window_state_fullscreen:
gdk_synthesize_window_state (window,
GDK_WINDOW_STATE_ICONIFIED |
GDK_WINDOW_STATE_MAXIMIZED,
@@ -494,9 +494,9 @@ handle_window_event (GdkWindow *window,
}
break;
- case mir_surface_attrib_swapinterval:
+ case mir_window_attrib_swapinterval:
break;
- case mir_surface_attrib_focus:
+ case mir_window_attrib_focus:
generate_focus_event (window, mir_window_event_get_attribute_value (event) != 0);
break;
default:
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index eaac45b..dc7d1e1 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -218,15 +218,15 @@ _gdk_mir_window_impl_new (GdkDisplay *display, GdkWindow *window)
}
void
-_gdk_mir_window_impl_set_surface_state (GdkMirWindowImpl *impl,
- MirWindowState state)
+_gdk_mir_window_impl_set_window_state (GdkMirWindowImpl *impl,
+ MirWindowState state)
{
impl->window_state = state;
}
void
-_gdk_mir_window_impl_set_surface_type (GdkMirWindowImpl *impl,
- MirWindowType type)
+_gdk_mir_window_impl_set_window_type (GdkMirWindowImpl *impl,
+ MirWindowType type)
{
}
@@ -270,8 +270,8 @@ gdk_mir_window_impl_init (GdkMirWindowImpl *impl)
}
static void
-set_surface_state (GdkMirWindowImpl *impl,
- MirWindowState state)
+set_window_state (GdkMirWindowImpl *impl,
+ MirWindowState state)
{
MirConnection *connection = gdk_mir_display_get_mir_connection (impl->display);
MirWindowSpec *spec;
@@ -751,7 +751,7 @@ gdk_mir_window_impl_show (GdkWindow *window,
//g_printerr ("gdk_mir_window_impl_show window=%p\n", window);
impl->visible = TRUE;
- set_surface_state (impl, mir_surface_state_restored);
+ set_window_state (impl, mir_window_state_restored);
/* Make sure there's a surface to see */
ensure_mir_window (window);
@@ -774,7 +774,7 @@ gdk_mir_window_impl_hide (GdkWindow *window)
impl->cursor_inside = FALSE;
impl->visible = FALSE;
- set_surface_state (impl, mir_surface_state_hidden);
+ set_window_state (impl, mir_window_state_hidden);
}
static void
@@ -786,7 +786,7 @@ gdk_mir_window_impl_withdraw (GdkWindow *window)
impl->cursor_inside = FALSE;
impl->visible = FALSE;
- set_surface_state (impl, mir_surface_state_hidden);
+ set_window_state (impl, mir_window_state_hidden);
}
static void
@@ -1537,21 +1537,21 @@ static void
gdk_mir_window_impl_maximize (GdkWindow *window)
{
//g_printerr ("gdk_mir_window_impl_maximize window=%p\n", window);
- set_surface_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_surface_state_maximized);
+ set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_maximized);
}
static void
gdk_mir_window_impl_unmaximize (GdkWindow *window)
{
//g_printerr ("gdk_mir_window_impl_unmaximize window=%p\n", window);
- set_surface_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_surface_state_restored);
+ set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
}
static void
gdk_mir_window_impl_fullscreen (GdkWindow *window)
{
//g_printerr ("gdk_mir_window_impl_fullscreen window=%p\n", window);
- set_surface_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_surface_state_fullscreen);
+ set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_fullscreen);
}
static void
@@ -1564,7 +1564,7 @@ static void
gdk_mir_window_impl_unfullscreen (GdkWindow *window)
{
//g_printerr ("gdk_mir_window_impl_unfullscreen window=%p\n", window);
- set_surface_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_surface_state_restored);
+ set_window_state (GDK_MIR_WINDOW_IMPL (window->impl), mir_window_state_restored);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]