mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: validate total osd field width

Browse source 
Before this patch, window switcher fields could overflow if the sum of
<windowSwitcher><fields><field width=""> exceeds 100%.
This commit is contained in:
tokyo4j 2025-05-03 20:58:39 +09:00 • committed by Hiroaki Yamamoto
parent 706f7bc03c
commit cb58156904
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/osd.h
View file

@ -59,7 +59,7 @@ void osd_field_get_content(struct window_switcher_field *field,
struct window_switcher_field *osd_field_create(void);
void osd_field_arg_from_xml_node(struct window_switcher_field *field,
const char *nodename, const char *content);
bool osd_field_validate(struct window_switcher_field *field);
bool osd_field_is_valid(struct window_switcher_field *field);
void osd_field_free(struct window_switcher_field *field);
#endif // LABWC_OSD_H

4
src/config/rcxml.c
View file

@ -1941,9 +1941,11 @@ validate(void)
validate_actions();
/* OSD fields */
int field_width_sum = 0;
struct window_switcher_field *field, *field_tmp;
wl_list_for_each_safe(field, field_tmp, &rc.window_switcher.fields, link) {
if (!osd_field_validate(field)) {
field_width_sum += field->width;
if (!osd_field_is_valid(field) || field_width_sum > 100) {
wlr_log(WLR_ERROR, "Deleting invalid window switcher field %p", field);
wl_list_remove(&field->link);
osd_field_free(field);

2
src/osd-field.c
View file

@ -352,7 +352,7 @@ osd_field_arg_from_xml_node(struct window_switcher_field *field,
}
bool
osd_field_validate(struct window_switcher_field *field)
osd_field_is_valid(struct window_switcher_field *field)
{
if (field->content == LAB_FIELD_NONE) {
wlr_log(WLR_ERROR, "Invalid OSD field: no content set");