(struct x_display_info): Struct renamed from x_screen.

(struct x_display_info): Struct renamed from x_screen.
(x_display): x_screen field renamed to display_info.
(FRAME_X_DISPLAY): Use new name.
(FRAME_X_DISPLAY_INFO): Likewise; also renamed from FRAME_X_SCREEN.

(struct x_display_info): New fields *_mod_mask, icon_bitmap_id, connection,
xrdb, Xatom..., grabbed, height, width, screen, visual, n_planes.

(x_display_list): New variable.

(FRAME_X_SCREEN): New macro.
(WHITE_PIX_DEFAULT, BLACK_PIX_DEFAULT): Take arg f.

(EMACS_CLASS): Macro moved here.

(XExposeRegionEvent): Unused macro deleted.
(XGetWindowInfo, XGetFont, XLoseFont): Unused macros deleted.
(MINWIDTH, MINHEIGHT, MAXWIDTH, MAXHEIGHT): Unused macros deleted.
(MAX_FACES_AND_GLYPHS, Bitmap): Unused macros deleted.
(struct event_queue): Structure deleted (was unused).
(EVENT_BUFFER_SIZE): Macro deleted.

(XClear): Macro deleted.  Callers use XClearWindow.
(XWarpMousePointer): Macro deleted.  Callers use XWarpPointer.
(XStuffPending): Macro deleted.  Callers use XPending.
(XHandleError, XHandleIOError): Macros deleted.
Callers use XSet...ErrorHandler.
(XChangeWindowSize): Macro deleted.  Callers use XResizeWindow.
(Color): Macro deleted; replaced with XColor.
(FONT_TYPE): Macro deleted; replaced with XFontStruct.
(PIX_TYPE): Macro deleted; replaced with unsigned long.

(ROOT_WINDOW): Macro deleted.
(struct x_display_info): New field root_window.  All uses changed.

(XDISPLAY): Macro deleted.
(XFlushQueue): Macro deleted.  All callers changed.
(DISPLAY_SCREEN_ARG): Maco deleted.
(DISPLAY_CELLS): Macro deleted.
(WINDOWINFO_TYPE): Macro deleted.