Update to i3-4.3
OK jasper@
This commit is contained in:
dcoppa
parent
16a816c628
commit
38febc9b19
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.45 2012/09/16 22:05:46 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.46 2012/09/21 17:16:13 dcoppa Exp $
|
||||
|
||||
COMMENT = improved dynamic tiling window manager
|
||||
|
||||
DISTNAME = i3-4.2
|
||||
REVISION = 11
|
||||
DISTNAME = i3-4.3
|
||||
CATEGORIES = x11
|
||||
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
@ -17,17 +16,20 @@ PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB = X11 X11-xcb Xau Xcursor Xdmcp Xfixes \
|
||||
Xrender c ev m pcre pthread-stubs \
|
||||
startup-notification-1 xcb xcb-atom \
|
||||
xcb-aux xcb-event xcb-icccm \
|
||||
xcb-keysyms xcb-property xcb-randr \
|
||||
xcb-xinerama yajl
|
||||
WANTLIB = GL X11 Xcursor Xrender c cairo ev expat \
|
||||
fontconfig freetype glib-2.0 gobject-2.0 m \
|
||||
pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
|
||||
pixman-1 png pthread pthread-stubs \
|
||||
startup-notification-1 xcb xcb-atom xcb-aux \
|
||||
xcb-event xcb-icccm xcb-keysyms xcb-property \
|
||||
xcb-randr xcb-render xcb-shm xcb-xinerama yajl z
|
||||
|
||||
MODULES = converters/libiconv
|
||||
MODULES = converters/libiconv \
|
||||
devel/gettext
|
||||
|
||||
LIB_DEPENDS = devel/libev \
|
||||
devel/libyajl>=2.0.0 \
|
||||
devel/pango \
|
||||
devel/pcre \
|
||||
devel/startup-notification
|
||||
|
||||
@ -45,7 +47,8 @@ NO_REGRESS = Yes
|
||||
MAKE_FLAGS = CC="${CC}" \
|
||||
BISON="${LOCALBASE}/bin/bison" \
|
||||
FLEX="${LOCALBASE}/bin/gflex" \
|
||||
SYSCONFDIR=${SYSCONFDIR}
|
||||
SYSCONFDIR=${SYSCONFDIR} \
|
||||
V=1
|
||||
|
||||
.if defined(DEBUG)
|
||||
MAKE_FLAGS += DEBUG=1
|
||||
@ -61,11 +64,12 @@ post-configure:
|
||||
${SUBST_CMD} ${WRKSRC}/i3.config \
|
||||
${WRKSRC}/i3.config.keycodes \
|
||||
${WRKSRC}/src/cfgparse.y \
|
||||
${WRKSRC}/src/config.c
|
||||
${WRKSRC}/src/commands.c \
|
||||
${WRKSRC}/src/config.c \
|
||||
${WRKSRC}/src/key_press.c
|
||||
|
||||
post-install:
|
||||
${INSTALL_MAN} ${WRKBUILD}/{i3bar/doc,man}/*.1 \
|
||||
${PREFIX}/man/man1/
|
||||
${INSTALL_MAN} ${WRKBUILD}/man/*.1 ${PREFIX}/man/man1/
|
||||
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \
|
||||
-c ${WRKBUILD}/man/i3-config-wizard.1 \
|
||||
${PREFIX}/man/man1/i3-config-wizard.1
|
||||
@ -73,7 +77,6 @@ post-install:
|
||||
-c ${WRKBUILD}/man/i3.1 \
|
||||
${PREFIX}/man/man1/i3.1
|
||||
@rm ${PREFIX}/man/man1/i3-dump-log.1 \
|
||||
${PREFIX}/man/man1/i3-sensible*.1 \
|
||||
${PREFIX}/man/man1/i3-wsbar.1
|
||||
${PREFIX}/man/man1/i3-sensible*.1
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (i3-4.2.tar.bz2) = 4CyDKCDokipE50TlVSlPhYDC+OIYxcECnlLxveBIcys=
|
||||
SIZE (i3-4.2.tar.bz2) = 758109
|
||||
SHA256 (i3-4.3.tar.bz2) = iVv1hgklNe+yvHI7pZnHGgJ3aBFeVgUvER/IuxSNuSU=
|
||||
SIZE (i3-4.3.tar.bz2) = 852253
|
||||
|
||||
@ -1,59 +1,14 @@
|
||||
$OpenBSD: patch-Makefile,v 1.6 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- Makefile.orig Wed Apr 25 23:21:25 2012
|
||||
+++ Makefile Wed May 9 12:40:11 2012
|
||||
@@ -19,7 +19,12 @@ else
|
||||
UNUSED:=$(shell $(MAKE) loglevels.h)
|
||||
endif
|
||||
|
||||
$OpenBSD: patch-Makefile,v 1.7 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- Makefile.orig Thu Sep 20 10:37:01 2012
|
||||
+++ Makefile Thu Sep 20 10:40:12 2012
|
||||
@@ -18,7 +18,10 @@ include i3-msg/i3-msg.mk
|
||||
include i3-input/i3-input.mk
|
||||
include i3-nagbar/i3-nagbar.mk
|
||||
include i3bar/i3bar.mk
|
||||
+# XXX OpenBSD lacks POSIX shared memory support, so no i3-dump-log
|
||||
+ifeq ($(UNAME),OpenBSD)
|
||||
+SUBDIRS:=i3-msg i3-input i3-nagbar i3-config-wizard i3bar
|
||||
+else
|
||||
SUBDIRS:=i3-msg i3-input i3-nagbar i3-config-wizard i3bar i3-dump-log
|
||||
+ifneq ($(UNAME),OpenBSD)
|
||||
include i3-dump-log/i3-dump-log.mk
|
||||
+endif
|
||||
include docs/docs.mk
|
||||
include man/man.mk
|
||||
|
||||
# Depend on the specific file (.c for each .o) and on all headers
|
||||
src/%.o: src/%.c ${HEADERS}
|
||||
@@ -44,7 +49,7 @@ subdirs:
|
||||
|
||||
loglevels.h:
|
||||
echo "[i3] LOGLEVELS"
|
||||
- for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \
|
||||
+ for file in $$(ls src/*.c src/*.y src/*.l | grep -v cfgparse.tab.c | grep -v cfgparse.yy.c); \
|
||||
do \
|
||||
echo $$(basename $$file .c); \
|
||||
done > loglevels.tmp
|
||||
@@ -67,7 +72,7 @@ include/GENERATED_tokens.h: include/GENERATED_call.h
|
||||
# and once as an object file for i3.
|
||||
src/commands_parser.o: src/commands_parser.c ${HEADERS} ${CMDPARSE_HEADERS}
|
||||
echo "[i3] CC $<"
|
||||
- $(CC) $(CPPFLAGS) $(CFLAGS) -DTEST_PARSER -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -o test.commands_parser $< $(LIBS)
|
||||
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -DTEST_PARSER -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -o test.commands_parser $< $(LIBS)
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $<
|
||||
|
||||
src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
|
||||
@@ -89,17 +94,13 @@ install: all
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications
|
||||
- $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/
|
||||
- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
|
||||
- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
|
||||
- $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
|
||||
- $(INSTALL) -m 0644 i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
|
||||
- $(INSTALL) -m 0644 i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop
|
||||
- $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
|
||||
+ ${INSTALL_PROGRAM} i3 $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_SCRIPT} i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_DATA} i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
|
||||
+ ${INSTALL_DATA} i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
|
||||
+ ${INSTALL_DATA} i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
|
||||
+ ${INSTALL_DATA} i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop
|
||||
+ ${INSTALL_DATA} include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
|
||||
for dir in $(SUBDIRS); do \
|
||||
$(MAKE) -C $$dir install; \
|
||||
done
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-common_mk,v 1.12 2012/09/16 22:05:46 ajacoutot Exp $
|
||||
--- common.mk.orig Wed Apr 25 23:21:32 2012
|
||||
+++ common.mk Mon Sep 17 00:03:25 2012
|
||||
$OpenBSD: patch-common_mk,v 1.13 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- common.mk.orig Wed Sep 19 18:08:09 2012
|
||||
+++ common.mk Fri Sep 21 15:20:57 2012
|
||||
@@ -1,5 +1,5 @@
|
||||
UNAME=$(shell uname)
|
||||
-DEBUG=1
|
||||
@ -8,113 +8,26 @@ $OpenBSD: patch-common_mk,v 1.12 2012/09/16 22:05:46 ajacoutot Exp $
|
||||
COVERAGE=0
|
||||
INSTALL=install
|
||||
FLEX=flex
|
||||
@@ -18,76 +18,17 @@ endif
|
||||
GIT_VERSION:="4.2 (2012-04-25, branch \\\"release-4.2\\\")"
|
||||
VERSION:=4.2
|
||||
|
||||
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
|
||||
-$(error "pkg-config was not found")
|
||||
-endif
|
||||
-
|
||||
-# An easier way to get CFLAGS and LDFLAGS falling back in case there's
|
||||
-# no pkg-config support for certain libraries.
|
||||
-#
|
||||
-# NOTE that you must not use a blank after comma when calling this:
|
||||
-# $(call ldflags_for_lib name, fallback) # bad
|
||||
-# $(call ldflags_for_lib name,fallback) # good
|
||||
-# Otherwise, the compiler will get -l foo instead of -lfoo
|
||||
-#
|
||||
-# We redirect stderr to /dev/null because pkg-config prints an error if support
|
||||
-# for gnome-config was enabled but gnome-config is not actually installed.
|
||||
-cflags_for_lib = $(shell pkg-config --silence-errors --cflags $(1) 2>/dev/null)
|
||||
-ldflags_for_lib = $(shell pkg-config --exists 2>/dev/null $(1) && pkg-config --libs $(1) 2>/dev/null || echo -l$(2))
|
||||
-
|
||||
CFLAGS += -std=c99
|
||||
-CFLAGS += -pipe
|
||||
-CFLAGS += -Wall
|
||||
# unused-function, unused-label, unused-variable are turned on by -Wall
|
||||
# We don’t want unused-parameter because of the use of many callbacks
|
||||
CFLAGS += -Wunused-value
|
||||
-CFLAGS += -Iinclude
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-keysyms)
|
||||
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
|
||||
+CFLAGS += -I$(TOPDIR)/include
|
||||
CPPFLAGS += -DXCB_COMPAT
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-atom)
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-aux)
|
||||
-else
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-util)
|
||||
-endif
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-icccm)
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-xinerama)
|
||||
-CFLAGS += $(call cflags_for_lib, xcb-randr)
|
||||
-CFLAGS += $(call cflags_for_lib, xcb)
|
||||
-CFLAGS += $(call cflags_for_lib, xcursor)
|
||||
-CFLAGS += $(call cflags_for_lib, x11)
|
||||
-CFLAGS += $(call cflags_for_lib, yajl)
|
||||
-CFLAGS += $(call cflags_for_lib, libev)
|
||||
-CFLAGS += $(call cflags_for_lib, libpcre)
|
||||
-CFLAGS += $(call cflags_for_lib, libstartup-notification-1.0)
|
||||
CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
|
||||
CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
|
||||
-
|
||||
-ifeq ($(shell pkg-config --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
|
||||
CPPFLAGS += -DPCRE_HAS_UCP=1
|
||||
-endif
|
||||
|
||||
-LIBS += -lm
|
||||
-LIBS += -lrt
|
||||
-LIBS += -L $(TOPDIR)/libi3 -li3
|
||||
-LIBS += $(call ldflags_for_lib, xcb-event,xcb-event)
|
||||
-LIBS += $(call ldflags_for_lib, xcb-keysyms,xcb-keysyms)
|
||||
-ifeq ($(shell pkg-config --exists xcb-util 2>/dev/null || echo 1),1)
|
||||
-LIBS += $(call ldflags_for_lib, xcb-atom,xcb-atom)
|
||||
-LIBS += $(call ldflags_for_lib, xcb-aux,xcb-aux)
|
||||
-else
|
||||
-LIBS += $(call ldflags_for_lib, xcb-util)
|
||||
-endif
|
||||
-LIBS += $(call ldflags_for_lib, xcb-icccm,xcb-icccm)
|
||||
-LIBS += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama)
|
||||
-LIBS += $(call ldflags_for_lib, xcb-randr,xcb-randr)
|
||||
-LIBS += $(call ldflags_for_lib, xcb,xcb)
|
||||
-LIBS += $(call ldflags_for_lib, xcursor,Xcursor)
|
||||
-LIBS += $(call ldflags_for_lib, x11,X11)
|
||||
-LIBS += $(call ldflags_for_lib, yajl,yajl)
|
||||
-LIBS += $(call ldflags_for_lib, libev,ev)
|
||||
-LIBS += $(call ldflags_for_lib, libpcre,pcre)
|
||||
-LIBS += $(call ldflags_for_lib, libstartup-notification-1.0,startup-notification-1)
|
||||
+LIBS += -L$(TOPDIR)/libi3 -lX11 -lX11-xcb -lXau -lXcursor -lXdmcp -lXfixes -lXrender -lev -li3 -lm -lpcre -lpthread-stubs -lstartup-notification-1 -lxcb -lxcb-atom -lxcb-aux -lxcb-event -lxcb-icccm -lxcb-keysyms -lxcb-property -lxcb-randr -lxcb-xinerama -lyajl
|
||||
|
||||
# Please test if -Wl,--as-needed works on your platform and send me a patch.
|
||||
# it is known not to work on Darwin (Mac OS X)
|
||||
@@ -102,9 +43,9 @@ LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/p
|
||||
@@ -161,20 +161,13 @@ I3_LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/us
|
||||
endif
|
||||
|
||||
ifeq ($(UNAME),OpenBSD)
|
||||
-CFLAGS += -I${X11BASE}/include
|
||||
+CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/startup-notification-1.0
|
||||
-I3_CFLAGS += -I${X11BASE}/include
|
||||
+I3_CFLAGS += -I${X11BASE}/include -I${LOCALBASE}/include
|
||||
LIBS += -liconv
|
||||
-LDFLAGS += -L${X11BASE}/lib
|
||||
+LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
|
||||
-I3_LDFLAGS += -L${X11BASE}/lib
|
||||
+I3_LDFLAGS += -L${X11BASE}/lib -L${LOCALBASE}/lib
|
||||
endif
|
||||
|
||||
ifeq ($(UNAME),FreeBSD)
|
||||
@@ -127,18 +68,12 @@ ifeq ($(DEBUG),1)
|
||||
# Extended debugging flags, macros shall be available in gcc
|
||||
CFLAGS += -gdwarf-2
|
||||
CFLAGS += -g3
|
||||
-else
|
||||
-CFLAGS += -O2
|
||||
-CFLAGS += -freorder-blocks-and-partition
|
||||
endif
|
||||
|
||||
ifeq ($(COVERAGE),1)
|
||||
CFLAGS += -fprofile-arcs -ftest-coverage
|
||||
LIBS += -lgcov
|
||||
endif
|
||||
LIBS += -liconv
|
||||
-endif
|
||||
-
|
||||
-# Don’t print command lines which are run
|
||||
-.SILENT:
|
||||
-ifeq ($(UNAME),Darwin)
|
||||
-LIBS += -liconv
|
||||
-else
|
||||
-# Darwin (Mac OS X) doesn’t have librt
|
||||
-LIBS += -lrt
|
||||
endif
|
||||
|
||||
# Always remake the following targets
|
||||
.PHONY: install clean dist distclean
|
||||
ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-i3-config-wizard_Makefile,v 1.3 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- i3-config-wizard/Makefile.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3-config-wizard/Makefile Wed May 9 09:40:08 2012
|
||||
@@ -38,7 +38,7 @@ cfgparse.y.o: cfgparse.y ${HEADERS}
|
||||
install: all
|
||||
echo "[i3-config-wizard] INSTALL"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-config-wizard $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-config-wizard $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean:
|
||||
rm -f *.o cfgparse.tab.{c,h} cfgparse.output cfgparse.yy.c
|
||||
@ -1,26 +0,0 @@
|
||||
$OpenBSD: patch-i3-config-wizard_cfgparse_y,v 1.1 2012/05/31 08:39:59 dcoppa Exp $
|
||||
|
||||
From 7a67938f3ce7dfe51eb60b9873946e120184195d Mon Sep 17 00:00:00 2001
|
||||
From: David Coppa <dcoppa@gmail.com>
|
||||
Date: Wed, 30 May 2012 09:11:08 +0000
|
||||
Subject: Replace deprecated XKeycodeToKeysym() with XkbKeycodeToKeysym()
|
||||
|
||||
--- i3-config-wizard/cfgparse.y.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3-config-wizard/cfgparse.y Thu May 31 10:32:20 2012
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
+#include <X11/XKBlib.h>
|
||||
|
||||
#include "libi3.h"
|
||||
|
||||
@@ -139,7 +140,7 @@ bindcode:
|
||||
* more likely for special characters). */
|
||||
level = 1;
|
||||
}
|
||||
- KeySym sym = XKeycodeToKeysym(dpy, $4, level);
|
||||
+ KeySym sym = XkbKeycodeToKeysym(dpy, $4, 0, level);
|
||||
char *str = XKeysymToString(sym);
|
||||
char *modifiers = modifier_to_string($<number>3);
|
||||
// TODO: modifier to string
|
||||
12
x11/i3/patches/patch-i3-config-wizard_i3-config-wizard_mk
Normal file
12
x11/i3/patches/patch-i3-config-wizard_i3-config-wizard_mk
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-i3-config-wizard_i3-config-wizard_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3-config-wizard/i3-config-wizard.mk.orig Fri Sep 21 11:40:58 2012
|
||||
+++ i3-config-wizard/i3-config-wizard.mk Fri Sep 21 11:42:00 2012
|
||||
@@ -30,7 +30,7 @@ i3-config-wizard/i3-config-wizard: libi3.a $(i3_config
|
||||
install-i3-config-wizard: i3-config-wizard/i3-config-wizard
|
||||
echo "[i3-config-wizard] Install"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-config-wizard/i3-config-wizard $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-config-wizard/i3-config-wizard $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean-i3-config-wizard:
|
||||
echo "[i3-config-wizard] Clean"
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-i3-input_Makefile,v 1.4 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- i3-input/Makefile.orig Wed Apr 25 23:21:32 2012
|
||||
+++ i3-input/Makefile Wed May 9 09:41:21 2012
|
||||
@@ -26,7 +26,7 @@ $(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c
|
||||
install: all
|
||||
echo "[i3-input] INSTALL"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-input $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-input $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean:
|
||||
rm -f *.o
|
||||
12
x11/i3/patches/patch-i3-input_i3-input_mk
Normal file
12
x11/i3/patches/patch-i3-input_i3-input_mk
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-i3-input_i3-input_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3-input/i3-input.mk.orig Fri Sep 21 11:42:35 2012
|
||||
+++ i3-input/i3-input.mk Fri Sep 21 11:43:10 2012
|
||||
@@ -21,7 +21,7 @@ i3-input/i3-input: libi3.a $(i3_input_OBJECTS)
|
||||
install-i3-input: i3-input/i3-input
|
||||
echo "[i3-input] Install"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-input/i3-input $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-input/i3-input $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean-i3-input:
|
||||
echo "[i3-input] Clean"
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-i3-msg_Makefile,v 1.5 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- i3-msg/Makefile.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3-msg/Makefile Wed May 9 09:42:29 2012
|
||||
@@ -3,8 +3,6 @@ TOPDIR=..
|
||||
|
||||
include $(TOPDIR)/common.mk
|
||||
|
||||
-CFLAGS += -I$(TOPDIR)/include
|
||||
-
|
||||
# Depend on the object files of all source-files in src/*.c and on all header files
|
||||
FILES=$(patsubst %.c,%.o,$(wildcard *.c))
|
||||
HEADERS=$(wildcard *.h)
|
||||
@@ -23,7 +21,7 @@ i3-msg: ${FILES}
|
||||
install: all
|
||||
echo "[i3-msg] INSTALL"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-msg $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-msg $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean:
|
||||
rm -f *.o
|
||||
21
x11/i3/patches/patch-i3-msg_i3-msg_mk
Normal file
21
x11/i3/patches/patch-i3-msg_i3-msg_mk
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-i3-msg_i3-msg_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3-msg/i3-msg.mk.orig Wed Sep 19 18:08:09 2012
|
||||
+++ i3-msg/i3-msg.mk Fri Sep 21 15:22:52 2012
|
||||
@@ -12,7 +12,7 @@ i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o)
|
||||
|
||||
i3-msg/%.o: i3-msg/%.c $(i3_msg_HEADERS)
|
||||
echo "[i3-msg] CC $<"
|
||||
- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_msg_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
|
||||
+ $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(I3_CFLAGS) $(i3_msg_CFLAGS) $(CFLAGS) -c -o $@ $<
|
||||
|
||||
i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS)
|
||||
echo "[i3-msg] Link i3-msg"
|
||||
@@ -21,7 +21,7 @@ i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS)
|
||||
install-i3-msg: i3-msg/i3-msg
|
||||
echo "[i3-msg] Install"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-msg/i3-msg $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-msg/i3-msg $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean-i3-msg:
|
||||
echo "[i3-msg] Clean"
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-i3-nagbar_Makefile,v 1.3 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- i3-nagbar/Makefile.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3-nagbar/Makefile Wed May 9 09:43:26 2012
|
||||
@@ -26,7 +26,7 @@ $(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c
|
||||
install: all
|
||||
echo "[i3-nagbar] INSTALL"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-nagbar $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-nagbar $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean:
|
||||
rm -f *.o
|
||||
12
x11/i3/patches/patch-i3-nagbar_i3-nagbar_mk
Normal file
12
x11/i3/patches/patch-i3-nagbar_i3-nagbar_mk
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-i3-nagbar_i3-nagbar_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3-nagbar/i3-nagbar.mk.orig Fri Sep 21 11:45:36 2012
|
||||
+++ i3-nagbar/i3-nagbar.mk Fri Sep 21 11:45:51 2012
|
||||
@@ -21,7 +21,7 @@ i3-nagbar/i3-nagbar: libi3.a $(i3_nagbar_OBJECTS)
|
||||
install-i3-nagbar: i3-nagbar/i3-nagbar
|
||||
echo "[i3-nagbar] Install"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3-nagbar/i3-nagbar $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3-nagbar/i3-nagbar $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean-i3-nagbar:
|
||||
echo "[i3-nagbar] Clean"
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-i3_config,v 1.12 2012/05/11 09:35:17 dcoppa Exp $
|
||||
--- i3.config.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3.config Fri May 11 11:21:17 2012
|
||||
@@ -16,13 +16,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
|
||||
$OpenBSD: patch-i3_config,v 1.13 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3.config.orig Wed Sep 19 18:08:09 2012
|
||||
+++ i3.config Fri Sep 21 14:09:31 2012
|
||||
@@ -22,13 +22,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
|
||||
floating_modifier Mod1
|
||||
|
||||
# start a terminal
|
||||
@ -17,18 +17,3 @@ $OpenBSD: patch-i3_config,v 1.12 2012/05/11 09:35:17 dcoppa Exp $
|
||||
|
||||
# change focus
|
||||
bindsym Mod1+j focus left
|
||||
@@ -134,7 +134,7 @@ bindsym Mod1+r mode "resize"
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
- status_command i3status
|
||||
+ status_command ${LOCALBASE}/bin/i3status
|
||||
}
|
||||
|
||||
#######################################################################
|
||||
@@ -146,4 +146,4 @@ bar {
|
||||
#
|
||||
# Please remove the following exec line:
|
||||
#######################################################################
|
||||
-exec i3-config-wizard
|
||||
+exec ${TRUEPREFIX}/bin/i3-config-wizard
|
||||
|
||||
@ -1,16 +1,11 @@
|
||||
$OpenBSD: patch-i3_config_keycodes,v 1.8 2012/05/18 08:26:05 dcoppa Exp $
|
||||
$OpenBSD: patch-i3_config_keycodes,v 1.9 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
Fix keycodes for the "Left", "Down", "Up" and "Right" keys: they're
|
||||
different between Linux and OpenBSD.
|
||||
|
||||
From 7d657a6a65fb3d5b1a4392132fcd40a7afd18373 Mon Sep 17 00:00:00 2001
|
||||
From: David Coppa <dcoppa@gmail.com>
|
||||
Date: Thu, 17 May 2012 10:31:36 +0000
|
||||
Subject: Fix errors in i3.config.keycodes (bindsym -> bindcode)
|
||||
|
||||
--- i3.config.keycodes.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3.config.keycodes Thu May 10 11:00:55 2012
|
||||
@@ -17,13 +17,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
|
||||
--- i3.config.keycodes.orig Wed Sep 19 18:08:09 2012
|
||||
+++ i3.config.keycodes Fri Sep 21 14:10:09 2012
|
||||
@@ -23,13 +23,13 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-is
|
||||
floating_modifier $mod
|
||||
|
||||
# start a terminal
|
||||
@ -26,7 +21,7 @@ Subject: Fix errors in i3.config.keycodes (bindsym -> bindcode)
|
||||
|
||||
# change focus
|
||||
bindcode $mod+44 focus left
|
||||
@@ -32,10 +32,10 @@ bindcode $mod+46 focus up
|
||||
@@ -38,10 +38,10 @@ bindcode $mod+46 focus up
|
||||
bindcode $mod+47 focus right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
@ -41,7 +36,7 @@ Subject: Fix errors in i3.config.keycodes (bindsym -> bindcode)
|
||||
|
||||
# move focused window
|
||||
bindcode $mod+Shift+44 move left
|
||||
@@ -44,10 +44,10 @@ bindcode $mod+Shift+46 move up
|
||||
@@ -50,10 +50,10 @@ bindcode $mod+Shift+46 move up
|
||||
bindcode $mod+Shift+47 move right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
@ -56,14 +51,14 @@ Subject: Fix errors in i3.config.keycodes (bindsym -> bindcode)
|
||||
|
||||
# split in horizontal orientation
|
||||
bindcode $mod+43 split h
|
||||
@@ -120,10 +120,10 @@ mode "resize" {
|
||||
@@ -126,10 +126,10 @@ mode "resize" {
|
||||
bindcode 47 resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
- bindsym 113 resize shrink width 10 px or 10 ppt
|
||||
- bindsym 116 resize grow height 10 px or 10 ppt
|
||||
- bindsym 111 resize shrink height 10 px or 10 ppt
|
||||
- bindsym 114 resize grow width 10 px or 10 ppt
|
||||
- bindcode 113 resize shrink width 10 px or 10 ppt
|
||||
- bindcode 116 resize grow height 10 px or 10 ppt
|
||||
- bindcode 111 resize shrink height 10 px or 10 ppt
|
||||
- bindcode 114 resize grow width 10 px or 10 ppt
|
||||
+ bindcode 100 resize shrink width 10 px or 10 ppt
|
||||
+ bindcode 104 resize grow height 10 px or 10 ppt
|
||||
+ bindcode 98 resize shrink height 10 px or 10 ppt
|
||||
@ -71,10 +66,3 @@ Subject: Fix errors in i3.config.keycodes (bindsym -> bindcode)
|
||||
|
||||
# back to normal: Enter or Escape
|
||||
bindcode 36 mode "default"
|
||||
@@ -135,5 +135,5 @@ bindcode $mod+27 mode "resize"
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
- status_command i3status
|
||||
+ status_command ${LOCALBASE}/bin/i3status
|
||||
}
|
||||
|
||||
17
x11/i3/patches/patch-i3_xsession_desktop
Normal file
17
x11/i3/patches/patch-i3_xsession_desktop
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-i3_xsession_desktop,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
From 9fa0dc657b44118fae0d016fb85fa1f4c425503f Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kowalik (Xarthisius) <xarthisius@gentoo.org>
|
||||
Date: Wed, 19 Sep 2012 18:00:28 +0000
|
||||
Subject: Fix xsession.desktop to comply to fdo standard
|
||||
|
||||
--- i3.xsession.desktop.orig Fri Sep 21 13:42:09 2012
|
||||
+++ i3.xsession.desktop Fri Sep 21 13:42:30 2012
|
||||
@@ -1,6 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-Encoding=UTF-8
|
||||
Name=i3
|
||||
Comment=improved dynamic tiling window manager
|
||||
Exec=i3
|
||||
-Type=XSession
|
||||
+Type=Application
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-i3bar_Makefile,v 1.3 2012/05/09 11:56:49 dcoppa Exp $
|
||||
--- i3bar/Makefile.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3bar/Makefile Wed May 9 09:45:03 2012
|
||||
@@ -6,7 +6,7 @@ FILES:=$(wildcard src/*.c)
|
||||
FILES:=$(FILES:.c=.o)
|
||||
HEADERS:=$(wildcard include/*.h)
|
||||
|
||||
-CPPFLAGS += -I$(TOPDIR)/include
|
||||
+CPPFLAGS += -Iinclude
|
||||
|
||||
all: i3bar doc
|
||||
|
||||
@@ -29,7 +29,7 @@ src/%.o: src/%.c ${HEADERS}
|
||||
install: all
|
||||
echo "[i3bar] INSTALL"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3bar $(DESTDIR)$(PREFIX)/bin
|
||||
+ ${INSTALL_PROGRAM} i3bar $(DESTDIR)$(PREFIX)/bin
|
||||
|
||||
clean:
|
||||
rm -f src/*.o
|
||||
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-i3bar_doc_i3bar_1,v 1.3 2012/05/09 11:56:49 dcoppa Exp $
|
||||
|
||||
Fix "AUTHORS" section
|
||||
|
||||
--- i3bar/doc/i3bar.1.orig Wed Apr 25 23:21:40 2012
|
||||
+++ i3bar/doc/i3bar.1 Wed May 9 09:17:37 2012
|
||||
@@ -82,9 +82,3 @@ dzen2(1) or xmobar(1) for similar programs to i3bar\&.
|
||||
.SH "AUTHORS"
|
||||
.sp
|
||||
Axel Wagner and contributors
|
||||
-.SH "AUTHOR"
|
||||
-.PP
|
||||
-\fBAxel Wagner\fR <\&mail+i3bar@merovius\&.de\&>
|
||||
-.RS 4
|
||||
-Author.
|
||||
-.RE
|
||||
12
x11/i3/patches/patch-i3bar_i3bar_mk
Normal file
12
x11/i3/patches/patch-i3bar_i3bar_mk
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-i3bar_i3bar_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- i3bar/i3bar.mk.orig Fri Sep 21 11:43:45 2012
|
||||
+++ i3bar/i3bar.mk Fri Sep 21 11:44:13 2012
|
||||
@@ -21,7 +21,7 @@ i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
|
||||
install-i3bar: i3bar/i3bar
|
||||
echo "[i3bar] Install"
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
|
||||
- $(INSTALL) -m 0755 i3bar/i3bar $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_PROGRAM} i3bar/i3bar $(DESTDIR)$(PREFIX)/bin/
|
||||
|
||||
clean-i3bar:
|
||||
echo "[i3bar] Clean"
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-i3bar_src_child_c,v 1.4 2012/05/14 07:47:05 dcoppa Exp $
|
||||
|
||||
From 156a06e4958b1550dc8448556730e80b8b551289 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sat, 12 May 2012 06:23:37 +0000
|
||||
Subject: i3bar: Don't crash when full_text is missing or null in the JSON input
|
||||
|
||||
--- i3bar/src/child.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3bar/src/child.c Mon May 14 09:32:12 2012
|
||||
@@ -128,6 +128,10 @@ static int stdin_end_map(void *context) {
|
||||
parser_ctx *ctx = context;
|
||||
struct status_block *new_block = smalloc(sizeof(struct status_block));
|
||||
memcpy(new_block, &(ctx->block), sizeof(struct status_block));
|
||||
+ /* Ensure we have a full_text set, so that when it is missing (or null),
|
||||
+ * i3bar doesn't crash and the user gets an annoying message. */
|
||||
+ if (!new_block->full_text)
|
||||
+ new_block->full_text = sstrdup("SPEC VIOLATION (null)");
|
||||
TAILQ_INSERT_TAIL(&statusline_head, new_block, blocks);
|
||||
return 1;
|
||||
}
|
||||
@ -1,82 +0,0 @@
|
||||
$OpenBSD: patch-i3bar_src_xcb_c,v 1.8 2012/07/16 14:38:22 dcoppa Exp $
|
||||
|
||||
From 3daa3e052f2388f95ef525bdcb6cca840d4f9a32 Mon Sep 17 00:00:00 2001
|
||||
From: Marcel Hellwig <keks@cookiesoft.de>
|
||||
Date: Sun, 08 Jul 2012 19:31:34 +0000
|
||||
Subject: Don't display empty strings from i3status in i3bar
|
||||
|
||||
From 599f7cc2a4ad0536759203cbdb03680389ae5e7b Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sun, 10 Jun 2012 19:04:51 +0000
|
||||
Subject: i3bar: handle clicks with negative coordinates
|
||||
|
||||
From 4f93e0587a849de00a1f50bfcd48a549009178c0 Mon Sep 17 00:00:00 2001
|
||||
From: TunnelWicht <MilkFreeze@web.de>
|
||||
Date: Tue, 01 May 2012 11:35:34 +0000
|
||||
Subject: don't wrap when changing workspaces by mouse wheel scrolling
|
||||
|
||||
From 8a3574f301725ba48484c05408e35ecec27aad65 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Tue, 10 Jul 2012 20:52:14 +0000
|
||||
Subject: i3bar: inform _all_ clients of new tray selection owner
|
||||
|
||||
--- i3bar/src/xcb.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ i3bar/src/xcb.c Mon Jul 16 16:30:28 2012
|
||||
@@ -117,6 +117,9 @@ void refresh_statusline() {
|
||||
/* Convert all blocks from UTF-8 to UCS-2 and predict the text width (in
|
||||
* pixels). */
|
||||
TAILQ_FOREACH(block, &statusline_head, blocks) {
|
||||
+ if (strlen(block->full_text) == 0)
|
||||
+ continue;
|
||||
+
|
||||
block->ucs2_full_text = (xcb_char2b_t*)convert_utf8_to_ucs2(block->full_text, &(block->glyph_count_full_text));
|
||||
block->width = predict_text_width((char*)block->ucs2_full_text, block->glyph_count_full_text, true);
|
||||
/* If this is not the last block, add some pixels for a separator. */
|
||||
@@ -138,6 +141,9 @@ void refresh_statusline() {
|
||||
/* Draw the text of each block. */
|
||||
uint32_t x = 0;
|
||||
TAILQ_FOREACH(block, &statusline_head, blocks) {
|
||||
+ if (strlen(block->full_text) == 0)
|
||||
+ continue;
|
||||
+
|
||||
uint32_t colorpixel = (block->color ? get_colorpixel(block->color) : colors.bar_fg);
|
||||
set_font_colors(statusline_ctx, colorpixel, colors.bar_bg);
|
||||
draw_text((char*)block->ucs2_full_text, block->glyph_count_full_text,
|
||||
@@ -281,7 +287,7 @@ void handle_button(xcb_button_press_event_t *event) {
|
||||
return;
|
||||
}
|
||||
|
||||
- int32_t x = event->event_x;
|
||||
+ int32_t x = event->event_x >= 0 ? event->event_x : 0;
|
||||
|
||||
DLOG("Got Button %d\n", event->detail);
|
||||
|
||||
@@ -302,17 +308,13 @@ void handle_button(xcb_button_press_event_t *event) {
|
||||
break;
|
||||
case 4:
|
||||
/* Mouse wheel down. We select the next ws */
|
||||
- if (cur_ws == TAILQ_FIRST(walk->workspaces)) {
|
||||
- cur_ws = TAILQ_LAST(walk->workspaces, ws_head);
|
||||
- } else {
|
||||
+ if (cur_ws != TAILQ_FIRST(walk->workspaces)) {
|
||||
cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq);
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
/* Mouse wheel up. We select the previos ws */
|
||||
- if (cur_ws == TAILQ_LAST(walk->workspaces, ws_head)) {
|
||||
- cur_ws = TAILQ_FIRST(walk->workspaces);
|
||||
- } else {
|
||||
+ if (cur_ws != TAILQ_LAST(walk->workspaces, ws_head)) {
|
||||
cur_ws = TAILQ_NEXT(cur_ws, tailq);
|
||||
}
|
||||
break;
|
||||
@@ -1046,7 +1048,7 @@ void init_tray() {
|
||||
xcb_send_event(xcb_connection,
|
||||
0,
|
||||
xcb_root,
|
||||
- XCB_EVENT_MASK_STRUCTURE_NOTIFY,
|
||||
+ 0xFFFFFF,
|
||||
(char*)ev);
|
||||
free(event);
|
||||
free(tray_reply);
|
||||
@ -1,13 +1,14 @@
|
||||
$OpenBSD: patch-include_atoms_xmacro,v 1.1 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-include_atoms_xmacro,v 1.2 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
--- include/atoms.xmacro.orig Wed Apr 25 23:21:25 2012
|
||||
+++ include/atoms.xmacro Wed May 9 12:11:48 2012
|
||||
@@ -26,4 +26,6 @@ xmacro(WM_WINDOW_ROLE)
|
||||
--- include/atoms.xmacro.orig Wed Sep 19 18:08:09 2012
|
||||
+++ include/atoms.xmacro Thu Sep 20 14:12:10 2012
|
||||
@@ -26,5 +26,7 @@ xmacro(WM_WINDOW_ROLE)
|
||||
xmacro(I3_SOCKET_PATH)
|
||||
xmacro(I3_CONFIG_PATH)
|
||||
xmacro(I3_SYNC)
|
||||
+#if !defined(__OpenBSD__)
|
||||
xmacro(I3_SHMLOG_PATH)
|
||||
+#endif
|
||||
xmacro(I3_PID)
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-include_log_h,v 1.1 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-include_log_h,v 1.2 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
--- include/log.h.orig Wed Apr 25 23:21:25 2012
|
||||
+++ include/log.h Wed May 9 12:12:28 2012
|
||||
@@ -21,8 +21,10 @@
|
||||
--- include/log.h.orig Wed Sep 19 18:08:09 2012
|
||||
+++ include/log.h Thu Sep 20 14:12:10 2012
|
||||
@@ -28,8 +28,10 @@
|
||||
#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)
|
||||
|
||||
extern char *loglevels[];
|
||||
extern char *errorfilename;
|
||||
+#if !defined(__OpenBSD__)
|
||||
extern char *shmlogname;
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
$OpenBSD: patch-man_i3-migrate-config-to-v4_1,v 1.5 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-man_i3-migrate-config-to-v4_1,v 1.6 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
Fix fatal error: "argument count wrong: line arguments >= 2 (have 1)"
|
||||
|
||||
--- man/i3-migrate-config-to-v4.1.orig Mon May 7 16:54:51 2012
|
||||
+++ man/i3-migrate-config-to-v4.1 Mon May 7 16:55:03 2012
|
||||
--- man/i3-migrate-config-to-v4.1.orig Fri Sep 21 11:38:26 2012
|
||||
+++ man/i3-migrate-config-to-v4.1 Fri Sep 21 11:38:32 2012
|
||||
@@ -7,7 +7,7 @@
|
||||
.\" Source: i3 4.1.2
|
||||
.\" Source: i3 4.3
|
||||
.\" Language: English
|
||||
.\"
|
||||
-.TH "I3\-MIGRATE\-CONFIG\" "1" "04/25/2012" "i3 4\&.1\&.2" "i3 Manual"
|
||||
+.TH "I3\-MIGRATE\-CONFIG" "1" "04/25/2012" "i3 4\&.1\&.2" "i3 Manual"
|
||||
-.TH "I3\-MIGRATE\-CONFIG\" "1" "09/19/2012" "i3 4\&.3" "i3 Manual"
|
||||
+.TH "I3\-MIGRATE\-CONFIG" "1" "09/19/2012" "i3 4\&.3" "i3 Manual"
|
||||
.\" -----------------------------------------------------------------
|
||||
.\" * Define some portability stuff
|
||||
.\" -----------------------------------------------------------------
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-man_i3_1,v 1.3 2011/12/01 16:00:01 dcoppa Exp $
|
||||
--- man/i3.1.orig Thu Dec 1 15:05:48 2011
|
||||
+++ man/i3.1 Thu Dec 1 15:11:55 2011
|
||||
@@ -213,7 +213,7 @@ When starting, i3 looks for configuration files in the
|
||||
$OpenBSD: patch-man_i3_1,v 1.4 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- man/i3.1.orig Wed Sep 19 18:08:20 2012
|
||||
+++ man/i3.1 Thu Sep 20 14:12:10 2012
|
||||
@@ -240,7 +240,7 @@ When starting, i3 looks for configuration files in the
|
||||
.sp -1
|
||||
.IP " 2." 4.2
|
||||
.\}
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-man_i3_1,v 1.3 2011/12/01 16:00:01 dcoppa Exp $
|
||||
.RE
|
||||
.sp
|
||||
.RS 4
|
||||
@@ -235,7 +235,7 @@ When starting, i3 looks for configuration files in the
|
||||
@@ -262,7 +262,7 @@ When starting, i3 looks for configuration files in the
|
||||
.sp -1
|
||||
.IP " 4." 4.2
|
||||
.\}
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-man_i3_1,v 1.3 2011/12/01 16:00:01 dcoppa Exp $
|
||||
.RE
|
||||
.sp
|
||||
You can specify a custom path using the \-c option\&.
|
||||
@@ -255,13 +255,13 @@ font \-misc\-fixed\-medium\-r\-normal\-\-13\-120\-75\-
|
||||
@@ -282,13 +282,13 @@ font \-misc\-fixed\-medium\-r\-normal\-\-13\-120\-75\-
|
||||
floating_modifier Mod1
|
||||
|
||||
# start a terminal
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-man_i3_1,v 1.3 2011/12/01 16:00:01 dcoppa Exp $
|
||||
|
||||
# change focus
|
||||
bindsym Mod1+j focus left
|
||||
@@ -384,7 +384,7 @@ ulimit \-c unlimited
|
||||
@@ -407,7 +407,7 @@ ulimit \-c unlimited
|
||||
|
||||
# Start i3 and log to ~/\&.i3/logfile
|
||||
echo "Starting at $(date)" >> ~/\&.i3/logfile
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-parser-specs_commands_spec,v 1.1 2012/06/28 09:33:06 dcoppa Exp $
|
||||
|
||||
From f0b56c5e98a152cb65e8d1935a83707b5d87e30d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sun, 10 Jun 2012 15:56:28 +0000
|
||||
Subject: parser: reorder v/h/vertical/horizontal
|
||||
|
||||
--- parser-specs/commands.spec.orig Wed Apr 25 23:21:25 2012
|
||||
+++ parser-specs/commands.spec Thu Jun 28 11:01:38 2012
|
||||
@@ -130,7 +130,7 @@ state FULLSCREEN:
|
||||
|
||||
# split v|h|vertical|horizontal
|
||||
state SPLIT:
|
||||
- direction = 'v', 'h', 'vertical', 'horizontal'
|
||||
+ direction = 'horizontal', 'vertical', 'v', 'h'
|
||||
-> call cmd_split($direction)
|
||||
|
||||
# floating enable|disable|toggle
|
||||
@ -1,14 +1,24 @@
|
||||
$OpenBSD: patch-src_cfgparse_y,v 1.5 2011/12/27 09:05:17 dcoppa Exp $
|
||||
--- src/cfgparse.y.orig Sat Dec 24 16:25:08 2011
|
||||
+++ src/cfgparse.y Tue Dec 27 09:24:53 2011
|
||||
@@ -286,8 +286,8 @@ static void start_configerror_nagbar(const char *confi
|
||||
$OpenBSD: patch-src_cfgparse_y,v 1.6 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- src/cfgparse.y.orig Thu Sep 20 14:33:19 2012
|
||||
+++ src/cfgparse.y Thu Sep 20 14:35:04 2012
|
||||
@@ -325,16 +325,16 @@ static void start_configerror_nagbar(const char *confi
|
||||
/* child */
|
||||
if (configerror_pid == 0) {
|
||||
char *edit_command, *pager_command;
|
||||
- sasprintf(&edit_command, "i3-sensible-editor \"%s\" && i3-msg reload\n", config_path);
|
||||
- sasprintf(&pager_command, "i3-sensible-pager \"%s\"\n", errorfilename);
|
||||
+ sasprintf(&edit_command, "/usr/bin/vi \"%s\" && i3-msg reload\n", config_path);
|
||||
+ sasprintf(&pager_command, "/usr/bin/less \"%s\"\n", errorfilename);
|
||||
if (!write_nagbar_script(edit_script_path, edit_command) ||
|
||||
!write_nagbar_script(pager_script_path, pager_command))
|
||||
return;
|
||||
|
||||
char *editaction,
|
||||
*pageraction;
|
||||
- sasprintf(&editaction, "i3-sensible-terminal -e sh -c \"i3-sensible-editor \\\"%s\\\" && i3-msg reload\"", config_path);
|
||||
- sasprintf(&pageraction, "i3-sensible-terminal -e i3-sensible-pager \"%s\"", errorfilename);
|
||||
+ sasprintf(&editaction, "${X11BASE}/bin/xterm -e sh -c \"/usr/bin/vi \\\"%s\\\" && i3-msg reload\"", config_path);
|
||||
+ sasprintf(&pageraction, "${X11BASE}/bin/xterm -e /usr/bin/less \"%s\"", errorfilename);
|
||||
- sasprintf(&editaction, "i3-sensible-terminal -e \"%s\"", edit_script_path);
|
||||
- sasprintf(&pageraction, "i3-sensible-terminal -e \"%s\"", pager_script_path);
|
||||
+ sasprintf(&editaction, "${X11BASE}/bin/xterm -e \"%s\"", edit_script_path);
|
||||
+ sasprintf(&pageraction, "${X11BASE}/bin/xterm -e \"%s\"", pager_script_path);
|
||||
char *argv[] = {
|
||||
NULL, /* will be replaced by the executable path */
|
||||
"-t",
|
||||
|
||||
@ -1,258 +1,12 @@
|
||||
$OpenBSD: patch-src_commands_c,v 1.3 2012/08/27 09:49:18 dcoppa Exp $
|
||||
|
||||
From b88ab981fd0a5725ed886a9f9788a5b1e721534c Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Grover <ondrej.grover@gmail.com>
|
||||
Date: Wed, 02 May 2012 14:05:27 +0000
|
||||
Subject: bugfix: less differentiation between named and numbered workspaces
|
||||
|
||||
calling workspace by number now also checks for switching back and forth
|
||||
and creates a new workspace if no workspace starting with that number is
|
||||
found
|
||||
|
||||
also removed the obsolete tree_render() in favor of setting
|
||||
cmd_output->needs_tree_render to true
|
||||
|
||||
From 1089b0b201cef30fbfd03620339f5e8a166feded Mon Sep 17 00:00:00 2001
|
||||
From: Joel Stemmer <stemmertech@gmail.com>
|
||||
Date: Sat, 18 Aug 2012 13:25:00 +0000
|
||||
Subject: fix resizing floating windows by height
|
||||
|
||||
From 83dc5d5cb6c71d365cd79b376fcb073e9120144d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sun, 22 Jul 2012 19:25:38 +0000
|
||||
Subject: Bugfix: Fix duplicate return value for 'resize' command
|
||||
|
||||
From 4eab046e8fa40535d1a2ad80533915983ef0ee7e Mon Sep 17 00:00:00 2001
|
||||
From: Fernando Tarla Cardoso Lemos <fernandotcl@gmail.com>
|
||||
Date: Sat, 21 Apr 2012 19:34:25 +0000
|
||||
Subject: Allow focus w/ target when in fs in some cases.
|
||||
|
||||
If the target is in a different workspace, there's no reason why
|
||||
we wouldn't allow the user to focus it. We already allow this when
|
||||
focusing a workspace, for example.
|
||||
|
||||
--- src/commands.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/commands.c Mon Aug 27 11:43:14 2012
|
||||
@@ -65,6 +65,28 @@ static Output *get_output_from_string(Output *current_
|
||||
return output;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * Checks whether we switched to a new workspace and returns false in that case,
|
||||
+ * signaling that further workspace switching should be done by the calling function
|
||||
+ * If not, calls workspace_back_and_forth() if workspace_auto_back_and_forth is set
|
||||
+ * and return true, signaling that no further workspace switching should occur in the calling function.
|
||||
+ *
|
||||
+ */
|
||||
+static bool maybe_back_and_forth(struct CommandResult *cmd_output, char *name) {
|
||||
+ Con *ws = con_get_workspace(focused);
|
||||
+
|
||||
+ /* If we switched to a different workspace, do nothing */
|
||||
+ if (strcmp(ws->name, name) != 0)
|
||||
+ return false;
|
||||
+
|
||||
+ DLOG("This workspace is already focused.\n");
|
||||
+ if (config.workspace_auto_back_and_forth) {
|
||||
+ workspace_back_and_forth();
|
||||
+ cmd_output->needs_tree_render = true;
|
||||
+ }
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
// This code is commented out because we might recycle it for popping up error
|
||||
// messages on parser errors.
|
||||
#if 0
|
||||
@@ -448,7 +470,7 @@ static void cmd_resize_floating(I3_CMD, char *way, cha
|
||||
if (strcmp(direction, "up") == 0) {
|
||||
floating_con->rect.y -= px;
|
||||
floating_con->rect.height += px;
|
||||
- } else if (strcmp(direction, "down") == 0) {
|
||||
+ } else if (strcmp(direction, "down") == 0 || strcmp(direction, "height") == 0) {
|
||||
floating_con->rect.height += px;
|
||||
} else if (strcmp(direction, "left") == 0) {
|
||||
floating_con->rect.x -= px;
|
||||
@@ -458,7 +480,7 @@ static void cmd_resize_floating(I3_CMD, char *way, cha
|
||||
}
|
||||
}
|
||||
|
||||
-static void cmd_resize_tiling_direction(I3_CMD, char *way, char *direction, int ppt) {
|
||||
+static bool cmd_resize_tiling_direction(I3_CMD, char *way, char *direction, int ppt) {
|
||||
LOG("tiling resize\n");
|
||||
/* get the appropriate current container (skip stacked/tabbed cons) */
|
||||
Con *current = focused;
|
||||
@@ -491,7 +513,7 @@ static void cmd_resize_tiling_direction(I3_CMD, char *
|
||||
LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
|
||||
(orientation == HORIZ ? "horizontal" : "vertical"));
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
if (strcmp(direction, "up") == 0 || strcmp(direction, "left") == 0) {
|
||||
@@ -502,7 +524,7 @@ static void cmd_resize_tiling_direction(I3_CMD, char *
|
||||
if (other == TAILQ_END(workspaces)) {
|
||||
LOG("No other container in this direction found, cannot resize.\n");
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
LOG("other->percent = %f\n", other->percent);
|
||||
LOG("current->percent before = %f\n", current->percent);
|
||||
@@ -525,9 +547,11 @@ static void cmd_resize_tiling_direction(I3_CMD, char *
|
||||
} else {
|
||||
LOG("Not resizing, already at minimum size\n");
|
||||
}
|
||||
+
|
||||
+ return true;
|
||||
}
|
||||
|
||||
-static void cmd_resize_tiling_width_height(I3_CMD, char *way, char *direction, int ppt) {
|
||||
+static bool cmd_resize_tiling_width_height(I3_CMD, char *way, char *direction, int ppt) {
|
||||
LOG("width/height resize\n");
|
||||
/* get the appropriate current container (skip stacked/tabbed cons) */
|
||||
Con *current = focused;
|
||||
@@ -559,13 +583,13 @@ static void cmd_resize_tiling_width_height(I3_CMD, cha
|
||||
LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
|
||||
(orientation == HORIZ ? "horizontal" : "vertical"));
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
if (children == 1) {
|
||||
LOG("This is the only container, cannot resize.\n");
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/* Ensure all the other children have a percentage set. */
|
||||
@@ -588,13 +612,13 @@ static void cmd_resize_tiling_width_height(I3_CMD, cha
|
||||
if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) {
|
||||
LOG("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent);
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
}
|
||||
if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) {
|
||||
LOG("Not resizing, already at minimum size\n");
|
||||
cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
current->percent += ((double)ppt / 100.0);
|
||||
@@ -606,6 +630,8 @@ static void cmd_resize_tiling_width_height(I3_CMD, cha
|
||||
child->percent -= subtract_percent;
|
||||
LOG("child->percent after (%p) = %f\n", child, child->percent);
|
||||
}
|
||||
+
|
||||
+ return true;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -628,9 +654,13 @@ void cmd_resize(I3_CMD, char *way, char *direction, ch
|
||||
cmd_resize_floating(current_match, cmd_output, way, direction, floating_con, px);
|
||||
} else {
|
||||
if (strcmp(direction, "width") == 0 ||
|
||||
- strcmp(direction, "height") == 0)
|
||||
- cmd_resize_tiling_width_height(current_match, cmd_output, way, direction, ppt);
|
||||
- else cmd_resize_tiling_direction(current_match, cmd_output, way, direction, ppt);
|
||||
+ strcmp(direction, "height") == 0) {
|
||||
+ if (!cmd_resize_tiling_width_height(current_match, cmd_output, way, direction, ppt))
|
||||
+ return;
|
||||
+ } else {
|
||||
+ if (!cmd_resize_tiling_direction(current_match, cmd_output, way, direction, ppt))
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
@@ -752,12 +782,19 @@ void cmd_workspace_number(I3_CMD, char *which) {
|
||||
child->num == parsed_num);
|
||||
|
||||
if (!workspace) {
|
||||
- LOG("There is no workspace with number %d.\n", parsed_num);
|
||||
+ LOG("There is no workspace with number %d, creating a new one.\n", parsed_num);
|
||||
cmd_output->json_output = sstrdup("{\"success\": false, "
|
||||
"\"error\": \"No such workspace\"}");
|
||||
+ /* terminate the which string after the endposition of the number */
|
||||
+ *endptr = '\0';
|
||||
+ if (maybe_back_and_forth(cmd_output, which))
|
||||
+ return;
|
||||
+ workspace_show_by_name(which);
|
||||
+ cmd_output->needs_tree_render = true;
|
||||
return;
|
||||
}
|
||||
-
|
||||
+ if (maybe_back_and_forth(cmd_output, which))
|
||||
+ return;
|
||||
workspace_show(workspace);
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
@@ -789,20 +826,8 @@ void cmd_workspace_name(I3_CMD, char *name) {
|
||||
}
|
||||
|
||||
DLOG("should switch to workspace %s\n", name);
|
||||
-
|
||||
- Con *ws = con_get_workspace(focused);
|
||||
-
|
||||
- /* Check if the command wants to switch to the current workspace */
|
||||
- if (strcmp(ws->name, name) == 0) {
|
||||
- DLOG("This workspace is already focused.\n");
|
||||
- if (config.workspace_auto_back_and_forth) {
|
||||
- workspace_back_and_forth();
|
||||
- tree_render();
|
||||
- }
|
||||
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
+ if (maybe_back_and_forth(cmd_output, name))
|
||||
+ return;
|
||||
workspace_show_by_name(name);
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
@@ -1196,16 +1221,7 @@ void cmd_focus_level(I3_CMD, char *level) {
|
||||
*/
|
||||
void cmd_focus(I3_CMD) {
|
||||
DLOG("current_match = %p\n", current_match);
|
||||
- if (focused &&
|
||||
- focused->type != CT_WORKSPACE &&
|
||||
- focused->fullscreen_mode != CF_NONE) {
|
||||
- LOG("Cannot change focus while in fullscreen mode.\n");
|
||||
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
|
||||
- return;
|
||||
- }
|
||||
|
||||
- owindow *current;
|
||||
-
|
||||
if (match_is_empty(current_match)) {
|
||||
ELOG("You have to specify which window/container should be focused.\n");
|
||||
ELOG("Example: [class=\"urxvt\" title=\"irssi\"] focus\n");
|
||||
@@ -1217,12 +1233,24 @@ void cmd_focus(I3_CMD) {
|
||||
}
|
||||
|
||||
int count = 0;
|
||||
+ owindow *current;
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
Con *ws = con_get_workspace(current->con);
|
||||
/* If no workspace could be found, this was a dock window.
|
||||
* Just skip it, you cannot focus dock windows. */
|
||||
if (!ws)
|
||||
continue;
|
||||
+
|
||||
+ /* Don't allow the focus switch if the focused and current
|
||||
+ * containers are in the same workspace. */
|
||||
+ if (focused &&
|
||||
+ focused->type != CT_WORKSPACE &&
|
||||
+ focused->fullscreen_mode != CF_NONE &&
|
||||
+ con_get_workspace(focused) == ws) {
|
||||
+ LOG("Cannot change focus while in fullscreen mode (same workspace).\n");
|
||||
+ cmd_output->json_output = sstrdup("{\"success\": false}");
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
/* If the container is not on the current workspace,
|
||||
* workspace_show() will switch to a different workspace and (if
|
||||
$OpenBSD: patch-src_commands_c,v 1.4 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- src/commands.c.orig Thu Sep 20 14:38:12 2012
|
||||
+++ src/commands.c Thu Sep 20 14:39:06 2012
|
||||
@@ -160,7 +160,7 @@ void cmd_MIGRATION_start_nagbar(void) {
|
||||
/* child */
|
||||
if (migration_pid == 0) {
|
||||
char *pageraction;
|
||||
- sasprintf(&pageraction, "i3-sensible-terminal -e i3-sensible-pager \"%s\"", errorfilename);
|
||||
+ sasprintf(&pageraction, "${X11BASE}/bin/xterm -e /usr/bin/less \"%s\"", errorfilename);
|
||||
char *argv[] = {
|
||||
NULL, /* will be replaced by the executable path */
|
||||
"-t",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_config_c,v 1.7 2011/12/27 09:05:17 dcoppa Exp $
|
||||
--- src/config.c.orig Sat Dec 24 16:25:08 2011
|
||||
+++ src/config.c Tue Dec 27 09:24:53 2011
|
||||
@@ -218,7 +218,7 @@ static char *get_config_path(const char *override_conf
|
||||
$OpenBSD: patch-src_config_c,v 1.8 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- src/config.c.orig Wed Sep 19 18:08:09 2012
|
||||
+++ src/config.c Thu Sep 20 14:12:10 2012
|
||||
@@ -246,7 +246,7 @@ static char *get_config_path(const char *override_conf
|
||||
|
||||
/* 4: check for $XDG_CONFIG_DIRS/i3/config */
|
||||
if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL)
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-src_floating_c,v 1.12 2012/08/08 14:33:25 dcoppa Exp $
|
||||
|
||||
From 74510c59c7db676f1228d054791e1e37456f6660 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sat, 04 Aug 2012 13:33:50 +0000
|
||||
Subject: floating_fix_coordinates: properly deal with negative positions
|
||||
|
||||
--- src/floating.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/floating.c Wed Aug 8 15:39:37 2012
|
||||
@@ -607,19 +607,24 @@ void floating_reposition(Con *con, Rect newrect) {
|
||||
*
|
||||
*/
|
||||
void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect) {
|
||||
- DLOG("Fixing coordinates of floating window %p\n", con);
|
||||
+ DLOG("Fixing coordinates of floating window %p (rect (%d, %d), %d x %d)\n",
|
||||
+ con, con->rect.x, con->rect.y, con->rect.width, con->rect.height);
|
||||
+ DLOG("old_rect = (%d, %d), %d x %d\n",
|
||||
+ old_rect->x, old_rect->y, old_rect->width, old_rect->height);
|
||||
+ DLOG("new_rect = (%d, %d), %d x %d\n",
|
||||
+ new_rect->x, new_rect->y, new_rect->width, new_rect->height);
|
||||
/* First we get the x/y coordinates relative to the x/y coordinates
|
||||
* of the output on which the window is on */
|
||||
- uint32_t rel_x = (con->rect.x - old_rect->x);
|
||||
- uint32_t rel_y = (con->rect.y - old_rect->y);
|
||||
+ int32_t rel_x = (con->rect.x - old_rect->x);
|
||||
+ int32_t rel_y = (con->rect.y - old_rect->y);
|
||||
/* Then we calculate a fraction, for example 0.63 for a window
|
||||
* which is at y = 1212 of a 1920 px high output */
|
||||
- double fraction_x = ((double)rel_x / old_rect->width);
|
||||
- double fraction_y = ((double)rel_y / old_rect->height);
|
||||
+ double fraction_x = ((double)rel_x / (int32_t)old_rect->width);
|
||||
+ double fraction_y = ((double)rel_y / (int32_t)old_rect->height);
|
||||
DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n",
|
||||
rel_x, rel_y, fraction_x, fraction_y, old_rect->width, old_rect->height);
|
||||
- con->rect.x = new_rect->x + (fraction_x * new_rect->width);
|
||||
- con->rect.y = new_rect->y + (fraction_y * new_rect->height);
|
||||
+ con->rect.x = (int32_t)new_rect->x + (fraction_x * (int32_t)new_rect->width);
|
||||
+ con->rect.y = (int32_t)new_rect->y + (fraction_y * (int32_t)new_rect->height);
|
||||
DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y);
|
||||
}
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-src_handlers_c,v 1.9 2012/06/28 09:33:06 dcoppa Exp $
|
||||
|
||||
From 6e9bbe67ce5f02ff6ac24889e5a215ee46247c32 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Wed, 27 Jun 2012 15:48:22 +0000
|
||||
Subject: Bugfix: fix reload crashes in rare cases
|
||||
|
||||
--- src/handlers.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/handlers.c Thu Jun 28 10:58:57 2012
|
||||
@@ -119,7 +119,9 @@ static void handle_key_press(xcb_key_press_event_t *ev
|
||||
}
|
||||
}
|
||||
|
||||
- struct CommandResult *command_output = parse_command(bind->command);
|
||||
+ char *command_copy = sstrdup(bind->command);
|
||||
+ struct CommandResult *command_output = parse_command(command_copy);
|
||||
+ free(command_copy);
|
||||
|
||||
if (command_output->needs_tree_render)
|
||||
tree_render();
|
||||
27
x11/i3/patches/patch-src_i3_mk
Normal file
27
x11/i3/patches/patch-src_i3_mk
Normal file
@ -0,0 +1,27 @@
|
||||
$OpenBSD: patch-src_i3_mk,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- src/i3.mk.orig Fri Sep 21 11:56:21 2012
|
||||
+++ src/i3.mk Fri Sep 21 11:59:56 2012
|
||||
@@ -69,16 +69,13 @@ install-i3: i3
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
|
||||
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/applications
|
||||
- $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/
|
||||
- $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/
|
||||
- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
|
||||
- test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
|
||||
- $(INSTALL) -m 0644 i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
|
||||
- $(INSTALL) -m 0644 i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop
|
||||
- $(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
|
||||
+ ${INSTALL_PROGRAM} i3 $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_SCRIPT} i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/
|
||||
+ ${INSTALL_DATA} i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
|
||||
+ ${INSTALL_DATA} i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
|
||||
+ ${INSTALL_DATA} i3.xsession.desktop $(DESTDIR)$(PREFIX)/share/xsessions/i3.desktop
|
||||
+ ${INSTALL_DATA} i3.applications.desktop $(DESTDIR)$(PREFIX)/share/applications/i3.desktop
|
||||
+ ${INSTALL_DATA} include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
|
||||
|
||||
clean-i3:
|
||||
echo "[i3] Clean"
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-src_ipc_c,v 1.7 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-src_ipc_c,v 1.8 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
Add missing header
|
||||
|
||||
--- src/ipc.c.orig Mon May 7 17:04:44 2012
|
||||
+++ src/ipc.c Mon May 7 17:04:58 2012
|
||||
@@ -9,6 +9,7 @@
|
||||
--- src/ipc.c.orig Wed Sep 19 18:08:09 2012
|
||||
+++ src/ipc.c Thu Sep 20 14:12:10 2012
|
||||
@@ -11,6 +11,7 @@
|
||||
*/
|
||||
#include "all.h"
|
||||
|
||||
|
||||
18
x11/i3/patches/patch-src_key_press_c
Normal file
18
x11/i3/patches/patch-src_key_press_c
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-src_key_press_c,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
--- src/key_press.c.orig Thu Sep 20 14:44:02 2012
|
||||
+++ src/key_press.c Thu Sep 20 14:44:46 2012
|
||||
@@ -118,12 +118,12 @@ static void start_commanderror_nagbar(void) {
|
||||
/* child */
|
||||
if (nagbar_pid == 0) {
|
||||
char *pager_command;
|
||||
- sasprintf(&pager_command, "i3-sensible-pager \"%s\"\n", errorfilename);
|
||||
+ sasprintf(&pager_command, "/usr/bin/less \"%s\"\n", errorfilename);
|
||||
if (!write_nagbar_script(pager_script_path, pager_command))
|
||||
return;
|
||||
|
||||
char *pageraction;
|
||||
- sasprintf(&pageraction, "i3-sensible-terminal -e \"%s\"", pager_script_path);
|
||||
+ sasprintf(&pageraction, "${X11BASE}/bin/xterm -e \"%s\"", pager_script_path);
|
||||
char *argv[] = {
|
||||
NULL, /* will be replaced by the executable path */
|
||||
"-t",
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-src_log_c,v 1.3 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-src_log_c,v 1.4 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
--- src/log.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/log.c Wed May 9 12:21:07 2012
|
||||
@@ -23,7 +23,9 @@
|
||||
--- src/log.c.orig Wed Sep 19 18:08:09 2012
|
||||
+++ src/log.c Thu Sep 20 14:19:57 2012
|
||||
@@ -30,7 +30,9 @@
|
||||
#include "log.h"
|
||||
#include "i3.h"
|
||||
#include "libi3.h"
|
||||
@ -12,9 +12,9 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
#include "shmlog.h"
|
||||
+#endif
|
||||
|
||||
/* loglevels.h is autogenerated at make time */
|
||||
#include "loglevels.h"
|
||||
@@ -35,6 +37,7 @@ char *errorfilename;
|
||||
static bool debug_logging = false;
|
||||
static bool verbose = false;
|
||||
@@ -39,6 +41,7 @@ char *errorfilename;
|
||||
|
||||
/* SHM logging variables */
|
||||
|
||||
@ -22,7 +22,7 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
/* The name for the SHM (/i3-log-%pid). Will end up on /dev/shm on most
|
||||
* systems. Global so that we can clean up at exit. */
|
||||
char *shmlogname = "";
|
||||
@@ -66,6 +69,7 @@ static void store_log_markers(void) {
|
||||
@@ -70,6 +73,7 @@ static void store_log_markers(void) {
|
||||
header->offset_last_wrap = (loglastwrap - logbuffer);
|
||||
header->size = logbuffer_size;
|
||||
}
|
||||
@ -30,7 +30,7 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
/*
|
||||
* Initializes logging by creating an error logfile in /tmp (or
|
||||
@@ -86,6 +90,7 @@ void init_logging(void) {
|
||||
@@ -90,6 +94,7 @@ void init_logging(void) {
|
||||
}
|
||||
}
|
||||
|
||||
@ -38,15 +38,15 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
/* If this is a debug build (not a release version), we will enable SHM
|
||||
* logging by default, unless the user turned it off explicitly. */
|
||||
if (logbuffer == NULL && shmlog_size > 0) {
|
||||
@@ -122,6 +127,7 @@ void init_logging(void) {
|
||||
@@ -145,6 +150,7 @@ void init_logging(void) {
|
||||
loglastwrap = logbuffer + logbuffer_size;
|
||||
store_log_markers();
|
||||
}
|
||||
+#endif
|
||||
atexit(purge_zerobyte_logfile);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -188,7 +194,9 @@ static void vlog(const bool print, const char *fmt, va
|
||||
@@ -197,7 +203,9 @@ static void vlog(const bool print, const char *fmt, va
|
||||
* false true print message only
|
||||
* false false INVALID, never called
|
||||
*/
|
||||
@ -56,15 +56,15 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
#ifdef DEBUG_TIMING
|
||||
struct timeval tv;
|
||||
gettimeofday(&tv, NULL);
|
||||
@@ -197,6 +205,7 @@ static void vlog(const bool print, const char *fmt, va
|
||||
@@ -206,6 +214,7 @@ static void vlog(const bool print, const char *fmt, va
|
||||
printf("%s", message);
|
||||
#endif
|
||||
vprintf(fmt, args);
|
||||
+#if !defined(__OpenBSD__)
|
||||
} else {
|
||||
len += vsnprintf(message + len, sizeof(message) - len, fmt, args);
|
||||
if (len < 0 ) {
|
||||
@@ -227,6 +236,7 @@ static void vlog(const bool print, const char *fmt, va
|
||||
if (len >= sizeof(message)) {
|
||||
@@ -234,6 +243,7 @@ static void vlog(const bool print, const char *fmt, va
|
||||
if (print)
|
||||
fwrite(message, len, 1, stdout);
|
||||
}
|
||||
@ -72,7 +72,7 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -237,7 +247,11 @@ static void vlog(const bool print, const char *fmt, va
|
||||
@@ -244,7 +254,11 @@ static void vlog(const bool print, const char *fmt, va
|
||||
void verboselog(char *fmt, ...) {
|
||||
va_list args;
|
||||
|
||||
@ -84,14 +84,14 @@ OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
return;
|
||||
|
||||
va_start(args, fmt);
|
||||
@@ -272,7 +286,11 @@ void errorlog(char *fmt, ...) {
|
||||
void debuglog(uint64_t lev, char *fmt, ...) {
|
||||
@@ -279,7 +293,11 @@ void errorlog(char *fmt, ...) {
|
||||
void debuglog(char *fmt, ...) {
|
||||
va_list args;
|
||||
|
||||
+#if !defined(__OpenBSD__)
|
||||
if (!logbuffer && !(loglevel & lev))
|
||||
if (!logbuffer && !(debug_logging))
|
||||
+#else
|
||||
+ if ((loglevel & lev) == 0)
|
||||
+ if (!debug_logging)
|
||||
+#endif
|
||||
return;
|
||||
|
||||
|
||||
@ -1,15 +1,10 @@
|
||||
$OpenBSD: patch-src_main_c,v 1.4 2012/06/28 09:33:06 dcoppa Exp $
|
||||
$OpenBSD: patch-src_main_c,v 1.5 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
From 6146f39b8a253bc84bc5ce1feb2e3cabc50d71ba Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Mon, 25 Jun 2012 19:43:41 +0000
|
||||
Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
|
||||
--- src/main.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/main.c Thu Jun 28 10:55:31 2012
|
||||
@@ -220,11 +220,13 @@ static void i3_exit(void) {
|
||||
--- src/main.c.orig Wed Sep 19 18:08:09 2012
|
||||
+++ src/main.c Thu Sep 20 11:56:52 2012
|
||||
@@ -219,11 +219,13 @@ static void i3_exit(void) {
|
||||
ev_loop_destroy(main_loop);
|
||||
#endif
|
||||
|
||||
@ -23,7 +18,7 @@ Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -235,10 +237,12 @@ static void i3_exit(void) {
|
||||
@@ -234,10 +236,12 @@ static void i3_exit(void) {
|
||||
*/
|
||||
static void handle_signal(int sig, siginfo_t *info, void *data) {
|
||||
fprintf(stderr, "Received signal %d, terminating\n", sig);
|
||||
@ -36,7 +31,7 @@ Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
fflush(stderr);
|
||||
raise(sig);
|
||||
}
|
||||
@@ -264,8 +268,10 @@ int main(int argc, char *argv[]) {
|
||||
@@ -266,8 +270,10 @@ int main(int argc, char *argv[]) {
|
||||
{"force-xinerama", no_argument, 0, 0},
|
||||
{"force_xinerama", no_argument, 0, 0},
|
||||
{"disable-signalhandler", no_argument, 0, 0},
|
||||
@ -47,26 +42,26 @@ Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
{"get-socketpath", no_argument, 0, 0},
|
||||
{"get_socketpath", no_argument, 0, 0},
|
||||
{"fake_outputs", required_argument, 0, 0},
|
||||
@@ -299,8 +305,10 @@ int main(int argc, char *argv[]) {
|
||||
* determine whether this is a git version or a release version. */
|
||||
debug_build = ((strchr(i3_version, '(') - i3_version) > 10);
|
||||
@@ -292,8 +298,10 @@ int main(int argc, char *argv[]) {
|
||||
* (file) logging. */
|
||||
init_logging();
|
||||
|
||||
+#if !defined(__OpenBSD__)
|
||||
/* On non-release builds, disable SHM logging by default. */
|
||||
shmlog_size = (debug_build ? 25 * 1024 * 1024 : 0);
|
||||
shmlog_size = (is_debug_build() ? 25 * 1024 * 1024 : 0);
|
||||
+#endif
|
||||
|
||||
start_argv = argv;
|
||||
|
||||
@@ -358,6 +366,7 @@ int main(int argc, char *argv[]) {
|
||||
@@ -357,6 +365,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
return 1;
|
||||
exit(EXIT_FAILURE);
|
||||
+#if !defined(__OpenBSD__)
|
||||
} else if (strcmp(long_options[option_index].name, "shmlog-size") == 0 ||
|
||||
strcmp(long_options[option_index].name, "shmlog_size") == 0) {
|
||||
shmlog_size = atoi(optarg);
|
||||
@@ -366,6 +375,7 @@ int main(int argc, char *argv[]) {
|
||||
@@ -365,6 +374,7 @@ int main(int argc, char *argv[]) {
|
||||
init_logging();
|
||||
LOG("Limiting SHM log size to %d bytes\n", shmlog_size);
|
||||
break;
|
||||
@ -88,15 +83,6 @@ Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
fprintf(stderr, "If you pass plain text arguments, i3 will interpret them as a command\n"
|
||||
"to send to a currently running i3 (like i3-msg). This allows you to\n"
|
||||
"use nice and logical commands, such as:\n"
|
||||
@@ -417,7 +429,7 @@ int main(int argc, char *argv[]) {
|
||||
/* If the user passes more arguments, we act like i3-msg would: Just send
|
||||
* the arguments as an IPC message to i3. This allows for nice semantic
|
||||
* commands such as 'i3 border none'. */
|
||||
- if (optind < argc) {
|
||||
+ if (!only_check_config && optind < argc) {
|
||||
/* We enable verbose mode so that the user knows what’s going on.
|
||||
* This should make it easier to find mistakes when the user passes
|
||||
* arguments by mistake. */
|
||||
@@ -471,8 +483,10 @@ int main(int argc, char *argv[]) {
|
||||
return 0;
|
||||
}
|
||||
@ -107,4 +93,4 @@ Subject: when using i3 -C, don't send remaining arguments via IPC
|
||||
+#endif
|
||||
|
||||
/* Try to enable core dumps by default when running a debug build */
|
||||
if (debug_build) {
|
||||
if (is_debug_build()) {
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
$OpenBSD: patch-src_randr_c,v 1.9 2012/08/08 14:33:25 dcoppa Exp $
|
||||
|
||||
From e36674c5b8389ff93537fdc9ad32d23bd7add61d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sat, 04 Aug 2012 13:19:11 +0000
|
||||
Subject: Fix a crash when the current output cannot be determined
|
||||
|
||||
From d57d51da6d040e8572159332224615f232c4645a Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Sat, 04 Aug 2012 13:21:16 +0000
|
||||
Subject: Bugfix: Properly fix floating coordinates when disabling outputs
|
||||
|
||||
Since the content containers are not yet updated (they will be when
|
||||
rendering), we need to use the output containers.s rects instead.
|
||||
|
||||
--- src/randr.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/randr.c Wed Aug 8 15:36:52 2012
|
||||
@@ -359,6 +359,19 @@ void init_ws_for_output(Output *output, Con *content)
|
||||
workspace_show(previous);
|
||||
}
|
||||
|
||||
+ /* Render the output on which the workspace was to get correct Rects.
|
||||
+ * Then, we need to work with the "content" container, since we cannot
|
||||
+ * be sure that the workspace itself was rendered at all (in case it's
|
||||
+ * invisible, it won't be rendered). */
|
||||
+ render_con(workspace_out, false);
|
||||
+ Con *ws_out_content = output_get_content(workspace_out);
|
||||
+
|
||||
+ Con *floating_con;
|
||||
+ TAILQ_FOREACH(floating_con, &(workspace->floating_head), floating_windows)
|
||||
+ /* NB: We use output->con here because content is not yet rendered,
|
||||
+ * so it has a rect of {0, 0, 0, 0}. */
|
||||
+ floating_fix_coordinates(floating_con, &(ws_out_content->rect), &(output->con->rect));
|
||||
+
|
||||
con_detach(workspace);
|
||||
con_attach(workspace, content, false);
|
||||
|
||||
@@ -682,7 +695,7 @@ void randr_query_outputs(void) {
|
||||
DLOG("Fixing the coordinates of floating containers\n");
|
||||
Con *floating_con;
|
||||
TAILQ_FOREACH(floating_con, &(current->floating_head), floating_windows)
|
||||
- floating_fix_coordinates(floating_con, &(old_content->rect), &(first_content->rect));
|
||||
+ floating_fix_coordinates(floating_con, &(output->con->rect), &(first->con->rect));
|
||||
DLOG("Done, next\n");
|
||||
}
|
||||
DLOG("re-attached all workspaces\n");
|
||||
24
x11/i3/patches/patch-src_sighandler_c
Normal file
24
x11/i3/patches/patch-src_sighandler_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-src_sighandler_c,v 1.3 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
From 710478055881928c70f8c6c1411076eb06a92936 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Thu, 20 Sep 2012 08:55:03 +0000
|
||||
Subject: spelling fix: s/succesfully/successfully/
|
||||
|
||||
--- src/sighandler.c.orig Fri Sep 21 13:40:19 2012
|
||||
+++ src/sighandler.c Fri Sep 21 13:41:27 2012
|
||||
@@ -112,12 +112,12 @@ static int backtrace(void) {
|
||||
|
||||
waitpid(pid_gdb, &status, 0);
|
||||
|
||||
- /* see if the backtrace was succesful or not */
|
||||
+ /* see if the backtrace was successful or not */
|
||||
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
|
||||
DLOG("GDB did not run properly\n");
|
||||
return -1;
|
||||
} else if (stat(filename, &bt) == -1) {
|
||||
- DLOG("GDB executed succesfully, but no backtrace was generated\n");
|
||||
+ DLOG("GDB executed successfully, but no backtrace was generated\n");
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
24
x11/i3/patches/patch-src_startup_c
Normal file
24
x11/i3/patches/patch-src_startup_c
Normal file
@ -0,0 +1,24 @@
|
||||
$OpenBSD: patch-src_startup_c,v 1.1 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
On OpenBSD, time_t is an int.
|
||||
|
||||
--- src/startup.c.orig Thu Sep 20 14:25:49 2012
|
||||
+++ src/startup.c Thu Sep 20 14:26:05 2012
|
||||
@@ -74,7 +74,7 @@ static int _delete_startup_sequence(struct Startup_Seq
|
||||
|
||||
/* Mark the given sequence for deletion in 30 seconds. */
|
||||
sequence->delete_at = current_time + 30;
|
||||
- DLOG("Will delete startup sequence %s at timestamp %ld\n",
|
||||
+ DLOG("Will delete startup sequence %s at timestamp %d\n",
|
||||
sequence->id, sequence->delete_at);
|
||||
|
||||
/* Traverse the list and delete everything which was marked for deletion 30
|
||||
@@ -94,7 +94,7 @@ static int _delete_startup_sequence(struct Startup_Seq
|
||||
if (current_time <= current->delete_at)
|
||||
continue;
|
||||
|
||||
- DLOG("Deleting startup sequence %s, delete_at = %ld, current_time = %ld\n",
|
||||
+ DLOG("Deleting startup sequence %s, delete_at = %d, current_time = %d\n",
|
||||
current->id, current->delete_at, current_time);
|
||||
|
||||
/* Unref the context, will be free()d */
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-src_workspace_c,v 1.6 2012/05/28 13:37:50 dcoppa Exp $
|
||||
|
||||
From ec4e6d1cdf5b76c79da2879635e4094e25a01f3d Mon Sep 17 00:00:00 2001
|
||||
From: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Wed, 16 May 2012 04:24:16 +0000
|
||||
Subject: Fix stray workspaces "number 1" being created when having workspace number 1 in your config
|
||||
|
||||
--- src/workspace.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/workspace.c Mon May 28 13:59:35 2012
|
||||
@@ -112,14 +112,15 @@ Con *create_workspace_on_output(Output *output, Con *c
|
||||
DLOG("relevant command = %s\n", bind->command);
|
||||
char *target = bind->command + strlen("workspace ");
|
||||
/* We check if this is the workspace
|
||||
- * next/prev/next_on_output/prev_on_output/back_and_forth command.
|
||||
+ * next/prev/next_on_output/prev_on_output/back_and_forth/number command.
|
||||
* Beware: The workspace names "next", "prev", "next_on_output",
|
||||
- * "prev_on_output" and "back_and_forth" are OK, so we check before
|
||||
- * stripping the double quotes */
|
||||
+ * "prev_on_output", "number" and "back_and_forth" are OK, so we check
|
||||
+ * before stripping the double quotes */
|
||||
if (strncasecmp(target, "next", strlen("next")) == 0 ||
|
||||
strncasecmp(target, "prev", strlen("prev")) == 0 ||
|
||||
strncasecmp(target, "next_on_output", strlen("next_on_output")) == 0 ||
|
||||
strncasecmp(target, "prev_on_output", strlen("prev_on_output")) == 0 ||
|
||||
+ strncasecmp(target, "number", strlen("number")) == 0 ||
|
||||
strncasecmp(target, "back_and_forth", strlen("back_and_forth")) == 0)
|
||||
continue;
|
||||
if (*target == '"')
|
||||
@ -1,11 +1,11 @@
|
||||
$OpenBSD: patch-src_x_c,v 1.5 2012/05/09 11:56:49 dcoppa Exp $
|
||||
$OpenBSD: patch-src_x_c,v 1.6 2012/09/21 17:16:14 dcoppa Exp $
|
||||
|
||||
OpenBSD lacks POSIX shared memory support (shm_open() and friends)
|
||||
|
||||
--- src/x.c.orig Wed Apr 25 23:21:25 2012
|
||||
+++ src/x.c Wed May 9 12:27:20 2012
|
||||
@@ -1019,8 +1019,10 @@ void x_set_i3_atoms(void) {
|
||||
current_socketpath);
|
||||
--- src/x.c.orig Wed Sep 19 18:08:09 2012
|
||||
+++ src/x.c Thu Sep 20 14:12:10 2012
|
||||
@@ -1037,8 +1037,10 @@ void x_set_i3_atoms(void) {
|
||||
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_PID, XCB_ATOM_CARDINAL, 32, 1, &pid);
|
||||
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
|
||||
strlen(current_configpath), current_configpath);
|
||||
+#if !defined(__OpenBSD__)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user