PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-01-27 15:25:24 -05:00
Code Releases Activity

cleanups

Browse source
This commit is contained in:
QC 2014-02-03 23:07:04 +01:00
parent b9c192c4fe
commit 57abc12c43
6 changed files with 20 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/config.c
View file

@ -59,9 +59,6 @@ Settings config = {
.window_key = "F12", .window_key = "F12",
.run_key = "mod1+F2", .run_key = "mod1+F2",
.ssh_key = "mod1+F3", .ssh_key = "mod1+F3",
#ifdef I3
.mark_key = "mod1+F5",
#endif
// Location of the window. CENTER, NORTH_WEST, NORTH,NORTH_EAST, etc. // Location of the window. CENTER, NORTH_WEST, NORTH,NORTH_EAST, etc.
.location = CENTER, .location = CENTER,
// Mode of window, list (Vertical) or dmenu like (Horizontal) // Mode of window, list (Vertical) or dmenu like (Horizontal)

3
include/simpleswitcher.h
View file

@ -98,9 +98,6 @@ typedef struct _Settings {
WindowLocation location; WindowLocation location;
WindowMode wmode; WindowMode wmode;
unsigned int padding; unsigned int padding;
#ifdef I3
char * mark_key;
#endif
} Settings; } Settings;
extern Settings config; extern Settings config;

1
source/dmenu-dialog.c
View file

@ -82,6 +82,7 @@ SwitcherMode dmenu_switcher_dialog ( char **input )
} }
if ( list != NULL ) free( list ); if ( list != NULL ) free( list );
return retv; return retv;
} }

2
source/run-dialog.c
View file

@ -309,7 +309,7 @@ SwitcherMode run_switcher_dialog ( char **input )
free( cmd_list[i] ); free( cmd_list[i] );
} }
if (cmd_list != NULL) free( cmd_list ); if ( cmd_list != NULL ) free( cmd_list );
return retv; return retv;
} }

38
source/simpleswitcher.c
View file

@ -74,6 +74,9 @@
#define OPAQUE 0xffffffff #define OPAQUE 0xffffffff
#define OPACITY "_NET_WM_WINDOW_OPACITY" #define OPACITY "_NET_WM_WINDOW_OPACITY"
#define I3_SOCKET_PATH_PROP "I3_SOCKET_PATH" #define I3_SOCKET_PATH_PROP "I3_SOCKET_PATH"
#define FORK 1
#define NOFORK 2
xdgHandle xdg_handle; xdgHandle xdg_handle;
const char *cache_dir = NULL; const char *cache_dir = NULL;
@ -202,7 +205,7 @@ static void focus_window_i3( const char *socket_path, int id )
} }
// Formulate command // Formulate command
snprintf( command, 128, "[id=\"%d\"] focus", id ); snprintf( command, 128, "[id=\"%d\"] focus", id );
// Prepare header. // Prepare header.
memcpy( head.magic, I3_IPC_MAGIC, 6 ); memcpy( head.magic, I3_IPC_MAGIC, 6 );
@ -1131,9 +1134,6 @@ MenuReturn menu( char **lines, char **input, char *prompt, Time *time, int *shif
return retv; return retv;
} }
#define FORK 1
#define NOFORK 2
@ -1455,32 +1455,28 @@ int main( int argc, char *argv[] )
parse_xresource_options( display ); parse_xresource_options( display );
find_arg_str( argc, argv, "-font", &( config.menu_font ) ); find_arg_str( argc, argv, "-font", &( config.menu_font ) );
find_arg_str( argc, argv, "-fg", &( config.menu_fg ) ); find_arg_str( argc, argv, "-fg", &( config.menu_fg ) );
find_arg_str( argc, argv, "-bg", &( config.menu_bg ) ); find_arg_str( argc, argv, "-bg", &( config.menu_bg ) );
find_arg_str( argc, argv, "-hlfg", &( config.menu_hlfg ) ); find_arg_str( argc, argv, "-hlfg", &( config.menu_hlfg ) );
find_arg_str( argc, argv, "-hlbg", &( config.menu_hlbg ) ); find_arg_str( argc, argv, "-hlbg", &( config.menu_hlbg ) );
find_arg_str( argc, argv, "-bc", &( config.menu_bc ) ); find_arg_str( argc, argv, "-bc", &( config.menu_bc ) );
find_arg_str( argc, argv, "-term", &( config.terminal_emulator ) );
find_arg_str( argc, argv, "-term", &( config.terminal_emulator ) ); find_arg_int( argc, argv, "-bw", &( config.menu_bw ) );
find_arg_int( argc, argv, "-o", &( config.window_opacity ) );
find_arg_int( argc, argv, "-width", &( config.menu_width ) );
find_arg_int( argc, argv, "-lines", &( config.menu_lines ) );
find_arg_int( argc, argv, "-loc", &( config.location ) );
find_arg_int( argc, argv, "-padding", &( config.padding ) );
if ( find_arg ( argc, argv, "-zeltak" ) >= 0 ) { if ( find_arg ( argc, argv, "-zeltak" ) >= 0 ) {
config.zeltak_mode = 1; config.zeltak_mode = 1;
} }
find_arg_int( argc, argv, "-bw", &( config.menu_bw ) );
find_arg_int( argc, argv, "-o", &( config.window_opacity ) );
find_arg_int( argc, argv, "-width",&( config.menu_width ) );
find_arg_int( argc, argv, "-lines",&( config.menu_lines ) );
find_arg_int( argc, argv, "-loc", &( config.location ) );
if ( find_arg( argc, argv, "-hmode" ) >= 0 ) { if ( find_arg( argc, argv, "-hmode" ) >= 0 ) {
config.wmode = HORIZONTAL; config.wmode = HORIZONTAL;
} }
find_arg_int( argc, argv, "-padding", &( config.padding ) );
#ifdef I3 #ifdef I3
// Check for i3 // Check for i3

2
source/ssh-dialog.c
View file

@ -310,7 +310,7 @@ SwitcherMode ssh_switcher_dialog ( char **input )
free( cmd_list[i] ); free( cmd_list[i] );
} }
if(cmd_list != NULL) free( cmd_list ); if ( cmd_list != NULL ) free( cmd_list );
return retv; return retv;
} }