Mercurial > hg > xemacs-beta

changeset 960:5b372a329b97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-08-12 08:00:01 by michaels] 2002-08-02 Marcus Crestani <crestani@informatik.uni-tuebingen.de> Additions for USE_KKCC: * tooltalk.c: Add dumpable-flag to tooltalk_message and tooltalk_pattern. * ui-gtk.c: Add dumpable-flag to emacs_ffi and emacs_gtk_object. Add description for emacs_gtk_boxed. 2002-08-12 Mike Sperber <mike@xemacs.org> * event-Xt.c (x_to_emacs_keysym): (enqueue_focus_event): Properly initialize event type for USE_KKCC (due to suggestions from David Bush <David.Bush@intel.com>).
author michaels
date Mon, 12 Aug 2002 08:00:07 +0000
parents 87e011e66a78
children d46451e73f6d
files src/ChangeLog src/event-Xt.c src/tooltalk.c src/ui-gtk.c
diffstat 4 files changed, 53 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Aug 12 07:45:38 2002 +0000
+++ b/src/ChangeLog	Mon Aug 12 08:00:07 2002 +0000
@@ -1,3 +1,17 @@
+2002-08-02  Marcus Crestani  <crestani@informatik.uni-tuebingen.de>
+
+	Additions for USE_KKCC:
+	* tooltalk.c: Add dumpable-flag to tooltalk_message and
+	tooltalk_pattern.
+	* ui-gtk.c: Add dumpable-flag to emacs_ffi and emacs_gtk_object.
+	Add description for emacs_gtk_boxed.
+
+2002-08-12  Mike Sperber <mike@xemacs.org>
+
+	* event-Xt.c (x_to_emacs_keysym):
+	(enqueue_focus_event): Properly initialize event type for USE_KKCC
+	(due to suggestions from David Bush <David.Bush@intel.com>).
+
 2002-08-06  Jerry James  <james@xemacs.org>
 
  	* window.c (Fsplit_window): Count only half of the divider width
--- a/src/event-Xt.c	Mon Aug 12 07:45:38 2002 +0000
+++ b/src/event-Xt.c	Mon Aug 12 08:00:07 2002 +0000
@@ -1070,11 +1070,12 @@
             Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
 	    Lisp_Event *ev          = XEVENT (emacs_event);
             ev->channel	            = DEVICE_CONSOLE (d);
+            ev->timestamp	    = event->time;
             ev->event_type	    = key_press_event;
-            ev->timestamp	    = event->time;
 #ifdef USE_KKCC
-	    SET_KEY_DATA_MODIFIERS (XKEY_DATA (emacs_event), 0);
-	    SET_KEY_DATA_KEYSYM (XKEY_DATA (emacs_event), make_char (ch));
+	    XSET_EVENT_TYPE (emacs_event, key_press_event);
+	    XSET_KEY_DATA_MODIFIERS (XEVENT_DATA (emacs_event), 0);
+	    XSET_KEY_DATA_KEYSYM (XEVENT_DATA (emacs_event), make_char (ch));
 #else
             ev->event.key.modifiers = 0;
             ev->event.key.keysym    = make_char (ch);
@@ -1684,21 +1685,24 @@
 {
   Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
   Lisp_Event *ev          = XEVENT (emacs_event);
+  XEvent *x_event;
+
+  ev->event_type = magic_event;
+
 #ifdef USE_KKCC
-  XEvent *x_event = &XMAGIC_DATA_X_EVENT(EVENT_DATA(ev));
+  XSET_EVENT_TYPE (emacs_event, magic_event);
+  x_event = &XMAGIC_DATA_X_EVENT (EVENT_DATA (ev));
 #else /* not USE_KKCC */
-  XEvent *x_event = &ev->event.magic.underlying_x_event;
+  x_event = &ev->event.magic.underlying_x_event;
 #endif /* not USE_KKCC */
 
   x_event->type = in_p ? FocusIn : FocusOut;
   x_event->xfocus.window = XtWindow (wants_it);
 
 #ifdef USE_KKCC
-  SET_EVENT_CHANNEL(ev, frame);
-  /*  SET_EVENT_TYPE(ev, magic_event); */
+  SET_EVENT_CHANNEL (ev, frame);
 #else /* not USE_KKCC */
-  ev->channel	            = frame;
-  ev->event_type	    = magic_event;
+  ev->channel = frame;
 #endif /* not USE_KKCC */
 
   enqueue_Xt_dispatch_event (emacs_event);
--- a/src/tooltalk.c	Mon Aug 12 07:45:38 2002 +0000
+++ b/src/tooltalk.c	Mon Aug 12 08:00:07 2002 +0000
@@ -183,6 +183,7 @@
 
 #ifdef USE_KKCC
 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-message", tooltalk_message,
+			       0, /*dumpable-flag*/
                                mark_tooltalk_message, print_tooltalk_message,
                                0, 0, 0, 
 			       tooltalk_message_description,
@@ -269,6 +270,7 @@
 
 #ifdef USE_KKCC
 DEFINE_LRECORD_IMPLEMENTATION ("tooltalk-pattern", tooltalk_pattern,
+			       0, /*dumpable-flag*/
                                mark_tooltalk_pattern, print_tooltalk_pattern,
                                0, 0, 0, 
 			       tooltalk_pattern_description,
--- a/src/ui-gtk.c	Mon Aug 12 07:45:38 2002 +0000
+++ b/src/ui-gtk.c	Mon Aug 12 08:00:07 2002 +0000
@@ -328,6 +328,7 @@
 
 #ifdef USE_KKCC
 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi,
+			       0, /*dumpable-flag*/
 			       mark_ffi_data, ffi_object_printer,
 			       0, 0, 0, 
 			       ffi_data_description, emacs_ffi_data);
@@ -934,6 +935,7 @@
 
 #ifdef USE_KKCC
 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkObject", emacs_gtk_object,
+					  0, /*dumpable-flag*/
 					  mark_gtk_object_data, /* marker function */
 					  emacs_gtk_object_printer, /* print function */
 					  emacs_gtk_object_finalizer, /* finalizer */
@@ -1109,6 +1111,12 @@
 
 
 /* GTK_TYPE_BOXED wrapper for Emacs lisp */
+#ifdef USE_KKCC
+static const struct lrecord_description emacs_gtk_boxed_description [] = {
+  { XD_END }
+};
+#endif /* USE_KKCC */
+
 static void
 emacs_gtk_boxed_printer (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
 {
@@ -1137,6 +1145,21 @@
   return (HASH2 ((unsigned long)data->object, data->object_type));
 }
 
+#ifdef USE_KKCC
+DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkBoxed", emacs_gtk_boxed,
+					  0, /*dumpable-flag*/
+					  0, /* marker function */
+					  emacs_gtk_boxed_printer, /* print function */
+					  0, /* nuker */
+					  emacs_gtk_boxed_equality, /* equality */
+					  emacs_gtk_boxed_hash, /* hash */
+					  emacs_gtk_boxed_description, /* desc */
+					  0, /* get prop */
+					  0, /* put prop */
+					  0, /* rem prop */
+					  0, /* plist */
+					  emacs_gtk_boxed_data);
+#else /* not USE_KKCC */
 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkBoxed", emacs_gtk_boxed,
 					  0, /* marker function */
 					  emacs_gtk_boxed_printer, /* print function */
@@ -1149,7 +1172,7 @@
 					  0, /* rem prop */
 					  0, /* plist */
 					  emacs_gtk_boxed_data);
-
+#endif /* not USE_KKCC */
 /* Currently defined GTK_TYPE_BOXED structures are:
 
    GtkAccelGroup -