Mercurial > emacs
diff src/xfns.c @ 11197:1bdc265aab86
(x_window_to_frame): New arg DPYINFO. All callers changed.
(x_any_window_to_frame, x_top_window_to_frame): Likewise.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Mon, 03 Apr 1995 23:34:26 +0000 |
| parents | 0a7048d331e6 |
| children | dd1c883953a2 |
line wrap: on
line diff
--- a/src/xfns.c Mon Apr 03 22:23:51 1995 +0000 +++ b/src/xfns.c Mon Apr 03 23:34:26 1995 +0000 @@ -263,7 +263,8 @@ /* 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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;