On Sun, Dec 21, 2014 at 07:01:41AM -0800, Thomas Adam wrote:
> commit 2a10bb4b172d77f9f7651ac58687648f3f4c5e08
> Author: Thomas Adam <[email protected]>
> Date: Sun Dec 21 14:21:04 2014 +0000
>
> ewmhInfo: move into struct monitor, update callers
>
> Remove the extern ewmhc definition, moving it into struct monitor so that
> it can
> be referenced on a per-monitor basis.
>
> In doing this, and because certain callers assumed ewmhc was global,
> rework them
> to get the values out the appropriate monitor.
> ---
> libs/FScreen.h | 7 +++++
Can this be done in a different way please?
> diff --git a/libs/FScreen.h b/libs/FScreen.h
> index 624d8ab..5129b1a 100644
> --- a/libs/FScreen.h
> +++ b/libs/FScreen.h
> @@ -2,10 +2,14 @@
> #ifndef MVWMLIB_FSCRREN_H
> #define MVWMLIB_FSCRREN_H
>
> +/* For CARD32 */
> +#include <X11/Xproto.h>
> +
> #include "mvwm/mvwm.h"
> #include "mvwm/execcontext.h"
> #include "mvwm/misc.h"
> #include "mvwm/screen.h"
> +#include "mvwm/ewmh_intern.h"
I've spent a lot of time to remove the include directives from the
library header files in the dv/new-parser branch. Such
dependencies make it very difficult to include the headers from
other places. My policy has always been (and will always be) to
not include *anything* in a header file (except if the header file
was explicitly written to include other headers and does nothing
else).
> typedef union
> {
> @@ -41,6 +45,9 @@ struct monitor {
> */
> DesktopsInfo *Desktops;
>
> + /* Information about EWMH */
> + ewmhInfo ewmhc;
Yuck! Please don't include typed from the core in the library.
For reference, I've pushed the broken merge of dv/new-parser to
the master onto the new branch dv/parser-2. I'd like to work on
that branch, but before I can do that this dependency issue needs
to get fixed.
Ciao
Dominik ^_^ ^_^
--
Dominik Vogt
