X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fqchess.py;h=899c47757dda6eb269014da8499609a7844c5db3;hp=24766e23e6bc6d9790872aec56a2cff2c51d3984;hb=df2c20df9b55fd3ab24c494d745a260662f1da67;hpb=3f610d389d45acf294bd66dc01e135d5ed406aa7

diff --git a/qchess/qchess.py b/qchess/qchess.py
index 24766e2..899c477 100755
--- a/qchess/qchess.py
+++ b/qchess/qchess.py
@@ -272,10 +272,11 @@ class Board():
 
 	# Update the board when a piece has been selected
 	# "type" is apparently reserved, so I'll use "state"
-	def update_select(self, x, y, type_index, state):
+	def update_select(self, x, y, type_index, state, sanity=True, deselect=True):
+		debug(str(self) + " update_select called")
 		piece = self.grid[x][y]
 		if piece.types[type_index] == "unknown":
-			if not state in self.unrevealed_types[piece.colour].keys():
+			if not state in self.unrevealed_types[piece.colour].keys() and sanity == True:
 				raise Exception("SANITY: Too many " + piece.colour + " " + state + "s")
 			self.unrevealed_types[piece.colour][state] -= 1
 			if self.unrevealed_types[piece.colour][state] <= 0:
@@ -284,19 +285,19 @@ class Board():
 		piece.types[type_index] = state
 		piece.current_type = state
 
-		if len(self.possible_moves(piece)) <= 0:
+		if deselect == True and len(self.possible_moves(piece)) <= 0:
 			piece.deselect() # Piece can't move; deselect it
 			
 		# Piece needs to recalculate moves
 		piece.possible_moves = None
 		
 	# Update the board when a piece has been moved
-	def update_move(self, x, y, x2, y2):
-				
+	def update_move(self, x, y, x2, y2, sanity=True):
+		debug(str(self) + " update_move called \""+str(x)+ " " + str(y) + " -> " + str(x2) + " " + str(y2) + "\"")	
 		piece = self.grid[x][y]
 		#print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece))
 		
-		if not [x2,y2] in self.possible_moves(piece):
+		if not [x2,y2] in self.possible_moves(piece) and sanity == True:
 			raise Exception("ILLEGAL move " + str(x2)+","+str(y2))
 		
 		self.grid[x][y] = None
@@ -331,8 +332,8 @@ class Board():
 
 	# Update the board from a string
 	# Guesses what to do based on the format of the string
-	def update(self, result):
-		#print "Update called with \"" + str(result) + "\""
+	def update(self, result, sanity=True, deselect=True):
+		debug(str(self) + " update called \""+str(result)+"\"")
 		# String always starts with 'x y'
 		try:
 			s = result.split(" ")
@@ -341,8 +342,8 @@ class Board():
 			raise Exception("GIBBERISH \""+ str(result) + "\"") # Raise expectations
 
 		piece = self.grid[x][y]
-		if piece == None:
-			raise Exception("EMPTY")
+		if piece == None and sanity == True:
+			raise Exception("EMPTY " + str(x) + " " + str(y))
 
 		# If a piece is being moved, the third token is '->'
 		# We could get away with just using four integers, but that wouldn't look as cool
@@ -354,7 +355,7 @@ class Board():
 				raise Exception("GIBBERISH \"" + str(result) + "\"") # Raise the alarm
 
 			# Move the piece (take opponent if possible)
-			self.update_move(x, y, x2, y2)
+			self.update_move(x, y, x2, y2, sanity)
 			
 		else:
 			# Otherwise we will just assume a piece has been selected
@@ -364,8 +365,9 @@ class Board():
 			except:
 				raise Exception("GIBBERISH \"" + result + "\"") # Throw a hissy fit
 
+
 			# Select the piece
-			self.update_select(x, y, type_index, state)
+			self.update_select(x, y, type_index, state, sanity=sanity, deselect=deselect)
 
 		return result
 
