mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-21 10:24:55 +00:00
Code Issues Releases Activity

* xfns.c: Make symbols static if they're not exported.

Browse Source 
(x_last_font_name, x_display_info_for_name):
(x_set_foreground_color, x_set_background_color, x_set_mouse_color):
(x_set_cursor_color, x_set_border_pixel, x_set_border_color):
(x_set_cursor_type, x_set_icon_type, x_set_icon_name):
(x_set_scroll_bar_foreground, x_set_scroll_bar_background):
(x_explicitly_set_name, x_set_title, xic_defaut_fontset, tip_timer):
(last_show_tip_args): Now static.
(xic_defaut_fontset, xic_create_fontsetname): Define only if
defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
(x_screen_planes): Remove; unused.
* dispextern.h (x_screen_planes): Remove decl.
This commit is contained in:
Paul Eggert 2011-04-12 01:39:43 -07:00
parent 5bf46f0511
commit e4cebfca13
3 changed files with 35 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ChangeLog
View File

@ -1,5 +1,18 @@
2011-04-12 Paul Eggert <eggert@cs.ucla.edu>
* xfns.c: Make symbols static if they're not exported.
(x_last_font_name, x_display_info_for_name):
(x_set_foreground_color, x_set_background_color, x_set_mouse_color):
(x_set_cursor_color, x_set_border_pixel, x_set_border_color):
(x_set_cursor_type, x_set_icon_type, x_set_icon_name):
(x_set_scroll_bar_foreground, x_set_scroll_bar_background):
(x_explicitly_set_name, x_set_title, xic_defaut_fontset, tip_timer):
(last_show_tip_args): Now static.
(xic_defaut_fontset, xic_create_fontsetname): Define only if
defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
(x_screen_planes): Remove; unused.
* dispextern.h (x_screen_planes): Remove decl.
* dispnew.c: Make symbols static if they're not exported.
* dispextern.h (redraw_garbaged_frames, scrolling):
(increment_row_positions): Remove.

1
src/dispextern.h
View File

@ -3171,7 +3171,6 @@ void gamma_correct (struct frame *, COLORREF *);
#ifdef HAVE_WINDOW_SYSTEM
int x_screen_planes (struct frame *);
void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
extern Lisp_Object tip_frame;

75
src/xfns.c
View File

