Updates

Author: inactive123

include/queues/message_queue.h

@@ -26,6 +26,7 @@
 #include <stddef.h>
 
 #include <retro_common_api.h>
+#include <boolean.h>
 
 RETRO_BEGIN_DECLS
 
@@ -44,6 +45,16 @@ enum message_queue_category
 
 typedef struct msg_queue msg_queue_t;
 
+typedef struct
+{
+   char msg[1024];
+   char title[1024];
+   unsigned duration;
+   unsigned prio;
+   enum message_queue_icon icon;
+   enum message_queue_category category;
+} msg_queue_entry_t;
+
 /**
  * msg_queue_new:
  * @size              : maximum size of message
@@ -82,6 +93,28 @@ void msg_queue_push(msg_queue_t *queue, const char *msg,
  **/
 const char *msg_queue_pull(msg_queue_t *queue);
 
+/**
+ * msg_queue_extract:
+ * @queue             : pointer to queue object
+ * @queue_entry       : pointer to external queue entry struct
+ *
+ * Removes highest priority message from queue, copying
+ * contents into queue_entry struct.
+ *
+ * Returns: false if no messages in queue, otherwise true
+ **/
+bool msg_queue_extract(msg_queue_t *queue, msg_queue_entry_t *queue_entry);
+
+/**
+ * msg_queue_size:
+ * @queue             : pointer to queue object
+ *
+ * Fetches number of messages in queue.
+ *
+ * Returns: Number of messages in queue.
+ **/
+size_t msg_queue_size(msg_queue_t *queue);
+
 /**
  * msg_queue_clear:
  * @queue             : pointer to queue object

include/string/stdstring.h

@@ -146,6 +146,10 @@ unsigned string_to_unsigned(const char *str);
  * Returns 0 if string is invalid  */
 unsigned string_hex_to_unsigned(const char *str);
 
+char *string_init(const char *src);
+
+void string_set(char **string, const char *src);
+
 RETRO_END_DECLS
 
 #endif

queues/message_queue.c

@@ -127,6 +127,9 @@ void msg_queue_push(msg_queue_t *queue, const char *msg,
    new_elem->prio                = prio;
    new_elem->duration            = duration;
    new_elem->msg                 = msg ? strdup(msg) : NULL;
+   new_elem->title               = title ? strdup(title) : NULL;
+   new_elem->icon                = icon;
+   new_elem->category            = category;
 
    queue->elems[queue->ptr]      = new_elem;
 
@@ -165,6 +168,7 @@ void msg_queue_clear(msg_queue_t *queue)
       if (queue->elems[i])
       {
          free(queue->elems[i]->msg);
+         free(queue->elems[i]->title);
          free(queue->elems[i]);
          queue->elems[i] = NULL;
       }
@@ -203,9 +207,9 @@ const char *msg_queue_pull(msg_queue_t *queue)
    queue->tmp_msg = front->msg;
    front->msg = NULL;
 
-   front = (struct queue_elem*)queue->elems[1];
    last  = (struct queue_elem*)queue->elems[--queue->ptr];
    queue->elems[1] = last;
+   free(front->title);
    free(front);
 
    for (;;)
@@ -243,3 +247,100 @@ const char *msg_queue_pull(msg_queue_t *queue)
 
    return queue->tmp_msg;
 }
+
+/**
+ * msg_queue_extract:
+ * @queue             : pointer to queue object
+ * @queue_entry       : pointer to external queue entry struct
+ *
+ * Removes highest priority message from queue, copying
+ * contents into queue_entry struct.
+ *
+ * Returns: false if no messages in queue, otherwise true
+ **/
+bool msg_queue_extract(msg_queue_t *queue, msg_queue_entry_t *queue_entry)
+{
+   struct queue_elem *front  = NULL, *last = NULL;
+   size_t tmp_ptr = 1;
+
+   (void)tmp_ptr;
+
+   /* Ensure arguments are valid and queue is not
+    * empty */
+   if (!queue || queue->ptr == 1 || !queue_entry)
+      return false;
+
+   front = (struct queue_elem*)queue->elems[1];
+   last  = (struct queue_elem*)queue->elems[--queue->ptr];
+   queue->elems[1] = last;
+
+   /* Copy element parameters */
+   queue_entry->duration = front->duration;
+   queue_entry->prio     = front->prio;
+   queue_entry->icon     = front->icon;
+   queue_entry->category = front->category;
+   queue_entry->msg[0]   = '\0';
+   queue_entry->title[0] = '\0';
+
+   if (front->msg)
+      strlcpy(queue_entry->msg, front->msg, sizeof(queue_entry->msg));
+
+   if (front->title)
+      strlcpy(queue_entry->title, front->title, sizeof(queue_entry->title));
+
+   /* Delete element */
+   free(front->msg);
+   free(front->title);
+   free(front);
+
+   for (;;)
+   {
+      struct queue_elem *parent = NULL;
+      struct queue_elem *child  = NULL;
+      size_t switch_index       = tmp_ptr;
+      bool left                 = (tmp_ptr * 2 <= queue->ptr)
+         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2]);
+      bool right                = (tmp_ptr * 2 + 1 <= queue->ptr)
+         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2 + 1]);
+
+      if (!left && !right)
+         break;
+
+      if (left && !right)
+         switch_index <<= 1;
+      else if (right && !left)
+         switch_index += switch_index + 1;
+      else
+      {
+         if (queue->elems[tmp_ptr * 2]
+               >= queue->elems[tmp_ptr * 2 + 1])
+            switch_index <<= 1;
+         else
+            switch_index += switch_index + 1;
+      }
+
+      parent = (struct queue_elem*)queue->elems[tmp_ptr];
+      child  = (struct queue_elem*)queue->elems[switch_index];
+      queue->elems[tmp_ptr]      = child;
+      queue->elems[switch_index] = parent;
+      tmp_ptr                    = switch_index;
+   }
+
+   return true;
+}
+
+/**
+ * msg_queue_size:
+ * @queue             : pointer to queue object
+ *
+ * Fetches number of messages in queue.
+ *
+ * Returns: Number of messages in queue.
+ **/
+size_t msg_queue_size(msg_queue_t *queue)
+{
+   if (!queue || queue->ptr <= 1)
+      return 0;
+
+   return queue->ptr - 1;
+}

string/stdstring.c

@@ -26,6 +26,18 @@
 #include <string/stdstring.h>
 #include <encodings/utf.h>
 
+char *string_init(const char *src)
+{
+   return src ? strdup(src) : NULL;
+}
+
+void string_set(char **string, const char *src)
+{
+   free(*string);
+   *string = src ? strdup(src) : NULL;
+}
+
+
 char *string_to_upper(char *s)
 {
    char *cs = (char *)s;