JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler.h (dev_console::set_color): Define new function.

Browse Source 
(dev_console::set_default_attr): Ditto, moved from fhandler_console.
(dev_console::fillin_info): Ditto.  Accommodate this change throughout this
file.
(fhandler_console::get_win32_attr): Eliminate.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Properly set default
attributes on initialization.
(fhandler_console::open): Set current attributes rather than default color on
open.
(fhandler_console::get_win32_attr): Eliminate.
(dev_console::set_color): New function.  Move get_win32_attr stuff here.
(dev_console::set_default_attr): New function, moved from fhandler_console.
(dev_console::fillin_info): Ditto.
(fhandler_console::char_command): Call set_color to set screen characteristics.
This commit is contained in:
Christopher Faylor 2005-04-22 17:03:38 +00:00
parent fb201f9270
commit 098a429002
3 changed files with 84 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,23 @@
2005-04-22 Christopher Faylor <cgf@timesys.com>
* fhandler.h (dev_console::set_color): Define new function.
(dev_console::set_default_attr): Ditto, moved from fhandler_console.
(dev_console::fillin_info): Ditto. Accommodate this change throughout
this file.
(fhandler_console::get_win32_attr): Eliminate.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Properly set
default attributes on initialization.
(fhandler_console::open): Set current attributes rather than default
color on open.
(fhandler_console::get_win32_attr): Eliminate.
(dev_console::set_color): New function. Move get_win32_attr stuff
here.
(dev_console::set_default_attr): New function, moved from
fhandler_console.
(dev_console::fillin_info): Ditto.
(fhandler_console::char_command): Call set_color to set screen
characteristics.
2005-04-22 Christopher Faylor <cgf@timesys.com> 2005-04-22 Christopher Faylor <cgf@timesys.com>
* fhandler.cc (fhandler_base::read): Remove unused signal state tweaks. * fhandler.cc (fhandler_base::read): Remove unused signal state tweaks.

5
winsup/cygwin/fhandler.h
View File

@ -834,6 +834,9 @@ class dev_console
bool con_to_str (char *d, const char *s, DWORD sz); bool con_to_str (char *d, const char *s, DWORD sz);
bool str_to_con (char *d, const char *s, DWORD sz); bool str_to_con (char *d, const char *s, DWORD sz);
void set_color (HANDLE);
bool fillin_info (HANDLE);
void set_default_attr ();
friend class fhandler_console; friend class fhandler_console;
}; };
@ -846,9 +849,7 @@ class fhandler_console: public fhandler_termios
/* Output calls */ /* Output calls */
void set_default_attr (); void set_default_attr ();
WORD get_win32_attr ();
bool fillin_info ();
void clear_screen (int, int, int, int); void clear_screen (int, int, int, int);
void scroll_screen (int, int, int, int, int, int); void scroll_screen (int, int, int, int, int, int);
void cursor_set (bool, int, int); void cursor_set (bool, int, int);

122
winsup/cygwin/fhandler_console.cc
View File

