rebase dimkr patches

This commit is contained in:
Dima Krasner
2024-06-21 13:33:56 +00:00
parent 51231b4688
commit 6f898cdbdf
4 changed files with 30 additions and 30 deletions
+12 -12
View File
@@ -1,4 +1,4 @@
From a822ac65306ca331b95b17ffe08147110c03c60d Mon Sep 17 00:00:00 2001
From 3c3ea42cd50bfa5111be69b3c1f71afa0443bb53 Mon Sep 17 00:00:00 2001
From: Dima Krasner <dima@dimakrasner.com>
Date: Sat, 30 Dec 2023 10:49:48 +0200
Subject: [PATCH] allow environment variables to override config.h
@@ -12,19 +12,19 @@ Subject: [PATCH] allow environment variables to override config.h
create mode 100644 env.c
diff --git a/Makefile b/Makefile
index 0822ddc..fbdfdca 100644
index 9308656..c66d376 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ all: dwl
dwl: dwl.o util.o
$(CC) dwl.o util.o $(LDLIBS) $(LDFLAGS) $(DWLCFLAGS) -o $@
dwl.o: dwl.c config.mk config.h client.h cursor-shape-v1-protocol.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h
@@ -22,6 +22,7 @@ dwl: dwl.o util.o
dwl.o: dwl.c client.h config.h config.mk cursor-shape-v1-protocol.h \
pointer-constraints-unstable-v1-protocol.h wlr-layer-shell-unstable-v1-protocol.h \
wlr-output-power-management-unstable-v1-protocol.h xdg-shell-protocol.h
+dwl.o: env.c
util.o: util.c util.h
# wayland-scanner is a tool which generates C headers and rigging for Wayland
diff --git a/config.def.h b/config.def.h
index 9009517..c6b9ae0 100644
index a784eb4..e0f10de 100644
--- a/config.def.h
+++ b/config.def.h
@@ -6,11 +6,11 @@
@@ -41,14 +41,14 @@ index 9009517..c6b9ae0 100644
+static float bordercolor[] = COLOR(0x444444ff);
+static float focuscolor[] = COLOR(0x005577ff);
+static float urgentcolor[] = COLOR(0xff0000ff);
/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
diff --git a/dwl.c b/dwl.c
index fa76db2..6dd4524 100644
index d48bf40..de33dfe 100644
--- a/dwl.c
+++ b/dwl.c
@@ -407,6 +407,8 @@ static xcb_atom_t netatom[NetLast];
@@ -429,6 +429,8 @@ static xcb_atom_t netatom[NetLast];
/* attempt to encapsulate suck into one file */
#include "client.h"
@@ -57,7 +57,7 @@ index fa76db2..6dd4524 100644
/* function implementations */
void
applybounds(Client *c, struct wlr_box *bbox)
@@ -1010,6 +1012,8 @@ createpointer(struct wlr_pointer *pointer)
@@ -1082,6 +1084,8 @@ createpointer(struct wlr_pointer *pointer)
libinput_device_config_accel_set_profile(device, accel_profile);
libinput_device_config_accel_set_speed(device, accel_speed);
}
@@ -66,7 +66,7 @@ index fa76db2..6dd4524 100644
}
wlr_cursor_attach_input_device(cursor, &pointer->base);
@@ -2974,6 +2978,7 @@ main(int argc, char *argv[])
@@ -3141,6 +3145,7 @@ main(int argc, char *argv[])
/* Wayland requires XDG_RUNTIME_DIR for creating its communications socket */
if (!getenv("XDG_RUNTIME_DIR"))
die("XDG_RUNTIME_DIR must be set");