]> granicus.if.org Git - nethack/commitdiff
X11: Find scrollbars in same window
authorPasi Kallinen <paxed@alt.org>
Tue, 16 Oct 2018 17:44:52 +0000 (20:44 +0300)
committerPasi Kallinen <paxed@alt.org>
Tue, 16 Oct 2018 17:44:56 +0000 (20:44 +0300)
Adding scroll() translations to a window with no scrollbars
scrolled the main window message area.

win/X11/winX.c

index 10462c978e33af2f5dc12a6ff1df67f339d979b0..7eb5da1a73316b2ab54aa5f636220c4324645e81 100644 (file)
@@ -2585,6 +2585,8 @@ Cardinal *num_params;
     /* The V_DELTA is 1/2 the value of shown. */
 
     if (horiz_sb) {
+        if (XtWindow(viewport) != XtWindow(horiz_sb))
+          return;
         XtSetArg(arg[0], nhStr(XtNshown), &shown);
         XtSetArg(arg[1], nhStr(XtNtopOfThumb), &top);
         XtGetValues(horiz_sb, arg, TWO);
@@ -2616,6 +2618,8 @@ Cardinal *num_params;
     }
 
     if (vert_sb) {
+        if (XtWindow(viewport) != XtWindow(vert_sb))
+          return;
         XtSetArg(arg[0], nhStr(XtNshown), &shown);
         XtSetArg(arg[1], nhStr(XtNtopOfThumb), &top);
         XtGetValues(vert_sb, arg, TWO);