xemacs-beta: src/event-stream.c comparison

comparison src/event-stream.c @ 5923:61d7d7bcbe76 cygwin

merged heads after pull -u

author	Henry Thompson <ht@markup.co.uk>
date	Thu, 05 Feb 2015 17:19:05 +0000
parents	b3824b7f5627
children	6ec4964c1687

comparison

equal deleted inserted replaced

-:68639fb08af8
+:61d7d7bcbe76
 #include "buffer.h"
 #include "commands.h"
 #include "device-impl.h"
 #include "elhash.h"
 #include "events.h"
+#include "extents.h"
 #include "frame-impl.h"
 #include "insdel.h"		/* for buffer_reset_changes */
 #include "keymap.h"
 #include "lstream.h"
 #include "macros.h"		/* for defining_keyboard_macro */
 { XD_LISP_OBJECT, offsetof (struct command_builder, current_events) },
 { XD_LISP_OBJECT, offsetof (struct command_builder, most_current_event) },
 { XD_LISP_OBJECT, offsetof (struct command_builder, last_non_munged_event) },
 { XD_LISP_OBJECT, offsetof (struct command_builder, console) },
 { XD_LISP_OBJECT_ARRAY, offsetof (struct command_builder, first_mungeable_event), 2 },
+{ XD_LISP_OBJECT, offsetof (struct command_builder, echo_buf) },
 { XD_END }
 };
 static Lisp_Object
 mark_command_builder (Lisp_Object obj)
 mark_object (builder->current_events);
 mark_object (builder->most_current_event);
 mark_object (builder->last_non_munged_event);
 mark_object (builder->first_mungeable_event[0]);
 mark_object (builder->first_mungeable_event[1]);
+mark_object (builder->echo_buf);
 return builder->console;
-}
-static void
-finalize_command_builder (Lisp_Object obj)
-{
-struct command_builder *b = XCOMMAND_BUILDER (obj);
-if (b->echo_buf)
-{
-xfree (b->echo_buf);
-b->echo_buf = 0;
-}
 }
 DEFINE_NODUMP_LISP_OBJECT ("command-builder", command_builder,
 			   mark_command_builder,
-			   internal_object_printer,
+			   internal_object_printer, 0, 0, 0,
-			   finalize_command_builder, 0, 0,
 			   command_builder_description,
 			   struct command_builder);
 static void
 reset_command_builder_event_chain (struct command_builder *builder)
 builder->console = console;
 reset_command_builder_event_chain (builder);
 if (with_echo_buf)
 {
-/* #### This badly needs to be turned into a Dynarr */
+builder->echo_buf = Fmake_string (make_fixnum (300 * MAX_ICHAR_LEN),
-builder->echo_buf_length = 300; /* #### Kludge */
+make_char (0));
-builder->echo_buf = xnew_array (Ibyte, builder->echo_buf_length);
-builder->echo_buf[0] = 0;
 }
 else
 {
-builder->echo_buf_length = 0;
+builder->echo_buf = Qnil;
-builder->echo_buf = NULL;
+}
-}
+builder->echo_buf_fill_pointer = builder->echo_buf_end = -1;
-builder->echo_buf_index = -1;
 builder->self_insert_countdown = 0;
 return builder_obj;
 }
 return wrap_command_builder (new_buildings);
 }
 static void
-free_command_builder (struct command_builder *builder)
-{
-if (builder->echo_buf)
-{
-xfree (builder->echo_buf);
-builder->echo_buf = NULL;
-}
-free_normal_lisp_object (wrap_command_builder (builder));
-}
-static void
 command_builder_append_event (struct command_builder *builder,
 			      Lisp_Object event)
 {
 assert (EVENTP (event));
 echo_key_event (struct command_builder *command_builder,
 		Lisp_Object event)
 {
 /* This function can GC */
 DECLARE_EISTRING_MALLOC (buf);
-Bytecount buf_index = command_builder->echo_buf_index;
+Bytecount buf_fill_pointer = command_builder->echo_buf_fill_pointer;
-Ibyte *e;
 Bytecount len;
-if (buf_index < 0)
+if (buf_fill_pointer < 0)
 {
-buf_index = 0;              /* We're echoing now */
+buf_fill_pointer = 0;
 clear_echo_area (selected_frame (), Qnil, 0);
 }
 format_event_object (buf, event, 1);
 len = eilen (buf);
-if (len + buf_index + 4 > command_builder->echo_buf_length)
+if (NILP (command_builder->echo_buf) ||
+(len + buf_fill_pointer + 4 > XSTRING_LENGTH (command_builder->echo_buf)))
 {
 eifree (buf);
 return;
 }
-e = command_builder->echo_buf + buf_index;
-memcpy (e, eidata (buf), len);
+eicat_ascii (buf, " - ");
-e += len;
+memcpy (XSTRING_DATA (command_builder->echo_buf) + buf_fill_pointer,
+eidata (buf), eilen (buf));
+init_string_ascii_begin (command_builder->echo_buf);
+bump_string_modiff (command_builder->echo_buf);
+sledgehammer_check_ascii_begin (command_builder->echo_buf);
+command_builder->echo_buf_end = buf_fill_pointer + eilen (buf);
+/* *Not* including the trailing " - ". */
+command_builder->echo_buf_fill_pointer = buf_fill_pointer + len + 1;
 eifree (buf);
-e[0] = ' ';
-e[1] = '-';
-e[2] = ' ';
-e[3] = 0;
-command_builder->echo_buf_index = buf_index + len + 1;
 }
 static void
 regenerate_echo_keys_from_this_command_keys (struct command_builder *
 					     builder)
 {
 Lisp_Object event;
-builder->echo_buf_index = 0;
+builder->echo_buf_fill_pointer = builder->echo_buf_end = 0;
+if (STRINGP (builder->echo_buf))
+{
+detach_all_extents (builder->echo_buf);
+}
 EVENT_CHAIN_LOOP (event, Vthis_command_keys)
 echo_key_event (builder, event);
 }
 	  if (NILP (Fsit_for (Vecho_keystrokes, Qnil)))
 	    /* input came in, so don't echo. */
 	    goto done;
 	}
