fix toggle.h stuff
This commit is contained in:
parent
47e657a52e
commit
d6100ede9e
|
@ -8,6 +8,4 @@
|
||||||
#include "statusbar-powerline.c" /* Include powerline status bar */
|
#include "statusbar-powerline.c" /* Include powerline status bar */
|
||||||
#include "title-basic.c" /* Include basic title */
|
#include "title-basic.c" /* Include basic title */
|
||||||
#include "title.c" /* Include title */
|
#include "title.c" /* Include title */
|
||||||
#if USESYSTRAY
|
|
||||||
#include "systray.c" /* Include systray */
|
#include "systray.c" /* Include systray */
|
||||||
#endif
|
|
||||||
|
|
|
@ -7,6 +7,4 @@
|
||||||
#include "statusbar-powerline.h"
|
#include "statusbar-powerline.h"
|
||||||
#include "title-basic.h"
|
#include "title-basic.h"
|
||||||
#include "title.h"
|
#include "title.h"
|
||||||
#if USESYSTRAY
|
|
||||||
#include "systray.h"
|
#include "systray.h"
|
||||||
#endif
|
|
||||||
|
|
|
@ -176,6 +176,7 @@ click_status(Bar *bar, Arg *arg, BarClickArg *a)
|
||||||
int
|
int
|
||||||
click_status_text(Arg *arg, int rel_x, char *text)
|
click_status_text(Arg *arg, int rel_x, char *text)
|
||||||
{
|
{
|
||||||
|
#if USEMOUSE
|
||||||
int i = -1;
|
int i = -1;
|
||||||
int x = 0;
|
int x = 0;
|
||||||
char ch;
|
char ch;
|
||||||
|
@ -194,6 +195,7 @@ click_status_text(Arg *arg, int rel_x, char *text)
|
||||||
clickstatusn = ch;
|
clickstatusn = ch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return ClkStatusText;
|
return ClkStatusText;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#if USESYSTRAY
|
||||||
static Systray *systray = NULL;
|
static Systray *systray = NULL;
|
||||||
static unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
|
static unsigned long systrayorientation = _NET_SYSTEM_TRAY_ORIENTATION_HORZ;
|
||||||
|
|
||||||
|
@ -181,3 +182,22 @@ wintosystrayicon(Window w)
|
||||||
for (i = systray->icons; i && i->win != w; i = i->next);
|
for (i = systray->icons; i && i->win != w; i = i->next);
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
int
|
||||||
|
width_systray(Bar *bar, BarWidthArg *a)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
draw_systray(Bar *bar, BarDrawArg *a)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
click_systray(Bar *bar, Arg *arg, BarClickArg *a)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#if USESYSTRAY
|
||||||
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
||||||
#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
|
#define _NET_SYSTEM_TRAY_ORIENTATION_HORZ 0
|
||||||
|
|
||||||
|
@ -37,3 +38,9 @@ static void resizerequest(XEvent *e);
|
||||||
static void updatesystrayicongeom(Client *i, int w, int h);
|
static void updatesystrayicongeom(Client *i, int w, int h);
|
||||||
static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
||||||
static Client *wintosystrayicon(Window w);
|
static Client *wintosystrayicon(Window w);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* bar integration */
|
||||||
|
static int width_systray(Bar *bar, BarWidthArg *a);
|
||||||
|
static int draw_systray(Bar *bar, BarDrawArg *a);
|
||||||
|
static int click_systray(Bar *bar, Arg *arg, BarClickArg *a);
|
||||||
|
|
11
speedwm.c
11
speedwm.c
|
@ -4357,11 +4357,14 @@ propertynotify(XEvent *e)
|
||||||
if (c == c->mon->sel && !selmon->hidetitle)
|
if (c == c->mon->sel && !selmon->hidetitle)
|
||||||
drawbaritems(c->mon);
|
drawbaritems(c->mon);
|
||||||
}
|
}
|
||||||
|
#if USEWINICON
|
||||||
else if (ev->atom == netatom[NetWMIcon]) {
|
else if (ev->atom == netatom[NetWMIcon]) {
|
||||||
updateicon(c);
|
updateicon(c);
|
||||||
if (c == c->mon->sel)
|
if (c == c->mon->sel)
|
||||||
drawbaritems(c->mon);
|
drawbaritems(c->mon);
|
||||||
} if (ev->atom == netatom[NetWMWindowType])
|
}
|
||||||
|
#endif
|
||||||
|
if (ev->atom == netatom[NetWMWindowType])
|
||||||
updatewindowtype(c);
|
updatewindowtype(c);
|
||||||
if (ev->atom == motifatom)
|
if (ev->atom == motifatom)
|
||||||
updatemotifhints(c);
|
updatemotifhints(c);
|
||||||
|
@ -5159,6 +5162,12 @@ toggleopacity(const Arg *arg) {
|
||||||
for (Client* c = m->clients; c; c = c->next)
|
for (Client* c = m->clients; c; c = c->next)
|
||||||
opacity(c, (fadewindows && c != selmon->sel) ? inactiveopacity : activeopacity);
|
opacity(c, (fadewindows && c != selmon->sel) ? inactiveopacity : activeopacity);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
void
|
||||||
|
toggleopacity(const Arg *arg)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in a new issue