summaryrefslogtreecommitdiff
path: root/src/xsettings.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2010-07-04 00:50:25 -0700
committerDan Nicolaescu <dann@ics.uci.edu>2010-07-04 00:50:25 -0700
commit971de7fb158335fbda39525feb2d7776a26bc030 (patch)
tree605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/xsettings.c
parentb8463cbfbe2c5183cf40772df2746e58b787ddeb (diff)
downloademacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C. * src/atimer.c: * src/bidi.c: * src/bytecode.c: * src/callint.c: * src/callproc.c: * src/casefiddle.c: * src/casetab.c: * src/category.c: * src/ccl.c: * src/character.c: * src/charset.c: * src/chartab.c: * src/cmds.c: * src/coding.c: * src/composite.c: * src/data.c: * src/dbusbind.c: * src/dired.c: * src/dispnew.c: * src/doc.c: * src/doprnt.c: * src/ecrt0.c: * src/editfns.c: * src/fileio.c: * src/filelock.c: * src/filemode.c: * src/fns.c: * src/font.c: * src/fontset.c: * src/frame.c: * src/fringe.c: * src/ftfont.c: * src/ftxfont.c: * src/gtkutil.c: * src/indent.c: * src/insdel.c: * src/intervals.c: * src/keymap.c: * src/lread.c: * src/macros.c: * src/marker.c: * src/md5.c: * src/menu.c: * src/minibuf.c: * src/prefix-args.c: * src/print.c: * src/ralloc.c: * src/regex.c: * src/region-cache.c: * src/scroll.c: * src/search.c: * src/sound.c: * src/strftime.c: * src/syntax.c: * src/sysdep.c: * src/termcap.c: * src/terminal.c: * src/terminfo.c: * src/textprop.c: * src/tparam.c: * src/undo.c: * src/unexelf.c: * src/window.c: * src/xfaces.c: * src/xfns.c: * src/xfont.c: * src/xftfont.c: * src/xgselect.c: * src/xmenu.c: * src/xrdb.c: * src/xselect.c: * src/xsettings.c: * src/xsmfns.c: * src/xterm.c: Likewise.
Diffstat (limited to 'src/xsettings.c')
-rw-r--r--src/xsettings.c49
1 files changed, 14 insertions, 35 deletions
diff --git a/src/xsettings.c b/src/xsettings.c
index 2760e48fe05..e8aba9ef2d8 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -54,9 +54,7 @@ static GConfClient *gconf_client;
static void
-store_config_changed_event (arg, display_name)
- Lisp_Object arg;
- Lisp_Object display_name;
+store_config_changed_event (Lisp_Object arg, Lisp_Object display_name)
{
struct input_event event;
EVENT_INIT (event);
@@ -102,11 +100,7 @@ struct xsettings
that is SYSTEM_MONO_FONT. */
static void
-something_changedCB (client, cnxn_id, entry, user_data)
- GConfClient *client;
- guint cnxn_id;
- GConfEntry *entry;
- gpointer user_data;
+something_changedCB (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
{
GConfValue *v = gconf_entry_get_value (entry);
@@ -156,8 +150,7 @@ something_changedCB (client, cnxn_id, entry, user_data)
/* Find the window that contains the XSETTINGS property values. */
static void
-get_prop_window (dpyinfo)
- struct x_display_info *dpyinfo;
+get_prop_window (struct x_display_info *dpyinfo)
{
Display *dpy = dpyinfo->display;
@@ -229,10 +222,7 @@ get_prop_window (dpyinfo)
*/
static int
-parse_settings (prop, bytes, settings)
- unsigned char *prop;
- unsigned long bytes;
- struct xsettings *settings;
+parse_settings (unsigned char *prop, long unsigned int bytes, struct xsettings *settings)
{
Lisp_Object byteorder = Fbyteorder ();
int my_bo = XFASTINT (byteorder) == 'B' ? MSBFirst : LSBFirst;
@@ -402,9 +392,7 @@ parse_settings (prop, bytes, settings)
}
static int
-read_settings (dpyinfo, settings)
- struct x_display_info *dpyinfo;
- struct xsettings *settings;
+read_settings (struct x_display_info *dpyinfo, struct xsettings *settings)
{
long long_len;
Atom act_type;
@@ -435,10 +423,7 @@ read_settings (dpyinfo, settings)
static void
-apply_xft_settings (dpyinfo, send_event_p, settings)
- struct x_display_info *dpyinfo;
- int send_event_p;
- struct xsettings *settings;
+apply_xft_settings (struct x_display_info *dpyinfo, int send_event_p, struct xsettings *settings)
{
#ifdef HAVE_XFT
FcPattern *pat;
@@ -546,9 +531,7 @@ apply_xft_settings (dpyinfo, send_event_p, settings)
}
static void
-read_and_apply_settings (dpyinfo, send_event_p)
- struct x_display_info *dpyinfo;
- int send_event_p;
+read_and_apply_settings (struct x_display_info *dpyinfo, int send_event_p)
{
struct xsettings settings;
Lisp_Object dpyname = XCAR (dpyinfo->name_list_element);
@@ -592,9 +575,7 @@ read_and_apply_settings (dpyinfo, send_event_p)
}
void
-xft_settings_event (dpyinfo, event)
- struct x_display_info *dpyinfo;
- XEvent *event;
+xft_settings_event (struct x_display_info *dpyinfo, XEvent *event)
{
int check_window_p = 0;
int apply_settings = 0;
@@ -636,7 +617,7 @@ xft_settings_event (dpyinfo, event)
static void
-init_gconf ()
+init_gconf (void)
{
#if defined (HAVE_GCONF) && defined (HAVE_XFT)
int i;
@@ -669,8 +650,7 @@ init_gconf ()
}
static void
-init_xsettings (dpyinfo)
- struct x_display_info *dpyinfo;
+init_xsettings (struct x_display_info *dpyinfo)
{
char sel[64];
Display *dpy = dpyinfo->display;
@@ -696,8 +676,7 @@ init_xsettings (dpyinfo)
}
void
-xsettings_initialize (dpyinfo)
- struct x_display_info *dpyinfo;
+xsettings_initialize (struct x_display_info *dpyinfo)
{
if (first_dpyinfo == NULL) first_dpyinfo = dpyinfo;
init_gconf ();
@@ -705,13 +684,13 @@ xsettings_initialize (dpyinfo)
}
const char *
-xsettings_get_system_font ()
+xsettings_get_system_font (void)
{
return current_mono_font;
}
const char *
-xsettings_get_system_normal_font ()
+xsettings_get_system_normal_font (void)
{
return current_font;
}
@@ -755,7 +734,7 @@ known style. Otherwise return image. */)
}
void
-syms_of_xsettings ()
+syms_of_xsettings (void)
{
current_mono_font = NULL;
current_font = NULL;