Fix a couple of warnings.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
This commit is contained in:
parent
eade93c4c8
commit
a4953d13d5
26
awesome.c
26
awesome.c
|
@ -75,7 +75,7 @@ typedef struct
|
||||||
/** Scan X to find windows to manage
|
/** Scan X to find windows to manage
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
scan()
|
scan(void)
|
||||||
{
|
{
|
||||||
int i, screen, real_screen, tree_c_len;
|
int i, screen, real_screen, tree_c_len;
|
||||||
const int screen_max = xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
const int screen_max = xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
||||||
|
@ -328,15 +328,17 @@ main(int argc, char **argv)
|
||||||
globalconf.evenths = xcb_alloc_event_handlers(globalconf.connection);
|
globalconf.evenths = xcb_alloc_event_handlers(globalconf.connection);
|
||||||
xutil_set_error_handler_catch_all(globalconf.evenths, xerrorstart, NULL);
|
xutil_set_error_handler_catch_all(globalconf.evenths, xerrorstart, NULL);
|
||||||
|
|
||||||
const uint32_t select_input_val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
|
|
||||||
|
|
||||||
for(screen_nbr = 0;
|
for(screen_nbr = 0;
|
||||||
screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
||||||
screen_nbr++)
|
screen_nbr++)
|
||||||
|
{
|
||||||
|
const uint32_t select_input_val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
|
||||||
|
|
||||||
/* This causes an error if some other window manager is running */
|
/* This causes an error if some other window manager is running */
|
||||||
xcb_change_window_attributes(globalconf.connection,
|
xcb_change_window_attributes(globalconf.connection,
|
||||||
xcb_aux_get_screen(globalconf.connection, screen_nbr)->root,
|
xcb_aux_get_screen(globalconf.connection, screen_nbr)->root,
|
||||||
XCB_CW_EVENT_MASK, &select_input_val);
|
XCB_CW_EVENT_MASK, &select_input_val);
|
||||||
|
}
|
||||||
|
|
||||||
/* Need to xcb_flush to validate error handler */
|
/* Need to xcb_flush to validate error handler */
|
||||||
xcb_aux_sync(globalconf.connection);
|
xcb_aux_sync(globalconf.connection);
|
||||||
|
@ -394,20 +396,20 @@ main(int argc, char **argv)
|
||||||
eprint("failed to load any configuration file");
|
eprint("failed to load any configuration file");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* select for events */
|
|
||||||
const uint32_t change_win_vals[] =
|
|
||||||
{
|
|
||||||
XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY
|
|
||||||
| XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW
|
|
||||||
| XCB_EVENT_MASK_STRUCTURE_NOTIFY,
|
|
||||||
globalconf.cursor[CurNormal]
|
|
||||||
};
|
|
||||||
|
|
||||||
/* do this only for real screen */
|
/* do this only for real screen */
|
||||||
for(screen_nbr = 0;
|
for(screen_nbr = 0;
|
||||||
screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
screen_nbr < xcb_setup_roots_length(xcb_get_setup(globalconf.connection));
|
||||||
screen_nbr++)
|
screen_nbr++)
|
||||||
{
|
{
|
||||||
|
/* select for events */
|
||||||
|
const uint32_t change_win_vals[] =
|
||||||
|
{
|
||||||
|
XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY
|
||||||
|
| XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW
|
||||||
|
| XCB_EVENT_MASK_STRUCTURE_NOTIFY,
|
||||||
|
globalconf.cursor[CurNormal]
|
||||||
|
};
|
||||||
|
|
||||||
xcb_change_window_attributes(globalconf.connection,
|
xcb_change_window_attributes(globalconf.connection,
|
||||||
xcb_aux_get_screen(globalconf.connection, screen_nbr)->root,
|
xcb_aux_get_screen(globalconf.connection, screen_nbr)->root,
|
||||||
XCB_CW_EVENT_MASK | XCB_CW_CURSOR,
|
XCB_CW_EVENT_MASK | XCB_CW_CURSOR,
|
||||||
|
|
|
@ -101,12 +101,14 @@
|
||||||
\
|
\
|
||||||
static inline void prefix##_list_swap(type **list, type *item1, type *item2) \
|
static inline void prefix##_list_swap(type **list, type *item1, type *item2) \
|
||||||
{ \
|
{ \
|
||||||
|
type *i1n, *i2n, *i1p, *i2p; \
|
||||||
|
\
|
||||||
if(!item1 || !item2) return; \
|
if(!item1 || !item2) return; \
|
||||||
\
|
\
|
||||||
type *i1n = item1->next; \
|
i1n = item1->next; \
|
||||||
type *i2n = item2->next; \
|
i2n = item2->next; \
|
||||||
type *i1p = item1->prev; \
|
i1p = item1->prev; \
|
||||||
type *i2p = item2->prev; \
|
i2p = item2->prev; \
|
||||||
\
|
\
|
||||||
if(item1 == i2n) \
|
if(item1 == i2n) \
|
||||||
{ \
|
{ \
|
||||||
|
|
Loading…
Reference in New Issue