mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 17:59:07 -04:00
82 lines
3.1 KiB
Plaintext
82 lines
3.1 KiB
Plaintext
--- Modules/_cursesmodule.c.orig Sun Nov 10 07:36:41 2013
|
|
+++ Modules/_cursesmodule.c Fri Apr 18 18:55:20 2014
|
|
@@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getparyx, int, "ii")
|
|
|
|
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
|
|
-#if defined(__NetBSD__)
|
|
-Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
|
|
-#else
|
|
Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
|
|
-#endif
|
|
Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
|
|
-#if defined(__NetBSD__)
|
|
-Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
|
|
-#else
|
|
Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
|
|
-#endif
|
|
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
|
|
@@ -893,7 +885,7 @@ PyCursesWindow_GetKey(PyCursesWindowObject *self, PyOb
|
|
return Py_BuildValue("c", rtn);
|
|
} else {
|
|
const char *knp;
|
|
-#if defined(__NetBSD__)
|
|
+#if defined(__NetBSD__) || defined(__minix)
|
|
knp = unctrl(rtn);
|
|
#else
|
|
knp = keyname(rtn);
|
|
@@ -2110,7 +2102,6 @@ PyCurses_Is_Term_Resized(PyObject *self, PyObject *arg
|
|
}
|
|
#endif /* HAVE_CURSES_IS_TERM_RESIZED */
|
|
|
|
-#if !defined(__NetBSD__)
|
|
static PyObject *
|
|
PyCurses_KeyName(PyObject *self, PyObject *args)
|
|
{
|
|
@@ -2129,7 +2120,6 @@ PyCurses_KeyName(PyObject *self, PyObject *args)
|
|
|
|
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
|
|
}
|
|
-#endif
|
|
|
|
static PyObject *
|
|
PyCurses_KillChar(PyObject *self)
|
|
@@ -2674,9 +2664,7 @@ static PyMethodDef PyCurses_methods[] = {
|
|
#ifdef HAVE_CURSES_IS_TERM_RESIZED
|
|
{"is_term_resized", (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
|
|
#endif
|
|
-#if !defined(__NetBSD__)
|
|
{"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},
|
|
-#endif
|
|
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
|
|
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
|
|
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
|
|
@@ -2785,9 +2773,7 @@ init_curses(void)
|
|
SetDictInt("A_DIM", A_DIM);
|
|
SetDictInt("A_BOLD", A_BOLD);
|
|
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
|
|
-#if !defined(__NetBSD__)
|
|
SetDictInt("A_INVIS", A_INVIS);
|
|
-#endif
|
|
SetDictInt("A_PROTECT", A_PROTECT);
|
|
SetDictInt("A_CHARTEXT", A_CHARTEXT);
|
|
SetDictInt("A_COLOR", A_COLOR);
|
|
@@ -2859,7 +2845,6 @@ init_curses(void)
|
|
int key;
|
|
char *key_n;
|
|
char *key_n2;
|
|
-#if !defined(__NetBSD__)
|
|
for (key=KEY_MIN;key < KEY_MAX; key++) {
|
|
key_n = (char *)keyname(key);
|
|
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
|
|
@@ -2887,7 +2872,6 @@ init_curses(void)
|
|
if (key_n2 != key_n)
|
|
free(key_n2);
|
|
}
|
|
-#endif
|
|
SetDictInt("KEY_MIN", KEY_MIN);
|
|
SetDictInt("KEY_MAX", KEY_MAX);
|
|
}
|