New upstream version 2.0.3preupstream/2.0.3pre

1 files changed, 49 insertions, 8 deletions

diff --git a/includes/info.h b/includes/info.h
index 253c06e0..77894518 100644
--- a/includes/info.h
+++ b/includes/info.h
@@ -1,10 +1,10 @@
 /*
  *    HardInfo - Displays System Information
- *    Copyright (C) 2017 Leandro A. F. Pereira <leandro@hardinfo.org>
+ *    Copyright (C) 2017 L. A. F. Pereira <l@tia.mat.br>
  *
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 2.
+ *    the Free Software Foundation, version 2 or later.
  *
  *    This program is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,20 @@
 
 #pragma once
 
+#include <stdarg.h>
 #include <glib.h>
 
+enum InfoGroupSort {
+    INFO_GROUP_SORT_NONE,
+    INFO_GROUP_SORT_NAME_ASCENDING,
+    INFO_GROUP_SORT_NAME_DESCENDING,
+    INFO_GROUP_SORT_VALUE_ASCENDING,
+    INFO_GROUP_SORT_VALUE_DESCENDING,
+    INFO_GROUP_SORT_TAG_ASCENDING,
+    INFO_GROUP_SORT_TAG_DESCENDING,
+    INFO_GROUP_SORT_MAX,
+};
+
 struct Info {
     GArray *groups;
 
@@ -36,32 +48,60 @@ struct Info {
 
 struct InfoGroup {
     const gchar *name;
+    enum InfoGroupSort sort;
 
     GArray *fields;
 
-     /* scaffolding fields */
+    /* scaffolding fields */
     const gchar *computed;
 };
 
 struct InfoField {
     const gchar *name;
-    gchar *value;
+    const gchar *value;
+    const gchar *icon;
 
     int update_interval;
+    gboolean highlight;      /* select in GUI, highlight in report (flag:*) */
+    gboolean report_details; /* show moreinfo() in report (flag:!) */
+    gboolean value_has_vendor; /* (flag:^) */
+    gboolean label_is_escaped;  /* if the label will need g_strcompress() before display use */
 
+    gboolean free_name_on_flatten;
     gboolean free_value_on_flatten;
+
+    /* scaffolding fields */
+    gchar *tag; /* moreinfo() lookup tag */
 };
 
 struct Info *info_new(void);
 
-void info_add_group(struct Info *info, const gchar *group_name, ...);
+void info_remove_group(struct Info *info, guint index);
+struct InfoGroup *info_add_group(struct Info *info, const gchar *group_name, ...);
+void info_group_strip_extra(struct InfoGroup *group);
+
 void info_add_computed_group(struct Info *info, const gchar *name, const gchar *value);
+void info_add_computed_group_wo_extra(struct Info *info, const gchar *name, const gchar *value);
+
+void info_group_add_field(struct InfoGroup *group, struct InfoField field);
+void info_group_add_fields(struct InfoGroup *group, ...);
+void info_group_add_fieldsv(struct InfoGroup *group, va_list ap);
 
-struct InfoField info_field(const gchar *name, gchar *value);
 struct InfoField info_field_printf(const gchar *name, const gchar *format, ...)
     __attribute__((format(printf, 2, 3)));
-struct InfoField info_field_update(const gchar *name, int update_interval);
-struct InfoField info_field_last(void);
+
+#define info_field_full(...)                                                   \
+    (struct InfoField) { __VA_ARGS__ }
+
+#define info_field(n, v, ...)                                                  \
+    info_field_full(.name = (n), .value = (v), __VA_ARGS__)
+
+#define info_field_update(n, ui, ...)                                          \
+    info_field_full(.name = (n), .value = "...", .update_interval = (ui),      \
+                    __VA_ARGS__)
+
+#define info_field_last()                                                      \
+    (struct InfoField) {}
 
 void info_set_column_title(struct Info *info, const gchar *column, const gchar *title);
 void info_set_column_headers_visible(struct Info *info, gboolean setting);
@@ -71,3 +111,4 @@ void info_set_view_type(struct Info *info, ShellViewType setting);
 void info_set_reload_interval(struct Info *info, int setting);
 
 gchar *info_flatten(struct Info *info);
+struct Info *info_unflatten(const gchar *str);