diff options
| author | Paul Eggert | 2015-05-23 09:01:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-05-23 09:02:04 -0700 |
| commit | 2219134940a18ba7a3cafa07382f4767bb511fa9 (patch) | |
| tree | aa1597efcf27f23c6cfe9739ba218ffb1f1fd331 /src/xterm.c | |
| parent | 78c9b2e847d14d56569d9e5aae8e0784c7f40844 (diff) | |
| download | emacs-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.c | 37 |
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 | ||
| 217 | static void x_free_cr_resources (struct frame *); | ||
| 217 | static bool x_alloc_nearest_color_1 (Display *, Colormap, XColor *); | 218 | static bool x_alloc_nearest_color_1 (Display *, Colormap, XColor *); |
| 218 | static void x_set_window_size_1 (struct frame *, bool, int, int); | ||
| 219 | static void x_raise_frame (struct frame *); | 219 | static void x_raise_frame (struct frame *); |
| 220 | static void x_lower_frame (struct frame *); | 220 | static void x_lower_frame (struct frame *); |
| 221 | static const XColor *x_color_cells (Display *, int *); | ||
| 222 | static int x_io_error_quitter (Display *); | 221 | static int x_io_error_quitter (Display *); |
| 223 | static struct terminal *x_create_terminal (struct x_display_info *); | 222 | static struct terminal *x_create_terminal (struct x_display_info *); |
| 224 | static void x_update_end (struct frame *); | ||
| 225 | static void XTframe_up_to_date (struct frame *); | ||
| 226 | static void x_clear_area1 (Display *, Window, int, int, int, int, int); | ||
| 227 | static void x_clear_frame (struct frame *); | ||
| 228 | static _Noreturn void x_ins_del_lines (struct frame *, int, int); | ||
| 229 | static void frame_highlight (struct frame *); | ||
| 230 | static void frame_unhighlight (struct frame *); | ||
| 231 | static void x_new_focus_frame (struct x_display_info *, struct frame *); | ||
| 232 | static void x_focus_changed (int, int, struct x_display_info *, | ||
| 233 | struct frame *, struct input_event *); | ||
| 234 | static void XTframe_rehighlight (struct frame *); | ||
| 235 | static void x_frame_rehighlight (struct x_display_info *); | 223 | static void x_frame_rehighlight (struct x_display_info *); |
| 236 | static void x_draw_hollow_cursor (struct window *, struct glyph_row *); | ||
| 237 | static void x_draw_bar_cursor (struct window *, struct glyph_row *, int, | ||
| 238 | enum text_cursor_kinds); | ||
| 239 | 224 | ||
| 240 | static void x_clip_to_row (struct window *, struct glyph_row *, | 225 | static void x_clip_to_row (struct window *, struct glyph_row *, |
| 241 | enum glyph_row_area, GC); | 226 | enum glyph_row_area, GC); |
| 242 | static void x_flush (struct frame *f); | ||
| 243 | static void x_update_begin (struct frame *); | ||
| 244 | static void x_update_window_begin (struct window *); | ||
| 245 | static struct scroll_bar *x_window_to_scroll_bar (Display *, Window, int); | 227 | static struct scroll_bar *x_window_to_scroll_bar (Display *, Window, int); |
| 246 | static void x_scroll_bar_report_motion (struct frame **, Lisp_Object *, | 228 | static 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) |
| 262 | static int x_dispatch_event (XEvent *, Display *); | 244 | static 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. */ | ||
| 266 | static void x_connection_closed (Display *, const char *, bool); | ||
| 267 | static void x_wm_set_window_state (struct frame *, int); | 246 | static void x_wm_set_window_state (struct frame *, int); |
| 268 | static void x_wm_set_icon_pixmap (struct frame *, ptrdiff_t); | 247 | static void x_wm_set_icon_pixmap (struct frame *, ptrdiff_t); |
| 269 | static void x_initialize (void); | 248 | static void x_initialize (void); |
| @@ -329,21 +308,7 @@ record_event (char *locus, int type) | |||
| 329 | 308 | ||
| 330 | #endif | 309 | #endif |
| 331 | 310 | ||
| 332 | static void x_free_cr_resources (struct frame *); | ||
| 333 | static void x_set_clip_rectangles (struct frame *, GC, XRectangle *, int); | ||
| 334 | static void x_reset_clip_rectangles (struct frame *, GC); | ||
| 335 | static void x_fill_rectangle (struct frame *, GC, int, int, int, int); | ||
| 336 | static void x_draw_rectangle (struct frame *, GC, int, int, int, int); | ||
| 337 | static void x_fill_trapezoid_for_relief (struct frame *, GC, int, int, | ||
| 338 | int, int, int); | ||
| 339 | static void x_clear_window (struct frame *); | ||
| 340 | |||
| 341 | #ifdef USE_CAIRO | 311 | #ifdef USE_CAIRO |
| 342 | static struct x_gc_ext_data *x_gc_get_ext_data (struct frame *, GC, int); | ||
| 343 | static void x_extension_initialize (struct x_display_info *); | ||
| 344 | static 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) |