xdg-shell: Rename focused_set / focused_unset to activated / deactivated

To try and make the distinction between this event and keyboard focus.
This commit is contained in:
Jasper St. Pierre
2014-02-08 18:11:53 -05:00
committed by Kristian Høgsberg
parent a0d8a30931
commit b223a72147
5 changed files with 30 additions and 23 deletions
+4 -4
View File
@@ -301,12 +301,12 @@ handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surf
}
static void
handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
handle_surface_activated(void *data, struct xdg_surface *xdg_surface)
{
}
static void
handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
handle_surface_deactivated(void *data, struct xdg_surface *xdg_surface)
{
}
@@ -322,8 +322,8 @@ static const struct xdg_surface_listener xdg_surface_listener = {
handle_surface_request_unset_maximized,
handle_surface_request_set_fullscreen,
handle_surface_request_unset_fullscreen,
handle_surface_focused_set,
handle_surface_focused_unset,
handle_surface_activated,
handle_surface_deactivated,
handle_surface_delete,
};
+4 -4
View File
@@ -140,12 +140,12 @@ handle_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surface)
}
static void
handle_focused_set(void *data, struct xdg_surface *xdg_surface)
handle_activated(void *data, struct xdg_surface *xdg_surface)
{
}
static void
handle_focused_unset(void *data, struct xdg_surface *xdg_surface)
handle_deactivated(void *data, struct xdg_surface *xdg_surface)
{
}
@@ -161,8 +161,8 @@ static const struct xdg_surface_listener xdg_surface_listener = {
handle_request_unset_maximized,
handle_request_set_fullscreen,
handle_request_unset_fullscreen,
handle_focused_set,
handle_focused_unset,
handle_activated,
handle_deactivated,
handle_delete,
};
+4 -4
View File
@@ -3867,14 +3867,14 @@ handle_surface_request_unset_fullscreen(void *data, struct xdg_surface *xdg_surf
}
static void
handle_surface_focused_set(void *data, struct xdg_surface *xdg_surface)
handle_surface_activated(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 1;
}
static void
handle_surface_focused_unset(void *data, struct xdg_surface *xdg_surface)
handle_surface_deactivated(void *data, struct xdg_surface *xdg_surface)
{
struct window *window = data;
window->focused = 0;
@@ -3893,8 +3893,8 @@ static const struct xdg_surface_listener xdg_surface_listener = {
handle_surface_request_unset_maximized,
handle_surface_request_set_fullscreen,
handle_surface_request_unset_fullscreen,
handle_surface_focused_set,
handle_surface_focused_unset,
handle_surface_activated,
handle_surface_deactivated,
handle_surface_delete,
};