Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

Cleanup display-x11 includes

Browse Source 
Signed-off-by: Tin <tin.svagelj@live.com>
This commit is contained in:
Tin 2023-11-08 05:44:18 +01:00 committed by Brenden Matthews
parent c4ef5f5e8c
commit 5d5e235467
No known key found for this signature in database
GPG Key ID: 137B7AC2BDFD8DF0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/display-x11.cc
View File

@ -24,12 +24,12 @@
* *
*/ */
#include <X11/X.h>
#include <config.h> #include <config.h>
#include <cstdint>
#include "logging.h"
#ifdef BUILD_X11 #ifdef BUILD_X11
#include <x11.h>
#include <X11/X.h>
#include "display-x11.hh"
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wvariadic-macros" #pragma GCC diagnostic ignored "-Wvariadic-macros"
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -37,13 +37,12 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif /* BUILD_XFT */ #endif /* BUILD_XFT */
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#include "x11.h"
#ifdef BUILD_XDAMAGE #ifdef BUILD_XDAMAGE
#include <X11/extensions/Xdamage.h> #include <X11/extensions/Xdamage.h>
#endif /* BUILD_XDAMAGE */ #endif /* BUILD_XDAMAGE */
#include "fonts.h" #include "fonts.h"
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include <imlib2.h>
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#ifdef BUILD_MOUSE_EVENTS #ifdef BUILD_MOUSE_EVENTS
#include "mouse-events.h" #include "mouse-events.h"
@ -53,18 +52,17 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <unordered_map> #include <unordered_map>
#include <cstdint>
#include "colours.h" #include "colours.h"
#include "conky.h" #include "conky.h"
#include "display-x11.hh"
#include "gui.h" #include "gui.h"
#include "llua.h" #include "llua.h"
#include "logging.h"
/* TODO: cleanup global namespace */ /* TODO: cleanup global namespace */
#ifdef BUILD_X11 #ifdef BUILD_X11
#include "x11.h"
// TODO: cleanup externs (move to conky.h ?) // TODO: cleanup externs (move to conky.h ?)
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
extern int fixed_size, fixed_pos; extern int fixed_size, fixed_pos;