diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-04-13 09:12:30 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-04-13 20:34:09 -0600 |
| commit | e7c3d39925dea5e69f9880b6f5609755f34b9d52 (patch) | |
| tree | 1c3b7dc708eedde5f03c0618b1b3ea87f0142397 /src/xterm.h | |
| parent | 09fd8e70a0a6739cbe94c9925ab938456b25b479 (diff) | |
| download | emacs-e7c3d39925dea5e69f9880b6f5609755f34b9d52.tar.gz | |
Rename non-X x_* identifiers 2
* src/alloc.c:
* src/frame.c:
* src/xdisp.c: Use FRAME_OUTPUT_DATA instead of FRAME_X_OUTPUT.
* src/termhooks.c (frame_visible_invisible_hook, set_window_size_hook)
(set_frame_offset_hook, set_bitmap_icon_hook, activate_menubar_hook)
(get_string_resource_hook): New terminal hooks.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/xterm.h b/src/xterm.h index a5313cf8f97..637ff2fd502 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -249,7 +249,7 @@ struct x_display_info #endif /* X Resource data base */ - XrmDatabase xrdb; + XrmDatabase rdb; /* Minimum width over all characters in all fonts in font_table. */ int smallest_char_width; @@ -764,9 +764,11 @@ enum /* Return the X output data for frame F. */ #define FRAME_X_OUTPUT(f) ((f)->output_data.x) +#define FRAME_OUTPUT_DATA(f) FRAME_X_OUTPUT (f) /* Return the X window used for displaying data in frame F. */ #define FRAME_X_WINDOW(f) ((f)->output_data.x->window_desc) +#define FRAME_NATIVE_WINDOW(f) FRAME_X_WINDOW (f) /* Return the drawable used for rendering to frame F. */ #define FRAME_X_RAW_DRAWABLE(f) ((f)->output_data.x->draw_desc) @@ -1087,6 +1089,7 @@ extern void x_real_pos_and_offsets (struct frame *f, XrmDatabase x_load_resources (Display *, const char *, const char *, const char *); +extern const char *x_get_string_resource (void *, const char *, const char *); /* Defined in xterm.c */ @@ -1103,8 +1106,9 @@ extern bool x_had_errors_p (Display *); extern void x_uncatch_errors (void); extern void x_uncatch_errors_after_check (void); extern void x_clear_errors (Display *); -extern void x_make_frame_visible (struct frame *f) -extern void x_make_frame_invisible (struct frame *f) +extern void x_set_window_size (struct frame *f, bool, int, int, bool); +extern void x_make_frame_visible (struct frame *f); +extern void x_make_frame_invisible (struct frame *f); extern void x_iconify_frame (struct frame *f); extern void x_free_frame_resources (struct frame *); extern void x_wm_set_size_hint (struct frame *, long, bool); @@ -1200,7 +1204,7 @@ extern void initial_set_up_x_back_buffer (struct frame *f); /* Defined in xfns.c. */ extern void x_real_positions (struct frame *, int *, int *); -extern void x_change_tool_bar_height (struct frame *, int) +extern void x_change_tool_bar_height (struct frame *, int); extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern void x_set_scroll_bar_default_width (struct frame *); extern void x_set_scroll_bar_default_height (struct frame *); |