aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-26 14:10:40 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:23 +0000
commitba46a039aca734bb284c22ba5d5bddf5407e3848 (patch)
treed5fe1a26a1cf107cbec555d4a54a54cb4a42f4e2 /terminal.c
parentwayland: add viewport object to sub-surface struct (diff)
wayland: refactor: wrap wl_surface pointers in a wayl_surface struct
And add a viewport object to accompany the surface (to be used when scaling the surface). Also rename the wl_surf_subsurf struct to wayl_sub_surface, and add a wayl_surface object to it, rather than a plain wl_surface pointer (to also get the viewport pointer).
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/terminal.c b/terminal.c
index 43ba157b..825e1550 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3589,23 +3589,23 @@ term_single_shift(struct terminal *term, enum charset_designator idx)
enum term_surface
term_surface_kind(const struct terminal *term, const struct wl_surface *surface)
{
- if (likely(surface == term->window->surface))
+ if (likely(surface == term->window->surface.surf))
return TERM_SURF_GRID;
- else if (surface == term->window->csd.surface[CSD_SURF_TITLE].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_TITLE].surface.surf)
return TERM_SURF_TITLE;
- else if (surface == term->window->csd.surface[CSD_SURF_LEFT].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_LEFT].surface.surf)
return TERM_SURF_BORDER_LEFT;
- else if (surface == term->window->csd.surface[CSD_SURF_RIGHT].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_RIGHT].surface.surf)
return TERM_SURF_BORDER_RIGHT;
- else if (surface == term->window->csd.surface[CSD_SURF_TOP].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_TOP].surface.surf)
return TERM_SURF_BORDER_TOP;
- else if (surface == term->window->csd.surface[CSD_SURF_BOTTOM].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_BOTTOM].surface.surf)
return TERM_SURF_BORDER_BOTTOM;
- else if (surface == term->window->csd.surface[CSD_SURF_MINIMIZE].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_MINIMIZE].surface.surf)
return TERM_SURF_BUTTON_MINIMIZE;
- else if (surface == term->window->csd.surface[CSD_SURF_MAXIMIZE].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_MAXIMIZE].surface.surf)
return TERM_SURF_BUTTON_MAXIMIZE;
- else if (surface == term->window->csd.surface[CSD_SURF_CLOSE].surf)
+ else if (surface == term->window->csd.surface[CSD_SURF_CLOSE].surface.surf)
return TERM_SURF_BUTTON_CLOSE;
else
return TERM_SURF_NONE;