Merge pull request #663 from FullName/peerchange-detail

group_namelistchange(): for gui reasons, divulge peernumber and change type

6 files changed, 36 insertions, 15 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index cc52c069..1a7fc230 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -785,7 +785,7 @@ void m_callback_group_message(Messenger *m, void (*function)(Messenger *m, int,
  * It gets called every time the name list changes(new peer/name, deleted peer)
  *  Function(Tox *tox, int groupnumber, void *userdata)
  */
-void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, void *), void *userdata)
+void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, int, uint8_t, void *), void *userdata)
 {
     m->group_namelistchange = function;
     m->group_namelistchange_userdata = userdata;
@@ -812,7 +812,7 @@ static void group_message_function(Group_Chat *chat, int peer_number, uint8_t *m
         (*m->group_message)(m, i, peer_number, message, length, m->group_message_userdata);
 }
 
-static void group_namelistchange_function(Group_Chat *chat, void *userdata)
+static void group_namelistchange_function(Group_Chat *chat, int peer, uint8_t change, void *userdata)
 {
     Messenger *m = userdata;
     int i = get_chat_num(m, chat);
@@ -820,7 +820,7 @@ static void group_namelistchange_function(Group_Chat *chat, void *userdata)
         return;
 
     if (m->group_namelistchange)
-        (*m->group_namelistchange)(m, i, m->group_namelistchange_userdata);
+        (*m->group_namelistchange)(m, i, peer, change, m->group_namelistchange_userdata);
 }
 
 
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index bf8a0572..6fc23db4 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -198,7 +198,7 @@ typedef struct Messenger {
     void *group_invite_userdata;
     void (*group_message)(struct Messenger *m, int, int, uint8_t *, uint16_t, void *);
     void *group_message_userdata;
-    void (*group_namelistchange)(struct Messenger *m, int, void *);
+    void (*group_namelistchange)(struct Messenger *m, int, int, uint8_t, void *);
     void *group_namelistchange_userdata;
 
     void (*file_sendrequest)(struct Messenger *m, int, uint8_t, uint64_t, uint8_t *, uint16_t, void *);
@@ -462,7 +462,7 @@ void m_callback_group_message(Messenger *m, void (*function)(Messenger *m, int,
  * It gets called every time the name list changes(new peer/name, deleted peer)
  *  Function(Tox *tox, int groupnumber, void *userdata)
  */
-void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, void *), void *userdata);
+void m_callback_group_namelistchange(Messenger *m, void (*function)(Messenger *m, int, int, uint8_t, void *), void *userdata);
 
 /* Creates a new groupchat and puts it in the chats array.
  *
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c
index b551a1fd..ec9229c4 100644
--- a/toxcore/group_chats.c
+++ b/toxcore/group_chats.c
@@ -219,7 +219,7 @@ static int addpeer(Group_Chat *chat, uint8_t *client_id)
     ++chat->numpeers;
 
     if (chat->peer_namelistchange != NULL)
-        (*chat->peer_namelistchange)(chat, chat->group_namelistchange_userdata);
+        (*chat->peer_namelistchange)(chat, chat->numpeers - 1, CHAT_CHANGE_PEER_ADD, chat->group_namelistchange_userdata);
 
     return (chat->numpeers - 1);
 }
@@ -254,8 +254,12 @@ static int delpeer(Group_Chat *chat, int peernum)
 
     chat->group = temp;
 
-    if (chat->peer_namelistchange != NULL)
-        (*chat->peer_namelistchange)(chat, chat->group_namelistchange_userdata);
+    if (chat->peer_namelistchange != NULL) {
+        (*chat->peer_namelistchange)(chat, chat->numpeers, CHAT_CHANGE_PEER_DEL, chat->group_namelistchange_userdata);
+
+        if (chat->numpeers != (uint32_t)peernum)
+            (*chat->peer_namelistchange)(chat, peernum, CHAT_CHANGE_PEER_NAME, chat->group_namelistchange_userdata);
+    }
 
     return 0;
 }
@@ -286,12 +290,18 @@ static void setnick(Group_Chat *chat, int peernum, uint8_t *contents, uint16_t c
     if (contents_len > MAX_NICK_BYTES || contents_len == 0)
         return;
 
+    /* same name as already stored? */
+    if ((chat->group[peernum].nick_len == contents_len) &&
+            !memcmp(chat->group[peernum].nick, contents, contents_len))
+        return;
+
     memcpy(chat->group[peernum].nick, contents, contents_len);
     /* Force null termination */
     chat->group[peernum].nick[contents_len - 1] = 0;
     chat->group[peernum].nick_len = contents_len;
+
     if (chat->peer_namelistchange != NULL)
-        (*chat->peer_namelistchange)(chat, chat->group_namelistchange_userdata);
+        (*chat->peer_namelistchange)(chat, peernum, CHAT_CHANGE_PEER_NAME, chat->group_namelistchange_userdata);
 }
 
 /* min time between pings sent to one peer in seconds */
@@ -626,7 +636,7 @@ void callback_groupmessage(Group_Chat *chat, void (*function)(Group_Chat *chat,
     chat->group_message_userdata = userdata;
 }
 
-void callback_namelistchange(Group_Chat *chat, void (*function)(Group_Chat *chat, void *), void *userdata)
+void callback_namelistchange(Group_Chat *chat, void (*function)(Group_Chat *chat, int peer, uint8_t change, void *), void *userdata)
 {
     chat->peer_namelistchange = function;
     chat->group_namelistchange_userdata = userdata;
diff --git a/toxcore/group_chats.h b/toxcore/group_chats.h
index 2235a6e3..65f573fb 100644
--- a/toxcore/group_chats.h
+++ b/toxcore/group_chats.h
@@ -65,7 +65,7 @@ typedef struct Group_Chat {
     uint32_t message_number;
     void (*group_message)(struct Group_Chat *m, int, uint8_t *, uint16_t, void *);
     void *group_message_userdata;
-    void (*peer_namelistchange)(struct Group_Chat *m, void *);
+    void (*peer_namelistchange)(struct Group_Chat *m, int peer, uint8_t change, void *);
     void *group_namelistchange_userdata;
 
     uint64_t last_sent_ping;
@@ -105,7 +105,13 @@ void callback_groupmessage(Group_Chat *chat, void (*function)(Group_Chat *chat,
  *
  * format of function is: function(Group_Chat *chat, userdata)
  */
-void callback_namelistchange(Group_Chat *chat, void (*function)(Group_Chat *chat, void *), void *userdata);
+typedef enum {
+    CHAT_CHANGE_PEER_ADD,
+    CHAT_CHANGE_PEER_DEL,
+    CHAT_CHANGE_PEER_NAME,
+} CHAT_CHANGE;
+
+void callback_namelistchange(Group_Chat *chat, void (*function)(Group_Chat *chat, int peer, uint8_t change, void *), void *userdata);
 
 /*
  * Send a message to the group.
diff --git a/toxcore/tox.c b/toxcore/tox.c
index 4ba17e34..d5bc1c35 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -422,7 +422,7 @@ void tox_callback_group_message(Tox *tox, void (*function)(Messenger *tox, int,
  *  Function(Tox *tox, int groupnumber, void *userdata)
  */
 
-void tox_callback_group_namelistchange(Tox *tox, void (*function)(Tox *tox, int, void *), void *userdata)
+void tox_callback_group_namelistchange(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t, void *), void *userdata)
 {
     Messenger *m = tox;
     m_callback_group_namelistchange(m, function, userdata);
diff --git a/toxcore/tox.h b/toxcore/tox.h
index fedc2c8a..08727d2a 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -366,10 +366,15 @@ void tox_callback_group_message(Tox *tox, void (*function)(Tox *tox, int, int, u
 /* Set callback function for peer name list changes.
  *
  * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, void *userdata)
+ *  Function(Tox *tox, int groupnumber, int peernumber, TOX_CHAT_CHANGE change, void *userdata)
  */
+typedef enum {
+    TOX_CHAT_CHANGE_PEER_ADD,
+    TOX_CHAT_CHANGE_PEER_DEL,
+    TOX_CHAT_CHANGE_PEER_NAME,
+} TOX_CHAT_CHANGE;
 
-void tox_callback_group_namelistchange(Tox *tox, void (*function)(Tox *tox, int, void *), void *userdata);
+void tox_callback_group_namelistchange(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t, void *), void *userdata);
 
 /* Creates a new groupchat and puts it in the chats array.
  *