Mirrors/rofi
2
0
Fork 0
mirror of https://github.com/lbonn/rofi synced 2024-11-10 06:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

[THEME] I1442 Fix parsing of nested media blocks.

Browse source 
* [1442] Fix widget media nested
* [Theme] Fix memory leak in P_LIST
* [I1442] Support merging down default block.
This commit is contained in:
Dave Davenport 2021-09-08 14:16:28 +02:00 committed by GitHub
parent c10ee955bd
commit 562146730b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lexer/theme-parser.y
View file

@ -377,7 +377,8 @@ t_entry_list:
g_list_free ( $3 );
}
| t_entry_list T_PDEFAULTS T_BOPEN t_property_list_optional T_BCLOSE {
rofi_theme_widget_add_properties ( $1, $4);
ThemeWidget *widget = rofi_theme_find_or_create_name ( $1, "*" );
rofi_theme_widget_add_properties (widget, $4);
if ( $4 ) {
g_hash_table_destroy ( $4 );
}

6
source/rofi.c
View file

@ -1009,6 +1009,12 @@ int main(int argc, char *argv[]) {
cleanup();
return EXIT_SUCCESS;
}
if (find_arg("-dump-processed-theme") >= 0) {
rofi_theme_parse_process_conditionals();
rofi_theme_print(rofi_theme);
cleanup();
return EXIT_SUCCESS;
}
if (find_arg("-dump-config") >= 0) {
config_parse_dump_config_rasi_format(stdout, FALSE);
cleanup();

56
source/theme.c
View file

@ -186,6 +186,9 @@ void rofi_theme_property_free(Property *p) {
g_free(p->name);
if (p->type == P_STRING) {
g_free(p->value.s);
} else if (p->type == P_LIST) {
g_list_free_full(p->value.list, g_free);
p->value.list = 0;
} else if (p->type == P_LINK) {
g_free(p->value.link.name);
if (p->value.link.def_value) {
@ -1346,22 +1349,6 @@ char *rofi_theme_parse_prepare_file(const char *file, const char *parent_file) {
return filename;
}
static void rofi_theme_parse_merge_widgets_no_media(ThemeWidget *parent,
ThemeWidget *child) {
g_assert(parent != NULL);
g_assert(child != NULL);
if (parent == rofi_theme && g_strcmp0(child->name, "*") == 0) {
rofi_theme_widget_add_properties(parent, child->properties);
return;
}
ThemeWidget *w = rofi_theme_find_or_create_name(parent, child->name);
rofi_theme_widget_add_properties(w, child->properties);
for (unsigned int i = 0; i < child->num_widgets; i++) {
rofi_theme_parse_merge_widgets_no_media(w, child->widgets[i]);
}
}
void rofi_theme_parse_merge_widgets(ThemeWidget *parent, ThemeWidget *child) {
g_assert(parent != NULL);
g_assert(child != NULL);
@ -1387,17 +1374,22 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
if (rwidget == NULL) {
return;
}
for (unsigned int i = 0; i < rwidget->num_widgets; i++) {
unsigned int i = 0;
// for (unsigned int i = 0; i < rwidget->num_widgets; i++) {
while (i < rwidget->num_widgets) {
ThemeWidget *widget = rwidget->widgets[i];
rofi_theme_parse_process_conditionals_int(mon, widget);
if (widget->media != NULL) {
rwidget->num_widgets--;
for (unsigned x = i; x < rwidget->num_widgets; x++) {
rwidget->widgets[x] = rwidget->widgets[x + 1];
}
rwidget->widgets[rwidget->num_widgets] = NULL;
switch (widget->media->type) {
case THEME_MEDIA_TYPE_MIN_WIDTH: {
int w = widget->media->value;
if (mon.w >= w) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1406,8 +1398,7 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
int w = widget->media->value;
if (mon.w < w) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1416,9 +1407,9 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
int h = widget->media->value;
if (mon.h >= h) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
} else {
}
break;
}
@ -1426,8 +1417,7 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
int h = widget->media->value;
if (mon.h < h) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1435,8 +1425,7 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
case THEME_MEDIA_TYPE_MON_ID: {
if (mon.monitor_id == widget->media->value) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1445,8 +1434,7 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
double r = widget->media->value;
if ((mon.w / (double)mon.h) >= r) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1455,8 +1443,7 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
double r = widget->media->value;
if ((mon.w / (double)mon.h) < r) {
for (unsigned int x = 0; x < widget->num_widgets; x++) {
rofi_theme_parse_merge_widgets_no_media(rofi_theme,
widget->widgets[x]);
rofi_theme_parse_merge_widgets(rwidget, widget->widgets[x]);
}
}
break;
@ -1465,6 +1452,11 @@ static void rofi_theme_parse_process_conditionals_int(workarea mon,
break;
}
}
rofi_theme_free(widget);
// endif
} else {
rofi_theme_parse_process_conditionals_int(mon, widget);
i++;
}
}
}