VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-24 07:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes from Florian - mainly OpenWatcom related

Browse Source
This commit is contained in:
Mark Hessling
2004-09-14 07:54:34 +00:00
parent b9b5a5fd36
commit ae4e07ee09
5 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
curses.h
View File

@@ -18,7 +18,7 @@
***************************************************************************
*/
/*
$Id: curses.h,v 1.22 2004/09/10 07:28:44 rexx Exp $
$Id: curses.h,v 1.23 2004/09/14 07:53:01 rexx Exp $
*/
/*
*----------------------------------------------------------------------
@@ -647,8 +647,8 @@ PDCurses portable platform definitions list:
# define DISPLAY_XGA 9
# endif
# endif
# ifdef __NT__ /* This specifies WIN32 target */
# ifdef INCLUDE_WINDOWS_H
# if defined(__NT__) || define (WIN32) /* This specifies WIN32 target */
# if defined(INCLUDE_WINDOWS_H) || __WATCOMC__ >= 1200
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
@@ -657,14 +657,10 @@ PDCurses portable platform definitions list:
# ifndef WIN32
# define WIN32
# endif
/*
# ifdef PDC_CDECL
# undef PDC_CDECL
# define PDC_CDECL cdecl
# define PDC_CDECL cdecl /* needed for compatibility to other systems */
# endif
*/
# endif
# ifndef HAVE_LIMITS_H
# define HAVE_LIMITS_H /* have <limits.h> */
@@ -1601,6 +1597,7 @@ int PDC_CDECL baudrate Args(( void ));
int PDC_CDECL beep Args(( void ));
int PDC_CDECL border Args(( chtype, chtype, chtype, chtype, chtype, chtype, chtype, chtype ));
int PDC_CDECL can_change_color Args(( void ));
int PDC_CDECL cbreak Args(( void ));
int PDC_CDECL clearok Args(( WINDOW*, bool ));
int PDC_CDECL color_content Args(( short, short*, short*, short* ));
int PDC_CDECL copywin Args(( WINDOW*, WINDOW*, int, int, int, int, int, int, int ));
@@ -1642,6 +1639,7 @@ char* PDC_CDECL keyname Args(( int ));
char PDC_CDECL killchar Args(( void ));
char* PDC_CDECL longname Args(( void ));
int PDC_CDECL meta Args(( WINDOW*, bool ));
int PDC_CDECL move Args(( int, int ));
int PDC_CDECL mvcur Args(( int, int, int, int ));
int PDC_CDECL mvderwin Args(( WINDOW*, int, int ));
#ifdef HAVE_STDARG_H
@@ -1650,6 +1648,7 @@ int PDC_CDECL mvscanw Args(( int, int, char*,... ));
#endif
int PDC_CDECL mvwaddnstr Args(( WINDOW*,int,int,char*,int ));
int PDC_CDECL mvwin Args(( WINDOW*, int, int ));
chtype PDC_CDECL mvwinch Args(( WINDOW*, int, int ));
int PDC_CDECL mvwinsertln Args(( WINDOW*, int, int ));
#ifdef HAVE_STDARG_H
int PDC_CDECL mvwprintw Args(( WINDOW*, int, int, char*,... ));
@@ -1712,6 +1711,7 @@ void PDC_CDECL traceon Args(( void ));
int PDC_CDECL typeahead Args(( int ));
char* PDC_CDECL unctrl Args(( chtype ));
int PDC_CDECL vline Args(( chtype, int ));
int PDC_CDECL waddch Args(( WINDOW*, chtype ));
int PDC_CDECL waddchnstr Args(( WINDOW*, chtype*, int ));
int PDC_CDECL waddnstr Args(( WINDOW*, char*, int ));
int PDC_CDECL waddstr Args(( WINDOW*, char* ));

4
curspriv.h
View File

@@ -18,7 +18,7 @@
***************************************************************************
*/
/*
$Id: curspriv.h,v 1.8 2004/07/01 07:25:34 rexx Exp $
$Id: curspriv.h,v 1.9 2004/09/14 07:53:09 rexx Exp $
*/
/*
*
@@ -405,7 +405,7 @@ void movedata Args(((unsigned, unsigned, unsigned, unsigned, unsigned
#endif
# ifdef PDCDEBUG
void PDC_debug Args(( char*,... ));
void PDC_CDECL PDC_debug Args(( char*,... ));
# endif
# ifdef REGISTERWINDOWS

4
win32/pdckbd.c
View File

@@ -25,7 +25,7 @@
#include <stdio.h>
#ifdef PDCDEBUG
char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.14 2004/09/10 07:51:40 rexx Exp $";
char *rcsid_PDCkbd = "$Id: pdckbd.c,v 1.15 2004/09/14 07:54:18 rexx Exp $";
#endif
#define KEY_STATE TRUE
@@ -1305,7 +1305,7 @@ static int win32_kbhit(int timeout)
/***********************************************************************/
{
INPUT_RECORD ip;
DWORD read, avail;
DWORD read;
int rc=FALSE;
#ifdef PDCDEBUG

3
win32/pdcscrn.c
View File

@@ -22,7 +22,7 @@
#include <curses.h>
#ifdef PDCDEBUG
char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.5 2004/09/10 07:47:44 rexx Exp $";
char *rcsid_PDCscrn = "$Id: pdcscrn.c,v 1.6 2004/09/14 07:54:26 rexx Exp $";
#endif
HANDLE hConOut = INVALID_HANDLE_VALUE;
@@ -161,7 +161,6 @@ bool PDC_scrn_modes_equal(int mode1, int mode2)
int PDC_scr_open(SCREEN *internal, bool echo)
{
DWORD numbuttons=0;
COORD bufsize,origin;
SMALL_RECT rect;
char *str=NULL;

10
win32/wccwin32.mak
View File

@@ -2,7 +2,7 @@
#
# Watcom WMAKE Makefile for PDCurses library - DOS/4GW Watcom C/C++ 10.6
#
# Usage: wmake -f [path\]wccdos4g.mak [-DDEBUG] [target]
# Usage: wmake -f [win32\]wccwin32.mak [DEBUG=Y] [target]
#
# where target can be any of:
# [all|demos|pdcurses.lib|panel.lib|testcurs.exe...]
@@ -21,9 +21,9 @@ CCINCDIR =d:\h
VER=26
VERDOT=2.6
PDCURSES_CURSES_H =$(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H =$(PDCURSES_HOME)\curspriv.h
PDCURSES_HEADERS =$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
PDCURSES_CURSES_H =$(PDCURSES_HOME)\curses.h
PDCURSES_CURSPRIV_H =$(PDCURSES_HOME)\curspriv.h
PDCURSES_HEADERS =$(PDCURSES_CURSES_H) $(PDCURSES_CURSPRIV_H)
PANEL_HEADER =$(PDCURSES_HOME)\panel.h
@@ -45,7 +45,7 @@ LDFLAGS =
CPPFLAGS = /i=$(PDCURSES_HOME) /i=$(CCINCDIR) /DPDC_STATIC_BUILD
CCFLAGS = /ei /zq /mf $(CFLAGS) $(CPPFLAGS)
CCFLAGS = /ei /zq /mf /wx $(CFLAGS) $(CPPFLAGS)
LINK = wlink