OK, for now, napms() goes back in pdcurses/kernel.c, and the others

become PDC_napms(). I didn't want it to be the _only_ curses-level
function defined on the platform level... and I just noticed that
curs_set() was already the same way, right above napms().
This commit is contained in:
William McBrine
2006-07-07 05:34:05 +00:00
parent eb776b28dd
commit 57aa0de7c9
6 changed files with 24 additions and 87 deletions

View File

@@ -15,7 +15,7 @@
* See the file maintain.er for details of the current maintainer. *
************************************************************************/
/* $Id: curspriv.h,v 1.71 2006/07/07 04:27:44 wmcbrine Exp $ */
/* $Id: curspriv.h,v 1.72 2006/07/07 05:34:04 wmcbrine Exp $ */
/* CURSPRIV.H
@@ -229,6 +229,7 @@ int PDC_gotoxy(int, int);
void PDC_init_atrtab(void);
WINDOW *PDC_makenew(int, int, int, int);
int PDC_mouse_in_slk(int, int);
void PDC_napms(int);
int PDC_newline(WINDOW *, int);
int PDC_putc(chtype, chtype);
int PDC_putctty(chtype, chtype);

View File

@@ -40,22 +40,7 @@
# endif
#endif
RCSID("$Id: pdcutil.c,v 1.2 2006/07/07 04:27:44 wmcbrine Exp $");
/*man-start**************************************************************
PDC_beep() - Low-level beep function
PDCurses Description:
This is a private PDCurses routine.
Generates a "beep" sound or flashes the screen. Called by
beep().
Portability:
PDCurses void PDC_beep(void);
**man-end****************************************************************/
RCSID("$Id: pdcutil.c,v 1.3 2006/07/07 05:34:04 wmcbrine Exp $");
void PDC_beep(void)
{
@@ -119,11 +104,9 @@ char *PDC_sysname(char *p)
return p;
}
/* napms() is documented in ../pdcurses/kernel.c */
int napms(int ms)
void PDC_napms(int ms)
{
PDC_LOG(("napms() - called: ms=%d\n", ms));
PDC_LOG(("PDC_napms() - called: ms=%d\n", ms));
#if defined(HAVE_USLEEP)
@@ -153,5 +136,4 @@ int napms(int ms)
}
# endif
#endif
return OK;
}

View File

@@ -26,22 +26,7 @@
APIRET APIENTRY DosSleep(ULONG ulTime);
#endif
RCSID("$Id: pdcutil.c,v 1.2 2006/07/07 04:27:44 wmcbrine Exp $");
/*man-start**************************************************************
PDC_beep() - Low-level beep function
PDCurses Description:
This is a private PDCurses routine.
Generates a "beep" sound or flashes the screen. Called by
beep().
Portability:
PDCurses void PDC_beep(void);
**man-end****************************************************************/
RCSID("$Id: pdcutil.c,v 1.3 2006/07/07 05:34:05 wmcbrine Exp $");
void PDC_beep(void)
{
@@ -103,16 +88,13 @@ char *PDC_sysname(char *p)
return p;
}
/* napms() is documented in ../pdcurses/kernel.c */
int napms(int ms)
void PDC_napms(int ms)
{
PDC_LOG(("napms() - called: ms=%d\n", ms));
PDC_LOG(("PDC_napms() - called: ms=%d\n", ms));
#ifdef __EMX__
_sleep2(ms);
#else
DosSleep(ms);
#endif
return OK;
}

View File

@@ -36,7 +36,7 @@
# undef wmove
#endif
RCSID("$Id: kernel.c,v 1.45 2006/07/07 02:53:07 wmcbrine Exp $");
RCSID("$Id: kernel.c,v 1.46 2006/07/07 05:34:05 wmcbrine Exp $");
RIPPEDOFFLINE linesripped[5];
char linesrippedoff = 0;
@@ -327,6 +327,15 @@ int curs_set(int visibility)
return PDC_curs_set(visibility);
}
int napms(int ms)
{
PDC_LOG(("napms() - called: ms=%d\n", ms));
PDC_napms(ms);
return OK;
}
int ripoffline(int line, int (*init)(WINDOW *, int))
{
PDC_LOG(("ripoffline() - called: line=%d\n", line));

View File

@@ -19,22 +19,7 @@
#define INCLUDE_WINDOWS_H
#include <curses.h>
RCSID("$Id: pdcutil.c,v 1.2 2006/07/07 04:27:44 wmcbrine Exp $");
/*man-start**************************************************************
PDC_beep() - Low-level beep function
PDCurses Description:
This is a private PDCurses routine.
Generates a "beep" sound or flashes the screen. Called by
beep().
Portability:
PDCurses void PDC_beep(void);
**man-end****************************************************************/
RCSID("$Id: pdcutil.c,v 1.3 2006/07/07 05:34:05 wmcbrine Exp $");
void PDC_beep(void)
{
@@ -69,13 +54,9 @@ char *PDC_sysname(char *p)
return p;
}
/* napms() is documented in ../pdcurses/kernel.c */
int napms(int ms)
void PDC_napms(int ms)
{
PDC_LOG(("napms() - called: ms=%d\n", ms));
PDC_LOG(("PDC_napms() - called: ms=%d\n", ms));
Sleep(ms);
return OK;
}

View File

@@ -21,22 +21,7 @@
# include <poll.h>
#endif
RCSID("$Id: pdcutil.c,v 1.2 2006/07/07 04:27:44 wmcbrine Exp $");
/*man-start**************************************************************
PDC_beep() - Low-level beep function
PDCurses Description:
This is a private PDCurses routine.
Generates a "beep" sound or flashes the screen. Called by
beep().
Portability:
PDCurses void PDC_beep(void);
**man-end****************************************************************/
RCSID("$Id: pdcutil.c,v 1.3 2006/07/07 05:34:05 wmcbrine Exp $");
void PDC_beep(void)
{
@@ -70,11 +55,9 @@ char *PDC_sysname(char *p)
return p;
}
/* napms() is documented in ../pdcurses/kernel.c */
int napms(int ms)
void PDC_napms(int ms)
{
PDC_LOG(("napms() - called: ms=%d\n", ms));
PDC_LOG(("PDC_napms() - called: ms=%d\n", ms));
#if defined(HAVE_USLEEP)
@@ -88,5 +71,4 @@ int napms(int ms)
poll(&fd, 1, ms);
}
#endif
return OK;
}