|
@@ -59,6 +59,7 @@
|
|
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
|
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
|
|
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
|
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
|
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
|
|
+#define TAGSLENGTH (LENGTH(tags))
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
|
|
|
|
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
|
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
|
@@ -116,6 +117,10 @@ enum {
|
|
NetWMWindowType,
|
|
NetWMWindowType,
|
|
NetWMWindowTypeDialog,
|
|
NetWMWindowTypeDialog,
|
|
NetClientList,
|
|
NetClientList,
|
|
|
|
+ NetDesktopNames,
|
|
|
|
+ NetDesktopViewport,
|
|
|
|
+ NetNumberOfDesktops,
|
|
|
|
+ NetCurrentDesktop,
|
|
NetLast
|
|
NetLast
|
|
}; /* EWMH atoms */
|
|
}; /* EWMH atoms */
|
|
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
|
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
|
@@ -308,12 +313,16 @@ static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2,
|
|
static void sendmon(Client *c, Monitor *m);
|
|
static void sendmon(Client *c, Monitor *m);
|
|
static void setborderpx(const Arg *arg);
|
|
static void setborderpx(const Arg *arg);
|
|
static void setclientstate(Client *c, long state);
|
|
static void setclientstate(Client *c, long state);
|
|
|
|
+static void setcurrentdesktop(void);
|
|
|
|
+static void setdesktopnames(void);
|
|
static void setfocus(Client *c);
|
|
static void setfocus(Client *c);
|
|
static void setfullscreen(Client *c, int fullscreen);
|
|
static void setfullscreen(Client *c, int fullscreen);
|
|
static void setlayout(const Arg *arg);
|
|
static void setlayout(const Arg *arg);
|
|
static void setcfact(const Arg *arg);
|
|
static void setcfact(const Arg *arg);
|
|
static void setmfact(const Arg *arg);
|
|
static void setmfact(const Arg *arg);
|
|
|
|
+static void setnumdesktops(void);
|
|
static void setup(void);
|
|
static void setup(void);
|
|
|
|
+static void setviewport(void);
|
|
static void seturgent(Client *c, int urg);
|
|
static void seturgent(Client *c, int urg);
|
|
static void showhide(Client *c);
|
|
static void showhide(Client *c);
|
|
static void sigchld(int unused);
|
|
static void sigchld(int unused);
|
|
@@ -332,6 +341,7 @@ static void toggleview(const Arg *arg);
|
|
static void unfocus(Client *c, int setfocus);
|
|
static void unfocus(Client *c, int setfocus);
|
|
static void unmanage(Client *c, int destroyed);
|
|
static void unmanage(Client *c, int destroyed);
|
|
static void unmapnotify(XEvent *e);
|
|
static void unmapnotify(XEvent *e);
|
|
|
|
+static void updatecurrentdesktop(void);
|
|
static void updatebarpos(Monitor *m);
|
|
static void updatebarpos(Monitor *m);
|
|
static void updatebars(void);
|
|
static void updatebars(void);
|
|
static void updateclientlist(void);
|
|
static void updateclientlist(void);
|
|
@@ -2291,6 +2301,17 @@ void setclientstate(Client *c, long state) {
|
|
PropModeReplace, (unsigned char *)data, 2);
|
|
PropModeReplace, (unsigned char *)data, 2);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+void
|
|
|
|
+setcurrentdesktop(void){
|
|
|
|
+ long data[] = { 0 };
|
|
|
|
+ XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
|
|
|
+}
|
|
|
|
+void setdesktopnames(void){
|
|
|
|
+ XTextProperty text;
|
|
|
|
+ Xutf8TextListToTextProperty(dpy, tags, TAGSLENGTH, XUTF8StringStyle, &text);
|
|
|
|
+ XSetTextProperty(dpy, root, &text, netatom[NetDesktopNames]);
|
|
|
|
+}
|
|
|
|
+
|
|
int sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2,
|
|
int sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2,
|
|
long d3, long d4) {
|
|
long d3, long d4) {
|
|
int n;
|
|
int n;
|
|
@@ -2324,6 +2345,12 @@ int sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2,
|
|
return exists;
|
|
return exists;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+void
|
|
|
|
+setnumdesktops(void){
|
|
|
|
+ long data[] = { TAGSLENGTH };
|
|
|
|
+ XChangeProperty(dpy, root, netatom[NetNumberOfDesktops], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
|
|
|
+}
|
|
|
|
+
|
|
void setfocus(Client *c) {
|
|
void setfocus(Client *c) {
|
|
if (!c->neverfocus) {
|
|
if (!c->neverfocus) {
|
|
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
|
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
|
@@ -2459,6 +2486,10 @@ void setup(void) {
|
|
xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
|
xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
|
xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
|
xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
|
xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
|
xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
|
|
|
+ netatom[NetDesktopViewport] = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False);
|
|
|
|
+ netatom[NetNumberOfDesktops] = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False);
|
|
|
|
+ netatom[NetCurrentDesktop] = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False);
|
|
|
|
+ netatom[NetDesktopNames] = XInternAtom(dpy, "_NET_DESKTOP_NAMES", False);
|
|
/* init cursors */
|
|
/* init cursors */
|
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
|
@@ -2488,6 +2519,10 @@ void setup(void) {
|
|
/* EWMH support per view */
|
|
/* EWMH support per view */
|
|
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
|
|
XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
|
|
PropModeReplace, (unsigned char *)netatom, NetLast);
|
|
PropModeReplace, (unsigned char *)netatom, NetLast);
|
|
|
|
+ setnumdesktops();
|
|
|
|
+ setcurrentdesktop();
|
|
|
|
+ setdesktopnames();
|
|
|
|
+ setviewport();
|
|
XDeleteProperty(dpy, root, netatom[NetClientList]);
|
|
XDeleteProperty(dpy, root, netatom[NetClientList]);
|
|
/* select events */
|
|
/* select events */
|
|
wa.cursor = cursor[CurNormal]->cursor;
|
|
wa.cursor = cursor[CurNormal]->cursor;
|
|
@@ -2499,6 +2534,11 @@ void setup(void) {
|
|
grabkeys();
|
|
grabkeys();
|
|
focus(NULL);
|
|
focus(NULL);
|
|
}
|
|
}
|
|
|
|
+void
|
|
|
|
+setviewport(void){
|
|
|
|
+ long data[] = { 0, 0 };
|
|
|
|
+ XChangeProperty(dpy, root, netatom[NetDesktopViewport], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 2);
|
|
|
|
+}
|
|
|
|
|
|
void seturgent(Client *c, int urg) {
|
|
void seturgent(Client *c, int urg) {
|
|
XWMHints *wmh;
|
|
XWMHints *wmh;
|
|
@@ -2629,6 +2669,7 @@ void toggletag(const Arg *arg) {
|
|
focus(NULL);
|
|
focus(NULL);
|
|
arrange(selmon);
|
|
arrange(selmon);
|
|
}
|
|
}
|
|
|
|
+ updatecurrentdesktop();
|
|
}
|
|
}
|
|
|
|
|
|
void toggleview(const Arg *arg) {
|
|
void toggleview(const Arg *arg) {
|
|
@@ -2640,6 +2681,7 @@ void toggleview(const Arg *arg) {
|
|
focus(NULL);
|
|
focus(NULL);
|
|
arrange(selmon);
|
|
arrange(selmon);
|
|
}
|
|
}
|
|
|
|
+ updatecurrentdesktop();
|
|
}
|
|
}
|
|
|
|
|
|
void unfocus(Client *c, int setfocus) {
|
|
void unfocus(Client *c, int setfocus) {
|
|
@@ -2765,6 +2807,16 @@ void updateclientlist() {
|
|
PropModeAppend, (unsigned char *)&(c->win), 1);
|
|
PropModeAppend, (unsigned char *)&(c->win), 1);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+void updatecurrentdesktop(void){
|
|
|
|
+ long rawdata[] = { selmon->tagset[selmon->seltags] };
|
|
|
|
+ int i=0;
|
|
|
|
+ while(*rawdata >> i+1){
|
|
|
|
+ i++;
|
|
|
|
+ }
|
|
|
|
+ long data[] = { i };
|
|
|
|
+ XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
|
|
|
|
+}
|
|
|
|
+
|
|
int updategeom(void) {
|
|
int updategeom(void) {
|
|
int dirty = 0;
|
|
int dirty = 0;
|
|
|
|
|
|
@@ -3065,6 +3117,7 @@ void view(const Arg *arg) {
|
|
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
|
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
|
focus(NULL);
|
|
focus(NULL);
|
|
arrange(selmon);
|
|
arrange(selmon);
|
|
|
|
+ updatecurrentdesktop();
|
|
}
|
|
}
|
|
|
|
|
|
Client *wintoclient(Window w) {
|
|
Client *wintoclient(Window w) {
|