From 2d271e2eac416bad259487e3c29cd0760692cfc7 Mon Sep 17 00:00:00 2001 From: Karl Heuer Date: Mon, 3 Apr 1995 23:34:26 +0000 Subject: [PATCH] (x_window_to_frame): New arg DPYINFO. All callers changed. (x_any_window_to_frame, x_top_window_to_frame): Likewise. --- src/xfns.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 6f3be6d6966..88310ed8cc0 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -263,7 +263,8 @@ check_x_display_info (frame) /* This function can be called during GC, so use GC_xxx type test macros. */ struct frame * -x_window_to_frame (wdesc) +x_window_to_frame (dpyinfo, wdesc) + struct x_display_info *dpyinfo; int wdesc; { Lisp_Object tail, frame; @@ -275,6 +276,8 @@ x_window_to_frame (wdesc) if (!GC_FRAMEP (frame)) continue; f = XFRAME (frame); + if (FRAME_X_DISPLAY_INFO (f) != dpyinfo) + continue; #ifdef USE_X_TOOLKIT if (f->display.nothing == 1) return 0; @@ -296,7 +299,8 @@ x_window_to_frame (wdesc) windows. */ struct frame * -x_any_window_to_frame (wdesc) +x_any_window_to_frame (dpyinfo, wdesc) + struct x_display_info *dpyinfo; int wdesc; { Lisp_Object tail, frame; @@ -309,6 +313,8 @@ x_any_window_to_frame (wdesc) if (!GC_FRAMEP (frame)) continue; f = XFRAME (frame); + if (FRAME_X_DISPLAY_INFO (f) != dpyinfo) + continue; if (f->display.nothing == 1) return 0; x = f->display.x; @@ -328,7 +334,8 @@ x_any_window_to_frame (wdesc) If WDESC is some other (smaller) window, we return 0. */ struct frame * -x_top_window_to_frame (wdesc) +x_top_window_to_frame (dpyinfo, wdesc) + struct x_display_info *dpyinfo; int wdesc; { Lisp_Object tail, frame; @@ -341,6 +348,8 @@ x_top_window_to_frame (wdesc) if (!GC_FRAMEP (frame)) continue; f = XFRAME (frame); + if (FRAME_X_DISPLAY_INFO (f) != dpyinfo) + continue; if (f->display.nothing == 1) return 0; x = f->display.x; -- 2.39.5