@@ -472,7 +474,7 @@ class Board():
 
 		
 		if p.current_type == "unknown":
-			raise Exception("SANITY: Piece state unknown")
+			raise Exception("SANITY: Unknown state for piece: "+str(p))
 			# The below commented out code causes things to break badly
 			#for t in p.types:
 			#	if t == "unknown":
@@ -631,10 +633,16 @@ class Player():
 		self.colour = colour
 
 	def update(self, result):
-		pass
+		return result
 
 	def reset_board(self, s):
 		pass
+	
+	def __str__(self):
+		return self.name + "<"+str(self.colour)+">"
+
+	def base_player(self):
+		return self
 
 # Player that runs from another process
 class ExternalAgent(Player):
@@ -691,7 +699,7 @@ class ExternalAgent(Player):
 	def update(self, result):
 		#print "Update " + str(result) + " called for AgentPlayer"
 		self.send_message(result)
-
+		return result
 
 	def get_move(self):
 		
@@ -777,6 +785,7 @@ class HumanPlayer(Player):
 			pass
 		else:
 			sys.stdout.write(result + "\n")	
+		return result
 
 
 # Default internal player (makes random moves)
@@ -792,7 +801,8 @@ class InternalAgent(Player):
 	def update(self, result):
 		
 		self.board.update(result)
-		self.board.verify()
+		#self.board.verify()
+		return result
 
 	def reset_board(self, s):
 		self.board.reset_board(s)
@@ -1128,38 +1138,129 @@ import select
 network_timeout_start = -1.0 # Timeout in seconds to wait for the start of a message
 network_timeout_delay = 1.0 # Maximum time between two characters being received
 
+class NetworkPlayer(Player):
+	def __init__(self, colour, network, player):
+		Player.__init__(self, "@network:"+str(network.address), colour) 
+		self.player = player
+		self.network = network
+		
+	def __str__(self):
+		return "NetworkPlayer<"+str(self.colour)+","+str(self.player)+">"
+		
+	def select(self):
+		debug(str(self) + " select called")
+		if self.player != None:
+			s = self.player.select()
+			self.send_message(str(s[0]) + " " + str(s[1]))
+		else:
+			s = map(int, self.get_response().split(" "))
+			for p in game.players:
+				if p != self and isinstance(p, NetworkPlayer) and p.player == None:
+					p.network.send_message(str(s[0]) + " " + str(s[1]))
+		return s
+	
+	def send_message(self, message):
+		debug(str(self) + " send_message(\""+str(message)+"\") called")
+		self.network.send_message(message)
+		
+	def get_response(self):
+		debug(str(self) + " get_response() called")
+		s = self.network.get_response()
+		debug(str(self) + " get_response() returns \""+str(s)+"\"")
+		return s
+			
+			
+	def get_move(self):
+		debug(str(self) + " get_move called")
+		if self.player != None:
+			s = self.player.get_move()
+			self.send_message(str(s[0]) + " " + str(s[1]))
+		else:
+			s = map(int, self.get_response().split(" "))
+			for p in game.players:
+				if p != self and isinstance(p, NetworkPlayer) and p.player == None:
+					p.network.send_message(str(s[0]) + " " + str(s[1]))
+		return s
+	
+	def update(self, result):
+		debug(str(self) + " update(\""+str(result)+"\") called")
+		if self.network.server == True:
+			if self.player == None:
+				self.send_message(result)
+		elif self.player != None:
+			result = self.get_response()
+			self.board.update(result, deselect=False)
+		
+		
+		
+		if self.player != None:
+			result = self.player.update(result)
+			
+		return result
+		
+		
+	
+	def base_player(self):
+		if self.player == None:
+			return self
+		else:
+			return self.player.base_player()
+		
+	def quit(self, result):
+		pass
+
 class Network():
-	def __init__(self, colour, address = None):
+	def __init__(self, address = (None,4562)):
 		self.socket = socket.socket()
+		self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
 		#self.socket.setblocking(0)
