mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-28 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename wl_surf_subsurf to wl_surf

Browse source 
In futher commits, the main term surface
will be refactored to be a wl_surf. It will not make
sense to call it a subsurface at that point.
This commit is contained in:
Alexander Orzechowski 2022-12-04 19:02:08 -05:00
parent 1486c57bdb
commit 7a78fdf771
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
render.c
View file

@ -1489,7 +1489,7 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
static void static void
render_overlay(struct terminal *term) render_overlay(struct terminal *term)
{ {
struct wl_surf_subsurf *overlay = &term->window->overlay; struct wl_surf *overlay = &term->window->overlay;
bool unicode_mode_active = false; bool unicode_mode_active = false;
/* Check if unicode mode is active on at least one seat focusing /* Check if unicode mode is active on at least one seat focusing
@ -1934,7 +1934,7 @@ render_csd_title(struct terminal *term, const struct csd_data *info,
{ {
xassert(term->window->csd_mode == CSD_YES); xassert(term->window->csd_mode == CSD_YES);
struct wl_surf_subsurf *surf = &term->window->csd.surface[CSD_SURF_TITLE]; struct wl_surf *surf = &term->window->csd.surface[CSD_SURF_TITLE];
if (info->width == 0 || info->height == 0) if (info->width == 0 || info->height == 0)
return; return;

6
wayland.c
View file

@ -1839,7 +1839,7 @@ wayl_win_csd_borders_visible(const struct wl_window *win)
bool bool
wayl_win_subsurface_new_with_custom_parent( wayl_win_subsurface_new_with_custom_parent(
struct wl_window *win, struct wl_surface *parent, struct wl_window *win, struct wl_surface *parent,
struct wl_surf_subsurf *surf, bool allow_pointer_input) struct wl_surf *surf, bool allow_pointer_input)
{ {
struct wayland *wayl = win->term->wl; struct wayland *wayl = win->term->wl;
@ -1877,7 +1877,7 @@ wayl_win_subsurface_new_with_custom_parent(
} }
bool bool
wayl_win_subsurface_new(struct wl_window *win, struct wl_surf_subsurf *surf, wayl_win_subsurface_new(struct wl_window *win, struct wl_surf *surf,
bool allow_pointer_input) bool allow_pointer_input)
{ {
return wayl_win_subsurface_new_with_custom_parent( return wayl_win_subsurface_new_with_custom_parent(
@ -1885,7 +1885,7 @@ wayl_win_subsurface_new(struct wl_window *win, struct wl_surf_subsurf *surf,
} }
void void
wayl_win_subsurface_destroy(struct wl_surf_subsurf *surf) wayl_win_subsurface_destroy(struct wl_surf *surf)
{ {
if (surf == NULL) if (surf == NULL)
return; return;

20
wayland.h
View file

@ -289,14 +289,14 @@ struct monitor {
bool use_output_release; bool use_output_release;
}; };
struct wl_surf_subsurf { struct wl_surf {
struct wl_surface *surf; struct wl_surface *surf;
struct wl_subsurface *sub; struct wl_subsurface *sub;
}; };
struct wl_url { struct wl_url {
const struct url *url; const struct url *url;
struct wl_surf_subsurf surf; struct wl_surf surf;
}; };
enum csd_mode {CSD_UNKNOWN, CSD_NO, CSD_YES}; enum csd_mode {CSD_UNKNOWN, CSD_NO, CSD_YES};
@ -333,7 +333,7 @@ struct wl_window {
enum csd_mode csd_mode; enum csd_mode csd_mode;
struct { struct {
struct wl_surf_subsurf surface[CSD_SURF_COUNT]; struct wl_surf surface[CSD_SURF_COUNT];
struct fcft_font *font; struct fcft_font *font;
int move_timeout_fd; int move_timeout_fd;
uint32_t serial; uint32_t serial;
@ -344,10 +344,10 @@ struct wl_window {
bool minimize:1; bool minimize:1;
} wm_capabilities; } wm_capabilities;
struct wl_surf_subsurf search; struct wl_surf search;
struct wl_surf_subsurf scrollback_indicator; struct wl_surf scrollback_indicator;
struct wl_surf_subsurf render_timer; struct wl_surf render_timer;
struct wl_surf_subsurf overlay; struct wl_surf overlay;
struct wl_callback *frame_callback; struct wl_callback *frame_callback;
@ -439,12 +439,12 @@ bool wayl_win_csd_titlebar_visible(const struct wl_window *win);
bool wayl_win_csd_borders_visible(const struct wl_window *win); bool wayl_win_csd_borders_visible(const struct wl_window *win);
bool wayl_win_subsurface_new( bool wayl_win_subsurface_new(
struct wl_window *win, struct wl_surf_subsurf *surf, struct wl_window *win, struct wl_surf *surf,
bool allow_pointer_input); bool allow_pointer_input);
bool wayl_win_subsurface_new_with_custom_parent( bool wayl_win_subsurface_new_with_custom_parent(
struct wl_window *win, struct wl_surface *parent, struct wl_window *win, struct wl_surface *parent,
struct wl_surf_subsurf *surf, bool allow_pointer_input); struct wl_surf *surf, bool allow_pointer_input);
void wayl_win_subsurface_destroy(struct wl_surf_subsurf *surf); void wayl_win_subsurface_destroy(struct wl_surf *surf);
#if defined(HAVE_XDG_ACTIVATION) #if defined(HAVE_XDG_ACTIVATION)
bool wayl_get_activation_token( bool wayl_get_activation_token(