move tree includes to their own directory

This commit is contained in:
Tony Crisci 2018-03-29 12:15:31 -04:00
parent b1984133a9
commit 874f009866
29 changed files with 89 additions and 110 deletions

View file

@ -6,8 +6,8 @@
#include <unistd.h>
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/container.h"
#include "sway/workspace.h"
#include "sway/tree/container.h"
#include "sway/tree/workspace.h"
#include "log.h"
#include "stringop.h"

View file

@ -3,10 +3,11 @@
#include "log.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/commands.h"
static bool parse_movement_direction(const char *name, enum movement_direction *out) {
static bool parse_movement_direction(const char *name,
enum movement_direction *out) {
if (strcasecmp(name, "left") == 0) {
*out = MOVE_LEFT;
} else if (strcasecmp(name, "right") == 0) {

View file

@ -2,7 +2,7 @@
#include "log.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/commands.h"
struct cmd_results *cmd_kill(int argc, char **argv) {

View file

@ -1,8 +1,8 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "log.h"
struct cmd_results *cmd_layout(int argc, char **argv) {

View file

@ -1,6 +1,6 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
struct cmd_results *cmd_reload(int argc, char **argv) {
struct cmd_results *error = NULL;

View file

@ -4,7 +4,7 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/input/seat.h"
#include "sway/workspace.h"
#include "sway/tree/workspace.h"
#include "list.h"
#include "log.h"
#include "stringop.h"

View file

@ -24,7 +24,7 @@
#include "sway/input/seat.h"
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "readline.h"
#include "stringop.h"
#include "list.h"

View file

@ -4,9 +4,9 @@
#include <stdbool.h>
#include <pcre.h>
#include "sway/criteria.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/config.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "stringop.h"
#include "list.h"
#include "log.h"

View file

@ -7,7 +7,7 @@
#include <wlr/types/wlr_output.h>
#include <wlr/util/log.h>
#include "sway/layers.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"

View file

@ -11,14 +11,14 @@
#include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_wl_shell.h>
#include "log.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/layers.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
/**
* Rotate a child's position relative to a parent. The parent size is (pw, ph),

View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <wayland-server.h>
#include <wlr/types/wlr_wl_shell.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
#include "log.h"

View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <wayland-server.h>
#include <wlr/types/wlr_xdg_shell_v6.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"
#include "log.h"

View file

@ -5,10 +5,10 @@
#include <wlr/xwayland.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_output.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/output.h"
#include "sway/input/seat.h"
#include "sway/input/input-manager.h"

View file

@ -7,7 +7,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include "sway/input/cursor.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "list.h"
#include "log.h"

View file

@ -1,13 +1,13 @@
#define _XOPEN_SOURCE 700
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/seat.h"
#include "sway/input/cursor.h"
#include "sway/input/input-manager.h"
#include "sway/input/keyboard.h"
#include "sway/output.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "log.h"
static void seat_device_destroy(struct sway_seat_device *seat_device) {

View file

@ -3,7 +3,7 @@
#include <ctype.h>
#include "log.h"
#include "sway/ipc-json.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/output.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"

View file

@ -18,7 +18,7 @@
#include <wlr/util/log.h>
#include "sway/config.h"
#include "sway/server.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/ipc-server.h"
#include "ipc-client.h"
#include "readline.h"

View file

@ -7,14 +7,14 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_wl_shell.h>
#include "sway/config.h"
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/layout.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/server.h"
#include "sway/view.h"
#include "sway/workspace.h"
#include "sway/tree/view.h"
#include "sway/tree/workspace.h"
#include "sway/ipc-server.h"
#include "log.h"
@ -82,8 +82,6 @@ static swayc_t *new_swayc(enum swayc_types type) {
c->layout = L_NONE;
c->workspace_layout = L_NONE;
c->type = type;
c->nb_master = 1;
c->nb_slave_groups = 1;
if (type != C_VIEW) {
c->children = create_list();
}

View file

@ -6,10 +6,10 @@
#include <string.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/output.h"
#include "sway/view.h"
#include "sway/tree/view.h"
#include "sway/input/seat.h"
#include "list.h"
#include "log.h"

View file

@ -1,8 +1,8 @@
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
#include "sway/container.h"
#include "sway/layout.h"
#include "sway/view.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
#include "sway/tree/view.h"
const char *view_get_title(struct sway_view *view) {
if (view->iface.get_prop) {
@ -45,6 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
}
}
// TODO make view coordinates
void view_set_position(struct sway_view *view, double ox, double oy) {
if (view->iface.set_position) {
struct wlr_box box = {

View file

@ -3,10 +3,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <strings.h>
#include "sway/container.h"
#include "sway/tree/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
#include "sway/workspace.h"
#include "sway/tree/workspace.h"
#include "log.h"
#include "util.h"