Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
71e44cb9
Commit
71e44cb9
authored
Sep 06, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #12567: Add curses.unget_wch() function
Push a character so the next get_wch() will return it.
parent
d4d8ae5a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
0 deletions
+97
-0
Doc/library/curses.rst
Doc/library/curses.rst
+11
-0
Lib/test/test_curses.py
Lib/test/test_curses.py
+15
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_cursesmodule.c
Modules/_cursesmodule.c
+68
-0
No files found.
Doc/library/curses.rst
View file @
71e44cb9
...
...
@@ -598,6 +598,17 @@ The module :mod:`curses` defines the following functions:
Only one *ch* can be pushed before :meth:`getch` is called.
.. function:: unget_wch(ch)
Push *ch* so the next :meth:`get_wch` will return it.
.. note::
Only one *ch* can be pushed before :meth:`get_wch` is called.
.. versionadded:: 3.3
.. function:: ungetmouse(id, x, y, z, bstate)
Push a :const:`KEY_MOUSE` event onto the input queue, associating the given
...
...
Lib/test/test_curses.py
View file @
71e44cb9
...
...
@@ -264,6 +264,20 @@ def test_issue6243(stdscr):
curses
.
ungetch
(
1025
)
stdscr
.
getkey
()
def
test_unget_wch
(
stdscr
):
ch
=
'
\
xe9
'
curses
.
unget_wch
(
ch
)
read
=
stdscr
.
get_wch
()
read
=
chr
(
read
)
if
read
!=
ch
:
raise
AssertionError
(
"%r != %r"
%
(
read
,
ch
))
ch
=
ord
(
'
\
xe9
'
)
curses
.
unget_wch
(
ch
)
read
=
stdscr
.
get_wch
()
if
read
!=
ch
:
raise
AssertionError
(
"%r != %r"
%
(
read
,
ch
))
def
main
(
stdscr
):
curses
.
savetty
()
try
:
...
...
@@ -272,6 +286,7 @@ def main(stdscr):
test_userptr_without_set
(
stdscr
)
test_resize_term
(
stdscr
)
test_issue6243
(
stdscr
)
test_unget_wch
(
stdscr
)
finally
:
curses
.
resetty
()
...
...
Misc/NEWS
View file @
71e44cb9
...
...
@@ -271,6 +271,9 @@ Core and Builtins
Library
-------
- Issue #12567: Add curses.unget_wch() function. Push a character so the next
get_wch() will return it.
- Issue #9561: distutils and packaging now writes egg-info files using UTF-8,
instead of the locale encoding.
...
...
Modules/_cursesmodule.c
View file @
71e44cb9
...
...
@@ -2696,6 +2696,71 @@ PyCurses_UngetCh(PyObject *self, PyObject *args)
return
PyCursesCheckERR
(
ungetch
(
ch
),
"ungetch"
);
}
#ifdef HAVE_NCURSESW
/* Convert an object to a character (wchar_t):
- int
- str of length 1
Return 1 on success, 0 on error. */
static
int
PyCurses_ConvertToWchar_t
(
PyObject
*
obj
,
wchar_t
*
wch
)
{
if
(
PyUnicode_Check
(
obj
))
{
wchar_t
buffer
[
2
];
if
(
PyUnicode_AsWideChar
(
obj
,
buffer
,
2
)
!=
1
)
{
PyErr_Format
(
PyExc_TypeError
,
"expect bytes or str of length 1, or int, "
"got a str of length %zi"
,
PyUnicode_GET_SIZE
(
obj
));
return
0
;
}
*
wch
=
buffer
[
0
];
return
2
;
}
else
if
(
PyLong_CheckExact
(
obj
))
{
long
value
;
int
overflow
;
value
=
PyLong_AsLongAndOverflow
(
obj
,
&
overflow
);
if
(
overflow
)
{
PyErr_SetString
(
PyExc_OverflowError
,
"int doesn't fit in long"
);
return
0
;
}
*
wch
=
(
wchar_t
)
value
;
if
((
long
)
*
wch
!=
value
)
{
PyErr_Format
(
PyExc_OverflowError
,
"character doesn't fit in wchar_t"
);
return
0
;
}
return
1
;
}
else
{
PyErr_Format
(
PyExc_TypeError
,
"expect bytes or str of length 1, or int, got %s"
,
Py_TYPE
(
obj
)
->
tp_name
);
return
0
;
}
}
static
PyObject
*
PyCurses_Unget_Wch
(
PyObject
*
self
,
PyObject
*
args
)
{
PyObject
*
obj
;
wchar_t
wch
;
PyCursesInitialised
;
if
(
!
PyArg_ParseTuple
(
args
,
"O"
,
&
obj
))
return
NULL
;
if
(
!
PyCurses_ConvertToWchar_t
(
obj
,
&
wch
))
return
NULL
;
return
PyCursesCheckERR
(
unget_wch
(
wch
),
"unget_wch"
);
}
#endif
static
PyObject
*
PyCurses_Use_Env
(
PyObject
*
self
,
PyObject
*
args
)
{
...
...
@@ -2823,6 +2888,9 @@ static PyMethodDef PyCurses_methods[] = {
{
"typeahead"
,
(
PyCFunction
)
PyCurses_TypeAhead
,
METH_VARARGS
},
{
"unctrl"
,
(
PyCFunction
)
PyCurses_UnCtrl
,
METH_VARARGS
},
{
"ungetch"
,
(
PyCFunction
)
PyCurses_UngetCh
,
METH_VARARGS
},
#ifdef HAVE_NCURSESW
{
"unget_wch"
,
(
PyCFunction
)
PyCurses_Unget_Wch
,
METH_VARARGS
},
#endif
{
"use_env"
,
(
PyCFunction
)
PyCurses_Use_Env
,
METH_VARARGS
},
#ifndef STRICT_SYSV_CURSES
{
"use_default_colors"
,
(
PyCFunction
)
PyCurses_Use_Default_Colors
,
METH_NOARGS
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment