mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-30 11:10:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix get_icon

Browse source 
Property reply functions are now notified if there was an error with the
property instead of silent failure. Also issues in `get_item` were
resolved.
This commit is contained in:
Calvin Lee 2017-11-15 13:16:21 -07:00
parent 87035380e3
commit 13b81f9fb9
4 changed files with 47 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
swaybar/tray/dbus.c
View file

@ -138,7 +138,7 @@ static void dispatch_status(DBusConnection *connection, DBusDispatchStatus new_s
struct async_prop_data {
char const *sig;
void(*callback)(DBusMessageIter *, void *);
void(*callback)(DBusMessageIter *, void *, enum property_status);
void *usr_data;
};
@ -160,6 +160,7 @@ static void get_prop_callback(DBusPendingCall *pending, void *_data) {
DBUS_TYPE_INVALID);
sway_log(L_INFO, "Failure to get property: %s", msg);
data->callback(NULL, data->usr_data, PROP_ERROR);
goto bail;
}
@ -169,16 +170,18 @@ static void get_prop_callback(DBusPendingCall *pending, void *_data) {
dbus_message_iter_init(reply, &iter);
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) {
sway_log(L_ERROR, "Property relpy type incorrect");
data->callback(NULL, data->usr_data, PROP_BAD_DATA);
goto bail;
}
dbus_message_iter_recurse(&iter, &variant);
if (!dbus_message_iter_check_signature(&variant, data->sig)) {
sway_log(L_INFO, "Property returned has incorrect signatue.");
data->callback(&variant, data->usr_data, PROP_WRONG_SIG);
goto bail;
}
data->callback(&variant, data->usr_data);
data->callback(&variant, data->usr_data, PROP_EXISTS);
bail:
if (reply) {
@ -199,7 +202,8 @@ bool dbus_message_iter_check_signature(DBusMessageIter *iter, const char *sig) {
bool dbus_get_prop_async(const char *destination,
const char *path, const char *iface,
const char *prop, const char *expected_signature,
void(*callback)(DBusMessageIter *, void *), void *usr_data) {
void(*callback)(DBusMessageIter *, void *, enum property_status),
void *usr_data) {
struct async_prop_data *data = malloc(sizeof(struct async_prop_data));
if (!data) {
return false;

30
swaybar/tray/sni.c
View file

@ -41,11 +41,15 @@ void sni_icon_ref_free(struct sni_icon_ref *sni_ref) {
}
/* Gets the pixmap of an icon */
static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data) {
static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data, enum property_status status) {
if (status != PROP_EXISTS) {
return;
}
struct StatusNotifierItem *item = _data;
DBusMessageIter d_struct; /* (iiay) */
DBusMessageIter icon; /* ay */
DBusMessageIter struct_items;
DBusMessageIter icon;
if (dbus_message_iter_get_element_count(iter) == 0) {
// Can't recurse if there are no items
@ -54,16 +58,17 @@ static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data) {
}
dbus_message_iter_recurse(iter, &d_struct);
dbus_message_iter_recurse(&d_struct, &struct_items);
int width;
dbus_message_iter_get_basic(&d_struct, &width);
dbus_message_iter_next(&d_struct);
dbus_message_iter_get_basic(&struct_items, &width);
dbus_message_iter_next(&struct_items);
int height;
dbus_message_iter_get_basic(&d_struct, &height);
dbus_message_iter_next(&d_struct);
dbus_message_iter_get_basic(&struct_items, &height);
dbus_message_iter_next(&struct_items);
int len = dbus_message_iter_get_element_count(&d_struct);
int len = dbus_message_iter_get_element_count(&struct_items);
if (!len) {
sway_log(L_ERROR, "No icon data");
@ -76,7 +81,7 @@ static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data) {
return;
}
dbus_message_iter_recurse(&d_struct, &icon);
dbus_message_iter_recurse(&struct_items, &icon);
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
// FIXME support a variable stride
@ -131,9 +136,16 @@ static void reply_icon(DBusMessageIter *iter /* a(iiay) */, void *_data) {
}
/* Get an icon by its name */
static void reply_icon_name(DBusMessageIter *iter, void *_data) {
static void reply_icon_name(DBusMessageIter *iter, void *_data, enum property_status status) {
struct StatusNotifierItem *item = _data;
if (status != PROP_EXISTS) {
dbus_get_prop_async(item->name, item->object_path,
(item->kde_special_snowflake ? KDE_IFACE : FD_IFACE),
"IconPixmap", "a(iiay)", reply_icon, item);
return;
}
char *icon_name;
dbus_message_iter_get_basic(iter, &icon_name);

10
swaybar/tray/tray.c
View file

@ -38,7 +38,10 @@ static void register_host(char *name) {
dbus_message_unref(message);
}
static void get_items_reply(DBusMessageIter *iter, void *_data) {
static void get_items_reply(DBusMessageIter *iter, void *_data, enum property_status status) {
if (status != PROP_EXISTS) {
return;
}
DBusMessageIter array;
// O(n) function, could be faster dynamically reading values
@ -60,7 +63,10 @@ static void get_items_reply(DBusMessageIter *iter, void *_data) {
}
}
}
static void get_obj_items_reply(DBusMessageIter *iter, void *_data) {
static void get_obj_items_reply(DBusMessageIter *iter, void *_data, enum property_status status) {
if (status != PROP_EXISTS) {
return;
}
DBusMessageIter array;
DBusMessageIter dstruct;