Lightpanda: the headless browser designed for AI and automation
dedupe code and use PointerInput
Karl Seguin063fc0ebb66b
diff --git a/src/browser/actions.zig b/src/browser/actions.zigindex 722074cac..d40df49a9 100644--- a/src/browser/actions.zig+++ b/src/browser/actions.zig@@ -38,9 +38,6 @@ fn dispatchInputAndChangeEvents(el: *Element, frame: *Frame) !void {};}-/// The trusted primary-button gesture a real user click produces; widgets key-/// off pointerdown/mousedown, not click alone. A focus failure is worth a-/// warning, not aborting the click.pub fn click(node: *DOMNode, frame: *Frame) !void {const el = node.is(Element) orelse return error.InvalidNodeType;@@ -50,20 +47,8 @@ pub fn click(node: *DOMNode, frame: *Frame) !void {Frame.user_input.updateHoverTarget(frame, el, .{ .with_pointer = true });- const main = Frame.user_input.mouse_button.main;- const press_result = Frame.user_input.dispatchPointerPress(frame, el, 0, 0, main, 1, .{}) catch |err| {- lp.log.err(.app, "click press failed", .{ .err = err });- return error.ActionFailed;- };- try Frame.user_input.runMouseDownFocus(frame, el, press_result, "click mousedown focus");-- Frame.user_input.dispatchPointerRelease(frame, el, 0, 0, main, press_result.suppress_mouse, 1, .{}) catch |err| {- lp.log.err(.app, "click release failed", .{ .err = err });- return error.ActionFailed;- };-- Frame.user_input.dispatchClickAsPointer(frame, el, 0, 0, 1, 0, .{}) catch |err| {- lp.log.err(.app, "click click failed", .{ .err = err });+ Frame.user_input.triggerClick(frame, el, .{}) catch |err| {+ lp.log.err(.app, "click failed", .{ .err = err });return error.ActionFailed;};}diff --git a/src/browser/frame/user_input.zig b/src/browser/frame/user_input.zigindex bcae9a1b0..6c627cae0 100644--- a/src/browser/frame/user_input.zig+++ b/src/browser/frame/user_input.zig@@ -281,52 +281,52 @@ pub const PointerButtons = struct {}};-pub const PressResult = struct {+const PressResult = struct {/// pointerdown's preventDefault() suppressed the compat mousedown here and/// the paired mouseup on release.suppress_mouse: bool,- /// mousedown's preventDefault() suppressed its focus default action (only- /// meaningful when suppress_mouse is false).+ /// mousedown's focus default action is suppressed (always when+ /// suppress_mouse is).suppress_focus: bool,};-/// Press half: pointerdown, then mousedown unless preventDefault() suppressed-/// it; doesn't run the focus default action (callers disagree on how a focus-/// failure should affect the click).-pub fn dispatchPointerPress(frame: *Frame, target: *Element, x: f64, y: f64, button: i32, mouse_detail: u32, modifiers: Modifiers) !PressResult {- const buttons = buttonsBitmask(button);- const suppress_mouse = try dispatchPointerEventOn(frame, target, "pointerdown", .{ .x = x, .y = y, .button = button, .buttons = buttons, .modifiers = modifiers });- const suppress_focus = if (suppress_mouse)- true- else- try dispatchMouseEventOn(frame, target, "mousedown", .{ .x = x, .y = y, .button = button, .buttons = buttons, .detail = mouse_detail, .modifiers = modifiers });- return .{ .suppress_mouse = suppress_mouse, .suppress_focus = suppress_focus };+/// pointerdown, then mousedown unless pointerdown was cancelled. `in.detail`+/// applies to mousedown only.+fn dispatchPointerPress(frame: *Frame, target: *Element, in: PointerInput) !PressResult {+ var pointer = in;+ pointer.detail = 0;+ const suppress_mouse = try dispatchPointerEventOn(frame, target, "pointerdown", pointer);+ if (suppress_mouse) {+ return .{ .suppress_mouse = true, .suppress_focus = true };+ }+ const suppress_focus = try dispatchMouseEventOn(frame, target, "mousedown", in);+ return .{ .suppress_mouse = false, .suppress_focus = suppress_focus };}-/// Runs mousedown's focus default action unless the gesture suppressed it;-/// `warn_label` logs a focus failure and continues, null propagates it.-pub fn runMouseDownFocus(frame: *Frame, target: *Element, press: PressResult, comptime warn_label: ?[]const u8) !void {- if (press.suppress_mouse or press.suppress_focus) return;- if (warn_label) |label| {- focusForMouseDown(frame, target) catch |err| log.warn(.app, label, .{ .err = err });- } else {- try focusForMouseDown(frame, target);+/// pointerup, then mouseup unless the gesture's pointerdown was cancelled.+/// `in.detail` applies to mouseup only.+fn dispatchPointerRelease(frame: *Frame, target: *Element, in: PointerInput, suppress_mouse: bool) !void {+ var pointer = in;+ pointer.detail = 0;+ _ = try dispatchPointerEventOn(frame, target, "pointerup", pointer);+ if (suppress_mouse == false) {+ _ = try dispatchMouseEventOn(frame, target, "mouseup", in);}}-/// Release half: pointerup, then mouseup unless the paired pointerdown-/// suppressed it (click fires separately via dispatchClickAsPointer).-pub fn dispatchPointerRelease(frame: *Frame, target: *Element, x: f64, y: f64, button: i32, suppress_mouse: bool, mouse_detail: u32, modifiers: Modifiers) !void {- _ = try dispatchPointerEventOn(frame, target, "pointerup", .{ .x = x, .y = y, .button = button, .modifiers = modifiers });- if (!suppress_mouse) {- _ = try dispatchMouseEventOn(frame, target, "mouseup", .{ .x = x, .y = y, .button = button, .detail = mouse_detail, .modifiers = modifiers });+/// The trusted primary-button gesture a real user click produces; widgets key+/// off pointerdown/mousedown, not click alone. A focus failure is logged, not+/// returned.+pub fn triggerClick(frame: *Frame, target: *Element, modifiers: Modifiers) !void {+ const press = try dispatchPointerPress(frame, target, .{ .x = 0, .y = 0, .buttons = 1, .detail = 1, .modifiers = modifiers });+ if (press.suppress_focus == false) {+ focusForMouseDown(frame, target) catch |err| log.warn(.app, "click mousedown focus", .{ .err = err });}-}-/// Primary-button click as a PointerEvent (matching HTMLElement.click());-/// `buttons` is the mask still held, nonzero on a mid-chord primary release.-pub fn dispatchClickAsPointer(frame: *Frame, target: *Element, x: f64, y: f64, detail: u32, buttons: u16, modifiers: Modifiers) !void {- _ = try dispatchPointerEventOn(frame, target, "click", .{ .x = x, .y = y, .buttons = buttons, .detail = detail, .modifiers = modifiers });+ const up: PointerInput = .{ .x = 0, .y = 0, .detail = 1, .modifiers = modifiers };+ try dispatchPointerRelease(frame, target, up, press.suppress_mouse);+ // click is a PointerEvent, matching HTMLElement.click().+ _ = try dispatchPointerEventOn(frame, target, "click", up);}pub fn triggerMousePress(frame: *Frame, x: f64, y: f64, button: i32, click_count: i32) !void {@@ -350,20 +350,25 @@ pub fn triggerMousePress(frame: *Frame, x: f64, y: f64, button: i32, click_count// clickCount 0 (omitted) stays 0, not forced to 1: Chrome and Firefox// both fire mousedown with detail 0 in that case.const detail: u32 = if (click_count > 0) @intCast(click_count) else 0;+ const in: PointerInput = .{ .x = x, .y = y, .button = button, .buttons = gesture.held, .detail = detail };if (gesture.starts_gesture) {// Stash the pointerdown outcome before the fallible focus call: the// release half is a separate message and can't observe it otherwise.- const press = try dispatchPointerPress(frame, target, x, y, button, detail, .{});+ const press = try dispatchPointerPress(frame, target, in);frame._page.input_pointer.mousedown_suppressed = press.suppress_mouse;- try runMouseDownFocus(frame, target, press, null);+ if (press.suppress_focus == false) {+ try focusForMouseDown(frame, target);+ }} else {// A chorded press is a buttons-mask change (pointermove), not a second// pointerdown: https://www.w3.org/TR/pointerevents3/#chorded-button-interactions_ = try dispatchPointerEventOn(frame, target, "pointermove", .{ .x = x, .y = y, .button = button, .buttons = gesture.held });- if (!frame._page.input_pointer.mousedown_suppressed) {- const suppress_focus = try dispatchMouseEventOn(frame, target, "mousedown", .{ .x = x, .y = y, .button = button, .buttons = gesture.held, .detail = detail });- try runMouseDownFocus(frame, target, .{ .suppress_mouse = false, .suppress_focus = suppress_focus }, null);+ if (frame._page.input_pointer.mousedown_suppressed == false) {+ const suppress_focus = try dispatchMouseEventOn(frame, target, "mousedown", in);+ if (suppress_focus == false) {+ try focusForMouseDown(frame, target);+ }}}}@@ -415,7 +420,7 @@ pub fn triggerMouseRelease(frame: *Frame, x: f64, y: f64, button: i32, click_couconst detail: u32 = if (click_count > 0) @intCast(click_count) else 1;if (ends_gesture) {- try dispatchPointerRelease(frame, target, x, y, button, was_suppressed, detail, .{});+ try dispatchPointerRelease(frame, target, .{ .x = x, .y = y, .button = button, .detail = detail }, was_suppressed);} else {// A chorded release (another button still held) is a buttons-mask// change, not pointerup.@@ -428,7 +433,7 @@ pub fn triggerMouseRelease(frame: *Frame, x: f64, y: f64, button: i32, click_cou// After mouseup, the activation event depends on the button.switch (button) {mouse_button.main => {- try dispatchClickAsPointer(frame, target, x, y, detail, remaining, .{});+ _ = try dispatchPointerEventOn(frame, target, "click", .{ .x = x, .y = y, .buttons = remaining, .detail = detail });// A second click in quick succession also fires dblclick.if (click_count == 2) {_ = try dispatchMouseEventOn(frame, target, "dblclick", .{ .x = x, .y = y, .button = button, .buttons = remaining, .detail = detail });diff --git a/src/browser/webapi/WebDriver.zig b/src/browser/webapi/WebDriver.zigindex d318bc2e1..2d2df2341 100644--- a/src/browser/webapi/WebDriver.zig+++ b/src/browser/webapi/WebDriver.zig@@ -67,21 +67,9 @@ pub fn click(_: *const WebDriver, element: *Element, frame: *Frame) !void {}}- // A dispatch error must never reject the testdriver command, so each- // stage is caught and logged rather than propagated.- const main = Frame.user_input.mouse_button.main;- const modifiers = frame._page.input_modifiers;- const press = Frame.user_input.dispatchPointerPress(frame, element, 0, 0, main, 1, modifiers) catch |err| {- log.warn(.app, "webdriver click press", .{ .err = err });- return;- };- try Frame.user_input.runMouseDownFocus(frame, element, press, "webdriver click focus");- Frame.user_input.dispatchPointerRelease(frame, element, 0, 0, main, press.suppress_mouse, 1, modifiers) catch |err| {- log.warn(.app, "webdriver click release", .{ .err = err });- return;- };- Frame.user_input.dispatchClickAsPointer(frame, element, 0, 0, 1, 0, modifiers) catch |err| {- log.warn(.app, "webdriver click click", .{ .err = err });+ // A dispatch error must never reject the testdriver command.+ Frame.user_input.triggerClick(frame, element, frame._page.input_modifiers) catch |err| {+ log.warn(.app, "webdriver click", .{ .err = err });};}