omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Route app input dispatch through app core

Browse Source
This commit is contained in:
omigamedev
2026-06-05 06:38:48 +02:00
parent 1df93c23f7
commit b825d920d2
11 changed files with 695 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
tools/pano_cli/main.cpp
View File

@@ -1,6 +1,7 @@
#include "app_core/about_menu.h"
#include "app_core/app_preferences.h"
#include "app_core/app_frame.h"
#include "app_core/app_input.h"
#include "app_core/app_shutdown.h"
#include "app_core/app_status.h"
#include "app_core/app_startup.h"
@@ -263,6 +264,25 @@ struct PlanAppFrameArgs {
bool bad_resize = false;
};
struct PlanAppInputArgs {
std::string kind = "pointer";
float x0 = 100.0F;
float y0 = 50.0F;
float x1 = 160.0F;
float y1 = 130.0F;
float previous_x0 = 100.0F;
float previous_y0 = 50.0F;
float previous_x1 = 130.0F;
float previous_y1 = 90.0F;
float zoom = 2.0F;
bool has_designer_layout = true;
bool has_main_layout = true;
bool spacebar = false;
bool vr_active = false;
bool key_up = false;
bool bad_float = false;
};
struct PlanCommandConvertArgs {
std::string project_path = "D:/Paint/demo.ppi";
std::string output_path = "D:/Paint/demo.png";
@@ -2051,6 +2071,7 @@ void print_help()
<< " plan-app-startup [--run-counter N] [--auto-timelapse-disabled] [--vr-controllers-disabled] [--license-invalid]\n"
<< " plan-app-startup-resources [--width N] [--height N] [--bad-size]\n"
<< " plan-app-frame [--redraw] [--animate] [--no-designer-layout] [--no-main-layout] [--no-canvas] [--no-canvas-document] [--vr-active] [--ui-hidden] [--vr-only] [--resize-width N] [--resize-height N] [--bad-resize]\n"
<< " plan-app-input --kind pointer|gesture|cancel|main|key [--x N] [--y N] [--x1 N] [--y1 N] [--prev-x N] [--prev-y N] [--prev-x1 N] [--prev-y1 N] [--zoom N] [--no-designer-layout] [--no-main-layout] [--spacebar] [--vr-active] [--key-up] [--bad-float]\n"
<< " plan-app-shutdown\n"
<< " plan-command-convert [--project FILE] [--output FILE] [--canvas-resolution N]\n"
<< " plan-app-status [--doc-name NAME] [--unsaved] [--resolution N] [--resolution-index N] [--zoom N] [--history-bytes N] [--recording-running] [--encoder-available] [--encoded-frames N] [--framebuffer-fetch] [--float32] [--float32-linear] [--float16]\n"
@@ -3860,6 +3881,199 @@ int plan_app_frame(int argc, char** argv)
return 0;
}
pp::foundation::Status parse_plan_app_input_args(
int argc,
char** argv,
PlanAppInputArgs& args)
{
for (int i = 2; i < argc; ++i) {
const std::string_view key(argv[i]);
auto parse_next_float = [&](float& target) -> pp::foundation::Status {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
const auto value = parse_float_arg(argv[++i]);
if (!value) {
return value.status();
}
target = value.value();
return pp::foundation::Status::success();
};
if (key == "--kind") {
if (i + 1 >= argc) {
return pp::foundation::Status::invalid_argument("missing value for option");
}
args.kind = argv[++i];
} else if (key == "--x") {
const auto status = parse_next_float(args.x0);
if (!status.ok()) {
return status;
}
} else if (key == "--y") {
const auto status = parse_next_float(args.y0);
if (!status.ok()) {
return status;
}
} else if (key == "--x1") {
const auto status = parse_next_float(args.x1);
if (!status.ok()) {
return status;
}
} else if (key == "--y1") {
const auto status = parse_next_float(args.y1);
if (!status.ok()) {
return status;
}
} else if (key == "--prev-x") {
const auto status = parse_next_float(args.previous_x0);
if (!status.ok()) {
return status;
}
} else if (key == "--prev-y") {
const auto status = parse_next_float(args.previous_y0);
if (!status.ok()) {
return status;
}
} else if (key == "--prev-x1") {
const auto status = parse_next_float(args.previous_x1);
if (!status.ok()) {
return status;
}
} else if (key == "--prev-y1") {
const auto status = parse_next_float(args.previous_y1);
if (!status.ok()) {
return status;
}
} else if (key == "--zoom") {
const auto status = parse_next_float(args.zoom);
if (!status.ok()) {
return status;
}
} else if (key == "--no-designer-layout") {
args.has_designer_layout = false;
} else if (key == "--no-main-layout") {
args.has_main_layout = false;
} else if (key == "--spacebar") {
args.spacebar = true;
} else if (key == "--vr-active") {
args.vr_active = true;
} else if (key == "--key-up") {
args.key_up = true;
} else if (key == "--bad-float") {
args.bad_float = true;
} else {
return pp::foundation::Status::invalid_argument("unknown option");
}
}
return pp::foundation::Status::success();
}
int plan_app_input(int argc, char** argv)
{
PlanAppInputArgs args;
const auto status = parse_plan_app_input_args(argc, argv, args);
if (!status.ok()) {
print_error("plan-app-input", status.message);
return 2;
}
if (args.bad_float) {
args.zoom = 0.0F;
}
if (args.kind == "pointer") {
const auto plan = pp::app::plan_app_pointer_dispatch(
args.x0,
args.y0,
args.zoom,
args.has_designer_layout,
args.has_main_layout);
if (!plan) {
print_error("plan-app-input", plan.status().message);
return 2;
}
std::cout << "{\"ok\":true,\"command\":\"plan-app-input\",\"kind\":\"pointer\""
<< ",\"requestRedraw\":" << json_bool(plan.value().request_redraw)
<< ",\"dispatchDesignerFirst\":" << json_bool(plan.value().dispatch_designer_first)
<< ",\"dispatchMainIfNotConsumed\":" << json_bool(plan.value().dispatch_main_if_not_consumed)
<< ",\"normalizedX\":" << plan.value().normalized_x
<< ",\"normalizedY\":" << plan.value().normalized_y
<< "}\n";
return 0;
}
if (args.kind == "gesture") {
const auto plan = pp::app::plan_app_gesture_dispatch(
args.x0,
args.y0,
args.x1,
args.y1,
args.previous_x0,
args.previous_y0,
args.previous_x1,
args.previous_y1,
args.zoom,
args.has_main_layout);
if (!plan) {
print_error("plan-app-input", plan.status().message);
return 2;
}
std::cout << "{\"ok\":true,\"command\":\"plan-app-input\",\"kind\":\"gesture\""
<< ",\"requestRedraw\":" << json_bool(plan.value().request_redraw)
<< ",\"dispatchMain\":" << json_bool(plan.value().dispatch_main)
<< ",\"normalizedX\":" << plan.value().normalized_x
<< ",\"normalizedY\":" << plan.value().normalized_y
<< ",\"distance\":" << plan.value().distance
<< ",\"distanceDelta\":" << plan.value().distance_delta
<< ",\"positionDeltaX\":" << plan.value().position_delta_x
<< ",\"positionDeltaY\":" << plan.value().position_delta_y
<< "}\n";
return 0;
}
if (args.kind == "cancel") {
const auto plan = pp::app::plan_app_mouse_cancel_dispatch(
args.has_designer_layout,
args.has_main_layout);
std::cout << "{\"ok\":true,\"command\":\"plan-app-input\",\"kind\":\"cancel\""
<< ",\"requestRedraw\":" << json_bool(plan.request_redraw)
<< ",\"dispatchDesignerFirst\":" << json_bool(plan.dispatch_designer_first)
<< ",\"dispatchMainIfNotConsumed\":" << json_bool(plan.dispatch_main_if_not_consumed)
<< "}\n";
return 0;
}
if (args.kind == "main") {
const auto plan = pp::app::plan_app_main_input_dispatch(args.has_main_layout);
std::cout << "{\"ok\":true,\"command\":\"plan-app-input\",\"kind\":\"main\""
<< ",\"requestRedraw\":" << json_bool(plan.request_redraw)
<< ",\"dispatchMain\":" << json_bool(plan.dispatch_main)
<< "}\n";
return 0;
}
if (args.kind == "key") {
const auto down = pp::app::plan_app_key_down_dispatch(
args.has_main_layout,
args.spacebar,
args.vr_active);
const auto up = pp::app::plan_app_key_up_dispatch(args.has_main_layout);
const auto& plan = args.key_up ? up : down;
std::cout << "{\"ok\":true,\"command\":\"plan-app-input\",\"kind\":\"key\""
<< ",\"requestRedraw\":" << json_bool(plan.request_redraw)
<< ",\"dispatchMain\":" << json_bool(plan.dispatch_main)
<< ",\"setKeyDown\":" << json_bool(plan.set_key_down)
<< ",\"syncVrCameraRotation\":" << json_bool(plan.sync_vr_camera_rotation)
<< "}\n";
return 0;
}
print_error("plan-app-input", "unknown input plan kind");
return 2;
}
int plan_app_shutdown(int argc, char** argv)
{
static_cast<void>(argv);
@@ -10202,6 +10416,10 @@ int main(int argc, char** argv)
return plan_app_frame(argc, argv);
}
if (command == "plan-app-input") {
return plan_app_input(argc, argv);
}
if (command == "plan-app-shutdown") {
return plan_app_shutdown(argc, argv);
}