Commit d81568ee authored by louiz’'s avatar louiz’

Use a logical order of arguments in the poopt functions, now

parent ee0c29ad
......@@ -42,7 +42,7 @@ static PyObject* poopt_cut_text(PyObject* self, PyObject* args)
const char* buffer;
const int buffer_len;
if (PyArg_ParseTuple(args, "ks#", &width, &buffer, &buffer_len) == 0)
if (PyArg_ParseTuple(args, "s#k", &buffer, &buffer_len, &width) == 0)
return NULL;
/* Pointer to the end of the string */
......@@ -223,7 +223,7 @@ static PyObject* poopt_cut_by_columns(PyObject* self, PyObject* args)
const char* start;
const int len;
const size_t limit;
if (PyArg_ParseTuple(args, "ks#", &limit, &start, &len) == 0)
if (PyArg_ParseTuple(args, "s#k", &start, &len, &limit) == 0)
return NULL;
const char* const end = start + len;
......
......@@ -269,7 +269,7 @@ class UserList(Win):
for user in users[self.pos:]:
self.draw_role_affiliation(y, user)
self.draw_status_chatstate(y, user)
self.addstr(y, 2, poopt.cut_by_columns(self.width-2, user.nick), to_curses_attr(user.color))
self.addstr(y, 2, poopt.cut_by_columns(user.nick, self.width-2), to_curses_attr(user.color))
if config.get('user_list_sort', 'desc').lower() == 'asc':
y -= 1
else:
......@@ -888,7 +888,7 @@ class TextWin(Win):
offset += 1
if get_theme().CHAR_TIME_RIGHT and message.str_time:
offset += 1
lines = poopt.cut_text(self.width-offset-1, txt)
lines = poopt.cut_text(txt, self.width-offset-1)
prepend = ''
attrs = []
for line in lines:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment