X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=efb56bba2cfc6d9030c5de4e1be6dc74f151f9e4;hb=e1fdeb57afb3db322b3757d8105c66ba33cadca4;hp=32910410bff9d25d3732813e85091a0fae53f269;hpb=ab0c2cf87c09fdc785f5124640a9f3334bb3a4b4;p=rocksndiamonds.git

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index 32910410..efb56bba 100644
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -215,8 +215,8 @@ boolean FrameReached(unsigned long *frame_counter_var,
 {
   unsigned long actual_frame_counter = FrameCounter;
 
-  if (actual_frame_counter < *frame_counter_var + frame_delay &&
-      actual_frame_counter >= *frame_counter_var)
+  if (actual_frame_counter >= *frame_counter_var &&
+      actual_frame_counter < *frame_counter_var + frame_delay)
     return FALSE;
 
   *frame_counter_var = actual_frame_counter;
@@ -229,8 +229,8 @@ boolean DelayReached(unsigned long *counter_var,
 {
   unsigned long actual_counter = Counter();
 
-  if (actual_counter < *counter_var + delay &&
-      actual_counter >= *counter_var)
+  if (actual_counter >= *counter_var &&
+      actual_counter < *counter_var + delay)
     return FALSE;
 
   *counter_var = actual_counter;
@@ -246,8 +246,8 @@ void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay)
   {
     actual_counter = Counter();
 
-    if (actual_counter < *counter_var + delay &&
-	actual_counter >= *counter_var)
+    if (actual_counter >= *counter_var &&
+	actual_counter < *counter_var + delay)
       sleep_milliseconds((*counter_var + delay - actual_counter) / 2);
     else
       break;
@@ -261,74 +261,70 @@ void WaitUntilDelayReached(unsigned long *counter_var, unsigned long delay)
 /* random generator functions                                                */
 /* ------------------------------------------------------------------------- */
 
+#if 0
 unsigned int SimpleRND(unsigned int max)
 {
-#if defined(TARGET_SDL)
-  static unsigned long root = 654321;
-  unsigned long current_ms;
+  return (random_linux_libc(RND_FREE) % max);
+}
 
-  current_ms = SDL_GetTicks();
-  root = root * 4253261 + current_ms;
-  return (root % max);
-#else
-  static unsigned long root = 654321;
-  struct timeval current_time;
+unsigned int InitSimpleRND(long seed)
+{
+  if (seed == NEW_RANDOMIZE)
+  {
+    struct timeval current_time;
 
-  gettimeofday(&current_time, NULL);
-  root = root * 4253261 + current_time.tv_sec + current_time.tv_usec;
-  return (root % max);
-#endif
-}
+    gettimeofday(&current_time, NULL);
+    seed = (long)current_time.tv_usec;
+  }
 
-#ifdef DEBUG
-static unsigned int last_RND_value = 0;
+  srandom_linux_libc(RND_FREE, (unsigned int) seed);
 
-unsigned int last_RND()
-{
-  return last_RND_value;
+  return (unsigned int) seed;
 }
-#endif
 
 unsigned int RND(unsigned int max)
 {
-#ifdef DEBUG
-  return (last_RND_value = random_linux_libc() % max);
-#else
-  return (random_linux_libc() % max);
-#endif
+  return (random_linux_libc(RND_GAME) % max);
 }
 
 unsigned int InitRND(long seed)
 {
-#if defined(TARGET_SDL)
-  unsigned long current_ms;
-
   if (seed == NEW_RANDOMIZE)
   {
-    current_ms = SDL_GetTicks();
-    srandom_linux_libc((unsigned int) current_ms);
-    return (unsigned int) current_ms;
-  }
-  else
-  {
-    srandom_linux_libc((unsigned int) seed);
-    return (unsigned int) seed;
+    struct timeval current_time;
+
+    gettimeofday(&current_time, NULL);
+    seed = (long)current_time.tv_usec;
   }
-#else
-  struct timeval current_time;
 
+  srandom_linux_libc(RND_GAME, (unsigned int) seed);
+
+  return (unsigned int) seed;
+}
+#endif
+
+unsigned int init_random_number(int nr, long seed)
+{
   if (seed == NEW_RANDOMIZE)
   {
+#if defined(TARGET_SDL)
+    seed = (long)SDL_GetTicks();
+#else
+    struct timeval current_time;
+
     gettimeofday(&current_time, NULL);
-    srandom_linux_libc((unsigned int) current_time.tv_usec);
-    return (unsigned int) current_time.tv_usec;
-  }
-  else
-  {
-    srandom_linux_libc((unsigned int) seed);
-    return (unsigned int) seed;
-  }
+    seed = (long)current_time.tv_usec;
 #endif
+  }
+
+  srandom_linux_libc(nr, (unsigned int) seed);
+
+  return (unsigned int) seed;
+}
+
+unsigned int get_random_number(int nr, unsigned int max)
+{
+  return (random_linux_libc(nr) % max);
 }
 
 
@@ -336,13 +332,53 @@ unsigned int InitRND(long seed)
 /* system info functions                                                     */
 /* ------------------------------------------------------------------------- */
 
+static char *get_corrected_real_name(char *real_name)
+{
+  char *real_name_new = checked_malloc(MAX_USERNAME_LEN + 1);
+  char *from_ptr = real_name;
+  char *to_ptr   = real_name_new;
+
+  if (strchr(real_name, 'ß') == NULL)	/* name does not contain 'ß' */
+  {
+    strncpy(real_name_new, real_name, MAX_USERNAME_LEN);
+    real_name_new[MAX_USERNAME_LEN] = '\0';
+
+    return real_name_new;
+  }
+
+  /* the user's real name may contain a 'ß' character (german sharp s),
+     which has no equivalent in upper case letters (which our fonts use) */
+  while (*from_ptr && (long)(to_ptr - real_name_new) < MAX_USERNAME_LEN - 1)
+  {
+    if (*from_ptr != 'ß')
+      *to_ptr++ = *from_ptr++;
+    else
+    {
+      from_ptr++;
+      *to_ptr++ = 's';
+      *to_ptr++ = 's';
+    }
+  }
+
+  *to_ptr = '\0';
+
+  return real_name_new;
+}
+
 char *getLoginName()
 {
-#if defined(PLATFORM_WIN32)
-  return ANONYMOUS_NAME;
-#else
   static char *login_name = NULL;
 
+#if defined(PLATFORM_WIN32)
+  if (login_name == NULL)
+  {
+    unsigned long buffer_size = MAX_USERNAME_LEN + 1;
+    login_name = checked_malloc(buffer_size);
+
+    if (GetUserName(login_name, &buffer_size) == 0)
+      strcpy(login_name, ANONYMOUS_NAME);
+  }
+#else
   if (login_name == NULL)
   {
     struct passwd *pwd;
@@ -352,70 +388,73 @@ char *getLoginName()
     else
       login_name = getStringCopy(pwd->pw_name);
   }
+#endif
 
   return login_name;
-#endif
 }
 
 char *getRealName()
 {
-#if defined(PLATFORM_UNIX)
-  struct passwd *pwd;
+  static char *real_name = NULL;
 
-  if ((pwd = getpwuid(getuid())) == NULL || strlen(pwd->pw_gecos) == 0)
-    return ANONYMOUS_NAME;
-  else
+#if defined(PLATFORM_WIN32)
+  if (real_name == NULL)
   {
-    static char real_name[1024];
-    char *from_ptr = pwd->pw_gecos, *to_ptr = real_name;
+    static char buffer[MAX_USERNAME_LEN + 1];
+    unsigned long buffer_size = MAX_USERNAME_LEN + 1;
 
-    if (strchr(pwd->pw_gecos, 'ß') == NULL)
-      return pwd->pw_gecos;
-
-    /* the user's real name contains a 'ß' character (german sharp s),
-       which has no equivalent in upper case letters (which our fonts use) */
-    while (*from_ptr != '\0' && (long)(to_ptr - real_name) < 1024 - 2)
-    {
-      if (*from_ptr != 'ß')
-	*to_ptr++ = *from_ptr++;
-      else
-      {
-	from_ptr++;
-	*to_ptr++ = 's';
-	*to_ptr++ = 's';
-      }
-    }
-    *to_ptr = '\0';
+    if (GetUserName(buffer, &buffer_size) != 0)
+      real_name = get_corrected_real_name(buffer);
+    else
+      real_name = ANONYMOUS_NAME;
+  }
+#elif defined(PLATFORM_UNIX)
+  if (real_name == NULL)
+  {
+    struct passwd *pwd;
 
-    return real_name;
+    if ((pwd = getpwuid(getuid())) != NULL && strlen(pwd->pw_gecos) != 0)
+      real_name = get_corrected_real_name(pwd->pw_gecos);
+    else
+      real_name = ANONYMOUS_NAME;
   }
-#else /* !PLATFORM_UNIX */
-  return ANONYMOUS_NAME;
+#else
+  real_name = ANONYMOUS_NAME;
 #endif
+
+  return real_name;
 }
 
 char *getHomeDir()
 {
-#if defined(PLATFORM_UNIX)
-  static char *home_dir = NULL;
+  static char *dir = NULL;
+
+#if defined(PLATFORM_WIN32)
+  if (dir == NULL)
+  {
+    dir = checked_malloc(MAX_PATH + 1);
 
-  if (home_dir == NULL)
+    if (!SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, dir)))
+      strcpy(dir, ".");
+  }
+#elif defined(PLATFORM_UNIX)
+  if (dir == NULL)
   {
-    if ((home_dir = getenv("HOME")) == NULL)
+    if ((dir = getenv("HOME")) == NULL)
     {
       struct passwd *pwd;
 
-      if ((pwd = getpwuid(getuid())) == NULL)
-	home_dir = ".";
+      if ((pwd = getpwuid(getuid())) != NULL)
+	dir = getStringCopy(pwd->pw_dir);
       else
-	home_dir = getStringCopy(pwd->pw_dir);
+	dir = ".";
     }
   }
-
-  return home_dir;
 #else
-  return ".";
+  dir = ".";
 #endif
+
+  return dir;
 }
 
 
@@ -429,6 +468,7 @@ char *getPath2(char *path1, char *path2)
 				       strlen(path2) + 1);
 
   sprintf(complete_path, "%s/%s", path1, path2);
