Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

upx-clang-format -i s_djgpp2.cpp s_object.cpp s_vcsa.cpp s_win32.cpp screen.h

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2016-09-21 17:45:55 +02:00
parent 104da198d3
commit 633073803f
6 changed files with 339 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/s_djgpp2.cpp
+98 -225
View File
@@ -25,7 +25,6 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/
#include "conf.h"
#if (USE_SCREEN) && defined(__DJGPP__)
@@ -39,7 +38,6 @@
/* #define USE_SCROLLBACK 1 */
/*************************************************************************
// direct screen access
**************************************************************************/
@@ -53,14 +51,13 @@
#include <sys/exceptn.h>
#include <sys/farptr.h>
#include <sys/movedata.h>
#define dossel _go32_info_block.selector_for_linear_memory
#define co80 _go32_info_block.linear_address_of_primary_screen
#define dossel _go32_info_block.selector_for_linear_memory
#define co80 _go32_info_block.linear_address_of_primary_screen
#undef kbhit
#define Cell upx_uint16_t
struct screen_data_t
{
struct screen_data_t {
int mode;
int cols;
int rows;
@@ -80,32 +77,22 @@ struct screen_data_t
#endif /* USE_SCROLLBACK */
};
/* atExit information */
static struct
{
int cursor_shape;
} ae = {
-1
};
static struct { int cursor_shape; } ae = {-1};
#if USE_SCROLLBACK
static __inline__ void sb_add(screen_t *this, int *val, int inc)
{
static __inline__ void sb_add(screen_t *this, int *val, int inc) {
*val = (*val + inc) & (this->data->sb_size - 1);
}
static void sb_push(screen_t *this, const Cell *line, int len)
{
memcpy(this->data->sb_buf[this->data->sb_sp],line,len);
sb_add(this,&this->data->sb_sp,1);
static void sb_push(screen_t *this, const Cell *line, int len) {
memcpy(this->data->sb_buf[this->data->sb_sp], line, len);
sb_add(this, &this->data->sb_sp, 1);
if (this->data->sb_sp == this->data->sb_base)
sb_add(this, &this->data->sb_base, 1);
}
static const Cell *sb_pop(screen_t *this)
{
static const Cell *sb_pop(screen_t *this) {
if (this->data->sb_sp == this->data->sb_base)
return NULL;
sb_add(this, &this->data->sb_sp, -1);
@@ -113,49 +100,28 @@ static const Cell *sb_pop(screen_t *this)
}
#endif /* USE_SCROLLBACK */
static void refresh(screen_t *this) { UNUSED(this); }
static void refresh(screen_t *this)
{
static __inline__ Cell make_cell(screen_t *this, int ch, int attr) {
UNUSED(this);
return (Cell)(((attr & 0xff) << 8) | (ch & 0xff));
}
static __inline__
Cell make_cell(screen_t *this, int ch, int attr)
{
UNUSED(this);
return (Cell) (((attr & 0xff) << 8) | (ch & 0xff));
}
static int getMode(const screen_t *this)
{
static int getMode(const screen_t *this) {
UNUSED(this);
return ScreenMode();
}
static int getPage(const screen_t *this)
{
static int getPage(const screen_t *this) {
UNUSED(this);
return _farpeekb(dossel, 0x462);
}
static int getRows(const screen_t *this) { return this->data->rows; }
static int getRows(const screen_t *this)
{
return this->data->rows;
}
static int getCols(const screen_t *this) { return this->data->cols; }
static int getCols(const screen_t *this)
{
return this->data->cols;
}
static int isMono(const screen_t *this)
{
static int isMono(const screen_t *this) {
if (this->data->mode == 7)
return 1;
if ((_farpeekb(dossel, 0x465) & (4 | 16)) != 0)
@@ -163,42 +129,26 @@ static int isMono(const screen_t *this)
return 0;
}
static int getFg(const screen_t *this) { return this->data->attr & mask_fg; }
static int getFg(const screen_t *this)
{
return this->data->attr & mask_fg;
}
static int getBg(const screen_t *this) { return this->data->attr & mask_bg; }
static int getBg(const screen_t *this)
{
return this->data->attr & mask_bg;
}
static void setFg(screen_t *this, int fg)
{
static void setFg(screen_t *this, int fg) {
this->data->attr = (this->data->attr & mask_bg) | (fg & mask_fg);
}
static void setBg(screen_t *this, int bg)
{
static void setBg(screen_t *this, int bg) {
this->data->attr = (this->data->attr & mask_fg) | (bg & mask_bg);
}
static void setCursor(screen_t *this, int x, int y)
{
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows)
{
ScreenSetCursor(y,x);
static void setCursor(screen_t *this, int x, int y) {
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows) {
ScreenSetCursor(y, x);
this->data->cursor_x = x;
this->data->cursor_y = y;
}
}
/*
// I added ScreenGetCursor, because when upx prints something longer than
// 1 line (an error message for example), the this->data->cursor_y can
@@ -210,88 +160,71 @@ static void setCursor(screen_t *this, int x, int y)
// the 2 passes implementation.
*/
static void getCursor(const screen_t *this, int *x, int *y)
{
static void getCursor(const screen_t *this, int *x, int *y) {
int cx = this->data->cursor_x;
int cy = this->data->cursor_y;
#if 1
ScreenGetCursor(&cy,&cx);
ScreenGetCursor(&cy, &cx);
#endif
if (x) *x = cx;
if (y) *y = cy;
if (x)
*x = cx;
if (y)
*y = cy;
}
static void putCharAttr(screen_t *this, int ch, int attr, int x, int y)
{
static void putCharAttr(screen_t *this, int ch, int attr, int x, int y) {
UNUSED(this);
ScreenPutChar(ch,attr,x,y);
ScreenPutChar(ch, attr, x, y);
}
static void putChar(screen_t *this, int ch, int x, int y)
{
ScreenPutChar(ch,this->data->attr,x,y);
static void putChar(screen_t *this, int ch, int x, int y) {
ScreenPutChar(ch, this->data->attr, x, y);
}
static void putStringAttr(screen_t *this, const char *s, int attr, int x, int y)
{
static void putStringAttr(screen_t *this, const char *s, int attr, int x, int y) {
UNUSED(this);
assert((int)strlen(s) <= 256);
assert(x + (int)strlen(s) <= this->data->cols);
ScreenPutString(s,attr,x,y);
assert((int) strlen(s) <= 256);
assert(x + (int) strlen(s) <= this->data->cols);
ScreenPutString(s, attr, x, y);
}
static void putString(screen_t *this, const char *s, int x, int y)
{
assert((int)strlen(s) <= 256);
assert(x + (int)strlen(s) <= this->data->cols);
ScreenPutString(s,this->data->attr,x,y);
static void putString(screen_t *this, const char *s, int x, int y) {
assert((int) strlen(s) <= 256);
assert(x + (int) strlen(s) <= this->data->cols);
ScreenPutString(s, this->data->attr, x, y);
}
/* private */
static void getChar(screen_t *this, int *ch, int *attr, int x, int y)
{
static void getChar(screen_t *this, int *ch, int *attr, int x, int y) {
UNUSED(this);
ScreenGetChar(ch,attr,x,y);
ScreenGetChar(ch, attr, x, y);
}
static int getCursorShape(const screen_t *this)
{
static int getCursorShape(const screen_t *this) {
UNUSED(this);
return _farpeekw(dossel, 0x460);
}
static void setCursorShape(screen_t *this, int shape)
{
static void setCursorShape(screen_t *this, int shape) {
__dpmi_regs r;
memset(&r, 0, sizeof(r)); /* just in case... */
memset(&r, 0, sizeof(r)); /* just in case... */
r.x.ax = 0x0103;
#if 1
if (this)
r.h.al = getMode(this); /* required for buggy BIOSes */
r.h.al = getMode(this); /* required for buggy BIOSes */
#endif
r.x.cx = shape & 0x7f1f;
__dpmi_int(0x10, &r);
}
static int hideCursor(screen_t *this)
{
static int hideCursor(screen_t *this) {
int shape = getCursorShape(this);
setCursorShape(this,0x2000);
setCursorShape(this, 0x2000);
return shape;
}
static int init(screen_t *this, int fd)
{
static int init(screen_t *this, int fd) {
int mode;
int cols, rows;
int attr;
@@ -324,27 +257,23 @@ static int init(screen_t *this, int fd)
cols = ScreenCols();
rows = ScreenRows();
mode = getMode(this);
if (mode > 0x13)
{
if (mode > 0x13) {
/* assume this is some SVGA/VESA text mode */
__dpmi_regs r;
memset(&r,0,sizeof(r)); /* just in case... */
r.x.ax = 0x4f03; /* VESA - get current video mode */
memset(&r, 0, sizeof(r)); /* just in case... */
r.x.ax = 0x4f03; /* VESA - get current video mode */
__dpmi_int(0x10, &r);
if (r.h.ah == 0)
mode = r.x.bx;
}
else
{
} else {
if (mode != 2 && mode != 3 && mode != 7)
return -1;
}
ScreenGetCursor(&this->data->cursor_y, &this->data->cursor_x);
getChar(this, NULL, &attr, this->data->cursor_x, this->data->cursor_y);
this->data->init_attr = attr;
if (mode != 7)
{
if (mode != 7) {
/* Does it normally blink when bg has its 3rd bit set? */
int b_mask = (_farpeekb(dossel, 0x465) & 0x20) ? 0x70 : 0xf0;
attr = attr & (mask_fg | b_mask);
@@ -354,25 +283,20 @@ static int init(screen_t *this, int fd)
this->data->rows = rows;
this->data->attr = attr;
this->data->empty_attr = attr;
this->data->empty_cell = make_cell(this,' ',attr);
this->data->empty_cell = make_cell(this, ' ', attr);
ae.cursor_shape = getCursorShape(this);
return 0;
}
static void updateLineN(screen_t *this, const void *line, int y, int len)
{
if (y >= 0 && y < this->data->rows && len > 0 && len <= 2*this->data->cols)
movedata(_my_ds(), (unsigned)line, dossel, co80+y*this->data->cols*2, len);
static void updateLineN(screen_t *this, const void *line, int y, int len) {
if (y >= 0 && y < this->data->rows && len > 0 && len <= 2 * this->data->cols)
movedata(_my_ds(), (unsigned) line, dossel, co80 + y * this->data->cols * 2, len);
}
static void clearLine(screen_t *this, int y)
{
if (y >= 0 && y < this->data->rows)
{
static void clearLine(screen_t *this, int y) {
if (y >= 0 && y < this->data->rows) {
unsigned sp = co80 + y * this->data->cols * 2;
Cell a = this->data->empty_cell;
int i = this->data->cols;
@@ -385,51 +309,43 @@ static void clearLine(screen_t *this, int y)
}
}
static void clear(screen_t *this)
{
static void clear(screen_t *this) {
unsigned char attr = ScreenAttrib;
ScreenAttrib = this->data->empty_attr;
ScreenClear();
ScreenAttrib = attr;
}
static int scrollUp(screen_t *this, int lines)
{
static int scrollUp(screen_t *this, int lines) {
int sr = this->data->rows;
int sc = this->data->cols;
int y;
if (lines <= 0 || lines > sr)
return 0;
#if USE_SCROLLBACK
/* copy to scrollback buffer */
for (y = 0; y < lines; y++)
{
Cell buf[ sc ];
movedata(dossel, co80+y*this->data->cols*2, _my_ds(), (unsigned)buf, sizeof(buf));
for (y = 0; y < lines; y++) {
Cell buf[sc];
movedata(dossel, co80 + y * this->data->cols * 2, _my_ds(), (unsigned) buf, sizeof(buf));
sb_push(this, buf, sizeof(buf));
}
#endif
/* move screen up */
if (lines < sr)
movedata(dossel, co80+lines*sc*2, dossel,co80, (sr-lines)*sc*2);
movedata(dossel, co80 + lines * sc * 2, dossel, co80, (sr - lines) * sc * 2);
/* fill in blank lines at bottom */
for (y = sr - lines; y < sr; y++)
clearLine(this,y);
clearLine(this, y);
this->data->scroll_counter += lines;
return lines;
}
static int scrollDown(screen_t *this, int lines)
{
static int scrollDown(screen_t *this, int lines) {
int sr = this->data->rows;
int sc = this->data->cols;
int y;
@@ -438,26 +354,24 @@ static int scrollDown(screen_t *this, int lines)
return 0;
/* move screen down */
if (lines < sr)
{
if (lines < sr) {
/* !@#% movedata can't handle overlapping regions... */
/* movedata(dossel,co80,dossel,co80+lines*sc*2,(sr-lines)*sc*2); */
Cell buf[ (sr-lines)*sc ];
movedata(dossel,co80,_my_ds(),(unsigned)buf,sizeof(buf));
movedata(_my_ds(),(unsigned)buf,dossel,co80+lines*sc*2,sizeof(buf));
Cell buf[(sr - lines) * sc];
movedata(dossel, co80, _my_ds(), (unsigned) buf, sizeof(buf));
movedata(_my_ds(), (unsigned) buf, dossel, co80 + lines * sc * 2, sizeof(buf));
}
/* copy top lines from scrollback buffer */
for (y = lines; --y >= 0; )
{
for (y = lines; --y >= 0;) {
#if USE_SCROLLBACK
const Cell *buf = sb_pop(this);
if (buf == NULL)
clearLine(this,y);
clearLine(this, y);
else
updateLineN(this,buf,y,sc*2);
updateLineN(this, buf, y, sc * 2);
#else
clearLine(this,y);
clearLine(this, y);
#endif
}
@@ -465,22 +379,14 @@ static int scrollDown(screen_t *this, int lines)
return lines;
}
static int getScrollCounter(const screen_t *this) { return this->data->scroll_counter; }
static int getScrollCounter(const screen_t *this)
{
return this->data->scroll_counter;
}
static int s_kbhit(screen_t *this)
{
static int s_kbhit(screen_t *this) {
UNUSED(this);
return kbhit();
}
static int intro(screen_t *this, void (*show_frames)(screen_t *) )
{
static int intro(screen_t *this, void (*show_frames)(screen_t *)) {
int shape;
upx_uint16_t old_flags = __djgpp_hwint_flags;
@@ -493,7 +399,7 @@ static int intro(screen_t *this, void (*show_frames)(screen_t *) )
shape = hideCursor(this);
show_frames(this);
setCursorShape(this,shape);
setCursorShape(this, shape);
while (kbhit())
(void) getkey();
@@ -502,65 +408,32 @@ static int intro(screen_t *this, void (*show_frames)(screen_t *) )
return 1;
}
static void atExit(void)
{
static void atExit(void) {
static int done = 0;
if (done) return;
if (done)
return;
done = 1;
if (ae.cursor_shape >= 0)
setCursorShape(NULL,ae.cursor_shape);
setCursorShape(NULL, ae.cursor_shape);
}
static const screen_t driver =
{
sobject_destroy,
0, /* finalize, */
atExit,
init,
refresh,
getMode,
getPage,
getRows,
getCols,
isMono,
getFg,
getBg,
getCursor,
getCursorShape,
setFg,
setBg,
setCursor,
setCursorShape,
hideCursor,
putChar,
putCharAttr,
putString,
putStringAttr,
clear,
clearLine,
updateLineN,
scrollUp,
scrollDown,
getScrollCounter,
s_kbhit,
intro,
(struct screen_data_t *) 0
};
static const screen_t driver = {sobject_destroy, 0, /* finalize, */
atExit, init, refresh,
getMode, getPage, getRows,
getCols, isMono, getFg,
getBg, getCursor, getCursorShape,
setFg, setBg, setCursor,
setCursorShape, hideCursor, putChar,
putCharAttr, putString, putStringAttr,
clear, clearLine, updateLineN,
scrollUp, scrollDown, getScrollCounter,
s_kbhit, intro, (struct screen_data_t *) 0};
/* public constructor */
screen_t *screen_djgpp2_construct(void)
{
return sobject_construct(&driver,sizeof(*driver.data));
}
screen_t *screen_djgpp2_construct(void) { return sobject_construct(&driver, sizeof(*driver.data)); }
#endif /* (USE_SCREEN) && defined(__DJGPP__) */
/*
vi:ts=4:et
*/