From e81345218a433afb760714c452d2726527bc4dde Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sat, 16 Jul 2022 07:32:19 -0700 Subject: [PATCH] Prevent X11 error when resuming after call to RAID when -noscroll is in use (#426) The device_before_raid() call that disables X11 scrolling and bit-gravity selection needs to avoid referring to the scrollbars and other ancillary windows that have not been initialized when the "-noscroll" option was given at startup. --- src/xinit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/xinit.c b/src/xinit.c index ec5b17d..09de786 100644 --- a/src/xinit.c +++ b/src/xinit.c @@ -133,13 +133,14 @@ void Xevent_before_raid(DspInterface dsp) XSelectInput(dsp->display_id, dsp->LispWindow, NoEventMask); XSelectInput(dsp->display_id, dsp->DisplayWindow, NoEventMask); - XSelectInput(dsp->display_id, dsp->VerScrollBar, NoEventMask); - XSelectInput(dsp->display_id, dsp->HorScrollBar, NoEventMask); - XSelectInput(dsp->display_id, dsp->NEGrav, NoEventMask); - XSelectInput(dsp->display_id, dsp->SEGrav, NoEventMask); - XSelectInput(dsp->display_id, dsp->SWGrav, NoEventMask); - XSelectInput(dsp->display_id, dsp->NWGrav, NoEventMask); - + if (noscroll == 0) { + XSelectInput(dsp->display_id, dsp->VerScrollBar, NoEventMask); + XSelectInput(dsp->display_id, dsp->HorScrollBar, NoEventMask); + XSelectInput(dsp->display_id, dsp->NEGrav, NoEventMask); + XSelectInput(dsp->display_id, dsp->SEGrav, NoEventMask); + XSelectInput(dsp->display_id, dsp->SWGrav, NoEventMask); + XSelectInput(dsp->display_id, dsp->NWGrav, NoEventMask); + } XLOCK; XFlush(dsp->display_id); XUNLOCK(dsp);