+
   return complete_path;
 }
 
@@ -439,6 +479,7 @@ char *getPath3(char *path1, char *path2, char *path3)
 				       strlen(path3) + 1);
 
   sprintf(complete_path, "%s/%s/%s", path1, path2, path3);
+
   return complete_path;
 }
 
@@ -447,6 +488,7 @@ char *getStringCat2(char *s1, char *s2)
   char *complete_string = checked_malloc(strlen(s1) + strlen(s2) + 1);
 
   sprintf(complete_string, "%s%s", s1, s2);
+
   return complete_string;
 }
 
@@ -458,8 +500,8 @@ char *getStringCopy(char *s)
     return NULL;
 
   s_copy = checked_malloc(strlen(s) + 1);
-
   strcpy(s_copy, s);
+
   return s_copy;
 }
 
@@ -475,6 +517,14 @@ char *getStringToLower(char *s)
   return s_copy;
 }
 
+void setString(char **old_value, char *new_value)
+{
+  if (*old_value != NULL)
+    free(*old_value);
+
+  *old_value = getStringCopy(new_value);
+}
+
 
 /* ------------------------------------------------------------------------- */
 /* command line option handling functions                                    */
@@ -523,12 +573,18 @@ void GetOptions(char *argv[])
   options.graphics_directory = RO_BASE_PATH "/" GRAPHICS_DIRECTORY;
   options.sounds_directory = RO_BASE_PATH "/" SOUNDS_DIRECTORY;
   options.music_directory = RO_BASE_PATH "/" MUSIC_DIRECTORY;
