From 2828da83db7bbba6b66234614c34aedf9a9eb284 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 15 Mar 2019 18:11:39 +0100 Subject: Makefile: fix clang-format path --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 17e7b2c..f254fcf 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,6 @@ clean: rm badwolf format: *.c *.h - clang-format -style=file -assume-filename=~/.clang-format -i *.c *.h + clang-format -style=file -assume-filename=.clang-format -i *.c *.h .PHONY: clean install -- cgit v1.3.1-23-gd82d From adfdc1f543588dae9426537b04b3874d76aaf010 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Fri, 15 Mar 2019 16:47:23 +0100 Subject: Makefile: cleaner usage of variables and make it easier to add exec targets --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f254fcf..6071b41 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,23 @@ -LIBS = $(shell pkg-config --cflags --libs gtk+-3.0 webkit2gtk-4.0) +CC ?= cc +CFLAGS ?= -g -Wall -Wextra PREFIX ?= /usr/local -badwolf: badwolf.c config.h - $(CC) $(CFLAGS) $(LIBS) -o $@ $< +DEPS = gtk+-3.0 webkit2gtk-4.0 +CFLAGS += $(shell pkg-config --cflags $(DEPS)) +LDFLAGS += $(shell pkg-config --libs $(DEPS)) +OBJS = badwolf + +all: $(OBJS) + +.c: + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< install: badwolf mkdir -p $(DESTDIR)$(PREFIX)/bin cp -p badwolf $(DESTDIR)$(PREFIX)/bin/badwolf clean: - rm badwolf + rm $(OBJS) format: *.c *.h clang-format -style=file -assume-filename=.clang-format -i *.c *.h -- cgit v1.3.1-23-gd82d From 1acb3987e24850c651c85fea7e5355bd75aa81ed Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 20 Mar 2019 15:47:57 +0100 Subject: Makefile: Make it POSIX --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6071b41..bcc39cc 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,13 @@ -CC ?= cc -CFLAGS ?= -g -Wall -Wextra -PREFIX ?= /usr/local - -DEPS = gtk+-3.0 webkit2gtk-4.0 -CFLAGS += $(shell pkg-config --cflags $(DEPS)) -LDFLAGS += $(shell pkg-config --libs $(DEPS)) -OBJS = badwolf +.POSIX: + +PREFIX = /usr/local + +DEPS = gtk+-3.0 webkit2gtk-4.0 +OBJS = badwolf + +CC = cc -std=c99 +CFLAGS = -g -Wall -Wextra `pkg-config --cflags $(DEPS)` +LDFLAGS = `pkg-config --libs $(DEPS)` all: $(OBJS) -- cgit v1.3.1-23-gd82d From 565482a6df05e2955ef1dbda293ad3ada7e3b639 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 20 Mar 2019 15:55:48 +0100 Subject: badwolf.c: Set a default size for float WMs --- badwolf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/badwolf.c b/badwolf.c index 6147885..9591d7c 100644 --- a/badwolf.c +++ b/badwolf.c @@ -471,6 +471,7 @@ int main(int argc, char *argv[]) window->notebook = gtk_notebook_new(); window->new_tab = gtk_button_new_from_icon_name("tab-new-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_window_set_default_size(GTK_WINDOW(window->main_window), 800, 600); gtk_window_set_role(GTK_WINDOW(window->main_window), "browser"); gtk_widget_set_tooltip_text(window->new_tab, "Open new tab"); -- cgit v1.3.1-23-gd82d From a5da22c81a448b4f66eaed1952cff8db2b609bc3 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 20 Mar 2019 16:01:22 +0100 Subject: Make the default window size configurable --- badwolf.c | 3 ++- config.h | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/badwolf.c b/badwolf.c index 9591d7c..87c0785 100644 --- a/badwolf.c +++ b/badwolf.c @@ -471,7 +471,8 @@ int main(int argc, char *argv[]) window->notebook = gtk_notebook_new(); window->new_tab = gtk_button_new_from_icon_name("tab-new-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_window_set_default_size(GTK_WINDOW(window->main_window), 800, 600); + gtk_window_set_default_size( + GTK_WINDOW(window->main_window), BADWOLF_DEFAULT_WIDTH, BADWOLF_DEFAULT_HEIGHT); gtk_window_set_role(GTK_WINDOW(window->main_window), "browser"); gtk_widget_set_tooltip_text(window->new_tab, "Open new tab"); diff --git a/config.h b/config.h index f4a8a59..3bb3596 100644 --- a/config.h +++ b/config.h @@ -26,3 +26,13 @@ // BADWOLF_TOOLBAR_PADDING: Amount of padding between toolbar elements #define BADWOLF_TOOLBAR_PADDING 0 + +/* + * BADWOLF_DEFAULT_WIDTH / BADWOLF_DEFAULT_HEIGHT: + * Used to define the default width/height of the window, + * useful for floating Window Managers, probably useless in tiling ones + * + * See https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-default-size + */ +#define BADWOLF_DEFAULT_WIDTH 800 +#define BADWOLF_DEFAULT_HEIGHT 600 -- cgit v1.3.1-23-gd82d From 2877c957673fbb1c1c6b6c96fb12ccf8d393542d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 28 Mar 2019 19:38:45 +0100 Subject: Makefile: Properly separate CFLAGS This allows to simply pass CFLAGS on make without having to care about deps --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bcc39cc..21f1c72 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,14 @@ DEPS = gtk+-3.0 webkit2gtk-4.0 OBJS = badwolf CC = cc -std=c99 -CFLAGS = -g -Wall -Wextra `pkg-config --cflags $(DEPS)` -LDFLAGS = `pkg-config --libs $(DEPS)` +CFLAGS = -g -Wall -Wextra +CDEPS = `pkg-config --cflags $(DEPS)` +LIBS = `pkg-config --libs $(DEPS)` all: $(OBJS) .c: - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + $(CC) $(CFLAGS) $(CDEPS) $(LDFLAGS) $(LIBS) -o $@ $< install: badwolf mkdir -p $(DESTDIR)$(PREFIX)/bin -- cgit v1.3.1-23-gd82d