jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions 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/Makefile
+1
View File
@@ -129,6 +129,7 @@ else
endif
CLANG_FORMAT_FILES += s_djgpp2.cpp s_object.cpp s_vcsa.cpp s_win32.cpp screen.h
CLANG_FORMAT_FILES += snprintf.cpp
CLANG_FORMAT_FILES += stdcxx.h stdcxx.cpp
clang-format:
src/s_djgpp2.cpp
+62 -189
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
**************************************************************************/
@@ -59,8 +57,7 @@
#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)
{
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)
{
UNUSED(this);
}
static __inline__
Cell make_cell(screen_t *this, int ch, int attr)
{
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)
{
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,65 +160,52 @@ 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);
#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);
}
static void putChar(screen_t *this, int ch, int x, int 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);
}
static void putString(screen_t *this, const char *s, int x, int 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);
}
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... */
@@ -281,17 +218,13 @@ static void setCursorShape(screen_t *this, int shape)
__dpmi_int(0x10, &r);
}
static int hideCursor(screen_t *this)
{
static int hideCursor(screen_t *this) {
int shape = getCursorShape(this);
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,8 +257,7 @@ 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;
@@ -334,17 +266,14 @@ static int init(screen_t *this, int fd)
__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);
@@ -361,18 +290,13 @@ static int init(screen_t *this, int fd)
return 0;
}
static void updateLineN(screen_t *this, const void *line, int y, int 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,30 +309,24 @@ 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++)
{
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));
@@ -427,9 +345,7 @@ static int scrollUp(screen_t *this, int 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,8 +354,7 @@ 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];
@@ -448,8 +363,7 @@ static int scrollDown(screen_t *this, int lines)
}
/* 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)
@@ -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;
@@ -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);
}
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
*/
src/s_object.cpp
+5 -19
View File
@@ -25,7 +25,6 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/
#include "conf.h"
#if (USE_SCREEN)
@@ -34,7 +33,6 @@
#include "screen.h"
/*************************************************************************
//
**************************************************************************/
@@ -42,19 +40,13 @@
// ugly hacks
static screen_t *last_screen = NULL;
screen_t *sobject_get_screen(void)
{
return last_screen;
}
screen_t *sobject_get_screen(void) { return last_screen; }
void sobject_destroy(screen_t *this)
{
void sobject_destroy(screen_t *this) {
last_screen = NULL;
if (!this)
return;
if (this->data)
{
if (this->data) {
if (this->finalize)
this->finalize(this);
free(this->data);
@@ -63,9 +55,7 @@ void sobject_destroy(screen_t *this)
free(this);
}
screen_t *sobject_construct(const screen_t *c, size_t data_size)
{
screen_t *sobject_construct(const screen_t *c, size_t data_size) {
screen_t *this;
last_screen = NULL;
@@ -80,8 +70,7 @@ screen_t *sobject_construct(const screen_t *c, size_t data_size)
/* initialize instance variables */
this->data = (struct screen_data_t *) malloc(data_size);
if (!this->data)
{
if (!this->data) {
free(this);
return NULL;
}
@@ -91,11 +80,8 @@ screen_t *sobject_construct(const screen_t *c, size_t data_size)
return this;
}
#endif /* (USE_SCREEN) */
/*
vi:ts=4:et
*/
src/s_vcsa.cpp
+67 -190
View File
@@ -25,7 +25,6 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/
#include "conf.h"
#if (USE_SCREEN) && (USE_SCREEN_VCSA)
@@ -39,7 +38,6 @@
/* #define USE_SCROLLBACK 1 */
/*************************************************************************
// direct screen access ( /dev/vcsaNN )
**************************************************************************/
@@ -53,11 +51,9 @@
#include <linux/major.h>
#endif
#define Cell upx_uint16_t
struct screen_data_t
{
struct screen_data_t {
int fd;
int mode;
int page;
@@ -79,23 +75,19 @@ struct screen_data_t
#endif /* USE_SCROLLBACK */
};
#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)
{
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);
@@ -103,94 +95,50 @@ 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)
{
UNUSED(this);
}
static __inline__
Cell make_cell(screen_t *this, int ch, int attr)
{
static __inline__ Cell make_cell(screen_t *this, int ch, int attr) {
return ((attr & 0xff) << 8) | (this->data->map[ch & 0xff] & 0xff);
}
static int getMode(const screen_t *this) { return this->data->mode; }
static int getMode(const screen_t *this)
{
return this->data->mode;
}
static int getPage(const screen_t *this) { return this->data->page; }
static int getRows(const screen_t *this) { return this->data->rows; }
static int getPage(const screen_t *this)
{
return this->data->page;
}
static int getCols(const screen_t *this) { return this->data->cols; }
static int getRows(const screen_t *this)
{
return this->data->rows;
}
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) {
/* FIXME */
UNUSED(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);
}
/* private */
static int gotoxy(screen_t *this, int x, int y)
{
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows)
{
if (lseek(this->data->fd, 4 + (x + y * this->data->cols) * 2, SEEK_SET) != -1)
{
static int gotoxy(screen_t *this, int x, int y) {
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows) {
if (lseek(this->data->fd, 4 + (x + y * this->data->cols) * 2, SEEK_SET) != -1) {
return 0;
}
}
return -1;
}
static void setCursor(screen_t *this, int x, int y)
{
if (gotoxy(this,x,y) == 0)
{
static void setCursor(screen_t *this, int x, int y) {
if (gotoxy(this, x, y) == 0) {
unsigned char b[2] = {x, y};
if (lseek(this->data->fd, 2, SEEK_SET) != -1)
write(this->data->fd, b, 2);
@@ -199,67 +147,53 @@ static void setCursor(screen_t *this, int x, int y)
}
}
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
if (lseek(this->data->fd, 2, SEEK_SET) != -1)
{
if (lseek(this->data->fd, 2, SEEK_SET) != -1) {
unsigned char b[2];
if (read(this->data->fd, b, 2) == 2)
{
if (b[0] < this->data->cols && b[1] < this->data->rows)
{
if (read(this->data->fd, b, 2) == 2) {
if (b[0] < this->data->cols && b[1] < this->data->rows) {
cx = b[0];
cy = b[1];
}
}
}
#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) {
Cell a = make_cell(this, ch, attr);
if (gotoxy(this, x, y) == 0)
write(this->data->fd, &a, 2);
}
static void putChar(screen_t *this, int ch, int x, int y)
{
static void putChar(screen_t *this, int ch, int x, int y) {
putCharAttr(this, 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) {
assert((int) strlen(s) <= 256);
assert(x + (int) strlen(s) <= this->data->cols);
while (*s)
putCharAttr(this, *s++, attr, x++, y);
}
static void putString(screen_t *this, const char *s, int x, int y)
{
static void putString(screen_t *this, const char *s, int x, int y) {
putStringAttr(this, 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) {
upx_uint16_t a;
if (gotoxy(this,x,y) == 0 && read(this->data->fd, &a, 2) == 2)
{
if (gotoxy(this, x, y) == 0 && read(this->data->fd, &a, 2) == 2) {
if (ch)
*ch = a & 0xff;
if (attr)
@@ -267,19 +201,15 @@ static void getChar(screen_t *this, int *ch, int *attr, int x, int y)
}
}
/* private */
static int init_scrnmap(screen_t *this, int fd)
{
static int init_scrnmap(screen_t *this, int fd) {
int scrnmap_done = 0;
int i;
#if 1 && defined(GIO_UNISCRNMAP) && defined(E_TABSZ)
if (!scrnmap_done)
{
if (!scrnmap_done) {
upx_uint16_t scrnmap[E_TABSZ];
if (ioctl(fd, GIO_UNISCRNMAP, scrnmap) == 0)
{
if (ioctl(fd, GIO_UNISCRNMAP, scrnmap) == 0) {
for (i = 0; i < E_TABSZ; i++)
this->data->map[scrnmap[i] & 0xff] = i;
scrnmap_done = 1;
@@ -287,11 +217,9 @@ static int init_scrnmap(screen_t *this, int fd)
}
#endif
#if 1 && defined(GIO_SCRNMAP) && defined(E_TABSZ)
if (!scrnmap_done)
{
if (!scrnmap_done) {
unsigned char scrnmap[E_TABSZ];
if (ioctl(fd, GIO_SCRNMAP, scrnmap) == 0)
{
if (ioctl(fd, GIO_SCRNMAP, scrnmap) == 0) {
for (i = 0; i < E_TABSZ; i++)
this->data->map[scrnmap[i] & 0xff] = i;
scrnmap_done = 1;
@@ -302,9 +230,7 @@ static int init_scrnmap(screen_t *this, int fd)
return scrnmap_done;
}
static int init(screen_t *this, int fd)
{
static int init(screen_t *this, int fd) {
struct stat st;
if (!this || !this->data)
@@ -325,8 +251,7 @@ static int init(screen_t *this, int fd)
/* check if we are running in a virtual console */
#if defined(MINOR) && defined(MAJOR) && defined(TTY_MAJOR)
if (MAJOR(st.st_rdev) == TTY_MAJOR)
{
if (MAJOR(st.st_rdev) == TTY_MAJOR) {
char vc_name[64];
unsigned char vc_data[4];
int i;
@@ -335,15 +260,12 @@ static int init(screen_t *this, int fd)
upx_snprintf(vc_name, sizeof(vc_name), "/dev/vcsa%d", (int) MINOR(st.st_rdev));
this->data->fd = open(vc_name, O_RDWR);
if (this->data->fd == -1)
{
if (this->data->fd == -1) {
upx_snprintf(vc_name, sizeof(vc_name), "/dev/vcc/a%d", (int) MINOR(st.st_rdev));
this->data->fd = open(vc_name, O_RDWR);
}
if (this->data->fd != -1)
{
if (read(this->data->fd, vc_data, 4) == 4)
{
if (this->data->fd != -1) {
if (read(this->data->fd, vc_data, 4) == 4) {
this->data->mode = 3;
this->data->rows = vc_data[0];
this->data->cols = vc_data[1];
@@ -352,8 +274,7 @@ static int init(screen_t *this, int fd)
for (i = 0; i < 256; i++)
this->data->map[i] = i;
i = init_scrnmap(this,this->data->fd) ||
init_scrnmap(this,STDIN_FILENO);
i = init_scrnmap(this, this->data->fd) || init_scrnmap(this, STDIN_FILENO);
getChar(this, NULL, &attr, this->data->cursor_x, this->data->cursor_y);
this->data->init_attr = attr;
@@ -361,9 +282,7 @@ static int init(screen_t *this, int fd)
a = make_cell(this, ' ', attr);
for (i = 0; i < 256; i++)
this->data->empty_line[i] = a;
}
else
{
} else {
close(this->data->fd);
this->data->fd = -1;
}
@@ -377,25 +296,19 @@ static int init(screen_t *this, int fd)
return 0;
}
static void finalize(screen_t *this)
{
static void finalize(screen_t *this) {
if (this->data->fd != -1)
(void) close(this->data->fd);
}
static void updateLineN(screen_t *this, const void *line, int y, int len)
{
if (len > 0 && len <= 2*this->data->cols && gotoxy(this,0,y) == 0)
{
static void updateLineN(screen_t *this, const void *line, int y, int len) {
if (len > 0 && len <= 2 * this->data->cols && gotoxy(this, 0, y) == 0) {
int i;
unsigned char new_line[len];
unsigned char *l1 = new_line;
const unsigned char *l2 = (const unsigned char *) line;
for (i = 0; i < len; i += 2)
{
for (i = 0; i < len; i += 2) {
*l1++ = *l2++;
*l1++ = this->data->map[*l2++];
}
@@ -403,25 +316,19 @@ static void updateLineN(screen_t *this, const void *line, int y, int len)
}
}
static void clearLine(screen_t *this, int y)
{
static void clearLine(screen_t *this, int y) {
if (gotoxy(this, 0, y) == 0)
write(this->data->fd, this->data->empty_line, 2 * this->data->cols);
}
static void clear(screen_t *this)
{
static void clear(screen_t *this) {
int y;
for (y = 0; y < this->data->rows; y++)
clearLine(this, y);
}
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;
@@ -431,8 +338,7 @@ static int scrollUp(screen_t *this, int lines)
#if USE_SCROLLBACK
/* copy to scrollback buffer */
for (y = 0; y < lines; y++)
{
for (y = 0; y < lines; y++) {
Cell buf[sc];
gotoxy(this, 0, y);
read(this->data->fd, buf, sizeof(buf));
@@ -441,8 +347,7 @@ static int scrollUp(screen_t *this, int lines)
#endif
/* move screen up */
if (lines < sr)
{
if (lines < sr) {
Cell buf[(sr - lines) * sc];
gotoxy(this, 0, lines);
read(this->data->fd, buf, sizeof(buf));
@@ -458,9 +363,7 @@ static int scrollUp(screen_t *this, int 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;
@@ -469,8 +372,7 @@ static int scrollDown(screen_t *this, int lines)
return 0;
/* move screen down */
if (lines < sr)
{
if (lines < sr) {
Cell buf[(sr - lines) * sc];
gotoxy(this, 0, 0);
read(this->data->fd, buf, sizeof(buf));
@@ -479,8 +381,7 @@ static int scrollDown(screen_t *this, int lines)
}
/* 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)
@@ -496,29 +397,19 @@ 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 getCursorShape(const screen_t *this)
{
static int getCursorShape(const screen_t *this) {
UNUSED(this);
return 0;
}
static void setCursorShape(screen_t *this, int shape)
{
static void setCursorShape(screen_t *this, int shape) {
UNUSED(this);
UNUSED(shape);
}
static int kbhit(screen_t *this)
{
static int kbhit(screen_t *this) {
const int fd = STDIN_FILENO;
const unsigned usec = 0;
struct timeval tv;
@@ -532,9 +423,7 @@ static int kbhit(screen_t *this)
return (select(fd + 1, &fds, NULL, NULL, &tv) > 0);
}
static int intro(screen_t *this, void (*show_frames)(screen_t *) )
{
static int intro(screen_t *this, void (*show_frames)(screen_t *)) {
int shape;
struct termios term_old, term_new;
int term_r;
@@ -543,8 +432,7 @@ static int intro(screen_t *this, void (*show_frames)(screen_t *) )
return 0;
term_r = tcgetattr(STDIN_FILENO, &term_old);
if (term_r == 0)
{
if (term_r == 0) {
term_new = term_old;
term_new.c_lflag &= ~(ISIG | ICANON | ECHO);
tcsetattr(STDIN_FILENO, TCSANOW, &term_new);
@@ -565,10 +453,7 @@ static int intro(screen_t *this, void (*show_frames)(screen_t *) )
return 1;
}
static const screen_t driver =
{
sobject_destroy,
static const screen_t driver = {sobject_destroy,
finalize,
0, /* atExit */
init,
@@ -599,21 +484,13 @@ static const screen_t driver =
getScrollCounter,
kbhit,
intro,
(struct screen_data_t *) 0
};
(struct screen_data_t *) 0};
/* public constructor */
screen_t *screen_vcsa_construct(void)
{
return sobject_construct(&driver,sizeof(*driver.data));
}
screen_t *screen_vcsa_construct(void) { return sobject_construct(&driver, sizeof(*driver.data)); }
#endif /* (USE_SCREEN) && (USE_SCREEN_VCSA) */
/*
vi:ts=4:et
*/
src/s_win32.cpp
+60 -178
View File
@@ -25,7 +25,6 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/
#include "conf.h"
#if (USE_SCREEN_WIN32)
@@ -37,7 +36,6 @@
#define mask_fg 0x0f
#define mask_bg 0xf0
/*************************************************************************
// direct screen access
**************************************************************************/
@@ -56,9 +54,7 @@
#include <conio.h>
#endif
struct screen_data_t
{
struct screen_data_t {
HANDLE hi;
HANDLE ho;
CONSOLE_SCREEN_BUFFER_INFO csbi;
@@ -80,90 +76,52 @@ struct screen_data_t
CHAR_INFO empty_line[256];
};
#define P(x) ((SHORT)(x))
static const COORD pos00 = {0, 0};
static const COORD size11 = {1, 1};
/* atExit information */
static struct
{
static struct {
int is_valid;
HANDLE ho;
CONSOLE_CURSOR_INFO cci;
} ae;
static void refresh(screen_t *this) { UNUSED(this); }
static void refresh(screen_t *this)
{
UNUSED(this);
}
static int getMode(const screen_t *this) { return this->data->mode; }
static int getMode(const screen_t *this)
{
return this->data->mode;
}
static int getPage(const screen_t *this)
{
static int getPage(const screen_t *this) {
UNUSED(this);
return 0;
}
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) {
UNUSED(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 = (WORD)((this->data->attr & mask_bg) | (fg & mask_fg));
SetConsoleTextAttribute(this->data->ho, this->data->attr);
}
static void setBg(screen_t *this, int bg)
{
static void setBg(screen_t *this, int bg) {
this->data->attr = (WORD)((this->data->attr & mask_fg) | (bg & mask_bg));
SetConsoleTextAttribute(this->data->ho, this->data->attr);
}
static void setCursor(screen_t *this, int x, int y)
{
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows)
{
static void setCursor(screen_t *this, int x, int y) {
if (x >= 0 && y >= 0 && x < this->data->cols && y < this->data->rows) {
COORD coord = {P(x), P(y)};
SetConsoleCursorPosition(this->data->ho, coord);
this->data->cursor_x = x;
@@ -171,15 +129,12 @@ static void setCursor(screen_t *this, int x, int y)
}
}
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
CONSOLE_SCREEN_BUFFER_INFO csbi;
if (GetConsoleScreenBufferInfo(this->data->ho, &csbi))
{
if (GetConsoleScreenBufferInfo(this->data->ho, &csbi)) {
cx = csbi.dwCursorPosition.X;
cy = csbi.dwCursorPosition.Y;
#if 0
@@ -188,13 +143,13 @@ static void getCursor(const screen_t *this, int *x, int *y)
#endif
}
#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) {
CHAR_INFO ci;
SMALL_RECT region = {P(x), P(y), P(x), P(y)};
ci.Char.UnicodeChar = 0;
@@ -203,15 +158,11 @@ static void putCharAttr(screen_t *this, int ch, int attr, int x, int y)
WriteConsoleOutputA(this->data->ho, &ci, size11, pos00, &region);
}
static void putChar(screen_t *this, int ch, int x, int y)
{
static void putChar(screen_t *this, int ch, int x, int y) {
this->putCharAttr(this, 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) {
int i;
int l = (int) strlen(s);
if (l <= 0)
@@ -221,8 +172,7 @@ static void putStringAttr(screen_t *this, const char *s, int attr, int x, int y)
CHAR_INFO ci[256];
COORD size = {P(l), 1};
SMALL_RECT region = {P(x), P(y), P(x + l - 1), P(y)};
for (i = 0; i < l; i++)
{
for (i = 0; i < l; i++) {
ci[i].Char.UnicodeChar = 0;
ci[i].Char.AsciiChar = *s++;
ci[i].Attributes = (WORD) attr;
@@ -230,58 +180,45 @@ static void putStringAttr(screen_t *this, const char *s, int attr, int x, int y)
WriteConsoleOutputA(this->data->ho, &ci[0], size, pos00, &region);
}
static void putString(screen_t *this, const char *s, int x, int y)
{
static void putString(screen_t *this, const char *s, int x, int y) {
this->putStringAttr(this, s, this->data->attr, x, y);
}
/* private */
static int cci2shape(const CONSOLE_CURSOR_INFO *cci)
{
static int cci2shape(const CONSOLE_CURSOR_INFO *cci) {
int shape = cci->dwSize & 255;
if (!cci->bVisible)
shape |= 0x2000;
return shape;
}
static int getCursorShape(const screen_t *this)
{
static int getCursorShape(const screen_t *this) {
CONSOLE_CURSOR_INFO cci;
GetConsoleCursorInfo(this->data->ho, &cci);
return cci2shape(&cci);
}
static void setCursorShape(screen_t *this, int shape)
{
static void setCursorShape(screen_t *this, int shape) {
CONSOLE_CURSOR_INFO cci;
cci.dwSize = shape & 255;
cci.bVisible = (shape & 0x2000) ? 0 : 1;
SetConsoleCursorInfo(this->data->ho, &cci);
}
static int hideCursor(screen_t *this)
{
static int hideCursor(screen_t *this) {
CONSOLE_CURSOR_INFO cci;
int shape;
GetConsoleCursorInfo(this->data->ho, &cci);
shape = cci2shape(&cci);
if (cci.bVisible)
{
if (cci.bVisible) {
cci.bVisible = 0;
SetConsoleCursorInfo(this->data->ho, &cci);
}
return shape;
}
static int init(screen_t *this, int fd)
{
static int init(screen_t *this, int fd) {
HANDLE hi, ho;
CONSOLE_SCREEN_BUFFER_INFO *csbi;
DWORD mode;
@@ -350,11 +287,8 @@ static int init(screen_t *this, int fd)
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)
{
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) {
#if 0
const char *s = (const char *) line;
int l = len / 2;
@@ -376,33 +310,25 @@ static void updateLineN(screen_t *this, const void *line, int y, int 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) {
COORD size = {P(this->data->cols), 1};
SMALL_RECT region = {0, P(y), P(this->data->cols - 1), P(y)};
WriteConsoleOutputA(this->data->ho, this->data->empty_line, size, pos00, &region);
}
}
static void clear(screen_t *this)
{
static void clear(screen_t *this) {
int y;
for (y = 0; y < this->data->rows; y++)
this->clearLine(this, y);
}
/* private */
static int do_scroll(screen_t *this, int lines, int way)
{
static int do_scroll(screen_t *this, int lines, int way) {
if (lines <= 0 || lines > this->data->rows)
return 0;
if (lines == this->data->rows)
{
if (lines == this->data->rows) {
this->clear(this);
return lines;
}
@@ -410,8 +336,7 @@ static int do_scroll(screen_t *this, int lines, int way)
SMALL_RECT rect = {0, 0, P(this->data->cols - 1), P(this->data->rows - 1)};
// SMALL_RECT clip = rect;
COORD dest = {0, 0};
switch (way)
{
switch (way) {
case 0:
rect.Top = P(rect.Top + lines);
break;
@@ -426,28 +351,21 @@ static int do_scroll(screen_t *this, int lines, int way)
return lines;
}
static int scrollUp(screen_t *this, int lines)
{
static int scrollUp(screen_t *this, int lines) {
lines = do_scroll(this, lines, 0);
this->data->scroll_counter += lines;
return lines;
}
static int scrollDown(screen_t *this, int lines)
{
static int scrollDown(screen_t *this, int lines) {
lines = do_scroll(this, lines, 1);
this->data->scroll_counter -= 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);
#if (HAVE_CONIO_H)
#if defined(__RSXNT__)
@@ -462,74 +380,38 @@ static int s_kbhit(screen_t *this)
#endif
}
static int intro(screen_t *this, void (*show_frames)(screen_t *) )
{
static int intro(screen_t *this, void (*show_frames)(screen_t *)) {
UNUSED(this);
UNUSED(show_frames);
return 0;
}
static void atExit(void)
{
static void atExit(void) {
static int done = 0;
if (done) return;
if (done)
return;
done = 1;
if (ae.is_valid)
{
if (ae.is_valid) {
}
}
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_win32_construct(void)
{
return sobject_construct(&driver,sizeof(*driver.data));
}
screen_t *screen_win32_construct(void) { return sobject_construct(&driver, sizeof(*driver.data)); }
#endif /* (USE_SCREEN_WIN32) */
/*
vi:ts=4:et
*/
src/screen.h
+1 -8
View File
@@ -25,13 +25,11 @@
<markus@oberhumer.com> <ml1050@users.sourceforge.net>
*/
#ifndef __UPX_SCREEN_H
#define __UPX_SCREEN_H 1
#if (USE_SCREEN)
/*************************************************************************
//
**************************************************************************/
@@ -40,8 +38,7 @@ struct screen_data_t;
struct screen_t;
typedef struct screen_t screen_t;
struct screen_t
{
struct screen_t {
/* public: */
void (*destroy)(screen_t *s);
void (*finalize)(screen_t *s);
@@ -89,7 +86,6 @@ struct screen_t
struct screen_data_t *data;
};
screen_t *sobject_construct(const screen_t *c, size_t data_size);
void sobject_destroy(screen_t *);
screen_t *sobject_get_screen(void);
@@ -101,13 +97,10 @@ screen_t *screen_win32_construct(void);
void screen_show_frames(screen_t *);
#endif /* USE_SCREEN */
#endif /* already included */
/*
vi:ts=4:et
*/