mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 18:41:25 -08:00
Code Issues Projects Releases Wiki Activity

(x_window_to_frame): New arg DPYINFO. All callers changed.

Browse source 
(x_any_window_to_frame, x_top_window_to_frame): Likewise.
This commit is contained in:
Karl Heuer 1995-04-03 23:34:26 +00:00
parent 34da6b1616
commit 2d271e2eac
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xfns.c
View file

@ -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;