(FRAME_TOOLBAR_LINES): New. (FRAME_TOP_MARGIN): New. (struct frame): Add toolbar-related members. (FRAME_WINDOW_WIDTH_ARG): Add bitmap area widths. (CHECK_FRAME): Give this macro a C-statement form! (CHECK_LIVE_FRAME): Ditto. (FRAME_FACE_CACHE): New. (struct frame): Add member face_cache. (FRAME_FLAGS_AREA_COLS): New. (FRAME_FLAGS_AREA_WIDTH): New. (struct frame): New member menu_bar_window. (struct frame): Add trunc_area_pixel_width, and _cols. (struct frame): Cursor-related stuff removed. (FRAME_SCROLL_BAR_WIDTH): Removed. (FRAME_WINDOW_WIDTH_ARG): Don't add scroll bar width. (FRAME_CURSOR_X): Removed. (FRAME_CURSOR_Y): Ditto. (struct frame): Remove old glyphs, add new.