Garmelon/wot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add input thread and some map keybindings

Browse source
This commit is contained in:
Joscha 2017-04-06 07:19:43 +00:00
parent 11a94f982d
commit 5b4a6a4a83
1 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

59
client.py
View file

@ -8,7 +8,10 @@ from chunks import ChunkPool
class Client(): class Client():
def __init__(self, address): def __init__(self, address):
self.stopping = False
self.address = address self.address = address
self.drawevent = threading.Event()
self.pool = ChunkPool() self.pool = ChunkPool()
#self.map_ = Map(sizex, sizey, self.pool) #self.map_ = Map(sizex, sizey, self.pool)
#self.chunkmap = Chunkmap(sizex, sizey, self.pool) # size changeable by +/-? #self.chunkmap = Chunkmap(sizex, sizey, self.pool) # size changeable by +/-?
@ -17,25 +20,51 @@ class Client():
def launch(self, stdscr): def launch(self, stdscr):
sizey, sizex = stdscr.getmaxyx() sizey, sizex = stdscr.getmaxyx()
self.map_ = Map(sizex, sizey, self.pool) self.map_ = Map(sizex, sizey, self.pool, self.drawevent)
stdscr.noutrefresh() # start input thread
self.map_.draw() self.inputthread = threading.Thread(
curses.doupdate() target=self.input_thread,
stdscr.getkey() name="inputthread",
self.map_.worldx += 1 args=(stdscr,),
self.map_.cursorx += 2 daemon=True
self.map_.cursory += 1 )
stdscr.noutrefresh() self.inputthread.start()
self.map_.draw()
curses.doupdate() while not self.stopping:
stdscr.getkey() self.drawevent.wait()
stdscr.noutrefresh()
with self.map_ as m:
m.draw()
curses.doupdate()
self.drawevent.clear()
def get_input(self, scr): def input_thread(self, scr):
pass while True:
i = scr.getkey()
if i == "q": self.stop()
# normal cursor movement
elif i == "KEY_UP": self.map_.move_cursor(0, -1)
elif i == "KEY_DOWN": self.map_.move_cursor(0, 1)
elif i == "KEY_LEFT": self.map_.move_cursor(-1, 0)
elif i == "KEY_RIGHT": self.map_.move_cursor(1, 0)
# quick cursor movement (5 vertical, 10 horizontal)
elif i == "KEY_SR": self.map_.move_cursor(0, -5)
elif i == "KEY_SF": self.map_.move_cursor(0, 5)
elif i == "KEY_SLEFT": self.map_.move_cursor(-10, 0)
elif i == "KEY_SRIGHT": self.map_.move_cursor(10, 0)
# scrolling the map (10 vertical, 20 horizontal)
elif i == "kUP5": self.map_.scroll(0, -10)
elif i == "kDN5": self.map_.scroll(0, 10)
elif i == "kLFT5": self.map_.scroll(-20, 0)
elif i == "kRIT5": self.map_.scroll(20, 0)
else: sys.stdout.write(repr(i) + "\n")
def stop(self): def stop(self):
pass self.stopping = True
self.drawevent.set()
def main(argv): def main(argv):
if len(argv) != 2: if len(argv) != 2: