HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add vc-annotate-goto-line.
[bpt/emacs.git]
/
lwlib
/
lwlib.c
diff --git
a/lwlib/lwlib.c
b/lwlib/lwlib.c
index
2b72f54
..
9d8ec33
100644
(file)
--- a/
lwlib/lwlib.c
+++ b/
lwlib/lwlib.c
@@
-1,7
+1,7
@@
/* A general interface to the widgets of different toolkits.
/* A general interface to the widgets of different toolkits.
+
Copyright (C) 1992, 1993 Lucid, Inc.
Copyright (C) 1992, 1993 Lucid, Inc.
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2011 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
This file is part of the Lucid Widget Library.
@@
-25,7
+25,7
@@
Boston, MA 02110-1301, USA. */
#endif
#include <setjmp.h>
#endif
#include <setjmp.h>
-#include
"../src/lisp.h"
+#include
<lisp.h>
#include <sys/types.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdio.h>
@@
-66,21
+66,21
@@
static widget_info*
all_widget_info = NULL;
#ifdef USE_MOTIF
all_widget_info = NULL;
#ifdef USE_MOTIF
-char *lwlib_toolkit_type = "motif";
+c
onst c
har *lwlib_toolkit_type = "motif";
#else
#else
-char *lwlib_toolkit_type = "lucid";
+c
onst c
har *lwlib_toolkit_type = "lucid";
#endif
static widget_value *merge_widget_value (widget_value *,
widget_value *,
int, int *);
static void instantiate_widget_instance (widget_instance *);
#endif
static widget_value *merge_widget_value (widget_value *,
widget_value *,
int, int *);
static void instantiate_widget_instance (widget_instance *);
-static int my_strcasecmp (c
har *,
char *);
+static int my_strcasecmp (c
onst char *, const
char *);
static void safe_free_str (char *);
static void free_widget_value_tree (widget_value *);
static widget_value *copy_widget_value_tree (widget_value *,
change_type);
static void safe_free_str (char *);
static void free_widget_value_tree (widget_value *);
static widget_value *copy_widget_value_tree (widget_value *,
change_type);
-static widget_info *allocate_widget_info (c
har *,
char *, LWLIB_ID,
+static widget_info *allocate_widget_info (c
onst char *, const
char *, LWLIB_ID,
widget_value *,
lw_callback, lw_callback,
lw_callback, lw_callback);
widget_value *,
lw_callback, lw_callback,
lw_callback, lw_callback);
@@
-92,14
+92,14
@@
static void free_widget_instance (widget_instance *);
static widget_info *get_widget_info (LWLIB_ID, Boolean);
static widget_instance *get_widget_instance (Widget, Boolean);
static widget_instance *find_instance (LWLIB_ID, Widget, Boolean);
static widget_info *get_widget_info (LWLIB_ID, Boolean);
static widget_instance *get_widget_instance (Widget, Boolean);
static widget_instance *find_instance (LWLIB_ID, Widget, Boolean);
-static Boolean safe_strcmp (c
har *,
char *);
-static Widget name_to_widget (widget_instance *, char *);
+static Boolean safe_strcmp (c
onst char *, const
char *);
+static Widget name_to_widget (widget_instance *, c
onst c
har *);
static void set_one_value (widget_instance *, widget_value *, Boolean);
static void update_one_widget_instance (widget_instance *, Boolean);
static void update_all_widget_values (widget_info *, Boolean);
static void initialize_widget_instance (widget_instance *);
static void set_one_value (widget_instance *, widget_value *, Boolean);
static void update_one_widget_instance (widget_instance *, Boolean);
static void update_all_widget_values (widget_info *, Boolean);
static void initialize_widget_instance (widget_instance *);
-static widget_creation_function find_in_table (c
har *,
widget_creation_entry *);
-static Boolean dialog_spec_p (char *);
+static widget_creation_function find_in_table (c
onst char *, const
widget_creation_entry *);
+static Boolean dialog_spec_p (c
onst c
har *);
static void destroy_one_instance (widget_instance *);
static void lw_pop_all_widgets (LWLIB_ID, Boolean);
static Boolean get_one_value (widget_instance *, widget_value *);
static void destroy_one_instance (widget_instance *);
static void lw_pop_all_widgets (LWLIB_ID, Boolean);
static Boolean get_one_value (widget_instance *, widget_value *);
@@
-110,9
+110,7
@@
safe_strdup (const char *s)
{
char *result;
if (! s) return 0;
{
char *result;
if (! s) return 0;
- result = (char *) malloc (strlen (s) + 1);
- if (! result)
- return 0;
+ result = (char *) xmalloc (strlen (s) + 1);
strcpy (result, s);
return result;
}
strcpy (result, s);
return result;
}
@@
-120,7
+118,7
@@
safe_strdup (const char *s)
/* Like strcmp but ignore differences in case. */
static int
/* Like strcmp but ignore differences in case. */
static int
-my_strcasecmp (c
har *s1,
char *s2)
+my_strcasecmp (c
onst char *s1, const
char *s2)
{
while (1)
{
{
while (1)
{
@@
-158,7
+156,7
@@
malloc_widget_value (void)
}
else
{
}
else
{
- wv = (widget_value *) malloc (sizeof (widget_value));
+ wv = (widget_value *)
x
malloc (sizeof (widget_value));
malloc_cpt++;
}
memset ((void*) wv, 0, sizeof (widget_value));
malloc_cpt++;
}
memset ((void*) wv, 0, sizeof (widget_value));
@@
-249,8
+247,8
@@
copy_widget_value_tree (widget_value *val, change_type change)
}
static widget_info *
}
static widget_info *
-allocate_widget_info (char* type,
- char* name,
+allocate_widget_info (c
onst c
har* type,
+ c
onst c
har* name,
LWLIB_ID id,
widget_value* val,
lw_callback pre_activate_cb,
LWLIB_ID id,
widget_value* val,
lw_callback pre_activate_cb,
@@
-258,7
+256,7
@@
allocate_widget_info (char* type,
lw_callback post_activate_cb,
lw_callback highlight_cb)
{
lw_callback post_activate_cb,
lw_callback highlight_cb)
{
- widget_info* info = (widget_info*)malloc (sizeof (widget_info));
+ widget_info* info = (widget_info*)
x
malloc (sizeof (widget_info));
info->type = safe_strdup (type);
info->name = safe_strdup (name);
info->id = id;
info->type = safe_strdup (type);
info->name = safe_strdup (name);
info->id = id;
@@
-300,7
+298,7
@@
static widget_instance *
allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p)
{
widget_instance* instance =
allocate_widget_instance (widget_info* info, Widget parent, Boolean pop_up_p)
{
widget_instance* instance =
- (widget_instance*)malloc (sizeof (widget_instance));
+ (widget_instance*)
x
malloc (sizeof (widget_instance));
memset (instance, 0, sizeof *instance);
instance->parent = parent;
instance->pop_up_p = pop_up_p;
memset (instance, 0, sizeof *instance);
instance->parent = parent;
instance->pop_up_p = pop_up_p;
@@
-402,7
+400,7
@@
find_instance (LWLIB_ID id, Widget parent, Boolean pop_up_p)
\f
/* utility function for widget_value */
static Boolean
\f
/* utility function for widget_value */
static Boolean
-safe_strcmp (c
har *s1,
char *s2)
+safe_strcmp (c
onst char *s1, const
char *s2)
{
if (!!s1 ^ !!s2) return True;
return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2;
{
if (!!s1 ^ !!s2) return True;
return (s1 && s2) ? strcmp (s1, s2) : s1 ? False : !!s2;
@@
-424,7
+422,7
@@
safe_strcmp (char *s1, char *s2)
(nc == STRUCTURAL_CHANGE ? "structural" : "???")))), \
nc, desc, a1, a2)
#else
(nc == STRUCTURAL_CHANGE ? "structural" : "???")))), \
nc, desc, a1, a2)
#else
-# define EXPLAIN(name, oc, nc, desc, a1, a2)
+# define EXPLAIN(name, oc, nc, desc, a1, a2)
((void) 0)
#endif
#endif
@@
-586,7
+584,7
@@
merge_widget_value (widget_value *val1,
\f
/* modifying the widgets */
static Widget
\f
/* modifying the widgets */
static Widget
-name_to_widget (widget_instance *instance, char *name)
+name_to_widget (widget_instance *instance, c
onst c
har *name)
{
Widget widget = NULL;
{
Widget widget = NULL;
@@
-729,9
+727,9
@@
initialize_widget_instance (widget_instance *instance)
static widget_creation_function
static widget_creation_function
-find_in_table (c
har *type,
widget_creation_entry *table)
+find_in_table (c
onst char *type, const
widget_creation_entry *table)
{
{
- widget_creation_entry* cur;
+
const
widget_creation_entry* cur;
for (cur = table; cur->type; cur++)
if (!my_strcasecmp (type, cur->type))
return cur->function;
for (cur = table; cur->type; cur++)
if (!my_strcasecmp (type, cur->type))
return cur->function;
@@
-739,7
+737,7
@@
find_in_table (char *type, widget_creation_entry *table)
}
static Boolean
}
static Boolean
-dialog_spec_p (char *name)
+dialog_spec_p (c
onst c
har *name)
{
/* return True if name matches [EILPQeilpq][1-9][Bb] or
[EILPQeilpq][1-9][Bb][Rr][1-9] */
{
/* return True if name matches [EILPQeilpq][1-9][Bb] or
[EILPQeilpq][1-9][Bb][Rr][1-9] */
@@
-823,8
+821,8
@@
instantiate_widget_instance (widget_instance *instance)
}
void
}
void
-lw_register_widget (char* type,
- char* name,
+lw_register_widget (c
onst c
har* type,
+ c
onst c
har* name,
LWLIB_ID id,
widget_value* val,
lw_callback pre_activate_cb,
LWLIB_ID id,
widget_value* val,
lw_callback pre_activate_cb,
@@
-867,7
+865,7
@@
lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p)
}
Widget
}
Widget
-lw_create_widget (c
har* type,
char* name, LWLIB_ID id, widget_value* val,
+lw_create_widget (c
onst char* type, const
char* name, LWLIB_ID id, widget_value* val,
Widget parent, Boolean pop_up_p,
lw_callback pre_activate_cb, lw_callback selection_cb,
lw_callback post_activate_cb, lw_callback highlight_cb)
Widget parent, Boolean pop_up_p,
lw_callback pre_activate_cb, lw_callback selection_cb,
lw_callback post_activate_cb, lw_callback highlight_cb)
@@
-914,8
+912,9
@@
destroy_one_instance (widget_instance *instance)
xaw_destroy_instance (instance);
else
#endif
xaw_destroy_instance (instance);
else
#endif
- /* do not remove the empty statement */
- ;
+ {
+ /* Empty compound statement to terminate if-then-else chain. */
+ }
}
free_widget_instance (instance);
}
free_widget_instance (instance);
@@
-980,7
+979,7
@@
lw_destroy_all_pop_ups (void)
}
#ifdef USE_MOTIF
}
#ifdef USE_MOTIF
-extern Widget first_child (
/* Widget */);
/* garbage */
+extern Widget first_child (
Widget);
/* garbage */
#endif
Widget
#endif
Widget
@@
-1317,7
+1316,7
@@
lw_allow_resizing (Widget w, Boolean flag)
to similar ones that are supported. */
int
to similar ones that are supported. */
int
-lw_separator_p (char *label, enum menu_separator *type, int motif_p)
+lw_separator_p (c
onst c
har *label, enum menu_separator *type, int motif_p)
{
int separator_p = 0;
{
int separator_p = 0;
@@
-1326,7
+1325,7
@@
lw_separator_p (char *label, enum menu_separator *type, int motif_p)
{
static struct separator_table
{
{
static struct separator_table
{
- char *name;
+ c
onst c
har *name;
enum menu_separator type;
}
separator_names[] =
enum menu_separator type;
}
separator_names[] =
@@
-1371,7
+1370,7
@@
lw_separator_p (char *label, enum menu_separator *type, int motif_p)
/* Alternative, more Emacs-style names. */
static struct separator_table
{
/* Alternative, more Emacs-style names. */
static struct separator_table
{
- char *name;
+ c
onst c
har *name;
enum menu_separator type;
}
separator_names[] =
enum menu_separator type;
}
separator_names[] =
@@
-1421,6
+1420,3
@@
lw_separator_p (char *label, enum menu_separator *type, int motif_p)
return separator_p;
}
return separator_p;
}
-
-/* arch-tag: 3d730f36-a441-4a71-9971-48ef3b5a4d9f
- (do not change this comment) */