mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-04 06:46:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into idle_v2

Browse source
This commit is contained in:
Mattias Eriksson 2018-04-20 12:37:29 +02:00
commit 83a0a6d450
26 changed files with 458 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -199,6 +199,8 @@ sway_cmd input_cmd_map_to_output;
sway_cmd input_cmd_middle_emulation;
sway_cmd input_cmd_natural_scroll;
sway_cmd input_cmd_pointer_accel;
sway_cmd input_cmd_repeat_delay;
sway_cmd input_cmd_repeat_rate;
sway_cmd input_cmd_scroll_method;
sway_cmd input_cmd_tap;
sway_cmd input_cmd_xkb_layout;

2
include/sway/config.h
View file

@ -65,6 +65,8 @@ struct input_config {
int middle_emulation;
int natural_scroll;
float pointer_accel;
int repeat_delay;
int repeat_rate;
int scroll_method;
int send_events;
int tap;

1
include/sway/ipc-server.h
View file

@ -1,6 +1,7 @@
#ifndef _SWAY_IPC_SERVER_H
#define _SWAY_IPC_SERVER_H
#include <sys/socket.h>
#include "sway/config.h"
#include "sway/tree/container.h"
#include "ipc.h"

2
include/sway/tree/container.h
View file

@ -45,6 +45,7 @@ enum sway_container_border {
struct sway_root;
struct sway_output;
struct sway_workspace;
struct sway_view;
struct sway_container {
@ -52,6 +53,7 @@ struct sway_container {
// TODO: Encapsulate state for other node types as well like C_CONTAINER
struct sway_root *sway_root;
struct sway_output *sway_output;
struct sway_workspace *sway_workspace;
struct sway_view *sway_view;
};

9
include/sway/tree/view.h
View file

@ -28,6 +28,7 @@ struct sway_view_impl {
void (*configure)(struct sway_view *view, double ox, double oy, int width,
int height);
void (*set_activated)(struct sway_view *view, bool activated);
void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
void (*for_each_surface)(struct sway_view *view,
wlr_surface_iterator_func_t iterator, void *user_data);
void (*close)(struct sway_view *view);
@ -41,6 +42,7 @@ struct sway_view {
struct sway_container *swayc; // NULL for unmanaged views
struct wlr_surface *surface; // NULL for unmapped views
int width, height;
bool is_fullscreen;
union {
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
@ -63,6 +65,7 @@ struct sway_xdg_shell_v6_view {
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;
struct wl_listener new_popup;
struct wl_listener map;
struct wl_listener unmap;
@ -79,6 +82,7 @@ struct sway_xwayland_view {
struct wl_listener request_resize;
struct wl_listener request_maximize;
struct wl_listener request_configure;
struct wl_listener request_fullscreen;
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener destroy;
@ -93,6 +97,7 @@ struct sway_xwayland_unmanaged {
int lx, ly;
struct wl_listener request_configure;
struct wl_listener request_fullscreen;
struct wl_listener commit;
struct wl_listener map;
struct wl_listener unmap;
@ -106,6 +111,8 @@ struct sway_wl_shell_view {
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;
struct wl_listener set_state;
struct wl_listener destroy;
int pending_width, pending_height;
@ -155,6 +162,8 @@ void view_configure(struct sway_view *view, double ox, double oy, int width,
void view_set_activated(struct sway_view *view, bool activated);
void view_set_fullscreen(struct sway_view *view, bool fullscreen);
void view_close(struct sway_view *view);
void view_damage(struct sway_view *view, bool whole);

7
include/sway/tree/workspace.h
View file

@ -3,6 +3,13 @@
#include "sway/tree/container.h"
struct sway_view;
struct sway_workspace {
struct sway_container *swayc;
struct sway_view *fullscreen;
};
extern char *prev_workspace_name;
char *workspace_next_name(const char *output_name);