Skip to content

Commit

Permalink
rename to tiling window management policy
Browse files Browse the repository at this point in the history
  • Loading branch information
mattkae committed Feb 25, 2024
1 parent 452ec12 commit c9b9dd0
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include(GNUInstallDirs)

add_executable(miracle-wm
src/main.cpp
src/miracle_window_management_policy.cpp
src/tiling_window_management_policy.cpp
src/window_tree.cpp
src/node.cpp
src/window_helpers.h
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define MIR_LOG_COMPONENT "miracle-main"

#include "miracle_window_management_policy.h"
#include "tiling_window_management_policy.h"
#include "miracle_config.h"
#include "auto_restarting_launcher.h"

Expand Down Expand Up @@ -29,7 +29,7 @@ int main(int argc, char const* argv[])
auto config = std::make_shared<miracle::MiracleConfig>(runner);
WindowManagerOptions window_managers
{
add_window_manager_policy<miracle::MiracleWindowManagementPolicy>(
add_window_manager_policy<miracle::TilingWindowManagementPolicy>(
"tiling", external_client_launcher, internal_client_launcher, runner, config)
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define MIR_LOG_COMPONENT "miracle"

#include "miracle_window_management_policy.h"
#include "tiling_window_management_policy.h"
#include "window_helpers.h"
#include "miracle_config.h"
#include "workspace_manager.h"
Expand Down Expand Up @@ -60,7 +60,7 @@ const std::string POSSIBLE_TERMINALS[] = {
};
}

MiracleWindowManagementPolicy::MiracleWindowManagementPolicy(
TilingWindowManagementPolicy::TilingWindowManagementPolicy(
miral::WindowManagerTools const& tools,
miral::ExternalClientLauncher const& external_client_launcher,
miral::InternalClientLauncher const& internal_client_launcher,
Expand All @@ -84,12 +84,12 @@ MiracleWindowManagementPolicy::MiracleWindowManagementPolicy(
}, 1);
}

MiracleWindowManagementPolicy::~MiracleWindowManagementPolicy()
TilingWindowManagementPolicy::~TilingWindowManagementPolicy()
{
workspace_observer_registrar.unregister_interest(*ipc);
}

bool MiracleWindowManagementPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
bool TilingWindowManagementPolicy::handle_keyboard_event(MirKeyboardEvent const* event)
{
auto const action = miral::toolkit::mir_keyboard_event_action(event);
auto const scan_code = miral::toolkit::mir_keyboard_event_scan_code(event);
Expand Down Expand Up @@ -236,7 +236,7 @@ bool MiracleWindowManagementPolicy::handle_keyboard_event(MirKeyboardEvent const
return false;
}

bool MiracleWindowManagementPolicy::handle_pointer_event(MirPointerEvent const* event)
bool TilingWindowManagementPolicy::handle_pointer_event(MirPointerEvent const* event)
{
auto x = miral::toolkit::mir_pointer_event_axis_value(event, MirPointerAxis::mir_pointer_axis_x);
auto y = miral::toolkit::mir_pointer_event_axis_value(event, MirPointerAxis::mir_pointer_axis_y);
Expand Down Expand Up @@ -264,7 +264,7 @@ bool MiracleWindowManagementPolicy::handle_pointer_event(MirPointerEvent const*
return false;
}

auto MiracleWindowManagementPolicy::place_new_window(
auto TilingWindowManagementPolicy::place_new_window(
const miral::ApplicationInfo &app_info,
const miral::WindowSpecification &requested_specification) -> miral::WindowSpecification
{
Expand All @@ -278,15 +278,15 @@ auto MiracleWindowManagementPolicy::place_new_window(
return active_output->get_active_tree().allocate_position(requested_specification);
}

void MiracleWindowManagementPolicy::_add_to_output_immediately(miral::Window& window, std::shared_ptr<Screen>& output)
void TilingWindowManagementPolicy::_add_to_output_immediately(miral::Window& window, std::shared_ptr<Screen>& output)
{
miral::WindowSpecification spec;
spec = output->get_active_tree().allocate_position(spec);
window_manager_tools.modify_window(window, spec);
output->get_active_tree().advise_new_window(window_manager_tools.info_for(window));
}

void MiracleWindowManagementPolicy::advise_new_window(miral::WindowInfo const& window_info)
void TilingWindowManagementPolicy::advise_new_window(miral::WindowInfo const& window_info)
{
auto shared_output = pending_output.lock();
if (!shared_output)
Expand All @@ -312,7 +312,7 @@ void MiracleWindowManagementPolicy::advise_new_window(miral::WindowInfo const& w
pending_output.reset();
}

void MiracleWindowManagementPolicy::handle_window_ready(miral::WindowInfo &window_info)
void TilingWindowManagementPolicy::handle_window_ready(miral::WindowInfo &window_info)
{
for (auto const& output : output_list)
{
Expand All @@ -321,20 +321,20 @@ void MiracleWindowManagementPolicy::handle_window_ready(miral::WindowInfo &windo
}
}

void MiracleWindowManagementPolicy::advise_focus_gained(const miral::WindowInfo &window_info)
void TilingWindowManagementPolicy::advise_focus_gained(const miral::WindowInfo &window_info)
{
for (auto const& output : output_list)
output->get_active_tree().advise_focus_gained(window_info.window());
window_manager_tools.raise_tree(window_info.window());
}

void MiracleWindowManagementPolicy::advise_focus_lost(const miral::WindowInfo &window_info)
void TilingWindowManagementPolicy::advise_focus_lost(const miral::WindowInfo &window_info)
{
for (auto const& output : output_list)
output->get_active_tree().advise_focus_lost(window_info.window());
}

void MiracleWindowManagementPolicy::advise_delete_window(const miral::WindowInfo &window_info)
void TilingWindowManagementPolicy::advise_delete_window(const miral::WindowInfo &window_info)
{
for (auto it = orphaned_window_list.begin(); it != orphaned_window_list.end();)
{
Expand All @@ -348,11 +348,11 @@ void MiracleWindowManagementPolicy::advise_delete_window(const miral::WindowInfo
output->get_active_tree().advise_delete_window(window_info.window());
}

void MiracleWindowManagementPolicy::advise_move_to(miral::WindowInfo const& window_info, geom::Point top_left)
void TilingWindowManagementPolicy::advise_move_to(miral::WindowInfo const& window_info, geom::Point top_left)
{
}

void MiracleWindowManagementPolicy::advise_output_create(miral::Output const& output)
void TilingWindowManagementPolicy::advise_output_create(miral::Output const& output)
{
auto new_tree = std::make_shared<Screen>(
output, workspace_manager, output.extents(), window_manager_tools, config);
Expand All @@ -372,7 +372,7 @@ void MiracleWindowManagementPolicy::advise_output_create(miral::Output const& ou
}
}

void MiracleWindowManagementPolicy::advise_output_update(miral::Output const& updated, miral::Output const& original)
void TilingWindowManagementPolicy::advise_output_update(miral::Output const& updated, miral::Output const& original)
{
for (auto& output : output_list)
{
Expand All @@ -387,7 +387,7 @@ void MiracleWindowManagementPolicy::advise_output_update(miral::Output const& up
}
}

void MiracleWindowManagementPolicy::advise_output_delete(miral::Output const& output)
void TilingWindowManagementPolicy::advise_output_delete(miral::Output const& output)
{
for (auto it = output_list.begin(); it != output_list.end();)
{
Expand Down Expand Up @@ -427,7 +427,7 @@ void MiracleWindowManagementPolicy::advise_output_delete(miral::Output const& ou
}
}

void MiracleWindowManagementPolicy::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
void TilingWindowManagementPolicy::advise_state_change(miral::WindowInfo const& window_info, MirWindowState state)
{
for (auto const& output : output_list)
{
Expand All @@ -438,7 +438,7 @@ void MiracleWindowManagementPolicy::advise_state_change(miral::WindowInfo const&
}
}

void MiracleWindowManagementPolicy::handle_modify_window(
void TilingWindowManagementPolicy::handle_modify_window(
miral::WindowInfo &window_info,
const miral::WindowSpecification &modifications)
{
Expand Down Expand Up @@ -497,13 +497,13 @@ void MiracleWindowManagementPolicy::handle_modify_window(
}
}

void MiracleWindowManagementPolicy::handle_raise_window(miral::WindowInfo &window_info)
void TilingWindowManagementPolicy::handle_raise_window(miral::WindowInfo &window_info)
{
window_manager_tools.select_active_window(window_info.window());
}

mir::geometry::Rectangle
MiracleWindowManagementPolicy::confirm_placement_on_display(
TilingWindowManagementPolicy::confirm_placement_on_display(
const miral::WindowInfo &window_info,
MirWindowState new_state,
const mir::geometry::Rectangle &new_placement)
Expand All @@ -526,48 +526,48 @@ MiracleWindowManagementPolicy::confirm_placement_on_display(
return modified_placement;
}

bool MiracleWindowManagementPolicy::handle_touch_event(const MirTouchEvent *event)
bool TilingWindowManagementPolicy::handle_touch_event(const MirTouchEvent *event)
{
return false;
}

void MiracleWindowManagementPolicy::handle_request_move(miral::WindowInfo &window_info, const MirInputEvent *input_event)
void TilingWindowManagementPolicy::handle_request_move(miral::WindowInfo &window_info, const MirInputEvent *input_event)
{

}

void MiracleWindowManagementPolicy::handle_request_resize(
void TilingWindowManagementPolicy::handle_request_resize(
miral::WindowInfo &window_info,
const MirInputEvent *input_event,
MirResizeEdge edge)
{

}

mir::geometry::Rectangle MiracleWindowManagementPolicy::confirm_inherited_move(
mir::geometry::Rectangle TilingWindowManagementPolicy::confirm_inherited_move(
const miral::WindowInfo &window_info,
mir::geometry::Displacement movement)
{
return {window_info.window().top_left()+movement, window_info.window().size()};
}

void MiracleWindowManagementPolicy::advise_application_zone_create(miral::Zone const& application_zone)
void TilingWindowManagementPolicy::advise_application_zone_create(miral::Zone const& application_zone)
{
for (auto const& output : output_list)
{
output->advise_application_zone_create(application_zone);
}
}

void MiracleWindowManagementPolicy::advise_application_zone_update(miral::Zone const& updated, miral::Zone const& original)
void TilingWindowManagementPolicy::advise_application_zone_update(miral::Zone const& updated, miral::Zone const& original)
{
for (auto const& output : output_list)
{
output->advise_application_zone_update(updated, original);
}
}

void MiracleWindowManagementPolicy::advise_application_zone_delete(miral::Zone const& application_zone)
void TilingWindowManagementPolicy::advise_application_zone_delete(miral::Zone const& application_zone)
{
for (auto const& output : output_list)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef MIRIACLE_WINDOW_MANAGEMENT_POLICY_H
#define MIRIACLE_WINDOW_MANAGEMENT_POLICY_H
#ifndef MIRACLE_TILING_WINDOW_MANAGEMENT_POLICY_H
#define MIRACLE_TILING_WINDOW_MANAGEMENT_POLICY_H

#include "screen.h"
#include "miracle_config.h"
Expand All @@ -22,16 +22,16 @@ class MirRunner;
namespace miracle
{

class MiracleWindowManagementPolicy : public miral::WindowManagementPolicy
class TilingWindowManagementPolicy : public miral::WindowManagementPolicy
{
public:
MiracleWindowManagementPolicy(
TilingWindowManagementPolicy(
miral::WindowManagerTools const&,
miral::ExternalClientLauncher const&,
miral::InternalClientLauncher const&,
miral::MirRunner&,
std::shared_ptr<MiracleConfig> const&);
~MiracleWindowManagementPolicy() override;
~TilingWindowManagementPolicy() override;

bool handle_keyboard_event(MirKeyboardEvent const* event) override;
bool handle_pointer_event(MirPointerEvent const* event) override;
Expand Down Expand Up @@ -95,4 +95,4 @@ class MiracleWindowManagementPolicy : public miral::WindowManagementPolicy
};
}

#endif //MIRIACLE_WINDOW_MANAGEMENT_POLICY_H
#endif //MIRACLE_TILING_WINDOW_MANAGEMENT_POLICY_H

0 comments on commit c9b9dd0

Please sign in to comment.