*** empty log message ***

src/xselect.c.old

@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "lisp.h"
 #include "xterm.h"
 #include "buffer.h"
-#include "screen.h"
+#include "frame.h"
 
 #ifdef HAVE_X11
 
@@ -127,7 +127,7 @@ own_selection (selection_type, time)
       || ((EQ (selection_type, Qclipboard)) && !NILP (Vx_clipboard_value)))
     return 1;
 
-  selecting_window = selected_screen->display.x->window_desc;
+  selecting_window = selected_frame->display.x->window_desc;
   XSetSelectionOwner (x_current_display, selection_type,
 		      selecting_window, time);
   owner_window = XGetSelectionOwner (x_current_display, selection_type);
@@ -212,7 +212,7 @@ x_disown_selection (old_owner, selection, changed_owner_time)
      Atom selection;
      Time changed_owner_time;
 {
-  struct screen *s = x_window_to_screen (old_owner);
+  struct frame *s = x_window_to_frame (old_owner);
 
   if (s)			/* We are the owner */
     {
@@ -531,7 +531,7 @@ get_selection_value (type)
 
   BLOCK_INPUT;
   requestor_time = last_event_timestamp;
-  requestor_window = selected_screen->display.x->window_desc;
+  requestor_window = selected_frame->display.x->window_desc;
   XConvertSelection (x_current_display, type, XA_STRING,
 		     Xatom_emacs_selection, requestor_window, requestor_time);
   XIfEvent (x_current_display,

src/xterm.h

@@ -166,12 +166,12 @@ extern int x_pending_input;
 
 extern Display *x_current_display;
 
-extern struct screen *x_window_to_screen ();
+extern struct frame *x_window_to_frame ();
 
-/* The screen (if any) which has the X window that has keyboard focus.
-   Zero if none.  This is examined by Ffocus_screen in xfns.c */
+/* The frame (if any) which has the X window that has keyboard focus.
+   Zero if none.  This is examined by Ffocus_frame in xfns.c */
 
-struct screen *x_focus_screen;
+struct frame *x_focus_frame;
 
 #ifdef HAVE_X11
 /* Variables associated with the X display screen this emacs is using. */
@@ -218,7 +218,7 @@ enum text_cursor_kinds {
 #define PIXEL_WIDTH(s) ((s)->display.x->pixel_width)
 #define PIXEL_HEIGHT(s) ((s)->display.x->pixel_height)
 
-/* Each X screen object points to its own struct x_display object
+/* Each X frame object points to its own struct x_display object
    in the display.x field.  The x_display structure contains all
    the information that is specific to X windows.  */
 
@@ -235,7 +235,7 @@ struct x_display
   int pixel_height, pixel_width;
 
 #ifdef HAVE_X11
-  /* The tiled border used when the mouse is out of the screen. */
+  /* The tiled border used when the mouse is out of the frame. */
   Pixmap border_tile;
 
   /* Here are the Graphics Contexts for the default font. */
@@ -245,12 +245,12 @@ struct x_display
 #endif /* HAVE_X11 */
 
   /* Width of the internal border.  This is a line of background color
-     just inside the window's border.  When the screen is selected,
+     just inside the window's border.  When the frame is selected,
      a highlighting is displayed inside the internal border.  */
   int internal_border_width;
 
-  /* The X window used for this screen.
-     May be zero while the screen object is being created
+  /* The X window used for this frame.
+     May be zero while the frame object is being created
      and the X window has not yet been created.  */
   Window window_desc;
 
@@ -302,7 +302,7 @@ struct x_display
 
   /* The name that was associated with the icon, the last time
      it was refreshed.  Usually the same as the name of the
-     buffer in the currently selected window in the screen */
+     buffer in the currently selected window in the frame */
   char *icon_label;
 
   /* Flag to set when the X window needs to be completely repainted. */
@@ -324,7 +324,7 @@ struct x_display
    fixed width, and to have the same height and width. */
 
 #ifdef HAVE_X11
-/* Table of GC's used for this screen. */
+/* Table of GC's used for this frame. */
 GC *gc_table;
 
 /* How many GCs are in the table. */