BAR_SYSTRAY_PATCH

[kmarzic]

Hi,

I can not compile using #define BAR_SYSTRAY_PATCH 0 in patches.h.
Without this patch compile is fine.
Maybe I am doing something wrong, so please correct me.
I am getting the following error:

$ cat patches.h | grep "^#define" | grep "1$"
#define BAR_LTSYMBOL_PATCH 1
#define BAR_STATUS_PATCH 1
#define BAR_SYSTRAY_PATCH 1
#define BAR_TAGS_PATCH 1
#define BAR_WINTITLE_PATCH 1
#define BAR_TITLE_LEFT_PAD_PATCH 1
#define TILE_LAYOUT 1
#define MONOCLE_LAYOUT 1
$ make
dwm build options:
CFLAGS   = -std=c99 -pedantic -Wall -Wno-unused-function -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2   -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION="6.3" -DXINERAMA
LDFLAGS  = -L/usr/X11R6/lib -lX11 -lXinerama -lfontconfig -lXft  -lXrender       -lImlib2
CC       = cc
cc -c -std=c99 -pedantic -Wall -Wno-unused-function -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2   -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"6.3\" -DXINERAMA drw.c
cc -c -std=c99 -pedantic -Wall -Wno-unused-function -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2   -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"6.3\" -DXINERAMA dwm.c
In file included from patch/include.h:84,
                 from dwm.c:718:
patch/bar_systray.h:35:13: error: conflicting types for ‘getatomprop’
   35 | static Atom getatomprop(Client *c, Atom prop);
      |             ^~~~~~~~~~~
dwm.c:634:13: note: previous declaration of ‘getatomprop’ was here
  634 | static Atom getatomprop(Client *c, Atom prop, Atom req);
      |             ^~~~~~~~~~~
In file included from patch/include.c:81,
                 from dwm.c:817:
patch/bar_systray.c: In function ‘updatesystrayiconstate’:
patch/bar_systray.c:167:14: error: too many arguments to function ‘getatomprop’
  167 |    !(flags = getatomprop(i, xatom[XembedInfo], xatom[XembedInfo])))
      |              ^~~~~~~~~~~
In file included from patch/include.h:84,
                 from dwm.c:718:
patch/bar_systray.h:35:13: note: declared here
   35 | static Atom getatomprop(Client *c, Atom prop);
      |             ^~~~~~~~~~~
dwm.c: In function ‘applyrules’:
dwm.c:855:13: error: too many arguments to function ‘getatomprop’
  855 |  wintype  = getatomprop(c, netatom[NetWMWindowType], XA_ATOM);
      |             ^~~~~~~~~~~
In file included from patch/include.h:84,
                 from dwm.c:718:
patch/bar_systray.h:35:13: note: declared here
   35 | static Atom getatomprop(Client *c, Atom prop);
      |             ^~~~~~~~~~~
dwm.c: At top level:
dwm.c:2110:1: error: conflicting types for ‘getatomprop’
 2110 | getatomprop(Client *c, Atom prop, Atom req)
      | ^~~~~~~~~~~
In file included from patch/include.h:84,
                 from dwm.c:718:
patch/bar_systray.h:35:13: note: previous declaration of ‘getatomprop’ was here
   35 | static Atom getatomprop(Client *c, Atom prop);
      |             ^~~~~~~~~~~
patch/bar_systray.h:35:13: warning: ‘getatomprop’ used but never defined
make: *** [Makefile:24: dwm.o] Error 1

Best regards

[bakkeby]

Related to changes I pushed yesterday, thought I covered all getatomprop calls but apparently not. Will push a fix shortly.

[bakkeby]

Caused by this declaration in bar_systray.h.

diff --git a/patch/bar_systray.h b/patch/bar_systray.h
index a64b971..092a6ff 100644
--- a/patch/bar_systray.h
+++ b/patch/bar_systray.h
@@ -32,7 +32,6 @@ static int draw_systray(Bar *bar, BarArg *a);
 static int click_systray(Bar *bar, Arg *arg, BarArg *a);

 /* function declarations */
-static Atom getatomprop(Client *c, Atom prop);
 static void removesystrayicon(Client *i);
 static void resizerequest(XEvent *e);
 static void updatesystrayicongeom(Client *i, int w, int h);

Have removed it now. Should compile fine.

[kmarzic]

Hi,
Yes, it is working fine.
Thanks for fixing it.

[bakkeby]

No, thank you for reporting :)