Make sendStatus an extra enginge event

Author: Stefan Murawski

project/src/main/java/com/shurik/droidzebra/ZebraEngine.java

@@ -70,6 +70,7 @@ public class ZebraEngine {
             MSG_CANDIDATE_EVALS = 13,
             MSG_ANALYZE_GAME = 14,
             MSG_NEXT_MOVE = 15,
+            MSG_STATUS = 16,
             MSG_DEBUG = 65535;
 
     // engine state
@@ -554,18 +555,6 @@ private JSONObject Callback(int msgcode, JSONObject data) {
 
                 case MSG_DEBUG: {
                     String message = data.getString("message");
-                    if(message.startsWith("status")) {
-                        String[] split = message.split("\\s+");
-                        if(split.length > 3) {
-                            ZebraEngine.this.onDebugListener.onDebug("Depth: " + split[2]);
-                            try {
-                                currentGameState.setReachedDepth(Integer.parseInt(split[2]));
-                            } catch (NumberFormatException e) {
-                                Log.e("Status", e.toString(), e);
-                            }
-                        }
-
-                    }
                     ZebraEngine.this.onDebugListener.onDebug(message);
                 }
                 break;
@@ -721,6 +710,26 @@ private JSONObject Callback(int msgcode, JSONObject data) {
                 }
                 break;
 
+
+                case MSG_STATUS: {
+                    String message = data.getString("status");
+                    ZebraEngine.this.onDebugListener.onDebug("Status: " + message);
+                    String[] split = message.split("\\s+");
+                    if(split.length > 1) {
+                        String reachedDepth = split[1];
+                        ZebraEngine.this.onDebugListener.onDebug("Depth: " + reachedDepth);
+                        try {
+                            currentGameState.setReachedDepth(Integer.parseInt(reachedDepth));
+                        } catch (NumberFormatException e) {
+                            Log.e("Status", e.toString(), e);
+                        }
+                    }
+
+
+                    ZebraEngine.this.onDebugListener.onDebug("Status: " + message);
+                }
+                break;
+
                 case MSG_CANDIDATE_EVALS: {
                     JSONArray jscevals = data.getJSONArray("evals");
                     CandidateMove cmoves[] = new CandidateMove[jscevals.length()];

project/src/main/jni/droidzebra-display.c

@@ -253,7 +253,7 @@ display_status( FILE *stream, int allow_repeat ) {
 	// original
 	if ( ((status_pos != 0) || allow_repeat ) &&
 			(strlen( status_buffer ) > 0) ) {
-		droidzebra_message_debug( "status: %s\n", status_buffer );
+		droidzebra_msg_status(status_buffer );
 		strcpy( stored_status_buffer, status_buffer );
 	}
 	status_pos = 0;

project/src/main/jni/droidzebra-msg.c

@@ -273,6 +273,15 @@ droidzebra_msg_pv(void)
 	droidzebra_message(MSG_PV, buffer);
 }
 
+// MSG_PV
+void
+droidzebra_msg_status(char *status)
+{
+	char buffer[128];
+	sprintf(buffer, "{\"status\":\"%s\"}", status);
+	droidzebra_message(MSG_STATUS, buffer);
+}
+
 /*
   COMPARE_EVAL
   Comparison function for two evals.  Same return value conventions

project/src/main/jni/droidzebra-msg.h

@@ -36,6 +36,7 @@
 #define MSG_CANDIDATE_EVALS 13
 #define MSG_ANALYZE_GAME 14
 #define MSG_NEXT_MOVE 15
+#define MSG_STATUS 16
 #define MSG_DEBUG 65535
 
 #define UI_EVENT_EXIT  0
@@ -100,6 +101,10 @@ droidzebra_msg_eval(void);
 void
 droidzebra_msg_pv(void);
 
+void
+droidzebra_msg_status(char *status);
+
+
 void
 droidzebra_msg_candidate_evals(void);