comparison src/xselect.c @ 20104:6128508b0c31

Include buffer.h. (selection_data_to_lisp_data): Do not perform code conversion if the default value of enable-multibyte-characters is nil. (lisp_data_to_selection_data): Likewise. Access the array `charsets' in the correct way.

20103:7867bb9ff46a

#include "lisp.h"
#include "xterm.h"	/* for all of the X includes */
#include "dispextern.h"	/* frame.h seems to want this */
#include "frame.h"	/* Need this to get the X window of selected_frame */
#include "blockinput.h"
#include "charset.h"
#include "coding.h"

#define CUT_BUFFER_SUPPORT

  else if (format == 8)
    {
      Lisp_Object str;
      int require_encoding = 0;

      /* If TYPE is `TEXT' or `COMPOUND_TEXT', we should decode DATA
	 to Emacs internal format because DATA may be encoded in
	 compound text format.  In addtion, if TYPE is `STRING' and
	 DATA contains any 8-bit Latin-1 code, we should also decode
	 it.  */
      if (type == dpyinfo->Xatom_TEXT || type == dpyinfo->Xatom_COMPOUND_TEXT)
	require_encoding = 1;
      else if (type == XA_STRING)
	{
	  int i;
	  for (i = 0; i < size; i++)
	    {
	      if (data[i] >= 0x80)
		{
		  require_encoding = 1;
		  break;
		}
	    }
	}
      if (!require_encoding)
	str = make_string ((char *) data, size);

      *format_ret = 8;
      *size_ret = XSTRING (obj)->size;
      *data_ret = XSTRING (obj)->data;
      bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
      num = ((*size_ret <= 1)	/* Check the possibility of short cut.  */
	     ? 0
	     : find_charset_in_str (*data_ret, *size_ret, charsets, Qnil));

      if (!num || (num == 1 && charsets[CHARSET_ASCII]))
	{

	  bufsize = encoding_buffer_size (&coding, *size_ret);
	  buf = (unsigned char *) xmalloc (bufsize);
	  *size_ret = encode_coding (&coding, *data_ret, buf,
				     *size_ret, bufsize, &dummy);
	  *data_ret = buf;
          if (charsets[get_charset_id(charset_latin_iso8859_1)]
	      && (num == 1 || (num == 2 && charsets[CHARSET_ASCII])))
	    {
	      /* Ok, we can return it as `STRING'.  */
	      if (NILP (type)) type = QSTRING;
	    }

20104:6128508b0c31

#include "lisp.h"
#include "xterm.h"	/* for all of the X includes */
#include "dispextern.h"	/* frame.h seems to want this */
#include "frame.h"	/* Need this to get the X window of selected_frame */
#include "blockinput.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"

#define CUT_BUFFER_SUPPORT

  else if (format == 8)
    {
      Lisp_Object str;
      int require_encoding = 0;

      if (! NILP (buffer_defaults.enable_multibyte_characters))
	{
	  /* If TYPE is `TEXT' or `COMPOUND_TEXT', we should decode
	     DATA to Emacs internal format because DATA may be encoded
	     in compound text format.  In addtion, if TYPE is `STRING'
	     and DATA contains any 8-bit Latin-1 code, we should also
	     decode it.  */
	  if (type == dpyinfo->Xatom_TEXT
	      || type == dpyinfo->Xatom_COMPOUND_TEXT)
	    require_encoding = 1;
	  else if (type == XA_STRING)
	    {
	      int i;
	      for (i = 0; i < size; i++)
		{
		  if (data[i] >= 0x80)
		    {
		      require_encoding = 1;
		      break;
		    }
		}
	    }
	}
      if (!require_encoding)
	str = make_string ((char *) data, size);

      *format_ret = 8;
      *size_ret = XSTRING (obj)->size;
      *data_ret = XSTRING (obj)->data;
      bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
      num = ((*size_ret <= 1	/* Check the possibility of short cut.  */
	      || NILP (buffer_defaults.enable_multibyte_characters))
	     ? 0
	     : find_charset_in_str (*data_ret, *size_ret, charsets, Qnil));

      if (!num || (num == 1 && charsets[CHARSET_ASCII]))
	{

	  bufsize = encoding_buffer_size (&coding, *size_ret);
	  buf = (unsigned char *) xmalloc (bufsize);
	  *size_ret = encode_coding (&coding, *data_ret, buf,
				     *size_ret, bufsize, &dummy);
	  *data_ret = buf;
          if (charsets[charset_latin_iso8859_1]
	      && (num == 1 || (num == 2 && charsets[CHARSET_ASCII])))
	    {
	      /* Ok, we can return it as `STRING'.  */
	      if (NILP (type)) type = QSTRING;
	    }