-echo_area_message (f, command_builder->echo_buf, Qnil, 0,
+echo_area_message (f, NULL, command_builder->echo_buf, 0,
-			 /* not echo_buf_index.  That doesn't include
+command_builder->echo_buf_end, Qcommand);
-			    the terminating " - ". */
-			 strlen ((char *) command_builder->echo_buf),
-			 Qcommand);
 }
 done:
 Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */
 unbind_to (depth);
 {
 /* This function can GC */
 struct frame *f = selected_frame ();
 if (command_builder)
-command_builder->echo_buf_index = -1;
+{
+command_builder->echo_buf_fill_pointer =
+command_builder->echo_buf_end = -1;
+}
 if (remove_echo_area_echo)
 clear_echo_area (f, Qcommand, 0);
 }
 Lisp_Object event)
 {
 /* This function can GC */
 Lisp_Object help = Qnil;
 int speccount = specpdl_depth ();
-Bytecount buf_index = command_builder->echo_buf_index;
+Bytecount buf_fill_pointer = command_builder->echo_buf_fill_pointer;
-Lisp_Object echo = ((buf_index <= 0)
+Bytecount buf_end = command_builder->echo_buf_end;
-? Qnil
+Lisp_Object echo = ((buf_fill_pointer <= 0) ? Qnil
-: make_string (command_builder->echo_buf,
+: Fcopy_sequence (command_builder->echo_buf));
-				     buf_index));
 struct gcpro gcpro1, gcpro2;
 GCPRO2 (echo, help);
 record_unwind_protect (Feval,
 list2 (Qset_window_configuration,
 /* Discard next key if it is a space */
 reset_key_echo (command_builder, 1);
 Fnext_command_event (event, Qnil);
 }
-command_builder->echo_buf_index = buf_index;
+command_builder->echo_buf_fill_pointer = buf_fill_pointer;
-if (buf_index > 0)
+command_builder->echo_buf_end = buf_end;
-memcpy (command_builder->echo_buf,
-XSTRING_DATA (echo), buf_index + 1); /* terminating 0 */
+if (buf_fill_pointer > 0)
+{
+command_builder->echo_buf = echo;
+}
 UNGCPRO;
 }
 /**********************************************************************/
 CHECK_LIVE_EVENT (event);
 if (!NILP (prompt))
 {
 Bytecount len;
+Lisp_Object args[] = { Qnil, prompt };
 CHECK_STRING (prompt);
 len = XSTRING_LENGTH (prompt);
-if (command_builder->echo_buf_length < len)
-	len = command_builder->echo_buf_length - 1;
+detach_all_extents (command_builder->echo_buf);
-memcpy (command_builder->echo_buf, XSTRING_DATA (prompt), len);
+if (XSTRING_LENGTH (command_builder->echo_buf) < len)
-command_builder->echo_buf[len] = 0;
+{
-command_builder->echo_buf_index = len;
+command_builder->echo_buf
-echo_area_message (XFRAME (CONSOLE_SELECTED_FRAME (con)),
+= Fmake_string (make_fixnum (len + 300 * MAX_ICHAR_LEN),
-			 command_builder->echo_buf,
+make_char (0));
-			 Qnil, 0,
+}
-			 command_builder->echo_buf_index,
-			 Qcommand);
+args[0] = command_builder->echo_buf;
+Freplace (countof (args), args);
+copy_string_extents (command_builder->echo_buf, prompt, 0, 0,
+XSTRING_LENGTH (prompt));
+command_builder->echo_buf_fill_pointer
+= command_builder->echo_buf_end = len;
+echo_area_message (XFRAME (CONSOLE_SELECTED_FRAME (con)), NULL,
+			 command_builder->echo_buf, 0,
+command_builder->echo_buf_end, Qcommand);
 }
 start_over_and_avoid_hosage:
 /* If there is something in unread-command-events, simply return it.
 struct gcpro gcpro1;
 GCPRO1 (event);
 maybe_echo_keys (XCOMMAND_BUILDER
 		   (XCONSOLE (Vselected_console)->
-		    command_builder), 0); /* #### This sucks bigtime */
+		    command_builder),
+/* Only snooze displaying keystrokes if we don't have a
+prompt. (If we have a prompt, our callers want us to
+show it!) */
+!NILP (prompt));
 for (;;)
 {
 event = Fnext_event (event, prompt);
 if (command_event_p (event))
 if (!NILP (result))
 	    {
 	      copy_command_builder (neub, builder);
 	      *did_munge = 1;
 	    }
-	  free_command_builder (neub);
+free_normal_lisp_object (wrap_command_builder (neub));
 	  UNGCPRO;
 	  if (!NILP (result))
 return result;
 }
 }
 				    make_char(tolower(this_alternative)));
 	      result = command_builder_find_leaf_no_jit_binding
 		(newb, allow_misc_user_events_p, did_munge);
 	    }
