Compare commits

..

No commits in common. "e1642ebe1379b4fcd2f52c1b013253ae14ae6ef0" and "45d035930f7fc1faa4096522c7a4593480a64592" have entirely different histories.

12 changed files with 100 additions and 196 deletions

6
.gitignore vendored
View File

@ -2,9 +2,3 @@
*.o
*.orig
*.rej
dwm
# makepkg stuff
*.pkg*
pkg/
src/

View File

@ -1,27 +0,0 @@
branches: master
when:
event: push
pipeline:
build:
image: 'archlinux:latest'
commands:
# Update packages
- pacman -Syu --needed --noconfirm base-devel
# Create non-root user to perform build & switch to their home
- groupadd -g 1000 builder
- useradd -mg builder builder
- chown -R builder:builder "$PWD"
- "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
- su builder
# Build the package
- MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed
publish:
image: 'archlinux:latest'
commands:
# Publish the package
- 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish'
secrets:
- api_key

View File

@ -1,49 +0,0 @@
# Maintainer: Jef Roosens
pkgname=jjr-dwm
pkgver=6.3
pkgrel=1
pkgdesc="Personal build of the Dynamic Window Manager."
arch=("x86_64")
url="https://git.rustybever.be/Chewing_Bever/dwm"
license=("MIT")
depends=("libx11" "libxinerama" "libxft" "freetype2" "jjr-st" "dmenu")
makedepends=("clang")
provides=("dwm")
conflicts=("dwm" "dwm-git")
source=("config.def.h" "config.h" "config.mk" "drw.c" "drw.h" "dwm.1" "dwm.c"
"LICENSE" "Makefile" "transient.c" "util.c" "util.h" "dwm.desktop" "README")
sha256sums=('f662413dd3882e83a8d1bd6165abdf1c78f358a9100e875b0c6633d41f65f224'
'0fc893d4cbb2955411d047773a75269ef318d04ec2477624f01158dea539703b'
'cda18f3700ed39dadbba983a36220320a88853d6858689b072fc0500b26b8fc8'
'85cc51a6a392a81d6073ff8d994200651cb8042b3bed93ce19e565ab752f8dae'
'137808b0e48f4acd8672678172edf16839ff0b4c13b7721deddb920a0d553fd7'
'216e0326791ac90a16549d39514d42cda0dfd5524df1ad511326a472cbd0f816'
'fcb808784839c38457a4e2834de2ddf730ccfbe9ef3ee85b55df01169998358f'
'b99adfc25cce6d62c1cc72a3105bb5d913a2faa40f172c14cfb204067f08c939'
'f5c9137d07849db36942045df9be4f71727207cd90e7cc45aeffcf3c2469b9dc'
'54c37c558613ab3da856b19c4b4c0c56c224133a253bf5fa6557b489da545d7c'
'dec870d0b5834c9008ff62f495710daf524cffdf12d0cf8ba4fadf5643623987'
'1196a7b6efbf4cb3f5c435fffd72e7647f977483845d5c78c1c48d9ab8b96819'
'bc36426772e1471d6dd8c8aed91f288e16949e3463a9933fee6390ee0ccd3f81'
'f0384e29e3f249fcd52a30c35c722fca50e9fabfdeb7725f4073e05170358d86')
build() {
make
}
package() {
local installopts='--mode 0644 -D --target-directory'
local shrdir="$pkgdir/usr/share"
local licdir="$shrdir/licenses/$pkgname"
local docdir="$shrdir/doc/$pkgname"
make PREFIX=/usr DESTDIR="$pkgdir" install
install $installopts "$licdir" "LICENSE"
install $installopts "$docdir" "README"
install $installopts "$pkgdir/usr/share/xsessions" "dwm.desktop"
}

View File

@ -42,7 +42,6 @@ static const Rule rules[] = {
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
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 Layout layouts[] = {
/* symbol arrange function */

View File

@ -44,10 +44,7 @@ static const Rule rules[] = {
/* layout(s) */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
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 resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const Layout layouts[] = {
/* symbol arrange function */
@ -65,17 +62,11 @@ static const Layout layouts[] = {
{ 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 } \
}
#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", col_gray1,
"-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL};
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
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 };
/* modifier key function argument */
@ -107,16 +98,21 @@ static Key keys[] = {
{ MODKEY , XK_F3 , spawn , {.v = { "dmenu_kb_layout" , NULL }}} ,
{ MODKEY , XK_F4 , spawn , {.v = { "dmenu_audio_sinks" , NULL }}} ,
{ MODKEY|ShiftMask , XK_q , quit , {0} } ,
TAGKEYS(XK_y, 0) TAGKEYS(XK_u, 1) TAGKEYS(XK_i, 2) TAGKEYS(XK_o, 3)
TAGKEYS(XK_p, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7)
TAGKEYS(XK_9, 8)};
TAGKEYS( XK_y , 0)
TAGKEYS( XK_u , 1)
TAGKEYS( XK_i , 2)
TAGKEYS( XK_o , 3)
TAGKEYS( XK_p , 4)
TAGKEYS( XK_6 , 5)
TAGKEYS( XK_7 , 6)
TAGKEYS( XK_8 , 7)
TAGKEYS( XK_9 , 8)
};
/* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
* ClkClientWin, or ClkRootWin */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static Button buttons[] = {
/* click event mask button function argument
*/
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkWinTitle, 0, Button2, zoom, {0} },
@ -129,3 +125,4 @@ static Button buttons[] = {
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
};

View File

@ -1,5 +1,5 @@
# dwm version
VERSION = 6.3
VERSION = 6.2
# Customize below to fit your system
@ -35,4 +35,4 @@ LDFLAGS = ${LIBS}
#LDFLAGS = ${LIBS}
# compiler and linker
CC = clang
CC = cc

BIN
drw.o 100644

Binary file not shown.

BIN
dwm 100755

Binary file not shown.

5
dwm.c
View File

@ -729,9 +729,6 @@ drawbar(Monitor *m)
unsigned int i, occ = 0, urg = 0;
Client *c;
if (!m->showbar)
return;
/* draw status first so it can be overdrawn by tags later */
if (m == selmon) { /* status is only drawn on selected monitor */
drw_setscheme(drw, scheme[SchemeNorm]);
@ -865,7 +862,7 @@ focusstack(const Arg *arg)
{
Client *c = NULL, *i;
if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
if (!selmon->sel)
return;
if (arg->i > 0) {
for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);

View File

@ -1,7 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Dwm
Comment=Dynamic window manager
Exec=dwm
Icon=dwm
Type=XSession

BIN
dwm.o 100644

Binary file not shown.

BIN
util.o 100644

Binary file not shown.