brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11: Replace some warnings with debug logs

Browse Source 
These warnings were altered due to the vast majority of cases they are
in practice harmless and just cause bug reports or red herrings due to
people seeing warnings and treating them as something that might be
relevant, while they rarely are.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4005>
This commit is contained in:
Jonas Ådahl 2024-09-09 16:25:02 +02:00 committed by Marge Bot
parent 7e9c6489ca
commit f44bf9fa40
3 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/x11/meta-x11-display.c
View File

@ -2587,7 +2587,8 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display)
vertical_layout = TRUE; vertical_layout = TRUE;
break; break;
default: default:
meta_warning ("Someone set a weird orientation in _NET_DESKTOP_LAYOUT"); meta_topic (META_DEBUG_X11,
"Someone set a weird orientation in _NET_DESKTOP_LAYOUT");
break; break;
} }
@ -2596,7 +2597,9 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display)
if (rows <= 0 && cols <= 0) if (rows <= 0 && cols <= 0)
{ {
meta_warning ("Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense", rows, cols); meta_topic (META_DEBUG_X11,
"Columns = %d rows = %d in _NET_DESKTOP_LAYOUT makes no sense",
rows, cols);
} }
else else
{ {
@ -2628,15 +2631,17 @@ meta_x11_display_update_workspace_layout (MetaX11Display *x11_display)
starting_corner = META_DISPLAY_BOTTOMLEFT; starting_corner = META_DISPLAY_BOTTOMLEFT;
break; break;
default: default:
meta_warning ("Someone set a weird starting corner in _NET_DESKTOP_LAYOUT"); meta_topic (META_DEBUG_X11,
"Someone set a weird starting corner in _NET_DESKTOP_LAYOUT");
break; break;
} }
} }
} }
else else
{ {
meta_warning ("Someone set _NET_DESKTOP_LAYOUT to %d integers instead of 4 " meta_topic (META_DEBUG_X11,
"(3 is accepted for backwards compat)", n_items); "Someone set _NET_DESKTOP_LAYOUT to %d integers instead of 4 "
"(3 is accepted for backwards compat)", n_items);
} }
g_free (list); g_free (list);

36
src/x11/window-props.c
View File

@ -1083,7 +1083,7 @@ reload_update_counter (MetaWindow *window,
if (value->v.xcounter_list.n_counters == 0) if (value->v.xcounter_list.n_counters == 0)
{ {
meta_warning ("_NET_WM_SYNC_REQUEST_COUNTER is empty"); meta_topic (META_DEBUG_X11, "_NET_WM_SYNC_REQUEST_COUNTER is empty");
meta_sync_counter_set_counter (sync_counter, None, FALSE); meta_sync_counter_set_counter (sync_counter, None, FALSE);
return; return;
} }
@ -1464,8 +1464,9 @@ reload_transient_for (MetaWindow *window,
transient_for); transient_for);
if (!parent) if (!parent)
{ {
meta_warning ("Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.", meta_topic (META_DEBUG_X11,
transient_for, window->desc); "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.",
transient_for, window->desc);
transient_for = None; transient_for = None;
} }
else if (parent->override_redirect) else if (parent->override_redirect)
@ -1478,12 +1479,13 @@ reload_transient_for (MetaWindow *window,
/* We don't have to go through the parents, as per this code it is /* We don't have to go through the parents, as per this code it is
* not possible that a window has the WM_TRANSIENT_FOR set to an * not possible that a window has the WM_TRANSIENT_FOR set to an
* override-redirect window anyways */ * override-redirect window anyways */
meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " meta_topic (META_DEBUG_X11,
"override-redirect window and this is not correct " "WM_TRANSIENT_FOR window %s for %s window %s is an "
"according to the standard, so we'll fallback to " "override-redirect window and this is not correct "
"the first non-override-redirect window 0x%lx.", "according to the standard, so we'll fallback to "
parent->desc, window->desc, window_kind, "the first non-override-redirect window 0x%lx.",
parent_xtransient_for); parent->desc, window->desc, window_kind,
parent_xtransient_for);
transient_for = parent_xtransient_for; transient_for = parent_xtransient_for;
parent = parent =
meta_x11_display_lookup_x_window (parent->display->x11_display, meta_x11_display_lookup_x_window (parent->display->x11_display,
@ -1491,11 +1493,12 @@ reload_transient_for (MetaWindow *window,
} }
else else
{ {
meta_warning ("WM_TRANSIENT_FOR window %s for %s window %s is an " meta_topic (META_DEBUG_X11,
"override-redirect window and this is not correct " "WM_TRANSIENT_FOR window %s for %s window %s is an "
"according to the standard, so we'll fallback to " "override-redirect window and this is not correct "
"the root window.", parent->desc, window_kind, "according to the standard, so we'll fallback to "
window->desc); "the root window.",
parent->desc, window_kind, window->desc);
transient_for = parent->display->x11_display->xroot; transient_for = parent->display->x11_display->xroot;
parent = NULL; parent = NULL;
} }
@ -1504,8 +1507,9 @@ reload_transient_for (MetaWindow *window,
/* Make sure there is not a loop */ /* Make sure there is not a loop */
if (check_xtransient_for_loop (window, parent)) if (check_xtransient_for_loop (window, parent))
{ {
meta_warning ("WM_TRANSIENT_FOR window 0x%lx for %s would create a " meta_topic (META_DEBUG_X11,
"loop.", transient_for, window->desc); "WM_TRANSIENT_FOR window 0x%lx for %s would create a loop.",
transient_for, window->desc);
transient_for = None; transient_for = None;
} }
} }

