Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix pointer focus of top/overlay layers

Browse source
This commit is contained in:
Isaac Freund 2020-04-24 15:48:52 +02:00
parent 822976e3a5
commit 1829ca46b4
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cursor.zig
View file

@ -1,8 +1,9 @@
const std = @import("std"); const std = @import("std");
const c = @import("c.zig"); const c = @import("c.zig");
const Output = @import("output.zig").Output;
const LayerSurface = @import("layer_surface.zig").LayerSurface; const LayerSurface = @import("layer_surface.zig").LayerSurface;
const Log = @import("log.zig").Log;
const Output = @import("output.zig").Output;
const Seat = @import("seat.zig").Seat; const Seat = @import("seat.zig").Seat;
const View = @import("view.zig").View; const View = @import("view.zig").View;
const ViewStack = @import("view_stack.zig").ViewStack; const ViewStack = @import("view_stack.zig").ViewStack;
@ -127,7 +128,7 @@ pub const Cursor = struct {
if (self.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y, &sx, &sy)) |wlr_surface| { if (self.surfaceAt(self.wlr_cursor.x, self.wlr_cursor.y, &sx, &sy)) |wlr_surface| {
// If the found surface is a keyboard inteactive layer surface, // If the found surface is a keyboard inteactive layer surface,
// focus it. // give it keyboard focus.
if (c.wlr_surface_is_layer_surface(wlr_surface)) { if (c.wlr_surface_is_layer_surface(wlr_surface)) {
const wlr_layer_surface = c.wlr_layer_surface_v1_from_wlr_surface(wlr_surface); const wlr_layer_surface = c.wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
if (wlr_layer_surface.*.current.keyboard_interactive) { if (wlr_layer_surface.*.current.keyboard_interactive) {
@ -139,8 +140,8 @@ pub const Cursor = struct {
} }
} }
// If the found surface is an xdg toplevel surface, send focus to // If the found surface is an xdg toplevel surface, send keyboard
// the view. // focus to the view.
if (c.wlr_surface_is_xdg_surface(wlr_surface)) { if (c.wlr_surface_is_xdg_surface(wlr_surface)) {
const wlr_xdg_surface = c.wlr_xdg_surface_from_wlr_surface(wlr_surface); const wlr_xdg_surface = c.wlr_xdg_surface_from_wlr_surface(wlr_surface);
if (wlr_xdg_surface.*.role == if (wlr_xdg_surface.*.role ==
@ -240,9 +241,11 @@ pub const Cursor = struct {
// a window. // a window.
if (self.seat.input_manager.inputAllowed(wlr_surface)) { if (self.seat.input_manager.inputAllowed(wlr_surface)) {
const wlr_seat = self.seat.wlr_seat; const wlr_seat = self.seat.wlr_seat;
const focus_changed = wlr_seat.pointer_state.focused_surface != wlr_surface; const focus_change = wlr_seat.pointer_state.focused_surface != wlr_surface;
c.wlr_seat_pointer_notify_enter(wlr_seat, wlr_surface, sx, sy); if (focus_change) {
if (!focus_changed) { Log.Debug.log("Pointer notify enter at ({},{})", .{ sx, sy });
c.wlr_seat_pointer_notify_enter(wlr_seat, wlr_surface, sx, sy);
} else {
// The enter event contains coordinates, so we only need to notify // The enter event contains coordinates, so we only need to notify
// on motion if the focus did not change. // on motion if the focus did not change.
c.wlr_seat_pointer_notify_motion(wlr_seat, time, sx, sy); c.wlr_seat_pointer_notify_motion(wlr_seat, time, sx, sy);
@ -290,7 +293,7 @@ pub const Cursor = struct {
}; };
// Check overlay layer incl. popups // Check overlay layer incl. popups
if (layerSurfaceAt(output.*, output.layers[0], ox, oy, sx, sy, false)) |surface| { if (layerSurfaceAt(output.*, output.layers[layer_idxs[0]], ox, oy, sx, sy, false)) |surface| {
return surface; return surface;
} }
@ -302,7 +305,7 @@ pub const Cursor = struct {
} }
// Check top layer // Check top layer
if (layerSurfaceAt(output.*, output.layers[1], ox, oy, sx, sy, false)) |surface| { if (layerSurfaceAt(output.*, output.layers[layer_idxs[1]], ox, oy, sx, sy, false)) |surface| {
return surface; return surface;
} }