pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xkb: Use xpp for xcb calls (#2536)

Browse Source
This commit is contained in:
Patrick Ziegler 2021-10-14 15:57:46 +02:00 committed by GitHub
parent b1c97e42cc
commit 76ae61f892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/x11/extensions/xkb.cpp
View File

@ -114,13 +114,7 @@ namespace xkb_util {
* Get current group number * Get current group number
*/ */
unsigned char get_current_group(connection& conn, xcb_xkb_device_spec_t device) { unsigned char get_current_group(connection& conn, xcb_xkb_device_spec_t device) {
unsigned char result{0}; return conn.xkb().get_state(device)->group;
auto reply = xcb_xkb_get_state_reply(conn, xcb_xkb_get_state(conn, device), nullptr);
if (reply != nullptr) {
result = reply->group;
free(reply);
}
return result;
} }
/** /**
@ -130,24 +124,14 @@ namespace xkb_util {
vector<keyboard::layout> results; vector<keyboard::layout> results;
unsigned int mask{XCB_XKB_NAME_DETAIL_GROUP_NAMES | XCB_XKB_NAME_DETAIL_SYMBOLS}; unsigned int mask{XCB_XKB_NAME_DETAIL_GROUP_NAMES | XCB_XKB_NAME_DETAIL_SYMBOLS};
auto reply = xcb_xkb_get_names_reply(conn, xcb_xkb_get_names(conn, device, mask), nullptr); auto reply = conn.xkb().get_names(device, mask);
if (reply == nullptr) {
return results;
}
xcb_xkb_get_names_value_list_t values{}; xcb_xkb_get_names_value_list_t values{};
void* buffer = xcb_xkb_get_names_value_list(reply); void* buffer = xcb_xkb_get_names_value_list(reply.get().get());
xcb_xkb_get_names_value_list_unpack(buffer, reply->nTypes, reply->indicators, reply->virtualMods, reply->groupNames, xcb_xkb_get_names_value_list_unpack(buffer, reply->nTypes, reply->indicators, reply->virtualMods, reply->groupNames,
reply->nKeys, reply->nKeyAliases, reply->nRadioGroups, reply->which, &values); reply->nKeys, reply->nKeyAliases, reply->nRadioGroups, reply->which, &values);
using get_atom_name_reply = xpp::x::reply::checked::get_atom_name<connection&>; for (int i = 0; i < xcb_xkb_get_names_value_list_groups_length(reply.get().get(), &values); i++) {
vector<get_atom_name_reply> replies;
for (int i = 0; i < xcb_xkb_get_names_value_list_groups_length(reply, &values); i++) {
replies.emplace_back(xpp::x::get_atom_name(conn, values.groups[i]));
}
for (const auto& reply : replies) {
vector<string> sym_names; vector<string> sym_names;
for (auto&& sym : string_util::split(conn.get_atom_name(values.symbolsName).name(), '+')) { for (auto&& sym : string_util::split(conn.get_atom_name(values.symbolsName).name(), '+')) {
@ -156,11 +140,10 @@ namespace xkb_util {
} }
} }
results.emplace_back(keyboard::layout{static_cast<get_atom_name_reply>(reply).name(), sym_names}); const auto& name = conn.get_atom_name(values.groups[i]).name();
results.emplace_back(keyboard::layout{name, sym_names});
} }
free(reply);
return results; return results;
} }
@ -171,25 +154,17 @@ namespace xkb_util {
map<keyboard::indicator::type, keyboard::indicator> results; map<keyboard::indicator::type, keyboard::indicator> results;
unsigned int mask{XCB_XKB_NAME_DETAIL_INDICATOR_NAMES}; unsigned int mask{XCB_XKB_NAME_DETAIL_INDICATOR_NAMES};
auto reply = xcb_xkb_get_names_reply(conn, xcb_xkb_get_names(conn, device, mask), nullptr); auto reply = conn.xkb().get_names(device, mask);
if (reply == nullptr) {
return results;
}
xcb_xkb_get_names_value_list_t values{}; xcb_xkb_get_names_value_list_t values{};
void* buffer = xcb_xkb_get_names_value_list(reply); void* buffer = xcb_xkb_get_names_value_list(reply.get().get());
xcb_xkb_get_names_value_list_unpack(buffer, reply->nTypes, reply->indicators, reply->virtualMods, reply->groupNames, xcb_xkb_get_names_value_list_unpack(buffer, reply->nTypes, reply->indicators, reply->virtualMods, reply->groupNames,
reply->nKeys, reply->nKeyAliases, reply->nRadioGroups, reply->which, &values); reply->nKeys, reply->nKeyAliases, reply->nRadioGroups, reply->which, &values);
using get_atom_name_reply = xpp::x::reply::checked::get_atom_name<connection&>; for (int i = 0; i < xcb_xkb_get_names_value_list_indicator_names_length(reply.get().get(), &values); i++) {
map<xcb_atom_t, get_atom_name_reply> entries; auto indicatorName = values.indicatorNames[i];
for (int i = 0; i < xcb_xkb_get_names_value_list_indicator_names_length(reply, &values); i++) {
entries.emplace(values.indicatorNames[i], xpp::x::get_atom_name(conn, values.indicatorNames[i]));
}
for (const auto& entry : entries) { auto name = conn.get_atom_name(indicatorName).name();
auto name = static_cast<get_atom_name_reply>(entry.second).name();
auto type = keyboard::indicator::type::NONE; auto type = keyboard::indicator::type::NONE;
if (string_util::compare(name, "caps lock")) { if (string_util::compare(name, "caps lock")) {
@ -202,15 +177,13 @@ namespace xkb_util {
continue; continue;
} }
auto data = conn.xkb().get_named_indicator(device, 0, 0, entry.first); auto data = conn.xkb().get_named_indicator(device, 0, 0, indicatorName);
auto mask = (*conn.xkb().get_indicator_map(device, 1 << data->ndx).maps().begin()).mods; auto mask = (*conn.xkb().get_indicator_map(device, 1 << data->ndx).maps().begin()).mods;
auto enabled = static_cast<bool>(data->on); auto enabled = static_cast<bool>(data->on);
results.emplace(type, keyboard::indicator{entry.first, mask, name, enabled}); results.emplace(type, keyboard::indicator{indicatorName, mask, name, enabled});
} }
free(reply);
return results; return results;
} }