mmenu; better handling where a suncategory name is available to multiple parent categ...

diff --git a/minimenu/freedesktop_cats.c b/minimenu/freedesktop_cats.c
index 7e198a4..05484ab 100644 (file)
--- a/minimenu/freedesktop_cats.c
+++ b/minimenu/freedesktop_cats.c
@@ -38,7 +38,9 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "Translation",      "Development",   "A translation tool " },
   { "Calendar",         "Office",   "Calendar application " },
   { "ContactManagement",    "Office",   "E.g. an address book " },
   { "Translation",      "Development",   "A translation tool " },
   { "Calendar",         "Office",   "Calendar application " },
   { "ContactManagement",    "Office",   "E.g. an address book " },

-  { "Database",         "Office",   "Application to manage a database " },
+  { "Database",         "Office",       "Application to manage a database " },
+  { "Database",         "Development",  "Application to manage a database " },
+  { "Database",         "AudioVideo",   "Application to manage a database " },

   { "Dictionary",       "Office",   "A dictionary  " },
   { "Chart",            "Office",   "Chart application" },
   { "Email",            "Office",   "Email application" },
   { "Dictionary",       "Office",   "A dictionary  " },
   { "Chart",            "Office",   "Chart application" },
   { "Email",            "Office",   "Email application" },


@@ -78,13 +80,23 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "WebBrowser",       "Network",   "A web browser    " },
   { "WebDevelopment",   "Network",   "A tool for web developers " },
   { "Midi",             "AudioVideo",   "An app related to MIDI    " },
   { "WebBrowser",       "Network",   "A web browser    " },
   { "WebDevelopment",   "Network",   "A tool for web developers " },
   { "Midi",             "AudioVideo",   "An app related to MIDI    " },

+  { "Midi",             "Audio",     "An app related to MIDI    " },

   { "Mixer",            "AudioVideo",   "Just a mixer  " },
   { "Mixer",            "AudioVideo",   "Just a mixer  " },

+  { "Mixer",            "Audio",     "Just a mixer  " },

   { "Sequencer",        "AudioVideo",   "A sequencer  " },
   { "Sequencer",        "AudioVideo",   "A sequencer  " },

+  { "Sequencer",        "Audio",     "A sequencer  " },

   { "Tuner",            "AudioVideo",   "A tuner  " },
   { "Tuner",            "AudioVideo",   "A tuner  " },

+  { "Tuner",            "Audio",        "A tuner  " },

   { "TV",               "AudioVideo",   "A TV application" },
   { "TV",               "AudioVideo",   "A TV application" },

+  { "TV",               "Video",   "A TV application" },

   { "AudioVideoEditing",    "Audio",   "Application to edit audio/video files " },
   { "AudioVideoEditing",    "Audio",   "Application to edit audio/video files " },

+  { "AudioVideoEditing",    "Video",   "Application to edit audio/video files " },
+  { "AudioVideoEditing",    "AudioVideo",   "Application to edit audio/video files " },

   { "Player",           "Audio",   "Application to play audio/video files " },
   { "Player",           "Audio",   "Application to play audio/video files " },

+  { "Player",           "AudioVideo",   "Application to play audio/video files " },
+  { "Player",           "Video",   "Application to play audio/video files " },

   { "Recorder",         "Audio",   "Application to record audio/video files " },
   { "Recorder",         "Audio",   "Application to record audio/video files " },

+  { "Recorder",         "AudioVideo",   "Application to record audio/video files " },

   { "DiscBurning",      "AudioVideo",   "Application to burn a disc     " },
   { "ActionGame",       "Game",   "An action game " },
   { "AdventureGame",    "Game",   "Adventure style game" },
   { "DiscBurning",      "AudioVideo",   "Application to burn a disc     " },
   { "ActionGame",       "Game",   "An action game " },
   { "AdventureGame",    "Game",   "Adventure style game" },


