Mercurial > hg > xemacs-beta

comparison src/redisplay-tty.c @ 16:0293115a14e9 r19-15b91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 4b173ad71786
children 56c54cf7c5b6
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
331 case IMAGE_TEXT: 331 case IMAGE_TEXT:
332 { 332 {
333 Bufbyte *temptemp; 333 Bufbyte *temptemp;
334 Lisp_Object string = 334 Lisp_Object string =
335 XIMAGE_INSTANCE_TEXT_STRING (instance); 335 XIMAGE_INSTANCE_TEXT_STRING (instance);
336 Bytecount len = string_length (XSTRING (string)); 336 Bytecount len = XSTRING_LENGTH (string);
337 337
338 /* In the unlikely instance that a garbage-collect 338 /* In the unlikely instance that a garbage-collect
339 occurs during encoding, we at least need to 339 occurs during encoding, we at least need to
340 copy the string. 340 copy the string.
341 */ 341 */
342 temptemp = (Bufbyte *) alloca (len); 342 temptemp = (Bufbyte *) alloca (len);
343 memcpy (temptemp, string_data (XSTRING (string)), len); 343 memcpy (temptemp, XSTRING_DATA (string), len);
344 { 344 {
345 int i; 345 int i;
346 346
347 /* Now truncate the first rb->object.dglyph.xoffset 347 /* Now truncate the first rb->object.dglyph.xoffset
348 columns. */ 348 columns. */
611 611
612 static void 612 static void
613 substitute_in_dynamic_color_string (Lisp_Object spec, Lisp_Object string) 613 substitute_in_dynamic_color_string (Lisp_Object spec, Lisp_Object string)
614 { 614 {
615 int i; 615 int i;
616 Bufbyte *specdata = string_data (XSTRING (spec)); 616 Bufbyte *specdata = XSTRING_DATA (spec);
617 Bytecount speclen = string_length (XSTRING (spec)); 617 Bytecount speclen = XSTRING_LENGTH (spec);
618 618
619 if (!sidcs_dynarr) 619 if (!sidcs_dynarr)
620 sidcs_dynarr = Dynarr_new (Bufbyte); 620 sidcs_dynarr = Dynarr_new (Bufbyte);
621 else 621 else
622 Dynarr_reset (sidcs_dynarr); 622 Dynarr_reset (sidcs_dynarr);
628 Dynarr_add (sidcs_dynarr, '%'); 628 Dynarr_add (sidcs_dynarr, '%');
629 i++; 629 i++;
630 } 630 }
631 else if (specdata[i] == '%' && specdata[i+1] == 's') 631 else if (specdata[i] == '%' && specdata[i+1] == 's')
632 { 632 {
633 Dynarr_add_many (sidcs_dynarr, string_data (XSTRING (string)), 633 Dynarr_add_many (sidcs_dynarr,
634 string_length (XSTRING (string))); 634 XSTRING_DATA (string),
635 XSTRING_LENGTH (string));
635 i++; 636 i++;
636 } 637 }
637 else 638 else
638 Dynarr_add (sidcs_dynarr, specdata[i]); 639 Dynarr_add (sidcs_dynarr, specdata[i]);
639 } 640 }
650 651
651 result = assq_no_quit (sym, Vtty_color_alist); 652 result = assq_no_quit (sym, Vtty_color_alist);
652 if (!NILP (result)) 653 if (!NILP (result))
653 { 654 {
654 Lisp_Object esc_seq = XCAR (XCDR (result)); 655 Lisp_Object esc_seq = XCAR (XCDR (result));
655 escseq = string_data (XSTRING (esc_seq)); 656 escseq = XSTRING_DATA (esc_seq);
656 escseqlen = string_length (XSTRING (esc_seq)); 657 escseqlen = XSTRING_LENGTH (esc_seq);
657 } 658 }
658 #if 0 659 #if 0
659 else if (STRINGP (Vtty_dynamic_color_fg)) 660 else if (STRINGP (Vtty_dynamic_color_fg))
660 { 661 {
661 substitute_in_dynamic_color_string (Vtty_dynamic_color_fg, 662 substitute_in_dynamic_color_string (Vtty_dynamic_color_fg,
680 681
681 result = assq_no_quit (sym, Vtty_color_alist); 682 result = assq_no_quit (sym, Vtty_color_alist);
682 if (!NILP (result)) 683 if (!NILP (result))
683 { 684 {
684 Lisp_Object esc_seq = XCDR (XCDR (result)); 685 Lisp_Object esc_seq = XCDR (XCDR (result));
685 escseq = string_data (XSTRING (esc_seq)); 686 escseq = XSTRING_DATA (esc_seq);
686 escseqlen = string_length (XSTRING (esc_seq)); 687 escseqlen = XSTRING_LENGTH (esc_seq);
687 } 688 }
688 #if 0 689 #if 0
689 else if (STRINGP (Vtty_dynamic_color_bg)) 690 else if (STRINGP (Vtty_dynamic_color_bg))
690 { 691 {
691 substitute_in_dynamic_color_string (Vtty_dynamic_color_bg, 692 substitute_in_dynamic_color_string (Vtty_dynamic_color_bg,
1065 static void 1066 static void
1066 tty_ring_bell (struct device *d, int volume, int pitch, int duration) 1067 tty_ring_bell (struct device *d, int volume, int pitch, int duration)
1067 { 1068 {
1068 struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); 1069 struct console *c = XCONSOLE (DEVICE_CONSOLE (d));
1069 1070
1070 OUTPUT1 (c, TTY_SD (c).audio_bell); 1071 if (volume)
1071 Lstream_flush (XLSTREAM (CONSOLE_TTY_DATA (c)->outstream)); 1072 {
1073 OUTPUT1 (c, TTY_SD (c).audio_bell);
1074 Lstream_flush (XLSTREAM (CONSOLE_TTY_DATA (c)->outstream));
1075 }
1072 } 1076 }
1073 1077
1074 1078
1075 int 1079 int
1076 init_tty_for_redisplay (struct device *d, char *terminal_type) 1080 init_tty_for_redisplay (struct device *d, char *terminal_type)