mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- function text_update() of the display libraries wx and x rewritten and

Browse Source 
line offset feature implemented
This commit is contained in:
Volker Ruppert 2003-05-11 08:29:23 +00:00
parent a17d06abcb
commit 846ffa3dba
2 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bochs/gui/wx.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////
// $Id: wx.cc,v 1.55 2003-05-07 19:15:46 vruppert Exp $
// $Id: wx.cc,v 1.56 2003-05-11 08:29:23 vruppert Exp $
/////////////////////////////////////////////////////////////////
//
// wxWindows VGA display for Bochs. wx.cc implements a custom
@ -977,41 +977,55 @@ void bx_wx_gui_c::text_update(Bit8u *old_text, Bit8u *new_text,
bx_vga_tminfo_t tm_info, unsigned nrows)
{
IFDBG_VGA(wxLogDebug (wxT ("text_update")));
//static Bit32u counter = 0;
//BX_INFO (("text_update executed %d times", ++counter));
Bit8u cs_start = tm_info.cs_start;
Bit8u cs_end = tm_info.cs_end;
unsigned char cChar;
unsigned char *old_line, *new_line, *new_start;
unsigned char cAttr, cChar;
unsigned int ncols = wxScreenX / 8;
unsigned int nchars = ncols * nrows;
unsigned int hchars, rows, x, y;
bx_bool forceUpdate = 0;
if(charmap_updated) {
forceUpdate = 1;
charmap_updated = 0;
}
if((wxCursorY * ncols + wxCursorX) < nchars) {
cChar = new_text[(wxCursorY * ncols + wxCursorX) * 2];
DrawBochsBitmap(wxCursorX * 8, wxCursorY * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5], new_text[((wxCursorY * ncols + wxCursorX) * 2) + 1], 1, 0);
}
for(unsigned int i = 0; i < nchars * 2; i += 2) {
if(forceUpdate || (old_text[i] != new_text[i])
|| (old_text[i+1] != new_text[i+1])) {
cChar = new_text[i];
int x = (i / 2) % ncols;
int y = (i / 2) / ncols;
DrawBochsBitmap(x * 8, y * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5], new_text[i+1], 1, 0);
}
if((wxCursorY < nrows) && (wxCursorX < ncols)) {
cChar = new_text[wxCursorY * tm_info.line_offset + wxCursorX * 2];
cAttr = new_text[wxCursorY * tm_info.line_offset + wxCursorX * 2 + 1];
DrawBochsBitmap(wxCursorX * 8, wxCursorY * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5], cAttr, 1, 0);
}
new_start = new_text;
rows = nrows;
y = 0;
do {
hchars = ncols;
new_line = new_text;
old_line = old_text;
x = 0;
do {
if(forceUpdate || (old_text[0] != new_text[0])
|| (old_text[1] != new_text[1])) {
cChar = new_text[0];
cAttr = new_text[1];
DrawBochsBitmap(x * 8, y * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5], cAttr, 1, 0);
}
x++;
new_text+=2;
old_text+=2;
} while (--hchars);
y++;
new_text = new_line + tm_info.line_offset;
old_text = old_line + tm_info.line_offset;
} while (--rows);
wxCursorX = cursor_x;
wxCursorY = cursor_y;
if(((cursor_y * ncols + cursor_x) < nchars) && (cs_start <= cs_end)) {
cChar = new_text[(cursor_y * ncols + cursor_x) * 2];
char cAttr = new_text[((cursor_y * ncols + cursor_x) * 2) + 1];
if((cursor_y < nrows) && (cursor_x < ncols) && (tm_info.cs_start <= tm_info.cs_end)) {
cChar = new_start[cursor_y * tm_info.line_offset + cursor_x * 2];
cAttr = new_start[cursor_y * tm_info.line_offset + cursor_x * 2 + 1];
cAttr = ((cAttr >> 4) & 0xF) + ((cAttr & 0xF) << 4);
DrawBochsBitmap(wxCursorX * 8, wxCursorY * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5], cAttr, cs_start, cs_end);
DrawBochsBitmap(cursor_x * 8, cursor_y * wxFontY, 8, wxFontY, (char *)&vga_charmap[cChar<<5],
cAttr, tm_info.cs_start, tm_info.cs_end);
}
thePanel->MyRefresh ();

