* dcrt0.cc: Remove local variable alternate_charset_active.
* fhandler.h: Add variable alternate_charset_active, functions str_to_con, con_to_str to dev_console structure. * fhandler_console.cc (con_to_str): Move function into dev_console class. (str_to_con): Ditto. (fhandler_console::read): Call con_to_str on dev_state. (fhandler_console::write_normal): Call str_to_con on dev_state. (fhandler_console::char_command): Change active_charset_active assignment to be on dev_state. * winsup.h: Remove global external variable alternate_charset_active.
This commit is contained in:
@ -752,6 +752,7 @@ class dev_console
|
||||
int nargs_;
|
||||
unsigned rarg;
|
||||
bool saw_question_mark;
|
||||
bool alternate_charset_active;
|
||||
|
||||
char my_title_buf [TITLESIZE + 1];
|
||||
|
||||
@ -788,6 +789,10 @@ class dev_console
|
||||
bool insert_mode;
|
||||
bool use_mouse;
|
||||
bool raw_win32_keyboard_mode;
|
||||
|
||||
BOOL con_to_str (char *d, const char *s, DWORD sz);
|
||||
BOOL str_to_con (char *d, const char *s, DWORD sz);
|
||||
|
||||
friend class fhandler_console;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user