From: Ken Brown Date: Mon, 20 Jun 2016 21:54:23 +0000 (-0400) Subject: Fix compiler warnings in no-window-system-build X-Git-Tag: emacs-26.0.90~1840^2~200 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4c1535c6321318e3ba96a482303bfc790a47266;p=emacs.git Fix compiler warnings in no-window-system-build * src/composite.c (autocmp_chars): Declare and set 'f' only if HAVE_WINDOW_SYSTEM. * src/dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P) (FACE_FOR_CHAR): Explicitly discard unused arguments. * src/font.c (font_open_entity): Declare 'min_width' where it is first set, and only if HAVE_WINDOW_SYSTEM. * src/frame.c [!HAVE_WINDOW_SYSTEM] (decode_window_system_frame): Define _Noreturn version to avoid "suggest attribute noreturn" compiler warning. (check_window_system): Declare as _Noreturn. (Ficonify_frame): (Fset_frame_position): Don’t declare and set 'f'. * src/frame.h [!HAVE_WINDOW_SYSTEM] (decode_window_system_frame) (check_window_system): Add _Noreturn prototypes. (FRAME_FRINGE_COLS, FRAME_TOTAL_FRINGE_WIDTH) (FRAME_LEFT_FRINGE_WIDTH, FRAME_RIGHT_FRINGE_WIDTH) (FRAME_INTERNAL_BORDER_WIDTH, FRAME_RIGHT_DIVIDER_WIDTH) (FRAME_BOTTOM_DIVIDER_WIDTH): Explicitly discard unused argument. * src/xdisp.c (handle_single_display_spec): Declare 'fringe_bitmap' only if HAVE_WINDOW_SYSTEM. (append_space_for_newline): Declare 'g' where it is first set. (Fmove_point_visually): Declare and set 'target_is_eol_p' only if HAVE_WINDOW_SYSTEM. (show_mouse_face): Declare and set 'f' and 'phys_cursor_on_p' only if HAVE_WINDOW_SYSTEM. (note_mode_line_or_margin_highlight): (note_mouse_highlight): Declare and set 'cursor' and 'pointer' only if HAVE_WINDOW_SYSTEM. * src/xfaces.c (realize_default_face): Declare and set 'face' only if HAVE_X_WINDOWS. Remove redundant #ifdef. --- diff --git a/src/composite.c b/src/composite.c index bef1c5f7c3b..5696e3ee3a9 100644 --- a/src/composite.c +++ b/src/composite.c @@ -867,7 +867,11 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, Lisp_Object string) { ptrdiff_t count = SPECPDL_INDEX (); +#ifdef HAVE_WINDOW_SYSTEM struct frame *f = XFRAME (win->frame); +#else + (void) XFRAME (win->frame); +#endif Lisp_Object pos = make_number (charpos); ptrdiff_t to; ptrdiff_t pt = PT, pt_byte = PT_BYTE; diff --git a/src/dispextern.h b/src/dispextern.h index e83b7c7fc83..987d7f8b048 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -1843,8 +1843,11 @@ struct face_cache #else /* not HAVE_WINDOW_SYSTEM */ -#define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) true -#define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) ((FACE)->id) +#define FACE_SUITABLE_FOR_ASCII_CHAR_P(FACE, CHAR) \ + ((void) (FACE), (void) (CHAR), true) +#define FACE_FOR_CHAR(F, FACE, CHAR, POS, OBJECT) \ + ((void) (F), (void) (FACE), (void) (CHAR), (void) (POS), \ + (void) (OBJECT), (FACE)->id) #endif /* not HAVE_WINDOW_SYSTEM */ diff --git a/src/font.c b/src/font.c index f289891bf65..144ba07c42a 100644 --- a/src/font.c +++ b/src/font.c @@ -2863,7 +2863,7 @@ font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size) struct font_driver_list *driver_list; Lisp_Object objlist, size, val, font_object; struct font *font; - int min_width, height, psize; + int height, psize; eassert (FONT_ENTITY_P (entity)); size = AREF (entity, FONT_SIZE_INDEX); @@ -2907,10 +2907,12 @@ font_open_entity (struct frame *f, Lisp_Object entity, int pixel_size) Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX))); font = XFONT_OBJECT (font_object); - min_width = (font->min_width ? font->min_width - : font->average_width ? font->average_width - : font->space_width ? font->space_width - : 1); +#ifdef HAVE_WINDOW_SYSTEM + int min_width = (font->min_width ? font->min_width + : font->average_width ? font->average_width + : font->space_width ? font->space_width + : 1); +#endif int font_ascent, font_descent; get_font_ascent_descent (font, &font_ascent, &font_descent); diff --git a/src/frame.c b/src/frame.c index df9753905b2..9048452381c 100644 --- a/src/frame.c +++ b/src/frame.c @@ -113,8 +113,6 @@ window_system_available (struct frame *f) return f ? FRAME_WINDOW_P (f) || FRAME_MSDOS_P (f) : x_display_list != NULL; } -#endif /* HAVE_WINDOW_SYSTEM */ - struct frame * decode_window_system_frame (Lisp_Object frame) { @@ -125,6 +123,16 @@ decode_window_system_frame (Lisp_Object frame) return f; } +#else /* not HAVE_WINDOW_SYSTEM */ + +_Noreturn void +decode_window_system_frame (Lisp_Object frame) +{ + error ("Window system is not in use"); +} + +_Noreturn +#endif /* not HAVE_WINDOW_SYSTEM */ void check_window_system (struct frame *f) { @@ -2129,7 +2137,11 @@ DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame, If omitted, FRAME defaults to the currently selected frame. */) (Lisp_Object frame) { +#ifdef HAVE_WINDOW_SYSTEM struct frame *f = decode_live_frame (frame); +#else + (void) decode_live_frame (frame); +#endif /* Don't allow minibuf_window to remain on an iconified frame. */ check_minibuf_window (frame, EQ (minibuf_window, selected_window)); @@ -3001,7 +3013,11 @@ or bottom edge of the outer frame of FRAME relative to the right or bottom edge of FRAME's display. */) (Lisp_Object frame, Lisp_Object x, Lisp_Object y) { +#ifdef HAVE_WINDOW_SYSTEM register struct frame *f = decode_live_frame (frame); +#else + (void) decode_live_frame (frame); +#endif CHECK_TYPE_RANGED_INTEGER (int, x); CHECK_TYPE_RANGED_INTEGER (int, y); diff --git a/src/frame.h b/src/frame.h index 7d64e00b422..4ee0a7411f9 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1102,21 +1102,23 @@ extern Lisp_Object selected_frame; extern int frame_default_tool_bar_height; #endif -extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *decode_live_frame (Lisp_Object); extern struct frame *decode_any_frame (Lisp_Object); extern struct frame *make_initial_frame (void); extern struct frame *make_frame (bool); #ifdef HAVE_WINDOW_SYSTEM +extern void check_window_system (struct frame *); +extern struct frame *decode_window_system_frame (Lisp_Object); extern struct frame *make_minibuffer_frame (void); extern struct frame *make_frame_without_minibuffer (Lisp_Object, struct kboard *, Lisp_Object); extern bool window_system_available (struct frame *); #else /* not HAVE_WINDOW_SYSTEM */ +extern _Noreturn void check_window_system (struct frame *); +extern _Noreturn void decode_window_system_frame (Lisp_Object); #define window_system_available(f) ((void) (f), false) #endif /* HAVE_WINDOW_SYSTEM */ -extern void check_window_system (struct frame *); extern void frame_make_pointer_invisible (struct frame *); extern void frame_make_pointer_visible (struct frame *); extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); @@ -1181,13 +1183,13 @@ extern Lisp_Object Vframe_list; #else /* not HAVE_WINDOW_SYSTEM */ -#define FRAME_FRINGE_COLS(F) 0 -#define FRAME_TOTAL_FRINGE_WIDTH(F) 0 -#define FRAME_LEFT_FRINGE_WIDTH(F) 0 -#define FRAME_RIGHT_FRINGE_WIDTH(F) 0 -#define FRAME_INTERNAL_BORDER_WIDTH(F) 0 -#define FRAME_RIGHT_DIVIDER_WIDTH(F) 0 -#define FRAME_BOTTOM_DIVIDER_WIDTH(F) 0 +#define FRAME_FRINGE_COLS(F) ((void) (F), 0) +#define FRAME_TOTAL_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_LEFT_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_RIGHT_FRINGE_WIDTH(F) ((void) (F), 0) +#define FRAME_INTERNAL_BORDER_WIDTH(F) ((void) (F), 0) +#define FRAME_RIGHT_DIVIDER_WIDTH(F) ((void) (F), 0) +#define FRAME_BOTTOM_DIVIDER_WIDTH(F) ((void) (F), 0) #endif /* not HAVE_WINDOW_SYSTEM */ diff --git a/src/xdisp.c b/src/xdisp.c index d589080ac4c..bcb283f8faa 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5017,8 +5017,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, || EQ (XCAR (spec), Qright_fringe)) && CONSP (XCDR (spec))) { - int fringe_bitmap; - if (it) { if (!FRAME_WINDOW_P (it->f)) @@ -5042,6 +5040,8 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, return 1; #ifdef HAVE_WINDOW_SYSTEM + int fringe_bitmap; + value = XCAR (XCDR (spec)); if (!SYMBOLP (value) || !(fringe_bitmap = lookup_fringe_bitmap (value))) @@ -19509,7 +19509,6 @@ append_space_for_newline (struct it *it, bool default_face_p) struct text_pos saved_pos; Lisp_Object saved_object; struct face *face; - struct glyph *g; saved_object = it->object; saved_pos = it->position; @@ -19545,7 +19544,7 @@ append_space_for_newline (struct it *it, bool default_face_p) /* Make sure this space glyph has the right ascent and descent values, or else cursor at end of line will look funny, and height of empty lines will be incorrect. */ - g = it->glyph_row->glyphs[TEXT_AREA] + n; + struct glyph *g = it->glyph_row->glyphs[TEXT_AREA] + n; struct font *font = face->font ? face->font : FRAME_FONT (it->f); if (n == 0) { @@ -21687,7 +21686,9 @@ Value is the new character position of point. */) int pt_x, target_x, pixel_width, pt_vpos; bool at_eol_p; bool overshoot_expected = false; +#ifdef HAVE_WINDOW_SYSTEM bool target_is_eol_p = false; +#endif /* Setup the arena. */ SET_TEXT_POS (pt, PT, PT_BYTE); @@ -21802,7 +21803,9 @@ Value is the new character position of point. */) { move_it_by_lines (&it, -1); target_x = it.last_visible_x - !FRAME_WINDOW_P (it.f); +#ifdef HAVE_WINDOW_SYSTEM target_is_eol_p = true; +#endif /* Under word-wrap, we don't know the x coordinate of the last character displayed on the previous line, which immediately precedes the wrap point. To find @@ -28594,7 +28597,11 @@ static void show_mouse_face (Mouse_HLInfo *hlinfo, enum draw_glyphs_face draw) { struct window *w = XWINDOW (hlinfo->mouse_face_window); +#ifdef HAVE_WINDOW_SYSTEM struct frame *f = XFRAME (WINDOW_FRAME (w)); +#else + (void) XFRAME (WINDOW_FRAME (w)); +#endif if (/* If window is in the process of being destroyed, don't bother to do anything. */ @@ -28605,7 +28612,9 @@ show_mouse_face (Mouse_HLInfo *hlinfo, enum draw_glyphs_face draw) anymore. This can happen when a window is split. */ && hlinfo->mouse_face_end_row < w->current_matrix->nrows) { +#ifdef HAVE_WINDOW_SYSTEM bool phys_cursor_on_p = w->phys_cursor_on_p; +#endif struct glyph_row *row, *first, *last; first = MATRIX_ROW (w->current_matrix, hlinfo->mouse_face_beg_row); @@ -29697,9 +29706,9 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); #ifdef HAVE_WINDOW_SYSTEM Display_Info *dpyinfo; -#endif Cursor cursor = No_Cursor; Lisp_Object pointer = Qnil; +#endif int dx, dy, width, height; ptrdiff_t charpos; Lisp_Object string, object = Qnil; @@ -29950,8 +29959,12 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, && hlinfo->mouse_face_beg_row == vpos ) return; +#ifdef HAVE_WINDOW_SYSTEM if (clear_mouse_face (hlinfo)) cursor = No_Cursor; +#else + (void) clear_mouse_face (hlinfo); +#endif if (!row->reversed_p) { @@ -29985,8 +29998,10 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, show_mouse_face (hlinfo, DRAW_MOUSE_FACE); mouse_face_shown = true; +#ifdef HAVE_WINDOW_SYSTEM if (NILP (pointer)) pointer = Qhand; +#endif } } @@ -30017,8 +30032,10 @@ note_mouse_highlight (struct frame *f, int x, int y) enum window_part part = ON_NOTHING; Lisp_Object window; struct window *w; +#ifdef HAVE_WINDOW_SYSTEM Cursor cursor = No_Cursor; Lisp_Object pointer = Qnil; /* Takes precedence over cursor! */ +#endif struct buffer *b; /* When a menu is active, don't highlight because this looks odd. */ @@ -30201,9 +30218,11 @@ note_mouse_highlight (struct frame *f, int x, int y) && glyph->type == STRETCH_GLYPH && glyph->avoid_cursor_p)) { +#ifndef HAVE_WINDOW_SYSTEM + (void) clear_mouse_face (hlinfo); +#else /* HAVE_WINDOW_SYSTEM */ if (clear_mouse_face (hlinfo)) cursor = No_Cursor; -#ifdef HAVE_WINDOW_SYSTEM if (FRAME_WINDOW_P (f) && NILP (pointer)) { if (area != TEXT_AREA) @@ -30211,7 +30230,7 @@ note_mouse_highlight (struct frame *f, int x, int y) else pointer = Vvoid_text_area_pointer; } -#endif +#endif /* HAVE_WINDOW_SYSTEM */ goto set_cursor; } @@ -30256,8 +30275,10 @@ note_mouse_highlight (struct frame *f, int x, int y) same_region = coords_in_mouse_face_p (w, hpos, vpos); +#ifdef HAVE_WINDOW_SYSTEM if (same_region) cursor = No_Cursor; +#endif /* Check mouse-face highlighting. */ if (! same_region @@ -30284,8 +30305,12 @@ note_mouse_highlight (struct frame *f, int x, int y) hlinfo->mouse_face_overlay = overlay; /* Clear the display of the old active region, if any. */ +#ifdef HAVE_WINDOW_SYSTEM if (clear_mouse_face (hlinfo)) cursor = No_Cursor; +#else + (void) clear_mouse_face (hlinfo); +#endif /* If no overlay applies, get a text property. */ if (NILP (overlay)) @@ -30316,7 +30341,9 @@ note_mouse_highlight (struct frame *f, int x, int y) = face_at_string_position (w, object, pos, 0, &ignore, glyph->face_id, true); show_mouse_face (hlinfo, DRAW_MOUSE_FACE); +#ifdef HAVE_WINDOW_SYSTEM cursor = No_Cursor; +#endif } else { @@ -30400,7 +30427,9 @@ note_mouse_highlight (struct frame *f, int x, int y) : XFASTINT (after), before_string, after_string, disp_string); +#ifdef HAVE_WINDOW_SYSTEM cursor = No_Cursor; +#endif } } } diff --git a/src/xfaces.c b/src/xfaces.c index ea02ee7ccbe..faf28fc513d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5198,7 +5198,6 @@ realize_default_face (struct frame *f) struct face_cache *c = FRAME_FACE_CACHE (f); Lisp_Object lface; Lisp_Object attrs[LFACE_VECTOR_SIZE]; - struct face *face; /* If the `default' face is not yet known, create it. */ lface = lface_from_face_name (f, Qdefault, false); @@ -5288,10 +5287,11 @@ realize_default_face (struct frame *f) eassert (lface_fully_specified_p (XVECTOR (lface)->contents)); check_lface (lface); memcpy (attrs, XVECTOR (lface)->contents, sizeof attrs); - face = realize_face (c, attrs, DEFAULT_FACE_ID); -#ifdef HAVE_WINDOW_SYSTEM -#ifdef HAVE_X_WINDOWS +#ifndef HAVE_X_WINDOWS + (void) realize_face (c, attrs, DEFAULT_FACE_ID); +#else /* HAVE_X_WINDOWS */ + struct face *face = realize_face (c, attrs, DEFAULT_FACE_ID); if (FRAME_X_P (f) && face->font != FRAME_FONT (f)) { /* This can happen when making a frame on a display that does @@ -5306,7 +5306,6 @@ realize_default_face (struct frame *f) x_set_font (f, LFACE_FONT (lface), Qnil); } #endif /* HAVE_X_WINDOWS */ -#endif /* HAVE_WINDOW_SYSTEM */ return true; }