mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-04 06:06:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

u/var: Expose root object raw name

Browse source
This commit is contained in:
Jakob Bornecrantz 2023-06-22 16:36:37 +01:00
parent ea77386887
commit cd7e921a03
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/auxiliary/util/u_var.cpp
View file

@ -41,6 +41,7 @@ class Obj
{ {
public: public:
std::string name = {}; std::string name = {};
std::string raw_name = {};
struct u_var_root_info info = {}; struct u_var_root_info info = {};
std::vector<Var> vars = {}; std::vector<Var> vars = {};
}; };
@ -130,6 +131,7 @@ u_var_add_root(void *root, const char *c_name, bool suffix_with_number)
} }
auto name = std::string(c_name); auto name = std::string(c_name);
auto raw_name = name;
uint32_t count = 0; // Zero means no number. uint32_t count = 0; // Zero means no number.
if (suffix_with_number) { if (suffix_with_number) {
@ -142,7 +144,9 @@ u_var_add_root(void *root, const char *c_name, bool suffix_with_number)
auto &obj = gTracker.map[(ptrdiff_t)root] = Obj(); auto &obj = gTracker.map[(ptrdiff_t)root] = Obj();
obj.name = name; obj.name = name;
obj.raw_name = raw_name;
obj.info.name = obj.name.c_str(); obj.info.name = obj.name.c_str();
obj.info.raw_name = obj.raw_name.c_str();
obj.info.number = count; obj.info.number = count;
} }

5
src/xrt/auxiliary/util/u_var.h
View file

@ -286,7 +286,10 @@ struct u_var_root_info
//! The displayed name. //! The displayed name.
const char *name; const char *name;
//! The number of the window, or zero. //! Raw name without any suffix.
const char *raw_name;
//! The number of the window, or zero (name and raw_name are the same).
uint32_t number; uint32_t number;
}; };