-	  free_command_builder (newb);
+free_normal_lisp_object (wrap_command_builder (newb));
 	  UNGCPRO;
 	  if (!NILP (result))
 	    return result;
 	}
 	  {
 	    Lisp_Object prompt = Fkeymap_prompt (leaf, Qt);
 	    if (STRINGP (prompt))
 	      {
 		/* Append keymap prompt to key echo buffer */
-		int buf_index = command_builder->echo_buf_index;
+		int buf_fill_pointer = command_builder->echo_buf_fill_pointer;
 		Bytecount len = XSTRING_LENGTH (prompt);
-		if (len + buf_index + 1 <= command_builder->echo_buf_length)
+		if (len + buf_fill_pointer + 1
+<= XSTRING_LENGTH (command_builder->echo_buf))
 		  {
-		    Ibyte *echo = command_builder->echo_buf + buf_index;
+memcpy (XSTRING_DATA (command_builder->echo_buf)
-		    memcpy (echo, XSTRING_DATA (prompt), len);
++ buf_fill_pointer,
-		    echo[len] = 0;
+XSTRING_DATA (prompt),
+len);
+copy_string_extents (command_builder->echo_buf, prompt,
+buf_fill_pointer, 0, len);
+init_string_ascii_begin (command_builder->echo_buf);
+bump_string_modiff (command_builder->echo_buf);
+sledgehammer_check_ascii_begin (command_builder->echo_buf);
+/* Show the keymap prompt, but don't adjust the fill
+pointer to reflect it. */
+command_builder->echo_buf_end
+= command_builder->echo_buf_fill_pointer + len;
 		  }
 		maybe_echo_keys (command_builder, 1);
 	      }
 	    else
 	      maybe_echo_keys (command_builder, 0);
 #endif
 }
 else if (!NILP (leaf))
 {
 	if (EQ (Qcommand, echo_area_status (f))
-	    && command_builder->echo_buf_index > 0)
+	    && command_builder->echo_buf_fill_pointer > 0)
 	  {
 	    /* If we had been echoing keys, echo the last one (without
 	       the trailing dash) and redisplay before executing the
 	       command. */
-	    command_builder->echo_buf[command_builder->echo_buf_index] = 0;
+command_builder->echo_buf_end =
+command_builder->echo_buf_fill_pointer;
 	    maybe_echo_keys (command_builder, 1);
 	    Fsit_for (Qzero, Qt);
 	  }
 }
 RETURN_UNGCPRO (leaf);
 	}
 else if (string_char_length (XSYMBOL (keysym)->name) == 1)
 	/* one-char key events are printed with just the key name */
 	Fprinc (keysym, Vdribble_file);
 else if (EQ (keysym, Qreturn))
-	Lstream_putc (XLSTREAM (Vdribble_file), '\n');
+	(void) Lstream_putc (XLSTREAM (Vdribble_file), '\n');
 else if (EQ (keysym, Qspace))
-	Lstream_putc (XLSTREAM (Vdribble_file), ' ');
+	(void) Lstream_putc (XLSTREAM (Vdribble_file), ' ');
 else
 	Fprinc (event, Vdribble_file);
 }
 else
 Fprinc (event, Vdribble_file);
 fd = qxe_open (XSTRING_DATA (filename),
 		     O_WRONLY | O_TRUNC | O_CREAT | OPEN_BINARY,
 		     CREAT_MODE);
 if (fd < 0)
 	report_file_error ("Unable to create dribble file", filename);
-Vdribble_file = make_filedesc_output_stream (fd, 0, 0, LSTR_CLOSING);
+Vdribble_file = make_filedesc_output_stream (fd, 0, 0, LSTR_CLOSING,
+						   NULL);
 #ifdef MULE
 Vdribble_file =
 	make_coding_output_stream
 	  (XLSTREAM (Vdribble_file),
 	   Qescape_quoted, CODING_ENCODE, 0);

Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 5923:61d7d7bcbe76 cygwin