Fix:Core:Correct layering of android surfaces

[navit-package] / navit / attr.h

diff --git a/navit/attr.h b/navit/attr.h
index 6bed739..b6db5a7 100644 (file)
--- a/navit/attr.h
+++ b/navit/attr.h
@@ -23,8 +23,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifndef ATTR_H
-#define ATTR_H
 
 #include "projection.h"
 
@@ -71,6 +69,21 @@ enum attr_type {
 #define ATTR_REL_MAXABS                        0x40000000
 #define ATTR_REL_RELSHIFT              0x60000000
 
+enum attr_position_valid {
+       attr_position_valid_invalid,
+       attr_position_valid_static,
+       attr_position_valid_extrapolated_time,
+       attr_position_valid_extrapolated_spatial,
+       attr_position_valid_valid,
+};
+
+#define ATTR_IS_INT(x) ((x) >= attr_type_int_begin && (x) <= attr_type_int_end)
+#define ATTR_IS_DOUBLE(x) ((x) >= attr_type_double_begin && (x) <= attr_type_double_end)
+#define ATTR_IS_STRING(x) ((x) >= attr_type_string_begin && (x) <= attr_type_string_end)
+#define ATTR_IS_OBJECT(x) ((x) >= attr_type_object_begin && (x) <= attr_type_object_end)
+#define ATTR_IS_COORD_GEO(x) ((x) >= attr_type_coord_geo_begin && (x) <= attr_type_coord_geo_end)
+#define ATTR_IS_NUMERIC(x) (ATTR_IS_INT(x) || ATTR_IS_DOUBLE(x))
+
 struct attr {
        enum attr_type type;
        union {
@@ -121,15 +134,13 @@ struct attr {
                } range;
                int *dash;
                enum item_type *item_types;
+               enum attr_type *attr_types;
                long long *num64;
        } u;
 };
 
-/* prototypes */
-enum attr_type;
-struct attr;
 struct attr_iter;
-struct map;
+/* prototypes */
 enum attr_type attr_from_name(const char *name);
 char *attr_to_name(enum attr_type attr);
 struct attr *attr_new_from_text(const char *name, const char *value);
@@ -139,16 +150,19 @@ int attr_generic_get_attr(struct attr **attrs, struct attr **def_attrs, enum att
 struct attr **attr_generic_set_attr(struct attr **attrs, struct attr *attr);
 struct attr **attr_generic_add_attr(struct attr **attrs, struct attr *attr);
 struct attr **attr_generic_remove_attr(struct attr **attrs, struct attr *attr);
+enum attr_type attr_type_begin(enum attr_type type);
 int attr_data_size(struct attr *attr);
 void *attr_data_get(struct attr *attr);
 void attr_data_set(struct attr *attr, void *data);
-void attr_data_set_le(struct attr * attr, void * data);
+void attr_data_set_le(struct attr *attr, void *data);
 void attr_free(struct attr *attr);
 struct attr *attr_dup(struct attr *attr);
 void attr_list_free(struct attr **attrs);
 struct attr **attr_list_dup(struct attr **attrs);
+int attr_from_line(char *line, char *name, int *pos, char *val_ret, char *name_ret);
+int attr_types_contains(enum attr_type *types, enum attr_type type);
+int attr_types_contains_default(enum attr_type *types, enum attr_type type, int deflt);
 /* end of prototypes */
-#endif
 #ifdef __cplusplus
 }
 #endif