PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-07-31 21:59:25 -04:00
Code Releases Activity

Fix ; in macro.

Browse source
This commit is contained in:
Dave Davenport 2015-11-24 22:53:40 +01:00
parent d1591273e7
commit 627643281d
3 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/timings.h
View file

@ -7,10 +7,10 @@ void rofi_timings_init ( void );
void rofi_timings_tick ( char const *str, int line, char const *msg ); void rofi_timings_tick ( char const *str, int line, char const *msg );
void rofi_timings_quit ( void ); void rofi_timings_quit ( void );
#define TIMINGS_START() rofi_timings_init (); #define TIMINGS_START() rofi_timings_init ()
#define TICK() rofi_timings_tick ( __FUNCTION__, __LINE__, "" ); #define TICK() rofi_timings_tick ( __FUNCTION__, __LINE__, "" )
#define TICK_N( a ) rofi_timings_tick ( __FUNCTION__, __LINE__, a ); #define TICK_N( a ) rofi_timings_tick ( __FUNCTION__, __LINE__, a )
#define TIMINGS_STOP() rofi_timings_quit (); #define TIMINGS_STOP() rofi_timings_quit ()
#else #else

4
source/dialogs/dmenu.c
View file

@ -63,7 +63,7 @@ typedef struct _DmenuModePrivateData
static char **get_dmenu ( unsigned int *length ) static char **get_dmenu ( unsigned int *length )
{ {
TICK_N ( "Read stdin START" ) TICK_N ( "Read stdin START" );
char **retv = NULL; char **retv = NULL;
unsigned int rvlength = 1; unsigned int rvlength = 1;
@ -92,7 +92,7 @@ static char **get_dmenu ( unsigned int *length )
} }
retv[( *length ) + 1] = NULL; retv[( *length ) + 1] = NULL;
retv = g_realloc ( retv, ( *length + 1 ) * sizeof ( char* ) ); retv = g_realloc ( retv, ( *length + 1 ) * sizeof ( char* ) );
TICK_N ( "Read stdin STOP" ) TICK_N ( "Read stdin STOP" );
return retv; return retv;
} }

54
source/rofi.c
View file