29
src/x11/window-x11.c
View File

@ -3015,13 +3015,10 @@ meta_window_move_resize_request (MetaWindow *window,
window->has_fullscreen_func && window->has_fullscreen_func &&
!meta_window_is_fullscreen (window)) !meta_window_is_fullscreen (window))
{ {
/*
meta_topic (META_DEBUG_GEOMETRY, meta_topic (META_DEBUG_GEOMETRY,
*/ "Treating resize request of legacy application %s as a "
meta_warning ( "fullscreen request",
"Treating resize request of legacy application %s as a " window->desc);
"fullscreen request",
window->desc);
meta_window_make_fullscreen_internal (window); meta_window_make_fullscreen_internal (window);
} }
} }
@ -3375,10 +3372,10 @@ meta_window_x11_client_message (MetaWindow *window,
timestamp = event->xclient.data.l[0]; timestamp = event->xclient.data.l[0];
else else
{ {
meta_warning ("Receiving a NET_CLOSE_WINDOW message for %s without " meta_topic (META_DEBUG_X11,
"a timestamp! This means some buggy (outdated) " "Receiving a NET_CLOSE_WINDOW message for %s without "
"application is on the loose!", "an expected timestamp.",
window->desc); window->desc);
timestamp = meta_display_get_current_time (window->display); timestamp = meta_display_get_current_time (window->display);
} }
@ -3805,9 +3802,10 @@ meta_window_x11_client_message (MetaWindow *window,
if (timestamp == 0) if (timestamp == 0)
{ {
/* Client using older EWMH _NET_ACTIVE_WINDOW without a timestamp */ /* Client using older EWMH _NET_ACTIVE_WINDOW without a timestamp */
meta_warning ("Buggy client sent a _NET_ACTIVE_WINDOW message with a " meta_topic (META_DEBUG_X11,
"timestamp of 0 for %s", "Client sent a _NET_ACTIVE_WINDOW message with an invalid"
window->desc); "timestamp of 0 for %s",
window->desc);
timestamp = meta_display_get_current_time (display); timestamp = meta_display_get_current_time (display);
} }
@ -4399,7 +4397,10 @@ meta_window_x11_configure_notify (MetaWindow *window,
meta_display_queue_check_fullscreen (window->display); meta_display_queue_check_fullscreen (window->display);
if (!event->override_redirect && !event->send_event) if (!event->override_redirect && !event->send_event)
meta_warning ("Unhandled change of windows override redirect status"); {
meta_topic (META_DEBUG_X11,
"Unhandled change of windows override redirect status");
}
meta_compositor_sync_window_geometry (window->display->compositor, window, FALSE); meta_compositor_sync_window_geometry (window->display->compositor, window, FALSE);
} }