-
-		if colour == "white":
-			self.port = 4562
-		else:
-			self.port = 4563
-
-		self.src = None
-
-	#	print str(self) + " listens on port " + str(self.port)
-
-		if address == None:
-			self.host = socket.gethostname()
-			self.socket.bind((self.host, self.port))
+		self.address = address
+		self.server = (address[0] == None)
+		
+		
+		self.connected = False
+			
+	def connect(self):	
+		debug(str(self) + "Tries to connect")
+		self.connected = True
+		if self.address[0] == None:
+			self.host = "0.0.0.0" #socket.gethostname() # Breaks things???
+			self.socket.bind((self.host, self.address[1]))
 			self.socket.listen(5)	
 
-			self.src, self.address = self.socket.accept()
+			self.src, self.actual_address = self.socket.accept()
+			
 			self.src.send("ok\n")
-			if self.get_response() == "QUIT":
+			s = self.get_response()
+			if s == "QUIT":
 				self.src.close()
+				return
+			elif s != "ok":
+				self.src.close()
+				self.__init__(colour, (self.address[0], int(s)), baseplayer)
+				return
+			
 		else:
-			self.host = address
-			self.socket.connect((address, self.port))
+			time.sleep(0.3)
+			self.socket.connect(self.address)
 			self.src = self.socket
 			self.src.send("ok\n")
-			if self.get_response() == "QUIT":
+			s = self.get_response()
+			if s == "QUIT":
+				self.src.close()
+				return
+			elif s != "ok":
 				self.src.close()
+				self.__init__(colour, (self.address[0], int(s)), baseplayer)
+				return
+			
+
+		
+	def __str__(self):
+		return "@network:"+str(self.address)
 
 	def get_response(self):
+		
 		# Timeout the start of the message (first character)
 		if network_timeout_start > 0.0:
 			ready = select.select([self.src], [], [], network_timeout_start)[0]
@@ -1182,6 +1283,7 @@ class Network():
 			else:
 				raise Exception("UNRESPONSIVE")
 
+		
 		return s.strip(" \r\n")
 
 	def send_message(self,s):
@@ -1194,125 +1296,10 @@ class Network():
 			self.src.send(s + "\n")
 		else:
 			raise Exception("UNRESPONSIVE")
-
-	def check_quit(self, s):
-		s = s.split(" ")
-		if s[0] == "QUIT":
-			with game.lock:
-				game.final_result = " ".join(s[1:]) + " " + str(opponent(self.colour))
-			game.stop()
-			return True
-
 		
-
-class NetworkSender(Player,Network):
-	def __init__(self, base_player, address = None):
-		self.base_player = base_player
-		Player.__init__(self, base_player.name, base_player.colour)
-
-		self.address = address
-
-	def connect(self):
-		Network.__init__(self, self.base_player.colour, self.address)
-
-
-
-	def select(self):
-		[x,y] = self.base_player.select()
-		choice = self.board.grid[x][y]
-		s = str(x) + " " + str(y)
-		#print str(self) + ".select sends " + s
-		self.send_message(s)
-		return [x,y]
-
-	def get_move(self):
-		[x,y] = self.base_player.get_move()
-		s = str(x) + " " + str(y)
-		#print str(self) + ".get_move sends " + s
-		self.send_message(s)
-		return [x,y]
-
-	def update(self, s):
-		self.base_player.update(s)
-		s = s.split(" ")
-		[x,y] = map(int, s[0:2])
-		selected = self.board.grid[x][y]
-		if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s:
-			s = " ".join(s[0:3])
-			for i in range(2):
-				if selected.types[i][0] == '?':
-					s += " " + str(selected.types[i])
-				else:
-					s += " unknown"
-			#print str(self) + ".update sends " + s
-			self.send_message(s)
-				
-
-	def quit(self, final_result):
-		self.base_player.quit(final_result)
-		#self.src.send("QUIT " + str(final_result) + "\n")
-		self.src.close()
-
-class NetworkReceiver(Player,Network):
-	def __init__(self, colour, address=None):
 		
