PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-02-03 15:34:54 -05:00
Code Releases Activity

Fix some small memory leaks.

Browse source
This commit is contained in:
QC 2014-05-19 21:58:13 +02:00
parent 0a95ba47fa
commit 05cf49a880
3 changed files with 184 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/xrmoptions.h
View file

@ -2,4 +2,5 @@
#define __XRMOPTIONS_H__ #define __XRMOPTIONS_H__
void parse_xresource_options ( Display *display ); void parse_xresource_options ( Display *display );
void parse_xresource_free( void );
#endif #endif

166
source/rofi.c
View file

@ -756,40 +756,50 @@ GC gc = NULL;
#include "textbox.h" #include "textbox.h"
void menu_hide_arrow_text(int filtered_lines, int selected, int max_elements, void menu_hide_arrow_text ( int filtered_lines, int selected, int max_elements,
textbox *arrowbox_top, textbox *arrowbox_bottom) textbox *arrowbox_top, textbox *arrowbox_bottom )
{ {
if(arrowbox_top == NULL || arrowbox_bottom == NULL ) return; if ( arrowbox_top == NULL || arrowbox_bottom == NULL )
int page = (filtered_lines > 0)? selected/max_elements:0; {
int npages = (filtered_lines > 0)? ((filtered_lines+max_elements-1)/max_elements):1; return;
if(!(page != 0 && npages > 1)) {
textbox_hide( arrowbox_top );
} }
if(!((npages-1) != page && npages > 1)) { int page = ( filtered_lines > 0 ) ? selected / max_elements : 0;
textbox_hide( arrowbox_bottom ); int npages = ( filtered_lines > 0 ) ? ( ( filtered_lines + max_elements - 1 ) / max_elements ) : 1;
if ( !( page != 0 && npages > 1 ) )
{
textbox_hide ( arrowbox_top );
}
if ( !( ( npages - 1 ) != page && npages > 1 ) )
{
textbox_hide ( arrowbox_bottom );
} }
} }
void menu_set_arrow_text(int filtered_lines, int selected, int max_elements, void menu_set_arrow_text ( int filtered_lines, int selected, int max_elements,
textbox *arrowbox_top, textbox *arrowbox_bottom) textbox *arrowbox_top, textbox *arrowbox_bottom )
{ {
if(arrowbox_top == NULL || arrowbox_bottom == NULL ) return; if ( arrowbox_top == NULL || arrowbox_bottom == NULL )
int page = (filtered_lines > 0)? selected/max_elements:0; {
int npages = (filtered_lines > 0)? ((filtered_lines+max_elements-1)/max_elements):1; return;
int entry = selected%max_elements;
if(page != 0 && npages > 1) {
textbox_show( arrowbox_top );
textbox_font ( arrowbox_top, config.menu_font,
(entry == 0 )? config.menu_hlfg : config.menu_fg,
(entry == 0 )? config.menu_hlbg : config.menu_bg );
textbox_draw( arrowbox_top );
} }
if((npages-1) != page && npages > 1) { int page = ( filtered_lines > 0 ) ? selected / max_elements : 0;
textbox_show( arrowbox_bottom ); int npages = ( filtered_lines > 0 ) ? ( ( filtered_lines + max_elements - 1 ) / max_elements ) : 1;
int entry = selected % max_elements;
if ( page != 0 && npages > 1 )
{
textbox_show ( arrowbox_top );
textbox_font ( arrowbox_top, config.menu_font,
( entry == 0 ) ? config.menu_hlfg : config.menu_fg,
( entry == 0 ) ? config.menu_hlbg : config.menu_bg );
textbox_draw ( arrowbox_top );
}
if ( ( npages - 1 ) != page && npages > 1 )
{
textbox_show ( arrowbox_bottom );
textbox_font ( arrowbox_bottom, config.menu_font, textbox_font ( arrowbox_bottom, config.menu_font,
(entry == (max_elements-1) )? config.menu_hlfg : config.menu_fg, ( entry == ( max_elements - 1 ) ) ? config.menu_hlfg : config.menu_fg,
(entry == (max_elements-1) )? config.menu_hlbg : config.menu_bg ); ( entry == ( max_elements - 1 ) ) ? config.menu_hlbg : config.menu_bg );
textbox_draw( arrowbox_bottom ); textbox_draw ( arrowbox_bottom );
} }
} }
@ -813,7 +823,7 @@ void menu_draw ( textbox *text,
else else
{ {
// Do paginating // Do paginating
int page = (max_elements > 0)?(selected / max_elements):0; int page = ( max_elements > 0 ) ? ( selected / max_elements ) : 0;
offset = page * max_elements; offset = page * max_elements;
*last_offset = offset; *last_offset = offset;
} }
@ -979,20 +989,20 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
} }
unsigned int max_elements = MIN ( config.menu_lines*config.menu_columns, num_lines ); unsigned int max_elements = MIN ( config.menu_lines * config.menu_columns, num_lines );
// TODO, clean this up. // TODO, clean this up.
// Calculate the number or rows. // Calculate the number or rows.
// we do this by getting the num_lines rounded up to X columns (num elements is better name) // we do this by getting the num_lines rounded up to X columns (num elements is better name)
// then dividing by columns. // then dividing by columns.
unsigned int max_rows = MIN ( config.menu_lines, unsigned int max_rows = MIN ( config.menu_lines,
(unsigned int)( (unsigned int) (
(num_lines+(config.menu_columns-num_lines%config.menu_columns)%config.menu_columns)/ ( num_lines + ( config.menu_columns - num_lines % config.menu_columns ) % config.menu_columns ) /
(config.menu_columns) ( config.menu_columns )
)); ) );
if ( config.fixed_num_lines == 1 ) if ( config.fixed_num_lines == 1 )
{ {
max_elements = config.menu_lines*config.menu_columns; max_elements = config.menu_lines * config.menu_columns;
max_rows = config.menu_lines; max_rows = config.menu_lines;
} }
// More hacks. // More hacks.
@ -1071,8 +1081,8 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
for ( i = 0; i < max_elements; i++ ) for ( i = 0; i < max_elements; i++ )
{ {
int line = ( i ) % max_rows +( ( config.wmode == VERTICAL )?1:0); int line = ( i ) % max_rows + ( ( config.wmode == VERTICAL ) ? 1 : 0 );
int col = ( i ) / max_rows +( ( config.wmode == VERTICAL )?0:1); int col = ( i ) / max_rows + ( ( config.wmode == VERTICAL ) ? 0 : 1 );
boxes[i] = textbox_create ( box, boxes[i] = textbox_create ( box,
0, 0,
( config.padding ) + col * ( element_width + LINE_MARGIN ), // X ( config.padding ) + col * ( element_width + LINE_MARGIN ), // X
@ -1084,27 +1094,27 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
} }
// Arrows // Arrows
textbox *arrowbox_top = NULL, *arrowbox_bottom = NULL; textbox *arrowbox_top = NULL, *arrowbox_bottom = NULL;
if(config.wmode == VERTICAL) if ( config.wmode == VERTICAL )
{ {
arrowbox_top = textbox_create ( box, TB_AUTOHEIGHT | TB_AUTOWIDTH, arrowbox_top = textbox_create ( box, TB_AUTOHEIGHT | TB_AUTOWIDTH,
(config.padding), ( config.padding ),
(config.padding), ( config.padding ),
0, 0, 0, 0,
config.menu_font, config.menu_fg, config.menu_bg, config.menu_font, config.menu_fg, config.menu_bg,
"↑", NULL); "↑", NULL );
arrowbox_bottom = textbox_create ( box, TB_AUTOHEIGHT | TB_AUTOWIDTH, arrowbox_bottom = textbox_create ( box, TB_AUTOHEIGHT | TB_AUTOWIDTH,
(config.padding), ( config.padding ),
(config.padding), ( config.padding ),
0, 0, 0, 0,
config.menu_font, config.menu_fg, config.menu_bg, config.menu_font, config.menu_fg, config.menu_bg,
"↓", NULL); "↓", NULL );
textbox_move ( arrowbox_top, textbox_move ( arrowbox_top,
w-config.padding-arrowbox_top->w, w - config.padding - arrowbox_top->w,
config.padding+line_height+LINE_MARGIN); config.padding + line_height + LINE_MARGIN );
textbox_move ( arrowbox_bottom, textbox_move ( arrowbox_bottom,
w-config.padding-arrowbox_bottom->w, w - config.padding - arrowbox_bottom->w,
config.padding+max_rows*line_height+LINE_MARGIN); config.padding + max_rows * line_height + LINE_MARGIN );
} }
// filtered list // filtered list
@ -1171,18 +1181,18 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
y = mon.y; y = mon.y;
case WL_EAST: case WL_EAST:
x = mon.x + mon.w - w-config.menu_bw*2; x = mon.x + mon.w - w - config.menu_bw * 2;
break; break;
case WL_EAST_SOUTH: case WL_EAST_SOUTH:
x = mon.x + mon.w - w-config.menu_bw*2; x = mon.x + mon.w - w - config.menu_bw * 2;
case WL_SOUTH: case WL_SOUTH:
y = mon.y + mon.h - h-config.menu_bw*2; y = mon.y + mon.h - h - config.menu_bw * 2;
break; break;
case WL_SOUTH_WEST: case WL_SOUTH_WEST:
y = mon.y + mon.h - h-config.menu_bw*2; y = mon.y + mon.h - h - config.menu_bw * 2;
case WL_WEST: case WL_WEST:
x = mon.x; x = mon.x;
@ -1193,15 +1203,15 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
break; break;
} }
// Apply offset. // Apply offset.
y+= config.y_offset; y += config.y_offset;
x+= config.x_offset; x += config.x_offset;
XMoveResizeWindow ( display, box, x, y, w, h ); XMoveResizeWindow ( display, box, x, y, w, h );
XMapRaised ( display, box ); XMapRaised ( display, box );
// if grabbing keyboard failed, fall through // if grabbing keyboard failed, fall through
if(take_keyboard ( box )) if ( take_keyboard ( box ) )
{ {
KeySym prev_key = 0; KeySym prev_key = 0;
unsigned int selected = 0; unsigned int selected = 0;
@ -1218,11 +1228,11 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
} }
menu_draw ( text, boxes, max_elements, num_lines, &last_offset, selected, filtered ); menu_draw ( text, boxes, max_elements, num_lines, &last_offset, selected, filtered );
menu_set_arrow_text(filtered_lines, selected, menu_set_arrow_text ( filtered_lines, selected,
max_elements, arrowbox_top, max_elements, arrowbox_top,
arrowbox_bottom); arrowbox_bottom );
// Why do we need the specian -1? // Why do we need the specian -1?
if ( config.wmode == VERTICAL && max_elements > 0) if ( config.wmode == VERTICAL && max_elements > 0 )
{ {
XDrawLine ( display, main_window, gc, ( config.padding ), XDrawLine ( display, main_window, gc, ( config.padding ),
line_height + ( config.padding ) + ( LINE_MARGIN - 2 ) / 2, line_height + ( config.padding ) + ( LINE_MARGIN - 2 ) / 2,
@ -1383,21 +1393,23 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
selected = num_lines - 1; selected = num_lines - 1;
} }
} }
else if ( key == XK_h && ev.xkey.state & ControlMask ) { else if ( key == XK_h && ev.xkey.state & ControlMask )
if(selected < max_rows ) {
if ( selected < max_rows )
{ {
selected = 0; selected = 0;
} }
else else
{ {
selected-=max_rows; selected -= max_rows;
} }
} }
else if ( key == XK_l && ev.xkey.state & ControlMask ) { else if ( key == XK_l && ev.xkey.state & ControlMask )
selected += max_rows;
if(selected >= num_lines )
{ {
selected = num_lines-1; selected += max_rows;
if ( selected >= num_lines )
{
selected = num_lines - 1;
} }
} }
else if ( key == XK_Home || key == XK_KP_Home ) else if ( key == XK_Home || key == XK_KP_Home )
@ -1441,7 +1453,7 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
free ( str ); free ( str );
} }
// Double tab! // Double tab!
else if (filtered_lines == 0 && key == prev_key ) else if ( filtered_lines == 0 && key == prev_key )
{ {
retv = MENU_NEXT; retv = MENU_NEXT;
*selected_line = 0; *selected_line = 0;
@ -1454,13 +1466,13 @@ MenuReturn menu ( char **lines, char **input, char *prompt, Time *time, int *shi
} }
} }
} }
menu_hide_arrow_text(filtered_lines, selected, menu_hide_arrow_text ( filtered_lines, selected,
max_elements, arrowbox_top, max_elements, arrowbox_top,
arrowbox_bottom); arrowbox_bottom );
menu_draw ( text, boxes, max_elements, num_lines, &last_offset, selected, filtered ); menu_draw ( text, boxes, max_elements, num_lines, &last_offset, selected, filtered );
menu_set_arrow_text(filtered_lines, selected, menu_set_arrow_text ( filtered_lines, selected,
max_elements, arrowbox_top, max_elements, arrowbox_top,
arrowbox_bottom); arrowbox_bottom );
prev_key = key; prev_key = key;
} }
} }
@ -1855,7 +1867,7 @@ void help ()
} }
} }
static void parse_cmd_options( int argc, char ** argv ) static void parse_cmd_options ( int argc, char ** argv )
{ {
// Parse commandline arguments about the looks. // Parse commandline arguments about the looks.
find_arg_str ( argc, argv, "-font", &( config.menu_font ) ); find_arg_str ( argc, argv, "-font", &( config.menu_font ) );
@ -1893,9 +1905,8 @@ static void parse_cmd_options( int argc, char ** argv )
} }
} }
static void cleanup() static void cleanup ()
{ {
printf("cleanup\n");
// Cleanup // Cleanup
if ( display != NULL ) if ( display != NULL )
{ {
@ -1906,11 +1917,11 @@ printf("cleanup\n");
XCloseDisplay ( display ); XCloseDisplay ( display );
} }
} }
if(cache_xattr != NULL) if ( cache_xattr != NULL )
{ {
winlist_free ( cache_xattr ); winlist_free ( cache_xattr );
} }
if(cache_client != NULL) if ( cache_client != NULL )
{ {
winlist_free ( cache_client ); winlist_free ( cache_client );
} }
@ -1922,8 +1933,13 @@ printf("cleanup\n");
} }
#endif #endif
xdgWipeHandle ( &xdg_handle );
// Cleaning up memory allocated by the Xresources file.
// TODO, not happy with this.
parse_xresource_free ();
// Whipe the handle.. (not working)
xdgWipeHandle ( &xdg_handle );
} }
int main ( int argc, char *argv[] ) int main ( int argc, char *argv[] )
{ {
@ -1964,7 +1980,7 @@ int main ( int argc, char *argv[] )
} }
// Register cleanup function. // Register cleanup function.
atexit(cleanup); atexit ( cleanup );
cache_dir = xdgCacheHome ( &xdg_handle ); cache_dir = xdgCacheHome ( &xdg_handle );