+  options.docs_directory = RO_BASE_PATH "/" DOCS_DIRECTORY;
   options.execute_command = NULL;
   options.serveronly = FALSE;
   options.network = FALSE;
   options.verbose = FALSE;
   options.debug = FALSE;
 
+#if !defined(PLATFORM_UNIX)
+  if (*options_left == NULL)	/* no options given -- enable verbose mode */
+    options.verbose = TRUE;
+#endif
+
   while (*options_left)
   {
     char option_str[MAX_OPTION_LEN];
@@ -1445,9 +1501,18 @@ void dumpList(ListNode *node_first)
 
 
 /* ------------------------------------------------------------------------- */
-/* functions for checking filenames                                          */
+/* functions for checking files and filenames                                */
 /* ------------------------------------------------------------------------- */
 
+boolean fileExists(char *filename)
+{
+#if 0
+  printf("checking file '%s'\n", filename);
+#endif
+
+  return (access(filename, F_OK) == 0);
+}
+
 boolean FileIsGraphic(char *filename)
 {
   if (strlen(filename) > 4 &&
@@ -1499,25 +1564,93 @@ boolean FileIsArtworkType(char *basename, int type)
 /* functions for loading artwork configuration information                   */
 /* ------------------------------------------------------------------------- */
 
-static void FreeCustomArtworkList(struct ArtworkListInfo *,
-				  struct ListNodeInfo ***, int *);
+/* This function checks if a string <s> of the format "string1, string2, ..."
+   exactly contains a string <s_contained>. */
+
+static boolean string_has_parameter(char *s, char *s_contained)
+{
+  char *substring;
+
+  if (s == NULL || s_contained == NULL)
+    return FALSE;
+
+  if (strlen(s_contained) > strlen(s))
+    return FALSE;
+
+  if (strncmp(s, s_contained, strlen(s_contained)) == 0)
+  {
+    char next_char = s[strlen(s_contained)];
+
+    /* check if next character is delimiter or whitespace */
+    return (next_char == ',' || next_char == '\0' ||
+	    next_char == ' ' || next_char == '\t' ? TRUE : FALSE);
+  }
+
+  /* check if string contains another parameter string after a comma */
+  substring = strchr(s, ',');
+  if (substring == NULL)	/* string does not contain a comma */
+    return FALSE;
+
+  /* advance string pointer to next character after the comma */
+  substring++;
 
-static int get_parameter_value(int type, char *value)
+  /* skip potential whitespaces after the comma */
+  while (*substring == ' ' || *substring == '\t')
+    substring++;
+
+  return string_has_parameter(substring, s_contained);
+}
+
+int get_parameter_value(char *token, char *value_raw, int type)
 {
-  return (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
-	  type == TYPE_INTEGER ? get_integer_from_string(value) :
-	  type == TYPE_BOOLEAN ? get_boolean_from_string(value) :
-	  -1);
+  char *value = getStringToLower(value_raw);
+  int result = 0;	/* probably a save default value */
+
+  if (strcmp(token, ".direction") == 0)
+  {
+    result = (strcmp(value, "left")  == 0 ? MV_LEFT :
+	      strcmp(value, "right") == 0 ? MV_RIGHT :
+	      strcmp(value, "up")    == 0 ? MV_UP :
+	      strcmp(value, "down")  == 0 ? MV_DOWN : MV_NO_MOVING);
+  }
+  else if (strcmp(token, ".anim_mode") == 0)
+  {
+    result = (string_has_parameter(value, "loop")      ? ANIM_LOOP :
+	      string_has_parameter(value, "linear")    ? ANIM_LINEAR :
+	      string_has_parameter(value, "pingpong")  ? ANIM_PINGPONG :
+	      string_has_parameter(value, "pingpong2") ? ANIM_PINGPONG2 :
+	      string_has_parameter(value, "random")    ? ANIM_RANDOM :
+	      string_has_parameter(value, "none")      ? ANIM_NONE :
+	      ANIM_LOOP);
+
+    if (string_has_parameter(value, "reverse"))
+      result |= ANIM_REVERSE;
+  }
+  else		/* generic parameter of type integer or boolean */
+  {
+    result = (strcmp(value, ARG_UNDEFINED) == 0 ? ARG_UNDEFINED_VALUE :
+	      type == TYPE_INTEGER ? get_integer_from_string(value) :
+	      type == TYPE_BOOLEAN ? get_boolean_from_string(value) :
+	      ARG_UNDEFINED_VALUE);
+  }
+
+  free(value);
+
+  return result;
 }
 
+static void FreeCustomArtworkList(struct ArtworkListInfo *,
+				  struct ListNodeInfo ***, int *);
+
 struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 					   struct ConfigInfo *suffix_list,
+					   char **ignore_tokens,
 					   int num_file_list_entries)
 {
   struct FileInfo *file_list;
   int num_file_list_entries_found = 0;
   int num_suffix_list_entries = 0;
-  int list_pos = 0;
+  int list_pos;
   int i, j;
 
   file_list = checked_calloc(num_file_list_entries * sizeof(struct FileInfo));
@@ -1529,27 +1662,26 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
   for (i=0; i<num_file_list_entries; i++)
   {
     file_list[i].token = NULL;
+
     file_list[i].default_filename = NULL;
     file_list[i].filename = NULL;
 
     if (num_suffix_list_entries > 0)
     {
-      int parameter_array_size = num_suffix_list_entries * sizeof(int);
+      int parameter_array_size = num_suffix_list_entries * sizeof(char *);
 
       file_list[i].default_parameter = checked_calloc(parameter_array_size);
       file_list[i].parameter = checked_calloc(parameter_array_size);
 
       for (j=0; j<num_suffix_list_entries; j++)
       {
-	int default_parameter =
-	  get_parameter_value(suffix_list[j].type, suffix_list[j].value);
-
-	file_list[i].default_parameter[j] = default_parameter;
-	file_list[i].parameter[j] = default_parameter;
+	setString(&file_list[i].default_parameter[j], suffix_list[j].value);
+	setString(&file_list[i].parameter[j], suffix_list[j].value);
       }
     }
   }
 
+  list_pos = 0;
   for (i=0; config_list[i].token != NULL; i++)
   {
     int len_config_token = strlen(config_list[i].token);
@@ -1564,14 +1696,19 @@ struct FileInfo *getFileListFromConfigList(struct ConfigInfo *config_list,
 	  strcmp(&config_list[i].token[len_config_token - len_suffix],
 		 suffix_list[j].token) == 0)
       {
-	file_list[list_pos].default_parameter[j] =
-	  get_parameter_value(suffix_list[j].type, config_list[i].value);
+	setString(&file_list[list_pos].default_parameter[j],
+		  config_list[i].value);
 
 	is_file_entry = FALSE;
 	break;
       }
     }
 
+    /* the following tokens are no file definitions, but other config tokens */
+    for (j=0; ignore_tokens[j] != NULL; j++)
+      if (strcmp(config_list[i].token, ignore_tokens[j]) == 0)
+	is_file_entry = FALSE;
+
     if (is_file_entry)
     {
       if (i > 0)
@@ -1616,7 +1753,7 @@ static boolean token_suffix_match(char *token, char *suffix, int start_pos)
   int len_suffix = strlen(suffix);
 
 #if 0
-  if (IS_PARENT_PROCESS(audio.mixer_pid))
+  if (IS_PARENT_PROCESS())
     printf(":::::::::: check '%s' for '%s' ::::::::::\n", token, suffix);
 #endif
 
@@ -1651,19 +1788,19 @@ static void read_token_parameters(struct SetupFileList *setup_file_list,
 
   if (filename != NULL)
   {
+    setString(&file_list_entry->filename, filename);
+
     /* when file definition found, set all parameters to default values */
     for (i=0; suffix_list[i].token != NULL; i++)
-      file_list_entry->parameter[i] =
-	get_parameter_value(suffix_list[i].type, suffix_list[i].value);
+      setString(&file_list_entry->parameter[i], suffix_list[i].value);
 
-    file_list_entry->filename = getStringCopy(filename);
+    file_list_entry->redefined = TRUE;
 
     /* mark config file token as well known from default config */
     setTokenValue(setup_file_list, file_list_entry->token, known_token_value);
   }
   else
-    file_list_entry->filename =
-      getStringCopy(file_list_entry->default_filename);
+    setString(&file_list_entry->filename, file_list_entry->default_filename);
 
   /* check for config tokens that can be build by base token and suffixes */
   for (i=0; suffix_list[i].token != NULL; i++)
@@ -1673,8 +1810,7 @@ static void read_token_parameters(struct SetupFileList *setup_file_list,
 
     if (value != NULL)
     {
-      file_list_entry->parameter[i] =
-	get_parameter_value(suffix_list[i].type, value);
+      setString(&file_list_entry->parameter[i], value);
 
       /* mark config file token as well known from default config */
       setTokenValue(setup_file_list, token, known_token_value);
@@ -1692,10 +1828,10 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
 					char *token)
 {
   struct FileInfo *new_list_entry;
-  int parameter_array_size = num_suffix_list_entries * sizeof(int);
+  int parameter_array_size = num_suffix_list_entries * sizeof(char *);
 
 #if 0
-  if (IS_PARENT_PROCESS(audio.mixer_pid))
+  if (IS_PARENT_PROCESS())
     printf("===> found dynamic definition '%s'\n", token);
 #endif
 
@@ -1704,6 +1840,7 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
   new_list_entry = &(*list)[*num_list_entries - 1];
 
   new_list_entry->token = getStringCopy(token);
+  new_list_entry->filename = NULL;
   new_list_entry->parameter = checked_calloc(parameter_array_size);
 
   read_token_parameters(extra_file_list, suffix_list, new_list_entry);
@@ -1711,7 +1848,8 @@ static void add_dynamic_file_list_entry(struct FileInfo **list,
 
 static void add_property_mapping(struct PropertyMapping **list,
 				 int *num_list_entries,
-				 int base_index, int ext1_index,int ext2_index,
+				 int base_index, int ext1_index,
+				 int ext2_index, int ext3_index,
 				 int artwork_index)
 {
   struct PropertyMapping *new_list_entry;
@@ -1724,6 +1862,7 @@ static void add_property_mapping(struct PropertyMapping **list,
   new_list_entry->base_index = base_index;
   new_list_entry->ext1_index = ext1_index;
   new_list_entry->ext2_index = ext2_index;
+  new_list_entry->ext3_index = ext3_index;
 
   new_list_entry->artwork_index = artwork_index;
 }
@@ -1735,17 +1874,21 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   char **base_prefixes = artwork_info->base_prefixes;
   char **ext1_suffixes = artwork_info->ext1_suffixes;
   char **ext2_suffixes = artwork_info->ext2_suffixes;
+  char **ext3_suffixes = artwork_info->ext3_suffixes;
+  char **ignore_tokens = artwork_info->ignore_tokens;
   int num_file_list_entries = artwork_info->num_file_list_entries;
   int num_suffix_list_entries = artwork_info->num_suffix_list_entries;
   int num_base_prefixes = artwork_info->num_base_prefixes;
   int num_ext1_suffixes = artwork_info->num_ext1_suffixes;
   int num_ext2_suffixes = artwork_info->num_ext2_suffixes;
+  int num_ext3_suffixes = artwork_info->num_ext3_suffixes;
+  int num_ignore_tokens = artwork_info->num_ignore_tokens;
   char *filename = getCustomArtworkConfigFilename(artwork_info->type);
   struct SetupFileList *setup_file_list;
   struct SetupFileList *extra_file_list = NULL;
   struct SetupFileList *list;
   char *known_token_value = KNOWN_TOKEN_VALUE;
-  int i, j, k;
+  int i, j, k, l;
 
 #if 0
   printf("GOT CUSTOM ARTWORK CONFIG FILE '%s'\n", filename);
@@ -1754,12 +1897,12 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   /* always start with reliable default values */
   for (i=0; i<num_file_list_entries; i++)
   {
-    if (file_list[i].filename != NULL)
-      free(file_list[i].filename);
-    file_list[i].filename = NULL;
+    setString(&file_list[i].filename, file_list[i].default_filename);
 
     for (j=0; j<num_suffix_list_entries; j++)
-      file_list[i].parameter[j] = file_list[i].default_parameter[j];
+      setString(&file_list[i].parameter[j], file_list[i].default_parameter[j]);
+
+    file_list[i].redefined = FALSE;
   }
 
   /* free previous dynamic artwork file array */
@@ -1798,9 +1941,9 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
   for (i=0; i<num_file_list_entries; i++)
     read_token_parameters(setup_file_list, suffix_list, &file_list[i]);
 
-  /* set all known tokens to "known" keyword */
-  setTokenValue(setup_file_list, "name", known_token_value);
-  setTokenValue(setup_file_list, "sort_priority", known_token_value);
+  /* set all tokens that can be ignored here to "known" keyword */
+  for (i=0; i < num_ignore_tokens; i++)
+    setTokenValue(setup_file_list, ignore_tokens[i], known_token_value);
 
   /* copy all unknown config file tokens to extra config list */
   for (list = setup_file_list; list != NULL; list = list->next)
@@ -1848,7 +1991,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     }
 
 #if 0
-    if (IS_PARENT_PROCESS(audio.mixer_pid))
+    if (IS_PARENT_PROCESS())
     {
       if (parameter_suffix_found)
 	printf("---> skipping token '%s' (parameter token)\n", token);
@@ -1860,7 +2003,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
     if (parameter_suffix_found)
       continue;
 
-    /* ---------- step 1: search for matching base prefix ---------- */
+    /* ---------- step 0: search for matching base prefix ---------- */
 
     start_pos = 0;
     for (i=0; i<num_base_prefixes && !base_prefix_found; i++)
@@ -1868,14 +2011,25 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
       char *base_prefix = base_prefixes[i];
       int len_base_prefix = strlen(base_prefix);
       boolean ext1_suffix_found = FALSE;
+      boolean ext2_suffix_found = FALSE;
+      boolean ext3_suffix_found = FALSE;
+      boolean exact_match = FALSE;
+      int base_index = -1;
+      int ext1_index = -1;
+      int ext2_index = -1;
+      int ext3_index = -1;
 
       base_prefix_found = token_suffix_match(token, base_prefix, start_pos);
 
       if (!base_prefix_found)
 	continue;
 
+      base_index = i;
+
       if (start_pos + len_base_prefix == len_token)	/* exact match */
       {
+	exact_match = TRUE;
+
 	add_dynamic_file_list_entry(dynamic_file_list,
 				    num_dynamic_file_list_entries,
 				    extra_file_list,
@@ -1884,32 +2038,35 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 				    token);
 	add_property_mapping(property_mapping,
 			     num_property_mapping_entries,
-			     i, -1, -1,
+			     base_index, -1, -1, -1,
 			     current_summarized_file_list_entry);
 	continue;
       }
 
 #if 0
-      if (IS_PARENT_PROCESS(audio.mixer_pid))
+      if (IS_PARENT_PROCESS())
 	printf("---> examining token '%s': search 1st suffix ...\n", token);
 #endif
 
-      /* ---------- step 2: search for matching first suffix ---------- */
+      /* ---------- step 1: search for matching first suffix ---------- */
 
       start_pos += len_base_prefix;
       for (j=0; j<num_ext1_suffixes && !ext1_suffix_found; j++)
       {
 	char *ext1_suffix = ext1_suffixes[j];
 	int len_ext1_suffix = strlen(ext1_suffix);
-	boolean ext2_suffix_found = FALSE;
 
 	ext1_suffix_found = token_suffix_match(token, ext1_suffix, start_pos);
 
 	if (!ext1_suffix_found)
 	  continue;
 
+	ext1_index = j;
+
 	if (start_pos + len_ext1_suffix == len_token)	/* exact match */
 	{
+	  exact_match = TRUE;
+
 	  add_dynamic_file_list_entry(dynamic_file_list,
 				      num_dynamic_file_list_entries,
 				      extra_file_list,
@@ -1918,43 +2075,93 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 				      token);
 	  add_property_mapping(property_mapping,
 			       num_property_mapping_entries,
-			       i, j, -1,
+			       base_index, ext1_index, -1, -1,
 			       current_summarized_file_list_entry);
 	  continue;
 	}
 
+	start_pos += len_ext1_suffix;
+      }
+
+      if (exact_match)
+	break;
+
 #if 0
-	if (IS_PARENT_PROCESS(audio.mixer_pid))
-	  printf("---> examining token '%s': search 2nd suffix ...\n", token);
+      if (IS_PARENT_PROCESS())
+	printf("---> examining token '%s': search 2nd suffix ...\n", token);
 #endif
 
-	/* ---------- step 3: search for matching second suffix ---------- */
+      /* ---------- step 2: search for matching second suffix ---------- */
 
-	start_pos += len_ext1_suffix;
-	for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+      for (k=0; k<num_ext2_suffixes && !ext2_suffix_found; k++)
+      {
+	char *ext2_suffix = ext2_suffixes[k];
+	int len_ext2_suffix = strlen(ext2_suffix);
+
+	ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
+
+	if (!ext2_suffix_found)
+	  continue;
+
+	ext2_index = k;
+
+	if (start_pos + len_ext2_suffix == len_token)	/* exact match */
+	{
+	  exact_match = TRUE;
+
+	  add_dynamic_file_list_entry(dynamic_file_list,
+				      num_dynamic_file_list_entries,
+				      extra_file_list,
+				      suffix_list,
+				      num_suffix_list_entries,
+				      token);
+	  add_property_mapping(property_mapping,
+			       num_property_mapping_entries,
+			       base_index, ext1_index, ext2_index, -1,
+			       current_summarized_file_list_entry);
+	  continue;
+	}
+
+	start_pos += len_ext2_suffix;
+      }
+
+      if (exact_match)
+	break;
+
+#if 0
+      if (IS_PARENT_PROCESS())
+	printf("---> examining token '%s': search 3rd suffix ...\n",token);
+#endif
+
+      /* ---------- step 3: search for matching third suffix ---------- */
+
+      for (l=0; l<num_ext3_suffixes && !ext3_suffix_found; l++)
+      {
+	char *ext3_suffix = ext3_suffixes[l];
+	int len_ext3_suffix = strlen(ext3_suffix);
+
+	ext3_suffix_found =token_suffix_match(token,ext3_suffix,start_pos);
+
+	if (!ext3_suffix_found)
+	  continue;
+
+	ext3_index = l;
+
+	if (start_pos + len_ext3_suffix == len_token) /* exact match */
 	{
-	  char *ext2_suffix = ext2_suffixes[k];
-	  int len_ext2_suffix = strlen(ext2_suffix);
-
-	  ext2_suffix_found = token_suffix_match(token, ext2_suffix,start_pos);
-
-	  if (!ext2_suffix_found)
-	    continue;
-
-	  if (start_pos + len_ext2_suffix == len_token)	/* exact match */
-	  {
-	    add_dynamic_file_list_entry(dynamic_file_list,
-					num_dynamic_file_list_entries,
-					extra_file_list,
-					suffix_list,
-					num_suffix_list_entries,
-					token);
-	    add_property_mapping(property_mapping,
-				 num_property_mapping_entries,
-				 i, j, k,
-				 current_summarized_file_list_entry);
-	    continue;
-	  }
+	  exact_match = TRUE;
+
+	  add_dynamic_file_list_entry(dynamic_file_list,
+				      num_dynamic_file_list_entries,
+				      extra_file_list,
+				      suffix_list,
+				      num_suffix_list_entries,
+				      token);
+	  add_property_mapping(property_mapping,
+			       num_property_mapping_entries,
+			       base_index, ext1_index, ext2_index, ext3_index,
+			       current_summarized_file_list_entry);
+	  continue;
 	}
       }
     }
@@ -1967,8 +2174,7 @@ void LoadArtworkConfig(struct ArtworkListInfo *artwork_info)
 		     artwork_info->sizeof_artwork_list_entry);
   }
 
-  if (extra_file_list != NULL &&
-      options.verbose && IS_PARENT_PROCESS(audio.mixer_pid))
+  if (extra_file_list != NULL && options.verbose && IS_PARENT_PROCESS())
   {
     boolean dynamic_tokens_found = FALSE;
     boolean unknown_tokens_found = FALSE;
@@ -2187,14 +2393,17 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *artwork_info)
 #if 0
   printf("DEBUG: reloading %d static artwork files ...\n",
 	 num_file_list_entries);
-  printf("DEBUG: reloading %d dynamic artwork files ...\n",
-	 num_dynamic_file_list_entries);
 #endif
 
   for(i=0; i<num_file_list_entries; i++)
     LoadArtworkToList(artwork_info, &artwork_info->artwork_list[i],
 		      file_list[i].filename, i);
 
+#if 0
+  printf("DEBUG: reloading %d dynamic artwork files ...\n",
+	 num_dynamic_file_list_entries);
+#endif
+
   for(i=0; i<num_dynamic_file_list_entries; i++)
     LoadArtworkToList(artwork_info, &artwork_info->dynamic_artwork_list[i],
 		      dynamic_file_list[i].filename, i);
@@ -2228,7 +2437,7 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
 
 #if 0
   printf("%s: FREEING ARTWORK ...\n",
-	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+	 IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
 #endif
 
   FreeCustomArtworkList(artwork_info, &artwork_info->artwork_list,
@@ -2239,7 +2448,7 @@ void FreeCustomArtworkLists(struct ArtworkListInfo *artwork_info)
 
 #if 0
   printf("%s: FREEING ARTWORK -- DONE\n",
-	 IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT");
+	 IS_CHILD_PROCESS() ? "CHILD" : "PARENT");
 #endif
 }
 
@@ -2299,3 +2508,20 @@ void debug_print_timestamp(int counter_nr, char *message)
 
   counter[counter_nr][1] = Counter();
 }
+
+void debug_print_parent_only(char *format, ...)
+{
+  if (!IS_PARENT_PROCESS())
+    return;
+
+  if (format)
+  {
+    va_list ap;
+
+    va_start(ap, format);
+    vprintf(format, ap);
+    va_end(ap);
+
+    printf("\n");
+  }
+}