comparison src/redisplay-tty.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 8efd647ea9ca
children 558f606b08ae
comparison
equal deleted inserted replaced
271:c7b7086b0a39 272:c5d627a313b1
99 static void term_get_fkeys (Lisp_Object keymap, char **address); 99 static void term_get_fkeys (Lisp_Object keymap, char **address);
100 100
101 /***************************************************************************** 101 /*****************************************************************************
102 tty_text_width 102 tty_text_width
103 103
104 tty's don't have fonts (that we use at least), so everything is 104 Non-Mule tty's don't have fonts (that we use at least), so everything
105 considered to be fixed width. In other words, we just return len. 105 is considered to be fixed width -- in other words, we return LEN.
106 Under Mule, however, a character can still cover more than one
107 column, so we use emchar_string_displayed_columns().
106 ****************************************************************************/ 108 ****************************************************************************/
107 static int 109 static int
108 tty_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str, 110 tty_text_width (struct frame *f, struct face_cachel *cachel, CONST Emchar *str,
109 Charcount len) 111 Charcount len)
110 { 112 {
807 /***************************************************************************** 809 /*****************************************************************************
808 tty_turn_off_face 810 tty_turn_off_face
809 811
810 Turn off all set properties of the given face (revert to default 812 Turn off all set properties of the given face (revert to default
811 face). We assume that tty_turn_on_face has been called for the given 813 face). We assume that tty_turn_on_face has been called for the given
812 face so that it's properties are actually active. 814 face so that its properties are actually active.
813 ****************************************************************************/ 815 ****************************************************************************/
814 static void 816 static void
815 tty_turn_off_face (struct window *w, face_index findex) 817 tty_turn_off_face (struct window *w, face_index findex)
816 { 818 {
817 struct frame *f = XFRAME (w->frame); 819 struct frame *f = XFRAME (w->frame);
853 Turn on all set properties of the given face. 855 Turn on all set properties of the given face.
854 ****************************************************************************/ 856 ****************************************************************************/
855 static void 857 static void
856 tty_turn_on_frame_face (struct frame *f, Lisp_Object face) 858 tty_turn_on_frame_face (struct frame *f, Lisp_Object face)
857 { 859 {
858 Lisp_Object frame = Qnil; 860 Lisp_Object frame;
859 struct console *c = XCONSOLE (FRAME_CONSOLE (f)); 861 struct console *c = XCONSOLE (FRAME_CONSOLE (f));
860 862
861 XSETFRAME (frame, f); 863 XSETFRAME (frame, f);
862 tty_turn_on_face_1 (c, 864 tty_turn_on_face_1 (c,
863 FACE_HIGHLIGHT_P (face, frame), 865 FACE_HIGHLIGHT_P (face, frame),
872 /***************************************************************************** 874 /*****************************************************************************
873 tty_turn_off_frame_face 875 tty_turn_off_frame_face
874 876
875 Turn off all set properties of the given face (revert to default 877 Turn off all set properties of the given face (revert to default
876 face). We assume that tty_turn_on_face has been called for the given 878 face). We assume that tty_turn_on_face has been called for the given
877 face so that it's properties are actually active. 879 face so that its properties are actually active.
878 ****************************************************************************/ 880 ****************************************************************************/
879 static void 881 static void
880 tty_turn_off_frame_face (struct frame *f, Lisp_Object face) 882 tty_turn_off_frame_face (struct frame *f, Lisp_Object face)
881 { 883 {
882 Lisp_Object frame = Qnil; 884 Lisp_Object frame;
883 struct console *c = XCONSOLE (FRAME_CONSOLE (f)); 885 struct console *c = XCONSOLE (FRAME_CONSOLE (f));
884 886
885 XSETFRAME (frame, f); 887 XSETFRAME (frame, f);
886 888
887 if (FACE_REVERSE_P (face, frame)) 889 if (FACE_REVERSE_P (face, frame))
1282 underline_mode_on = 0; 1284 underline_mode_on = 0;
1283 alternate_mode_on = 0; 1285 alternate_mode_on = 0;
1284 attributes_on = 0; 1286 attributes_on = 0;
1285 1287
1286 /* 1288 /*
1287 * Attempt to initialise the function_key_map to 1289 * Attempt to initialize the function_key_map to
1288 * some kind of sensible value 1290 * some kind of sensible value
1289 */ 1291 */
1290 1292
1291 term_get_fkeys (c->function_key_map, &bufptr); 1293 term_get_fkeys (c->function_key_map, &bufptr);
1292 1294