mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-20 06:59:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into xwayland-dnd

Browse source
This commit is contained in:
emersion 2018-04-03 10:38:46 -04:00
commit 58ac05c276
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
18 changed files with 230 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/rootston/seat.h
View file

@ -4,6 +4,7 @@
#include <wayland-server.h>
#include "rootston/input.h"
#include "rootston/keyboard.h"
#include "rootston/layers.h"
struct roots_seat {
struct roots_input *input;
@ -15,6 +16,9 @@ struct roots_seat {
int32_t touch_id;
double touch_x, touch_y;
// If the focused layer is set, views cannot receive keyboard focus
struct wlr_layer_surface *focused_layer;
struct wl_list views; // roots_seat_view::link
bool has_focus;
@ -100,6 +104,9 @@ struct roots_view *roots_seat_get_focus(struct roots_seat *seat);
void roots_seat_set_focus(struct roots_seat *seat, struct roots_view *view);
void roots_seat_set_focus_layer(struct roots_seat *seat,
struct wlr_layer_surface *layer);
void roots_seat_cycle_focus(struct roots_seat *seat);
void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view);

5
include/wlr/types/wlr_layer_shell.h
View file

@ -99,4 +99,9 @@ void wlr_layer_surface_configure(struct wlr_layer_surface *surface,
*/
void wlr_layer_surface_close(struct wlr_layer_surface *surface);
bool wlr_surface_is_layer_surface(struct wlr_surface *surface);
struct wlr_layer_surface *wlr_layer_surface_from_wlr_surface(
struct wlr_surface *surface);
#endif

5
include/wlr/types/wlr_wl_shell.h
View file

@ -150,4 +150,9 @@ struct wlr_wl_shell_surface *wlr_wl_shell_surface_popup_at(
struct wlr_wl_shell_surface *surface, double sx, double sy,
double *popup_sx, double *popup_sy);
bool wlr_surface_is_wl_shell_surface(struct wlr_surface *surface);
struct wlr_wl_surface *wlr_wl_shell_surface_from_wlr_surface(
struct wlr_surface *surface);
#endif

5
include/wlr/types/wlr_xdg_shell.h
View file

@ -229,4 +229,9 @@ struct wlr_xdg_surface *wlr_xdg_surface_popup_at(
struct wlr_xdg_surface *surface, double sx, double sy,
double *popup_sx, double *popup_sy);
bool wlr_surface_is_xdg_surface(struct wlr_surface *surface);
struct wlr_xdg_surface *wlr_xdg_surface_from_wlr_surface(
struct wlr_surface *surface);
#endif

5
include/wlr/types/wlr_xdg_shell_v6.h
View file

@ -289,4 +289,9 @@ void wlr_positioner_v6_invert_x(
void wlr_positioner_v6_invert_y(
struct wlr_xdg_positioner_v6 *positioner);
bool wlr_surface_is_xdg_surface_v6(struct wlr_surface *surface);
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6_from_wlr_surface(
struct wlr_surface *surface);
#endif

5
include/wlr/xwayland.h
View file

@ -185,4 +185,9 @@ void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland,
bool wlr_xwayland_surface_is_unmanaged(
const struct wlr_xwayland_surface *surface);
bool wlr_surface_is_xwayland_surface(struct wlr_surface *surface);
struct wlr_xwayland_surface *wlr_xwayland_surface_from_wlr_surface(
struct wlr_surface *surface);
#endif