summaryrefslogtreecommitdiff
path: root/x11-wm/ion/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/ion/files')
-rw-r--r--x11-wm/ion/files/patch-Makefile55
-rw-r--r--x11-wm/ion/files/patch-disable_border162
-rw-r--r--x11-wm/ion/files/patch-ion-edit9
-rw-r--r--x11-wm/ion/files/patch-ion-view18
-rw-r--r--x11-wm/ion/files/patch-src-Makefile12
-rw-r--r--x11-wm/ion/files/patch-system.mk84
-rw-r--r--x11-wm/ion/files/patch-winprop_frame74
7 files changed, 0 insertions, 414 deletions
diff --git a/x11-wm/ion/files/patch-Makefile b/x11-wm/ion/files/patch-Makefile
deleted file mode 100644
index 83b8d1fee707..000000000000
--- a/x11-wm/ion/files/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
---- Makefile.orig 2014-07-02 11:22:29.181567830 +0800
-+++ Makefile 2014-07-02 11:24:31.679559320 +0800
-@@ -17,7 +17,7 @@ SCRIPTS=scripts/ion-edit scripts/ion-man
-
- ETC= etc/bindings-default.conf etc/bindings-sun.conf etc/kludges.conf \
- etc/look-brownsteel.conf etc/look-greyviolet.conf \
-- etc/look-simpleblue.conf etc/look-wheat.conf etc/sample.conf
-+ etc/look-simpleblue.conf etc/look-wheat.conf
-
- DOCS= README LICENSE ChangeLog doc/config.txt doc/functions.txt
-
-@@ -31,34 +31,22 @@ man/ion.1x: man/ion.1x.in
- sed 's#PREFIX#$(PREFIX)#g' man/ion.1x.in > man/ion.1x
-
- _install:
-- $(INSTALLDIR) $(BINDIR)
-+ $(INSTALLDIR) $(DESTDIR)$(BINDIR)
- for i in $(SCRIPTS); do \
-- $(INSTALL) -m $(BIN_MODE) $$i $(BINDIR); \
-+ $(INSTALL) -m $(BIN_MODE) $$i $(DESTDIR)$(BINDIR); \
- done
-
-- $(INSTALLDIR) $(MANDIR)/man1
-- $(INSTALL) -m $(DATA_MODE) man/ion.1x $(MANDIR)/man1
-+ $(INSTALLDIR) $(DESTDIR)$(MANDIR)/man1
-+ $(INSTALL) -m $(DATA_MODE) man/ion.1x $(DESTDIR)$(MANDIR)/man1
-
-- $(INSTALLDIR) $(DOCDIR)/ion
-+ $(INSTALLDIR) $(DESTDIR)$(DOCDIR)/ion
- for i in $(DOCS); do \
-- $(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/ion; \
-+ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(DOCDIR)/ion; \
- done
-
-- $(INSTALLDIR) $(ETCDIR)/ion
-+ $(INSTALLDIR) $(DESTDIR)$(ETCDIR)/ion
- for i in $(ETC); do \
-- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/ion; \
-+ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(ETCDIR)/ion; \
- done
--
-- @ if test -f $(ETCDIR)/ion/ion.conf ; then \
-- echo "$(ETCDIR)/ion/ion.conf already exists. Not installing one."; \
-- else \
-- echo "Installing configuration file $(ETCDIR)/ion/ion.conf"; \
-- if uname -s -p|grep "SunOS sparc" > /dev/null; then \
-- sed s/bindings-default/bindings-sun/ \
-- $(ETCDIR)/ion/sample.conf > $(ETCDIR)/ion/ion.conf; \
-- chmod $(DATA_MODE) $(ETCDIR)/ion/ion.conf; \
-- else \
-- cp $(ETCDIR)/ion/sample.conf $(ETCDIR)/ion/ion.conf; \
-- fi; \
-- fi
-+ $(INSTALL) -m $(DATA_MODE) etc/sample.conf $(DESTDIR)$(ETCDIR)/ion/ion.conf.sample;
-
diff --git a/x11-wm/ion/files/patch-disable_border b/x11-wm/ion/files/patch-disable_border
deleted file mode 100644
index 9afd88b74f34..000000000000
--- a/x11-wm/ion/files/patch-disable_border
+++ /dev/null
@@ -1,162 +0,0 @@
-# This patch was originally sent to the ION mailing list by:
-# Christian Mauduit <ufoot@ufoot.org>
-
-diff -r -u doc.orig/functions.txt doc/functions.txt
---- doc.orig/functions.txt Fri Feb 8 22:23:17 2002
-+++ doc/functions.txt Fri Mar 8 23:57:46 2002
-@@ -59,6 +59,13 @@
- enabled
-
-
-+Border control
-+--------------
-+
-+disable_border Disables the border and the bar
-+enable_border Enables the border and the bar
-+
-+
- Close and destroy
- -----------------
-
-diff -r -u src.orig/draw.c src/draw.c
---- src.orig/draw.c Fri Feb 8 22:23:17 2002
-+++ src/draw.c Fri Mar 8 23:53:34 2002
-@@ -136,6 +136,13 @@
- DrawInfo _dinfo, *dinfo=&_dinfo;
- WGRData *grdata=GRDATA_OF(frame);
-
-+ if(complete)
-+ XClearWindow(wglobal.dpy, FRAME_WIN(frame));
-+
-+ /* if the border is not active, we draw nothing here */
-+ if (frame->flags & WFRAME_NO_BORDER)
-+ return;
-+
- dinfo->win=FRAME_WIN(frame);
- dinfo->grdata=grdata;
- dinfo->gc=grdata->gc;
-@@ -143,15 +150,12 @@
- dinfo->geom.w+=FRAME_W(frame);
- dinfo->geom.h+=FRAME_H(frame);
- dinfo->border=&(grdata->frame_border);
--
-+
- if(IS_ACTIVE_FRAME(frame))
- dinfo->colors=&(grdata->act_frame_colors);
- else
- dinfo->colors=&(grdata->frame_colors);
-
-- if(complete)
-- XClearWindow(wglobal.dpy, FRAME_WIN(frame));
--
- /*#if 1*/
- draw_box(dinfo, FALSE);
- /*#else
-@@ -191,6 +195,10 @@
- WGRData *grdata=&(scr->grdata);
- WRectangle bg;
-
-+ /* if the border is not active, we draw nothing here */
-+ if (frame->flags & WFRAME_NO_BORDER)
-+ return;
-+
- frame_bar_geom(frame, &bg);
-
- dinfo->win=FRAME_WIN(frame);
-diff -r -u src.orig/frame.c src/frame.c
---- src.orig/frame.c Fri Feb 8 22:23:17 2002
-+++ src/frame.c Fri Mar 8 23:53:37 2002
-@@ -41,15 +41,28 @@
- #define BAR_W(FRAME, GRDATA) ((FRAME)->win.geom.w+(GRDATA)->bar_off.w)
- #define BAR_H(FRAME, GRDATA) ((GRDATA)->bar_h)
-
--#define FRAME_TO_CLIENT_W(W, GRDATA) ((W)+(GRDATA)->client_off.w)
--#define FRAME_TO_CLIENT_H(H, GRDATA) ((H)+(GRDATA)->client_off.h)
--#define CLIENT_TO_FRAME_W(W, GRDATA) ((W)-(GRDATA)->client_off.w)
--#define CLIENT_TO_FRAME_H(H, GRDATA) ((H)-(GRDATA)->client_off.h)
--
--#define CLIENT_X(FRAME, GRDATA) ((GRDATA)->client_off.x)
--#define CLIENT_Y(FRAME, GRDATA) ((GRDATA)->client_off.y)
--#define CLIENT_W(FRAME, GRDATA) FRAME_TO_CLIENT_W(FRAME_W(FRAME), GRDATA)
--#define CLIENT_H(FRAME, GRDATA) FRAME_TO_CLIENT_H(FRAME_H(FRAME), GRDATA)
-+#define FRAME_TO_CLIENT_W(W, FRAME, GRDATA) \
-+ (((FRAME)->flags & WFRAME_NO_BORDER) ? \
-+ (W) : (W)+(GRDATA)->client_off.w)
-+#define FRAME_TO_CLIENT_H(H, FRAME, GRDATA) \
-+ (((FRAME)->flags & WFRAME_NO_BORDER) ? \
-+ (H) : (H)+(GRDATA)->client_off.h)
-+#define CLIENT_TO_FRAME_W(W, FRAME, GRDATA) \
-+ (((FRAME)->flags & WFRAME_NO_BORDER) ? \
-+ (W) : (W)-(GRDATA)->client_off.w)
-+#define CLIENT_TO_FRAME_H(H, FRAME, GRDATA) \
-+ (((FRAME)->flags & WFRAME_NO_BORDER) ? \
-+ (H) : (H)-(GRDATA)->client_off.h)
-+
-+#define CLIENT_X(FRAME, GRDATA) \
-+ ((FRAME)->flags & WFRAME_NO_BORDER ? \
-+ 0 : (GRDATA)->client_off.x)
-+#define CLIENT_Y(FRAME, GRDATA) \
-+ ((FRAME)->flags & WFRAME_NO_BORDER ? \
-+ 0 : (GRDATA)->client_off.y)
-+
-+#define CLIENT_W(FRAME, GRDATA) FRAME_TO_CLIENT_W(FRAME_W(FRAME), FRAME, GRDATA)
-+#define CLIENT_H(FRAME, GRDATA) FRAME_TO_CLIENT_H(FRAME_H(FRAME), FRAME, GRDATA)
-
-
- WThingFuntab frame_funtab={deinit_frame, frame_remove_child};
-@@ -658,6 +671,22 @@
- geom->y=CLIENT_Y(frame, grdata);
- geom->w=CLIENT_W(frame, grdata);
- geom->h=CLIENT_H(frame, grdata);
-+}
-+
-+void enable_border(WFrame *frame)
-+{
-+ frame->flags = frame->flags & (~WFRAME_NO_BORDER);
-+
-+ frame_fit_clients(frame);
-+ draw_frame(frame,TRUE);
-+}
-+
-+void disable_border(WFrame *frame)
-+{
-+ frame->flags = frame->flags | WFRAME_NO_BORDER;
-+
-+ frame_fit_clients(frame);
-+ draw_frame(frame,TRUE);
- }
-
-
-diff -r -u src.orig/frame.h src/frame.h
---- src.orig/frame.h Fri Feb 8 22:23:17 2002
-+++ src/frame.h Fri Mar 8 23:05:54 2002
-@@ -23,6 +23,7 @@
- #define WFRAME_SHADE 0x0004
- #define WFRAME_NO_BAR 0x0008
- #define WFRAME_MAX_BOTH (WFRAME_MAX_VERT|WFRAME_MAX_HORIZ)
-+#define WFRAME_NO_BORDER 0x0010
-
- #define FRAME_SHORTCUT_W 23
-
-@@ -96,5 +97,8 @@
- extern void split_top(WWorkspace *ws, char *str);
-
- extern WFrame *find_frame_of(Window win);
-+
-+extern void enable_border(WFrame *frame);
-+extern void disable_border(WFrame *frame);
-
- #endif /* INCLUDED_FRAME_H */
-diff -r -u src.orig/function.c src/function.c
---- src.orig/function.c Fri Feb 8 22:23:17 2002
-+++ src/function.c Fri Mar 8 23:05:54 2002
-@@ -90,6 +90,9 @@
- FN(d, generic, WFrame, "set_widthq", set_widthq),
- FN(d, generic, WFrame, "set_heightq", set_heightq),
-
-+ FN_VOID(generic, WFrame, "enable_border", enable_border),
-+ FN_VOID(generic, WFrame, "disable_border", disable_border),
-+
- FN(s, generic, WWorkspace,"split_top", split_top),
-
- /* client */
diff --git a/x11-wm/ion/files/patch-ion-edit b/x11-wm/ion/files/patch-ion-edit
deleted file mode 100644
index b1313ff1a951..000000000000
--- a/x11-wm/ion/files/patch-ion-edit
+++ /dev/null
@@ -1,9 +0,0 @@
-*** scripts/ion-edit.orig Sat Jan 20 01:43:39 2001
---- scripts/ion-edit Sat Jan 20 01:51:17 2001
-***************
-*** 1,2 ****
- #!/bin/sh
-! exec run-mailcap --action=edit "$1" > /dev/null
---- 1,2 ----
- #!/bin/sh
-! exec ion-runinxterm -T $1 $EDITOR "$1" > /dev/null
diff --git a/x11-wm/ion/files/patch-ion-view b/x11-wm/ion/files/patch-ion-view
deleted file mode 100644
index 689e8a514757..000000000000
--- a/x11-wm/ion/files/patch-ion-view
+++ /dev/null
@@ -1,18 +0,0 @@
-*** scripts/ion-view.orig Sat Jan 20 01:44:05 2001
---- scripts/ion-view Sat Jan 20 01:55:39 2001
-***************
-*** 1,7 ****
- #!/bin/sh
- if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
-! exec netscape-remote "$1"
- else
-! exec run-mailcap --action=view "$1" > /dev/null
- fi
-
---- 1,7 ----
- #!/bin/sh
- if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
-! exec netscape "$1"
- else
-! exec ion-runinxterm -T $1 $EDITOR "$1" > /dev/null
- fi
diff --git a/x11-wm/ion/files/patch-src-Makefile b/x11-wm/ion/files/patch-src-Makefile
deleted file mode 100644
index 3fecb404b7c8..000000000000
--- a/x11-wm/ion/files/patch-src-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.orig 2014-07-02 11:27:14.555548726 +0800
-+++ src/Makefile 2014-07-02 11:27:31.345550958 +0800
-@@ -35,6 +35,6 @@ ion: $(OBJS) $(EXT_OBJS)
- $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@
-
- _install:
-- $(INSTALLDIR) $(BINDIR)
-- $(INSTALL) -m $(BIN_MODE) ion $(BINDIR)
-- $(STRIP) $(BINDIR)/ion
-+ $(INSTALLDIR) $(DESTDIR)$(BINDIR)
-+ $(INSTALL) -m $(BIN_MODE) ion $(DESTDIR)$(BINDIR)
-+ $(STRIP) $(DESTDIR)$(BINDIR)/ion
diff --git a/x11-wm/ion/files/patch-system.mk b/x11-wm/ion/files/patch-system.mk
deleted file mode 100644
index bee9da4e1b88..000000000000
--- a/x11-wm/ion/files/patch-system.mk
+++ /dev/null
@@ -1,84 +0,0 @@
---- system.mk.orig Sat Jan 19 15:15:13 2002
-+++ system.mk Mon Mar 15 03:19:42 2004
-@@ -7,13 +7,13 @@
- ## Installation paths
- ##
-
--PREFIX=/usr/local
-+#PREFIX=/usr/local
-
- # No need to modify these usually
- BINDIR=$(PREFIX)/bin
- ETCDIR=$(PREFIX)/etc
- MANDIR=$(PREFIX)/man
--DOCDIR=$(PREFIX)/doc
-+DOCDIR=$(PREFIX)/share/doc
- # Not used
- INCDIR=$(PREFIX)/include
- LIBDIR=$(PREFIX)/lib
-@@ -24,14 +24,14 @@
- ##
-
- #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
--MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl
-+MODULE_SUPPORT_LDFLAGS=-export-dynamic
-
-
- ##
- ## X libraries, includes and options
- ##
-
--X11_PREFIX=/usr/X11R6
-+X11_PREFIX=$(LOCALBASE)
-
- # SunOS/Solaris
- #X11_PREFIX=/usr/openwin
-@@ -52,14 +52,14 @@
- # asprintf and vasprintf in the c library. (gnu libc has.)
- # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
- # in libtu/sprintf_2.2/ is used.
--#HAS_SYSTEM_ASPRINTF=1
-+HAS_SYSTEM_ASPRINTF=1
-
-
- ##
- ## C compiler
- ##
-
--CC=gcc
-+CC?=gcc
-
- # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
- # they're mainly for development use. So, if they cause trouble (not
-@@ -83,11 +83,11 @@
- # have unused variables.
- WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
- -Wtrigraphs -Wformat -Wchar-subscripts \
-- -Wparentheses -pedantic-errors -Wuninitialized
-+ -Wparentheses -Wuninitialized
-
-
--CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
--LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
-+CFLAGS+= $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
-+LDFLAGS= $(LIBS) $(EXTRA_LIBS)
-
-
- ##
-@@ -112,13 +112,13 @@
- ##
-
- # Should work almost everywhere
--INSTALL=install
-+#INSTALL=install
- # On a system with pure BSD install, -c might be preferred
--#INSTALL=install -c
-+INSTALL=install -c
-
- INSTALLDIR=mkdir -p
-
- BIN_MODE=755
--DATA_MODE=664
-+DATA_MODE=644
-
- STRIP=strip
diff --git a/x11-wm/ion/files/patch-winprop_frame b/x11-wm/ion/files/patch-winprop_frame
deleted file mode 100644
index 412d82f36d56..000000000000
--- a/x11-wm/ion/files/patch-winprop_frame
+++ /dev/null
@@ -1,74 +0,0 @@
-# This patch was originally sent to the ION mailing list by:
-# Alejandro Forero Cuervo <bachue@bachue.com>
-
-diff -Naur ChangeLog.orig ChangeLog
---- ChangeLog.orig Tue Feb 5 23:46:01 2002
-+++ ChangeLog Sat Feb 9 17:19:06 2002
-@@ -1,3 +1,6 @@
-+2002-02-09:
-+ * Implemented "frame" functionality for winprops (Alejandro Forero
-+ <bachue@bachue.com>).
-
- 2002-02-06:
- * Added 'split_top "dir"' command.
-diff -Naur src.orig/clientwin.c src/clientwin.c
---- src.orig/clientwin.c Wed Feb 6 18:41:22 2002
-+++ src/clientwin.c Sat Feb 9 17:09:22 2002
-@@ -180,7 +180,10 @@
- }
- }
-
-- get_integer_property(win, wglobal.atom_frame_id, &frame_id);
-+ if (props!=NULL && props->frame!=0)
-+ frame_id=props->frame;
-+ else
-+ get_integer_property(win, wglobal.atom_frame_id, &frame_id);
-
- /* Get client to place this window in */
- if(client==NULL){
-diff -Naur src.orig/readconfig.c src/readconfig.c
---- src.orig/readconfig.c Wed Feb 6 18:38:16 2002
-+++ src/readconfig.c Sat Feb 9 17:24:01 2002
-@@ -674,6 +674,14 @@
- return TRUE;
- }
-
-+
-+static bool opt_winprop_frame(Tokenizer *tokz, int n, Token *toks)
-+{
-+ tmp_winprop->frame=TOK_LONG_VAL(&(toks[1]));
-+ return TRUE;
-+}
-+
-+
- static bool opt_winprop_transient_mode(Tokenizer *tokz, int n, Token *toks)
- {
- char *mod=TOK_IDENT_VAL(&(toks[1]));
-@@ -721,6 +729,7 @@
- tmp_winprop->data=wclass=TOK_TAKE_STRING_VAL(&(toks[1]));
- tmp_winprop->switchto=-1;
- tmp_winprop->stubborn=0;
-+ tmp_winprop->frame=0;
- tmp_winprop->transient_mode=TRANSIENT_MODE_NORMAL;
-
- winstance=strchr(wclass, '.');
-@@ -799,6 +808,7 @@
- {"switchto", "b", opt_winprop_switchto, NULL},
- {"stubborn", "b", opt_winprop_stubborn, NULL},
- {"transient_mode", "i", opt_winprop_transient_mode, NULL},
-+ {"frame", "l", opt_winprop_frame, NULL},
-
- {"#end", NULL, end_winprop, NULL},
- /*{"#cancel", NULL, cancel_winprop, NULL},*/
-diff -Naur src.orig/winprops.h src/winprops.h
---- src.orig/winprops.h Mon Mar 5 16:16:06 2001
-+++ src/winprops.h Sat Feb 9 17:09:22 2002
-@@ -30,6 +30,7 @@
- int transient_mode;
- int max_w, max_h;
- int aspect_w, aspect_h;
-+ int frame;
-
- WWinProp *next, *prev;
- };
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 06:48:35 +0000