home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check server disconnect right on websocket.onclose.
[plomrogue2-experiments]
/
client-curses.py
diff --git
a/client-curses.py
b/client-curses.py
index ea5dcf32f8ad34d9281de174566fe64f3a20601f..f65d3a0e242c022e1266a3d97c6a27526eaa6532 100755
(executable)
--- a/
client-curses.py
+++ b/
client-curses.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python3
import curses
#!/usr/bin/env python3
import curses
-import plom_socket
_io
+import plom_socket
import socket
import threading
from parser import ArgError, Parser
import socket
import threading
from parser import ArgError, Parser
@@
-77,7
+77,7
@@
class MapHex(Map):
return map_lines
return map_lines
-map_manager = game_common.MapManager(
globals(
))
+map_manager = game_common.MapManager(
(MapHex, MapSquare
))
class World(game_common.World):
class World(game_common.World):
@@
-186,8
+186,8
@@
ASCII_printable = ' !"#$%&\'\(\)*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWX'
'YZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~'
'YZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~'
-def recv_loop(socket, game):
- for msg in plom_socket
_io.recv(s
):
+def recv_loop(
plom_
socket, game):
+ for msg in plom_socket
.recv(
):
game.handle_input(msg)
game.handle_input(msg)
@@
-353,8
+353,8
@@
class TurnWidget(Widget):
class TUI:
class TUI:
- def __init__(self, socket, game):
- self.socket = socket
+ def __init__(self,
plom_
socket, game):
+ self.socket =
plom_
socket
self.game = game
self.parser = Parser(self.game)
self.to_update = {'edit': False}
self.game = game
self.parser = Parser(self.game)
self.to_update = {'edit': False}
@@
-400,26
+400,26
@@
class TUI:
elif map_mode:
if type(self.game.world.map_) == MapSquare:
if key == 'a':
elif map_mode:
if type(self.game.world.map_) == MapSquare:
if key == 'a':
-
plom_socket_io.send(self.socket,
'TASK:MOVE LEFT')
+
self.socket.send(
'TASK:MOVE LEFT')
elif key == 'd':
elif key == 'd':
-
plom_socket_io.send(self.socket,
'TASK:MOVE RIGHT')
+
self.socket.send(
'TASK:MOVE RIGHT')
elif key == 'w':
elif key == 'w':
-
plom_socket_io.send(self.socket,
'TASK:MOVE UP')
+
self.socket.send(
'TASK:MOVE UP')
elif key == 's':
elif key == 's':
-
plom_socket_io.send(self.socket,
'TASK:MOVE DOWN')
+
self.socket.send(
'TASK:MOVE DOWN')
elif type(self.game.world.map_) == MapHex:
if key == 'w':
elif type(self.game.world.map_) == MapHex:
if key == 'w':
-
plom_socket_io.send(self.socket,
'TASK:MOVE UPLEFT')
+
self.socket.send(
'TASK:MOVE UPLEFT')
elif key == 'e':
elif key == 'e':
-
plom_socket_io.send(self.socket,
'TASK:MOVE UPRIGHT')
+
self.socket.send(
'TASK:MOVE UPRIGHT')
if key == 's':
if key == 's':
-
plom_socket_io.send(self.socket,
'TASK:MOVE LEFT')
+
self.socket.send(
'TASK:MOVE LEFT')
elif key == 'd':
elif key == 'd':
-
plom_socket_io.send(self.socket,
'TASK:MOVE RIGHT')
+
self.socket.send(
'TASK:MOVE RIGHT')
if key == 'x':
if key == 'x':
-
plom_socket_io.send(self.socket,
'TASK:MOVE DOWNLEFT')
+
self.socket.send(
'TASK:MOVE DOWNLEFT')
elif key == 'c':
elif key == 'c':
-
plom_socket_io.send(self.socket,
'TASK:MOVE DOWNRIGHT')
+
self.socket.send(
'TASK:MOVE DOWNRIGHT')
else:
if len(key) == 1 and key in ASCII_printable and \
len(self.to_send) < len(self.edit):
else:
if len(key) == 1 and key in ASCII_printable and \
len(self.to_send) < len(self.edit):
@@
-429,7
+429,7
@@
class TUI:
self.to_send[:] = self.to_send[:-1]
self.to_update['edit'] = True
elif key == '\n': # Return key
self.to_send[:] = self.to_send[:-1]
self.to_update['edit'] = True
elif key == '\n': # Return key
-
plom_socket_io.send(self.socket,
''.join(self.to_send))
+
self.socket.send(
''.join(self.to_send))
self.to_send[:] = []
self.to_update['edit'] = True
except curses.error:
self.to_send[:] = []
self.to_update['edit'] = True
except curses.error:
@@
-439,7
+439,8
@@
class TUI:
s = socket.create_connection(('127.0.0.1', 5000))
s = socket.create_connection(('127.0.0.1', 5000))
+plom_socket = plom_socket.PlomSocket(s)
game = Game()
game = Game()
-t = threading.Thread(target=recv_loop, args=(
s
, game))
+t = threading.Thread(target=recv_loop, args=(
plom_socket
, game))
t.start()
t.start()
-TUI(
s
, game)
+TUI(
plom_socket
, game)