66
source/xrmoptions.c
View file

@ -50,29 +50,30 @@ typedef struct
unsigned int * num; unsigned int * num;
char ** str; char ** str;
}; };
char *mem;
} XrmOption; } XrmOption;
/** /**
* Map X resource settings to internal options * Map X resource settings to internal options
* Currently supports string and number. * Currently supports string and number.
*/ */
static XrmOption xrmOptions[] = { static XrmOption xrmOptions[] = {
{ xrm_Number, "opacity", { .num = &config.window_opacity } }, { xrm_Number, "opacity", { .num = &config.window_opacity }, NULL },
{ xrm_Number, "width", { .num = &config.menu_width } }, { xrm_Number, "width", { .num = &config.menu_width }, NULL },
{ xrm_Number, "lines", { .num = &config.menu_lines } }, { xrm_Number, "lines", { .num = &config.menu_lines }, NULL },
{ xrm_String, "font", { .str = &config.menu_font } }, { xrm_String, "font", { .str = &config.menu_font }, NULL },
{ xrm_String, "foreground", { .str = &config.menu_fg } }, { xrm_String, "foreground", { .str = &config.menu_fg }, NULL },
{ xrm_String, "background", { .str = &config.menu_bg } }, { xrm_String, "background", { .str = &config.menu_bg }, NULL },
{ xrm_String, "highlightfg", { .str = &config.menu_hlfg } }, { xrm_String, "highlightfg", { .str = &config.menu_hlfg }, NULL },
{ xrm_String, "highlightbg", { .str = &config.menu_hlbg } }, { xrm_String, "highlightbg", { .str = &config.menu_hlbg }, NULL },
{ xrm_String, "bordercolor", { .str = &config.menu_bc } }, { xrm_String, "bordercolor", { .str = &config.menu_bc }, NULL },
{ xrm_Number, "padding", { .num = &config.padding } }, { xrm_Number, "padding", { .num = &config.padding }, NULL },
{ xrm_Number, "borderwidth", { .num = &config.menu_bw } }, { xrm_Number, "borderwidth", { .num = &config.menu_bw }, NULL },
{ xrm_String, "terminal", { .str = &config.terminal_emulator } }, { xrm_String, "terminal", { .str = &config.terminal_emulator }, NULL },
{ xrm_Number, "location", { .num = &config.location } }, { xrm_Number, "location", { .num = &config.location }, NULL },
{ xrm_Number, "yoffset", { .num = &config.y_offset } }, { xrm_Number, "yoffset", { .num = &config.y_offset }, NULL },
{ xrm_Number, "xoffset", { .num = &config.x_offset } }, { xrm_Number, "xoffset", { .num = &config.x_offset }, NULL },
{ xrm_Number, "fixed_num_lines", { .num = &config.fixed_num_lines } }, { xrm_Number, "fixed_num_lines", { .num = &config.fixed_num_lines }, NULL },
{ xrm_Number, "columns", { .num = &config.menu_columns } }, { xrm_Number, "columns", { .num = &config.menu_columns }, NULL },
}; };
@ -91,23 +92,33 @@ void parse_xresource_options ( Display *display )
char * xrmType; char * xrmType;
XrmValue xrmValue; XrmValue xrmValue;
// TODO: update when we have new name.
const char * namePrefix = "rofi"; const char * namePrefix = "rofi";
const char * classPrefix = "Simpleswitcher"; const char * classPrefix = "rofi";
for ( unsigned int i = 0; i < sizeof ( xrmOptions ) / sizeof ( *xrmOptions ); ++i ) for ( unsigned int i = 0; i < sizeof ( xrmOptions ) / sizeof ( *xrmOptions ); ++i )
{ {
char *name, *class; char *name, *class;
if ( asprintf ( &name, "%s.%s", namePrefix, xrmOptions[i].name ) == -1) continue; if ( asprintf ( &name, "%s.%s", namePrefix, xrmOptions[i].name ) == -1 )
if ( asprintf ( &class, "%s.%s", classPrefix, xrmOptions[i].name ) > 0) {
continue;
}
if ( asprintf ( &class, "%s.%s", classPrefix, xrmOptions[i].name ) > 0 )
{ {
if ( XrmGetResource ( xDB, name, class, &xrmType, &xrmValue ) ) if ( XrmGetResource ( xDB, name, class, &xrmType, &xrmValue ) )
{ {
if ( xrmOptions[i].type == xrm_String ) if ( xrmOptions[i].type == xrm_String )
{ {
if ( xrmOptions[i].mem != NULL )
{
free ( xrmOptions[i].mem );
xrmOptions[i].mem = NULL;
}
//TODO this leaks memory. //TODO this leaks memory.
*xrmOptions[i].str = ( char * ) malloc ( xrmValue.size * sizeof ( char ) ); *xrmOptions[i].str = ( char * ) malloc ( xrmValue.size * sizeof ( char ) );
strncpy ( *xrmOptions[i].str, xrmValue.addr, xrmValue.size ); strncpy ( *xrmOptions[i].str, xrmValue.addr, xrmValue.size );
// Memory
xrmOptions[i].mem = ( *xrmOptions[i].str );
} }
else if ( xrmOptions[i].type == xrm_Number ) else if ( xrmOptions[i].type == xrm_Number )
{ {
@ -119,4 +130,17 @@ void parse_xresource_options ( Display *display )
} }
free ( name ); free ( name );
} }
XrmDestroyDatabase ( xDB );
}
void parse_xresource_free ( void )
{
for ( unsigned int i = 0; i < sizeof ( xrmOptions ) / sizeof ( *xrmOptions ); ++i )
{
if ( xrmOptions[i].mem != NULL )
{
free ( xrmOptions[i].mem );
xrmOptions[i].mem = NULL;
}
}
} }