[MPlayer-cvslog] CVS: main/osdep getch2-win.c, 1.9, 1.10 getch2.c, 1.21, 1.22

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main/osdep
In directory mail:/var2/tmp/cvs-serv24/osdep

Modified Files:
	getch2-win.c getch2.c 
Log Message:
change erase to end of line, fall back to old behavior if no termcap found


Index: getch2-win.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/getch2-win.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- getch2-win.c	27 Dec 2005 10:42:02 -0000	1.9
+++ getch2-win.c	29 Dec 2005 11:27:21 -0000	1.10
@@ -22,7 +22,7 @@
 
 int screen_width=80;
 int screen_height=24;
-char * erase_to_end_of_line = "                                                                               \r";
+char * erase_to_end_of_line = NULL;
 
 void get_screen_size(){
 }

Index: getch2.c
===================================================================
RCS file: /cvsroot/mplayer/main/osdep/getch2.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- getch2.c	25 Dec 2005 18:26:35 -0000	1.21
+++ getch2.c	29 Dec 2005 11:27:21 -0000	1.22
@@ -40,7 +40,7 @@
 
 int screen_width=80;
 int screen_height=24;
-char * erase_to_end_of_line = "\033[J";
+char * erase_to_end_of_line = NULL;
 
 typedef struct {
   int len;
@@ -79,7 +79,6 @@
 static int success=0;
 
 int load_termcap(char *termtype){
-  char * p;
   if(!termtype) termtype=getenv("TERM");
   if(!termtype) termtype="unknown";
   success=tgetent(term_buffer, termtype);
@@ -90,7 +89,7 @@
   screen_height=tgetnum("li");
   if(screen_width<1 || screen_width>255) screen_width=80;
   if(screen_height<1 || screen_height>255) screen_height=24;
-  if ((p = tgetstr("cd",&term_p))) erase_to_end_of_line=p;
+  erase_to_end_of_line= tgetstr("cd",&term_p);
 
   termcap_add("kP",KEY_PGUP);
   termcap_add("kN",KEY_PGDWN);