summaryrefslogtreecommitdiffstats
path: root/source/dialogs
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2016-03-20 10:16:55 +0100
committerDave Davenport <qball@gmpclient.org>2016-03-20 10:16:55 +0100
commitd36ae81408385bb4278ab3af2aad127d815f2421 (patch)
tree11dcbf7d28a654bda8ed1eec24e6614dbd33632b /source/dialogs
parenta2869ef39d1e78c70877df27dc9a6ebc66962842 (diff)
Fix positioning window on top of window.
Diffstat (limited to 'source/dialogs')
-rw-r--r--source/dialogs/combi.c2
-rw-r--r--source/dialogs/dmenu.c6
-rw-r--r--source/dialogs/script.c10
-rw-r--r--source/dialogs/window.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/source/dialogs/combi.c b/source/dialogs/combi.c
index 3dc1a773..3c911736 100644
--- a/source/dialogs/combi.c
+++ b/source/dialogs/combi.c
@@ -53,7 +53,7 @@ static void combi_mode_parse_switchers ( Mode *sw )
char *savept = NULL;
// Make a copy, as strtok will modify it.
char *switcher_str = g_strdup ( config.combi_modi );
- const char * const sep = ",";
+ const char * const sep = ",";
// Split token on ','. This modifies switcher_str.
for ( char *token = strtok_r ( switcher_str, sep, &savept ); token != NULL;
token = strtok_r ( NULL, sep, &savept ) ) {
diff --git a/source/dialogs/dmenu.c b/source/dialogs/dmenu.c
index 89352bba..4f87bcc2 100644
--- a/source/dialogs/dmenu.c
+++ b/source/dialogs/dmenu.c
@@ -122,8 +122,8 @@ static unsigned int dmenu_mode_get_num_entries ( const Mode *sw )
static void parse_pair ( char *input, struct range_pair *item )
{
- int index = 0;
- const char * const sep = "-";
+ int index = 0;
+ const char * const sep = "-";
for ( char *token = strsep ( &input, sep ); token != NULL; token = strsep ( &input, sep ) ) {
if ( index == 0 ) {
item->start = item->stop = (unsigned int) strtoul ( token, NULL, 10 );
@@ -146,7 +146,7 @@ static void parse_ranges ( char *input, struct range_pair **list, unsigned int *
if ( input == NULL ) {
return;
}
- const char *const sep =",";
+ const char *const sep = ",";
for ( char *token = strtok_r ( input, sep, &endp ); token != NULL; token = strtok_r ( NULL, sep, &endp ) ) {
// Make space.
*list = g_realloc ( ( *list ), ( ( *length ) + 1 ) * sizeof ( struct range_pair ) );
diff --git a/source/dialogs/script.c b/source/dialogs/script.c
index ef2c8d45..928a1dd5 100644
--- a/source/dialogs/script.c
+++ b/source/dialogs/script.c
@@ -179,11 +179,11 @@ static int script_is_not_ascii ( const Mode *sw, unsigned int index )
#include "mode-private.h"
Mode *script_switcher_parse_setup ( const char *str )
{
- Mode *sw = g_malloc0 ( sizeof ( *sw ) );
- char *endp = NULL;
- char *parse = g_strdup ( str );
- unsigned int index = 0;
- const char *const sep = ":";
+ Mode *sw = g_malloc0 ( sizeof ( *sw ) );
+ char *endp = NULL;
+ char *parse = g_strdup ( str );
+ unsigned int index = 0;
+ const char *const sep = ":";
for ( char *token = strtok_r ( parse, sep, &endp ); token != NULL; token = strtok_r ( NULL, sep, &endp ) ) {
if ( index == 0 ) {
g_strlcpy ( sw->name, token, 32 );
diff --git a/source/dialogs/window.c b/source/dialogs/window.c
index 5c34fd0a..b4f4be30 100644
--- a/source/dialogs/window.c
+++ b/source/dialogs/window.c
@@ -265,13 +265,13 @@ static client* window_client ( xcb_window_t win )
xcb_ewmh_get_atoms_reply_t states;
if ( xcb_ewmh_get_wm_state_reply ( &xcb->ewmh, cky, &states, NULL ) ) {
c->states = MIN ( CLIENTSTATE, states.atoms_len );
- memcpy ( c->state, states.atoms, MIN ( CLIENTSTATE, states.atoms_len )*sizeof(xcb_atom_t) );
+ memcpy ( c->state, states.atoms, MIN ( CLIENTSTATE, states.atoms_len ) * sizeof ( xcb_atom_t ) );
xcb_ewmh_get_atoms_reply_wipe ( &states );
}
cky = xcb_ewmh_get_wm_window_type ( &xcb->ewmh, win );
if ( xcb_ewmh_get_wm_window_type_reply ( &xcb->ewmh, cky, &states, NULL ) ) {
c->window_types = MIN ( CLIENTWINDOWTYPE, states.atoms_len );
- memcpy ( c->window_type, states.atoms, MIN ( CLIENTWINDOWTYPE, states.atoms_len )*sizeof(xcb_atom_t) );
+ memcpy ( c->window_type, states.atoms, MIN ( CLIENTWINDOWTYPE, states.atoms_len ) * sizeof ( xcb_atom_t ) );
xcb_ewmh_get_atoms_reply_wipe ( &states );
}
@@ -419,7 +419,7 @@ static void _window_mode_load_data ( Mode *sw, unsigned int cd )
&& !client_has_window_type ( c, xcb->ewmh._NET_WM_WINDOW_TYPE_DESKTOP )
&& !client_has_state ( c, xcb->ewmh._NET_WM_STATE_SKIP_PAGER )
&& !client_has_state ( c, xcb->ewmh._NET_WM_STATE_SKIP_TASKBAR ) ) {
- classfield = MAX ( classfield, (c->class != NULL)?(strlen ( c->class )):0 );
+ classfield = MAX ( classfield, ( c->class != NULL ) ? ( strlen ( c->class ) ) : 0 );
if ( client_has_state ( c, xcb->ewmh._NET_WM_STATE_DEMANDS_ATTENTION ) ) {
c->demands = TRUE;