Merge branch 'master' of wendy:pdcurses

This commit is contained in:
William McBrine
2019-07-14 23:49:01 -04:00
5 changed files with 15 additions and 5 deletions

View File

@@ -12,8 +12,8 @@ ifeq ($(OS),Windows_NT)
SFLAGS = -Ic:/sdl2-2.0.9/$(PLATFORM)/include/SDL2
SLIBS = -Lc:/sdl2-2.0.9/$(PLATFORM)/lib -lSDL2main -lSDL2
TFLAGS = -Ic:/sdl2_ttf-2.0.14/$(PLATFORM)/include/SDL2
TLIBS =-Lc:/sdl2_ttf-2.0.14/$(PLATFORM)/lib -lSDL2_ttf
TFLAGS = -Ic:/sdl2_ttf-2.0.15/$(PLATFORM)/include/SDL2
TLIBS =-Lc:/sdl2_ttf-2.0.15/$(PLATFORM)/lib -lSDL2_ttf
DEMOFLAGS = -mwindows
else

View File

@@ -37,8 +37,8 @@ LDFLAGS =
!ifdef WIDE
WIDEOPT = -DPDC_WIDE
TTF_INCLUDE = -IC:\SDL2_ttf-2.0.14\include
TTF_LIB = C:\SDL2_ttf-2.0.14\lib\$(PLATFORM)\SDL2_ttf.lib
TTF_INCLUDE = -IC:\SDL2_ttf-2.0.15\include
TTF_LIB = C:\SDL2_ttf-2.0.15\lib\$(PLATFORM)\SDL2_ttf.lib
!endif
!ifdef UTF8

View File

@@ -694,6 +694,8 @@ int PDC_color_content(short color, short *red, short *green, short *blue)
int PDC_init_color(short color, short red, short green, short blue)
{
pdc_dirty = TRUE;
if (color < 16)
{
COLORREF *color_table = _get_colors();

View File

@@ -2,6 +2,8 @@
#include "pdcwin.h"
bool pdc_dirty = FALSE;
void PDC_beep(void)
{
PDC_LOG(("PDC_beep() - called\n"));
@@ -14,6 +16,12 @@ void PDC_napms(int ms)
{
PDC_LOG(("PDC_napms() - called: ms=%d\n", ms));
if (pdc_dirty)
{
pdc_dirty = FALSE;
wrefresh(curscr);
}
if ((SP->termattrs & A_BLINK) && (GetTickCount() >= pdc_last_blink + 500))
PDC_blink_text();

View File

@@ -22,6 +22,6 @@ extern DWORD pdc_quick_edit;
extern DWORD pdc_last_blink;
extern short pdc_curstoreal[16], pdc_curstoansi[16];
extern short pdc_oldf, pdc_oldb, pdc_oldu;
extern bool pdc_conemu, pdc_ansi;
extern bool pdc_conemu, pdc_ansi, pdc_dirty;
extern void PDC_blink_text(void);