diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-04-07 12:13:37 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-04-07 12:13:37 +0000 |
| commit | 62755474e58f3238fb1c672dcbcf91182481c23f (patch) | |
| tree | 6cf224ab6f5962cc1f0532a0342f005647e77775 /winsup/cygwin/fhandler.h | |
| parent | 3d66f2c9ae95425175d52f27ddfea36f52b5b740 (diff) | |
| download | cygnal-62755474e58f3238fb1c672dcbcf91182481c23f.tar.gz cygnal-62755474e58f3238fb1c672dcbcf91182481c23f.tar.bz2 cygnal-62755474e58f3238fb1c672dcbcf91182481c23f.zip | |
* fhandler.h (class dev_console): Add members con_mbtowc, con_wctomb,
and con_charset.
(dev_console::str_to_con): Take mbtowc function pointer and charset
as additional parameters.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Initialize
aforementioned new members. Explain why.
(dev_console::con_to_str): Remove useless comment. Call new
sys_cp_wcstombs function rather than sys_wcstombs.
(dev_console::str_to_con): Take mbtowc function pointer and charset
as additional parameters. Call sys_cp_mbstowcs accordingly.
(fhandler_console::write_normal): Only initialize f_mbtowc and charset
once. Accommodate changed str_to_con.
* strfuncs.cc (sys_cp_wcstombs): Renamed from sys_wcstombs. Take
wctomb function pointer and charset as parameters. Use throughout.
(sys_cp_mbstowcs): Take wctomb function pointer and charset as
parameters instead of codepage. Remove matching local variables and
their initialization.
* wchar.h (ENCODING_LEN): Define as in newlib.
(__mbtowc): Use mbtowc_p typedef for declaration.
(wctomb_f): New type.
(wctomb_p): New type.
(__wctomb): Declare.
(__utf8_wctomb): Use wctomb_f typedef for declaration.
(sys_cp_wcstombs): Move declaration from winsup.h here.
(sys_wcstombs): Ditto.
(sys_wcstombs_alloc): Ditto.
(sys_cp_mbstowcs): Ditto.
(sys_mbstowcs): Ditto.
(sys_mbstowcs_alloc): Ditto.
* winsup.h: Move declaration of sys_FOO functions to wchar.h. Include
wchar.h instead.
Diffstat (limited to 'winsup/cygwin/fhandler.h')
| -rw-r--r-- | winsup/cygwin/fhandler.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 7dff68dd4..be4c080ee 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -894,9 +894,13 @@ class dev_console bool use_mouse; bool raw_win32_keyboard_mode; + mbtowc_p con_mbtowc; + wctomb_p con_wctomb; + char con_charset[ENCODING_LEN + 1]; + inline UINT get_console_cp (); DWORD con_to_str (char *d, int dlen, WCHAR w); - DWORD str_to_con (PWCHAR d, const char *s, DWORD sz); + DWORD str_to_con (mbtowc_p, char *, PWCHAR d, const char *s, DWORD sz); void set_color (HANDLE); bool fillin_info (HANDLE); void set_default_attr (); |