rework include
This commit is contained in:
parent
c3aeedfa24
commit
ab8d95f13d
|
@ -129,14 +129,15 @@ awesome_SOURCES = \
|
|||
common/swindow.c common/swindow.h \
|
||||
widget.c widget.h \
|
||||
ewmh.c ewmh.h \
|
||||
common/list.h structs.h
|
||||
common/list.h structs.h \
|
||||
common/awclient.h
|
||||
awesome_SOURCES += $(LAYOUTS)
|
||||
awesome_SOURCES += $(WIDGETS)
|
||||
awesome_LDADD = $(XFT_LIBS) $(X_LIBS) $(CAIRO_LIBS) $(CONFUSE_LIBS) $(XRANDR_LIBS) $(XINERAMA_LIBS)
|
||||
|
||||
bin_PROGRAMS += awesome-client
|
||||
awesome_client_SOURCES = \
|
||||
awesome-client.c awesome-client.h \
|
||||
awesome-client.c common/awclient.h \
|
||||
common/awesome-version.c common/awesome-version.h \
|
||||
common/awclient.c \
|
||||
common/util.c common/util.h
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
#include "awesome-client.h"
|
||||
#include "common/awclient.h"
|
||||
#include "common/awesome-version.h"
|
||||
#include "common/util.h"
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
#include <X11/extensions/shape.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
|
||||
#include "common/awesome-version.h"
|
||||
#include "config.h"
|
||||
#include "awesome.h"
|
||||
#include "event.h"
|
||||
#include "layout.h"
|
||||
|
@ -49,8 +49,9 @@
|
|||
#include "client.h"
|
||||
#include "focus.h"
|
||||
#include "ewmh.h"
|
||||
#include "awesome-client.h"
|
||||
#include "common/awclient.h"
|
||||
#include "common/util.h"
|
||||
#include "common/awesome-version.h"
|
||||
|
||||
static int (*xerrorxlib) (Display *, XErrorEvent *);
|
||||
static Bool running = True;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
#include "awesome-client.h"
|
||||
#include "common/awclient.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#define CONTROL_UNIX_SOCKET_PATH ".awesome_ctl."
|
||||
|
|
2
config.c
2
config.c
|
@ -25,6 +25,7 @@
|
|||
|
||||
#include <X11/keysym.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "statusbar.h"
|
||||
#include "tag.h"
|
||||
#include "rules.h"
|
||||
|
@ -34,7 +35,6 @@
|
|||
#include "ewmh.h"
|
||||
#include "defconfig.h"
|
||||
#include "layouts/tile.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#define AWESOME_CONFIG_FILE ".awesomerc"
|
||||
|
||||
|
|
1
event.c
1
event.c
|
@ -38,7 +38,6 @@
|
|||
#include "rules.h"
|
||||
#include "layouts/tile.h"
|
||||
#include "layouts/floating.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
1
ewmh.c
1
ewmh.c
|
@ -28,7 +28,6 @@
|
|||
#include "screen.h"
|
||||
#include "client.h"
|
||||
#include "widget.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
2
ewmh.h
2
ewmh.h
|
@ -22,7 +22,7 @@
|
|||
#ifndef AWESOME_EWMH_H
|
||||
#define AWESOME_EWMH_H
|
||||
|
||||
#include "config.h"
|
||||
#include "structs.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
1
focus.c
1
focus.c
|
@ -19,7 +19,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "common/util.h"
|
||||
#include "tag.h"
|
||||
#include "focus.h"
|
||||
#include "client.h"
|
||||
|
|
1
layout.c
1
layout.c
|
@ -33,7 +33,6 @@
|
|||
#include "layouts/max.h"
|
||||
#include "layouts/fibonacci.h"
|
||||
#include "layouts/floating.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
|
@ -112,7 +112,7 @@ _tile(int screen, const Position position)
|
|||
unsigned int mw = 0, mh = 0;
|
||||
int n, i, masterwin = 0, otherwin = 0;
|
||||
int real_ncol = 1, win_by_col = 1, current_col = 0;
|
||||
Area area, geometry;
|
||||
Area area, geometry = { 0, 0, 0, 0, NULL };
|
||||
Client *c;
|
||||
Tag **curtags = tags_get_current(screen);
|
||||
|
||||
|
|
1
mouse.c
1
mouse.c
|
@ -30,7 +30,6 @@
|
|||
#include "client.h"
|
||||
#include "layouts/floating.h"
|
||||
#include "layouts/tile.h"
|
||||
#include "common/util.h"
|
||||
|
||||
#define MOUSEMASK (ButtonPressMask | ButtonReleaseMask | PointerMotionMask)
|
||||
|
||||
|
|
1
rules.c
1
rules.c
|
@ -21,7 +21,6 @@
|
|||
|
||||
#include "rules.h"
|
||||
#include "xutil.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
3
screen.c
3
screen.c
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* screen.c - screen management
|
||||
*
|
||||
* Copyright © 2007 Julien Danjou <julien@danjou.info>
|
||||
* Copyright © 2007-2008 Julien Danjou <julien@danjou.info>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
@ -26,7 +26,6 @@
|
|||
#include "focus.h"
|
||||
#include "client.h"
|
||||
#include "layouts/floating.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
2
screen.h
2
screen.h
|
@ -22,7 +22,7 @@
|
|||
#ifndef AWESOME_SCREEN_H
|
||||
#define AWESOME_SCREEN_H
|
||||
|
||||
#include "config.h"
|
||||
#include "structs.h"
|
||||
|
||||
Area get_screen_area(int, Statusbar *, Padding *);
|
||||
Area get_display_area(int, Statusbar *, Padding *);
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "tag.h"
|
||||
#include "widget.h"
|
||||
#include "window.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
1
tag.c
1
tag.c
|
@ -28,7 +28,6 @@
|
|||
#include "client.h"
|
||||
#include "ewmh.h"
|
||||
#include "widget.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
1
uicb.c
1
uicb.c
|
@ -29,7 +29,6 @@
|
|||
#include "client.h"
|
||||
#include "screen.h"
|
||||
#include "layouts/tile.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
1
widget.c
1
widget.c
|
@ -23,7 +23,6 @@
|
|||
#include "widget.h"
|
||||
#include "statusbar.h"
|
||||
#include "event.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
1
window.c
1
window.c
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include "structs.h"
|
||||
#include "window.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
5
xutil.c
5
xutil.c
|
@ -18,15 +18,14 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/extensions/Xinerama.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "structs.h"
|
||||
#include "xutil.h"
|
||||
#include "screen.h"
|
||||
#include "common/util.h"
|
||||
|
||||
extern AwesomeConf globalconf;
|
||||
|
||||
|
|
Loading…
Reference in New Issue