mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Minor screen cleanup.

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2016-09-21 17:43:32 +02:00
parent b3121e4534
commit 104da198d3
5 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/s_djgpp2.cpp
View File

@ -32,7 +32,7 @@
#include "screen.h" #include "screen.h"
#define this local_this #define this self
#define mask_fg 0x0f #define mask_fg 0x0f
#define mask_bg 0xf0 #define mask_bg 0xf0
@ -57,6 +57,7 @@
#define co80 _go32_info_block.linear_address_of_primary_screen #define co80 _go32_info_block.linear_address_of_primary_screen
#undef kbhit #undef kbhit
#define Cell upx_uint16_t
struct screen_data_t struct screen_data_t
{ {
@ -69,10 +70,10 @@ struct screen_data_t
unsigned char attr; unsigned char attr;
unsigned char init_attr; unsigned char init_attr;
unsigned char empty_attr; unsigned char empty_attr;
unsigned short empty_cell; Cell empty_cell;
#if USE_SCROLLBACK #if USE_SCROLLBACK
/* scrollback buffer */ /* scrollback buffer */
unsigned short sb_buf[32][256]; Cell sb_buf[32][256];
int sb_size; int sb_size;
int sb_base; int sb_base;
int sb_sp; int sb_sp;
@ -95,19 +96,19 @@ static __inline__ void sb_add(screen_t *this, int *val, int inc)
*val = (*val + inc) & (this->data->sb_size - 1); *val = (*val + inc) & (this->data->sb_size - 1);
} }
static void sb_push(screen_t *this, const unsigned short *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); memcpy(this->data->sb_buf[this->data->sb_sp],line,len);
sb_add(this,&this->data->sb_sp,1); sb_add(this,&this->data->sb_sp,1);
if (this->data->sb_sp == this->data->sb_base) if (this->data->sb_sp == this->data->sb_base)
sb_add(this,&this->data->sb_base,1); sb_add(this, &this->data->sb_base, 1);
} }
static const unsigned short *sb_pop(screen_t *this) static const Cell *sb_pop(screen_t *this)
{ {
if (this->data->sb_sp == this->data->sb_base) if (this->data->sb_sp == this->data->sb_base)
return NULL; return NULL;
sb_add(this,&this->data->sb_sp,-1); sb_add(this, &this->data->sb_sp, -1);
return this->data->sb_buf[this->data->sb_sp]; return this->data->sb_buf[this->data->sb_sp];
} }
#endif /* USE_SCROLLBACK */ #endif /* USE_SCROLLBACK */
@ -120,10 +121,10 @@ static void refresh(screen_t *this)
static __inline__ static __inline__
unsigned short make_cell(screen_t *this, int ch, int attr) Cell make_cell(screen_t *this, int ch, int attr)
{ {
UNUSED(this); UNUSED(this);
return (unsigned short) (((attr & 0xff) << 8) | (ch & 0xff)); return (Cell) (((attr & 0xff) << 8) | (ch & 0xff));
} }
@ -270,7 +271,7 @@ static void setCursorShape(screen_t *this, int shape)
{ {
__dpmi_regs r; __dpmi_regs r;
memset(&r,0,sizeof(r)); /* just in case... */ memset(&r, 0, sizeof(r)); /* just in case... */
r.x.ax = 0x0103; r.x.ax = 0x0103;
#if 1 #if 1
if (this) if (this)
@ -339,8 +340,8 @@ static int init(screen_t *this, int fd)
if (mode != 2 && mode != 3 && mode != 7) if (mode != 2 && mode != 3 && mode != 7)
return -1; return -1;
} }
ScreenGetCursor(&this->data->cursor_y,&this->data->cursor_x); ScreenGetCursor(&this->data->cursor_y, &this->data->cursor_x);
getChar(this,NULL,&attr,this->data->cursor_x,this->data->cursor_y); getChar(this, NULL, &attr, this->data->cursor_x, this->data->cursor_y);
this->data->init_attr = attr; this->data->init_attr = attr;
if (mode != 7) if (mode != 7)
{ {
@ -364,7 +365,7 @@ static int init(screen_t *this, int fd)
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) 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); movedata(_my_ds(), (unsigned)line, dossel, co80+y*this->data->cols*2, len);
} }
@ -373,7 +374,7 @@ static void clearLine(screen_t *this, int y)
if (y >= 0 && y < this->data->rows) if (y >= 0 && y < this->data->rows)
{ {
unsigned sp = co80 + y * this->data->cols * 2; unsigned sp = co80 + y * this->data->cols * 2;
unsigned short a = this->data->empty_cell; Cell a = this->data->empty_cell;
int i = this->data->cols; int i = this->data->cols;
_farsetsel(dossel); _farsetsel(dossel);
@ -408,15 +409,15 @@ static int scrollUp(screen_t *this, int lines)
/* copy to scrollback buffer */ /* copy to scrollback buffer */
for (y = 0; y < lines; y++) for (y = 0; y < lines; y++)
{ {
unsigned short buf[ sc ]; Cell buf[ sc ];
movedata(dossel,co80+y*this->data->cols*2,_my_ds(),(unsigned)buf,sizeof(buf)); movedata(dossel, co80+y*this->data->cols*2, _my_ds(), (unsigned)buf, sizeof(buf));
sb_push(this,buf,sizeof(buf)); sb_push(this, buf, sizeof(buf));
} }
#endif #endif
/* move screen up */ /* move screen up */
if (lines < sr) 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 */ /* fill in blank lines at bottom */
for (y = sr - lines; y < sr; y++) for (y = sr - lines; y < sr; y++)
@ -441,7 +442,7 @@ static int scrollDown(screen_t *this, int lines)
{ {
/* !@#% movedata can't handle overlapping regions... */ /* !@#% movedata can't handle overlapping regions... */
/* movedata(dossel,co80,dossel,co80+lines*sc*2,(sr-lines)*sc*2); */ /* movedata(dossel,co80,dossel,co80+lines*sc*2,(sr-lines)*sc*2); */
unsigned short buf[ (sr-lines)*sc ]; Cell buf[ (sr-lines)*sc ];
movedata(dossel,co80,_my_ds(),(unsigned)buf,sizeof(buf)); movedata(dossel,co80,_my_ds(),(unsigned)buf,sizeof(buf));
movedata(_my_ds(),(unsigned)buf,dossel,co80+lines*sc*2,sizeof(buf)); movedata(_my_ds(),(unsigned)buf,dossel,co80+lines*sc*2,sizeof(buf));
} }
@ -450,7 +451,7 @@ static int scrollDown(screen_t *this, int lines)
for (y = lines; --y >= 0; ) for (y = lines; --y >= 0; )
{ {
#if USE_SCROLLBACK #if USE_SCROLLBACK
const unsigned short *buf = sb_pop(this); const Cell *buf = sb_pop(this);
if (buf == NULL) if (buf == NULL)
clearLine(this,y); clearLine(this,y);
else else
@ -481,7 +482,7 @@ static int s_kbhit(screen_t *this)
static int intro(screen_t *this, void (*show_frames)(screen_t *) ) static int intro(screen_t *this, void (*show_frames)(screen_t *) )
{ {
int shape; int shape;
unsigned short old_flags = __djgpp_hwint_flags; upx_uint16_t old_flags = __djgpp_hwint_flags;
if ((this->data->init_attr & mask_bg) != BG_BLACK) if ((this->data->init_attr & mask_bg) != BG_BLACK)
return 0; return 0;

2
src/s_object.cpp
View File

@ -30,7 +30,7 @@
#if (USE_SCREEN) #if (USE_SCREEN)
#define this local_this #define this self
#include "screen.h" #include "screen.h"

32
src/s_vcsa.cpp
View File

@ -32,7 +32,7 @@
#include "screen.h" #include "screen.h"
#define this local_this #define this self
#define mask_fg 0x0f #define mask_fg 0x0f
#define mask_bg 0xf0 #define mask_bg 0xf0
@ -54,6 +54,8 @@
#endif #endif
#define Cell upx_uint16_t
struct screen_data_t struct screen_data_t
{ {
int fd; int fd;
@ -67,10 +69,10 @@ struct screen_data_t
unsigned char attr; unsigned char attr;
unsigned char init_attr; unsigned char init_attr;
unsigned char map[256]; unsigned char map[256];
unsigned short empty_line[256]; Cell empty_line[256];
#if USE_SCROLLBACK #if USE_SCROLLBACK
/* scrollback buffer */ /* scrollback buffer */
unsigned short sb_buf[32][256]; Cell sb_buf[32][256];
int sb_size; int sb_size;
int sb_base; int sb_base;
int sb_sp; int sb_sp;
@ -84,7 +86,7 @@ static __inline__ void sb_add(screen_t *this, int *val, int inc)
*val = (*val + inc) & (this->data->sb_size - 1); *val = (*val + inc) & (this->data->sb_size - 1);
} }
static void sb_push(screen_t *this, const unsigned short *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); memcpy(this->data->sb_buf[this->data->sb_sp],line,len);
sb_add(this,&this->data->sb_sp,1); sb_add(this,&this->data->sb_sp,1);
@ -92,7 +94,7 @@ static void sb_push(screen_t *this, const unsigned short *line, int len)
sb_add(this,&this->data->sb_base,1); sb_add(this,&this->data->sb_base,1);
} }
static const unsigned short *sb_pop(screen_t *this) static const Cell *sb_pop(screen_t *this)
{ {
if (this->data->sb_sp == this->data->sb_base) if (this->data->sb_sp == this->data->sb_base)
return NULL; return NULL;
@ -109,7 +111,7 @@ static void refresh(screen_t *this)
static __inline__ static __inline__
unsigned short make_cell(screen_t *this, int ch, int attr) Cell make_cell(screen_t *this, int ch, int attr)
{ {
return ((attr & 0xff) << 8) | (this->data->map[ch & 0xff] & 0xff); return ((attr & 0xff) << 8) | (this->data->map[ch & 0xff] & 0xff);
} }
@ -223,7 +225,7 @@ static void getCursor(const screen_t *this, int *x, int *y)
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)
{ {
unsigned short a = make_cell(this,ch,attr); Cell a = make_cell(this,ch,attr);
if (gotoxy(this,x,y) == 0) if (gotoxy(this,x,y) == 0)
write(this->data->fd, &a, 2); write(this->data->fd, &a, 2);
@ -254,7 +256,7 @@ static void putString(screen_t *this, const char *s, int x, int y)
/* private */ /* 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)
{ {
unsigned short a; 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)
{ {
@ -275,7 +277,7 @@ static int init_scrnmap(screen_t *this, int fd)
#if 1 && defined(GIO_UNISCRNMAP) && defined(E_TABSZ) #if 1 && defined(GIO_UNISCRNMAP) && defined(E_TABSZ)
if (!scrnmap_done) if (!scrnmap_done)
{ {
unsigned short scrnmap[E_TABSZ]; 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++) for (i = 0; i < E_TABSZ; i++)
@ -329,7 +331,7 @@ static int init(screen_t *this, int fd)
unsigned char vc_data[4]; unsigned char vc_data[4];
int i; int i;
int attr; int attr;
unsigned short a; Cell a;
upx_snprintf(vc_name, sizeof(vc_name), "/dev/vcsa%d", (int) MINOR(st.st_rdev)); upx_snprintf(vc_name, sizeof(vc_name), "/dev/vcsa%d", (int) MINOR(st.st_rdev));
this->data->fd = open(vc_name, O_RDWR); this->data->fd = open(vc_name, O_RDWR);
@ -431,7 +433,7 @@ static int scrollUp(screen_t *this, int lines)
/* copy to scrollback buffer */ /* copy to scrollback buffer */
for (y = 0; y < lines; y++) for (y = 0; y < lines; y++)
{ {
unsigned short buf[ sc ]; Cell buf[ sc ];
gotoxy(this,0,y); gotoxy(this,0,y);
read(this->data->fd, buf, sizeof(buf)); read(this->data->fd, buf, sizeof(buf));
sb_push(this,buf,sizeof(buf)); sb_push(this,buf,sizeof(buf));
@ -441,7 +443,7 @@ static int scrollUp(screen_t *this, int lines)
/* move screen up */ /* move screen up */
if (lines < sr) if (lines < sr)
{ {
unsigned short buf[ (sr-lines)*sc ]; Cell buf[ (sr-lines)*sc ];
gotoxy(this,0,lines); gotoxy(this,0,lines);
read(this->data->fd, buf, sizeof(buf)); read(this->data->fd, buf, sizeof(buf));
gotoxy(this,0,0); gotoxy(this,0,0);
@ -469,7 +471,7 @@ static int scrollDown(screen_t *this, int lines)
/* move screen down */ /* move screen down */
if (lines < sr) if (lines < sr)
{ {
unsigned short buf[ (sr-lines)*sc ]; Cell buf[ (sr-lines)*sc ];
gotoxy(this,0,0); gotoxy(this,0,0);
read(this->data->fd, buf, sizeof(buf)); read(this->data->fd, buf, sizeof(buf));
gotoxy(this,0,lines); gotoxy(this,0,lines);
@ -480,7 +482,7 @@ static int scrollDown(screen_t *this, int lines)
for (y = lines; --y >= 0; ) for (y = lines; --y >= 0; )
{ {
#if USE_SCROLLBACK #if USE_SCROLLBACK
const unsigned short *buf = sb_pop(this); const Cell *buf = sb_pop(this);
if (buf == NULL) if (buf == NULL)
clearLine(this,y); clearLine(this,y);
else else
@ -518,7 +520,7 @@ static void setCursorShape(screen_t *this, int shape)
static int kbhit(screen_t *this) static int kbhit(screen_t *this)
{ {
const int fd = STDIN_FILENO; const int fd = STDIN_FILENO;
const unsigned long usec = 0; const unsigned usec = 0;
struct timeval tv; struct timeval tv;
fd_set fds; fd_set fds;

2
src/s_win32.cpp
View File

@ -32,7 +32,7 @@
#include "screen.h" #include "screen.h"
#define this local_this #define this self
#define mask_fg 0x0f #define mask_fg 0x0f
#define mask_bg 0xf0 #define mask_bg 0xf0

39
src/screen.h
View File

@ -102,45 +102,6 @@ screen_t *screen_win32_construct(void);
void screen_show_frames(screen_t *); void screen_show_frames(screen_t *);
/*************************************************************************
// debugging support
**************************************************************************/
#if 0
#undef LOG
#undef LOGI
#undef LOGU
#undef LOGS
#if (SCREEN_DEBUG)
static void LOG(const char *format, ...)
{
static FILE *logfile = NULL;
va_list args;
if (!logfile)
logfile = fopen("screen.log", "wt");
if (!logfile)
return;
va_start(args,format);
vfprintf(logfile,format,args);
fflush(logfile);
va_end(args);
}
# define LOGI(x) LOG(#x " %ld\n", (long)(x))
# define LOGU(x) LOG(#x " %lu\n", (long)(x))
# define LOGS(x) LOG(#x " %s\n", x)
#else
# define LOGI(x) /*empty*/
# define LOGU(x) /*empty*/
# define LOGS(x) /*empty*/
#endif
#endif /* if #0 */
#endif /* USE_SCREEN */ #endif /* USE_SCREEN */
#endif /* already included */ #endif /* already included */