Commit 7a99bb83 authored by Guido Gunther's avatar Guido Gunther
Browse files

Rename phosh to phosh_private

This makes it better match the protocol name. Also name the
variables consistently "phosh" instead of the overused "shell".
parent ec909bdf
......@@ -74,7 +74,7 @@ struct roots_desktop {
struct wlr_xwayland *xwayland;
struct wl_listener xwayland_surface;
struct phosh *phosh;
struct phosh_private *phosh;
struct roots_server;
#pragma once
#include <wlr/types/wlr_layer_shell.h>
struct phosh {
struct phosh_private {
struct wl_resource* resource;
struct wl_global *global;
struct roots_desktop *desktop;
struct {
struct wl_listener layer_shell_new_surface;
......@@ -14,6 +13,7 @@ struct phosh {
struct wlr_layer_surface *panel;
struct phosh* phosh_create(struct roots_desktop *desktop, struct wl_display *display);
void phosh_destroy(struct phosh *shell);
struct phosh_private* phosh_create(struct roots_desktop *desktop, struct wl_display *display);
void phosh_destroy(struct phosh_private *shell);
struct phosh_private *phosh_private_from_resource(struct wl_resource *resource);
......@@ -12,12 +12,14 @@
#include "rootston/desktop.h"
#include "rootston/phosh.h"
static void phosh_rotate_output(struct wl_client *client,
static void phosh_rotate_display(struct wl_client *client,
struct wl_resource *resource,
struct wl_resource *surface_resource,
uint32_t degrees)
struct phosh *shell = wl_resource_get_user_data(resource);
struct phosh_private *phosh = wl_resource_get_user_data(resource);
enum wl_output_transform transform = WL_OUTPUT_TRANSFORM_NORMAL;
wlr_log(WLR_DEBUG, "rotation: %d", degrees);
......@@ -43,17 +45,17 @@ static void phosh_rotate_output(struct wl_client *client,
if (!shell->panel) {
if (!phosh->panel) {
wlr_log(WLR_ERROR, "Tried to rotate inexistent panel");
wlr_output_set_transform(shell->panel->output, transform);
wlr_output_set_transform(phosh->panel->output, transform);
static void handle_phosh_panel_surface_destroy (struct wl_listener *listener, void *data) {
struct phosh *phosh =
struct phosh_private *phosh =
wl_container_of(listener, phosh, listeners.panel_surface_destroy);
if (phosh->panel) {
......@@ -65,7 +67,7 @@ static void handle_phosh_panel_surface_destroy (struct wl_listener *listener, vo
static void handle_phosh_layer_shell_new_surface(struct wl_listener *listener, void *data) {
struct wlr_layer_surface *surface = data;
struct phosh *phosh =
struct phosh_private *phosh =
wl_container_of(listener, phosh, listeners.layer_shell_new_surface);
/* We're only interested in the panel */
......@@ -79,36 +81,37 @@ static void handle_phosh_layer_shell_new_surface(struct wl_listener *listener, v
static void phosh_resource_destroy(struct wl_resource *resource) {
struct phosh *phosh = wl_resource_get_user_data(resource);
static void phosh_handle_resource_destroy(struct wl_resource *resource) {
struct phosh_private *phosh = wl_resource_get_user_data(resource);
phosh->resource = NULL;
phosh->panel = NULL;
wlr_log(WLR_DEBUG, "Destroying phosh %p (res %p)", phosh, resource);
static const struct phosh_private_interface phosh_impl = {
static const struct phosh_private_interface phosh_private_impl = {
static void
bind_phosh(struct wl_client *client, void *data, uint32_t version, uint32_t id) {
struct phosh *phosh = data;
phosh_bind(struct wl_client *client, void *data, uint32_t version, uint32_t id) {
struct phosh_private *phosh = data;
struct wl_resource *resource = wl_resource_create(client, &phosh_private_interface,
1, id);
version, id);
if (phosh->resource) {
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
"Only a single client can bind to phosh's private protocol");
/* FIXME: unsafe needs client == shell->child.client */
/* FIXME: unsafe, needs client == shell->child.client */
if (true) {
wlr_log(WLR_ERROR, "FIXME: allowing every client to bind as phosh");
phosh, phosh_resource_destroy);
phosh, phosh_handle_resource_destroy);
phosh->resource = resource;
......@@ -118,29 +121,36 @@ bind_phosh(struct wl_client *client, void *data, uint32_t version, uint32_t id)
struct phosh*
struct phosh_private*
phosh_create(struct roots_desktop *desktop, struct wl_display *display) {
struct phosh *shell = calloc(1, sizeof (struct phosh));
if (!shell)
struct phosh_private *phosh = calloc(1, sizeof (struct phosh_private));
if (!phosh)
return NULL;
shell->desktop = desktop;
phosh->desktop = desktop;
shell->listeners.layer_shell_new_surface.notify = handle_phosh_layer_shell_new_surface;
phosh->listeners.layer_shell_new_surface.notify = handle_phosh_layer_shell_new_surface;
wlr_log(WLR_INFO, "Initializing phosh private inrerface");
shell->global = wl_global_create(display, &phosh_private_interface, 1, shell, bind_phosh);
if (!shell->global) {
wlr_log(WLR_INFO, "Initializing phosh private interface");
phosh->global = wl_global_create(display, &phosh_private_interface, PHOSH_PRIVATE_VERSION, phosh, phosh_bind);
if (!phosh->global) {
return NULL;
return shell;
return phosh;
void phosh_destroy(struct phosh *shell) {
void phosh_destroy(struct phosh_private *phosh) {
struct phosh_private *phosh_private_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, &phosh_private_interface,
return wl_resource_get_user_data(resource);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment