summaryrefslogtreecommitdiffstats
path: root/source/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'source/dialogs')
-rw-r--r--source/dialogs/drun.c13
-rw-r--r--source/dialogs/filebrowser.c18
-rw-r--r--source/dialogs/help-keys.c1
-rw-r--r--source/dialogs/run.c4
-rw-r--r--source/dialogs/script.c29
-rw-r--r--source/dialogs/ssh.c3
-rw-r--r--source/dialogs/window.c33
7 files changed, 54 insertions, 47 deletions
diff --git a/source/dialogs/drun.c b/source/dialogs/drun.c
index ee5616d5..b20f5b25 100644
--- a/source/dialogs/drun.c
+++ b/source/dialogs/drun.c
@@ -400,7 +400,7 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
}
else if ( !g_strcmp0 ( key, "Service" ) ) {
desktop_entry_type = DRUN_DESKTOP_ENTRY_TYPE_SERVICE;
- g_debug("Service file detected.");
+ g_debug ( "Service file detected." );
}
else {
g_debug ( "[%s] [%s] Skipping desktop file: Not of type Application or Link (%s)", id, path, key );
@@ -575,7 +575,7 @@ static void read_desktop_file ( DRunModePrivateData *pd, const char *root, const
pd->entry_list[pd->cmd_list_length].type = desktop_entry_type;
if ( desktop_entry_type == DRUN_DESKTOP_ENTRY_TYPE_APPLICATION ||
- desktop_entry_type == DRUN_DESKTOP_ENTRY_TYPE_SERVICE) {
+ desktop_entry_type == DRUN_DESKTOP_ENTRY_TYPE_SERVICE ) {
pd->entry_list[pd->cmd_list_length].exec = g_key_file_get_string ( kf, action, "Exec", NULL );
}
else {
@@ -726,9 +726,11 @@ static gint drun_int_sort_list ( gconstpointer a, gconstpointer b, G_GNUC_UNUSED
if ( da->sort_index < 0 && db->sort_index < 0 ) {
if ( da->name == NULL && db->name == NULL ) {
return 0;
- } else if ( da->name == NULL ) {
+ }
+ else if ( da->name == NULL ) {
return -1;
- } else if ( db->name == NULL ) {
+ }
+ else if ( db->name == NULL ) {
return 1;
}
return g_utf8_collate ( da->name, db->name );
@@ -1078,7 +1080,8 @@ static ModeMode drun_mode_result ( Mode *sw, int mretv, char **input, unsigned i
rmpd->cmd_list_length--;
}
retv = RELOAD_DIALOG;
- } else if ( mretv & MENU_CUSTOM_COMMAND ) {
+ }
+ else if ( mretv & MENU_CUSTOM_COMMAND ) {
retv = ( mretv & MENU_LOWER_MASK );
}
return retv;
diff --git a/source/dialogs/filebrowser.c b/source/dialogs/filebrowser.c
index 3df1f678..c9637285 100644
--- a/source/dialogs/filebrowser.c
+++ b/source/dialogs/filebrowser.c
@@ -97,8 +97,8 @@ static void free_list ( FileBrowserModePrivateData *pd )
static gint compare ( gconstpointer a, gconstpointer b, G_GNUC_UNUSED gpointer data )
{
- FBFile *fa = (FBFile*) a;
- FBFile *fb = (FBFile*) b;
+ FBFile *fa = (FBFile *) a;
+ FBFile *fb = (FBFile *) b;
if ( fa->type != fb->type ) {
return fa->type - fb->type;
}
@@ -239,9 +239,11 @@ static ModeMode file_browser_mode_result ( Mode *sw, int mretv, char **input, un
}
else if ( mretv & MENU_QUICK_SWITCH ) {
retv = ( mretv & MENU_LOWER_MASK );
- } else if ( mretv & MENU_CUSTOM_COMMAND ) {
+ }
+ else if ( mretv & MENU_CUSTOM_COMMAND ) {
retv = ( mretv & MENU_LOWER_MASK );
- } else if ( ( mretv & MENU_OK ) ) {
+ }
+ else if ( ( mretv & MENU_OK ) ) {
if ( selected_line < pd->array_length ) {
if ( pd->array[selected_line].type == UP ) {
GFile *new = g_file_get_parent ( pd->current_dir );
@@ -265,10 +267,10 @@ static ModeMode file_browser_mode_result ( Mode *sw, int mretv, char **input, un
return RESET_DIALOG;
}
else if ( pd->array[selected_line].type == RFILE ) {
- char *d = g_filename_from_utf8 ( pd->array[selected_line].path, -1, NULL, NULL, NULL );
- char *d_esc = g_shell_quote(d);
- char *cmd = g_strdup_printf ( "xdg-open %s", d_esc );
- g_free(d_esc);
+ char *d = g_filename_from_utf8 ( pd->array[selected_line].path, -1, NULL, NULL, NULL );
+ char *d_esc = g_shell_quote ( d );
+ char *cmd = g_strdup_printf ( "xdg-open %s", d_esc );
+ g_free ( d_esc );
g_free ( d );
char *cdir = g_file_get_path ( pd->current_dir );
helper_execute_command ( cdir, cmd, FALSE, NULL );
diff --git a/source/dialogs/help-keys.c b/source/dialogs/help-keys.c
index 6fc1e37f..a82d82c4 100644
--- a/source/dialogs/help-keys.c
+++ b/source/dialogs/help-keys.c
@@ -71,7 +71,6 @@ static ModeMode help_keys_mode_result ( G_GNUC_UNUSED Mode *sw,
G_GNUC_UNUSED char **input,
G_GNUC_UNUSED unsigned int selected_line )
{
-
if ( mretv & MENU_CUSTOM_COMMAND ) {
int retv = ( mretv & MENU_LOWER_MASK );
return retv;
diff --git a/source/dialogs/run.c b/source/dialogs/run.c
index 23b31e8b..a4aa7bc1 100644
--- a/source/dialogs/run.c
+++ b/source/dialogs/run.c
@@ -391,8 +391,8 @@ static ModeMode run_mode_result ( Mode *sw, int mretv, char **input, unsigned in
retv = RELOAD_DIALOG;
run_mode_destroy ( sw );
run_mode_init ( sw );
-
- } else if ( mretv & MENU_CUSTOM_COMMAND ) {
+ }
+ else if ( mretv & MENU_CUSTOM_COMMAND ) {
retv = ( mretv & MENU_LOWER_MASK );
}
return retv;
diff --git a/source/dialogs/script.c b/source/dialogs/script.c
index 14ca2df8..9bc33af7 100644
--- a/source/dialogs/script.c
+++ b/source/dialogs/script.c
@@ -284,23 +284,24 @@ static ModeMode script_mode_result ( Mode *sw, int mretv, char **input, unsigned
unsigned int new_length = 0;
if ( ( mretv & MENU_CUSTOM_COMMAND ) ) {
- if ( rmpd->use_hot_keys ) {
- script_mode_reset_highlight ( sw );
- if ( selected_line != UINT32_MAX ) {
- new_list = execute_executor ( sw, rmpd->cmd_list[selected_line].entry, &new_length, 10 + ( mretv & MENU_LOWER_MASK ), &( rmpd->cmd_list[selected_line] ) );
+ if ( rmpd->use_hot_keys ) {
+ script_mode_reset_highlight ( sw );
+ if ( selected_line != UINT32_MAX ) {
+ new_list = execute_executor ( sw, rmpd->cmd_list[selected_line].entry, &new_length, 10 + ( mretv & MENU_LOWER_MASK ), &( rmpd->cmd_list[selected_line] ) );
+ }
+ else {
+ if ( rmpd->no_custom == FALSE ) {
+ new_list = execute_executor ( sw, *input, &new_length, 10 + ( mretv & MENU_LOWER_MASK ), NULL );
+ }
+ else {
+ return RELOAD_DIALOG;
+ }
+ }
}
else {
- if ( rmpd->no_custom == FALSE ) {
- new_list = execute_executor ( sw, *input, &new_length, 10 + ( mretv & MENU_LOWER_MASK ), NULL );
- }
- else {
- return RELOAD_DIALOG;
- }
+ retv = ( mretv & MENU_LOWER_MASK );
+ return retv;
}
- } else {
- retv = ( mretv & MENU_LOWER_MASK );
- return retv;
- }
}
else if ( ( mretv & MENU_OK ) && rmpd->cmd_list[selected_line].entry != NULL ) {
if ( rmpd->cmd_list[selected_line].nonselectable ) {
diff --git a/source/dialogs/ssh.c b/source/dialogs/ssh.c
index 76f0d75f..75991f42 100644
--- a/source/dialogs/ssh.c
+++ b/source/dialogs/ssh.c
@@ -606,7 +606,8 @@ static ModeMode ssh_mode_result ( Mode *sw, int mretv, char **input, unsigned in
retv = RELOAD_DIALOG;
ssh_mode_destroy ( sw );
ssh_mode_init ( sw );
- } else if ( mretv & MENU_CUSTOM_COMMAND ) {
+ }
+ else if ( mretv & MENU_CUSTOM_COMMAND ) {
retv = ( mretv & MENU_LOWER_MASK );
}
return retv;
diff --git a/source/dialogs/window.c b/source/dialogs/window.c
index d2e2d792..289ed9c7 100644
--- a/source/dialogs/window.c
+++ b/source/dialogs/window.c
@@ -342,15 +342,15 @@ static client* window_client ( ModeModePrivateData *pd, xcb_window_t win )
g_free ( tmp_title );
char *tmp_role = window_get_text_prop ( c->window, netatoms[WM_WINDOW_ROLE] );
- c->role = g_markup_escape_text ( tmp_role ? tmp_role : "", -1 );
- pd->role_len = MAX ( c->role ? g_utf8_strlen ( c->role, -1 ) : 0, pd->role_len );
+ c->role = g_markup_escape_text ( tmp_role ? tmp_role : "", -1 );
+ pd->role_len = MAX ( c->role ? g_utf8_strlen ( c->role, -1 ) : 0, pd->role_len );
g_free ( tmp_role );
cky = xcb_icccm_get_wm_class ( xcb->connection, c->window );
xcb_icccm_get_wm_class_reply_t wcr;
if ( xcb_icccm_get_wm_class_reply ( xcb->connection, cky, &wcr, NULL ) ) {
- c->class = g_markup_escape_text( wcr.class_name, -1 );
- c->name = g_markup_escape_text( wcr.instance_name, -1 );
+ c->class = g_markup_escape_text ( wcr.class_name, -1 );
+ c->name = g_markup_escape_text ( wcr.instance_name, -1 );
pd->name_len = MAX ( c->name ? g_utf8_strlen ( c->name, -1 ) : 0, pd->name_len );
xcb_icccm_get_wm_class_reply_wipe ( &wcr );
}
@@ -496,7 +496,7 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
current_desktop = 0;
}
- g_debug("Get list from: %d", xcb->screen_nbr);
+ g_debug ( "Get list from: %d", xcb->screen_nbr );
c = xcb_ewmh_get_client_list_stacking ( &xcb->ewmh, xcb->screen_nbr );
xcb_ewmh_get_windows_reply_t clients = { 0, };
if ( xcb_ewmh_get_client_list_stacking_reply ( &xcb->ewmh, c, &clients, NULL ) ) {
@@ -566,29 +566,29 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
char *output = NULL;
if ( pango_parse_markup ( _window_name_list_entry ( names.strings, names.strings_len,
c->wmdesktop ), -1, 0, NULL, &output, NULL, NULL ) ) {
- c->wmdesktopstr = g_strdup ( _window_name_list_entry ( names.strings, names.strings_len, c->wmdesktop ) );
+ c->wmdesktopstr = g_strdup ( _window_name_list_entry ( names.strings, names.strings_len, c->wmdesktop ) );
c->wmdesktopstr_len = g_utf8_strlen ( output, -1 );
- pd->wmdn_len = MAX ( pd->wmdn_len, c->wmdesktopstr_len );
+ pd->wmdn_len = MAX ( pd->wmdn_len, c->wmdesktopstr_len );
g_free ( output );
}
else {
c->wmdesktopstr = g_strdup ( "Invalid name" );
- pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
+ pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
}
}
else {
c->wmdesktopstr = g_markup_escape_text ( _window_name_list_entry ( names.strings, names.strings_len, c->wmdesktop ), -1 );
- pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
+ pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
}
}
else {
c->wmdesktopstr = g_strdup_printf ( "%u", (uint32_t) c->wmdesktop );
- pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
+ pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
}
}
else {
c->wmdesktopstr = g_strdup ( "" );
- pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
+ pd->wmdn_len = MAX ( pd->wmdn_len, g_utf8_strlen ( c->wmdesktopstr, -1 ) );
}
if ( cd && c->wmdesktop != current_desktop ) {
continue;
@@ -727,7 +727,8 @@ static ModeMode window_mode_result ( Mode *sw, int mretv, G_GNUC_UNUSED char **i
retv = RELOAD_DIALOG;
}
g_free ( lf_cmd );
- } else if ( mretv & MENU_CUSTOM_COMMAND ) {
+ }
+ else if ( mretv & MENU_CUSTOM_COMMAND ) {
retv = ( mretv & MENU_LOWER_MASK );
}
return retv;
@@ -756,20 +757,20 @@ static void helper_eval_add_str ( GString *str, const char *input, int l, int ma
// g_utf8 does not work with NULL string.
const char *input_nn = input ? input : "";
// Both l and max_len are in characters, not bytes.
- int spaces = 0;
+ int spaces = 0;
if ( l == 0 ) {
spaces = MAX ( 0, max_len - nc );
g_string_append ( str, input_nn );
}
else {
if ( nc > l ) {
- int bl = g_utf8_offset_to_pointer ( input_nn, l ) - input_nn;
+ int bl = g_utf8_offset_to_pointer ( input_nn, l ) - input_nn;
char *tmp = g_markup_escape_text ( input_nn, bl );
g_string_append ( str, tmp );
g_free ( tmp );
}
else {
- spaces = l - nc;
+ spaces = l - nc;
char *tmp = g_markup_escape_text ( input_nn, -1 );
g_string_append ( str, tmp );
g_free ( tmp );
@@ -811,7 +812,7 @@ static gboolean helper_eval_cb ( const GMatchInfo *info, GString *str, gpointer
else if ( match[1] == 'r' ) {
helper_eval_add_str ( str, d->c->role, l, d->pd->role_len, g_utf8_strlen ( d->c->role, -1 ) );
}
-
+
g_free ( match );
}
return FALSE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 13:02:13 +0000