@ -804,7 +804,7 @@ static void call_thread ( gpointer data, gpointer user_data )
static void menu_refilter ( MenuState *state ) static void menu_refilter ( MenuState *state )
{ {
TICK_N ( "Filter start" ) TICK_N ( "Filter start" );
if ( strlen ( state->text->text ) > 0 ) { if ( strlen ( state->text->text ) > 0 ) {
unsigned int j = 0; unsigned int j = 0;
char **tokens = tokenize ( state->text->text, config.case_sensitive ); char **tokens = tokenize ( state->text->text, config.case_sensitive );
@ -884,7 +884,7 @@ static void menu_refilter ( MenuState *state )
scrollbar_set_max_value ( state->scrollbar, state->filtered_lines ); scrollbar_set_max_value ( state->scrollbar, state->filtered_lines );
state->refilter = FALSE; state->refilter = FALSE;
state->rchanged = TRUE; state->rchanged = TRUE;
TICK_N ( "Filter done" ) TICK_N ( "Filter done" );
} }
static void menu_draw ( MenuState *state, cairo_t *d ) static void menu_draw ( MenuState *state, cairo_t *d )
@ -968,7 +968,7 @@ static void menu_draw ( MenuState *state, cairo_t *d )
static void menu_update ( MenuState *state ) static void menu_update ( MenuState *state )
{ {
TICK () TICK ();
cairo_surface_t * surf = cairo_image_surface_create ( get_format (), state->w, state->h ); cairo_surface_t * surf = cairo_image_surface_create ( get_format (), state->w, state->h );
cairo_t *d = cairo_create ( surf ); cairo_t *d = cairo_create ( surf );
cairo_set_operator ( d, CAIRO_OPERATOR_SOURCE ); cairo_set_operator ( d, CAIRO_OPERATOR_SOURCE );
@ -988,7 +988,7 @@ static void menu_update ( MenuState *state )
color_background ( display, d ); color_background ( display, d );
cairo_paint ( d ); cairo_paint ( d );
} }
TICK_N ( "Background" ) TICK_N ( "Background" );
color_border ( display, d ); color_border ( display, d );
if ( config.menu_bw > 0 ) { if ( config.menu_bw > 0 ) {
@ -1060,7 +1060,7 @@ static void menu_update ( MenuState *state )
// Flush the surface. // Flush the surface.
cairo_surface_flush ( surface ); cairo_surface_flush ( surface );
TICK () TICK ();
} }
/** /**
@ -1169,12 +1169,12 @@ static void menu_setup_fake_transparency ( Display *display, MenuState *state )
cairo_paint ( dr ); cairo_paint ( dr );
cairo_destroy ( dr ); cairo_destroy ( dr );
cairo_surface_destroy ( s ); cairo_surface_destroy ( s );
TICK_N ( "Fake transparency" ) TICK_N ( "Fake transparency" );
} }
MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *selected_line, unsigned int *next_pos, const char *message ) MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *selected_line, unsigned int *next_pos, const char *message )
{ {
TICK () TICK ();
int shift = FALSE; int shift = FALSE;
MenuState state = { MenuState state = {
.sw = sw, .sw = sw,
@ -1202,7 +1202,7 @@ MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *select
// find out which lines contain non-ascii codepoints, so we can be faster in some cases. // find out which lines contain non-ascii codepoints, so we can be faster in some cases.
if ( state.num_lines > 0 ) { if ( state.num_lines > 0 ) {
TICK_N ( "Is ASCII start" ) TICK_N ( "Is ASCII start" );
unsigned int nt = MAX ( 1, state.num_lines / 5000 ); unsigned int nt = MAX ( 1, state.num_lines / 5000 );
thread_state states[nt]; thread_state states[nt];
unsigned int steps = ( state.num_lines + nt ) / nt; unsigned int steps = ( state.num_lines + nt ) / nt;
@ -1235,7 +1235,7 @@ MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *select
} }
g_cond_clear ( &cond ); g_cond_clear ( &cond );
g_mutex_clear ( &mutex ); g_mutex_clear ( &mutex );
TICK_N ( "Is ASCII stop" ) TICK_N ( "Is ASCII stop" );
} }
if ( next_pos ) { if ( next_pos ) {
@ -1251,7 +1251,7 @@ MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *select
// Break off. // Break off.
return MENU_CANCEL; return MENU_CANCEL;
} }
TICK_N ( "Grab keyboard" ) TICK_N ( "Grab keyboard" );
// main window isn't explicitly destroyed in case we switch modes. Reusing it prevents flicker // main window isn't explicitly destroyed in case we switch modes. Reusing it prevents flicker
XWindowAttributes attr; XWindowAttributes attr;
if ( main_window == None || XGetWindowAttributes ( display, main_window, &attr ) == 0 ) { if ( main_window == None || XGetWindowAttributes ( display, main_window, &attr ) == 0 ) {
@ -1260,10 +1260,10 @@ MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *select
sn_launchee_context_setup_window ( sncontext, main_window ); sn_launchee_context_setup_window ( sncontext, main_window );
} }
} }
TICK_N ( "Startup notification" ) TICK_N ( "Startup notification" );
// Get active monitor size. // Get active monitor size.
monitor_active ( display, &( state.mon ) ); monitor_active ( display, &( state.mon ) );
TICK_N ( "Get active monitor" ) TICK_N ( "Get active monitor" );
if ( config.fake_transparency ) { if ( config.fake_transparency ) {
menu_setup_fake_transparency ( display, &state ); menu_setup_fake_transparency ( display, &state );
} }
@ -1429,7 +1429,7 @@ MenuReturn menu ( Switcher *sw, char **input, char *prompt, unsigned int *select
} }
// Get next event. (might block) // Get next event. (might block)
XNextEvent ( display, &ev ); XNextEvent ( display, &ev );
TICK_N ( "X Event" ) TICK_N ( "X Event" );
if ( sndisplay != NULL ) { if ( sndisplay != NULL ) {
sn_display_process_event ( sndisplay, &ev ); sn_display_process_event ( sndisplay, &ev );
} }
@ -1957,7 +1957,7 @@ static void cleanup ()
// Cleanup the custom keybinding // Cleanup the custom keybinding
cleanup_abe (); cleanup_abe ();
TIMINGS_STOP () TIMINGS_STOP ();
} }
/** /**
@ -2095,7 +2095,7 @@ static void print_global_keybindings ()
static void reload_configuration () static void reload_configuration ()
{ {
if ( find_arg ( "-no-config" ) < 0 ) { if ( find_arg ( "-no-config" ) < 0 ) {
TICK () TICK ();
// Reset the color cache // Reset the color cache
color_cache_reset (); color_cache_reset ();
// We need to open a new connection to X11, otherwise we get old // We need to open a new connection to X11, otherwise we get old
@ -2114,7 +2114,7 @@ static void reload_configuration ()
fprintf ( stderr, "Failed to get a new connection to the X11 server. No point in continuing.\n" ); fprintf ( stderr, "Failed to get a new connection to the X11 server. No point in continuing.\n" );
abort (); abort ();
} }
TICK_N ( "Load config" ) TICK_N ( "Load config" );
} }
} }
@ -2280,7 +2280,7 @@ static void error_trap_pop ( G_GNUC_UNUSED SnDisplay *display, Display *xdispl
int main ( int argc, char *argv[] ) int main ( int argc, char *argv[] )
{ {
TIMINGS_START () TIMINGS_START ();
cmd_set_arguments ( argc, argv ); cmd_set_arguments ( argc, argv );
// Quiet flag // Quiet flag
@ -2306,7 +2306,7 @@ int main ( int argc, char *argv[] )
// Free the basename for dmenu detection. // Free the basename for dmenu detection.
g_free ( base_name ); g_free ( base_name );
} }
TICK () TICK ();
// Get the path to the cache dir. // Get the path to the cache dir.
cache_dir = g_get_user_cache_dir (); cache_dir = g_get_user_cache_dir ();
@ -2317,11 +2317,11 @@ int main ( int argc, char *argv[] )
} }
config_parser_add_option ( xrm_String, "pid", (void * *) &pidfile, "Pidfile location" ); config_parser_add_option ( xrm_String, "pid", (void * *) &pidfile, "Pidfile location" );
TICK () TICK ();
// Register cleanup function. // Register cleanup function.
atexit ( cleanup ); atexit ( cleanup );
TICK () TICK ();
// Get DISPLAY, first env, then argument. // Get DISPLAY, first env, then argument.
display_str = getenv ( "DISPLAY" ); display_str = getenv ( "DISPLAY" );
find_arg_str ( "-display", &display_str ); find_arg_str ( "-display", &display_str );
@ -2343,17 +2343,17 @@ int main ( int argc, char *argv[] )
fprintf ( stderr, "cannot open display!\n" ); fprintf ( stderr, "cannot open display!\n" );
return EXIT_FAILURE; return EXIT_FAILURE;
} }
TICK_N ( "Open Display" ) TICK_N ( "Open Display" );
// startup not. // startup not.
sndisplay = sn_display_new ( display, error_trap_push, error_trap_pop ); sndisplay = sn_display_new ( display, error_trap_push, error_trap_pop );
if ( sndisplay != NULL ) { if ( sndisplay != NULL ) {
sncontext = sn_launchee_context_new_from_environment ( sndisplay, DefaultScreen ( display ) ); sncontext = sn_launchee_context_new_from_environment ( sndisplay, DefaultScreen ( display ) );
} }
TICK_N ( "Startup Notification" ) TICK_N ( "Startup Notification" );
// Setup keybinding // Setup keybinding
setup_abe (); setup_abe ();
TICK_N ( "Setup abe" ) TICK_N ( "Setup abe" );
if ( find_arg ( "-no-config" ) < 0 ) { if ( find_arg ( "-no-config" ) < 0 ) {
load_configuration ( display ); load_configuration ( display );
@ -2373,10 +2373,10 @@ int main ( int argc, char *argv[] )
x11_setup ( display ); x11_setup ( display );
TICK_N ( "X11 Setup " ) TICK_N ( "X11 Setup " );
// Sanity check // Sanity check
config_sanity_check ( display ); config_sanity_check ( display );
TICK_N ( "Config sanity check" ) TICK_N ( "Config sanity check" );
// Dump. // Dump.
// catch help request // catch help request
if ( find_arg ( "-h" ) >= 0 || find_arg ( "-help" ) >= 0 || find_arg ( "--help" ) >= 0 ) { if ( find_arg ( "-h" ) >= 0 || find_arg ( "-help" ) >= 0 || find_arg ( "--help" ) >= 0 ) {
@ -2389,7 +2389,7 @@ int main ( int argc, char *argv[] )
} }
// Parse the keybindings. // Parse the keybindings.
parse_keys_abe (); parse_keys_abe ();
TICK_N ( "Parse ABE" ) TICK_N ( "Parse ABE" );
char *msg = NULL; char *msg = NULL;
if ( find_arg_str ( "-e", &( msg ) ) ) { if ( find_arg_str ( "-e", &( msg ) ) ) {
int markup = FALSE; int markup = FALSE;
@ -2417,7 +2417,7 @@ int main ( int argc, char *argv[] )
return EXIT_FAILURE; return EXIT_FAILURE;
} }
TICK_N ( "Setup Threadpool" ) TICK_N ( "Setup Threadpool" );
// Dmenu mode. // Dmenu mode.
if ( dmenu_mode == TRUE ) { if ( dmenu_mode == TRUE ) {
normal_window_mode = find_arg ( "-normal-window" ) >= 0; normal_window_mode = find_arg ( "-normal-window" ) >= 0;