@ -150,9 +150,11 @@ int image_cache_refcount, dpyinfo_refcount;
#endif
#if defined (USE_GTK) && defined (HAVE_FREETYPE)
char *x_last_font_name;
static char *x_last_font_name;
#endif
static struct x_display_info *x_display_info_for_name (Lisp_Object);
/* Error if we are not connected to X. */
@ -419,35 +421,6 @@ x_top_window_to_frame (struct x_display_info *dpyinfo, int wdesc)
static void x_default_font_parameter (struct frame *, Lisp_Object);
static Lisp_Object unwind_create_frame (Lisp_Object);
static Lisp_Object unwind_create_tip_frame (Lisp_Object);
void x_set_foreground_color (struct frame *, Lisp_Object, Lisp_Object);
static void x_set_wait_for_wm (struct frame *, Lisp_Object, Lisp_Object);
void x_set_background_color (struct frame *, Lisp_Object, Lisp_Object);
void x_set_mouse_color (struct frame *, Lisp_Object, Lisp_Object);
void x_set_cursor_color (struct frame *, Lisp_Object, Lisp_Object);
void x_set_border_color (struct frame *, Lisp_Object, Lisp_Object);
void x_set_cursor_type (struct frame *, Lisp_Object, Lisp_Object);
void x_set_icon_type (struct frame *, Lisp_Object, Lisp_Object);
void x_set_icon_name (struct frame *, Lisp_Object, Lisp_Object);
void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
void x_set_scroll_bar_foreground (struct frame *, Lisp_Object,
Lisp_Object);
void x_set_scroll_bar_background (struct frame *, Lisp_Object,
Lisp_Object);
static Lisp_Object x_default_scroll_bar_color_parameter (struct frame *,
Lisp_Object,
Lisp_Object,
const char *, const char *,
int);
/* Store the screen positions of frame F into XPTR and YPTR.
These are the positions of the containing window manager window,
not Emacs's own window. */
@ -766,7 +739,7 @@ xg_set_icon_from_xpm_data (FRAME_PTR f, const char **data)
In that case, just record the parameter's new value
in the standard place; do not attempt to change the window. */
void
static void
x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
struct x_output *x = f->output_data.x;
@ -802,7 +775,7 @@ x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
unload_color (f, old_fg);
}
void
static void
x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
struct x_output *x = f->output_data.x;
@ -877,7 +850,7 @@ make_invisible_cursor (struct frame *f)
return c;
}
void
static void
x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
struct x_output *x = f->output_data.x;
@ -1022,7 +995,7 @@ x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
update_face_from_frame_parameter (f, Qmouse_color, arg);
}
void
static void
x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
unsigned long fore_pixel, pixel;
@ -1093,7 +1066,7 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
Note that this does not fully take effect if done before
F has an x-window. */
void
static void
x_set_border_pixel (struct frame *f, int pix)
{
unload_color (f, f->output_data.x->border_pixel);
@ -1122,7 +1095,7 @@ x_set_border_pixel (struct frame *f, int pix)
Note: under X11, this is normally the province of the window manager,
and so emacs' border colors may be overridden. */
void
static void
x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
int pix;
@ -1134,7 +1107,7 @@ x_set_border_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
}
void
static void
x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
{
set_frame_cursor_types (f, arg);
@ -1143,7 +1116,7 @@ x_set_cursor_type (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
cursor_type_changed = 1;
}
void
static void
x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
int result;
@ -1175,7 +1148,7 @@ x_set_icon_type (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
UNBLOCK_INPUT;
}
void
static void
x_set_icon_name (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
{
int result;
@ -1398,7 +1371,7 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
isn't a valid color name, do nothing. OLDVAL is the old value of
the frame parameter. */
void
static void
x_set_scroll_bar_foreground (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
unsigned long pixel;
@ -1431,7 +1404,7 @@ x_set_scroll_bar_foreground (struct frame *f, Lisp_Object value, Lisp_Object old
valid color name, do nothing. OLDVAL is the old value of the frame
parameter. */
void
static void
x_set_scroll_bar_background (struct frame *f, Lisp_Object value, Lisp_Object oldval)
{
unsigned long pixel;
@ -1682,7 +1655,7 @@ x_set_name (struct frame *f, Lisp_Object name, int explicit)
/* This function should be called when the user's lisp code has
specified a name for the frame; the name will override any set by the
redisplay code. */
void
static void
x_explicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
{
x_set_name (f, arg, 1);
@ -1700,7 +1673,7 @@ x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
/* Change the title of frame F to NAME.
If NAME is nil, use the frame name as the title. */
void
static void
x_set_title (struct frame *f, Lisp_Object name, Lisp_Object old_name)
{
/* Don't change the title if it's already NAME. */
@ -1888,9 +1861,10 @@ static XIMStyle supported_xim_styles[] =
};
#if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
/* Create an X fontset on frame F with base font name BASE_FONTNAME. */
const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
/* Create an Xt fontset spec from the name of a base font.
If `motif' is True use the Motif syntax. */
@ -2016,6 +1990,7 @@ xic_create_fontsetname (const char *base_fontname, int motif)
strcat (fontsetname, ":");
return fontsetname;
}
#endif /* HAVE_X_WINDOWS && USE_X_TOOLKIT */
#ifdef DEBUG_XIC_FONTSET
static void
@ -3887,12 +3862,6 @@ x_char_height (register struct frame *f)
return FRAME_LINE_HEIGHT (f);
}
int
x_screen_planes (register struct frame *f)
{
return FRAME_X_DISPLAY_INFO (f)->n_planes;
}
/************************************************************************
@ -4017,7 +3986,7 @@ select_visual (struct x_display_info *dpyinfo)
/* Return the X display structure for the display named NAME.
Open a new connection if necessary. */
struct x_display_info *
static struct x_display_info *
x_display_info_for_name (Lisp_Object name)
{
Lisp_Object names;
@ -4538,13 +4507,13 @@ Lisp_Object tip_frame;
/* If non-nil, a timer started that hides the last tooltip when it
fires. */
Lisp_Object tip_timer;
static Lisp_Object tip_timer;
Window tip_window;
/* If non-nil, a vector of 3 elements containing the last args
with which x-show-tip was called. See there. */
Lisp_Object last_show_tip_args;
static Lisp_Object last_show_tip_args;
static Lisp_Object