PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-25 13:55:34 -05:00
Code Releases Activity

Fix memory leak in box and listview widget, add coverage make target. (ggcov and lcov)

Browse source
This commit is contained in:
Dave Davenport 2016-10-18 13:49:24 +02:00
parent 2c0c3c675a
commit 7b3b68462e
12 changed files with 46 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile.am
View file

@ -348,5 +348,14 @@ $(top_builddir)/gitconfig.h: .FORCE
$(rofi_SOURCES): $(top_builddir)/gitconfig.h $(rofi_SOURCES): $(top_builddir)/gitconfig.h
.PHONY: coverage
coverage: coverage/index.html
coverage.info: $(top_builddir)/test/*.gcda $(top_builddir)/source/*.gcda $(top_builddir)/source/**/*.gcda
lcov --capture --directory ./ --output-file coverage.info
coverage/index.html: coverage.info
genhtml $^ --output-directory coverage/
.PHONY: .FORCE .PHONY: .FORCE
.FORCE: .FORCE:

2
include/widgets/widget.h
View file

@ -28,7 +28,7 @@ typedef struct _widget widget;
typedef gboolean ( *widget_clicked_cb )( widget *, xcb_button_press_event_t *, void * ); typedef gboolean ( *widget_clicked_cb )( widget *, xcb_button_press_event_t *, void * );
/** Macro to get widget from an implementation (e.g. textbox/scrollbar) */ /** Macro to get widget from an implementation (e.g. textbox/scrollbar) */
#define WIDGET( a ) ( ( a ) != NULL ? (widget *) ( a ) : NULL ) #define WIDGET( a ) ( (widget *) ( a ) )
/** /**
* @param widget The widget to check * @param widget The widget to check

2
source/dialogs/drun.c
View file

@ -366,7 +366,7 @@ static void walk_dir ( DRunModePrivateData *pd, const char *root, const char *di
} }
// Skip files not ending on .desktop. // Skip files not ending on .desktop.
if ( file->d_type != DT_DIR && !g_str_has_suffix ( file->d_name, ".desktop" ) ) { if ( file->d_type != DT_DIR && !g_str_has_suffix ( file->d_name, ".desktop" ) ) {
g_free(filename); g_free ( filename );
continue; continue;
} }

6
source/widgets/box.c
View file

@ -202,13 +202,15 @@ static void box_free ( widget *wid )
widget * child = (widget *) iter->data; widget * child = (widget *) iter->data;
widget_free ( child ); widget_free ( child );
} }
g_list_free ( b->children );
g_free ( b ); g_free ( b );
} }
void box_add ( box *box, widget *child, gboolean expand, gboolean end ) void box_add ( box *box, widget *child, gboolean expand, gboolean end )
{ {
if ( box == NULL ) return; if ( box == NULL ) {
return;
}
child->expand = expand; child->expand = expand;
child->end = end; child->end = end;
child->parent = WIDGET ( box ); child->parent = WIDGET ( box );

12
source/widgets/listview.c
View file

@ -71,9 +71,15 @@ struct _listview
void *mouse_activated_data; void *mouse_activated_data;
}; };
static void listview_free ( widget *widget ) static void listview_free ( widget *wid )
{ {
listview *lv = (listview *) widget; listview *lv = (listview *) wid;
for ( unsigned int i = 0; i < lv->cur_elements; i++ ) {
widget_free ( WIDGET ( lv->boxes [i] ) );
}
g_free ( lv->boxes );
widget_free ( WIDGET ( lv->scrollbar ) );
g_free ( lv ); g_free ( lv );
} }
static unsigned int scroll_per_page ( listview * lv ) static unsigned int scroll_per_page ( listview * lv )
@ -237,7 +243,7 @@ static void listview_resize ( widget *wid, short w, short h )
lv->max_rows = ( lv->padding + lv->widget.h ) / ( lv->element_height + lv->padding ); lv->max_rows = ( lv->padding + lv->widget.h ) / ( lv->element_height + lv->padding );
lv->max_elements = lv->max_rows * lv->menu_columns; lv->max_elements = lv->max_rows * lv->menu_columns;
widget_move ( WIDGET ( lv->scrollbar ), lv->widget.w - widget_get_width ( WIDGET (lv->scrollbar ) ), 0 ); widget_move ( WIDGET ( lv->scrollbar ), lv->widget.w - widget_get_width ( WIDGET ( lv->scrollbar ) ), 0 );
widget_resize ( WIDGET ( lv->scrollbar ), widget_get_width ( WIDGET ( lv->scrollbar ) ), h ); widget_resize ( WIDGET ( lv->scrollbar ), widget_get_width ( WIDGET ( lv->scrollbar ) ), h );
listview_recompute_elements ( lv ); listview_recompute_elements ( lv );

6
source/widgets/widget.c
View file

@ -66,10 +66,10 @@ void widget_draw ( widget *widget, cairo_t *d )
widget->need_redraw = FALSE; widget->need_redraw = FALSE;
} }
} }
void widget_free ( widget *widget ) void widget_free ( widget *wid )
{ {
if ( widget && widget->free ) { if ( wid && wid->free ) {
widget->free ( widget ); wid->free ( wid );
} }
} }

4
test/widget-test.c
View file

@ -20,6 +20,10 @@ int main ( G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv )
widget *wid= (widget*)g_malloc0(sizeof(widget)); widget *wid= (widget*)g_malloc0(sizeof(widget));
widget_resize ( wid, 20, 40); widget_resize ( wid, 20, 40);
widget_move ( wid, 10, 10); widget_move ( wid, 10, 10);
// Getter, setter x pos
//
TASSERT( widget_get_x_pos ( wid ) == 10 );
TASSERT( widget_get_y_pos ( wid ) == 10 );
// Left of box // Left of box
TASSERT ( widget_intersect ( wid, 0, 0) == 0 ); TASSERT ( widget_intersect ( wid, 0, 0) == 0 );