mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-15 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename sources to ext too

Browse source
This commit is contained in:
Ilia Bozhinov 2021-02-17 08:07:07 +01:00
parent be327234a8
commit d711c3c440
3 changed files with 125 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/meson.build
View file

@ -188,7 +188,7 @@ clients = {
'wlr-workspace': { 'wlr-workspace': {
'src': 'wlr-workspace.c', 'src': 'wlr-workspace.c',
'dep': [wlroots], 'dep': [wlroots],
'proto': ['wlr-workspace-unstable-v1'], 'proto': ['ext-workspace-unstable-v1'],
}, },
} }

72
include/wlr/types/wlr_ext_workspace_v1.h
View file

@ -12,32 +12,32 @@
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
struct wlr_workspace_manager_v1 { struct wlr_ext_workspace_manager_v1 {
struct wl_event_loop *event_loop; struct wl_event_loop *event_loop;
struct wl_event_source *idle_source; struct wl_event_source *idle_source;
struct wl_global *global; struct wl_global *global;
struct wl_list resources; // wl_resource_get_link struct wl_list resources; // wl_resource_get_link
struct wl_list groups; // wlr_workspace_group_handle_v1::link struct wl_list groups; // wlr_ext_workspace_group_handle_v1::link
struct wl_listener display_destroy; struct wl_listener display_destroy;
struct { struct {
struct wl_signal commit; // wlr_workspace_manager_v1 struct wl_signal commit; // wlr_ext_workspace_manager_v1
struct wl_signal destroy; struct wl_signal destroy;
} events; } events;
void *data; void *data;
}; };
struct wlr_workspace_group_handle_v1 { struct wlr_ext_workspace_group_handle_v1 {
struct wl_list link; // wlr_workspace_manager_v1::groups struct wl_list link; // wlr_ext_workspace_manager_v1::groups
struct wl_list resources; // wl_resource_get_link struct wl_list resources; // wl_ext_resource_get_link
struct wl_list workspaces; // wlr_workspace_handle_v1::link struct wl_list workspaces; // wlr_ext_workspace_handle_v1::link
struct wl_list outputs; // wlr_workspace_group_handle_v1_output::link struct wl_list outputs; // wlr_ext_workspace_group_handle_v1_output::link
struct wlr_workspace_manager_v1 *manager; struct wlr_ext_workspace_manager_v1 *manager;
struct { struct {
struct wl_signal destroy; struct wl_signal destroy;
@ -46,24 +46,24 @@ struct wlr_workspace_group_handle_v1 {
void *data; void *data;
}; };
struct wlr_workspace_group_handle_v1_output { struct wlr_ext_workspace_group_handle_v1_output {
struct wl_list link; // wlr_workspace_group_handle_v1::outputs struct wl_list link; // wlr_ext_workspace_group_handle_v1::outputs
struct wl_listener output_destroy; struct wl_listener output_destroy;
struct wlr_output *output; struct wlr_output *output;
struct wlr_workspace_group_handle_v1 *group_handle; struct wlr_ext_workspace_group_handle_v1 *group_handle;
}; };
enum wlr_workspace_handle_v1_state enum wlr_ext_workspace_handle_v1_state
{ {
WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE = 1 << 0, WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE = 1 << 0,
}; };
struct wlr_workspace_handle_v1 { struct wlr_ext_workspace_handle_v1 {
struct wl_list link; // wlr_workspace_group_handle_v1::workspaces struct wl_list link; // wlr_ext_workspace_group_handle_v1::workspaces
struct wl_list resources; struct wl_list resources;
struct wlr_workspace_group_handle_v1 *group; struct wlr_ext_workspace_group_handle_v1 *group;
// request from the client // request from the client
uint32_t pending, current; uint32_t pending, current;
@ -81,42 +81,42 @@ struct wlr_workspace_handle_v1 {
void *data; void *data;
}; };
struct wlr_workspace_manager_v1 *wlr_workspace_manager_v1_create( struct wlr_ext_workspace_manager_v1 *wlr_ext_workspace_manager_v1_create(
struct wl_display *display); struct wl_display *display);
struct wlr_workspace_group_handle_v1 *wlr_workspace_group_handle_v1_create( struct wlr_ext_workspace_group_handle_v1 *wlr_ext_workspace_group_handle_v1_create(
struct wlr_workspace_manager_v1 *manager); struct wlr_ext_workspace_manager_v1 *manager);
/** /**
* Destroy the workspace group and all workspaces inside it. * Destroy the workspace group and all workspaces inside it.
*/ */
void wlr_workspace_group_handle_v1_destroy( void wlr_ext_workspace_group_handle_v1_destroy(
struct wlr_workspace_group_handle_v1 *group); struct wlr_ext_workspace_group_handle_v1 *group);
/** /**
* Create a new workspace in the workspace group. * Create a new workspace in the workspace group.
* Note that the compositor must set the workspace name immediately after * Note that the compositor must set the workspace name immediately after
* creating it. * creating it.
*/ */
struct wlr_workspace_handle_v1 *wlr_workspace_handle_v1_create( struct wlr_ext_workspace_handle_v1 *wlr_ext_workspace_handle_v1_create(
struct wlr_workspace_group_handle_v1 *group); struct wlr_ext_workspace_group_handle_v1 *group);
void wlr_workspace_handle_v1_destroy( void wlr_ext_workspace_handle_v1_destroy(
struct wlr_workspace_handle_v1 *workspace); struct wlr_ext_workspace_handle_v1 *workspace);
void wlr_workspace_group_handle_v1_output_enter( void wlr_ext_workspace_group_handle_v1_output_enter(
struct wlr_workspace_group_handle_v1 *group, struct wlr_output *output); struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output);
void wlr_workspace_group_handle_v1_output_leave( void wlr_ext_workspace_group_handle_v1_output_leave(
struct wlr_workspace_group_handle_v1 *group, struct wlr_output *output); struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output);
void wlr_workspace_handle_v1_set_name(struct wlr_workspace_handle_v1 *workspace, void wlr_ext_workspace_handle_v1_set_name(
const char* name); struct wlr_ext_workspace_handle_v1 *workspace, const char* name);
void wlr_workspace_handle_v1_set_coordinates( void wlr_ext_workspace_handle_v1_set_coordinates(
struct wlr_workspace_handle_v1 *workspace, struct wl_array *coordinates); struct wlr_ext_workspace_handle_v1 *workspace, struct wl_array *coordinates);
void wlr_workspace_handle_v1_set_active( void wlr_ext_workspace_handle_v1_set_active(
struct wlr_workspace_handle_v1 *workspace, bool active); struct wlr_ext_workspace_handle_v1 *workspace, bool active);
#endif #endif

176
types/wlr_ext_workspace_v1.c
View file

@ -3,27 +3,27 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <wlr/types/wlr_workspace_v1.h> #include <wlr/types/wlr_ext_workspace_v1.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "util/signal.h" #include "util/signal.h"
#include "wlr-workspace-unstable-v1-protocol.h" #include "ext-workspace-unstable-v1-protocol.h"
#define WORKSPACE_V1_VERSION 1 #define WORKSPACE_V1_VERSION 1
static void workspace_manager_idle_send_done(void *data) { static void workspace_manager_idle_send_done(void *data) {
struct wlr_workspace_manager_v1 *manager = data; struct wlr_ext_workspace_manager_v1 *manager = data;
struct wl_resource *resource, *tmp; struct wl_resource *resource, *tmp;
wl_resource_for_each_safe(resource, tmp, &manager->resources) { wl_resource_for_each_safe(resource, tmp, &manager->resources) {
zwlr_workspace_manager_v1_send_done(resource); zext_workspace_manager_v1_send_done(resource);
} }
manager->idle_source = NULL; manager->idle_source = NULL;
} }
static void workspace_manager_update_idle_source( static void workspace_manager_update_idle_source(
struct wlr_workspace_manager_v1 *manager) { struct wlr_ext_workspace_manager_v1 *manager) {
if (manager->idle_source) { if (manager->idle_source) {
return; return;
} }
@ -32,11 +32,11 @@ static void workspace_manager_update_idle_source(
workspace_manager_idle_send_done, manager); workspace_manager_idle_send_done, manager);
} }
static const struct zwlr_workspace_handle_v1_interface workspace_handle_impl; static const struct zext_workspace_handle_v1_interface workspace_handle_impl;
static struct wlr_workspace_handle_v1 *workspace_from_resource( static struct wlr_ext_workspace_handle_v1 *workspace_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, assert(wl_resource_instance_of(resource,
&zwlr_workspace_handle_v1_interface, &zext_workspace_handle_v1_interface,
&workspace_handle_impl)); &workspace_handle_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
} }
@ -48,22 +48,22 @@ static void workspace_handle_destroy(struct wl_client *client,
static void workspace_handle_activate(struct wl_client *client, static void workspace_handle_activate(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_workspace_handle_v1 *workspace = workspace_from_resource(resource); struct wlr_ext_workspace_handle_v1 *workspace = workspace_from_resource(resource);
if (!workspace) { if (!workspace) {
return; return;
} }
workspace->pending |= WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE; workspace->pending |= WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE;
} }
static void workspace_handle_deactivate(struct wl_client *client, static void workspace_handle_deactivate(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_workspace_handle_v1 *workspace = workspace_from_resource(resource); struct wlr_ext_workspace_handle_v1 *workspace = workspace_from_resource(resource);
if (!workspace) { if (!workspace) {
return; return;
} }
workspace->pending &= ~WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE; workspace->pending &= ~WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE;
} }
static void workspace_handle_resource_destroy(struct wl_resource *resource) { static void workspace_handle_resource_destroy(struct wl_resource *resource) {
@ -72,25 +72,25 @@ static void workspace_handle_resource_destroy(struct wl_resource *resource) {
static bool fill_array_from_workspace_state(struct wl_array *array, static bool fill_array_from_workspace_state(struct wl_array *array,
uint32_t state) { uint32_t state) {
if (state & WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE) { if (state & WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE) {
uint32_t *index = wl_array_add(array, sizeof(uint32_t)); uint32_t *index = wl_array_add(array, sizeof(uint32_t));
if (index == NULL) { if (index == NULL) {
return false; return false;
} }
*index = ZWLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE; *index = ZEXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE;
} }
return true; return true;
} }
static void workspace_handle_send_details_to_resource( static void workspace_handle_send_details_to_resource(
struct wlr_workspace_handle_v1 *workspace, struct wl_resource *resource) { struct wlr_ext_workspace_handle_v1 *workspace, struct wl_resource *resource) {
if (workspace->name) { if (workspace->name) {
zwlr_workspace_handle_v1_send_name(resource, workspace->name); zext_workspace_handle_v1_send_name(resource, workspace->name);
} }
if (workspace->coordinates.size > 0) { if (workspace->coordinates.size > 0) {
zwlr_workspace_handle_v1_send_coordinates(resource, zext_workspace_handle_v1_send_coordinates(resource,
&workspace->coordinates); &workspace->coordinates);
} }
@ -102,46 +102,46 @@ static void workspace_handle_send_details_to_resource(
return; return;
} }
zwlr_workspace_handle_v1_send_state(resource, &state); zext_workspace_handle_v1_send_state(resource, &state);
} }
static const struct zwlr_workspace_handle_v1_interface workspace_handle_impl = { static const struct zext_workspace_handle_v1_interface workspace_handle_impl = {
.destroy = workspace_handle_destroy, .destroy = workspace_handle_destroy,
.activate = workspace_handle_activate, .activate = workspace_handle_activate,
.deactivate = workspace_handle_deactivate, .deactivate = workspace_handle_deactivate,
}; };
void wlr_workspace_handle_v1_set_name(struct wlr_workspace_handle_v1 *workspace, void wlr_ext_workspace_handle_v1_set_name(struct wlr_ext_workspace_handle_v1 *workspace,
const char* name) { const char* name) {
free(workspace->name); free(workspace->name);
workspace->name = strdup(name); workspace->name = strdup(name);
struct wl_resource *tmp, *resource; struct wl_resource *tmp, *resource;
wl_resource_for_each_safe(resource, tmp, &workspace->resources) { wl_resource_for_each_safe(resource, tmp, &workspace->resources) {
zwlr_workspace_handle_v1_send_name(resource, name); zext_workspace_handle_v1_send_name(resource, name);
} }
workspace_manager_update_idle_source(workspace->group->manager); workspace_manager_update_idle_source(workspace->group->manager);
} }
void wlr_workspace_handle_v1_set_coordinates( void wlr_ext_workspace_handle_v1_set_coordinates(
struct wlr_workspace_handle_v1 *workspace, struct wl_array *coordinates) { struct wlr_ext_workspace_handle_v1 *workspace, struct wl_array *coordinates) {
wl_array_copy(&workspace->coordinates, coordinates); wl_array_copy(&workspace->coordinates, coordinates);
struct wl_resource *tmp, *resource; struct wl_resource *tmp, *resource;
wl_resource_for_each_safe(resource, tmp, &workspace->resources) { wl_resource_for_each_safe(resource, tmp, &workspace->resources) {
zwlr_workspace_handle_v1_send_coordinates(resource, coordinates); zext_workspace_handle_v1_send_coordinates(resource, coordinates);
} }
workspace_manager_update_idle_source(workspace->group->manager); workspace_manager_update_idle_source(workspace->group->manager);
} }
void wlr_workspace_handle_v1_set_active( void wlr_ext_workspace_handle_v1_set_active(
struct wlr_workspace_handle_v1 *workspace, bool activate) { struct wlr_ext_workspace_handle_v1 *workspace, bool activate) {
if (activate) { if (activate) {
workspace->server_state |= WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE; workspace->server_state |= WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE;
} else { } else {
workspace->server_state &= ~WLR_WORKSPACE_HANDLE_V1_STATE_ACTIVE; workspace->server_state &= ~WLR_EXT_WORKSPACE_HANDLE_V1_STATE_ACTIVE;
} }
struct wl_array state; struct wl_array state;
@ -159,7 +159,7 @@ void wlr_workspace_handle_v1_set_active(
struct wl_resource *tmp, *resource; struct wl_resource *tmp, *resource;
wl_resource_for_each_safe(resource, tmp, &workspace->resources) { wl_resource_for_each_safe(resource, tmp, &workspace->resources) {
zwlr_workspace_handle_v1_send_state(resource, &state); zext_workspace_handle_v1_send_state(resource, &state);
} }
wl_array_release(&state); wl_array_release(&state);
@ -167,12 +167,12 @@ void wlr_workspace_handle_v1_set_active(
} }
static struct wl_resource *create_workspace_resource_for_group_resource( static struct wl_resource *create_workspace_resource_for_group_resource(
struct wlr_workspace_handle_v1 *workspace, struct wlr_ext_workspace_handle_v1 *workspace,
struct wl_resource *group_resource) { struct wl_resource *group_resource) {
struct wl_client *client = wl_resource_get_client(group_resource); struct wl_client *client = wl_resource_get_client(group_resource);
struct wl_resource *resource = wl_resource_create(client, struct wl_resource *resource = wl_resource_create(client,
&zwlr_workspace_handle_v1_interface, &zext_workspace_handle_v1_interface,
wl_resource_get_version(group_resource), 0); wl_resource_get_version(group_resource), 0);
if (!resource) { if (!resource) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
@ -183,15 +183,15 @@ static struct wl_resource *create_workspace_resource_for_group_resource(
workspace_handle_resource_destroy); workspace_handle_resource_destroy);
wl_list_insert(&workspace->resources, wl_resource_get_link(resource)); wl_list_insert(&workspace->resources, wl_resource_get_link(resource));
zwlr_workspace_group_handle_v1_send_workspace(group_resource, resource); zext_workspace_group_handle_v1_send_workspace(group_resource, resource);
return resource; return resource;
} }
struct wlr_workspace_handle_v1 *wlr_workspace_handle_v1_create( struct wlr_ext_workspace_handle_v1 *wlr_ext_workspace_handle_v1_create(
struct wlr_workspace_group_handle_v1 *group) { struct wlr_ext_workspace_group_handle_v1 *group) {
struct wlr_workspace_handle_v1 *workspace = calloc(1, struct wlr_ext_workspace_handle_v1 *workspace = calloc(1,
sizeof(struct wlr_workspace_handle_v1)); sizeof(struct wlr_ext_workspace_handle_v1));
if (!workspace) { if (!workspace) {
return NULL; return NULL;
} }
@ -210,8 +210,8 @@ struct wlr_workspace_handle_v1 *wlr_workspace_handle_v1_create(
return workspace; return workspace;
} }
void wlr_workspace_handle_v1_destroy( void wlr_ext_workspace_handle_v1_destroy(
struct wlr_workspace_handle_v1 *workspace) { struct wlr_ext_workspace_handle_v1 *workspace) {
if (!workspace) { if (!workspace) {
return; return;
} }
@ -222,7 +222,7 @@ void wlr_workspace_handle_v1_destroy(
struct wl_resource *tmp, *resource; struct wl_resource *tmp, *resource;
wl_resource_for_each_safe(resource, tmp, &workspace->resources) { wl_resource_for_each_safe(resource, tmp, &workspace->resources) {
zwlr_workspace_handle_v1_send_remove(resource); zext_workspace_handle_v1_send_remove(resource);
wl_resource_set_user_data(resource, NULL); wl_resource_set_user_data(resource, NULL);
wl_list_remove(&resource->link); wl_list_remove(&resource->link);
@ -239,7 +239,7 @@ static void workspace_group_handle_handle_destroy(struct wl_client *client,
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
const struct zwlr_workspace_group_handle_v1_interface workspace_group_impl = { const struct zext_workspace_group_handle_v1_interface workspace_group_impl = {
.destroy = workspace_group_handle_handle_destroy, .destroy = workspace_group_handle_handle_destroy,
}; };
@ -251,11 +251,11 @@ static void workspace_group_resource_destroy(struct wl_resource *resource) {
* Create the workspace group resource and child workspace resources as well. * Create the workspace group resource and child workspace resources as well.
*/ */
static struct wl_resource *create_workspace_group_resource_for_resource( static struct wl_resource *create_workspace_group_resource_for_resource(
struct wlr_workspace_group_handle_v1 *group, struct wlr_ext_workspace_group_handle_v1 *group,
struct wl_resource *manager_resource) { struct wl_resource *manager_resource) {
struct wl_client *client = wl_resource_get_client(manager_resource); struct wl_client *client = wl_resource_get_client(manager_resource);
struct wl_resource *resource = wl_resource_create(client, struct wl_resource *resource = wl_resource_create(client,
&zwlr_workspace_group_handle_v1_interface, &zext_workspace_group_handle_v1_interface,
wl_resource_get_version(manager_resource), 0); wl_resource_get_version(manager_resource), 0);
if (!resource) { if (!resource) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
@ -266,9 +266,9 @@ static struct wl_resource *create_workspace_group_resource_for_resource(
workspace_group_resource_destroy); workspace_group_resource_destroy);
wl_list_insert(&group->resources, wl_resource_get_link(resource)); wl_list_insert(&group->resources, wl_resource_get_link(resource));
zwlr_workspace_manager_v1_send_workspace_group(manager_resource, resource); zext_workspace_manager_v1_send_workspace_group(manager_resource, resource);
struct wlr_workspace_handle_v1 *tmp, *workspace; struct wlr_ext_workspace_handle_v1 *tmp, *workspace;
wl_list_for_each_safe(workspace, tmp, &group->workspaces, link) { wl_list_for_each_safe(workspace, tmp, &group->workspaces, link) {
struct wl_resource *workspace_resource = struct wl_resource *workspace_resource =
create_workspace_resource_for_group_resource(workspace, resource); create_workspace_resource_for_group_resource(workspace, resource);
@ -286,17 +286,17 @@ static void send_output_to_group_resource(struct wl_resource *group_resource,
wl_resource_for_each_safe(output_resource, tmp, &output->resources) { wl_resource_for_each_safe(output_resource, tmp, &output->resources) {
if (wl_resource_get_client(output_resource) == client) { if (wl_resource_get_client(output_resource) == client) {
if (enter) { if (enter) {
zwlr_workspace_group_handle_v1_send_output_enter(group_resource, zext_workspace_group_handle_v1_send_output_enter(group_resource,
output_resource); output_resource);
} else { } else {
zwlr_workspace_group_handle_v1_send_output_leave(group_resource, zext_workspace_group_handle_v1_send_output_leave(group_resource,
output_resource); output_resource);
} }
} }
} }
} }
static void group_send_output(struct wlr_workspace_group_handle_v1 *group, static void group_send_output(struct wlr_ext_workspace_group_handle_v1 *group,
struct wlr_output *output, bool enter) { struct wlr_output *output, bool enter) {
struct wl_resource *resource, *tmp; struct wl_resource *resource, *tmp;
wl_resource_for_each_safe(resource, tmp, &group->resources) { wl_resource_for_each_safe(resource, tmp, &group->resources) {
@ -306,22 +306,22 @@ static void group_send_output(struct wlr_workspace_group_handle_v1 *group,
static void workspace_handle_output_destroy(struct wl_listener *listener, static void workspace_handle_output_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct wlr_workspace_group_handle_v1_output *output = struct wlr_ext_workspace_group_handle_v1_output *output =
wl_container_of(listener, output, output_destroy); wl_container_of(listener, output, output_destroy);
wlr_workspace_group_handle_v1_output_leave(output->group_handle, wlr_ext_workspace_group_handle_v1_output_leave(output->group_handle,
output->output); output->output);
} }
void wlr_workspace_group_handle_v1_output_enter( void wlr_ext_workspace_group_handle_v1_output_enter(
struct wlr_workspace_group_handle_v1 *group, struct wlr_output *output) { struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output) {
struct wlr_workspace_group_handle_v1_output *group_output; struct wlr_ext_workspace_group_handle_v1_output *group_output;
wl_list_for_each(group_output, &group->outputs, link) { wl_list_for_each(group_output, &group->outputs, link) {
if (group_output->output == output) { if (group_output->output == output) {
return; // we have already sent output_enter event return; // we have already sent output_enter event
} }
} }
group_output = calloc(1, sizeof(struct wlr_workspace_group_handle_v1_output)); group_output = calloc(1, sizeof(struct wlr_ext_workspace_group_handle_v1_output));
if (!group_output) { if (!group_output) {
wlr_log(WLR_ERROR, "failed to allocate memory for workspace output"); wlr_log(WLR_ERROR, "failed to allocate memory for workspace output");
return; return;
@ -338,16 +338,16 @@ void wlr_workspace_group_handle_v1_output_enter(
} }
static void group_output_destroy( static void group_output_destroy(
struct wlr_workspace_group_handle_v1_output *output) { struct wlr_ext_workspace_group_handle_v1_output *output) {
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_list_remove(&output->output_destroy.link); wl_list_remove(&output->output_destroy.link);
free(output); free(output);
} }
void wlr_workspace_group_handle_v1_output_leave( void wlr_ext_workspace_group_handle_v1_output_leave(
struct wlr_workspace_group_handle_v1 *group, struct wlr_output *output) { struct wlr_ext_workspace_group_handle_v1 *group, struct wlr_output *output) {
struct wlr_workspace_group_handle_v1_output *group_output_iterator; struct wlr_ext_workspace_group_handle_v1_output *group_output_iterator;
struct wlr_workspace_group_handle_v1_output *group_output = NULL; struct wlr_ext_workspace_group_handle_v1_output *group_output = NULL;
wl_list_for_each(group_output_iterator, &group->outputs, link) { wl_list_for_each(group_output_iterator, &group->outputs, link) {
if (group_output_iterator->output == output) { if (group_output_iterator->output == output) {
@ -365,19 +365,19 @@ void wlr_workspace_group_handle_v1_output_leave(
} }
static void group_send_details_to_resource( static void group_send_details_to_resource(
struct wlr_workspace_group_handle_v1 *group, struct wlr_ext_workspace_group_handle_v1 *group,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_workspace_group_handle_v1_output *output; struct wlr_ext_workspace_group_handle_v1_output *output;
wl_list_for_each(output, &group->outputs, link) { wl_list_for_each(output, &group->outputs, link) {
send_output_to_group_resource(resource, output->output, true); send_output_to_group_resource(resource, output->output, true);
} }
} }
struct wlr_workspace_group_handle_v1 *wlr_workspace_group_handle_v1_create( struct wlr_ext_workspace_group_handle_v1 *wlr_ext_workspace_group_handle_v1_create(
struct wlr_workspace_manager_v1 *manager) { struct wlr_ext_workspace_manager_v1 *manager) {
struct wlr_workspace_group_handle_v1 *group = calloc(1, struct wlr_ext_workspace_group_handle_v1 *group = calloc(1,
sizeof(struct wlr_workspace_group_handle_v1)); sizeof(struct wlr_ext_workspace_group_handle_v1));
if (!group) { if (!group) {
return NULL; return NULL;
} }
@ -398,28 +398,28 @@ struct wlr_workspace_group_handle_v1 *wlr_workspace_group_handle_v1_create(
return group; return group;
} }
void wlr_workspace_group_handle_v1_destroy( void wlr_ext_workspace_group_handle_v1_destroy(
struct wlr_workspace_group_handle_v1 *group) { struct wlr_ext_workspace_group_handle_v1 *group) {
if (!group) { if (!group) {
return; return;
} }
struct wlr_workspace_handle_v1 *workspace, *tmp; struct wlr_ext_workspace_handle_v1 *workspace, *tmp;
wl_list_for_each_safe(workspace, tmp, &group->workspaces, link) { wl_list_for_each_safe(workspace, tmp, &group->workspaces, link) {
wlr_workspace_handle_v1_destroy(workspace); wlr_ext_workspace_handle_v1_destroy(workspace);
} }
wlr_signal_emit_safe(&group->events.destroy, group); wlr_signal_emit_safe(&group->events.destroy, group);
workspace_manager_update_idle_source(group->manager); workspace_manager_update_idle_source(group->manager);
struct wlr_workspace_group_handle_v1_output *output, *tmp2; struct wlr_ext_workspace_group_handle_v1_output *output, *tmp2;
wl_list_for_each_safe(output, tmp2, &group->outputs, link) { wl_list_for_each_safe(output, tmp2, &group->outputs, link) {
group_output_destroy(output); group_output_destroy(output);
} }
struct wl_resource *tmp3, *resource; struct wl_resource *tmp3, *resource;
wl_resource_for_each_safe(resource, tmp3, &group->resources) { wl_resource_for_each_safe(resource, tmp3, &group->resources) {
zwlr_workspace_group_handle_v1_send_remove(resource); zext_workspace_group_handle_v1_send_remove(resource);
wl_resource_set_user_data(resource, NULL); wl_resource_set_user_data(resource, NULL);
wl_list_remove(&resource->link); wl_list_remove(&resource->link);
@ -429,25 +429,25 @@ void wlr_workspace_group_handle_v1_destroy(
free(group); free(group);
} }
static const struct zwlr_workspace_manager_v1_interface workspace_manager_impl; static const struct zext_workspace_manager_v1_interface workspace_manager_impl;
static struct wlr_workspace_manager_v1 *manager_from_resource( static struct wlr_ext_workspace_manager_v1 *manager_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, assert(wl_resource_instance_of(resource,
&zwlr_workspace_manager_v1_interface, &zext_workspace_manager_v1_interface,
&workspace_manager_impl)); &workspace_manager_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
} }
static void workspace_manager_commit(struct wl_client *client, static void workspace_manager_commit(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_workspace_manager_v1 *manager = manager_from_resource(resource); struct wlr_ext_workspace_manager_v1 *manager = manager_from_resource(resource);
if (!manager) { if (!manager) {
return; return;
} }
struct wlr_workspace_group_handle_v1 *group; struct wlr_ext_workspace_group_handle_v1 *group;
struct wlr_workspace_handle_v1 *workspace; struct wlr_ext_workspace_handle_v1 *workspace;
wl_list_for_each(group, &manager->groups, link) { wl_list_for_each(group, &manager->groups, link) {
wl_list_for_each(workspace, &group->workspaces, link) { wl_list_for_each(workspace, &group->workspaces, link) {
workspace->current = workspace->pending; workspace->current = workspace->pending;
@ -459,16 +459,16 @@ static void workspace_manager_commit(struct wl_client *client,
static void workspace_manager_stop(struct wl_client *client, static void workspace_manager_stop(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_workspace_manager_v1 *manager = manager_from_resource(resource); struct wlr_ext_workspace_manager_v1 *manager = manager_from_resource(resource);
if (!manager) { if (!manager) {
return; return;
} }
zwlr_workspace_manager_v1_send_finished(resource); zext_workspace_manager_v1_send_finished(resource);
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
static const struct zwlr_workspace_manager_v1_interface static const struct zext_workspace_manager_v1_interface
workspace_manager_impl = { workspace_manager_impl = {
.commit = workspace_manager_commit, .commit = workspace_manager_commit,
.stop = workspace_manager_stop, .stop = workspace_manager_stop,
@ -480,9 +480,9 @@ static void workspace_manager_resource_destroy( struct wl_resource *resource) {
static void workspace_manager_bind(struct wl_client *client, void *data, static void workspace_manager_bind(struct wl_client *client, void *data,
uint32_t version, uint32_t id) { uint32_t version, uint32_t id) {
struct wlr_workspace_manager_v1 *manager = data; struct wlr_ext_workspace_manager_v1 *manager = data;
struct wl_resource *resource = wl_resource_create(client, struct wl_resource *resource = wl_resource_create(client,
&zwlr_workspace_manager_v1_interface, version, id); &zext_workspace_manager_v1_interface, version, id);
if (!resource) { if (!resource) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
@ -492,18 +492,18 @@ static void workspace_manager_bind(struct wl_client *client, void *data,
wl_list_insert(&manager->resources, wl_resource_get_link(resource)); wl_list_insert(&manager->resources, wl_resource_get_link(resource));
struct wlr_workspace_group_handle_v1 *group, *tmp; struct wlr_ext_workspace_group_handle_v1 *group, *tmp;
wl_list_for_each_safe(group, tmp, &manager->groups, link) { wl_list_for_each_safe(group, tmp, &manager->groups, link) {
struct wl_resource *group_resource = struct wl_resource *group_resource =
create_workspace_group_resource_for_resource(group, resource); create_workspace_group_resource_for_resource(group, resource);
group_send_details_to_resource(group, group_resource); group_send_details_to_resource(group, group_resource);
} }
zwlr_workspace_manager_v1_send_done(resource); zext_workspace_manager_v1_send_done(resource);
} }
static void handle_display_destroy(struct wl_listener *listener, void *data) { static void handle_display_destroy(struct wl_listener *listener, void *data) {
struct wlr_workspace_manager_v1 *manager = struct wlr_ext_workspace_manager_v1 *manager =
wl_container_of(listener, manager, display_destroy); wl_container_of(listener, manager, display_destroy);
wlr_signal_emit_safe(&manager->events.destroy, manager); wlr_signal_emit_safe(&manager->events.destroy, manager);
@ -513,18 +513,18 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
free(manager); free(manager);
} }
struct wlr_workspace_manager_v1 *wlr_workspace_manager_v1_create( struct wlr_ext_workspace_manager_v1 *wlr_ext_workspace_manager_v1_create(
struct wl_display *display) { struct wl_display *display) {
struct wlr_workspace_manager_v1 *manager = calloc(1, struct wlr_ext_workspace_manager_v1 *manager = calloc(1,
sizeof(struct wlr_workspace_manager_v1)); sizeof(struct wlr_ext_workspace_manager_v1));
if (!manager) { if (!manager) {
return NULL; return NULL;
} }
manager->event_loop = wl_display_get_event_loop(display); manager->event_loop = wl_display_get_event_loop(display);
manager->global = wl_global_create(display, manager->global = wl_global_create(display,
&zwlr_workspace_manager_v1_interface, &zext_workspace_manager_v1_interface,
WORKSPACE_V1_VERSION, manager, WORKSPACE_V1_VERSION, manager,
workspace_manager_bind); workspace_manager_bind);
if (!manager->global) { if (!manager->global) {