summaryrefslogtreecommitdiff
path: root/gdk/x11
diff options
context:
space:
mode:
authorElliot Lee <sopwith@cuc.ml.org>1998-11-30 19:07:15 +0000
committerElliot Lee <sopwith@src.gnome.org>1998-11-30 19:07:15 +0000
commit060978e069b3c1726c7a1fb3916c3e8c8348a813 (patch)
treeb92907dd3d6ca58cb5e5bf7e7481277feada033c /gdk/x11
parent58ca2448eb7d0a337fd83bd2951f5d9adde81b7c (diff)
downloadgtk+-060978e069b3c1726c7a1fb3916c3e8c8348a813.tar.gz
I submitted this patch twice to gtk-devel-list, and received no comments,
I submitted this patch twice to gtk-devel-list, and received no comments, so am committing it. Although not exhaustively tested, I have been using this gtk+ for a week w/o problems, and I did read the code to ensure that nothing ever writes to these data structures. If by chance people encounter SEGV's in gtk+ code that is setting values in global data structures, this patch could be a possible culprit. 1998-11-30 Elliot Lee <sopwith@cuc.ml.org> * {gdk,gtk}/*.c: Make read-only data structures "static const" to allow them to be shared, mainly including (but not limited to) the GtkTypeInfo structures for each class. * gtk/gtkfilesel.c: Add /net to the "leave me alone" directory listing.
Diffstat (limited to 'gdk/x11')
-rw-r--r--gdk/x11/gdkinput.c4
-rw-r--r--gdk/x11/gdkmain-x11.c6
-rw-r--r--gdk/x11/gdkvisual-x11.c10
-rw-r--r--gdk/x11/gdkwindow-x11.c4
4 files changed, 12 insertions, 12 deletions
diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c
index c0f199fae9..a11da09f22 100644
--- a/gdk/x11/gdkinput.c
+++ b/gdk/x11/gdkinput.c
@@ -38,9 +38,9 @@ static GdkDevicePrivate *gdk_input_find_device (guint32 id);
/* Incorporate the specific routines depending on compilation options */
-static GdkAxisUse gdk_input_core_axes[] = { GDK_AXIS_X, GDK_AXIS_Y };
+static const GdkAxisUse gdk_input_core_axes[] = { GDK_AXIS_X, GDK_AXIS_Y };
-static GdkDeviceInfo gdk_input_core_info =
+static const GdkDeviceInfo gdk_input_core_info =
{
GDK_CORE_POINTER,
"Core Pointer",
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 36e0fb1438..f504ea313a 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -229,7 +229,7 @@ static gulong base_id;
static gint autorepeat;
#ifdef G_ENABLE_DEBUG
-static GDebugKey gdk_debug_keys[] = {
+static const GDebugKey gdk_debug_keys[] = {
{"events", GDK_DEBUG_EVENTS},
{"misc", GDK_DEBUG_MISC},
{"dnd", GDK_DEBUG_DND},
@@ -1504,8 +1504,8 @@ gdk_pointer_grab (GdkWindow * window,
guint32 time)
{
/* From gdkwindow.c */
- extern int nevent_masks;
- extern int event_mask_table[];
+ extern const int nevent_masks;
+ extern const int event_mask_table[];
gint return_val;
GdkWindowPrivate *window_private;
diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
index 693020ef61..ebdcccb127 100644
--- a/gdk/x11/gdkvisual-x11.c
+++ b/gdk/x11/gdkvisual-x11.c
@@ -44,7 +44,7 @@ static gint navailable_types;
#ifdef G_ENABLE_DEBUG
-static gchar* visual_names[] =
+static const gchar* visual_names[] =
{
"static gray",
"grayscale",
@@ -61,8 +61,8 @@ static GHashTable *visual_hash = NULL;
void
gdk_visual_init (void)
{
- static gint possible_depths[7] = { 32, 24, 16, 15, 8, 4, 1 };
- static GdkVisualType possible_types[6] =
+ static const gint possible_depths[7] = { 32, 24, 16, 15, 8, 4, 1 };
+ static const GdkVisualType possible_types[6] =
{
GDK_VISUAL_DIRECT_COLOR,
GDK_VISUAL_TRUE_COLOR,
@@ -72,8 +72,8 @@ gdk_visual_init (void)
GDK_VISUAL_STATIC_GRAY
};
- static gint npossible_depths = 7;
- static gint npossible_types = 6;
+ static const gint npossible_depths = sizeof(possible_depths)/sizeof(gint);
+ static const gint npossible_types = sizeof(possible_types)/sizeof(GdkVisualType);
XVisualInfo *visual_list;
XVisualInfo visual_template;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 09399dcf1a..c8a42595ed 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -33,8 +33,7 @@
#include <X11/extensions/shape.h>
#endif
-int nevent_masks = 20;
-int event_mask_table[20] =
+const int event_mask_table[20] =
{
ExposureMask,
PointerMotionMask,
@@ -57,6 +56,7 @@ int event_mask_table[20] =
0, /* PROXIMTY_OUT */
SubstructureNotifyMask
};
+const int nevent_masks = sizeof(event_mask_table)/sizeof(int);
static gboolean gdk_window_have_shape_ext (void);