mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

(x_window_to_frame): Skip non-X frames before testing dpyinfo.

Browse source 
[USE_X_TOOLKIT] (x_any_window_to_frame, x_top_window_to_frame): Ditto.
This commit is contained in:
Karl Heuer 1995-04-06 18:51:54 +00:00
parent e1960a184a
commit 21a6ce3ada
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/xfns.c
View file

@ -276,11 +276,9 @@ x_window_to_frame (dpyinfo, wdesc)
if (!GC_FRAMEP (frame))
continue;
f = XFRAME (frame);
if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
#ifdef USE_X_TOOLKIT
if (f->display.nothing == 1)
return 0;
if ((f->display.x->edit_widget
&& XtWindow (f->display.x->edit_widget) == wdesc)
|| f->display.x->icon_desc == wdesc)
@ -313,10 +311,8 @@ x_any_window_to_frame (dpyinfo, wdesc)
if (!GC_FRAMEP (frame))
continue;
f = XFRAME (frame);
if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
if (f->display.nothing == 1)
return 0;
x = f->display.x;
/* This frame matches if the window is any of its widgets. */
if (wdesc == XtWindow (x->widget)
@ -348,10 +344,8 @@ x_top_window_to_frame (dpyinfo, wdesc)
if (!GC_FRAMEP (frame))
continue;
f = XFRAME (frame);
if (FRAME_X_DISPLAY_INFO (f) != dpyinfo)
if (f->display.nothing == 1 || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
continue;
if (f->display.nothing == 1)
return 0;
x = f->display.x;
/* This frame matches if the window is its topmost widget. */
if (wdesc == XtWindow (x->widget))