Skip to content

W
wine-winehq
Commit 3bf6b278 authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard
Browse files
Options

conhost: Copy font properties to the new screen buffer.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50187Signed-off-by: 's avatarHugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5cb70e73
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
programs/conhost/conhost.c
View file @ 3bf6b278
......@@ -68,6 +68,7 @@ static void destroy_screen_buffer( struct screen_buffer *screen_buffer )
if (screen_buffer->console->active == screen_buffer)
screen_buffer->console->active = NULL;
wine_rb_remove( &screen_buffer_map, &screen_buffer->entry );
free( screen_buffer->font.face_name );
free( screen_buffer->data );
free( screen_buffer );
}
......@@ -85,8 +86,6 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
screen_buffer->cursor_visible = 1;
screen_buffer->width = width;
screen_buffer->height = height;
screen_buffer->font.weight = FW_NORMAL;
screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE;
if (console->active)
{
......@@ -96,15 +95,22 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int
screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top;
screen_buffer->attr = console->active->attr;
screen_buffer->popup_attr = console->active->attr;
screen_buffer->font = console->active->font;
if (!(screen_buffer->font.face_name = malloc( screen_buffer->font.face_len ))) return NULL;
memcpy( screen_buffer->font.face_name, console->active->font.face_name,
screen_buffer->font.face_len );
}
else
{
screen_buffer->max_width = width;
screen_buffer->max_height = height;
screen_buffer->win.right = width - 1;
screen_buffer->win.bottom = height - 1;
screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED;
screen_buffer->popup_attr = 0xf5;
screen_buffer->max_width = width;
screen_buffer->max_height = height;
screen_buffer->win.right = width - 1;
screen_buffer->win.bottom = height - 1;
screen_buffer->attr = FOREGROUND_BLUE|FOREGROUND_GREEN|FOREGROUND_RED;
screen_buffer->popup_attr = 0xf5;
screen_buffer->font.weight = FW_NORMAL;
screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE;
}
if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment