2018-07-07 11:30:52 +02:00
|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
#include <assert.h>
|
2019-11-13 19:23:36 +01:00
|
|
|
#include <GLES2/gl2.h>
|
2018-07-07 11:30:52 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <time.h>
|
2019-07-27 22:02:56 +02:00
|
|
|
#include <wayland-server-core.h>
|
2019-11-13 19:23:36 +01:00
|
|
|
#include <wlr/render/gles2.h>
|
2018-07-07 11:30:52 +02:00
|
|
|
#include <wlr/render/wlr_renderer.h>
|
|
|
|
#include <wlr/types/wlr_buffer.h>
|
|
|
|
#include <wlr/types/wlr_matrix.h>
|
|
|
|
#include <wlr/types/wlr_output_damage.h>
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
#include <wlr/types/wlr_output.h>
|
2022-01-13 11:15:39 +01:00
|
|
|
#include <wlr/types/wlr_compositor.h>
|
2018-07-07 11:30:52 +02:00
|
|
|
#include <wlr/util/region.h>
|
|
|
|
#include "log.h"
|
2018-07-25 13:32:20 +02:00
|
|
|
#include "config.h"
|
2018-07-07 11:30:52 +02:00
|
|
|
#include "sway/config.h"
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
#include "sway/layers.h"
|
|
|
|
#include "sway/output.h"
|
|
|
|
#include "sway/server.h"
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
#include "sway/tree/container.h"
|
2018-08-26 04:05:16 +02:00
|
|
|
#include "sway/tree/root.h"
|
2018-07-07 11:30:52 +02:00
|
|
|
#include "sway/tree/view.h"
|
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
|
|
|
struct render_data {
|
|
|
|
pixman_region32_t *damage;
|
|
|
|
float alpha;
|
2021-04-25 23:25:23 +02:00
|
|
|
struct wlr_box *clip_box;
|
2018-07-07 11:30:52 +02:00
|
|
|
};
|
|
|
|
|
2018-10-12 14:36:11 +02:00
|
|
|
/**
|
|
|
|
* Apply scale to a width or height.
|
|
|
|
*
|
|
|
|
* One does not simply multiply the width by the scale. We allow fractional
|
|
|
|
* scaling, which means the resulting scaled width might be a decimal.
|
|
|
|
* So we round it.
|
|
|
|
*
|
|
|
|
* But even this can produce undesirable results depending on the X or Y offset
|
|
|
|
* of the box. For example, with a scale of 1.5, a box with width=1 should not
|
|
|
|
* scale to 2px if its X coordinate is 1, because the X coordinate would have
|
|
|
|
* scaled to 2px.
|
|
|
|
*/
|
|
|
|
static int scale_length(int length, int offset, float scale) {
|
|
|
|
return round((offset + length) * scale) - round(offset * scale);
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
static void scissor_output(struct wlr_output *wlr_output,
|
|
|
|
pixman_box32_t *rect) {
|
2021-11-15 19:32:52 +01:00
|
|
|
struct wlr_renderer *renderer = wlr_output->renderer;
|
2018-07-07 11:30:52 +02:00
|
|
|
assert(renderer);
|
|
|
|
|
|
|
|
struct wlr_box box = {
|
|
|
|
.x = rect->x1,
|
|
|
|
.y = rect->y1,
|
|
|
|
.width = rect->x2 - rect->x1,
|
|
|
|
.height = rect->y2 - rect->y1,
|
|
|
|
};
|
|
|
|
|
|
|
|
int ow, oh;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &ow, &oh);
|
|
|
|
|
|
|
|
enum wl_output_transform transform =
|
|
|
|
wlr_output_transform_invert(wlr_output->transform);
|
2018-12-22 14:53:05 +01:00
|
|
|
wlr_box_transform(&box, &box, transform, ow, oh);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
wlr_renderer_scissor(renderer, &box);
|
|
|
|
}
|
|
|
|
|
2019-11-13 19:23:36 +01:00
|
|
|
static void set_scale_filter(struct wlr_output *wlr_output,
|
|
|
|
struct wlr_texture *texture, enum scale_filter_mode scale_filter) {
|
|
|
|
if (!wlr_texture_is_gles2(texture)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct wlr_gles2_texture_attribs attribs;
|
|
|
|
wlr_gles2_texture_get_attribs(texture, &attribs);
|
|
|
|
|
2020-01-13 16:13:50 +01:00
|
|
|
glBindTexture(attribs.target, attribs.tex);
|
|
|
|
|
2019-11-13 19:23:36 +01:00
|
|
|
switch (scale_filter) {
|
|
|
|
case SCALE_FILTER_LINEAR:
|
|
|
|
glTexParameteri(attribs.target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
|
|
break;
|
|
|
|
case SCALE_FILTER_NEAREST:
|
|
|
|
glTexParameteri(attribs.target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
|
|
break;
|
|
|
|
case SCALE_FILTER_DEFAULT:
|
|
|
|
case SCALE_FILTER_SMART:
|
|
|
|
assert(false); // unreachable
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
static void render_texture(struct wlr_output *wlr_output,
|
|
|
|
pixman_region32_t *output_damage, struct wlr_texture *texture,
|
2020-04-27 16:41:54 +02:00
|
|
|
const struct wlr_fbox *src_box, const struct wlr_box *dst_box,
|
|
|
|
const float matrix[static 9], float alpha) {
|
2021-11-15 19:32:52 +01:00
|
|
|
struct wlr_renderer *renderer = wlr_output->renderer;
|
2020-01-13 16:13:50 +01:00
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
pixman_region32_t damage;
|
|
|
|
pixman_region32_init(&damage);
|
2020-04-27 16:41:54 +02:00
|
|
|
pixman_region32_union_rect(&damage, &damage, dst_box->x, dst_box->y,
|
|
|
|
dst_box->width, dst_box->height);
|
2018-07-07 11:30:52 +02:00
|
|
|
pixman_region32_intersect(&damage, &damage, output_damage);
|
|
|
|
bool damaged = pixman_region32_not_empty(&damage);
|
|
|
|
if (!damaged) {
|
|
|
|
goto damage_finish;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nrects;
|
|
|
|
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
|
|
|
|
for (int i = 0; i < nrects; ++i) {
|
|
|
|
scissor_output(wlr_output, &rects[i]);
|
2020-01-13 16:13:50 +01:00
|
|
|
set_scale_filter(wlr_output, texture, output->scale_filter);
|
2020-04-27 16:41:54 +02:00
|
|
|
if (src_box != NULL) {
|
|
|
|
wlr_render_subtexture_with_matrix(renderer, texture, src_box, matrix, alpha);
|
|
|
|
} else {
|
|
|
|
wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
|
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
damage_finish:
|
|
|
|
pixman_region32_fini(&damage);
|
|
|
|
}
|
|
|
|
|
2021-04-26 09:32:26 +02:00
|
|
|
static void render_surface_iterator(struct sway_output *output,
|
|
|
|
struct sway_view *view, struct wlr_surface *surface,
|
|
|
|
struct wlr_box *_box, void *_data) {
|
2018-07-27 19:17:47 +02:00
|
|
|
struct render_data *data = _data;
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
pixman_region32_t *output_damage = data->damage;
|
|
|
|
float alpha = data->alpha;
|
|
|
|
|
|
|
|
struct wlr_texture *texture = wlr_surface_get_texture(surface);
|
|
|
|
if (!texture) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-04-27 16:41:54 +02:00
|
|
|
struct wlr_fbox src_box;
|
|
|
|
wlr_surface_get_buffer_source_box(surface, &src_box);
|
|
|
|
|
2020-06-13 15:37:03 +02:00
|
|
|
struct wlr_box proj_box = *_box;
|
|
|
|
scale_box(&proj_box, wlr_output->scale);
|
2018-07-27 19:17:47 +02:00
|
|
|
|
|
|
|
float matrix[9];
|
|
|
|
enum wl_output_transform transform =
|
|
|
|
wlr_output_transform_invert(surface->current.transform);
|
2021-04-26 09:32:26 +02:00
|
|
|
wlr_matrix_project_box(matrix, &proj_box, transform, 0.0,
|
2018-07-27 19:17:47 +02:00
|
|
|
wlr_output->transform_matrix);
|
|
|
|
|
2020-06-13 15:37:03 +02:00
|
|
|
struct wlr_box dst_box = *_box;
|
2021-04-25 23:25:23 +02:00
|
|
|
struct wlr_box *clip_box = data->clip_box;
|
|
|
|
if (clip_box != NULL) {
|
|
|
|
dst_box.width = fmin(dst_box.width, clip_box->width);
|
|
|
|
dst_box.height = fmin(dst_box.height, clip_box->height);
|
2020-06-13 15:37:03 +02:00
|
|
|
}
|
|
|
|
scale_box(&dst_box, wlr_output->scale);
|
|
|
|
|
2020-04-27 16:41:54 +02:00
|
|
|
render_texture(wlr_output, output_damage, texture,
|
|
|
|
&src_box, &dst_box, matrix, alpha);
|
2019-08-18 06:58:52 +02:00
|
|
|
|
2019-11-17 00:24:19 +01:00
|
|
|
wlr_presentation_surface_sampled_on_output(server.presentation, surface,
|
|
|
|
wlr_output);
|
2018-07-27 19:17:47 +02:00
|
|
|
}
|
|
|
|
|
2019-12-03 16:03:38 +01:00
|
|
|
static void render_layer_toplevel(struct sway_output *output,
|
2018-07-07 11:30:52 +02:00
|
|
|
pixman_region32_t *damage, struct wl_list *layer_surfaces) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2021-01-08 10:53:36 +01:00
|
|
|
output_layer_for_each_toplevel_surface(output, layer_surfaces,
|
2019-12-03 16:03:38 +01:00
|
|
|
render_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_layer_popups(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *layer_surfaces) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2021-01-08 10:53:36 +01:00
|
|
|
output_layer_for_each_popup_surface(output, layer_surfaces,
|
2018-07-27 20:16:36 +02:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
2018-07-27 19:17:47 +02:00
|
|
|
|
2018-11-18 00:33:06 +01:00
|
|
|
#if HAVE_XWAYLAND
|
2018-07-07 11:30:52 +02:00
|
|
|
static void render_unmanaged(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *unmanaged) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2018-07-27 19:17:47 +02:00
|
|
|
output_unmanaged_for_each_surface(output, unmanaged,
|
2018-07-27 20:16:36 +02:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
2018-07-24 22:16:06 +02:00
|
|
|
#endif
|
2018-07-27 19:17:47 +02:00
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
static void render_drag_icons(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct wl_list *drag_icons) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
2018-07-27 19:44:36 +02:00
|
|
|
output_drag_icons_for_each_surface(output, drag_icons,
|
2018-07-27 20:16:36 +02:00
|
|
|
render_surface_iterator, &data);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-09-07 10:42:43 +02:00
|
|
|
// _box.x and .y are expected to be layout-local
|
|
|
|
// _box.width and .height are expected to be output-buffer-local
|
2019-03-11 11:45:01 +01:00
|
|
|
void render_rect(struct sway_output *output,
|
2018-07-07 11:30:52 +02:00
|
|
|
pixman_region32_t *output_damage, const struct wlr_box *_box,
|
|
|
|
float color[static 4]) {
|
2019-03-11 11:45:01 +01:00
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
2021-11-15 19:32:52 +01:00
|
|
|
struct wlr_renderer *renderer = wlr_output->renderer;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
struct wlr_box box;
|
|
|
|
memcpy(&box, _box, sizeof(struct wlr_box));
|
2019-03-11 11:45:01 +01:00
|
|
|
box.x -= output->lx * wlr_output->scale;
|
|
|
|
box.y -= output->ly * wlr_output->scale;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
pixman_region32_t damage;
|
|
|
|
pixman_region32_init(&damage);
|
|
|
|
pixman_region32_union_rect(&damage, &damage, box.x, box.y,
|
|
|
|
box.width, box.height);
|
|
|
|
pixman_region32_intersect(&damage, &damage, output_damage);
|
|
|
|
bool damaged = pixman_region32_not_empty(&damage);
|
|
|
|
if (!damaged) {
|
|
|
|
goto damage_finish;
|
|
|
|
}
|
|
|
|
|
|
|
|
int nrects;
|
|
|
|
pixman_box32_t *rects = pixman_region32_rectangles(&damage, &nrects);
|
|
|
|
for (int i = 0; i < nrects; ++i) {
|
|
|
|
scissor_output(wlr_output, &rects[i]);
|
|
|
|
wlr_render_rect(renderer, &box, color,
|
|
|
|
wlr_output->transform_matrix);
|
|
|
|
}
|
|
|
|
|
|
|
|
damage_finish:
|
|
|
|
pixman_region32_fini(&damage);
|
|
|
|
}
|
|
|
|
|
2019-01-10 13:04:42 +01:00
|
|
|
void premultiply_alpha(float color[4], float opacity) {
|
2018-07-07 11:30:52 +02:00
|
|
|
color[3] *= opacity;
|
|
|
|
color[0] *= color[3];
|
|
|
|
color[1] *= color[3];
|
|
|
|
color[2] *= color[3];
|
|
|
|
}
|
|
|
|
|
2018-08-02 15:30:26 +02:00
|
|
|
static void render_view_toplevels(struct sway_view *view,
|
2018-07-07 11:30:52 +02:00
|
|
|
struct sway_output *output, pixman_region32_t *damage, float alpha) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = alpha,
|
|
|
|
};
|
2021-04-25 23:25:23 +02:00
|
|
|
struct wlr_box clip_box;
|
2020-06-13 15:37:03 +02:00
|
|
|
if (!container_is_current_floating(view->container)) {
|
2021-04-25 23:25:23 +02:00
|
|
|
// As we pass the geometry offsets to the surface iterator, we will
|
|
|
|
// need to account for the offsets in the clip dimensions.
|
|
|
|
clip_box.width = view->container->current.content_width + view->geometry.x;
|
|
|
|
clip_box.height = view->container->current.content_height + view->geometry.y;
|
|
|
|
data.clip_box = &clip_box;
|
2020-06-13 15:37:03 +02:00
|
|
|
}
|
2018-08-02 15:30:26 +02:00
|
|
|
// Render all toplevels without descending into popups
|
2019-01-28 07:00:34 +01:00
|
|
|
double ox = view->container->surface_x -
|
2019-03-11 11:45:01 +01:00
|
|
|
output->lx - view->geometry.x;
|
2019-01-28 07:00:34 +01:00
|
|
|
double oy = view->container->surface_y -
|
2019-03-11 11:45:01 +01:00
|
|
|
output->ly - view->geometry.y;
|
2018-08-18 07:10:06 +02:00
|
|
|
output_surface_for_each_surface(output, view->surface, ox, oy,
|
2018-08-02 15:30:26 +02:00
|
|
|
render_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_view_popups(struct sway_view *view,
|
|
|
|
struct sway_output *output, pixman_region32_t *damage, float alpha) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = alpha,
|
|
|
|
};
|
2021-01-08 10:46:12 +01:00
|
|
|
output_view_for_each_popup_surface(output, view,
|
|
|
|
render_surface_iterator, &data);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void render_saved_view(struct sway_view *view,
|
|
|
|
struct sway_output *output, pixman_region32_t *damage, float alpha) {
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
|
2020-05-31 01:37:43 +02:00
|
|
|
if (wl_list_empty(&view->saved_buffers)) {
|
2018-07-07 11:30:52 +02:00
|
|
|
return;
|
|
|
|
}
|
2020-06-13 15:37:03 +02:00
|
|
|
|
|
|
|
bool floating = container_is_current_floating(view->container);
|
|
|
|
|
2020-05-31 01:37:43 +02:00
|
|
|
struct sway_saved_buffer *saved_buf;
|
|
|
|
wl_list_for_each(saved_buf, &view->saved_buffers, link) {
|
|
|
|
if (!saved_buf->buffer->texture) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2020-06-13 15:37:03 +02:00
|
|
|
struct wlr_box proj_box = {
|
2021-02-08 00:51:10 +01:00
|
|
|
.x = saved_buf->x - view->saved_geometry.x - output->lx,
|
|
|
|
.y = saved_buf->y - view->saved_geometry.y - output->ly,
|
2020-05-31 01:37:43 +02:00
|
|
|
.width = saved_buf->width,
|
|
|
|
.height = saved_buf->height,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct wlr_box output_box = {
|
|
|
|
.width = output->width,
|
|
|
|
.height = output->height,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct wlr_box intersection;
|
2020-06-13 15:37:03 +02:00
|
|
|
bool intersects = wlr_box_intersection(&intersection, &output_box, &proj_box);
|
2020-05-31 01:37:43 +02:00
|
|
|
if (!intersects) {
|
|
|
|
continue;
|
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2020-06-13 15:37:03 +02:00
|
|
|
struct wlr_box dst_box = proj_box;
|
|
|
|
scale_box(&proj_box, wlr_output->scale);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2020-05-31 01:37:43 +02:00
|
|
|
float matrix[9];
|
2020-06-05 14:13:18 +02:00
|
|
|
enum wl_output_transform transform = wlr_output_transform_invert(saved_buf->transform);
|
2020-06-13 15:37:03 +02:00
|
|
|
wlr_matrix_project_box(matrix, &proj_box, transform, 0,
|
2020-05-31 01:37:43 +02:00
|
|
|
wlr_output->transform_matrix);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2020-06-13 15:37:03 +02:00
|
|
|
if (!floating) {
|
|
|
|
dst_box.width = fmin(dst_box.width,
|
|
|
|
view->container->current.content_width -
|
2021-04-25 23:25:23 +02:00
|
|
|
(saved_buf->x - view->container->current.content_x) + view->saved_geometry.x);
|
2020-06-13 15:37:03 +02:00
|
|
|
dst_box.height = fmin(dst_box.height,
|
|
|
|
view->container->current.content_height -
|
2021-04-25 23:25:23 +02:00
|
|
|
(saved_buf->y - view->container->current.content_y) + view->saved_geometry.y);
|
2020-06-13 15:37:03 +02:00
|
|
|
}
|
|
|
|
scale_box(&dst_box, wlr_output->scale);
|
|
|
|
|
2020-05-31 01:37:43 +02:00
|
|
|
render_texture(wlr_output, damage, saved_buf->buffer->texture,
|
2020-06-13 15:37:03 +02:00
|
|
|
&saved_buf->source_box, &dst_box, matrix, alpha);
|
2020-05-31 01:37:43 +02:00
|
|
|
}
|
2019-08-18 06:58:52 +02:00
|
|
|
|
|
|
|
// FIXME: we should set the surface that this saved buffer originates from
|
|
|
|
// as sampled here.
|
|
|
|
// https://github.com/swaywm/sway/pull/4465#discussion_r321082059
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render a view's surface and left/bottom/right borders.
|
|
|
|
*/
|
|
|
|
static void render_view(struct sway_output *output, pixman_region32_t *damage,
|
|
|
|
struct sway_container *con, struct border_colors *colors) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
struct sway_view *view = con->view;
|
2020-05-31 01:37:43 +02:00
|
|
|
if (!wl_list_empty(&view->saved_buffers)) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_saved_view(view, output, damage, view->container->alpha);
|
2018-09-06 03:39:52 +02:00
|
|
|
} else if (view->surface) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_view_toplevels(view, output, damage, view->container->alpha);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (con->current.border == B_NONE || con->current.border == B_CSD) {
|
2018-07-17 02:14:33 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
struct wlr_box box;
|
|
|
|
float output_scale = output->wlr_output->scale;
|
|
|
|
float color[4];
|
|
|
|
struct sway_container_state *state = &con->current;
|
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (state->border_left) {
|
|
|
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
2021-02-22 12:32:07 +01:00
|
|
|
box.x = floor(state->x);
|
|
|
|
box.y = floor(state->content_y);
|
2018-09-24 12:54:57 +02:00
|
|
|
box.width = state->border_thickness;
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
2018-11-17 09:32:03 +01:00
|
|
|
box.height = state->content_height;
|
2018-09-24 12:54:57 +02:00
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, damage, &box, color);
|
2018-09-24 12:54:57 +02:00
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
list_t *siblings = container_get_current_siblings(con);
|
|
|
|
enum sway_container_layout layout =
|
|
|
|
container_current_parent_layout(con);
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (state->border_right) {
|
2021-02-22 19:33:08 +01:00
|
|
|
if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_HORIZ) {
|
2018-09-24 12:54:57 +02:00
|
|
|
memcpy(&color, colors->indicator, sizeof(float) * 4);
|
|
|
|
} else {
|
|
|
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
2018-09-24 12:54:57 +02:00
|
|
|
premultiply_alpha(color, con->alpha);
|
2021-02-22 12:32:07 +01:00
|
|
|
box.x = floor(state->content_x + state->content_width);
|
|
|
|
box.y = floor(state->content_y);
|
2018-09-24 12:54:57 +02:00
|
|
|
box.width = state->border_thickness;
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
2018-11-17 09:32:03 +01:00
|
|
|
box.height = state->content_height;
|
2018-09-24 12:54:57 +02:00
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, damage, &box, color);
|
2018-09-24 12:54:57 +02:00
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (state->border_bottom) {
|
2021-02-22 19:33:08 +01:00
|
|
|
if (!container_is_current_floating(con) && siblings->length == 1 && layout == L_VERT) {
|
2018-09-24 12:54:57 +02:00
|
|
|
memcpy(&color, colors->indicator, sizeof(float) * 4);
|
|
|
|
} else {
|
|
|
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
2018-09-24 12:54:57 +02:00
|
|
|
premultiply_alpha(color, con->alpha);
|
2021-02-22 12:32:07 +01:00
|
|
|
box.x = floor(state->x);
|
|
|
|
box.y = floor(state->content_y + state->content_height);
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
2018-11-17 09:32:03 +01:00
|
|
|
box.width = state->width;
|
2018-09-24 12:54:57 +02:00
|
|
|
box.height = state->border_thickness;
|
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render a titlebar.
|
|
|
|
*
|
|
|
|
* Care must be taken not to render over the same pixel multiple times,
|
|
|
|
* otherwise the colors will be incorrect when using opacity.
|
|
|
|
*
|
|
|
|
* The height is: 1px border, 3px padding, font height, 3px padding, 1px border
|
2019-08-24 04:44:53 +02:00
|
|
|
* The left side is: 1px border, 2px padding, title
|
2018-07-07 11:30:52 +02:00
|
|
|
*/
|
|
|
|
static void render_titlebar(struct sway_output *output,
|
|
|
|
pixman_region32_t *output_damage, struct sway_container *con,
|
|
|
|
int x, int y, int width,
|
|
|
|
struct border_colors *colors, struct wlr_texture *title_texture,
|
|
|
|
struct wlr_texture *marks_texture) {
|
|
|
|
struct wlr_box box;
|
|
|
|
float color[4];
|
|
|
|
float output_scale = output->wlr_output->scale;
|
2019-03-11 11:45:01 +01:00
|
|
|
double output_x = output->lx;
|
|
|
|
double output_y = output->ly;
|
2018-11-17 20:06:48 +01:00
|
|
|
int titlebar_border_thickness = config->titlebar_border_thickness;
|
|
|
|
int titlebar_h_padding = config->titlebar_h_padding;
|
|
|
|
int titlebar_v_padding = config->titlebar_v_padding;
|
2018-11-26 04:08:58 +01:00
|
|
|
enum alignment title_align = config->title_align;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
// Single pixel bar above title
|
|
|
|
memcpy(&color, colors->border, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
|
|
|
box.x = x;
|
|
|
|
box.y = y;
|
|
|
|
box.width = width;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.height = titlebar_border_thickness;
|
2018-07-07 11:30:52 +02:00
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
// Single pixel bar below title
|
2019-08-24 04:44:53 +02:00
|
|
|
box.x = x;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.y = y + container_titlebar_height() - titlebar_border_thickness;
|
2019-08-24 04:44:53 +02:00
|
|
|
box.width = width;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.height = titlebar_border_thickness;
|
2018-07-07 11:30:52 +02:00
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2019-08-24 04:44:53 +02:00
|
|
|
// Single pixel left edge
|
|
|
|
box.x = x;
|
|
|
|
box.y = y + titlebar_border_thickness;
|
|
|
|
box.width = titlebar_border_thickness;
|
|
|
|
box.height = container_titlebar_height() - titlebar_border_thickness * 2;
|
|
|
|
scale_box(&box, output_scale);
|
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2019-08-24 04:44:53 +02:00
|
|
|
// Single pixel right edge
|
|
|
|
box.x = x + width - titlebar_border_thickness;
|
|
|
|
box.y = y + titlebar_border_thickness;
|
|
|
|
box.width = titlebar_border_thickness;
|
|
|
|
box.height = container_titlebar_height() - titlebar_border_thickness * 2;
|
|
|
|
scale_box(&box, output_scale);
|
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
int inner_x = x - output_x + titlebar_h_padding;
|
2018-11-17 20:06:48 +01:00
|
|
|
int bg_y = y + titlebar_border_thickness;
|
2018-11-26 04:08:58 +01:00
|
|
|
size_t inner_width = width - titlebar_h_padding * 2;
|
|
|
|
|
|
|
|
// output-buffer local
|
|
|
|
int ob_inner_x = round(inner_x * output_scale);
|
|
|
|
int ob_inner_width = scale_length(inner_width, inner_x, output_scale);
|
2018-10-12 14:36:11 +02:00
|
|
|
int ob_bg_height = scale_length(
|
2018-11-17 20:06:48 +01:00
|
|
|
(titlebar_v_padding - titlebar_border_thickness) * 2 +
|
2018-10-12 14:36:11 +02:00
|
|
|
config->font_height, bg_y, output_scale);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
// Marks
|
2018-11-26 04:08:58 +01:00
|
|
|
int ob_marks_x = 0; // output-buffer-local
|
|
|
|
int ob_marks_width = 0; // output-buffer-local
|
2018-07-07 11:30:52 +02:00
|
|
|
if (config->show_marks && marks_texture) {
|
2021-05-17 10:32:27 +02:00
|
|
|
struct wlr_box texture_box = {
|
|
|
|
.width = marks_texture->width,
|
|
|
|
.height = marks_texture->height,
|
|
|
|
};
|
2018-11-26 04:08:58 +01:00
|
|
|
ob_marks_width = texture_box.width;
|
2018-09-07 10:42:43 +02:00
|
|
|
|
|
|
|
// The marks texture might be shorter than the config->font_height, in
|
|
|
|
// which case we need to pad it as evenly as possible above and below.
|
2018-10-12 14:36:11 +02:00
|
|
|
int ob_padding_total = ob_bg_height - texture_box.height;
|
|
|
|
int ob_padding_above = floor(ob_padding_total / 2.0);
|
|
|
|
int ob_padding_below = ceil(ob_padding_total / 2.0);
|
2018-09-07 10:42:43 +02:00
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
// Render texture. If the title is on the right, the marks will be on
|
|
|
|
// the left. Otherwise, they will be on the right.
|
|
|
|
if (title_align == ALIGN_RIGHT || texture_box.width > ob_inner_width) {
|
|
|
|
texture_box.x = ob_inner_x;
|
|
|
|
} else {
|
|
|
|
texture_box.x = ob_inner_x + ob_inner_width - texture_box.width;
|
|
|
|
}
|
|
|
|
ob_marks_x = texture_box.x;
|
|
|
|
|
2018-10-12 14:36:11 +02:00
|
|
|
texture_box.y = round((bg_y - output_y) * output_scale) +
|
2018-09-07 10:42:43 +02:00
|
|
|
ob_padding_above;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
float matrix[9];
|
|
|
|
wlr_matrix_project_box(matrix, &texture_box,
|
|
|
|
WL_OUTPUT_TRANSFORM_NORMAL,
|
|
|
|
0.0, output->wlr_output->transform_matrix);
|
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
if (ob_inner_width < texture_box.width) {
|
|
|
|
texture_box.width = ob_inner_width;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
render_texture(output->wlr_output, output_damage, marks_texture,
|
2020-04-27 16:41:54 +02:00
|
|
|
NULL, &texture_box, matrix, con->alpha);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-09-07 10:42:43 +02:00
|
|
|
// Padding above
|
2018-10-12 14:36:11 +02:00
|
|
|
memcpy(&color, colors->background, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
|
|
|
box.x = texture_box.x + round(output_x * output_scale);
|
2018-11-17 20:06:48 +01:00
|
|
|
box.y = round((y + titlebar_border_thickness) * output_scale);
|
2018-10-12 14:36:11 +02:00
|
|
|
box.width = texture_box.width;
|
|
|
|
box.height = ob_padding_above;
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-09-07 10:42:43 +02:00
|
|
|
|
|
|
|
// Padding below
|
2018-10-12 14:36:11 +02:00
|
|
|
box.y += ob_padding_above + texture_box.height;
|
|
|
|
box.height = ob_padding_below;
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Title text
|
2018-11-26 04:08:58 +01:00
|
|
|
int ob_title_x = 0; // output-buffer-local
|
|
|
|
int ob_title_width = 0; // output-buffer-local
|
2018-07-07 11:30:52 +02:00
|
|
|
if (title_texture) {
|
2021-05-17 10:32:27 +02:00
|
|
|
struct wlr_box texture_box = {
|
|
|
|
.width = title_texture->width,
|
|
|
|
.height = title_texture->height,
|
|
|
|
};
|
2021-02-22 06:30:36 +01:00
|
|
|
|
2021-02-24 21:15:22 +01:00
|
|
|
// The effective output may be NULL when con is not on any output.
|
|
|
|
// This can happen because we render all children of containers,
|
|
|
|
// even those that are out of the bounds of any output.
|
|
|
|
struct sway_output *effective = container_get_effective_output(con);
|
|
|
|
float title_scale = effective ? effective->wlr_output->scale : output_scale;
|
2021-02-22 06:30:36 +01:00
|
|
|
texture_box.width = texture_box.width * output_scale / title_scale;
|
|
|
|
texture_box.height = texture_box.height * output_scale / title_scale;
|
2018-11-26 04:08:58 +01:00
|
|
|
ob_title_width = texture_box.width;
|
2018-09-07 10:42:43 +02:00
|
|
|
|
2018-09-08 08:19:31 +02:00
|
|
|
// The title texture might be shorter than the config->font_height,
|
|
|
|
// in which case we need to pad it above and below.
|
2021-08-18 23:27:01 +02:00
|
|
|
int ob_padding_above = round((titlebar_v_padding -
|
2018-11-17 20:06:48 +01:00
|
|
|
titlebar_border_thickness) * output_scale);
|
2018-10-12 14:36:11 +02:00
|
|
|
int ob_padding_below = ob_bg_height - ob_padding_above -
|
|
|
|
texture_box.height;
|
2018-09-07 10:42:43 +02:00
|
|
|
|
|
|
|
// Render texture
|
2018-11-26 04:08:58 +01:00
|
|
|
if (texture_box.width > ob_inner_width - ob_marks_width) {
|
|
|
|
texture_box.x = (title_align == ALIGN_RIGHT && ob_marks_width)
|
|
|
|
? ob_marks_x + ob_marks_width : ob_inner_x;
|
|
|
|
} else if (title_align == ALIGN_LEFT) {
|
|
|
|
texture_box.x = ob_inner_x;
|
|
|
|
} else if (title_align == ALIGN_CENTER) {
|
|
|
|
// If there are marks visible, center between the edge and marks.
|
|
|
|
// Otherwise, center in the inner area.
|
|
|
|
if (ob_marks_width) {
|
|
|
|
texture_box.x = (ob_inner_x + ob_marks_x) / 2
|
|
|
|
- texture_box.width / 2;
|
|
|
|
} else {
|
|
|
|
texture_box.x = ob_inner_x + ob_inner_width / 2
|
|
|
|
- texture_box.width / 2;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
texture_box.x = ob_inner_x + ob_inner_width - texture_box.width;
|
|
|
|
}
|
|
|
|
ob_title_x = texture_box.x;
|
|
|
|
|
2018-10-12 14:36:11 +02:00
|
|
|
texture_box.y =
|
|
|
|
round((bg_y - output_y) * output_scale) + ob_padding_above;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
float matrix[9];
|
|
|
|
wlr_matrix_project_box(matrix, &texture_box,
|
|
|
|
WL_OUTPUT_TRANSFORM_NORMAL,
|
|
|
|
0.0, output->wlr_output->transform_matrix);
|
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
if (ob_inner_width - ob_marks_width < texture_box.width) {
|
|
|
|
texture_box.width = ob_inner_width - ob_marks_width;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
2018-11-26 04:08:58 +01:00
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
render_texture(output->wlr_output, output_damage, title_texture,
|
2020-04-27 16:41:54 +02:00
|
|
|
NULL, &texture_box, matrix, con->alpha);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-09-07 10:42:43 +02:00
|
|
|
// Padding above
|
2018-10-12 14:36:11 +02:00
|
|
|
memcpy(&color, colors->background, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
|
|
|
box.x = texture_box.x + round(output_x * output_scale);
|
2018-11-17 20:06:48 +01:00
|
|
|
box.y = round((y + titlebar_border_thickness) * output_scale);
|
2018-10-12 14:36:11 +02:00
|
|
|
box.width = texture_box.width;
|
|
|
|
box.height = ob_padding_above;
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-09-07 10:42:43 +02:00
|
|
|
|
|
|
|
// Padding below
|
2018-10-12 14:36:11 +02:00
|
|
|
box.y += ob_padding_above + texture_box.height;
|
|
|
|
box.height = ob_padding_below;
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
// Determine the left + right extends of the textures (output-buffer local)
|
|
|
|
int ob_left_x, ob_left_width, ob_right_x, ob_right_width;
|
2018-11-28 20:18:30 +01:00
|
|
|
if (ob_title_width == 0 && ob_marks_width == 0) {
|
|
|
|
ob_left_x = ob_inner_x;
|
|
|
|
ob_left_width = 0;
|
|
|
|
ob_right_x = ob_inner_x;
|
|
|
|
ob_right_width = 0;
|
|
|
|
} else if (ob_title_x < ob_marks_x) {
|
2018-11-26 04:08:58 +01:00
|
|
|
ob_left_x = ob_title_x;
|
|
|
|
ob_left_width = ob_title_width;
|
|
|
|
ob_right_x = ob_marks_x;
|
|
|
|
ob_right_width = ob_marks_width;
|
|
|
|
} else {
|
|
|
|
ob_left_x = ob_marks_x;
|
|
|
|
ob_left_width = ob_marks_width;
|
|
|
|
ob_right_x = ob_title_x;
|
|
|
|
ob_right_width = ob_title_width;
|
|
|
|
}
|
|
|
|
if (ob_left_x < ob_inner_x) {
|
|
|
|
ob_left_x = ob_inner_x;
|
|
|
|
} else if (ob_left_x + ob_left_width > ob_right_x + ob_right_width) {
|
|
|
|
ob_right_x = ob_left_x;
|
|
|
|
ob_right_width = ob_left_width;
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
// Filler between title and marks
|
2018-11-26 04:08:58 +01:00
|
|
|
box.width = ob_right_x - ob_left_x - ob_left_width;
|
2018-07-07 11:30:52 +02:00
|
|
|
if (box.width > 0) {
|
2018-11-26 04:08:58 +01:00
|
|
|
box.x = ob_left_x + ob_left_width + round(output_x * output_scale);
|
2018-10-12 14:36:11 +02:00
|
|
|
box.y = round(bg_y * output_scale);
|
|
|
|
box.height = ob_bg_height;
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
// Padding on left side
|
2019-08-24 04:44:53 +02:00
|
|
|
box.x = x + titlebar_border_thickness;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.y = y + titlebar_border_thickness;
|
2019-08-24 04:44:53 +02:00
|
|
|
box.width = titlebar_h_padding - titlebar_border_thickness;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.height = (titlebar_v_padding - titlebar_border_thickness) * 2 +
|
2018-10-12 14:36:11 +02:00
|
|
|
config->font_height;
|
2018-07-07 11:30:52 +02:00
|
|
|
scale_box(&box, output_scale);
|
2018-11-26 04:08:58 +01:00
|
|
|
int left_x = ob_left_x + round(output_x * output_scale);
|
|
|
|
if (box.x + box.width < left_x) {
|
|
|
|
box.width += left_x - box.x - box.width;
|
|
|
|
}
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-11-26 04:08:58 +01:00
|
|
|
// Padding on right side
|
2018-11-17 20:06:48 +01:00
|
|
|
box.x = x + width - titlebar_h_padding;
|
|
|
|
box.y = y + titlebar_border_thickness;
|
2019-08-24 04:44:53 +02:00
|
|
|
box.width = titlebar_h_padding - titlebar_border_thickness;
|
2018-11-17 20:06:48 +01:00
|
|
|
box.height = (titlebar_v_padding - titlebar_border_thickness) * 2 +
|
2018-10-12 14:36:11 +02:00
|
|
|
config->font_height;
|
2018-07-07 11:30:52 +02:00
|
|
|
scale_box(&box, output_scale);
|
2018-11-26 04:08:58 +01:00
|
|
|
int right_rx = ob_right_x + ob_right_width + round(output_x * output_scale);
|
|
|
|
if (right_rx < box.x) {
|
|
|
|
box.width += box.x - right_rx;
|
|
|
|
box.x = right_rx;
|
|
|
|
}
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render the top border line for a view using "border pixel".
|
|
|
|
*/
|
|
|
|
static void render_top_border(struct sway_output *output,
|
|
|
|
pixman_region32_t *output_damage, struct sway_container *con,
|
|
|
|
struct border_colors *colors) {
|
|
|
|
struct sway_container_state *state = &con->current;
|
|
|
|
if (!state->border_top) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct wlr_box box;
|
|
|
|
float color[4];
|
|
|
|
float output_scale = output->wlr_output->scale;
|
|
|
|
|
|
|
|
// Child border - top edge
|
|
|
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
|
|
|
premultiply_alpha(color, con->alpha);
|
2021-02-22 12:32:07 +01:00
|
|
|
box.x = floor(state->x);
|
|
|
|
box.y = floor(state->y);
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
2018-11-17 09:32:03 +01:00
|
|
|
box.width = state->width;
|
2018-07-07 11:30:52 +02:00
|
|
|
box.height = state->border_thickness;
|
|
|
|
scale_box(&box, output_scale);
|
2019-03-11 11:45:01 +01:00
|
|
|
render_rect(output, output_damage, &box, color);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
struct parent_data {
|
|
|
|
enum sway_container_layout layout;
|
|
|
|
struct wlr_box box;
|
|
|
|
list_t *children;
|
|
|
|
bool focused;
|
|
|
|
struct sway_container *active_child;
|
|
|
|
};
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
static void render_container(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct sway_container *con, bool parent_focused);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render a container's children using a L_HORIZ or L_VERT layout.
|
|
|
|
*
|
|
|
|
* Wrap child views in borders and leave child containers borderless because
|
|
|
|
* they'll apply their own borders to their children.
|
|
|
|
*/
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
static void render_containers_linear(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct parent_data *parent) {
|
|
|
|
for (int i = 0; i < parent->children->length; ++i) {
|
|
|
|
struct sway_container *child = parent->children->items[i];
|
|
|
|
|
|
|
|
if (child->view) {
|
|
|
|
struct sway_view *view = child->view;
|
2018-07-07 11:30:52 +02:00
|
|
|
struct border_colors *colors;
|
|
|
|
struct wlr_texture *title_texture;
|
|
|
|
struct wlr_texture *marks_texture;
|
|
|
|
struct sway_container_state *state = &child->current;
|
|
|
|
|
2018-07-15 14:43:33 +02:00
|
|
|
if (view_is_urgent(view)) {
|
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_urgent;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
} else if (state->focused || parent->focused) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
} else if (child == parent->active_child) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused_inactive;
|
|
|
|
title_texture = child->title_focused_inactive;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused_inactive;
|
2018-07-07 11:30:52 +02:00
|
|
|
} else {
|
|
|
|
colors = &config->border_colors.unfocused;
|
|
|
|
title_texture = child->title_unfocused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_unfocused;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (state->border == B_NORMAL) {
|
2021-02-22 12:32:07 +01:00
|
|
|
render_titlebar(output, damage, child, floor(state->x),
|
|
|
|
floor(state->y), state->width, colors,
|
2018-09-24 12:54:57 +02:00
|
|
|
title_texture, marks_texture);
|
|
|
|
} else if (state->border == B_PIXEL) {
|
|
|
|
render_top_border(output, damage, child, colors);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
render_view(output, damage, child, colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, child,
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
parent->focused || child->current.focused);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-10 16:09:29 +01:00
|
|
|
static bool container_is_focused(struct sway_container *con, void *data) {
|
|
|
|
return con->current.focused;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool container_has_focused_child(struct sway_container *con) {
|
|
|
|
return container_find_child(con, container_is_focused, NULL);
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
/**
|
|
|
|
* Render a container's children using the L_TABBED layout.
|
|
|
|
*/
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
static void render_containers_tabbed(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct parent_data *parent) {
|
|
|
|
if (!parent->children->length) {
|
2018-07-07 11:30:52 +02:00
|
|
|
return;
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
struct sway_container *current = parent->active_child;
|
2018-07-15 07:20:21 +02:00
|
|
|
struct border_colors *current_colors = &config->border_colors.unfocused;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
int tab_width = parent->box.width / parent->children->length;
|
2018-07-09 23:33:13 +02:00
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
// Render tabs
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
for (int i = 0; i < parent->children->length; ++i) {
|
|
|
|
struct sway_container *child = parent->children->items[i];
|
|
|
|
struct sway_view *view = child->view;
|
2018-07-07 11:30:52 +02:00
|
|
|
struct sway_container_state *cstate = &child->current;
|
|
|
|
struct border_colors *colors;
|
|
|
|
struct wlr_texture *title_texture;
|
|
|
|
struct wlr_texture *marks_texture;
|
2018-07-16 10:22:27 +02:00
|
|
|
bool urgent = view ?
|
|
|
|
view_is_urgent(view) : container_has_urgent_child(child);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-07-16 10:22:27 +02:00
|
|
|
if (urgent) {
|
2018-07-15 14:43:33 +02:00
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_urgent;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
} else if (cstate->focused || parent->focused) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused;
|
2021-12-10 16:09:29 +01:00
|
|
|
} else if (config->has_focused_tab_title && container_has_focused_child(child)) {
|
|
|
|
colors = &config->border_colors.focused_tab_title;
|
|
|
|
title_texture = child->title_focused_tab_title;
|
|
|
|
marks_texture = child->marks_focused_tab_title;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
} else if (child == parent->active_child) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused_inactive;
|
|
|
|
title_texture = child->title_focused_inactive;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused_inactive;
|
2018-07-07 11:30:52 +02:00
|
|
|
} else {
|
|
|
|
colors = &config->border_colors.unfocused;
|
|
|
|
title_texture = child->title_unfocused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_unfocused;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2021-02-22 12:32:07 +01:00
|
|
|
int x = floor(cstate->x + tab_width * i);
|
2018-07-09 23:33:13 +02:00
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
// Make last tab use the remaining width of the parent
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
if (i == parent->children->length - 1) {
|
|
|
|
tab_width = parent->box.width - tab_width * i;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_titlebar(output, damage, child, x, parent->box.y, tab_width,
|
2018-07-07 11:30:52 +02:00
|
|
|
colors, title_texture, marks_texture);
|
|
|
|
|
|
|
|
if (child == current) {
|
|
|
|
current_colors = colors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
if (current->view) {
|
2018-07-15 07:20:21 +02:00
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, current,
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
parent->focused || current->current.focused);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Render a container's children using the L_STACKED layout.
|
|
|
|
*/
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
static void render_containers_stacked(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct parent_data *parent) {
|
|
|
|
if (!parent->children->length) {
|
2018-07-07 11:30:52 +02:00
|
|
|
return;
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
struct sway_container *current = parent->active_child;
|
2018-07-15 07:20:21 +02:00
|
|
|
struct border_colors *current_colors = &config->border_colors.unfocused;
|
2018-07-09 23:33:13 +02:00
|
|
|
size_t titlebar_height = container_titlebar_height();
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
// Render titles
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
for (int i = 0; i < parent->children->length; ++i) {
|
|
|
|
struct sway_container *child = parent->children->items[i];
|
|
|
|
struct sway_view *view = child->view;
|
2018-07-07 11:30:52 +02:00
|
|
|
struct sway_container_state *cstate = &child->current;
|
|
|
|
struct border_colors *colors;
|
|
|
|
struct wlr_texture *title_texture;
|
|
|
|
struct wlr_texture *marks_texture;
|
2018-07-16 10:22:27 +02:00
|
|
|
bool urgent = view ?
|
|
|
|
view_is_urgent(view) : container_has_urgent_child(child);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-07-16 10:22:27 +02:00
|
|
|
if (urgent) {
|
2018-07-15 14:43:33 +02:00
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = child->title_urgent;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_urgent;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
} else if (cstate->focused || parent->focused) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = child->title_focused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused;
|
2021-12-10 16:09:29 +01:00
|
|
|
} else if (config->has_focused_tab_title && container_has_focused_child(child)) {
|
|
|
|
colors = &config->border_colors.focused_tab_title;
|
|
|
|
title_texture = child->title_focused_tab_title;
|
|
|
|
marks_texture = child->marks_focused_tab_title;
|
|
|
|
} else if (child == parent->active_child) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused_inactive;
|
|
|
|
title_texture = child->title_focused_inactive;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_focused_inactive;
|
2018-07-07 11:30:52 +02:00
|
|
|
} else {
|
|
|
|
colors = &config->border_colors.unfocused;
|
|
|
|
title_texture = child->title_unfocused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = child->marks_unfocused;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
int y = parent->box.y + titlebar_height * i;
|
|
|
|
render_titlebar(output, damage, child, parent->box.x, y,
|
|
|
|
parent->box.width, colors, title_texture, marks_texture);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
if (child == current) {
|
|
|
|
current_colors = colors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
if (current->view) {
|
2018-07-15 07:20:21 +02:00
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, current,
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
parent->focused || current->current.focused);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
static void render_containers(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct parent_data *parent) {
|
2019-02-24 10:00:15 +01:00
|
|
|
if (config->hide_lone_tab && parent->children->length == 1) {
|
|
|
|
struct sway_container *child = parent->children->items[0];
|
|
|
|
if (child->view) {
|
|
|
|
render_containers_linear(output,damage, parent);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
switch (parent->layout) {
|
2018-07-07 11:30:52 +02:00
|
|
|
case L_NONE:
|
|
|
|
case L_HORIZ:
|
|
|
|
case L_VERT:
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_containers_linear(output, damage, parent);
|
2018-07-07 11:30:52 +02:00
|
|
|
break;
|
|
|
|
case L_STACKED:
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_containers_stacked(output, damage, parent);
|
2018-07-07 11:30:52 +02:00
|
|
|
break;
|
|
|
|
case L_TABBED:
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_containers_tabbed(output, damage, parent);
|
2018-07-07 11:30:52 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
static void render_container(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct sway_container *con, bool focused) {
|
|
|
|
struct parent_data data = {
|
|
|
|
.layout = con->current.layout,
|
|
|
|
.box = {
|
2021-02-22 12:32:07 +01:00
|
|
|
.x = floor(con->current.x),
|
|
|
|
.y = floor(con->current.y),
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
2018-11-17 09:32:03 +01:00
|
|
|
.width = con->current.width,
|
|
|
|
.height = con->current.height,
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
},
|
|
|
|
.children = con->current.children,
|
|
|
|
.focused = focused,
|
|
|
|
.active_child = con->current.focused_inactive_child,
|
|
|
|
};
|
|
|
|
render_containers(output, damage, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_workspace(struct sway_output *output,
|
|
|
|
pixman_region32_t *damage, struct sway_workspace *ws, bool focused) {
|
|
|
|
struct parent_data data = {
|
|
|
|
.layout = ws->current.layout,
|
|
|
|
.box = {
|
2021-02-22 12:32:07 +01:00
|
|
|
.x = floor(ws->current.x),
|
|
|
|
.y = floor(ws->current.y),
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
.width = ws->current.width,
|
|
|
|
.height = ws->current.height,
|
|
|
|
},
|
|
|
|
.children = ws->current.tiling,
|
|
|
|
.focused = focused,
|
|
|
|
.active_child = ws->current.focused_inactive_child,
|
|
|
|
};
|
|
|
|
render_containers(output, damage, &data);
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
static void render_floating_container(struct sway_output *soutput,
|
|
|
|
pixman_region32_t *damage, struct sway_container *con) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
if (con->view) {
|
|
|
|
struct sway_view *view = con->view;
|
2018-07-07 11:30:52 +02:00
|
|
|
struct border_colors *colors;
|
|
|
|
struct wlr_texture *title_texture;
|
|
|
|
struct wlr_texture *marks_texture;
|
|
|
|
|
2018-07-15 14:43:33 +02:00
|
|
|
if (view_is_urgent(view)) {
|
|
|
|
colors = &config->border_colors.urgent;
|
|
|
|
title_texture = con->title_urgent;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = con->marks_urgent;
|
2018-07-15 14:43:33 +02:00
|
|
|
} else if (con->current.focused) {
|
2018-07-07 11:30:52 +02:00
|
|
|
colors = &config->border_colors.focused;
|
|
|
|
title_texture = con->title_focused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = con->marks_focused;
|
2018-07-07 11:30:52 +02:00
|
|
|
} else {
|
|
|
|
colors = &config->border_colors.unfocused;
|
|
|
|
title_texture = con->title_unfocused;
|
2018-10-31 12:27:38 +01:00
|
|
|
marks_texture = con->marks_unfocused;
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2018-09-24 12:54:57 +02:00
|
|
|
if (con->current.border == B_NORMAL) {
|
2021-02-22 12:32:07 +01:00
|
|
|
render_titlebar(soutput, damage, con, floor(con->current.x),
|
|
|
|
floor(con->current.y), con->current.width, colors,
|
2018-09-24 12:54:57 +02:00
|
|
|
title_texture, marks_texture);
|
|
|
|
} else if (con->current.border == B_PIXEL) {
|
|
|
|
render_top_border(soutput, damage, con, colors);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
render_view(soutput, damage, con, colors);
|
|
|
|
} else {
|
2018-07-26 10:36:46 +02:00
|
|
|
render_container(soutput, damage, con, con->current.focused);
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void render_floating(struct sway_output *soutput,
|
|
|
|
pixman_region32_t *damage) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
for (int i = 0; i < root->outputs->length; ++i) {
|
|
|
|
struct sway_output *output = root->outputs->items[i];
|
|
|
|
for (int j = 0; j < output->current.workspaces->length; ++j) {
|
|
|
|
struct sway_workspace *ws = output->current.workspaces->items[j];
|
2018-07-07 11:30:52 +02:00
|
|
|
if (!workspace_is_visible(ws)) {
|
|
|
|
continue;
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
for (int k = 0; k < ws->current.floating->length; ++k) {
|
|
|
|
struct sway_container *floater = ws->current.floating->items[k];
|
2021-02-12 23:27:08 +01:00
|
|
|
if (floater->current.fullscreen_mode != FULLSCREEN_NONE) {
|
2019-03-03 05:17:46 +01:00
|
|
|
continue;
|
|
|
|
}
|
2018-07-07 11:30:52 +02:00
|
|
|
render_floating_container(soutput, damage, floater);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-10 13:04:42 +01:00
|
|
|
static void render_seatops(struct sway_output *output,
|
2018-09-11 13:34:21 +02:00
|
|
|
pixman_region32_t *damage) {
|
|
|
|
struct sway_seat *seat;
|
2018-10-18 13:20:00 +02:00
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
2019-01-10 13:04:42 +01:00
|
|
|
seatop_render(seat, output, damage);
|
2018-09-11 13:34:21 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
void output_render(struct sway_output *output, struct timespec *when,
|
|
|
|
pixman_region32_t *damage) {
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
2021-11-15 19:32:52 +01:00
|
|
|
struct wlr_renderer *renderer = output->server->renderer;
|
2018-07-07 11:30:52 +02:00
|
|
|
|
2018-09-19 11:03:25 +02:00
|
|
|
struct sway_workspace *workspace = output->current.active_workspace;
|
|
|
|
if (workspace == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-09-24 13:06:02 +02:00
|
|
|
struct sway_container *fullscreen_con = root->fullscreen_global;
|
|
|
|
if (!fullscreen_con) {
|
|
|
|
fullscreen_con = workspace->current.fullscreen;
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
|
|
|
|
|
2021-09-07 14:47:27 +02:00
|
|
|
if (debug.damage == DAMAGE_RERENDER) {
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &width, &height);
|
|
|
|
pixman_region32_union_rect(damage, damage, 0, 0, width, height);
|
|
|
|
}
|
|
|
|
|
2018-07-07 11:30:52 +02:00
|
|
|
if (!pixman_region32_not_empty(damage)) {
|
|
|
|
// Output isn't damaged but needs buffer swap
|
|
|
|
goto renderer_end;
|
|
|
|
}
|
|
|
|
|
2018-08-19 03:29:59 +02:00
|
|
|
if (debug.damage == DAMAGE_HIGHLIGHT) {
|
2018-08-18 08:58:50 +02:00
|
|
|
wlr_renderer_clear(renderer, (float[]){1, 1, 0, 1});
|
2018-07-07 11:30:52 +02:00
|
|
|
}
|
|
|
|
|
2022-03-09 03:14:26 +01:00
|
|
|
if (server.session_lock.locked) {
|
|
|
|
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
|
|
|
|
if (server.session_lock.lock == NULL) {
|
|
|
|
// abandoned lock -> red BG
|
|
|
|
clear_color[0] = 1.f;
|
|
|
|
}
|
|
|
|
int nrects;
|
|
|
|
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
|
|
|
|
for (int i = 0; i < nrects; ++i) {
|
|
|
|
scissor_output(wlr_output, &rects[i]);
|
|
|
|
wlr_renderer_clear(renderer, clear_color);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (server.session_lock.lock != NULL) {
|
|
|
|
struct render_data data = {
|
|
|
|
.damage = damage,
|
|
|
|
.alpha = 1.0f,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct wlr_session_lock_surface_v1 *lock_surface;
|
|
|
|
wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
|
|
|
|
if (lock_surface->output != wlr_output) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!lock_surface->mapped) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
output_surface_for_each_surface(output, lock_surface->surface,
|
|
|
|
0.0, 0.0, render_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
goto renderer_end;
|
|
|
|
}
|
|
|
|
|
2018-07-25 09:50:06 +02:00
|
|
|
if (output_has_opaque_overlay_layer_surface(output)) {
|
|
|
|
goto render_overlay;
|
|
|
|
}
|
|
|
|
|
2018-07-25 12:56:23 +02:00
|
|
|
if (fullscreen_con) {
|
2018-07-07 11:30:52 +02:00
|
|
|
float clear_color[] = {0.0f, 0.0f, 0.0f, 1.0f};
|
|
|
|
|
|
|
|
int nrects;
|
|
|
|
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
|
|
|
|
for (int i = 0; i < nrects; ++i) {
|
|
|
|
scissor_output(wlr_output, &rects[i]);
|
|
|
|
wlr_renderer_clear(renderer, clear_color);
|
|
|
|
}
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
if (fullscreen_con->view) {
|
2020-05-31 01:37:43 +02:00
|
|
|
if (!wl_list_empty(&fullscreen_con->view->saved_buffers)) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_saved_view(fullscreen_con->view, output, damage, 1.0f);
|
2019-01-01 15:45:14 +01:00
|
|
|
} else if (fullscreen_con->view->surface) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_view_toplevels(fullscreen_con->view,
|
2018-07-25 12:56:23 +02:00
|
|
|
output, damage, 1.0f);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
render_container(output, damage, fullscreen_con,
|
|
|
|
fullscreen_con->current.focused);
|
2018-07-11 12:33:36 +02:00
|
|
|
}
|
2018-10-07 12:40:05 +02:00
|
|
|
|
2018-10-08 15:27:19 +02:00
|
|
|
for (int i = 0; i < workspace->current.floating->length; ++i) {
|
|
|
|
struct sway_container *floater =
|
|
|
|
workspace->current.floating->items[i];
|
2018-10-08 15:00:36 +02:00
|
|
|
if (container_is_transient_for(floater, fullscreen_con)) {
|
|
|
|
render_floating_container(output, damage, floater);
|
2018-10-07 12:40:05 +02:00
|
|
|
}
|
|
|
|
}
|
2018-11-18 00:33:06 +01:00
|
|
|
#if HAVE_XWAYLAND
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_unmanaged(output, damage, &root->xwayland_unmanaged);
|
2018-07-24 23:37:41 +02:00
|
|
|
#endif
|
2018-07-07 11:30:52 +02:00
|
|
|
} else {
|
|
|
|
float clear_color[] = {0.25f, 0.25f, 0.25f, 1.0f};
|
|
|
|
|
|
|
|
int nrects;
|
|
|
|
pixman_box32_t *rects = pixman_region32_rectangles(damage, &nrects);
|
|
|
|
for (int i = 0; i < nrects; ++i) {
|
|
|
|
scissor_output(wlr_output, &rects[i]);
|
|
|
|
wlr_renderer_clear(renderer, clear_color);
|
|
|
|
}
|
|
|
|
|
2019-12-03 16:03:38 +01:00
|
|
|
render_layer_toplevel(output, damage,
|
2018-07-07 11:30:52 +02:00
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
|
2019-12-03 16:03:38 +01:00
|
|
|
render_layer_toplevel(output, damage,
|
2018-07-07 11:30:52 +02:00
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_workspace(output, damage, workspace, workspace->current.focused);
|
2018-07-07 11:30:52 +02:00
|
|
|
render_floating(output, damage);
|
2018-11-18 00:33:06 +01:00
|
|
|
#if HAVE_XWAYLAND
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_unmanaged(output, damage, &root->xwayland_unmanaged);
|
2018-07-24 23:37:41 +02:00
|
|
|
#endif
|
2019-12-03 16:03:38 +01:00
|
|
|
render_layer_toplevel(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
|
|
|
|
|
|
|
|
render_layer_popups(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND]);
|
|
|
|
render_layer_popups(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM]);
|
|
|
|
render_layer_popups(output, damage,
|
2018-07-07 11:30:52 +02:00
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP]);
|
|
|
|
}
|
2018-07-25 09:50:06 +02:00
|
|
|
|
2019-01-10 13:04:42 +01:00
|
|
|
render_seatops(output, damage);
|
2018-09-11 13:34:21 +02:00
|
|
|
|
2018-10-18 13:20:00 +02:00
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
struct sway_container *focus = seat_get_focused_container(seat);
|
|
|
|
if (focus && focus->view) {
|
|
|
|
render_view_popups(focus->view, output, damage, focus->alpha);
|
2018-08-02 15:30:26 +02:00
|
|
|
}
|
|
|
|
|
2018-07-25 09:50:06 +02:00
|
|
|
render_overlay:
|
2019-12-03 16:03:38 +01:00
|
|
|
render_layer_toplevel(output, damage,
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
|
|
|
|
render_layer_popups(output, damage,
|
2018-07-07 11:30:52 +02:00
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY]);
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
2018-08-30 13:00:10 +02:00
|
|
|
render_drag_icons(output, damage, &root->drag_icons);
|
2018-07-07 11:30:52 +02:00
|
|
|
|
|
|
|
renderer_end:
|
|
|
|
wlr_renderer_scissor(renderer, NULL);
|
2018-11-10 19:22:32 +01:00
|
|
|
wlr_output_render_software_cursors(wlr_output, damage);
|
2018-07-07 11:30:52 +02:00
|
|
|
wlr_renderer_end(renderer);
|
2018-12-01 11:01:08 +01:00
|
|
|
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &width, &height);
|
|
|
|
|
2019-04-27 16:49:37 +02:00
|
|
|
pixman_region32_t frame_damage;
|
|
|
|
pixman_region32_init(&frame_damage);
|
2018-12-01 11:01:08 +01:00
|
|
|
|
|
|
|
enum wl_output_transform transform =
|
|
|
|
wlr_output_transform_invert(wlr_output->transform);
|
2019-04-27 16:49:37 +02:00
|
|
|
wlr_region_transform(&frame_damage, &output->damage->current,
|
|
|
|
transform, width, height);
|
|
|
|
|
2021-09-07 14:47:27 +02:00
|
|
|
if (debug.damage != DAMAGE_DEFAULT) {
|
2019-04-27 16:49:37 +02:00
|
|
|
pixman_region32_union_rect(&frame_damage, &frame_damage,
|
|
|
|
0, 0, wlr_output->width, wlr_output->height);
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_output_set_damage(wlr_output, &frame_damage);
|
|
|
|
pixman_region32_fini(&frame_damage);
|
2018-12-01 11:01:08 +01:00
|
|
|
|
2019-04-23 19:36:28 +02:00
|
|
|
if (!wlr_output_commit(wlr_output)) {
|
2018-07-07 11:30:52 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
output->last_frame = *when;
|
|
|
|
}
|