A guint * was being passed where X expected a Keysym *, and keysyms are

Tue May 5 17:04:14 1998 Owen Taylor <otaylor@gtk.org> * gdk/gdk.c (gdk_event_translate): A guint * was being passed where X expected a Keysym *, and keysyms are long's on Alpha Linux. This was causing segfaults in Xlib, apparently because of alignment.
1998-05-05 21:22:35 +00:00
parent 7d6aff77e5
commit 5cb538d805
9 changed files with 69 additions and 20 deletions
--- a/7
+++ b/7
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue May  5 17:04:14 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* gdk/gdk.c (gdk_event_translate): A guint * was
+	being passed where X expected a Keysym *, and
+	keysyms are long's on Alpha Linux. This was causing
+	segfaults in Xlib, apparently because of alignment.
+
 Tue May  5 11:03:00 1998  Owen Taylor  <otaylor@gtk.org>

 	* gtk/gtkselection.c (gtk_selection_clear): Fixed
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -1685,7 +1685,8 @@ gdk_event_translate (GdkEvent *event,

  GdkWindow *window;
  GdkWindowPrivate *window_private;
-  XComposeStatus compose;
+  static XComposeStatus compose;
+  KeySym keysym;
  int charcount;
 #ifdef USE_XIM
  static gchar* buf = NULL;
@@ -1767,16 +1768,16 @@ gdk_event_translate (GdkEvent *event,
 	  buf_len = 128;
 	  buf = g_new (gchar, buf_len);
 	}
+      keysym = GDK_VoidSymbol;
+
      if (xim_using == TRUE && xim_ic)
 	{
 	  Status status;
 	  
 	  /* Clear keyval. Depending on status, may not be set */
-	  event->key.keyval = GDK_VoidSymbol;
 	  charcount = XmbLookupString(xim_ic->xic,
 				      &xevent->xkey, buf, buf_len-1,
-				      (KeySym*) &event->key.keyval,
-				      &status);
+				      &keysym, &status);
 	  if (status == XBufferOverflow)
 	    {                     /* retry */
 	      /* alloc adequate size of buffer */
@@ -1789,8 +1790,7 @@ gdk_event_translate (GdkEvent *event,
 	     
 	      charcount = XmbLookupString (xim_ic->xic,
 					   &xevent->xkey, buf, buf_len-1,
-					   (KeySym*) &event->key.keyval,
-					   &status);
+					   &keysym, &status);
 	    }
 	  if (status == XLookupNone)
 	    {
@@ -1800,13 +1800,13 @@ gdk_event_translate (GdkEvent *event,
 	}
      else
 	charcount = XLookupString (&xevent->xkey, buf, buf_len,
-				   (KeySym*) &event->key.keyval,
-				   &compose);
+				   &keysym, &compose);
 #else
      charcount = XLookupString (&xevent->xkey, buf, 16,
-				 (KeySym*) &event->key.keyval,
-				 &compose);
+				 &keysym, &compose);
 #endif
+      event->key.keyval = keysym;
+
      if (charcount > 0 && buf[charcount-1] == '\0')
 	charcount --;
      else
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -1685,7 +1685,8 @@ gdk_event_translate (GdkEvent *event,

  GdkWindow *window;
  GdkWindowPrivate *window_private;
-  XComposeStatus compose;
+  static XComposeStatus compose;
+  KeySym keysym;
  int charcount;
 #ifdef USE_XIM
  static gchar* buf = NULL;
@@ -1767,16 +1768,16 @@ gdk_event_translate (GdkEvent *event,
 	  buf_len = 128;
 	  buf = g_new (gchar, buf_len);
 	}
+      keysym = GDK_VoidSymbol;
+
      if (xim_using == TRUE && xim_ic)
 	{
 	  Status status;
 	  
 	  /* Clear keyval. Depending on status, may not be set */
-	  event->key.keyval = GDK_VoidSymbol;
 	  charcount = XmbLookupString(xim_ic->xic,
 				      &xevent->xkey, buf, buf_len-1,
-				      (KeySym*) &event->key.keyval,
-				      &status);
+				      &keysym, &status);
 	  if (status == XBufferOverflow)
 	    {                     /* retry */
 	      /* alloc adequate size of buffer */
@@ -1789,8 +1790,7 @@ gdk_event_translate (GdkEvent *event,
 	     
 	      charcount = XmbLookupString (xim_ic->xic,
 					   &xevent->xkey, buf, buf_len-1,
-					   (KeySym*) &event->key.keyval,
-					   &status);
+					   &keysym, &status);
 	    }
 	  if (status == XLookupNone)
 	    {
@@ -1800,13 +1800,13 @@ gdk_event_translate (GdkEvent *event,
 	}
      else
 	charcount = XLookupString (&xevent->xkey, buf, buf_len,
-				   (KeySym*) &event->key.keyval,
-				   &compose);
+				   &keysym, &compose);
 #else
      charcount = XLookupString (&xevent->xkey, buf, 16,
-				 (KeySym*) &event->key.keyval,
-				 &compose);
+				 &keysym, &compose);
 #endif
+      event->key.keyval = keysym;
+
      if (charcount > 0 && buf[charcount-1] == '\0')
 	charcount --;
      else