Commit 7556890b authored by Richard M. Stallman's avatar Richard M. Stallman

Renamings: frame->display => frame->output, struct x_display -> sruct x_output.

parent f39d1692
...@@ -1261,12 +1261,12 @@ update_frame (f, force, inhibit_hairy_id) ...@@ -1261,12 +1261,12 @@ update_frame (f, force, inhibit_hairy_id)
#ifdef HAVE_X_WINDOWS #ifdef HAVE_X_WINDOWS
if (FRAME_X_P (f)) if (FRAME_X_P (f))
{ {
leftmost = downto = f->display.x->internal_border_width; leftmost = downto = f->output_data.x->internal_border_width;
if (desired_frame->enable[0]) if (desired_frame->enable[0])
{ {
current_frame->top_left_x[FRAME_HEIGHT (f) - 1] = leftmost; current_frame->top_left_x[FRAME_HEIGHT (f) - 1] = leftmost;
current_frame->top_left_y[FRAME_HEIGHT (f) - 1] current_frame->top_left_y[FRAME_HEIGHT (f) - 1]
= PIXEL_HEIGHT (f) - f->display.x->internal_border_width = PIXEL_HEIGHT (f) - f->output_data.x->internal_border_width
- current_frame->pix_height[FRAME_HEIGHT (f) - 1]; - current_frame->pix_height[FRAME_HEIGHT (f) - 1];
current_frame->top_left_x[0] = leftmost; current_frame->top_left_x[0] = leftmost;
current_frame->top_left_y[0] = downto; current_frame->top_left_y[0] = downto;
...@@ -1627,9 +1627,9 @@ update_line (frame, vpos) ...@@ -1627,9 +1627,9 @@ update_line (frame, vpos)
{ {
current_frame->pix_width[vpos] current_frame->pix_width[vpos]
= current_frame->used[vpos] = current_frame->used[vpos]
* FONT_WIDTH (frame->display.x->font); * FONT_WIDTH (frame->output_data.x->font);
current_frame->pix_height[vpos] current_frame->pix_height[vpos]
= frame->display.x->line_height; = frame->output_data.x->line_height;
} }
#endif /* HAVE_X_WINDOWS */ #endif /* HAVE_X_WINDOWS */
......
...@@ -158,7 +158,7 @@ make_frame (mini_p) ...@@ -158,7 +158,7 @@ make_frame (mini_p)
f->desired_glyphs = 0; f->desired_glyphs = 0;
f->visible = 0; f->visible = 0;
f->async_visible = 0; f->async_visible = 0;
f->display.nothing = 0; f->output_data.nothing = 0;
f->iconified = 0; f->iconified = 0;
f->async_iconified = 0; f->async_iconified = 0;
f->wants_modeline = 1; f->wants_modeline = 1;
...@@ -377,7 +377,7 @@ make_terminal_frame () ...@@ -377,7 +377,7 @@ make_terminal_frame ()
f->visible = 1; /* FRAME_SET_VISIBLE wd set frame_garbaged. */ f->visible = 1; /* FRAME_SET_VISIBLE wd set frame_garbaged. */
f->async_visible = 1; /* Don't let visible be cleared later. */ f->async_visible = 1; /* Don't let visible be cleared later. */
f->display.nothing = 1; /* Nonzero means frame isn't deleted. */ f->output_data.nothing = 1; /* Nonzero means frame isn't deleted. */
return f; return f;
} }
...@@ -1036,7 +1036,7 @@ but if the second optional argument FORCE is non-nil, you may do so.") ...@@ -1036,7 +1036,7 @@ but if the second optional argument FORCE is non-nil, you may do so.")
x_destroy_window (f); x_destroy_window (f);
#endif #endif
f->display.nothing = 0; f->output_data.nothing = 0;
/* If we've deleted the last_nonminibuf_frame, then try to find /* If we've deleted the last_nonminibuf_frame, then try to find
another one. */ another one. */
......
...@@ -87,13 +87,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -87,13 +87,13 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
(assq FACE-NAME global-face-data) returns a vector describing the (assq FACE-NAME global-face-data) returns a vector describing the
global parameters for that face. global parameters for that face.
Let PARAM-FACE be FRAME->display.x->param_faces[Faref (FACE-VECTOR, 2)]. Let PARAM-FACE be FRAME->output_data.x->param_faces[Faref (FACE-VECTOR, 2)].
PARAM_FACE is a struct face whose members are the Xlib analogues of PARAM_FACE is a struct face whose members are the Xlib analogues of
the parameters in FACE-VECTOR. If an element of FACE-VECTOR is the parameters in FACE-VECTOR. If an element of FACE-VECTOR is
nil, then the corresponding member of PARAM_FACE is FACE_DEFAULT. nil, then the corresponding member of PARAM_FACE is FACE_DEFAULT.
These faces are called "parameter faces", because they're the ones These faces are called "parameter faces", because they're the ones
lisp manipulates to control what gets displayed. Elements 0 and 1 lisp manipulates to control what gets displayed. Elements 0 and 1
of FRAME->display.x->param_faces are special - they describe the of FRAME->output_data.x->param_faces are special - they describe the
default and mode line faces. None of the faces in param_faces have default and mode line faces. None of the faces in param_faces have
GC's. (See src/dispextern.h for the definiton of struct face. GC's. (See src/dispextern.h for the definiton of struct face.
lisp/faces.el maintains the isomorphism between face_alist and lisp/faces.el maintains the isomorphism between face_alist and
...@@ -104,9 +104,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -104,9 +104,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
properties. The resulting faces are called "computed faces"; none properties. The resulting faces are called "computed faces"; none
of their members are FACE_DEFAULT; they are completely specified. of their members are FACE_DEFAULT; they are completely specified.
They then call intern_compute_face to search They then call intern_compute_face to search
FRAME->display.x->computed_faces for a matching face, add one if FRAME->output_data.x->computed_faces for a matching face, add one if
none is found, and return the index into none is found, and return the index into
FRAME->display.x->computed_faces. FRAME's glyph matrices use these FRAME->output_data.x->computed_faces. FRAME's glyph matrices use these
indices to record the faces of the matrix characters, and the X indices to record the faces of the matrix characters, and the X
display hooks consult compute_faces to decide how to display these display hooks consult compute_faces to decide how to display these
characters. Elements 0 and 1 of computed_faces always describe the characters. Elements 0 and 1 of computed_faces always describe the
...@@ -231,17 +231,17 @@ intern_face (f, face) ...@@ -231,17 +231,17 @@ intern_face (f, face)
if (face->foreground != FACE_DEFAULT) if (face->foreground != FACE_DEFAULT)
xgcv.foreground = face->foreground; xgcv.foreground = face->foreground;
else else
xgcv.foreground = f->display.x->foreground_pixel; xgcv.foreground = f->output_data.x->foreground_pixel;
if (face->background != FACE_DEFAULT) if (face->background != FACE_DEFAULT)
xgcv.background = face->background; xgcv.background = face->background;
else else
xgcv.background = f->display.x->background_pixel; xgcv.background = f->output_data.x->background_pixel;
if (face->font && face->font != (XFontStruct *) FACE_DEFAULT) if (face->font && face->font != (XFontStruct *) FACE_DEFAULT)
xgcv.font = face->font->fid; xgcv.font = face->font->fid;
else else
xgcv.font = f->display.x->font->fid; xgcv.font = f->output_data.x->font->fid;
xgcv.graphics_exposures = 0; xgcv.graphics_exposures = 0;
...@@ -699,21 +699,21 @@ frame_update_line_height (f) ...@@ -699,21 +699,21 @@ frame_update_line_height (f)
FRAME_PTR f; FRAME_PTR f;
{ {
int i; int i;
int biggest = FONT_HEIGHT (f->display.x->font); int biggest = FONT_HEIGHT (f->output_data.x->font);
for (i = 0; i < f->display.x->n_param_faces; i++) for (i = 0; i < f->output_data.x->n_param_faces; i++)
if (f->display.x->param_faces[i] != 0 if (f->output_data.x->param_faces[i] != 0
&& f->display.x->param_faces[i]->font != (XFontStruct *) FACE_DEFAULT) && f->output_data.x->param_faces[i]->font != (XFontStruct *) FACE_DEFAULT)
{ {
int height = FONT_HEIGHT (f->display.x->param_faces[i]->font); int height = FONT_HEIGHT (f->output_data.x->param_faces[i]->font);
if (height > biggest) if (height > biggest)
biggest = height; biggest = height;
} }
if (biggest == f->display.x->line_height) if (biggest == f->output_data.x->line_height)
return 0; return 0;
f->display.x->line_height = biggest; f->output_data.x->line_height = biggest;
return 1; return 1;
} }
#endif /* not HAVE_X_WINDOWS */ #endif /* not HAVE_X_WINDOWS */
...@@ -1105,7 +1105,7 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal, ...@@ -1105,7 +1105,7 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal,
face->font = 0; /* The one and only font. */ face->font = 0; /* The one and only font. */
#else #else
XFontStruct *font = load_font (f, attr_value); XFontStruct *font = load_font (f, attr_value);
if (face->font != f->display.x->font) if (face->font != f->output_data.x->font)
unload_font (f, face->font); unload_font (f, face->font);
face->font = font; face->font = font;
if (frame_update_line_height (f)) if (frame_update_line_height (f))
......
This diff is collapsed.
...@@ -169,7 +169,7 @@ static int next_menubar_widget_id; ...@@ -169,7 +169,7 @@ static int next_menubar_widget_id;
#ifdef USE_X_TOOLKIT #ifdef USE_X_TOOLKIT
/* Return the frame whose ->display.x->id equals ID, or 0 if none. */ /* Return the frame whose ->output_data.x->id equals ID, or 0 if none. */
static struct frame * static struct frame *
menubar_id_to_frame (id) menubar_id_to_frame (id)
...@@ -186,7 +186,7 @@ menubar_id_to_frame (id) ...@@ -186,7 +186,7 @@ menubar_id_to_frame (id)
f = XFRAME (frame); f = XFRAME (frame);
if (f->display.nothing == 1) if (f->display.nothing == 1)
continue; continue;
if (f->display.x->id == id) if (f->output_data.x->id == id)
return f; return f;
} }
return 0; return 0;
...@@ -830,8 +830,8 @@ cached information about equivalent key sequences.") ...@@ -830,8 +830,8 @@ cached information about equivalent key sequences.")
CHECK_LIVE_WINDOW (window, 0); CHECK_LIVE_WINDOW (window, 0);
f = XFRAME (WINDOW_FRAME (XWINDOW (window))); f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
xpos = (FONT_WIDTH (f->display.x->font) * XWINDOW (window)->left); xpos = (FONT_WIDTH (f->output_data.x->font) * XWINDOW (window)->left);
ypos = (f->display.x->line_height * XWINDOW (window)->top); ypos = (f->output_data.x->line_height * XWINDOW (window)->top);
} }
else else
/* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
...@@ -1151,17 +1151,17 @@ popup_get_selection (initial_event, dpyinfo, id) ...@@ -1151,17 +1151,17 @@ popup_get_selection (initial_event, dpyinfo, id)
x_activate_menubar (f) x_activate_menubar (f)
FRAME_PTR f; FRAME_PTR f;
{ {
if (f->display.x->saved_button_event->type != ButtonPress) if (f->output_data.x->saved_button_event->type != ButtonPress)
return; return;
set_frame_menubar (f, 0, 1); set_frame_menubar (f, 0, 1);
BLOCK_INPUT; BLOCK_INPUT;
XtDispatchEvent ((XEvent *) f->display.x->saved_button_event); XtDispatchEvent ((XEvent *) f->output_data.x->saved_button_event);
UNBLOCK_INPUT; UNBLOCK_INPUT;
/* Ignore this if we get it a second time. */ /* Ignore this if we get it a second time. */
f->display.x->saved_button_event->type = 0; f->output_data.x->saved_button_event->type = 0;
} }
/* Detect if a dialog or menu has been posted. */ /* Detect if a dialog or menu has been posted. */
...@@ -1481,7 +1481,7 @@ static void ...@@ -1481,7 +1481,7 @@ static void
update_frame_menubar (f) update_frame_menubar (f)
FRAME_PTR f; FRAME_PTR f;
{ {
struct x_display *x = f->display.x; struct x_output *x = f->output_data.x;
int columns, rows; int columns, rows;
int menubar_changed; int menubar_changed;
...@@ -1543,15 +1543,15 @@ set_frame_menubar (f, first_time, deep_p) ...@@ -1543,15 +1543,15 @@ set_frame_menubar (f, first_time, deep_p)
int first_time; int first_time;
int deep_p; int deep_p;
{ {
Widget menubar_widget = f->display.x->menubar_widget; Widget menubar_widget = f->output_data.x->menubar_widget;
Lisp_Object tail, items, frame; Lisp_Object tail, items, frame;
widget_value *wv, *first_wv, *prev_wv = 0; widget_value *wv, *first_wv, *prev_wv = 0;
int i; int i;
LWLIB_ID id; LWLIB_ID id;
if (f->display.x->id == 0) if (f->output_data.x->id == 0)
f->display.x->id = next_menubar_widget_id++; f->output_data.x->id = next_menubar_widget_id++;
id = f->display.x->id; id = f->output_data.x->id;
if (! menubar_widget) if (! menubar_widget)
deep_p = 1; deep_p = 1;
...@@ -1701,42 +1701,42 @@ set_frame_menubar (f, first_time, deep_p) ...@@ -1701,42 +1701,42 @@ set_frame_menubar (f, first_time, deep_p)
if (menubar_widget) if (menubar_widget)
{ {
/* Disable resizing (done for Motif!) */ /* Disable resizing (done for Motif!) */
lw_allow_resizing (f->display.x->widget, False); lw_allow_resizing (f->output_data.x->widget, False);
/* The third arg is DEEP_P, which says to consider the entire /* The third arg is DEEP_P, which says to consider the entire
menu trees we supply, rather than just the menu bar item names. */ menu trees we supply, rather than just the menu bar item names. */
lw_modify_all_widgets (id, first_wv, deep_p); lw_modify_all_widgets (id, first_wv, deep_p);
/* Re-enable the edit widget to resize. */ /* Re-enable the edit widget to resize. */
lw_allow_resizing (f->display.x->widget, True); lw_allow_resizing (f->output_data.x->widget, True);
} }
else else
{ {
menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv, menubar_widget = lw_create_widget ("menubar", "menubar", id, first_wv,
f->display.x->column_widget, f->output_data.x->column_widget,
0, 0,
popup_activate_callback, popup_activate_callback,
menubar_selection_callback, menubar_selection_callback,
popup_deactivate_callback); popup_deactivate_callback);
f->display.x->menubar_widget = menubar_widget; f->output_data.x->menubar_widget = menubar_widget;
} }
{ {
int menubar_size int menubar_size
= (f->display.x->menubar_widget = (f->output_data.x->menubar_widget
? (f->display.x->menubar_widget->core.height ? (f->output_data.x->menubar_widget->core.height
+ f->display.x->menubar_widget->core.border_width) + f->output_data.x->menubar_widget->core.border_width)
: 0); : 0);
if (FRAME_EXTERNAL_MENU_BAR (f)) if (FRAME_EXTERNAL_MENU_BAR (f))
{ {
Dimension ibw = 0; Dimension ibw = 0;
XtVaGetValues (f->display.x->column_widget, XtVaGetValues (f->output_data.x->column_widget,
XtNinternalBorderWidth, &ibw, NULL); XtNinternalBorderWidth, &ibw, NULL);
menubar_size += ibw; menubar_size += ibw;
} }
f->display.x->menubar_height = menubar_size; f->output_data.x->menubar_height = menubar_size;
} }
free_menubar_widget_value_tree (first_wv); free_menubar_widget_value_tree (first_wv);
...@@ -1771,12 +1771,12 @@ free_frame_menubar (f) ...@@ -1771,12 +1771,12 @@ free_frame_menubar (f)
Widget menubar_widget; Widget menubar_widget;
int id; int id;
menubar_widget = f->display.x->menubar_widget; menubar_widget = f->output_data.x->menubar_widget;
if (menubar_widget) if (menubar_widget)
{ {
BLOCK_INPUT; BLOCK_INPUT;
lw_destroy_all_widgets ((LWLIB_ID) f->display.x->id); lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
UNBLOCK_INPUT; UNBLOCK_INPUT;
} }
} }
...@@ -1989,7 +1989,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) ...@@ -1989,7 +1989,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
/* Actually create the menu. */ /* Actually create the menu. */
menu_id = widget_id_tick++; menu_id = widget_id_tick++;
menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv, menu = lw_create_widget ("popup", first_wv->name, menu_id, first_wv,
f->display.x->widget, 1, 0, f->output_data.x->widget, 1, 0,
popup_selection_callback, popup_selection_callback,
popup_deactivate_callback); popup_deactivate_callback);
...@@ -2210,7 +2210,7 @@ xdialog_show (f, keymaps, title, error) ...@@ -2210,7 +2210,7 @@ xdialog_show (f, keymaps, title, error)
/* Actually create the dialog. */ /* Actually create the dialog. */
dialog_id = widget_id_tick++; dialog_id = widget_id_tick++;
menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv, menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,
f->display.x->widget, 1, 0, f->output_data.x->widget, 1, 0,
dialog_selection_callback, 0); dialog_selection_callback, 0);
lw_modify_all_widgets (dialog_id, first_wv->contents, True); lw_modify_all_widgets (dialog_id, first_wv->contents, True);
/* Free the widget_value objects we used to specify the contents. */ /* Free the widget_value objects we used to specify the contents. */
...@@ -2321,14 +2321,14 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) ...@@ -2321,14 +2321,14 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
/* Find the position of the outside upper-left corner of /* Find the position of the outside upper-left corner of
the inner window, with respect to the outer window. */ the inner window, with respect to the outer window. */
if (f->display.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window) if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
{ {
BLOCK_INPUT; BLOCK_INPUT;
XTranslateCoordinates (FRAME_X_DISPLAY (f), XTranslateCoordinates (FRAME_X_DISPLAY (f),
/* From-window, to-window. */ /* From-window, to-window. */
f->display.x->window_desc, f->output_data.x->window_desc,
f->display.x->parent_desc, f->output_data.x->parent_desc,
/* From-position, to-position. */ /* From-position, to-position. */
0, 0, &win_x, &win_y, 0, 0, &win_x, &win_y,
...@@ -2343,8 +2343,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) ...@@ -2343,8 +2343,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
#endif /* HAVE_X_WINDOWS */ #endif /* HAVE_X_WINDOWS */
/* Adjust coordinates to be root-window-relative. */ /* Adjust coordinates to be root-window-relative. */
x += f->display.x->left_pos; x += f->output_data.x->left_pos;
y += f->display.x->top_pos; y += f->output_data.x->top_pos;
/* Create all the necessary panes and their items. */ /* Create all the necessary panes and their items. */
i = 0; i = 0;
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment