Changeset 3542

Timestamp:

2004年11月12日 21時47分05秒 (4 years ago)

Author:

miyoshi

Message:

* mw32term.c (mw32_scroll_bar_handle_click): Initialize
`input_event'. Thanks to KOBAYASHI Yasuhiro
<kobayays@otsukakj.co.jp>.
(mw32_drop_file_handler): Ditto.
(mw32_menu_bar_store_activate_event): Ditto.
(mw32_process_tool_bar_click): Ditto.
(mw32_message_loop): Ditto.

* keyboard.c (gen_help_event): Ditto.
(kbd_buffer_store_help_event): Ditto.
(record_asynch_buffer_change): Ditto.
(read_avail_input): Ditto.

* termhooks.h (EVENT_INIT): New macro from Emacs CVS HEAD.

Files:

• branches/2.1/src/ChangeLog.Meadow (modified) (1 diff)
• branches/2.1/src/keyboard.c (modified) (6 diffs)
• branches/2.1/src/mw32term.c (modified) (10 diffs)
• branches/2.1/src/termhooks.h (modified) (1 diff)

branches/2.1/src/ChangeLog.Meadow

@@ +1 @@
+2004-11-12  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.c (mw32_scroll_bar_handle_click): Initialize
+        `input_event'.  Thanks to KOBAYASHI Yasuhiro
+        <kobayays@otsukakj.co.jp>.
+        (mw32_drop_file_handler): Ditto.
+        (mw32_menu_bar_store_activate_event): Ditto.
+        (mw32_process_tool_bar_click): Ditto.
+        (mw32_message_loop): Ditto.
+
+        * keyboard.c (gen_help_event): Ditto.
+        (kbd_buffer_store_help_event): Ditto.
+        (record_asynch_buffer_change): Ditto.
+        (read_avail_input): Ditto.
+
+        * termhooks.h (EVENT_INIT): New macro from Emacs CVS HEAD.
+
-2004-11-08  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

branches/2.1/src/keyboard.c

@@ -3418 +3418 @@
-  if (size >= 2)
-    {
+      EVENT_INIT (bufp);
-      bufp->kind = HELP_EVENT;
-      bufp->frame_or_window = frame;
@@ -3425 +3426 @@
-
-      ++bufp;
+      EVENT_INIT (bufp);
-      bufp->kind = HELP_EVENT;
-      bufp->frame_or_window = WINDOWP (window) ? window : frame;
@@ -3444 +3446 @@
-  struct input_event event;
-
+  EVENT_INIT (event);
-  event.kind = HELP_EVENT;
-  event.frame_or_window = frame;
@@ -3450 +3453 @@
-  event.code = 0;
-  kbd_buffer_store_event (&event);
-
+
-  event.kind = HELP_EVENT;
-  event.frame_or_window = frame;
@@ -6314 +6317 @@
-  struct input_event event;
-  Lisp_Object tem;
+  EVENT_INIT (event);
-
-  event.kind = buffer_switch_event;
@@ -6470 +6474 @@
-      for (i = 0; i < nread; i++)
-        {
+          EVENT_INIT (buf[i]);
-          buf[i].kind = ascii_keystroke;
-          buf[i].modifiers = 0;

branches/2.1/src/mw32term.c

@@ -7864 +7864 @@
-    abort ();
-
+  EVENT_INIT (*emacs_event);
-  MW32_INIT_EMACS_EVENT (*emacs_event);
-  emacs_event->kind = w32_scroll_bar_click;
@@ -8218 +8219 @@
-  DragQueryPoint (hDrop, &pt);
-  /* DragQueryPoint returns position based on window coordination */
+  EVENT_INIT (*emacs_event);
-  MW32_INIT_EMACS_EVENT (*emacs_event);
-  emacs_event->kind = drag_n_drop;
@@ -8284 +8286 @@
-  HANDLE ev = f->output_data.mw32->mainthread_to_frame_handle;
-
+  EVENT_INIT (emacs_event);
-  MW32_INIT_EMACS_EVENT (emacs_event);
-  emacs_event.kind = menu_bar_activate_event;
@@ -8367 +8370 @@
-      XSETFRAME (frame, f);
-
+      EVENT_INIT (buf);
-      MW32_INIT_EMACS_EVENT (buf);
-      buf.kind = TOOL_BAR_EVENT;
@@ -8664 +8668 @@
-              keyflag = mw32_emacs_translate_message (dpyinfo, 1, msg.wParam, 
-                                                      &keycode, &keymod);
+              EVENT_INIT (*bufp);
-              MW32_INIT_EMACS_EVENT (*bufp);
-              while (1)
@@ -8721 +8726 @@
-          if (f && !f->iconified && f->visible && numchars > 0)
-            {
+              EVENT_INIT (*bufp);
-              MW32_INIT_EMACS_EVENT (*bufp);
-              bufp->kind = non_ascii_keystroke;
@@ -8748 +8754 @@
-                while (1)
-                  {
+                    EVENT_INIT (buf);  
-                    MW32_INIT_EMACS_EVENT (buf);
-                    XSETFRAME (buf.frame_or_window, f);
@@ -8933 +8940 @@
-                if (numchars >= 1)
-                  {
+                    EVENT_INIT (*bufp);
-                    MW32_INIT_EMACS_EVENT (*bufp);
-                    bufp->kind = mouse_click;
@@ -9047 +9055 @@
-          if (numchars <= 0)
-            abort ();
-
+
+
-          MW32_INIT_EMACS_EVENT (*bufp);
-          bufp->kind = delete_window_event;
@@ -9072 +9081 @@
-          if (f && numchars > 0)
-            {
+              EVENT_INIT (*bufp);
-              MW32_INIT_EMACS_EVENT (*bufp);
-              bufp->kind = meadow_private_event;

branches/2.1/src/termhooks.h

@@ -386 +386 @@
-};
-
+#define EVENT_INIT(event) bzero (&(event), sizeof (struct input_event))
+
-/* Called to read input events.  */
-extern int (*read_socket_hook) P_ ((int, struct input_event *, int, int));