Compare commits
No commits in common. "2e819b2be0521dd71010e0a5700dc8980212f0b9" and "85fe518c1af5eb43f222f4d8579e4814ed769f3b" have entirely different histories.
2e819b2be0
...
85fe518c1a
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +0,0 @@
|
|||||||
*.o
|
|
||||||
*.orig
|
|
||||||
*.rej
|
|
||||||
dwm
|
|
||||||
61
config.def.h
61
config.def.h
@ -1,23 +1,21 @@
|
|||||||
/* See LICENSE file for copyright and license details. */
|
/* See LICENSE file for copyright and license details. */
|
||||||
|
|
||||||
/* appearance */
|
/* appearance */
|
||||||
static unsigned int borderpx = 1; /* border pixel of windows */
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
static unsigned int snap = 32; /* snap pixel */
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
static int showbar = 1; /* 0 means no bar */
|
static const int showbar = 1; /* 0 means no bar */
|
||||||
static int topbar = 1; /* 0 means bottom bar */
|
static const int topbar = 1; /* 0 means bottom bar */
|
||||||
static char font[] = "monospace:size=10";
|
static const char *fonts[] = { "monospace:size=10" };
|
||||||
static char dmenufont[] = "monospace:size=10";
|
static const char dmenufont[] = "monospace:size=10";
|
||||||
static const char *fonts[] = { font };
|
static const char col_gray1[] = "#222222";
|
||||||
static char normbgcolor[] = "#222222";
|
static const char col_gray2[] = "#444444";
|
||||||
static char normbordercolor[] = "#444444";
|
static const char col_gray3[] = "#bbbbbb";
|
||||||
static char normfgcolor[] = "#bbbbbb";
|
static const char col_gray4[] = "#eeeeee";
|
||||||
static char selfgcolor[] = "#eeeeee";
|
static const char col_cyan[] = "#005577";
|
||||||
static char selbordercolor[] = "#005577";
|
static const char *colors[][3] = {
|
||||||
static char selbgcolor[] = "#005577";
|
/* fg bg border */
|
||||||
static char *colors[][3] = {
|
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
||||||
/* fg bg border */
|
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
|
||||||
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
|
|
||||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* tagging */
|
/* tagging */
|
||||||
@ -34,9 +32,9 @@ static const Rule rules[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* layout(s) */
|
/* layout(s) */
|
||||||
static float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||||
static int nmaster = 1; /* number of clients in master area */
|
static const int nmaster = 1; /* number of clients in master area */
|
||||||
static int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
||||||
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
||||||
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
|
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
|
||||||
|
|
||||||
@ -60,30 +58,9 @@ static const Layout layouts[] = {
|
|||||||
|
|
||||||
/* commands */
|
/* commands */
|
||||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
||||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
|
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
|
||||||
static const char *termcmd[] = { "st", NULL };
|
static const char *termcmd[] = { "st", NULL };
|
||||||
|
|
||||||
/*
|
|
||||||
* Xresources preferences to load at startup
|
|
||||||
*/
|
|
||||||
ResourcePref resources[] = {
|
|
||||||
{ "font", STRING, &font },
|
|
||||||
{ "dmenufont", STRING, &dmenufont },
|
|
||||||
{ "normbgcolor", STRING, &normbgcolor },
|
|
||||||
{ "normbordercolor", STRING, &normbordercolor },
|
|
||||||
{ "normfgcolor", STRING, &normfgcolor },
|
|
||||||
{ "selbgcolor", STRING, &selbgcolor },
|
|
||||||
{ "selbordercolor", STRING, &selbordercolor },
|
|
||||||
{ "selfgcolor", STRING, &selfgcolor },
|
|
||||||
{ "borderpx", INTEGER, &borderpx },
|
|
||||||
{ "snap", INTEGER, &snap },
|
|
||||||
{ "showbar", INTEGER, &showbar },
|
|
||||||
{ "topbar", INTEGER, &topbar },
|
|
||||||
{ "nmaster", INTEGER, &nmaster },
|
|
||||||
{ "resizehints", INTEGER, &resizehints },
|
|
||||||
{ "mfact", FLOAT, &mfact },
|
|
||||||
};
|
|
||||||
|
|
||||||
static const Key keys[] = {
|
static const Key keys[] = {
|
||||||
/* modifier key function argument */
|
/* modifier key function argument */
|
||||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||||
|
|||||||
156
config.h
156
config.h
@ -1,156 +0,0 @@
|
|||||||
/* See LICENSE file for copyright and license details. */
|
|
||||||
|
|
||||||
/* Constants */
|
|
||||||
#define TERMINAL "alacritty"
|
|
||||||
#define TERMCLASS "Alacritty"
|
|
||||||
#define BROWSER "firefox"
|
|
||||||
|
|
||||||
/* appearance */
|
|
||||||
static unsigned int borderpx = 3; /* border pixel of windows */
|
|
||||||
static unsigned int snap = 32; /* snap pixel */
|
|
||||||
static int swallowfloating = 0; /* 1 means swallow floating windows by default */
|
|
||||||
static int showbar = 1; /* 0 means no bar */
|
|
||||||
static int topbar = 1; /* 0 means bottom bar */
|
|
||||||
static const char *fonts[] = { "IntoneMonoNerdFontMono:size=13", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true", "font-awesome" };
|
|
||||||
static char font[] = "IntoneMonoNerdFontMono:size=13";
|
|
||||||
static char dmenufont[] = "IntoneMonoNerdFontMono:size=13";
|
|
||||||
static char normbgcolor[] = "#222222";
|
|
||||||
static char normbordercolor[] = "#444444";
|
|
||||||
static char normfgcolor[] = "#bbbbbb";
|
|
||||||
static char selfgcolor[] = "#eeeeee";
|
|
||||||
static char selbordercolor[] = "#770000";
|
|
||||||
static char selbgcolor[] = "#005577";
|
|
||||||
static char *colors[][3] = {
|
|
||||||
/* fg bg border */
|
|
||||||
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
|
|
||||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* tagging */
|
|
||||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
||||||
|
|
||||||
static const Rule rules[] = {
|
|
||||||
/* xprop(1):
|
|
||||||
* WM_CLASS(STRING) = instance, class
|
|
||||||
* WM_NAME(STRING) = title
|
|
||||||
*/
|
|
||||||
/* class instance title tags mask isfloating monitor */
|
|
||||||
{ "Gimp", NULL, NULL, 0, 1, -1 },
|
|
||||||
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* layout(s) */
|
|
||||||
static float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
|
||||||
static int nmaster = 1; /* number of clients in master area */
|
|
||||||
static int resizehints = 0; /* 1 means respect size hints in tiled resizals */
|
|
||||||
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
|
||||||
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
|
|
||||||
static const Layout layouts[] = {
|
|
||||||
/* symbo"kdeconnectd",l arrange function */
|
|
||||||
{ "[]=", tile }, /* Default: Master on left, slaves on right */
|
|
||||||
//{ "TTT", bstack }, /* Master on top, slaves on bottom */
|
|
||||||
//{ "[@]", spiral }, /* Fibonacci spiral */
|
|
||||||
//{ "[\\]", dwindle }, /* Decreasing in size right and leftward */
|
|
||||||
//{ "[D]", deck }, /* Master on left, slaves in monocle-like mode on right */
|
|
||||||
{ "[M]", monocle }, /* All windows on top of eachother */
|
|
||||||
//{ "|M|", centeredmaster }, /* Master in middle, slaves on sides */
|
|
||||||
//{ ">M>", centeredfloatingmaster }, /* Same but master floats */
|
|
||||||
//{ "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
//{ NULL, NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
#define MODKEY Mod4Mask
|
|
||||||
#define ALTKEY Mod1Mask
|
|
||||||
#define TAGKEYS(KEY,TAG) \
|
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
|
||||||
|
|
||||||
/* commands */
|
|
||||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
|
||||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
|
|
||||||
static const char *termcmd[] = { TERMINAL, NULL };
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Xresources preferences to load at startup
|
|
||||||
*/
|
|
||||||
ResourcePref resources[] = {
|
|
||||||
{ "font", STRING, &font },
|
|
||||||
{ "dmenufont", STRING, &dmenufont },
|
|
||||||
{ "normbgcolor", STRING, &normbgcolor },
|
|
||||||
{ "normbordercolor", STRING, &normbordercolor },
|
|
||||||
{ "normfgcolor", STRING, &normfgcolor },
|
|
||||||
{ "selbgcolor", STRING, &selbgcolor },
|
|
||||||
{ "selbordercolor", STRING, &selbordercolor },
|
|
||||||
{ "selfgcolor", STRING, &selfgcolor },
|
|
||||||
{ "borderpx", INTEGER, &borderpx },
|
|
||||||
{ "snap", INTEGER, &snap },
|
|
||||||
{ "showbar", INTEGER, &showbar },
|
|
||||||
{ "topbar", INTEGER, &topbar },
|
|
||||||
{ "nmaster", INTEGER, &nmaster },
|
|
||||||
{ "resizehints", INTEGER, &resizehints },
|
|
||||||
{ "mfact", FLOAT, &mfact },
|
|
||||||
};
|
|
||||||
|
|
||||||
static const Key keys[] = {
|
|
||||||
/* modifier key function argument */
|
|
||||||
{ MODKEY, XK_r, spawn, {.v = dmenucmd } },
|
|
||||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
|
||||||
{ MODKEY, XK_b, togglebar, {0} },
|
|
||||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
||||||
{ MODKEY, XK_Tab, view, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */
|
|
||||||
//{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */
|
|
||||||
//{ MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */
|
|
||||||
//{ MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */
|
|
||||||
//{ MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */
|
|
||||||
//{ MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */
|
|
||||||
//{ MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */
|
|
||||||
//{ MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */
|
|
||||||
{ MODKEY, XK_o, incnmaster, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_backslash, view, {0} },
|
|
||||||
//{ MODKEY, XK_f, togglefullscr, {0} },
|
|
||||||
{ MODKEY, XK_period, focusmon, {.i = -1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = -1 } },
|
|
||||||
{ MODKEY, XK_comma, focusmon, {.i = +1 } },
|
|
||||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = +1 } },
|
|
||||||
{ MODKEY, XK_space, zoom, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
|
||||||
TAGKEYS( XK_1, 0)
|
|
||||||
TAGKEYS( XK_2, 1)
|
|
||||||
TAGKEYS( XK_3, 2)
|
|
||||||
TAGKEYS( XK_4, 3)
|
|
||||||
TAGKEYS( XK_5, 4)
|
|
||||||
TAGKEYS( XK_6, 5)
|
|
||||||
TAGKEYS( XK_7, 6)
|
|
||||||
TAGKEYS( XK_8, 7)
|
|
||||||
TAGKEYS( XK_9, 8)
|
|
||||||
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* button definitions */
|
|
||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
|
||||||
static const Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
|
||||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
|
||||||
{ ClkTagBar, 0, Button1, view, {0} },
|
|
||||||
{ ClkTagBar, 0, Button3, toggleview, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
||||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
||||||
};
|
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# dwm version
|
# dwm version
|
||||||
VERSION = 6.8
|
VERSION = 6.7
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
|||||||
2
drw.c
2
drw.c
@ -180,7 +180,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
|
|||||||
|
|
||||||
/* Create color schemes. */
|
/* Create color schemes. */
|
||||||
Clr *
|
Clr *
|
||||||
drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount)
|
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
Clr *ret;
|
Clr *ret;
|
||||||
|
|||||||
2
drw.h
2
drw.h
@ -41,7 +41,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
|
|||||||
/* Colorscheme abstraction */
|
/* Colorscheme abstraction */
|
||||||
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
|
||||||
void drw_clr_free(Drw *drw, Clr *c);
|
void drw_clr_free(Drw *drw, Clr *c);
|
||||||
Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount);
|
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
|
||||||
void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount);
|
void drw_scm_free(Drw *drw, Clr *scm, size_t clrcount);
|
||||||
|
|
||||||
/* Cursor abstraction */
|
/* Cursor abstraction */
|
||||||
|
|||||||
100
dwm.c
100
dwm.c
@ -36,7 +36,6 @@
|
|||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xproto.h>
|
#include <X11/Xproto.h>
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
#include <X11/Xresource.h>
|
|
||||||
#ifdef XINERAMA
|
#ifdef XINERAMA
|
||||||
#include <X11/extensions/Xinerama.h>
|
#include <X11/extensions/Xinerama.h>
|
||||||
#endif /* XINERAMA */
|
#endif /* XINERAMA */
|
||||||
@ -141,19 +140,6 @@ typedef struct {
|
|||||||
int monitor;
|
int monitor;
|
||||||
} Rule;
|
} Rule;
|
||||||
|
|
||||||
/* Xresources preferences */
|
|
||||||
enum resource_type {
|
|
||||||
STRING = 0,
|
|
||||||
INTEGER = 1,
|
|
||||||
FLOAT = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
char *name;
|
|
||||||
enum resource_type type;
|
|
||||||
void *dst;
|
|
||||||
} ResourcePref;
|
|
||||||
|
|
||||||
/* function declarations */
|
/* function declarations */
|
||||||
static void applyrules(Client *c);
|
static void applyrules(Client *c);
|
||||||
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
||||||
@ -246,8 +232,6 @@ static int xerror(Display *dpy, XErrorEvent *ee);
|
|||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
static void zoom(const Arg *arg);
|
static void zoom(const Arg *arg);
|
||||||
static void load_xresources(void);
|
|
||||||
static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
|
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
@ -456,7 +440,7 @@ buttonpress(XEvent *e)
|
|||||||
arg.ui = 1 << i;
|
arg.ui = 1 << i;
|
||||||
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
||||||
click = ClkLtSymbol;
|
click = ClkLtSymbol;
|
||||||
else if (ev->x > selmon->ww - (int)TEXTW(stext) + lrpad - 2)
|
else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
||||||
click = ClkStatusText;
|
click = ClkStatusText;
|
||||||
else
|
else
|
||||||
click = ClkWinTitle;
|
click = ClkWinTitle;
|
||||||
@ -879,15 +863,15 @@ focusstack(const Arg *arg)
|
|||||||
Atom
|
Atom
|
||||||
getatomprop(Client *c, Atom prop)
|
getatomprop(Client *c, Atom prop)
|
||||||
{
|
{
|
||||||
int format;
|
int di;
|
||||||
unsigned long nitems, dl;
|
unsigned long dl;
|
||||||
unsigned char *p = NULL;
|
unsigned char *p = NULL;
|
||||||
Atom da, atom = None;
|
Atom da, atom = None;
|
||||||
|
|
||||||
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||||
&da, &format, &nitems, &dl, &p) == Success && p) {
|
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||||
if (nitems > 0 && format == 32)
|
if (dl > 0)
|
||||||
atom = *(long *)p;
|
atom = *(Atom *)p;
|
||||||
XFree(p);
|
XFree(p);
|
||||||
}
|
}
|
||||||
return atom;
|
return atom;
|
||||||
@ -913,10 +897,10 @@ getstate(Window w)
|
|||||||
Atom real;
|
Atom real;
|
||||||
|
|
||||||
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
|
if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
|
||||||
&real, &format, &n, &extra, &p) != Success)
|
&real, &format, &n, &extra, (unsigned char **)&p) != Success)
|
||||||
return -1;
|
return -1;
|
||||||
if (n != 0 && format == 32)
|
if (n != 0)
|
||||||
result = *(long *)p;
|
result = *p;
|
||||||
XFree(p);
|
XFree(p);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@ -1445,8 +1429,6 @@ sendmon(Client *c, Monitor *m)
|
|||||||
c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
|
c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
|
||||||
attach(c);
|
attach(c);
|
||||||
attachstack(c);
|
attachstack(c);
|
||||||
if (c->isfullscreen)
|
|
||||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
|
||||||
focus(NULL);
|
focus(NULL);
|
||||||
arrange(NULL);
|
arrange(NULL);
|
||||||
}
|
}
|
||||||
@ -1488,10 +1470,12 @@ sendevent(Client *c, Atom proto)
|
|||||||
void
|
void
|
||||||
setfocus(Client *c)
|
setfocus(Client *c)
|
||||||
{
|
{
|
||||||
if (!c->neverfocus)
|
if (!c->neverfocus) {
|
||||||
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
|
||||||
XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
|
XChangeProperty(dpy, root, netatom[NetActiveWindow],
|
||||||
PropModeReplace, (unsigned char *)&c->win, 1);
|
XA_WINDOW, 32, PropModeReplace,
|
||||||
|
(unsigned char *) &(c->win), 1);
|
||||||
|
}
|
||||||
sendevent(c, wmatom[WMTakeFocus]);
|
sendevent(c, wmatom[WMTakeFocus]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2156,60 +2140,6 @@ zoom(const Arg *arg)
|
|||||||
pop(c);
|
pop(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
|
|
||||||
{
|
|
||||||
char *sdst = NULL;
|
|
||||||
int *idst = NULL;
|
|
||||||
float *fdst = NULL;
|
|
||||||
|
|
||||||
sdst = dst;
|
|
||||||
idst = dst;
|
|
||||||
fdst = dst;
|
|
||||||
|
|
||||||
char fullname[256];
|
|
||||||
char *type;
|
|
||||||
XrmValue ret;
|
|
||||||
|
|
||||||
snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name);
|
|
||||||
fullname[sizeof(fullname) - 1] = '\0';
|
|
||||||
|
|
||||||
XrmGetResource(db, fullname, "*", &type, &ret);
|
|
||||||
if (!(ret.addr == NULL || strncmp("String", type, 64)))
|
|
||||||
{
|
|
||||||
switch (rtype) {
|
|
||||||
case STRING:
|
|
||||||
strcpy(sdst, ret.addr);
|
|
||||||
break;
|
|
||||||
case INTEGER:
|
|
||||||
*idst = strtoul(ret.addr, NULL, 10);
|
|
||||||
break;
|
|
||||||
case FLOAT:
|
|
||||||
*fdst = strtof(ret.addr, NULL);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
load_xresources(void)
|
|
||||||
{
|
|
||||||
Display *display;
|
|
||||||
char *resm;
|
|
||||||
XrmDatabase db;
|
|
||||||
ResourcePref *p;
|
|
||||||
|
|
||||||
display = XOpenDisplay(NULL);
|
|
||||||
resm = XResourceManagerString(display);
|
|
||||||
if (!resm)
|
|
||||||
return;
|
|
||||||
|
|
||||||
db = XrmGetStringDatabase(resm);
|
|
||||||
for (p = resources; p < resources + LENGTH(resources); p++)
|
|
||||||
resource_load(db, p->name, p->type, p->dst);
|
|
||||||
XCloseDisplay(display);
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char *argv[])
|
main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
@ -2222,8 +2152,6 @@ main(int argc, char *argv[])
|
|||||||
if (!(dpy = XOpenDisplay(NULL)))
|
if (!(dpy = XOpenDisplay(NULL)))
|
||||||
die("dwm: cannot open display");
|
die("dwm: cannot open display");
|
||||||
checkotherwm();
|
checkotherwm();
|
||||||
XrmInitialize();
|
|
||||||
load_xresources();
|
|
||||||
setup();
|
setup();
|
||||||
#ifdef __OpenBSD__
|
#ifdef __OpenBSD__
|
||||||
if (pledge("stdio rpath proc exec", NULL) == -1)
|
if (pledge("stdio rpath proc exec", NULL) == -1)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user