callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/another-randr-error-trap' into 'gtk-3-24'

Browse Source 
[3.24] x11: Trap errors happening when getting output properties

See merge request GNOME/gtk!4680
This commit is contained in:
Matthias Clasen
2022-05-03 00:46:32 +00:00
parent a47f81804d 9addb14a83
commit 3e4c9b1f04
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gdk/x11/gdkscreen-x11.c
View File

@ -594,19 +594,6 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
XRRFreeCrtcInfo (crtc); XRRFreeCrtcInfo (crtc);
} }
monitor = find_monitor_by_output (x11_display, output);
if (monitor)
monitor->remove = FALSE;
else
{
monitor = g_object_new (GDK_TYPE_X11_MONITOR,
"display", display,
NULL);
monitor->output = output;
monitor->add = TRUE;
g_ptr_array_add (x11_display->monitors, monitor);
}
/* Fetch minimal manufacturer information (PNP ID) from EDID */ /* Fetch minimal manufacturer information (PNP ID) from EDID */
{ {
#define EDID_LENGTH 128 #define EDID_LENGTH 128
@ -619,6 +606,7 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
edid_atom = XInternAtom (disp, RR_PROPERTY_RANDR_EDID, FALSE); edid_atom = XInternAtom (disp, RR_PROPERTY_RANDR_EDID, FALSE);
gdk_x11_display_error_trap_push (display);
XRRGetOutputProperty (disp, output, XRRGetOutputProperty (disp, output,
edid_atom, edid_atom,
0, 0,
@ -631,6 +619,11 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
&nbytes, &nbytes,
&bytes_left, &bytes_left,
&prop); &prop);
if (gdk_x11_display_error_trap_pop (display))
{
XRRFreeOutputInfo (output_info);
continue;
}
// Check partial EDID header (whole header: 00 ff ff ff ff ff ff 00) // Check partial EDID header (whole header: 00 ff ff ff ff ff ff 00)
if (nbytes >= EDID_LENGTH && prop[0] == 0x00 && prop[1] == 0xff) if (nbytes >= EDID_LENGTH && prop[0] == 0x00 && prop[1] == 0xff)
@ -651,6 +644,19 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
#undef EDID_LENGTH #undef EDID_LENGTH
} }
monitor = find_monitor_by_output (x11_display, output);
if (monitor)
monitor->remove = FALSE;
else
{
monitor = g_object_new (GDK_TYPE_X11_MONITOR,
"display", display,
NULL);
monitor->output = output;
monitor->add = TRUE;
g_ptr_array_add (x11_display->monitors, monitor);
}
gdk_monitor_get_geometry (GDK_MONITOR (monitor), &geometry); gdk_monitor_get_geometry (GDK_MONITOR (monitor), &geometry);
name = g_strndup (output_info->name, output_info->nameLen); name = g_strndup (output_info->name, output_info->nameLen);