This is the mail archive of the cygwin-patches@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [Patch]: Ncurses frame drawing


On Tue, Oct 14, 2003 at 01:29:37PM +0200, Micha Nelissen wrote:
>Corinna Vinschen wrote:
>
>>On Mon, Oct 13, 2003 at 06:38:42PM +0200, Micha Nelissen wrote:
>>
>>>Hi,
>>>
>>>Attached is a patch to enable correct ncurses frame drawing. It does so 
>>>by implementing the escape sequence for 'start/end alternate charset'. 
>>>This is code \E[11m and \E[10m respectively in the linux termcap.
>>
>>
>>This patch is a nice idea but it's not quite correct.  You can't
>>rely on "current_codepage" being ansi_cp.  Since the user can set
>>it to oem_cp in the CYGWIN environment variable, you have to memorize
>>the old value on \E[11m and to restore to the old value on \E[10m.
>
>Ok, that's true.  Attached is a patch with the suggested changes.

I guess this is ok although it's not thread safe.  It looks like
fhandler_console isn't thread safe in general, though.

Corinna do you have time to check this in?

cgf

>Regards,
>
>Micha.
>

>2003-10-13  Micha Nelissen  <M.Nelissen@student.tue.nl>
>
>* fhandler_console.cc (char_command): added escape sequence for codepage
>ansi <-> oem switching for ncurses frame drawing capabilities.
>
>* dcrt0.cc: add local variable original_codepage.
>
>* winsup.h: add global external variable original_codepage.

>Index: dcrt0.cc
>===================================================================
>RCS file: /cvs/src/src/winsup/cygwin/dcrt0.cc,v
>retrieving revision 1.187
>diff -u -w -r1.187 dcrt0.cc
>--- dcrt0.cc	8 Oct 2003 21:40:33 -0000	1.187
>+++ dcrt0.cc	14 Oct 2003 11:28:44 -0000
>@@ -57,6 +57,7 @@
> bool strip_title_path;
> bool allow_glob = TRUE;
> codepage_type current_codepage = ansi_cp;
>+codepage_type original_codepage;
> 
> int cygwin_finished_initializing;
> 
>Index: fhandler_console.cc
>===================================================================
>RCS file: /cvs/src/src/winsup/cygwin/fhandler_console.cc,v
>retrieving revision 1.115
>diff -u -w -r1.115 fhandler_console.cc
>--- fhandler_console.cc	27 Sep 2003 02:36:50 -0000	1.115
>+++ fhandler_console.cc	14 Oct 2003 11:28:44 -0000
>@@ -1111,6 +1111,13 @@
> 	     case 9:    /* dim */
> 	       dev_state->intensity = INTENSITY_DIM;
> 	       break;
>+             case 10:   /* end alternate charset */
>+               current_codepage = original_codepage;
>+	       break;
>+             case 11:   /* start alternate charset */
>+               original_codepage = current_codepage;
>+               current_codepage = oem_cp;
>+	       break;
> 	     case 24:
> 	       dev_state->underline = FALSE;
> 	       break;
>Index: winsup.h
>===================================================================
>RCS file: /cvs/src/src/winsup/cygwin/winsup.h,v
>retrieving revision 1.119
>diff -u -w -r1.119 winsup.h
>--- winsup.h	25 Sep 2003 00:37:17 -0000	1.119
>+++ winsup.h	14 Oct 2003 11:28:44 -0000
>@@ -90,6 +90,7 @@
> 
> enum codepage_type {ansi_cp, oem_cp};
> extern codepage_type current_codepage;
>+extern codepage_type original_codepage;
> 
> UINT get_cp ();
> 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]