From cffcb10b6ae859032afdf58822ea1e66e960caf9 Mon Sep 17 00:00:00 2001 From: troido Date: Thu, 19 Apr 2018 16:34:17 +0200 Subject: client doesn't crash anymore when typing long lines --- asciifarm/client/display/display.py | 1 - asciifarm/client/display/health.py | 1 - asciifarm/client/display/info.py | 1 - asciifarm/client/display/inventory.py | 1 - asciifarm/client/display/messages.py | 1 - asciifarm/client/display/textinput.py | 4 ++-- asciifarm/client/display/window.py | 4 ---- asciifarm/client/gameclient.py | 1 - 8 files changed, 2 insertions(+), 12 deletions(-) diff --git a/asciifarm/client/display/display.py b/asciifarm/client/display/display.py index 85ee4b1..ede443e 100644 --- a/asciifarm/client/display/display.py +++ b/asciifarm/client/display/display.py @@ -1,6 +1,5 @@ -import curses from .field import Field from .info import Info from .health import Health diff --git a/asciifarm/client/display/health.py b/asciifarm/client/display/health.py index 063fb8e..0450449 100644 --- a/asciifarm/client/display/health.py +++ b/asciifarm/client/display/health.py @@ -1,5 +1,4 @@ -import curses class Health: diff --git a/asciifarm/client/display/info.py b/asciifarm/client/display/info.py index da23ac1..ded985d 100644 --- a/asciifarm/client/display/info.py +++ b/asciifarm/client/display/info.py @@ -1,5 +1,4 @@ -import curses class Info: diff --git a/asciifarm/client/display/inventory.py b/asciifarm/client/display/inventory.py index 6481602..a583e25 100644 --- a/asciifarm/client/display/inventory.py +++ b/asciifarm/client/display/inventory.py @@ -1,5 +1,4 @@ -import curses from asciifarm.common import utils class Inventory: diff --git a/asciifarm/client/display/messages.py b/asciifarm/client/display/messages.py index e72c831..39cc970 100644 --- a/asciifarm/client/display/messages.py +++ b/asciifarm/client/display/messages.py @@ -1,5 +1,4 @@ -import curses import textwrap class Messages(): diff --git a/asciifarm/client/display/textinput.py b/asciifarm/client/display/textinput.py index 38d69ed..fb27a08 100644 --- a/asciifarm/client/display/textinput.py +++ b/asciifarm/client/display/textinput.py @@ -20,7 +20,7 @@ class TextInput: win = self.widget.getWin() width, height = win.getSize() win.erase() - win.addLine((0, 0), self.text) + win.addLine((0, 0), self.text[:width]) if self.cursor >= 0 and self.cursor <= len(self.text): - win.setAttr((self.cursor, 0), curses.A_REVERSE) + win.setAttr((min(self.cursor, width-1), 0), curses.A_REVERSE) win.noutrefresh() diff --git a/asciifarm/client/display/window.py b/asciifarm/client/display/window.py index 7e19942..7723f7b 100644 --- a/asciifarm/client/display/window.py +++ b/asciifarm/client/display/window.py @@ -63,10 +63,6 @@ class Window: def noutrefresh(self): self.win.noutrefresh() - def getStr(self, pos): - x, y = pos - return self.win.getstr(y, x) - def getCh(self, pos): x, y = pos return self.win.getch(y, x) diff --git a/asciifarm/client/gameclient.py b/asciifarm/client/gameclient.py index 0a9b243..965239c 100644 --- a/asciifarm/client/gameclient.py +++ b/asciifarm/client/gameclient.py @@ -3,7 +3,6 @@ import os import sys -import curses import threading import json import getpass -- cgit