Skip to content

wlserver: answer xdg_toplevel maximize/fullscreen #2535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eerii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wlserver: answer xdg_toplevel maximize/fullscreen #2535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/steamcompmgr_shared.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ struct wlserver_xdg_surface_info
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener destroy;

bool bToplevelListeners = false;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;
struct wl_listener toplevel_destroy;
};


Expand Down
63 changes: 63 additions & 0 deletions src/wlserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,12 @@ static void wlserver_xdg_surface_info_finish( struct wlserver_xdg_surface_info *
wl_list_remove( &info->map.link );
wl_list_remove( &info->unmap.link );
wl_list_remove( &info->destroy.link );
if ( info->bToplevelListeners )
{
wl_list_remove( &info->request_maximize.link );
wl_list_remove( &info->request_fullscreen.link );
info->bToplevelListeners = false;
}
}

static void handle_wl_surface_destroy( struct wl_listener *l, void *data )
Expand Down Expand Up @@ -2201,6 +2207,55 @@ wlserver_xdg_surface_info* waylandy_type_surface_new(struct wl_client *client, s
return xdg_surface_info;
}

static void xdg_toplevel_apply_state( struct wlr_xdg_toplevel *toplevel )
{
const bool bMaximized = toplevel->requested.maximized;
const bool bFullscreen = toplevel->requested.fullscreen;
const bool bFill = ( bMaximized || bFullscreen ) && g_nNestedWidth > 0 && g_nNestedHeight > 0;
const int nWidth = bFill ? g_nNestedWidth : 0;
const int nHeight = bFill ? g_nNestedHeight : 0;

if ( !toplevel->base->initialized )
{
toplevel->scheduled.maximized = bMaximized;
toplevel->scheduled.fullscreen = bFullscreen;
toplevel->scheduled.width = nWidth;
toplevel->scheduled.height = nHeight;
return;
}

wlr_xdg_toplevel_set_maximized( toplevel, bMaximized );
wlr_xdg_toplevel_set_fullscreen( toplevel, bFullscreen );
wlr_xdg_toplevel_set_size( toplevel, nWidth, nHeight );
}

static void xdg_toplevel_destroy( struct wl_listener *listener, void *data )
{
wlserver_xdg_surface_info *info = wl_container_of( listener, info, toplevel_destroy );

if ( info->bToplevelListeners )
{
wl_list_remove( &info->request_maximize.link );
wl_list_remove( &info->request_fullscreen.link );
info->bToplevelListeners = false;
}
wl_list_remove( &info->toplevel_destroy.link );
}

static void xdg_toplevel_request_maximize( struct wl_listener *listener, void *data )
{
wlserver_xdg_surface_info *info = wl_container_of( listener, info, request_maximize );
if ( info->xdg_surface && info->xdg_surface->toplevel )
xdg_toplevel_apply_state( info->xdg_surface->toplevel );
}

static void xdg_toplevel_request_fullscreen( struct wl_listener *listener, void *data )
{
wlserver_xdg_surface_info *info = wl_container_of( listener, info, request_fullscreen );
if ( info->xdg_surface && info->xdg_surface->toplevel )
xdg_toplevel_apply_state( info->xdg_surface->toplevel );
}

void xdg_toplevel_new(struct wl_listener *listener, void *data)
{
struct wlr_xdg_toplevel *toplevel = (struct wlr_xdg_toplevel *)data;
Expand All @@ -2214,6 +2269,14 @@ void xdg_toplevel_new(struct wl_listener *listener, void *data)
wl_signal_add(&xdg_surface->events.destroy, &surface_info->destroy);

surface_info->xdg_surface = xdg_surface;

surface_info->request_maximize.notify = xdg_toplevel_request_maximize;
wl_signal_add(&toplevel->events.request_maximize, &surface_info->request_maximize);
surface_info->request_fullscreen.notify = xdg_toplevel_request_fullscreen;
wl_signal_add(&toplevel->events.request_fullscreen, &surface_info->request_fullscreen);
surface_info->toplevel_destroy.notify = xdg_toplevel_destroy;
wl_signal_add(&toplevel->events.destroy, &surface_info->toplevel_destroy);
surface_info->bToplevelListeners = true;
}


Expand Down
Loading