-		Player.__init__(self, "NetworkReceiver", colour)
-
-		self.address = address
 
-		self.board = None
-
-	def connect(self):
-		Network.__init__(self, self.colour, self.address)
-			
-
-	def select(self):
-		
-		s = self.get_response()
-		#print str(self) + ".select gets " + s
-		[x,y] = map(int,s.split(" "))
-		if x == -1 and y == -1:
-			#print str(self) + ".select quits the game"
-			with game.lock:
-				game.final_state = "network terminated " + self.colour
-			game.stop()
-		return [x,y]
-	def get_move(self):
-		s = self.get_response()
-		#print str(self) + ".get_move gets " + s
-		[x,y] = map(int,s.split(" "))
-		if x == -1 and y == -1:
-			#print str(self) + ".get_move quits the game"
-			with game.lock:
-				game.final_state = "network terminated " + self.colour
-			game.stop()
-		return [x,y]
-
-	def update(self, result):
-		
-		result = result.split(" ")
-		[x,y] = map(int, result[0:2])
-		selected = self.board.grid[x][y]
-		if selected != None and selected.colour == self.colour and len(result) > 2 and not "->" in result:
-			s = self.get_response()
-			#print str(self) + ".update - receives " + str(s)
-			s = s.split(" ")
-			selected.choice = int(s[2])
-			for i in range(2):
-				selected.types[i] = str(s[3+i])
-				if s[3+i] == "unknown":
-					selected.types[i] = '?'+selected.types[i]
-				else:
-					selected.types[i] = selected.types[i][1:]
-			selected.current_type = selected.types[selected.choice]	
-		else:
-			pass
-			#print str(self) + ".update - ignore result " + str(result)			
 		
-
-	def quit(self, final_result):
-		self.src.close()
-	
 # --- network.py --- #
 import threading
 
@@ -1505,6 +1492,9 @@ def log(s):
 	for l in log_files:
 		l.write(s)
 		
+def debug(s):
+	sys.stderr.write("# DEBUG: " + s + "\n")
+		
 
 def log_init(board, players):
 	for l in log_files:
@@ -1518,7 +1508,7 @@ def log_init(board, players):
 
 # A thread that runs the game
 class GameThread(StoppableThread):
-	def __init__(self, board, players):
+	def __init__(self, board, players, server = True):
 		StoppableThread.__init__(self)
 		self.board = board
 		self.players = players
@@ -1527,6 +1517,10 @@ class GameThread(StoppableThread):
 		self.lock = threading.RLock() #lock for access of self.state
 		self.cond = threading.Condition() # conditional for some reason, I forgot
 		self.final_result = ""
+		self.server = server
+		
+		
+			
 		
 		
 
@@ -1537,22 +1531,26 @@ class GameThread(StoppableThread):
 			
 			for p in self.players:
 				with self.lock:
-					if isinstance(p, NetworkSender):
-						self.state["turn"] = p.base_player # "turn" contains the player who's turn it is
-					else:
-						self.state["turn"] = p
+					self.state["turn"] = p.base_player()
 				#try:
 				if True:
 					[x,y] = p.select() # Player selects a square
 					if self.stopped():
 						break
-
-					
 						
-
-					result = self.board.select(x, y, colour = p.colour)				
+					if isinstance(p, NetworkPlayer):
+						if p.network.server == True:
+							result = self.board.select(x, y, colour = p.colour)
+						else:
+							result = None
+							
+					else:
+						result = self.board.select(x, y, colour = p.colour)
+					
+					result = p.update(result)					
 					for p2 in self.players:
-						p2.update(result) # Inform players of what happened
+						if p2 != p:
+							p2.update(result) # Inform players of what happened
 
 
 					log(result)
@@ -1583,14 +1581,25 @@ class GameThread(StoppableThread):
 
 					if self.stopped():
 						break
