commit 9884692d54433f5fca0c3dcb77bc4df01116c608
parent c9bd0ea004f240e3e4babcfd3686e897e73db3ef
Author: deurzen <max@deurzen.net>
Date: Mon, 30 May 2022 20:59:08 +0200
renames files
Diffstat:
9 files changed, 770 insertions(+), 770 deletions(-)
diff --git a/include/kranewl/tree/xdg_view.hh b/include/kranewl/tree/xdg-view.hh
diff --git a/include/kranewl/tree/xwayland_view.hh b/include/kranewl/tree/xwayland-view.hh
diff --git a/src/kranewl/model.cc b/src/kranewl/model.cc
@@ -13,8 +13,8 @@
#include <kranewl/server.hh>
#include <kranewl/tree/output.hh>
#include <kranewl/tree/view.hh>
-#include <kranewl/tree/xdg_view.hh>
-#include <kranewl/tree/xwayland_view.hh>
+#include <kranewl/tree/xdg-view.hh>
+#include <kranewl/tree/xwayland-view.hh>
#include <kranewl/workspace.hh>
#include <spdlog/spdlog.h>
diff --git a/src/kranewl/server.cc b/src/kranewl/server.cc
@@ -7,9 +7,9 @@
#include <kranewl/model.hh>
#include <kranewl/tree/output.hh>
#include <kranewl/tree/view.hh>
-#include <kranewl/tree/xdg_view.hh>
+#include <kranewl/tree/xdg-view.hh>
#ifdef XWAYLAND
-#include <kranewl/tree/xwayland_view.hh>
+#include <kranewl/tree/xwayland-view.hh>
#include <kranewl/xwayland.hh>
#endif
diff --git a/src/kranewl/tree/view.cc b/src/kranewl/tree/view.cc
@@ -4,7 +4,7 @@
#include <kranewl/scene-layer.hh>
#include <kranewl/server.hh>
#include <kranewl/tree/view.hh>
-#include <kranewl/tree/xdg_view.hh>
+#include <kranewl/tree/xdg-view.hh>
// https://github.com/swaywm/wlroots/issues/682
#include <pthread.h>
diff --git a/src/kranewl/tree/xdg-view.cc b/src/kranewl/tree/xdg-view.cc
@@ -0,0 +1,476 @@
+#include <trace.hh>
+
+#include <kranewl/context.hh>
+#include <kranewl/model.hh>
+#include <kranewl/scene-layer.hh>
+#include <kranewl/server.hh>
+#include <kranewl/tree/output.hh>
+#include <kranewl/tree/view.hh>
+#include <kranewl/tree/xdg-view.hh>
+#include <kranewl/workspace.hh>
+
+// https://github.com/swaywm/wlroots/issues/682
+#include <pthread.h>
+#define class class_
+#define namespace namespace_
+#define static
+extern "C" {
+#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_idle_inhibit_v1.h>
+#include <wlr/types/wlr_layer_shell_v1.h>
+#include <wlr/types/wlr_scene.h>
+#include <wlr/types/wlr_xdg_shell.h>
+}
+#undef static
+#undef namespace
+#undef class
+
+XDGView::XDGView(
+ struct wlr_xdg_surface* wlr_xdg_surface,
+ Server_ptr server,
+ Model_ptr model,
+ Seat_ptr seat
+)
+ : View(
+ this,
+ reinterpret_cast<std::uintptr_t>(wlr_xdg_surface),
+ server,
+ model,
+ seat,
+ wlr_xdg_surface->toplevel->base->surface
+ ),
+ mp_wlr_xdg_surface(wlr_xdg_surface),
+ mp_wlr_xdg_toplevel(wlr_xdg_surface->toplevel),
+ ml_commit({ .notify = XDGView::handle_commit }),
+ ml_request_move({ .notify = XDGView::handle_request_move }),
+ ml_request_resize({ .notify = XDGView::handle_request_resize }),
+ ml_request_fullscreen({ .notify = XDGView::handle_request_fullscreen }),
+ ml_set_title({ .notify = XDGView::handle_set_title }),
+ ml_set_app_id({ .notify = XDGView::handle_set_app_id }),
+ ml_new_popup({ .notify = XDGView::handle_new_popup }),
+ ml_map({ .notify = XDGView::handle_map }),
+ ml_unmap({ .notify = XDGView::handle_unmap }),
+ ml_destroy({ .notify = XDGView::handle_destroy })
+{
+ wl_signal_add(&mp_wlr_xdg_surface->events.map, &ml_map);
+ wl_signal_add(&mp_wlr_xdg_surface->events.unmap, &ml_unmap);
+ wl_signal_add(&mp_wlr_xdg_surface->events.destroy, &ml_destroy);
+}
+
+XDGView::~XDGView()
+{}
+
+Region
+XDGView::constraints()
+{
+ TRACE();
+
+}
+
+pid_t
+XDGView::pid()
+{
+ TRACE();
+
+ pid_t pid;
+ struct wl_client* client
+ = wl_resource_get_client(mp_wlr_surface->resource);
+
+ wl_client_get_credentials(client, &pid, nullptr, nullptr);
+ return pid;
+}
+
+bool
+XDGView::prefers_floating()
+{
+ TRACE();
+
+ struct wlr_xdg_toplevel_state *state = &mp_wlr_xdg_toplevel->current;
+ return mp_wlr_xdg_toplevel->parent || (state->min_width != 0 && state->min_height != 0
+ && (state->min_width == state->max_width || state->min_height == state->max_height));
+}
+
+View_ptr
+XDGView::is_transient_for()
+{
+ TRACE();
+
+}
+
+void
+XDGView::focus(Toggle toggle)
+{
+ TRACE();
+
+ switch (toggle) {
+ case Toggle::On:
+ {
+ if (focused())
+ return;
+
+ set_focused(true);
+ activate(toggle);
+ render_decoration();
+ break;
+ }
+ case Toggle::Off:
+ {
+ if (!focused())
+ return;
+
+ set_focused(false);
+ activate(toggle);
+ render_decoration();
+ break;
+ }
+ case Toggle::Reverse:
+ {
+ focus(
+ focused()
+ ? Toggle::Off
+ : Toggle::On
+ );
+ return;
+ }
+ default: break;
+ }
+}
+
+void
+XDGView::activate(Toggle toggle)
+{
+ TRACE();
+
+ switch (toggle) {
+ case Toggle::On:
+ {
+ if (activated())
+ return;
+
+ set_activated(true);
+
+ struct wlr_keyboard* keyboard = wlr_seat_get_keyboard(mp_seat->mp_wlr_seat);
+ if (keyboard)
+ wlr_seat_keyboard_notify_enter(
+ mp_seat->mp_wlr_seat,
+ mp_wlr_surface,
+ keyboard->keycodes,
+ keyboard->num_keycodes,
+ &keyboard->modifiers
+ );
+ else
+ wlr_seat_keyboard_notify_enter(
+ mp_seat->mp_wlr_seat,
+ mp_wlr_surface,
+ nullptr,
+ 0,
+ nullptr
+ );
+
+ wlr_xdg_toplevel_set_activated(mp_wlr_xdg_surface, true);
+ break;
+ }
+ case Toggle::Off:
+ {
+ if (!activated())
+ return;
+
+ set_activated(false);
+ wlr_xdg_toplevel_set_activated(mp_wlr_xdg_surface, false);
+ break;
+ }
+ case Toggle::Reverse:
+ {
+ activate(
+ activated()
+ ? Toggle::Off
+ : Toggle::On
+ );
+ return;
+ }
+ default: break;
+ }
+}
+
+void
+XDGView::set_tiled(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XDGView::set_fullscreen(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XDGView::set_resizing(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XDGView::configure(Region const& region, Extents const& extents, bool interactive)
+{
+ TRACE();
+
+ wlr_scene_node_set_position(mp_scene, region.pos.x, region.pos.y);
+ wlr_scene_node_set_position(mp_scene_surface, extents.left, extents.top);
+ wlr_scene_rect_set_size(m_protrusions[0], region.dim.w, extents.top);
+ wlr_scene_rect_set_size(m_protrusions[1], region.dim.w, extents.bottom);
+ wlr_scene_rect_set_size(m_protrusions[2], extents.left, region.dim.h - extents.top - extents.bottom);
+ wlr_scene_rect_set_size(m_protrusions[3], extents.right, region.dim.h - extents.top - extents.bottom);
+ wlr_scene_node_set_position(&m_protrusions[0]->node, 0, 0);
+ wlr_scene_node_set_position(&m_protrusions[1]->node, 0, region.dim.h - extents.bottom);
+ wlr_scene_node_set_position(&m_protrusions[2]->node, 0, extents.top);
+ wlr_scene_node_set_position(&m_protrusions[3]->node, region.dim.w - extents.right, extents.top);
+
+ m_resize = wlr_xdg_toplevel_set_size(
+ mp_wlr_xdg_surface,
+ region.dim.w - extents.left - extents.right,
+ region.dim.h - extents.top - extents.bottom
+ );
+}
+
+void
+XDGView::close()
+{
+ TRACE();
+ wlr_xdg_toplevel_send_close(mp_wlr_xdg_surface);
+}
+
+void
+XDGView::close_popups()
+{
+ TRACE();
+
+}
+
+void
+XDGView::destroy()
+{
+ TRACE();
+
+}
+
+void
+XDGView::handle_commit(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_commit);
+
+ if (view->m_resize && view->m_resize <= view->mp_wlr_xdg_surface->current.configure_serial)
+ view->m_resize = 0;
+}
+
+void
+XDGView::handle_request_move(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XDGView::handle_request_resize(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XDGView::handle_request_fullscreen(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XDGView::handle_set_title(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_set_title);
+ view->m_title = view->mp_wlr_xdg_toplevel->title;
+ view->m_title_formatted = view->m_title;
+ view->format_uid();
+}
+
+void
+XDGView::handle_set_app_id(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_set_app_id);
+ view->m_app_id = view->mp_wlr_xdg_toplevel->app_id;
+ view->format_uid();
+}
+
+void
+XDGView::handle_new_popup(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XDGView::handle_map(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_map);
+ Server_ptr server = view->mp_server;
+ Model_ptr model = view->mp_model;
+
+ view->m_pid = view->pid();
+ view->set_floating(view->prefers_floating());
+
+ struct wlr_xdg_surface* wlr_xdg_surface = view->mp_wlr_xdg_surface;
+ struct wlr_xdg_toplevel* wlr_xdg_toplevel = view->mp_wlr_xdg_toplevel;
+
+ Dim preferred_dim = Dim{
+ .w = wlr_xdg_toplevel->base->current.geometry.width,
+ .h = wlr_xdg_toplevel->base->current.geometry.height,
+ };
+
+ if (!preferred_dim.w && !preferred_dim.h) {
+ preferred_dim.w = wlr_xdg_toplevel->base->surface->current.width;
+ preferred_dim.h = wlr_xdg_toplevel->base->surface->current.height;
+ }
+
+ Extents const& extents = view->free_decoration().extents();
+ preferred_dim.w += extents.left + extents.right;
+ preferred_dim.h += extents.top + extents.bottom;
+ view->set_preferred_dim(preferred_dim);
+
+ struct wlr_xdg_toplevel_state* state = &wlr_xdg_toplevel->current;
+ view->set_minimum_dim(Dim{
+ .w = state->min_width,
+ .h = state->min_height
+ });
+
+ view->set_free_region(Region{
+ .pos = Pos{0, 0},
+ .dim = preferred_dim
+ });
+
+ view->set_tile_region(Region{
+ .pos = Pos{0, 0},
+ .dim = preferred_dim
+ });
+
+ view->m_app_id = wlr_xdg_toplevel->app_id
+ ? std::string(wlr_xdg_toplevel->app_id)
+ : "N/a";
+ view->m_title = wlr_xdg_toplevel->title
+ ? std::string(wlr_xdg_toplevel->title)
+ : "N/a";
+ view->m_title_formatted = view->m_title; // TODO: format title
+
+ wlr_xdg_toplevel_set_tiled(
+ wlr_xdg_surface,
+ view->free_decoration_to_wlr_edges()
+ );
+
+ view->mp_scene = &wlr_scene_tree_create(
+ server->m_scene_layers[SCENE_LAYER_TILE]
+ )->node;
+ view->mp_wlr_surface->data = view->mp_scene_surface = wlr_scene_xdg_surface_create(
+ view->mp_scene,
+ view->mp_wlr_xdg_surface
+ );
+ view->mp_scene_surface->data = view;
+
+ view->relayer(
+ view->floating()
+ ? SCENE_LAYER_FREE
+ : SCENE_LAYER_TILE
+ );
+
+ for (std::size_t i = 0; i < 4; ++i) {
+ view->m_protrusions[i] = wlr_scene_rect_create(
+ view->mp_scene,
+ 0, 0,
+ view->active_decoration().colorscheme.unfocused.values
+ );
+ view->m_protrusions[i]->node.data = view;
+ wlr_scene_rect_set_color(
+ view->m_protrusions[i],
+ view->active_decoration().colorscheme.unfocused.values
+ );
+ wlr_scene_node_lower_to_bottom(&view->m_protrusions[i]->node);
+ }
+
+ wl_signal_add(&wlr_xdg_toplevel->base->surface->events.commit, &view->ml_commit);
+ wl_signal_add(&wlr_xdg_toplevel->base->events.new_popup, &view->ml_new_popup);
+ wl_signal_add(&wlr_xdg_toplevel->events.request_fullscreen, &view->ml_request_fullscreen);
+ wl_signal_add(&wlr_xdg_toplevel->events.request_move, &view->ml_request_move);
+ wl_signal_add(&wlr_xdg_toplevel->events.request_resize, &view->ml_request_resize);
+ wl_signal_add(&wlr_xdg_toplevel->events.set_title, &view->ml_set_title);
+ wl_signal_add(&wlr_xdg_toplevel->events.set_app_id, &view->ml_set_app_id);
+
+ Workspace_ptr workspace;
+
+ if (wlr_xdg_toplevel->requested.fullscreen
+ && wlr_xdg_toplevel->requested.fullscreen_output->data)
+ {
+ Output_ptr output = reinterpret_cast<Output_ptr>(
+ wlr_xdg_toplevel->requested.fullscreen_output->data
+ );
+
+ Context_ptr context = output->context();
+ workspace = context->workspace();
+ } else
+ workspace = model->mp_workspace;
+
+ view->set_mapped(true);
+ view->render_decoration();
+ model->register_view(view, workspace);
+}
+
+void
+XDGView::handle_unmap(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_unmap);
+
+ wl_list_remove(&view->ml_commit.link);
+ wl_list_remove(&view->ml_new_popup.link);
+ wl_list_remove(&view->ml_request_fullscreen.link);
+ wl_list_remove(&view->ml_request_move.link);
+ wl_list_remove(&view->ml_request_resize.link);
+ wl_list_remove(&view->ml_set_title.link);
+ wl_list_remove(&view->ml_set_app_id.link);
+
+ view->activate(Toggle::Off);
+ view->mp_model->unregister_view(view);
+
+ wlr_scene_node_destroy(view->mp_scene);
+ view->mp_wlr_surface = nullptr;
+ view->set_managed(false);
+
+ if (view->mp_model->mp_workspace)
+ view->mp_model->apply_layout(view->mp_workspace);
+}
+
+void
+XDGView::handle_destroy(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+ XDGView_ptr view = wl_container_of(listener, view, ml_destroy);
+
+ wl_list_remove(&view->ml_map.link);
+ wl_list_remove(&view->ml_unmap.link);
+ wl_list_remove(&view->ml_destroy.link);
+ wl_list_remove(&view->m_events.unmap.listener_list);
+
+ view->mp_wlr_xdg_toplevel = nullptr;
+ view->mp_wlr_xdg_surface = nullptr;
+ view->mp_model->destroy_view(view);
+}
diff --git a/src/kranewl/tree/xdg_view.cc b/src/kranewl/tree/xdg_view.cc
@@ -1,476 +0,0 @@
-#include <trace.hh>
-
-#include <kranewl/context.hh>
-#include <kranewl/model.hh>
-#include <kranewl/scene-layer.hh>
-#include <kranewl/server.hh>
-#include <kranewl/tree/output.hh>
-#include <kranewl/tree/view.hh>
-#include <kranewl/tree/xdg_view.hh>
-#include <kranewl/workspace.hh>
-
-// https://github.com/swaywm/wlroots/issues/682
-#include <pthread.h>
-#define class class_
-#define namespace namespace_
-#define static
-extern "C" {
-#include <wlr/types/wlr_idle.h>
-#include <wlr/types/wlr_idle_inhibit_v1.h>
-#include <wlr/types/wlr_layer_shell_v1.h>
-#include <wlr/types/wlr_scene.h>
-#include <wlr/types/wlr_xdg_shell.h>
-}
-#undef static
-#undef namespace
-#undef class
-
-XDGView::XDGView(
- struct wlr_xdg_surface* wlr_xdg_surface,
- Server_ptr server,
- Model_ptr model,
- Seat_ptr seat
-)
- : View(
- this,
- reinterpret_cast<std::uintptr_t>(wlr_xdg_surface),
- server,
- model,
- seat,
- wlr_xdg_surface->toplevel->base->surface
- ),
- mp_wlr_xdg_surface(wlr_xdg_surface),
- mp_wlr_xdg_toplevel(wlr_xdg_surface->toplevel),
- ml_commit({ .notify = XDGView::handle_commit }),
- ml_request_move({ .notify = XDGView::handle_request_move }),
- ml_request_resize({ .notify = XDGView::handle_request_resize }),
- ml_request_fullscreen({ .notify = XDGView::handle_request_fullscreen }),
- ml_set_title({ .notify = XDGView::handle_set_title }),
- ml_set_app_id({ .notify = XDGView::handle_set_app_id }),
- ml_new_popup({ .notify = XDGView::handle_new_popup }),
- ml_map({ .notify = XDGView::handle_map }),
- ml_unmap({ .notify = XDGView::handle_unmap }),
- ml_destroy({ .notify = XDGView::handle_destroy })
-{
- wl_signal_add(&mp_wlr_xdg_surface->events.map, &ml_map);
- wl_signal_add(&mp_wlr_xdg_surface->events.unmap, &ml_unmap);
- wl_signal_add(&mp_wlr_xdg_surface->events.destroy, &ml_destroy);
-}
-
-XDGView::~XDGView()
-{}
-
-Region
-XDGView::constraints()
-{
- TRACE();
-
-}
-
-pid_t
-XDGView::pid()
-{
- TRACE();
-
- pid_t pid;
- struct wl_client* client
- = wl_resource_get_client(mp_wlr_surface->resource);
-
- wl_client_get_credentials(client, &pid, nullptr, nullptr);
- return pid;
-}
-
-bool
-XDGView::prefers_floating()
-{
- TRACE();
-
- struct wlr_xdg_toplevel_state *state = &mp_wlr_xdg_toplevel->current;
- return mp_wlr_xdg_toplevel->parent || (state->min_width != 0 && state->min_height != 0
- && (state->min_width == state->max_width || state->min_height == state->max_height));
-}
-
-View_ptr
-XDGView::is_transient_for()
-{
- TRACE();
-
-}
-
-void
-XDGView::focus(Toggle toggle)
-{
- TRACE();
-
- switch (toggle) {
- case Toggle::On:
- {
- if (focused())
- return;
-
- set_focused(true);
- activate(toggle);
- render_decoration();
- break;
- }
- case Toggle::Off:
- {
- if (!focused())
- return;
-
- set_focused(false);
- activate(toggle);
- render_decoration();
- break;
- }
- case Toggle::Reverse:
- {
- focus(
- focused()
- ? Toggle::Off
- : Toggle::On
- );
- return;
- }
- default: break;
- }
-}
-
-void
-XDGView::activate(Toggle toggle)
-{
- TRACE();
-
- switch (toggle) {
- case Toggle::On:
- {
- if (activated())
- return;
-
- set_activated(true);
-
- struct wlr_keyboard* keyboard = wlr_seat_get_keyboard(mp_seat->mp_wlr_seat);
- if (keyboard)
- wlr_seat_keyboard_notify_enter(
- mp_seat->mp_wlr_seat,
- mp_wlr_surface,
- keyboard->keycodes,
- keyboard->num_keycodes,
- &keyboard->modifiers
- );
- else
- wlr_seat_keyboard_notify_enter(
- mp_seat->mp_wlr_seat,
- mp_wlr_surface,
- nullptr,
- 0,
- nullptr
- );
-
- wlr_xdg_toplevel_set_activated(mp_wlr_xdg_surface, true);
- break;
- }
- case Toggle::Off:
- {
- if (!activated())
- return;
-
- set_activated(false);
- wlr_xdg_toplevel_set_activated(mp_wlr_xdg_surface, false);
- break;
- }
- case Toggle::Reverse:
- {
- activate(
- activated()
- ? Toggle::Off
- : Toggle::On
- );
- return;
- }
- default: break;
- }
-}
-
-void
-XDGView::set_tiled(Toggle)
-{
- TRACE();
-
-}
-
-void
-XDGView::set_fullscreen(Toggle)
-{
- TRACE();
-
-}
-
-void
-XDGView::set_resizing(Toggle)
-{
- TRACE();
-
-}
-
-void
-XDGView::configure(Region const& region, Extents const& extents, bool interactive)
-{
- TRACE();
-
- wlr_scene_node_set_position(mp_scene, region.pos.x, region.pos.y);
- wlr_scene_node_set_position(mp_scene_surface, extents.left, extents.top);
- wlr_scene_rect_set_size(m_protrusions[0], region.dim.w, extents.top);
- wlr_scene_rect_set_size(m_protrusions[1], region.dim.w, extents.bottom);
- wlr_scene_rect_set_size(m_protrusions[2], extents.left, region.dim.h - extents.top - extents.bottom);
- wlr_scene_rect_set_size(m_protrusions[3], extents.right, region.dim.h - extents.top - extents.bottom);
- wlr_scene_node_set_position(&m_protrusions[0]->node, 0, 0);
- wlr_scene_node_set_position(&m_protrusions[1]->node, 0, region.dim.h - extents.bottom);
- wlr_scene_node_set_position(&m_protrusions[2]->node, 0, extents.top);
- wlr_scene_node_set_position(&m_protrusions[3]->node, region.dim.w - extents.right, extents.top);
-
- m_resize = wlr_xdg_toplevel_set_size(
- mp_wlr_xdg_surface,
- region.dim.w - extents.left - extents.right,
- region.dim.h - extents.top - extents.bottom
- );
-}
-
-void
-XDGView::close()
-{
- TRACE();
- wlr_xdg_toplevel_send_close(mp_wlr_xdg_surface);
-}
-
-void
-XDGView::close_popups()
-{
- TRACE();
-
-}
-
-void
-XDGView::destroy()
-{
- TRACE();
-
-}
-
-void
-XDGView::handle_commit(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_commit);
-
- if (view->m_resize && view->m_resize <= view->mp_wlr_xdg_surface->current.configure_serial)
- view->m_resize = 0;
-}
-
-void
-XDGView::handle_request_move(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XDGView::handle_request_resize(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XDGView::handle_request_fullscreen(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XDGView::handle_set_title(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_set_title);
- view->m_title = view->mp_wlr_xdg_toplevel->title;
- view->m_title_formatted = view->m_title;
- view->format_uid();
-}
-
-void
-XDGView::handle_set_app_id(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_set_app_id);
- view->m_app_id = view->mp_wlr_xdg_toplevel->app_id;
- view->format_uid();
-}
-
-void
-XDGView::handle_new_popup(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XDGView::handle_map(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_map);
- Server_ptr server = view->mp_server;
- Model_ptr model = view->mp_model;
-
- view->m_pid = view->pid();
- view->set_floating(view->prefers_floating());
-
- struct wlr_xdg_surface* wlr_xdg_surface = view->mp_wlr_xdg_surface;
- struct wlr_xdg_toplevel* wlr_xdg_toplevel = view->mp_wlr_xdg_toplevel;
-
- Dim preferred_dim = Dim{
- .w = wlr_xdg_toplevel->base->current.geometry.width,
- .h = wlr_xdg_toplevel->base->current.geometry.height,
- };
-
- if (!preferred_dim.w && !preferred_dim.h) {
- preferred_dim.w = wlr_xdg_toplevel->base->surface->current.width;
- preferred_dim.h = wlr_xdg_toplevel->base->surface->current.height;
- }
-
- Extents const& extents = view->free_decoration().extents();
- preferred_dim.w += extents.left + extents.right;
- preferred_dim.h += extents.top + extents.bottom;
- view->set_preferred_dim(preferred_dim);
-
- struct wlr_xdg_toplevel_state* state = &wlr_xdg_toplevel->current;
- view->set_minimum_dim(Dim{
- .w = state->min_width,
- .h = state->min_height
- });
-
- view->set_free_region(Region{
- .pos = Pos{0, 0},
- .dim = preferred_dim
- });
-
- view->set_tile_region(Region{
- .pos = Pos{0, 0},
- .dim = preferred_dim
- });
-
- view->m_app_id = wlr_xdg_toplevel->app_id
- ? std::string(wlr_xdg_toplevel->app_id)
- : "N/a";
- view->m_title = wlr_xdg_toplevel->title
- ? std::string(wlr_xdg_toplevel->title)
- : "N/a";
- view->m_title_formatted = view->m_title; // TODO: format title
-
- wlr_xdg_toplevel_set_tiled(
- wlr_xdg_surface,
- view->free_decoration_to_wlr_edges()
- );
-
- view->mp_scene = &wlr_scene_tree_create(
- server->m_scene_layers[SCENE_LAYER_TILE]
- )->node;
- view->mp_wlr_surface->data = view->mp_scene_surface = wlr_scene_xdg_surface_create(
- view->mp_scene,
- view->mp_wlr_xdg_surface
- );
- view->mp_scene_surface->data = view;
-
- view->relayer(
- view->floating()
- ? SCENE_LAYER_FREE
- : SCENE_LAYER_TILE
- );
-
- for (std::size_t i = 0; i < 4; ++i) {
- view->m_protrusions[i] = wlr_scene_rect_create(
- view->mp_scene,
- 0, 0,
- view->active_decoration().colorscheme.unfocused.values
- );
- view->m_protrusions[i]->node.data = view;
- wlr_scene_rect_set_color(
- view->m_protrusions[i],
- view->active_decoration().colorscheme.unfocused.values
- );
- wlr_scene_node_lower_to_bottom(&view->m_protrusions[i]->node);
- }
-
- wl_signal_add(&wlr_xdg_toplevel->base->surface->events.commit, &view->ml_commit);
- wl_signal_add(&wlr_xdg_toplevel->base->events.new_popup, &view->ml_new_popup);
- wl_signal_add(&wlr_xdg_toplevel->events.request_fullscreen, &view->ml_request_fullscreen);
- wl_signal_add(&wlr_xdg_toplevel->events.request_move, &view->ml_request_move);
- wl_signal_add(&wlr_xdg_toplevel->events.request_resize, &view->ml_request_resize);
- wl_signal_add(&wlr_xdg_toplevel->events.set_title, &view->ml_set_title);
- wl_signal_add(&wlr_xdg_toplevel->events.set_app_id, &view->ml_set_app_id);
-
- Workspace_ptr workspace;
-
- if (wlr_xdg_toplevel->requested.fullscreen
- && wlr_xdg_toplevel->requested.fullscreen_output->data)
- {
- Output_ptr output = reinterpret_cast<Output_ptr>(
- wlr_xdg_toplevel->requested.fullscreen_output->data
- );
-
- Context_ptr context = output->context();
- workspace = context->workspace();
- } else
- workspace = model->mp_workspace;
-
- view->set_mapped(true);
- view->render_decoration();
- model->register_view(view, workspace);
-}
-
-void
-XDGView::handle_unmap(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_unmap);
-
- wl_list_remove(&view->ml_commit.link);
- wl_list_remove(&view->ml_new_popup.link);
- wl_list_remove(&view->ml_request_fullscreen.link);
- wl_list_remove(&view->ml_request_move.link);
- wl_list_remove(&view->ml_request_resize.link);
- wl_list_remove(&view->ml_set_title.link);
- wl_list_remove(&view->ml_set_app_id.link);
-
- view->activate(Toggle::Off);
- view->mp_model->unregister_view(view);
-
- wlr_scene_node_destroy(view->mp_scene);
- view->mp_wlr_surface = nullptr;
- view->set_managed(false);
-
- if (view->mp_model->mp_workspace)
- view->mp_model->apply_layout(view->mp_workspace);
-}
-
-void
-XDGView::handle_destroy(struct wl_listener* listener, void* data)
-{
- TRACE();
-
- XDGView_ptr view = wl_container_of(listener, view, ml_destroy);
-
- wl_list_remove(&view->ml_map.link);
- wl_list_remove(&view->ml_unmap.link);
- wl_list_remove(&view->ml_destroy.link);
- wl_list_remove(&view->m_events.unmap.listener_list);
-
- view->mp_wlr_xdg_toplevel = nullptr;
- view->mp_wlr_xdg_surface = nullptr;
- view->mp_model->destroy_view(view);
-}
diff --git a/src/kranewl/tree/xwayland-view.cc b/src/kranewl/tree/xwayland-view.cc
@@ -0,0 +1,289 @@
+#ifdef XWAYLAND
+#include <trace.hh>
+
+#include <kranewl/tree/view.hh>
+#include <kranewl/tree/xwayland-view.hh>
+
+// https://github.com/swaywm/wlroots/issues/682
+#include <pthread.h>
+#define class class_
+#define namespace namespace_
+#define static
+extern "C" {
+#include <wlr/xwayland.h>
+}
+#undef static
+#undef namespace
+#undef class
+
+XWaylandView::XWaylandView(
+ struct wlr_xwayland_surface* wlr_xwayland_surface,
+ Server_ptr server,
+ Model_ptr model,
+ Seat_ptr seat,
+ XWayland_ptr xwayland
+)
+ : View(
+ this,
+ reinterpret_cast<std::uintptr_t>(wlr_xwayland_surface),
+ server,
+ model,
+ seat,
+ wlr_xwayland_surface->surface
+ ),
+ mp_xwayland(xwayland),
+ mp_wlr_xwayland_surface(wlr_xwayland_surface),
+ ml_commit({ .notify = XWaylandView::handle_commit }),
+ ml_request_move({ .notify = XWaylandView::handle_request_move }),
+ ml_request_resize({ .notify = XWaylandView::handle_request_resize }),
+ ml_request_maximize({ .notify = XWaylandView::handle_request_maximize }),
+ ml_request_minimize({ .notify = XWaylandView::handle_request_minimize }),
+ ml_request_configure({ .notify = XWaylandView::handle_request_configure }),
+ ml_request_fullscreen({ .notify = XWaylandView::handle_request_fullscreen }),
+ ml_request_activate({ .notify = XWaylandView::handle_request_activate }),
+ ml_set_title({ .notify = XWaylandView::handle_set_title }),
+ ml_set_class({ .notify = XWaylandView::handle_set_class }),
+ ml_set_role({ .notify = XWaylandView::handle_set_role }),
+ ml_set_window_type({ .notify = XWaylandView::handle_set_window_type }),
+ ml_set_hints({ .notify = XWaylandView::handle_set_hints }),
+ ml_set_decorations({ .notify = XWaylandView::handle_set_decorations }),
+ ml_map({ .notify = XWaylandView::handle_map }),
+ ml_unmap({ .notify = XWaylandView::handle_unmap }),
+ ml_destroy({ .notify = XWaylandView::handle_destroy }),
+ ml_override_redirect({ .notify = XWaylandView::handle_override_redirect })
+{}
+
+XWaylandView::~XWaylandView()
+{}
+
+Region
+XWaylandView::constraints()
+{
+ TRACE();
+
+}
+
+pid_t
+XWaylandView::pid()
+{
+ TRACE();
+
+ struct wlr_xwayland_surface* wlr_xwayland_surface
+ = wlr_xwayland_surface_from_wlr_surface(mp_wlr_surface);
+ return wlr_xwayland_surface->pid;
+}
+
+bool
+XWaylandView::prefers_floating()
+{
+ TRACE();
+
+}
+
+View_ptr
+XWaylandView::is_transient_for()
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::focus(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::activate(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::set_tiled(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::set_fullscreen(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::set_resizing(Toggle)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::configure(Region const& region, Extents const& extents, bool interactive)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::close()
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::close_popups()
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::destroy()
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_commit(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_move(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_resize(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_maximize(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_minimize(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_configure(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_fullscreen(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_request_activate(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_title(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_class(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_role(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_window_type(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_hints(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_set_decorations(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_map(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_unmap(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_destroy(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+void
+XWaylandView::handle_override_redirect(struct wl_listener* listener, void* data)
+{
+ TRACE();
+
+}
+
+XWaylandUnmanaged::XWaylandUnmanaged(
+ struct wlr_xwayland_surface* wlr_xwayland_surface,
+ XWayland_ptr xwayland
+)
+ : mp_wlr_xwayland_surface(wlr_xwayland_surface),
+ mp_xwayland(xwayland)
+{}
+
+XWaylandUnmanaged::~XWaylandUnmanaged()
+{}
+#endif
diff --git a/src/kranewl/tree/xwayland_view.cc b/src/kranewl/tree/xwayland_view.cc
@@ -1,289 +0,0 @@
-#ifdef XWAYLAND
-#include <trace.hh>
-
-#include <kranewl/tree/view.hh>
-#include <kranewl/tree/xwayland_view.hh>
-
-// https://github.com/swaywm/wlroots/issues/682
-#include <pthread.h>
-#define class class_
-#define namespace namespace_
-#define static
-extern "C" {
-#include <wlr/xwayland.h>
-}
-#undef static
-#undef namespace
-#undef class
-
-XWaylandView::XWaylandView(
- struct wlr_xwayland_surface* wlr_xwayland_surface,
- Server_ptr server,
- Model_ptr model,
- Seat_ptr seat,
- XWayland_ptr xwayland
-)
- : View(
- this,
- reinterpret_cast<std::uintptr_t>(wlr_xwayland_surface),
- server,
- model,
- seat,
- wlr_xwayland_surface->surface
- ),
- mp_xwayland(xwayland),
- mp_wlr_xwayland_surface(wlr_xwayland_surface),
- ml_commit({ .notify = XWaylandView::handle_commit }),
- ml_request_move({ .notify = XWaylandView::handle_request_move }),
- ml_request_resize({ .notify = XWaylandView::handle_request_resize }),
- ml_request_maximize({ .notify = XWaylandView::handle_request_maximize }),
- ml_request_minimize({ .notify = XWaylandView::handle_request_minimize }),
- ml_request_configure({ .notify = XWaylandView::handle_request_configure }),
- ml_request_fullscreen({ .notify = XWaylandView::handle_request_fullscreen }),
- ml_request_activate({ .notify = XWaylandView::handle_request_activate }),
- ml_set_title({ .notify = XWaylandView::handle_set_title }),
- ml_set_class({ .notify = XWaylandView::handle_set_class }),
- ml_set_role({ .notify = XWaylandView::handle_set_role }),
- ml_set_window_type({ .notify = XWaylandView::handle_set_window_type }),
- ml_set_hints({ .notify = XWaylandView::handle_set_hints }),
- ml_set_decorations({ .notify = XWaylandView::handle_set_decorations }),
- ml_map({ .notify = XWaylandView::handle_map }),
- ml_unmap({ .notify = XWaylandView::handle_unmap }),
- ml_destroy({ .notify = XWaylandView::handle_destroy }),
- ml_override_redirect({ .notify = XWaylandView::handle_override_redirect })
-{}
-
-XWaylandView::~XWaylandView()
-{}
-
-Region
-XWaylandView::constraints()
-{
- TRACE();
-
-}
-
-pid_t
-XWaylandView::pid()
-{
- TRACE();
-
- struct wlr_xwayland_surface* wlr_xwayland_surface
- = wlr_xwayland_surface_from_wlr_surface(mp_wlr_surface);
- return wlr_xwayland_surface->pid;
-}
-
-bool
-XWaylandView::prefers_floating()
-{
- TRACE();
-
-}
-
-View_ptr
-XWaylandView::is_transient_for()
-{
- TRACE();
-
-}
-
-void
-XWaylandView::focus(Toggle)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::activate(Toggle)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::set_tiled(Toggle)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::set_fullscreen(Toggle)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::set_resizing(Toggle)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::configure(Region const& region, Extents const& extents, bool interactive)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::close()
-{
- TRACE();
-
-}
-
-void
-XWaylandView::close_popups()
-{
- TRACE();
-
-}
-
-void
-XWaylandView::destroy()
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_commit(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_move(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_resize(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_maximize(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_minimize(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_configure(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_fullscreen(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_request_activate(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_title(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_class(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_role(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_window_type(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_hints(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_set_decorations(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_map(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_unmap(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_destroy(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-void
-XWaylandView::handle_override_redirect(struct wl_listener* listener, void* data)
-{
- TRACE();
-
-}
-
-XWaylandUnmanaged::XWaylandUnmanaged(
- struct wlr_xwayland_surface* wlr_xwayland_surface,
- XWayland_ptr xwayland
-)
- : mp_wlr_xwayland_surface(wlr_xwayland_surface),
- mp_xwayland(xwayland)
-{}
-
-XWaylandUnmanaged::~XWaylandUnmanaged()
-{}
-#endif
