summaryrefslogtreecommitdiff
path: root/debian/patches/brl-enlarge.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/brl-enlarge.diff')
-rw-r--r--debian/patches/brl-enlarge.diff74
1 files changed, 40 insertions, 34 deletions
diff --git a/debian/patches/brl-enlarge.diff b/debian/patches/brl-enlarge.diff
index 2bcc350..fb06b22 100644
--- a/debian/patches/brl-enlarge.diff
+++ b/debian/patches/brl-enlarge.diff
@@ -1,8 +1,12 @@
-Index: ChangeLog
+This patch adds new removeleft/up/right/down commands to extend the current
+frame in the given direction, removing all frames in the way.
+Default key-bindings are C-t M-arrow-keys.
+
+Index: ratpoison-1.4.4/ChangeLog
===================================================================
---- ChangeLog.orig 2007-04-16 18:33:29.000000000 +0200
-+++ ChangeLog 2007-04-16 18:33:33.000000000 +0200
-@@ -1,1 +1,18 @@
+--- ratpoison-1.4.4.orig/ChangeLog 2009-04-27 04:05:45.000000000 +0200
++++ ratpoison-1.4.4/ChangeLog 2009-04-27 14:43:28.000000000 +0200
+@@ -1,3 +1,20 @@
+2005-06-28 Bernhard R. Link <brlink@debian.org>
+
+ * src/split.c: new functions enlarge_frame_{left,up,right,down}
@@ -20,12 +24,14 @@ Index: ChangeLog
+
+ * doc/ratpoison.1: Document the new commands and keybindings.
+
- 2006-12-19 Shawn Betts <sabetts@shitbender.gagrod>
-Index: doc/ratpoison.1
+ commit 18ee1ed3b3839d44e08e5aefd0e926d29d252654
+ Author: Shawn Betts <sabetts@gmail.com>
+ Date: Fri Apr 24 15:28:27 2009 -0700
+Index: ratpoison-1.4.4/doc/ratpoison.1
===================================================================
---- doc/ratpoison.1.orig 2007-04-16 18:33:29.000000000 +0200
-+++ doc/ratpoison.1 2007-04-16 18:33:33.000000000 +0200
-@@ -499,6 +499,18 @@
+--- ratpoison-1.4.4.orig/doc/ratpoison.1 2009-04-13 14:31:28.000000000 +0200
++++ ratpoison-1.4.4/doc/ratpoison.1 2009-04-27 14:43:28.000000000 +0200
+@@ -511,6 +511,18 @@
.cmd remove ( C\-t R )
Remove the current frame and extend some frames around to fill the remaining
gap.
@@ -44,13 +50,13 @@ Index: doc/ratpoison.1
.cmd resize [ deltax deltay ] ( C\-t r )
If \fIdeltax\fP and \fIdeltay\fP are supplied, resize the current frame
by that (i.e. move the bottom right corner by the given offsets and then
-Index: src/actions.c
+Index: ratpoison-1.4.4/src/actions.c
===================================================================
---- src/actions.c.orig 2007-04-16 18:33:29.000000000 +0200
-+++ src/actions.c 2007-04-16 18:33:33.000000000 +0200
-@@ -283,6 +283,10 @@
+--- ratpoison-1.4.4.orig/src/actions.c 2009-04-13 14:49:08.000000000 +0200
++++ ratpoison-1.4.4/src/actions.c 2009-04-27 14:43:28.000000000 +0200
+@@ -324,6 +324,10 @@
"Hook: ", arg_HOOK,
- "Command: ", arg_REST);
+ "Command: ", arg_COMMAND);
add_command ("remove", cmd_remove, 0, 0, 0);
+ add_command ("removeup", cmd_removeup, 0, 0, 0);
+ add_command ("removedown", cmd_removedown, 0, 0, 0);
@@ -59,7 +65,7 @@ Index: src/actions.c
add_command ("resize", cmd_resize, 2, 0, 2,
"", arg_NUMBER,
"", arg_NUMBER);
-@@ -744,6 +748,10 @@
+@@ -785,6 +789,10 @@
add_keybinding (XK_Down, 0, "focusdown", map);
add_keybinding (XK_Q, 0, "only", map);
add_keybinding (XK_R, 0, "remove", map);
@@ -70,7 +76,7 @@ Index: src/actions.c
add_keybinding (XK_f, 0, "fselect", map);
add_keybinding (XK_f, RP_CONTROL_MASK, "fselect", map);
add_keybinding (XK_F, 0, "curframe", map);
-@@ -2871,6 +2879,38 @@
+@@ -2957,6 +2965,38 @@
}
cmdret *
@@ -109,11 +115,11 @@ Index: src/actions.c
cmd_shrink (int interactive, struct cmdarg **args)
{
push_frame_undo (current_screen()); /* fdump to stack */
-Index: src/actions.h
+Index: ratpoison-1.4.4/src/actions.h
===================================================================
---- src/actions.h.orig 2007-04-16 18:33:29.000000000 +0200
-+++ src/actions.h 2007-04-16 18:33:33.000000000 +0200
-@@ -165,6 +165,10 @@
+--- ratpoison-1.4.4.orig/src/actions.h 2009-04-13 14:02:34.000000000 +0200
++++ ratpoison-1.4.4/src/actions.h 2009-04-27 14:43:28.000000000 +0200
+@@ -168,6 +168,10 @@
RP_CMD (redisplay);
RP_CMD (remhook);
RP_CMD (remove);
@@ -124,11 +130,11 @@ Index: src/actions.h
RP_CMD (rename);
RP_CMD (resize);
RP_CMD (restart);
-Index: src/split.c
+Index: ratpoison-1.4.4/src/split.c
===================================================================
---- src/split.c.orig 2007-04-16 18:33:29.000000000 +0200
-+++ src/split.c 2007-04-16 18:33:33.000000000 +0200
-@@ -703,6 +703,147 @@
+--- ratpoison-1.4.4.orig/src/split.c 2009-04-13 03:52:16.000000000 +0200
++++ ratpoison-1.4.4/src/split.c 2009-04-27 14:47:10.000000000 +0200
+@@ -701,6 +701,147 @@
return 0;
}
@@ -276,7 +282,7 @@ Index: src/split.c
void
remove_frame (rp_frame *frame)
{
-@@ -800,17 +941,7 @@
+@@ -798,17 +939,7 @@
}
if (fits)
@@ -286,16 +292,16 @@ Index: src/split.c
- the new frame size. */
- if (cur->win_number != EMPTY)
- {
-- win = find_window_number (cur->win_number);
+- rp_window *new = find_window_number (cur->win_number);
- maximize_all_windows_in_frame (cur);
-- XRaiseWindow (dpy, win->w);
+- XRaiseWindow (dpy, new->w);
- }
- }
+ maximize_all_in_frame(cur);
else
{
memcpy (cur, &tmp_frame, sizeof (rp_frame));
-@@ -1025,16 +1156,24 @@
+@@ -1030,16 +1161,24 @@
rp_screen *s = frames_screen (frame);
rp_frame *cur;
@@ -321,7 +327,7 @@ Index: src/split.c
}
rp_frame *
-@@ -1043,16 +1182,24 @@
+@@ -1048,16 +1187,24 @@
rp_screen *s = frames_screen (frame);
rp_frame *cur;
@@ -347,7 +353,7 @@ Index: src/split.c
}
rp_frame *
-@@ -1061,16 +1208,24 @@
+@@ -1066,16 +1213,24 @@
rp_screen *s = frames_screen (frame);
rp_frame *cur;
@@ -373,7 +379,7 @@ Index: src/split.c
}
rp_frame *
-@@ -1079,16 +1234,24 @@
+@@ -1084,16 +1239,24 @@
rp_screen *s = frames_screen (frame);
rp_frame *cur;
@@ -399,10 +405,10 @@ Index: src/split.c
}
rp_frame *
-Index: src/split.h
+Index: ratpoison-1.4.4/src/split.h
===================================================================
---- src/split.h.orig 2007-04-16 18:33:29.000000000 +0200
-+++ src/split.h 2007-04-16 18:33:33.000000000 +0200
+--- ratpoison-1.4.4.orig/src/split.h 2009-04-13 03:52:16.000000000 +0200
++++ ratpoison-1.4.4/src/split.h 2009-04-27 14:43:28.000000000 +0200
@@ -33,6 +33,10 @@
void resize_frame_horizontally (rp_frame *frame, int diff);
void resize_frame_vertically (rp_frame *frame, int diff);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 17:00:02 +0000