@ -1,6 +1,6 @@
/* fhandler_console.cc /* fhandler_console.cc
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc. Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -97,7 +97,6 @@ fhandler_console::get_tty_stuff (int flags = 0)
dev_state->scroll_region.Bottom = -1; dev_state->scroll_region.Bottom = -1;
dev_state->dwLastCursorPosition.X = -1; dev_state->dwLastCursorPosition.X = -1;
dev_state->dwLastCursorPosition.Y = -1; dev_state->dwLastCursorPosition.Y = -1;
dev_state->default_color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
dev_state->underline_color = FOREGROUND_GREEN | FOREGROUND_BLUE; dev_state->underline_color = FOREGROUND_GREEN | FOREGROUND_BLUE;
dev_state->dim_color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; dev_state->dim_color = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
dev_state->meta_mask = LEFT_ALT_PRESSED; dev_state->meta_mask = LEFT_ALT_PRESSED;
@ -112,6 +111,7 @@ fhandler_console::get_tty_stuff (int flags = 0)
shell symbols and should not be interpreted as META. */ shell symbols and should not be interpreted as META. */
if (PRIMARYLANGID (LOWORD (GetKeyboardLayout (0))) == LANG_ENGLISH) if (PRIMARYLANGID (LOWORD (GetKeyboardLayout (0))) == LANG_ENGLISH)
dev_state->meta_mask |= RIGHT_ALT_PRESSED; dev_state->meta_mask |= RIGHT_ALT_PRESSED;
dev_state->set_default_attr ();
} }
return &shared_console_info->tty_min_state; return &shared_console_info->tty_min_state;
@ -213,7 +213,7 @@ fhandler_console::send_winch_maybe ()
{ {
SHORT y = dev_state->info.dwWinSize.Y; SHORT y = dev_state->info.dwWinSize.Y;
SHORT x = dev_state->info.dwWinSize.X; SHORT x = dev_state->info.dwWinSize.X;
fillin_info (); dev_state->fillin_info (get_output_handle ());
if (y != dev_state->info.dwWinSize.Y || x != dev_state->info.dwWinSize.X) if (y != dev_state->info.dwWinSize.Y || x != dev_state->info.dwWinSize.X)
{ {
@ -556,27 +556,27 @@ fhandler_console::set_input_state ()
} }
bool bool
fhandler_console::fillin_info (void) dev_console::fillin_info (HANDLE h)
{ {
bool ret; bool ret;
CONSOLE_SCREEN_BUFFER_INFO linfo; CONSOLE_SCREEN_BUFFER_INFO linfo;
if ((ret = GetConsoleScreenBufferInfo (get_output_handle (), &linfo))) if ((ret = GetConsoleScreenBufferInfo (h, &linfo)))
{ {
dev_state->info.winTop = linfo.srWindow.Top; info.winTop = linfo.srWindow.Top;
dev_state->info.winBottom = linfo.srWindow.Bottom; info.winBottom = linfo.srWindow.Bottom;
dev_state->info.dwWinSize.Y = 1 + linfo.srWindow.Bottom - linfo.srWindow.Top; info.dwWinSize.Y = 1 + linfo.srWindow.Bottom - linfo.srWindow.Top;
dev_state->info.dwWinSize.X = 1 + linfo.srWindow.Right - linfo.srWindow.Left; info.dwWinSize.X = 1 + linfo.srWindow.Right - linfo.srWindow.Left;
dev_state->info.dwBufferSize = linfo.dwSize; info.dwBufferSize = linfo.dwSize;
dev_state->info.dwCursorPosition = linfo.dwCursorPosition; info.dwCursorPosition = linfo.dwCursorPosition;
dev_state->info.wAttributes = linfo.wAttributes; info.wAttributes = linfo.wAttributes;
} }
else else
{ {
memset (&dev_state->info, 0, sizeof dev_state->info); memset (&info, 0, sizeof info);
dev_state->info.dwWinSize.Y = 25; info.dwWinSize.Y = 25;
dev_state->info.dwWinSize.X = 80; info.dwWinSize.X = 80;
dev_state->info.winBottom = 24; info.winBottom = 24;
} }
return ret; return ret;
@ -589,7 +589,7 @@ fhandler_console::scroll_screen (int x1, int y1, int x2, int y2, int xn, int yn)
CHAR_INFO fill; CHAR_INFO fill;
COORD dest; COORD dest;
(void) fillin_info (); (void) dev_state->fillin_info (get_output_handle ());
sr1.Left = x1 >= 0 ? x1 : dev_state->info.dwWinSize.X - 1; sr1.Left = x1 >= 0 ? x1 : dev_state->info.dwWinSize.X - 1;
if (y1 == 0) if (y1 == 0)
sr1.Top = dev_state->info.winTop; sr1.Top = dev_state->info.winTop;
@ -661,10 +661,13 @@ fhandler_console::open (int flags, mode_t)
} }
set_output_handle (h); set_output_handle (h);
if (fillin_info ()) if (dev_state->fillin_info (get_output_handle ()))
dev_state->default_color = dev_state->info.wAttributes; {
dev_state->current_win32_attr = dev_state->info.wAttributes;
set_default_attr (); if (!dev_state->default_color)
dev_state->default_color = dev_state->info.wAttributes;
dev_state->set_default_attr ();
}
DWORD cflags; DWORD cflags;
if (GetConsoleMode (get_io_handle (), &cflags)) if (GetConsoleMode (get_io_handle (), &cflags))
@ -723,7 +726,7 @@ fhandler_console::ioctl (unsigned int cmd, void *buf)
case TIOCGWINSZ: case TIOCGWINSZ:
int st; int st;
st = fillin_info (); st = dev_state->fillin_info (get_output_handle ());
if (st) if (st)
{ {
/* *not* the buffer size, the actual screen size... */ /* *not* the buffer size, the actual screen size... */
@ -911,28 +914,12 @@ fhandler_console::fhandler_console () :
fhandler_termios () fhandler_termios ()
{ {
} }
#define FOREGROUND_ATTR_MASK (FOREGROUND_RED | FOREGROUND_GREEN | \
FOREGROUND_BLUE | FOREGROUND_INTENSITY)
#define BACKGROUND_ATTR_MASK (BACKGROUND_RED | BACKGROUND_GREEN | \
BACKGROUND_BLUE | BACKGROUND_INTENSITY)
void void
fhandler_console::set_default_attr () dev_console::set_color (HANDLE h)
{ {
dev_state->blink = dev_state->underline = dev_state->reverse = false; WORD win_fg = fg;
dev_state->intensity = INTENSITY_NORMAL; WORD win_bg = bg;
dev_state->fg = dev_state->default_color & FOREGROUND_ATTR_MASK; if (reverse)
dev_state->bg = dev_state->default_color & BACKGROUND_ATTR_MASK;
dev_state->current_win32_attr = get_win32_attr ();
SetConsoleTextAttribute (get_output_handle (), dev_state->current_win32_attr);
}
WORD
fhandler_console::get_win32_attr ()
{
WORD win_fg = dev_state->fg;
WORD win_bg = dev_state->bg;
if (dev_state->reverse)
{ {
WORD save_fg = win_fg; WORD save_fg = win_fg;
win_fg = (win_bg & BACKGROUND_RED ? FOREGROUND_RED : 0) | win_fg = (win_bg & BACKGROUND_RED ? FOREGROUND_RED : 0) |
@ -944,16 +931,32 @@ fhandler_console::get_win32_attr ()
(save_fg & FOREGROUND_BLUE ? BACKGROUND_BLUE : 0) | (save_fg & FOREGROUND_BLUE ? BACKGROUND_BLUE : 0) |
(save_fg & FOREGROUND_INTENSITY ? BACKGROUND_INTENSITY : 0); (save_fg & FOREGROUND_INTENSITY ? BACKGROUND_INTENSITY : 0);
} }
if (dev_state->underline) if (underline)
win_fg = dev_state->underline_color; win_fg = underline_color;
/* emulate blink with bright background */ /* emulate blink with bright background */
if (dev_state->blink) if (blink)
win_bg |= BACKGROUND_INTENSITY; win_bg |= BACKGROUND_INTENSITY;
if (dev_state->intensity == INTENSITY_INVISIBLE) if (intensity == INTENSITY_INVISIBLE)
win_fg = win_bg; win_fg = win_bg;
else if (dev_state->intensity == INTENSITY_BOLD) else if (intensity == INTENSITY_BOLD)
win_fg |= FOREGROUND_INTENSITY; win_fg |= FOREGROUND_INTENSITY;
return (win_fg | win_bg); current_win32_attr = win_fg | win_bg;
if (h)
SetConsoleTextAttribute (h, current_win32_attr);
}
#define FOREGROUND_ATTR_MASK (FOREGROUND_RED | FOREGROUND_GREEN | \
FOREGROUND_BLUE | FOREGROUND_INTENSITY)
#define BACKGROUND_ATTR_MASK (BACKGROUND_RED | BACKGROUND_GREEN | \
BACKGROUND_BLUE | BACKGROUND_INTENSITY)
void
dev_console::set_default_attr ()
{
blink = underline = reverse = false;
intensity = INTENSITY_NORMAL;
fg = default_color & FOREGROUND_ATTR_MASK;
bg = default_color & BACKGROUND_ATTR_MASK;
set_color (NULL);
} }
/* /*
@ -967,7 +970,7 @@ fhandler_console::clear_screen (int x1, int y1, int x2, int y2)
DWORD done; DWORD done;
int num; int num;
(void)fillin_info (); (void) dev_state->fillin_info (get_output_handle ());
if (x1 < 0) if (x1 < 0)
x1 = dev_state->info.dwWinSize.X - 1; x1 = dev_state->info.dwWinSize.X - 1;
@ -1006,7 +1009,7 @@ fhandler_console::cursor_set (bool rel_to_top, int x, int y)
{ {
COORD pos; COORD pos;
(void) fillin_info (); (void) dev_state->fillin_info (get_output_handle ());
if (y > dev_state->info.winBottom) if (y > dev_state->info.winBottom)
y = dev_state->info.winBottom; y = dev_state->info.winBottom;
else if (y < 0) else if (y < 0)
@ -1027,7 +1030,7 @@ fhandler_console::cursor_set (bool rel_to_top, int x, int y)
void void
fhandler_console::cursor_rel (int x, int y) fhandler_console::cursor_rel (int x, int y)
{ {
fillin_info (); (void) dev_state->fillin_info (get_output_handle ());
x += dev_state->info.dwCursorPosition.X; x += dev_state->info.dwCursorPosition.X;
y += dev_state->info.dwCursorPosition.Y; y += dev_state->info.dwCursorPosition.Y;
cursor_set (false, x, y); cursor_set (false, x, y);
@ -1036,7 +1039,7 @@ fhandler_console::cursor_rel (int x, int y)
void void
fhandler_console::cursor_get (int *x, int *y) fhandler_console::cursor_get (int *x, int *y)
{ {
fillin_info (); dev_state->fillin_info (get_output_handle ());
*y = dev_state->info.dwCursorPosition.Y; *y = dev_state->info.dwCursorPosition.Y;
*x = dev_state->info.dwCursorPosition.X; *x = dev_state->info.dwCursorPosition.X;
} }
@ -1100,13 +1103,11 @@ fhandler_console::char_command (char c)
switch (c) switch (c)
{ {
case 'm': /* Set Graphics Rendition */ case 'm': /* Set Graphics Rendition */
int i; for (int i = 0; i <= dev_state->nargs_; i++)
for (i = 0; i <= dev_state->nargs_; i++)
switch (dev_state->args_[i]) switch (dev_state->args_[i])
{ {
case 0: /* normal color */ case 0: /* normal color */
set_default_attr (); dev_state->set_default_attr ();
break; break;
case 1: /* bold */ case 1: /* bold */
dev_state->intensity = INTENSITY_BOLD; dev_state->intensity = INTENSITY_BOLD;
@ -1193,8 +1194,7 @@ fhandler_console::char_command (char c)
dev_state->bg = dev_state->default_color & BACKGROUND_ATTR_MASK; dev_state->bg = dev_state->default_color & BACKGROUND_ATTR_MASK;
break; break;
} }
dev_state->current_win32_attr = get_win32_attr (); dev_state->set_color (get_output_handle ());
SetConsoleTextAttribute (get_output_handle (), dev_state->current_win32_attr);
break; break;
case 'h': case 'h':
case 'l': case 'l':
@ -1365,7 +1365,7 @@ fhandler_console::char_command (char c)
scroll_screen (0, dev_state->args_[0], -1, -1, 0, 0); scroll_screen (0, dev_state->args_[0], -1, -1, 0, 0);
break; break;
case 'T': /* SR - Scroll down */ case 'T': /* SR - Scroll down */
fillin_info (); dev_state->fillin_info (get_output_handle ());
dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1; dev_state->args_[0] = dev_state->args_[0] ? dev_state->args_[0] : 1;
scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + dev_state->args_[0]); scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + dev_state->args_[0]);
break; break;
@ -1555,13 +1555,13 @@ fhandler_console::write (const void *vsrc, size_t len)
} }
else if (*src == 'M') /* Reverse Index */ else if (*src == 'M') /* Reverse Index */
{ {
fillin_info (); dev_state->fillin_info (get_output_handle ());
scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + 1); scroll_screen (0, 0, -1, -1, 0, dev_state->info.winTop + 1);
dev_state->state_ = normal; dev_state->state_ = normal;
} }
else if (*src == 'c') /* Reset Linux terminal */ else if (*src == 'c') /* Reset Linux terminal */
{ {
set_default_attr (); dev_state->set_default_attr ();
clear_screen (0, 0, -1, -1); clear_screen (0, 0, -1, -1);
cursor_set (true, 0, 0); cursor_set (true, 0, 0);
dev_state->state_ = normal; dev_state->state_ = normal;