aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorPaul Eggert2015-05-23 09:01:40 -0700
committerPaul Eggert2015-05-23 09:02:04 -0700
commit2219134940a18ba7a3cafa07382f4767bb511fa9 (patch)
treeaa1597efcf27f23c6cfe9739ba218ffb1f1fd331 /src/xterm.c
parent78c9b2e847d14d56569d9e5aae8e0784c7f40844 (diff)
downloademacs-2219134940a18ba7a3cafa07382f4767bb511fa9.tar.gz
emacs-2219134940a18ba7a3cafa07382f4767bb511fa9.zip
Pacify --enable-gcc-warnings
* src/frame.h (x_query_color): Remove redundant extern decl. * src/ftcrfont.c (ftcrfont_glyph_extents, ftcrfont_list) (ftcrfont_match, ftcrfont_open, ftcrfont_close) (ftcrfont_text_extents, ftcrfont_draw): * src/xterm.c (x_set_window_size_1, *x_color_cells, x_update_end) (XTframe_up_to_date, x_clear_area1, x_clear_frame) (x_ins_del_lines, frame_highlight, frame_unhighlight) (x_new_focus_frame, x_focus_changed, XTframe_rehighlight) (x_draw_hollow_cursor, x_draw_bar_cursor, x_flush, x_update_begin) (x_update_window_begin, x_connection_closed) (x_set_clip_rectangles, x_reset_clip_rectangles, x_fill_rectangle) (x_draw_rectangle, x_fill_trapezoid_for_relief, x_clear_window) (*x_gc_get_ext_data, x_extension_initialize) (x_cr_accumulate_data): Remove redundant static decl. Many of these GCC doesn't complain about, but we might as well clean out the duplication while we're in the neighborhood. * src/xterm.c (x_fill_trapezoid_for_relief): Remove decl of nonexistent function.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c37
1 files changed, 1 insertions, 36 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 3734fbfee92..c793a5111f7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -214,34 +214,16 @@ enum xembed_message
214 XEMBED_ACTIVATE_ACCELERATOR = 14 214 XEMBED_ACTIVATE_ACCELERATOR = 14
215 }; 215 };
216 216
217static void x_free_cr_resources (struct frame *);
217static bool x_alloc_nearest_color_1 (Display *, Colormap, XColor *); 218static bool x_alloc_nearest_color_1 (Display *, Colormap, XColor *);
218static void x_set_window_size_1 (struct frame *, bool, int, int);
219static void x_raise_frame (struct frame *); 219static void x_raise_frame (struct frame *);
220static void x_lower_frame (struct frame *); 220static void x_lower_frame (struct frame *);
221static const XColor *x_color_cells (Display *, int *);
222static int x_io_error_quitter (Display *); 221static int x_io_error_quitter (Display *);
223static struct terminal *x_create_terminal (struct x_display_info *); 222static struct terminal *x_create_terminal (struct x_display_info *);
224static void x_update_end (struct frame *);
225static void XTframe_up_to_date (struct frame *);
226static void x_clear_area1 (Display *, Window, int, int, int, int, int);
227static void x_clear_frame (struct frame *);
228static _Noreturn void x_ins_del_lines (struct frame *, int, int);
229static void frame_highlight (struct frame *);
230static void frame_unhighlight (struct frame *);
231static void x_new_focus_frame (struct x_display_info *, struct frame *);
232static void x_focus_changed (int, int, struct x_display_info *,
233 struct frame *, struct input_event *);
234static void XTframe_rehighlight (struct frame *);
235static void x_frame_rehighlight (struct x_display_info *); 223static void x_frame_rehighlight (struct x_display_info *);
236static void x_draw_hollow_cursor (struct window *, struct glyph_row *);
237static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
238 enum text_cursor_kinds);
239 224
240static void x_clip_to_row (struct window *, struct glyph_row *, 225static void x_clip_to_row (struct window *, struct glyph_row *,
241 enum glyph_row_area, GC); 226 enum glyph_row_area, GC);
242static void x_flush (struct frame *f);
243static void x_update_begin (struct frame *);
244static void x_update_window_begin (struct window *);
245static struct scroll_bar *x_window_to_scroll_bar (Display *, Window, int); 227static struct scroll_bar *x_window_to_scroll_bar (Display *, Window, int);
246static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, 228static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *,
247 enum scroll_bar_part *, 229 enum scroll_bar_part *,
@@ -261,9 +243,6 @@ static int handle_one_xevent (struct x_display_info *,
261#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF) 243#if ! (defined USE_X_TOOLKIT || defined USE_MOTIF)
262static int x_dispatch_event (XEvent *, Display *); 244static int x_dispatch_event (XEvent *, Display *);
263#endif 245#endif
264/* Don't declare this _Noreturn because we want no
265 interference with debugging failing X calls. */
266static void x_connection_closed (Display *, const char *, bool);
267static void x_wm_set_window_state (struct frame *, int); 246static void x_wm_set_window_state (struct frame *, int);
268static void x_wm_set_icon_pixmap (struct frame *, ptrdiff_t); 247static void x_wm_set_icon_pixmap (struct frame *, ptrdiff_t);
269static void x_initialize (void); 248static void x_initialize (void);
@@ -329,21 +308,7 @@ record_event (char *locus, int type)
329 308
330#endif 309#endif
331 310
332static void x_free_cr_resources (struct frame *);
333static void x_set_clip_rectangles (struct frame *, GC, XRectangle *, int);
334static void x_reset_clip_rectangles (struct frame *, GC);
335static void x_fill_rectangle (struct frame *, GC, int, int, int, int);
336static void x_draw_rectangle (struct frame *, GC, int, int, int, int);
337static void x_fill_trapezoid_for_relief (struct frame *, GC, int, int,
338 int, int, int);
339static void x_clear_window (struct frame *);
340
341#ifdef USE_CAIRO 311#ifdef USE_CAIRO
342static struct x_gc_ext_data *x_gc_get_ext_data (struct frame *, GC, int);
343static void x_extension_initialize (struct x_display_info *);
344static cairo_status_t x_cr_accumulate_data (void *,
345 const unsigned char *,
346 unsigned int);
347 312
348#define FRAME_CR_CONTEXT(f) ((f)->output_data.x->cr_context) 313#define FRAME_CR_CONTEXT(f) ((f)->output_data.x->cr_context)
349#define FRAME_CR_SURFACE(f) ((f)->output_data.x->cr_surface) 314#define FRAME_CR_SURFACE(f) ((f)->output_data.x->cr_surface)