Merge pull request #27 from taiyu-len/master
rewrote and grouped swayc related functions together.master
Drew DeVault
9 years ago
commit
5a8f464bc1
@ -1,18 +1,213 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdbool.h>
|
||||
#include <strings.h>
|
||||
#include "container.h"
|
||||
#include "workspace.h"
|
||||
#include "layout.h"
|
||||
#include "log.h"
|
||||
|
||||
void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
|
||||
|
||||
static swayc_t *new_swayc(enum swayc_types type) {
|
||||
swayc_t *c = calloc(1, sizeof(swayc_t));
|
||||
c->handle = -1;
|
||||
c->layout = L_NONE;
|
||||
c->type = type;
|
||||
c->weight = 1;
|
||||
if (type != C_VIEW) {
|
||||
c->children = create_list();
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
static void free_swayc(swayc_t *c) {
|
||||
//TODO does not properly handle containers with children,
|
||||
//TODO but functions that call this usually check for that
|
||||
if (c->children) {
|
||||
list_free(c->children);
|
||||
}
|
||||
if (c->parent) {
|
||||
remove_child(c->parent, c);
|
||||
}
|
||||
free(c);
|
||||
}
|
||||
|
||||
/* New containers */
|
||||
static void add_output_widths(swayc_t *container, void *_width) {
|
||||
int *width = _width;
|
||||
if (container->type == C_OUTPUT) {
|
||||
*width += container->width;
|
||||
}
|
||||
}
|
||||
|
||||
swayc_t *new_output(wlc_handle handle) {
|
||||
sway_log(L_DEBUG, "Added output %d", handle);
|
||||
const struct wlc_size* size = wlc_output_get_resolution(handle);
|
||||
|
||||
swayc_t *output = new_swayc(C_OUTPUT);
|
||||
output->width = size->w;
|
||||
output->height = size->h;
|
||||
output->handle = handle;
|
||||
|
||||
add_child(&root_container, output);
|
||||
|
||||
//TODO something with this
|
||||
int total_width = 0;
|
||||
container_map(&root_container, add_output_widths, &total_width);
|
||||
|
||||
//Create workspace
|
||||
char *ws_name = workspace_next_name();
|
||||
new_workspace(output, ws_name);
|
||||
free(ws_name);
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
swayc_t *new_workspace(swayc_t * output, const char *name) {
|
||||
sway_log(L_DEBUG, "Added workspace %s for output %d", name, output->handle);
|
||||
swayc_t *workspace = new_swayc(C_WORKSPACE);
|
||||
|
||||
workspace->layout = L_HORIZ; // TODO:default layout
|
||||
workspace->width = output->width;
|
||||
workspace->height = output->height;
|
||||
workspace->name = strdup(name);
|
||||
workspace->visible = true;
|
||||
|
||||
add_child(output, workspace);
|
||||
return workspace;
|
||||
}
|
||||
|
||||
swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) {
|
||||
swayc_t *cont = new_swayc(C_CONTAINER);
|
||||
|
||||
sway_log(L_DEBUG, "creating container %p around %p", cont, child);
|
||||
|
||||
cont->layout = layout;
|
||||
cont->width = child->width;
|
||||
cont->height = child->height;
|
||||
cont->x = child->x;
|
||||
cont->y = child->y;
|
||||
cont->visible = child->visible;
|
||||
|
||||
swayc_t *parent = replace_child(child, cont);
|
||||
if (parent) {
|
||||
add_child(cont, child);
|
||||
}
|
||||
return cont;
|
||||
}
|
||||
|
||||
swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
|
||||
const uint32_t type = wlc_view_get_type(handle);
|
||||
const char *title = wlc_view_get_title(handle);
|
||||
/* Skip if unmanaged window */
|
||||
if ((type & WLC_BIT_OVERRIDE_REDIRECT) || (type & WLC_BIT_UNMANAGED) ||
|
||||
(type & WLC_BIT_POPUP) || (type & WLC_BIT_MODAL) || (type & WLC_BIT_SPLASH)) {
|
||||
sway_log(L_DEBUG, "Leaving view %d:%s alone (unmanaged)", handle, title);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
swayc_t *view = new_swayc(C_VIEW);
|
||||
sway_log(L_DEBUG, "Adding new view %d:%s:%d to container %p %d",
|
||||
handle, title, type, sibling, sibling?sibling->type:0);
|
||||
//Setup values
|
||||
view->handle = handle;
|
||||
view->name = strdup(title);
|
||||
view->visible = true;
|
||||
|
||||
//Case of focused workspace, just create as child of it
|
||||
if (sibling->type == C_WORKSPACE) {
|
||||
add_child(sibling, view);
|
||||
}
|
||||
//Regular case, create as sibling of current container
|
||||
else {
|
||||
add_sibling(sibling, view);
|
||||
}
|
||||
return view;
|
||||
}
|
||||
|
||||
|
||||
swayc_t *destroy_output(swayc_t *output) {
|
||||
if (output->children->length == 0) {
|
||||
//TODO move workspaces to other outputs
|
||||
}
|
||||
sway_log(L_DEBUG, "OUTPUT: Destroying output '%d'", output->handle);
|
||||
free_swayc(output);
|
||||
return &root_container;
|
||||
}
|
||||
|
||||
swayc_t *destroy_workspace(swayc_t *workspace) {
|
||||
//TODO move containers to other workspaces?
|
||||
//for now just dont delete
|
||||
if (workspace->children->length == 0) {
|
||||
sway_log(L_DEBUG, "Workspace: Destroying workspace '%s'", workspace->name);
|
||||
swayc_t *parent = workspace->parent;
|
||||
free_swayc(workspace);
|
||||
return parent;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
swayc_t *destroy_container(swayc_t *container) {
|
||||
while (container->children->length == 0 && container->type == C_CONTAINER) {
|
||||
sway_log(L_DEBUG, "Container: Destroying container '%p'", container);
|
||||
swayc_t *parent = container->parent;
|
||||
free_swayc(container);
|
||||
|
||||
if (parent->focused == container) {
|
||||
parent->focused = NULL;
|
||||
}
|
||||
container = parent;
|
||||
}
|
||||
return container;
|
||||
}
|
||||
|
||||
swayc_t *destroy_view(swayc_t *view) {
|
||||
if (view == NULL) {
|
||||
sway_log(L_DEBUG, "Warning: NULL passed into destroy_view");
|
||||
return NULL;
|
||||
}
|
||||
sway_log(L_DEBUG, "Destroying view '%p'", view);
|
||||
swayc_t *parent = view->parent;
|
||||
free_swayc(view);
|
||||
|
||||
if (parent->focused == view) {
|
||||
parent->focused = NULL;
|
||||
}
|
||||
//Destroy empty containers
|
||||
if (parent->type == C_CONTAINER) {
|
||||
return destroy_container(parent);
|
||||
}
|
||||
return parent;
|
||||
}
|
||||
|
||||
|
||||
swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data) {
|
||||
if (!container->children) {
|
||||
return NULL;
|
||||
}
|
||||
int i;
|
||||
for (i = 0; i < container->children->length; ++i) {
|
||||
swayc_t *child = container->children->items[i];
|
||||
if (test(child, data)) {
|
||||
return child;
|
||||
} else {
|
||||
swayc_t *_ = find_container(child, test, data);
|
||||
if (_) {
|
||||
return _;
|
||||
}
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
|
||||
if (!container->children || !container->children->length) {
|
||||
return;
|
||||
}
|
||||
int i;
|
||||
for (i = 0; i < container->children->length; ++i) {
|
||||
swayc_t *child = container->children->items[i];
|
||||
f(child, data);
|
||||
|
||||
if (child->children) {
|
||||
container_map(child, f, data);
|
||||
}
|
||||
container_map(child, f, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,8 +1,71 @@
|
||||
#ifndef _SWAY_CONTAINER_H
|
||||
#define _SWAY_CONTAINER_H
|
||||
#include <wlc/wlc.h>
|
||||
typedef struct sway_container swayc_t;
|
||||
|
||||
#include "layout.h"
|
||||
|
||||
enum swayc_types{
|
||||
C_ROOT,
|
||||
C_OUTPUT,
|
||||
C_WORKSPACE,
|
||||
C_CONTAINER,
|
||||
C_VIEW,
|
||||
//Keep last
|
||||
C_TYPES,
|
||||
};
|
||||
|
||||
enum swayc_layouts{
|
||||
L_NONE,
|
||||
L_HORIZ,
|
||||
L_VERT,
|
||||
L_STACKED,
|
||||
L_TABBED,
|
||||
L_FLOATING,
|
||||
//Keep last
|
||||
L_LAYOUTS,
|
||||
};
|
||||
|
||||
struct sway_container {
|
||||
wlc_handle handle;
|
||||
|
||||
enum swayc_types type;
|
||||
|
||||
enum swayc_layouts layout;
|
||||
|
||||
// Not including borders or margins
|
||||
int width, height;
|
||||
|
||||
int x, y;
|
||||
|
||||
bool visible;
|
||||
|
||||
int weight;
|
||||
|
||||
char *name;
|
||||
|
||||
list_t *children;
|
||||
|
||||
struct sway_container *parent;
|
||||
struct sway_container *focused;
|
||||
};
|
||||
|
||||
|
||||
swayc_t *new_output(wlc_handle handle);
|
||||
swayc_t *new_workspace(swayc_t * output, const char *name);
|
||||
//Creates container Around child (parent child) -> (parent (container child))
|
||||
swayc_t *new_container(swayc_t *child, enum swayc_layouts layout);
|
||||
//Creates view as a sibling of current focused container, or as child of a workspace
|
||||
swayc_t *new_view(swayc_t *sibling, wlc_handle handle);
|
||||
|
||||
|
||||
swayc_t *destroy_output(swayc_t *output);
|
||||
//destroys workspace if empty and returns parent pointer, else returns NULL
|
||||
swayc_t *destroy_workspace(swayc_t *workspace);
|
||||
swayc_t *destroy_container(swayc_t *container);
|
||||
swayc_t *destroy_view(swayc_t *view);
|
||||
|
||||
swayc_t *find_container(swayc_t *container, bool (*test)(swayc_t *view, void *data), void *data);
|
||||
void container_map(swayc_t *, void (*f)(swayc_t *, void *), void *);
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in new issue