[prev in list] [next in list] [prev in thread] [next in thread] 

List:       elinks-cvs
Subject:    [ELinks] elinks - zas: update_screen_driver(): test for utf8_io on...
From:       cvs () pasky ! or ! cz
Date:       2004-04-30 9:26:27
Message-ID: 20040430092627.17897.qmail () machine ! sinus ! cz
[Download RAW message or body]

This is an automated notification of a change to the ELinks CVS tree.

Author: zas
Module: elinks
   Tag: <TRUNK>
  Date: Fri Apr 30 09:26:27 2004 GMT

---- Log message:

update_screen_driver(): test for utf8_io only once.


---- Files affected:

elinks/src/terminal:
   screen.c (1.133 -> 1.134) 
    http://cvsweb.elinks.or.cz/cvsweb.cgi/elinks/src/terminal/screen.c.diff?r1=1.133&r2=1.134&f=u


---- Diffs:

 elinks/src/terminal/screen.c |   52 +++++++++++++++--------------------
 1 files changed, 23 insertions(+), 29 deletions(-)


Index: elinks/src/terminal/screen.c
diff -u elinks/src/terminal/screen.c:1.133 elinks/src/terminal/screen.c:1.134
--- elinks/src/terminal/screen.c:1.133	Fri Apr 30 11:05:36 2004
+++ elinks/src/terminal/screen.c	Fri Apr 30 11:26:22 2004
@@ -205,47 +205,41 @@
 
 	if (utf8_io) {
 		driver->charsets[0] = get_opt_int_tree(term_spec, "charset");
-	} else {
-		driver->charsets[0] = -1;
-	}
+		if (driver->type == TERM_LINUX) {
+			if (get_opt_bool_tree(term_spec, "restrict_852"))
+				driver->frame = frame_restrict;
 
-	if (driver->type == TERM_LINUX) {
-		if (get_opt_bool_tree(term_spec, "restrict_852")) {
-			driver->frame = frame_restrict;
-		}
-
-		if (utf8_io) {
 			driver->charsets[1] = get_cp_index("cp437");
 
-		} else if (get_opt_bool_tree(term_spec, "m11_hack")) {
-			driver->frame_seqs = m11_hack_frame_seqs;
-		}
-
-	} else if (driver->type == TERM_FREEBSD) {
-		if (utf8_io) {
+		} else if (driver->type == TERM_FREEBSD) {
 			driver->charsets[1] = get_cp_index("cp437");
 
-		} else if (get_opt_bool_tree(term_spec, "m11_hack")) {
-			driver->frame_seqs = m11_hack_frame_seqs;
-		}
-
-
-	} else if (driver->type == TERM_VT100) {
-		if (utf8_io) {
+		} else if (driver->type == TERM_VT100) {
 			driver->frame = frame_vt100_u;
 			driver->charsets[1] = get_cp_index("cp437");
-		} else {
-			driver->frame = frame_vt100;
-		}
 
-	} else if (driver->type == TERM_KOI8) {
-		if (utf8_io) {
+		} else if (driver->type == TERM_KOI8) {
 			driver->charsets[1] = get_cp_index("koi8-r");
+
+		} else {
+			driver->charsets[1] = driver->charsets[0];
 		}
 
 	} else {
-		if (utf8_io) {
-			driver->charsets[1] = driver->charsets[0];
+		driver->charsets[0] = -1;
+		if (driver->type == TERM_LINUX) {
+			if (get_opt_bool_tree(term_spec, "restrict_852"))
+				driver->frame = frame_restrict;
+
+			if (get_opt_bool_tree(term_spec, "m11_hack"))
+				driver->frame_seqs = m11_hack_frame_seqs;
+
+		} else if (driver->type == TERM_FREEBSD) {
+			if (get_opt_bool_tree(term_spec, "m11_hack"))
+				driver->frame_seqs = m11_hack_frame_seqs;
+
+		} else if (driver->type == TERM_VT100) {
+			driver->frame = frame_vt100;
 		}
 	}
 }

[prev in list] [next in list] [prev in thread] [next in thread]