Skip to content

bpo-41818: Add termios.tcgetwinsize(), termios.tcsetwinsize(). Update docs. #23686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 9 commits into from
Aug 27, 2021
Merged

bpo-41818: Add termios.tcgetwinsize(), termios.tcsetwinsize(). Update docs. #23686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78aaac7
Add termios.tcgetwinsize(), termios.tcsetwinsize(). Update docs.
8vasu Dec 8, 2020
0553063
Add news, clinic generated code.
8vasu Dec 8, 2020
0d2d35b
Improve termios.tcsetwinsize().
8vasu Dec 10, 2020
628b7dc
Add TIOCGSIZE support to termios.tcgetwinsize()
8vasu Dec 14, 2020
6ef8a29
Add TIOCSSIZE support to termios.tcsetwinsize()
8vasu Dec 14, 2020
91374ea
The SunOS struct ttysize had fields of type "int"; update termios.tcg…
8vasu Dec 15, 2020
bb0b2b1
termios.tcgetwinsize() and termios.tcsetwinsize() should return/accep…
8vasu Aug 14, 2021
eb0be09
Refactor tcsetwinsize to share common code and accept any two item se…
gpshead Aug 27, 2021
5ab0d4c
parenthesis on my if statements :)
gpshead Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add TIOCGSIZE support to termios.tcgetwinsize() 
Signed-off-by: Soumendra Ganguly <soumendraganguly@gmail.com>
  • Loading branch information
@8vasu
8vasu committed Dec 14, 2020
commit 628b7dcc32efe8d1bc5a52bf167547f4092412a0
3 changes: 2 additions & 1 deletion Doc/library/termios.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ The module defines the following functions:
.. function:: tcgetwinsize(fd)

@gpshead gpshead Aug 27, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one follow up PR as I forgot to fix it up here, these need versionadded tags. I'll take care of it.

@8vasu 8vasu Aug 28, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gpshead Thank you for making the improvements!


Return a list ``[ws_row, ws_col]`` containing the tty window size for file
descriptor *fd*. Requires :const:`termios.TIOCGWINSZ`.
descriptor *fd*. Requires :const:`termios.TIOCGWINSZ` or
:const:`termios.TIOCGSIZE`.


.. function:: tcsetwinsize(fd, winsize)
Expand Down
25 changes: 24 additions & 1 deletion Modules/termios.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,28 @@ termios_tcgetwinsize_impl(PyObject *module, int fd)
return NULL;
}
return v;
#elif defined(TIOCGSIZE)
termiosmodulestate *state = PyModule_GetState(module);
struct ttysize s;
if (ioctl(fd, TIOCGSIZE, &s) == -1) {
return PyErr_SetFromErrno(state->TermiosError);
}

PyObject *v;
if (!(v = PyList_New(2))) {
return NULL;
}

PyList_SetItem(v, 0, PyLong_FromLong((long)s.ts_lines));
PyList_SetItem(v, 1, PyLong_FromLong((long)s.ts_cols));
if (PyErr_Occurred()) {
Py_DECREF(v);
return NULL;
}
return v;
#else
PyErr_SetString(PyExc_NotImplementedError, "termios.TIOCGWINSZ undefined");
PyErr_SetString(PyExc_NotImplementedError,
"termios.TIOCGWINSZ and termios.TIOCGSIZE undefined");
return NULL;
#endif /* defined(TIOCGWINSZ) */
}
Expand Down Expand Up @@ -933,6 +953,9 @@ static struct constant {
#ifdef TIOCGSERIAL
{"TIOCGSERIAL", TIOCGSERIAL},
#endif
#ifdef TIOCGSIZE
{"TIOCGSIZE", TIOCGSIZE},
#endif
#ifdef TIOCGSOFTCAR
{"TIOCGSOFTCAR", TIOCGSOFTCAR},
#endif
Expand Down