82
bochs/gui/x.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: x.cc,v 1.63 2003-05-07 19:15:47 vruppert Exp $
// $Id: x.cc,v 1.64 2003-05-11 08:29:23 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1069,11 +1069,11 @@ bx_x_gui_c::text_update(Bit8u *old_text, Bit8u *new_text,
unsigned long cursor_x, unsigned long cursor_y,
bx_vga_tminfo_t tm_info, unsigned nrows)
{
unsigned i, x, y, curs;
unsigned char *old_line, *new_line, *new_start;
unsigned char cChar;
unsigned int ncols = dimension_x / font_width;
unsigned int curs, hchars, i, rows, x, y;
unsigned new_foreground, new_background;
Bit8u c;
Bit8u cs_start, cs_end;
unsigned nchars;
bx_bool force_update=0;
unsigned char cell[32];
@ -1107,56 +1107,62 @@ bx_x_gui_c::text_update(Bit8u *old_text, Bit8u *new_text,
charmap_updated = 0;
}
cs_start = tm_info.cs_start;
cs_end = tm_info.cs_end;
// Number of characters on screen, variable number of rows
nchars = columns*nrows;
// first draw over character at original block cursor location
if ( (prev_block_cursor_y*columns + prev_block_cursor_x) < nchars ) {
curs = (prev_block_cursor_y*columns + prev_block_cursor_x)*2;
c = new_text[curs];
if ( (prev_block_cursor_y < nrows) && (prev_block_cursor_x < ncols) ) {
curs = prev_block_cursor_y * tm_info.line_offset + prev_block_cursor_x * 2;
cChar = new_text[curs];
XSetForeground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_text[curs+1] & 0x0f)]);
XSetBackground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx((new_text[curs+1] & 0xf0) >> 4)]);
XCopyPlane(bx_x_display, vgafont[c], win, gc, 0, 0, font_width, font_height,
XCopyPlane(bx_x_display, vgafont[cChar], win, gc, 0, 0, font_width, font_height,
prev_block_cursor_x * font_width, prev_block_cursor_y * font_height + bx_headerbar_y, 1);
}
for (i=0; i<nchars*2; i+=2) {
if ( (old_text[i]!=new_text[i]) ||
(old_text[i+1]!=new_text[i+1]) ||
(force_update) ) {
new_start = new_text;
rows = nrows;
y = 0;
do {
hchars = ncols;
new_line = new_text;
old_line = old_text;
x = 0;
do {
if ( force_update || (old_text[0] != new_text[0])
|| (old_text[1] != new_text[1]) ) {
c = new_text[i];
new_foreground = new_text[i+1] & 0x0f;
new_background = (new_text[i+1] & 0xf0) >> 4;
cChar = new_text[0];
new_foreground = new_text[1] & 0x0f;
new_background = (new_text[1] & 0xf0) >> 4;
XSetForeground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_foreground)]);
XSetBackground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_background)]);
XSetForeground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_foreground)]);
XSetBackground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_background)]);
x = (i/2) % columns;
y = (i/2) / columns;
XCopyPlane(bx_x_display, vgafont[c], win, gc, 0, 0, font_width, font_height,
x * font_width, y * font_height + bx_headerbar_y, 1);
XCopyPlane(bx_x_display, vgafont[cChar], win, gc, 0, 0, font_width, font_height,
x * font_width, y * font_height + bx_headerbar_y, 1);
}
}
x++;
new_text+=2;
old_text+=2;
} while (--hchars);
y++;
new_text = new_line + tm_info.line_offset;
old_text = old_line + tm_info.line_offset;
} while (--rows);
prev_block_cursor_x = cursor_x;
prev_block_cursor_y = cursor_y;
// now draw character at new block cursor location in reverse
if ( ( (cursor_y*columns + cursor_x) < nchars ) && (cs_start <= cs_end) ) {
curs = (cursor_y*columns + cursor_x)*2;
c = new_text[curs];
XSetForeground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx((new_text[curs+1] & 0xf0) >> 4)]);
XSetBackground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_text[curs+1] & 0x0f)]);
if ( (cursor_y < nrows) && (cursor_x < ncols ) && (tm_info.cs_start <= tm_info.cs_end) ) {
curs = cursor_y * tm_info.line_offset + cursor_x * 2;
cChar = new_start[curs];
XSetForeground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx((new_start[curs+1] & 0xf0) >> 4)]);
XSetBackground(bx_x_display, gc, col_vals[DEV_vga_get_actl_pal_idx(new_start[curs+1] & 0x0f)]);
XCopyPlane(bx_x_display, vgafont[c], win, gc, 0, cs_start, font_width, cs_end - cs_start + 1,
cursor_x * font_width, cursor_y * font_height + bx_headerbar_y + cs_start, 1);
}
XCopyPlane(bx_x_display, vgafont[cChar], win, gc, 0, tm_info.cs_start, font_width,
tm_info.cs_end - tm_info.cs_start + 1, cursor_x * font_width,
cursor_y * font_height + bx_headerbar_y + tm_info.cs_start, 1);
}
XFlush(bx_x_display);
}