-
-					result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
-					log(result)
-
-					self.board.update_move(x, y, x2, y2)
 					
+					if isinstance(p, NetworkPlayer):
+						if p.network.server == True:
+							result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+							self.board.update_move(x, y, x2, y2)
+						else:
+							result = None
+							
+					else:
+						result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+						self.board.update_move(x, y, x2, y2)
+					
+					result = p.update(result)				
 					for p2 in self.players:
-						p2.update(result) # Inform players of what happened
+						if p2 != p:
+							p2.update(result) # Inform players of what happened
+											
+					log(result)
+
 
 										
 
@@ -1904,6 +1913,7 @@ class GraphicsThread(StoppableThread):
 		self.cond = threading.Condition()
 		self.sleep_timeout = None
 		self.last_event = time.time()
+		self.blackout = False
 
 		#print "Test font"
 		pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 32).render("Hello", True,(0,0,0))
@@ -1937,8 +1947,11 @@ class GraphicsThread(StoppableThread):
 
 				#print "Display pieces"
 				self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board		
+				self.blackout = False
 				
-			else:
+			elif pygame.mouse.get_focused() and not self.blackout:
+				os.system("xset dpms force off")
+				self.blackout = True
 				self.window.fill((0,0,0))
 
 			pygame.display.flip()
@@ -1963,7 +1976,7 @@ class GraphicsThread(StoppableThread):
 				
 				
 					
-
+  
 				
 								
 						
@@ -2354,10 +2367,18 @@ def make_player(name, colour):
 			return HumanPlayer(name, colour)
 		s = name[1:].split(":")
 		if s[0] == "network":
-			address = None
+			ip = None
+			port = 4562
 			if len(s) > 1:
-				address = s[1]
-			return NetworkReceiver(colour, address)
+				ip = s[1]
+				
+			if ip == None:
+				if colour == "black":
+					port = 4563
+			elif colour == "white":
+				port = 4563
+						
+			return NetworkPlayer(colour, Network((ip, port)), None)
 		if s[0] == "internal":
 
 			import inspect
@@ -2546,27 +2567,23 @@ def main(argv):
 		sys.stderr.write(sys.argv[0] + " : Graphics window closed before players chosen\n")
 		return 45
 
-
-	# Wrap NetworkSender players around original players if necessary
-	for i in range(len(players)):
-		if isinstance(players[i], NetworkReceiver):
-			players[i].board = board # Network players need direct access to the board
-			for j in range(len(players)):
-				if j == i:
-					continue
-				if isinstance(players[j], NetworkSender) or isinstance(players[j], NetworkReceiver):
+	old = players[:]
+	for p in old:
+		if isinstance(p, NetworkPlayer):
+			for i in range(len(old)):
+				if old[i] == p or isinstance(old[i], NetworkPlayer):
 					continue
-				players[j] = NetworkSender(players[j], players[i].address)
-				players[j].board = board
-
-	# Connect the networked players
+				players[i] = NetworkPlayer(old[i].colour, p.network, old[i])
+		
 	for p in players:
-		if isinstance(p, NetworkSender) or isinstance(p, NetworkReceiver):
-			if graphics != None:
-				graphics.board.display_grid(graphics.window, graphics.grid_sz)
-				graphics.message("Connecting to " + p.colour + " player...")
-			p.connect()
-
+		debug(str(p))
+		if isinstance(p, NetworkPlayer):
+			p.board = game.board
+			if not p.network.connected:
+				if not p.network.server:
+					time.sleep(0.2)
+				p.network.connect()
+				
 	
 	# If using windows, select won't work; use horrible TimeoutPlayer hack
 	if agent_timeout > 0:
@@ -2633,4 +2650,4 @@ if __name__ == "__main__":
 		sys.exit(102)
 
 # --- main.py --- #
-# EOF - created from make on Wed Mar 27 13:05:44 WST 2013
+# EOF - created from make on Fri Apr 12 17:07:44 WST 2013