blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 765 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Campbell Barton 2022-11-10 11:22:08 +11:00
parent 1bf3069912 7e4e8cca7d
commit 7d606ad3b8
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -4984,6 +4984,42 @@ static const struct wl_registry_listener registry_listener = {
/** \} */
/* -------------------------------------------------------------------- */
/** \name Listener (Display), #wl_display_listener
* \{ */
static CLG_LogRef LOG_WL_DISPLAY = {"ghost.wl.handle.display"};
#define LOG (&LOG_WL_DISPLAY)
static void display_handle_error(
void *data, struct wl_display *wl_display, void *object_id, uint32_t code, const char *message)
{
GWL_Display *display = static_cast<GWL_Display *>(data);
GHOST_ASSERT(display->wl_display == wl_display, "Invalid internal state");
(void)display;
/* NOTE: code is #wl_display_error, there isn't a convenient way to convert to an ID. */
CLOG_INFO(LOG, 2, "error (code=%u, object_id=%p, message=%s)", code, object_id, message);
}
static void display_handle_delete_id(void *data, struct wl_display *wl_display, uint32_t id)
{
GWL_Display *display = static_cast<GWL_Display *>(data);
GHOST_ASSERT(display->wl_display == wl_display, "Invalid internal state");
(void)display;
CLOG_INFO(LOG, 2, "delete_id (id=%u)", id);
}
static const struct wl_display_listener display_listener = {
display_handle_error,
display_handle_delete_id,
};
#undef LOG
/** \} */
/* -------------------------------------------------------------------- */
/** \name GHOST Implementation
*
@ -5006,6 +5042,8 @@ GHOST_SystemWayland::GHOST_SystemWayland(bool background)
/* This may be removed later if decorations are required, needed as part of registration. */
display_->xdg_decor = new GWL_XDG_Decor_System;
wl_display_add_listener(display_->wl_display, &display_listener, display_);
/* Register interfaces. */
{
display_->registry_skip_update_all = true;