diff options
| author | Vito Caputo <vcaputo@gnugeneration.com> | 2017-03-08 01:13:17 -0800 |
|---|---|---|
| committer | Vito Caputo <vcaputo@gnugeneration.com> | 2017-03-14 19:41:48 -0700 |
| commit | df9f5f5b92cef88492b647f362c91f281c3b2e3b (patch) | |
| tree | 01af92c2aff68613d124418091bf5c027457d720 | |
| parent | 2c9fe3973a28504e664c5d7c9d990bc2f16c0348 (diff) | |
overlay: rename overlay.[ch] -> overlays.[ch]
In preparation for vwm_overlays_* encapsulation of overlay global state
and general cleanup therein.
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/composite.c | 1 | ||||
| -rw-r--r-- | src/overlays.c (renamed from src/overlay.c) | 3 | ||||
| -rw-r--r-- | src/overlays.h (renamed from src/overlay.h) | 4 | ||||
| -rw-r--r-- | src/xwindow.c | 1 | ||||
| -rw-r--r-- | src/xwindow.h | 2 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7fff59f..6fa77c5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS = libvmon bin_PROGRAMS = vwm -vwm_SOURCES = clickety.c composite.c context.c desktop.c key.c launch.c logo.c overlay.c screen.c vwm.c window.c xevent.c xserver.c xwindow.c clickety.h composite.h context.h desktop.h key.h launch.h list.h logo.h overlay.h screen.h util.h vwm.h window.h xevent.h xserver.h xwindow.h colors.def launchers.def +vwm_SOURCES = clickety.c composite.c context.c desktop.c key.c launch.c logo.c overlays.c screen.c vwm.c window.c xevent.c xserver.c xwindow.c clickety.h composite.h context.h desktop.h key.h launch.h list.h logo.h overlays.h screen.h util.h vwm.h window.h xevent.h xserver.h xwindow.h colors.def launchers.def vwm_LDADD = @VWM_LIBS@ libvmon/libvmon.a vwm_CPPFLAGS = @VWM_CFLAGS@ diff --git a/src/composite.c b/src/composite.c index 79a001c..bdb2b64 100644 --- a/src/composite.c +++ b/src/composite.c @@ -25,6 +25,7 @@ #include <X11/extensions/Xfixes.h> #include <X11/extensions/Xrender.h> +#include "overlays.h" #include "xwindow.h" #include "vwm.h" diff --git a/src/overlay.c b/src/overlays.c index 34802c2..defeae2 100644 --- a/src/overlay.c +++ b/src/overlays.c @@ -28,11 +28,10 @@ #include "composite.h" #include "libvmon/vmon.h" #include "list.h" -#include "overlay.h" +#include "overlays.h" #include "vwm.h" #include "xwindow.h" -/* TODO: move to overlay.h */ #define OVERLAY_MASK_DEPTH 8 /* XXX: 1 would save memory, but Xorg isn't good at it */ #define OVERLAY_MASK_FORMAT PictStandardA8 #define OVERLAY_FIXED_FONT "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1" diff --git a/src/overlay.h b/src/overlays.h index dd60319..bfcf0da 100644 --- a/src/overlay.h +++ b/src/overlays.h @@ -1,5 +1,5 @@ -#ifndef _OVERLAY_H -#define _OVERLAY_H +#ifndef _OVERLAYS_H +#define _OVERLAYS_H #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> diff --git a/src/xwindow.c b/src/xwindow.c index 76d758e..f19180e 100644 --- a/src/xwindow.c +++ b/src/xwindow.c @@ -23,6 +23,7 @@ #include "composite.h" #include "list.h" +#include "overlays.h" #include "vwm.h" #include "window.h" #include "xwindow.h" diff --git a/src/xwindow.h b/src/xwindow.h index f3be681..c72abc4 100644 --- a/src/xwindow.h +++ b/src/xwindow.h @@ -7,7 +7,7 @@ #include "libvmon/vmon.h" #include "list.h" -#include "overlay.h" +#include "overlays.h" typedef struct _vwm_t vwm_t; typedef struct _vwm_window_t vwm_window_t; |