@@ -131,6 +143,7 @@ freedesktop_cat_t freedesktop_complete[] = {
   { "Emulator",         "Game",   "Emulator of another platform, such as a DOS emulator " },
   { "Engineering",      NULL, "Engineering software, e.g. CAD programs " },
   { "FileTools",        "Utility",   "A file tool utility " },
   { "Emulator",         "Game",   "Emulator of another platform, such as a DOS emulator " },
   { "Engineering",      NULL, "Engineering software, e.g. CAD programs " },
   { "FileTools",        "Utility",   "A file tool utility " },

+  { "FileTools",        "System",   "A file tool utility " },

   { "FileManager",      "System",   "A file manager " },
   { "TerminalEmulator", "System",   "A terminal emulator application " },
   { "Filesystem",       "System",   "A file system tool  " },
   { "FileManager",      "System",   "A file manager " },
   { "TerminalEmulator", "System",   "A terminal emulator application " },
   { "Filesystem",       "System",   "A file system tool  " },


@@ -152,13 +165,27 @@ freedesktop_cat_t freedesktop_complete[] = {
   { NULL,               NULL, NULL }
 };
 
   { NULL,               NULL, NULL }
 };
 

-freedesktop_cat_t *freedesktop_category_query ( char *name ) {
+// return the found category, if ..
+//   name matches catname AND
+//   parent is NULL, or
+//     parent is value and matches cats parent.
+// ex:
+//   If you're looking for Game/NULL, you'll find it.
+//   If you're looking for Game/Emulator, you'll find it.
+//   If you're looking for Emulator/NULL you WILL NOT find it.
+freedesktop_cat_t *freedesktop_category_query ( char *name, char *parentcatname ) {

   freedesktop_cat_t *p = freedesktop_complete;
 
   while ( p -> cat ) {
 
     if ( strcasecmp ( p -> cat, name ) == 0 ) {
   freedesktop_cat_t *p = freedesktop_complete;
 
   while ( p -> cat ) {
 
     if ( strcasecmp ( p -> cat, name ) == 0 ) {

-      return ( p );
+
+      if ( parentcatname == NULL && p -> parent_cat == NULL ) {
+       return ( p );
+      } else if ( parentcatname && p -> parent_cat && strcasecmp ( p -> parent_cat, parentcatname ) == 0 ) {
+       return ( p );
+      }
+

     }
 
     p++;
     }
 
     p++;

diff --git a/minimenu/freedesktop_cats.h b/minimenu/freedesktop_cats.h
index 61ac9c4..362be8a 100644 (file)
--- a/minimenu/freedesktop_cats.h
+++ b/minimenu/freedesktop_cats.h
@@ -11,7 +11,7 @@ typedef struct {
 extern freedesktop_cat_t freedesktop_complete[];
 
 // return NULL on error, otherwise a category entry
 extern freedesktop_cat_t freedesktop_complete[];
 
 // return NULL on error, otherwise a category entry

-freedesktop_cat_t *freedesktop_category_query ( char *name );
+freedesktop_cat_t *freedesktop_category_query ( char *name, char *parentcatname );

 
 #define BADCATNAME "Other" /* irony: Other is itself not a freedesktop category */
 
 
 #define BADCATNAME "Other" /* irony: Other is itself not a freedesktop category */
 

diff --git a/minimenu/mmcat.c b/minimenu/mmcat.c
index c4a0533..b9493cb 100644 (file)
--- a/minimenu/mmcat.c
+++ b/minimenu/mmcat.c
@@ -39,6 +39,12 @@ void category_init ( void ) {
   return;
 }
 
   return;
 }
 

+static char *_normalize ( char *catname, char *parentcatname ) {
+  static char buffer [ 101 ];
+  snprintf ( buffer, 100, "%s*%s", catname, parentcatname ? parentcatname : "NoParent" );
+  return ( buffer );
+}
+

 unsigned char category_push ( char *catname, char *parentcatname, pnd_disco_t *app, pnd_conf_handle ovrh, char *fspath, unsigned char visiblep ) {
   mm_category_t *c;
 
 unsigned char category_push ( char *catname, char *parentcatname, pnd_disco_t *app, pnd_conf_handle ovrh, char *fspath, unsigned char visiblep ) {
   mm_category_t *c;
 


@@ -51,12 +57,12 @@ unsigned char category_push ( char *catname, char *parentcatname, pnd_disco_t *a
   // find or create category
   //
 
   // find or create category
   //
 

-  if ( ( c = pnd_box_find_by_key ( m_categories, catname ) ) ) {
+  if ( ( c = pnd_box_find_by_key ( m_categories, _normalize ( catname, parentcatname ) ) ) ) {

     // category was found..
   } else {
     // category wasn't found..
     //pnd_log ( PND_LOG_DEFAULT, "New category '%s'\n", catname );
     // category was found..
   } else {
     // category wasn't found..
     //pnd_log ( PND_LOG_DEFAULT, "New category '%s'\n", catname );

-    c = pnd_box_allocinsert ( m_categories, catname, sizeof(mm_category_t) );
+    c = pnd_box_allocinsert ( m_categories, _normalize ( catname, parentcatname ), sizeof(mm_category_t) );

     c -> catname = strdup ( catname );
     if ( parentcatname ) {
       c -> parent_catname = strdup ( parentcatname );
     c -> catname = strdup ( catname );
     if ( parentcatname ) {
       c -> parent_catname = strdup ( parentcatname );


@@ -291,7 +297,7 @@ unsigned char category_map_setup ( void ) {
        //pnd_log ( pndn_debug, "target(%s) from(%s)\n", k, buffer );
 
        category_push ( k, NULL /* parent cat */, NULL, 0, NULL /* fspath */, 1 );
        //pnd_log ( pndn_debug, "target(%s) from(%s)\n", k, buffer );
 
        category_push ( k, NULL /* parent cat */, NULL, 0, NULL /* fspath */, 1 );

-       g_catmaps [ g_catmapcount ].target = pnd_box_find_by_key ( m_categories, k );
+       g_catmaps [ g_catmapcount ].target = pnd_box_find_by_key ( m_categories, _normalize ( k, NULL /* TBD: hack, not sure if this is right default value */ ) );

        g_catmaps [ g_catmapcount ].from = strdup ( buffer );
        g_catmapcount++;
 
        g_catmaps [ g_catmapcount ].from = strdup ( buffer );
        g_catmapcount++;
 


@@ -348,9 +354,9 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
 
   unsigned char cat_is_clean = 1;
   freedesktop_cat_t *fdcat = NULL, *fdpcat = NULL;
 
   unsigned char cat_is_clean = 1;
   freedesktop_cat_t *fdcat = NULL, *fdpcat = NULL;

-  fdcat = freedesktop_category_query ( catname );
+  fdcat = freedesktop_category_query ( catname, parentcatname );

   if ( parentcatname ) {
   if ( parentcatname ) {

-    fdpcat = freedesktop_category_query ( parentcatname );
+    fdpcat = freedesktop_category_query ( parentcatname, NULL );

   }
 
   // ensure requested cat is good
   }
 
   // ensure requested cat is good


@@ -360,7 +366,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
     printf ( "PXML Fail %s: Cat request %s (parent %s) -> bad cat\n", app -> title_en ? app -> title_en : "no name?", catname, parentcatname ? parentcatname : "n/a" );
 
     // do the Other substitution right away, so remaining code has something to look at in fdcat
     printf ( "PXML Fail %s: Cat request %s (parent %s) -> bad cat\n", app -> title_en ? app -> title_en : "no name?", catname, parentcatname ? parentcatname : "n/a" );
 
     // do the Other substitution right away, so remaining code has something to look at in fdcat

-    fdcat = freedesktop_category_query ( BADCATNAME );
+    fdcat = freedesktop_category_query ( BADCATNAME, NULL );

     catname = fdcat -> cat;
     fdpcat = NULL;
     parentcatname = NULL;
     catname = fdcat -> cat;
     fdpcat = NULL;
     parentcatname = NULL;


@@ -435,7 +441,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
     // set Other visibility
     visiblep = cat_is_visible ( g_conf, BADCATNAME );
     // fix cat request
     // set Other visibility
     visiblep = cat_is_visible ( g_conf, BADCATNAME );
     // fix cat request

-    fdcat = freedesktop_category_query ( BADCATNAME );
+    fdcat = freedesktop_category_query ( BADCATNAME, NULL );

     catname = fdcat -> cat;
     // nullify parent cat request (if any)
     fdpcat = NULL;
     catname = fdcat -> cat;
     // nullify parent cat request (if any)
     fdpcat = NULL;


@@ -522,7 +528,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
 
   // is app already in the target cat? (ie: its being pushed twice due to cat mapping or Other'ing or something..)
   if ( app ) {
 
   // is app already in the target cat? (ie: its being pushed twice due to cat mapping or Other'ing or something..)
   if ( app ) {

-    if ( category_contains_app ( catname, app -> unique_id ) ) {
+    if ( category_contains_app ( catname, parentcatname, app -> unique_id ) ) {

       printf ( "App Fail: app (%s %s) is already in cat %s\n", app -> title_en ? app -> title_en : "no name?", app -> unique_id, catname );
       return ( 1 ); // success, already there!
     }
       printf ( "App Fail: app (%s %s) is already in cat %s\n", app -> title_en ? app -> title_en : "no name?", app -> unique_id, catname );
       return ( 1 ); // success, already there!
     }


@@ -561,7 +567,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
     // iv) create the dummy app folder by pushing the disco into the apprefs as normal
     // v) create a dummy '..' for going back up, in the child
 
     // iv) create the dummy app folder by pushing the disco into the apprefs as normal
     // v) create a dummy '..' for going back up, in the child
 

-    mm_category_t *pcat = pnd_box_find_by_key ( m_categories, parentcatname );
+    mm_category_t *pcat = pnd_box_find_by_key ( m_categories, _normalize ( parentcatname, NULL ) );

 
     if ( ! pcat -> disco ) {
       pcat -> disco = pnd_box_new ( pcat -> catname );
 
     if ( ! pcat -> disco ) {
       pcat -> disco = pnd_box_new ( pcat -> catname );


@@ -589,7 +595,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
        }
        disco -> object_flags = PND_DISCO_GENERATED;
        disco -> object_type = pnd_object_type_directory; // suggest to Grid that its a dir
        }
        disco -> object_flags = PND_DISCO_GENERATED;
        disco -> object_type = pnd_object_type_directory; // suggest to Grid that its a dir

-       disco -> object_path = strdup ( catname );
+       disco -> object_path = strdup ( _normalize ( catname, parentcatname ) );

 
        category_push ( parentcatname, NULL /* parent cat */, disco, 0 /*ovrh*/, NULL /* fspath */, 1 /* visible */ );
 
 
        category_push ( parentcatname, NULL /* parent cat */, disco, 0 /*ovrh*/, NULL /* fspath */, 1 /* visible */ );
 


@@ -779,7 +785,10 @@ void category_publish ( unsigned int filter_mask, char *param ) {
     if ( filter_mask == CFALL ) {
       interested = 1;
     } else if ( filter_mask == CFBYNAME ) {
     if ( filter_mask == CFALL ) {
       interested = 1;
     } else if ( filter_mask == CFBYNAME ) {

-      if ( strcasecmp ( iter -> catname, param ) == 0 ) {
+      char *foo = strchr ( param, '*' ) + 1;
+      if ( strncasecmp ( iter -> catname, param, strlen ( iter -> catname ) ) == 0 &&
+          strcasecmp ( iter -> parent_catname, foo ) == 0 )
+      {

        interested = 1;
       }
     } else if ( iter -> catflags == filter_mask ) {
        interested = 1;
       }
     } else if ( iter -> catflags == filter_mask ) {


@@ -854,9 +863,9 @@ int category_index ( char *catname ) {
   return ( -1 );
 }
 
   return ( -1 );
 }
 

-unsigned char category_contains_app ( char *catname, char *unique_id ) {
+unsigned char category_contains_app ( char *catname, char *parentcatname, char *unique_id ) {

 
 

-  mm_category_t *c = pnd_box_find_by_key ( m_categories, catname );
+  mm_category_t *c = pnd_box_find_by_key ( m_categories, _normalize ( catname, parentcatname ) );

 
   if ( ! c ) {
     return ( 0 ); // wtf?
 
   if ( ! c ) {
     return ( 0 ); // wtf?

diff --git a/minimenu/mmcat.h b/minimenu/mmcat.h
index 9e82545..6ee2108 100644 (file)
--- a/minimenu/mmcat.h
+++ b/minimenu/mmcat.h
@@ -63,7 +63,7 @@ unsigned char category_meta_push ( char *catname, char *parentcatname, pnd_disco
 unsigned char category_fs_restock ( mm_category_t *cat );
 
 // apps within cats
 unsigned char category_fs_restock ( mm_category_t *cat );
 
 // apps within cats

-unsigned char category_contains_app ( char *catname, char *unique_id );
+unsigned char category_contains_app ( char *catname, char *parentcatname, char *unique_id );

 
 // advertising to rest of the system
 //
 
 // advertising to rest of the system
 //