Skip to content

Commit

Permalink
ratpoison: refactor patches, add a new one, relbump
Browse files Browse the repository at this point in the history
  • Loading branch information
sighook committed Mar 15, 2024
1 parent 081f047 commit f6cf7a2
Show file tree
Hide file tree
Showing 11 changed files with 320 additions and 48 deletions.
17 changes: 9 additions & 8 deletions ratpoison/.md5sum
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
6d78f8e1aa453f9d900c93e854b815f7 0001-ignore-resize-hints.patch
a8d25f70c2305b526dfa8bba97a2e21c 0002-fix-dedicate-frame.patch
d02c7d1bd94026408ca025184d3aa551 0003-fix-edge-case-for-find_frame_-left-right-up-down-fun.patch
d8e22af3c4fd84f6c229165e6c36dde3 0004-ctrl-w-as-backspace.patch
c631078970543cc4873beb94f5f921bf 0005-Fix-only-set-active-frame-when-needed-in-sync_wins.patch
ea2c7319497b9c8da84bf5be6b445aa0 0006-Fix-don-t-draw-help-window-beyond-screen-height.patch
826c32897e108c439eb275cfd518e34d 0007-Fix-draw-the-license-text-centered-on-multi-screen-s.patch
5c6b09831831bbd0ef40455b07e0f53f 0008-Fix-exclude-degenerate-case-from-frame-overlap.patch
821f32204e6a7daf6a072be24ea84505 0001-obeyresizehints-option-to-dis-obey-ICCCM-window-resi.patch
ea7a0ab470771db8d8366a743a89f59b 0002-fix-dedicate-frame.patch
da19b555ab7fbfc0e5a4f58e1350dfd2 0003-fix-edge-case-for-find_frame_-left-right-up-down-fun.patch
560db84df2fe9f705949642a8c8d3010 0004-editor-support-C-w-for-backward-kill-word.patch
40e48f49a1533261aa205a393992902a 0005-Fix-only-set-active-frame-when-needed-in-sync_wins.patch
a8da2c3fa7027924308ff32015c39e17 0006-Fix-don-t-draw-help-window-beyond-screen-height.patch
4e5e803df9eae0683cec89182e6c46cf 0007-Fix-draw-the-license-text-centered-on-multi-screen-s.patch
be4ad9e2d3afbe4f1b7e7ce336b05a3b 0008-Fix-exclude-degenerate-case-from-frame-overlap.patch
21b1fb165c64945114bbfb2dfa76e425 0009-ratpoison.mdoc.1-add-missing-infofmt-description-and.patch
63afedddd7897bb248cf6eea2b7f560e genratpoison-re.pl
de38668b1fa3d65821c1da2e35c52cd3 ratpoison-re.pl.diff
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
From b6d36019dfaa4568ffb2e7d36715c2347ce4e06e Mon Sep 17 00:00:00 2001
From 60ad9145e88478cd6f285a40f6cb89df46e94ba8 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <[email protected]>
Date: Sat, 3 Feb 2024 02:57:54 +0200
Subject: [PATCH 1/8] ignore resize hints
Subject: [PATCH 1/9] obeyresizehints: option to dis(obey) ICCCM window resize
hints

Mujo:
Initial patch commit message (by Mujo):
>> I wrote a patch to ignore resize hints so there would not be a gap
>> between my term windows and the frame. The patch also includes a
>> new setting to toggle this behaviour and changes to the manpage to
>> describe it. I've not fixed the info page because I have no
>> familiarity with it.
>> Currently this applies only to normal windows, not transient ones.
>> Reference: https://lists.nongnu.org/archive/html/ratpoison-devel/2018-05/msg00000.html

Reference: https://lists.nongnu.org/archive/html/ratpoison-devel/2018-05/msg00000.html
Updates:
- Added the info page documentation to the initial patch.
---
doc/ratpoison.mdoc.1 | 9 +++++++++
doc/ratpoison.texi | 12 ++++++++++++
src/actions.c | 26 ++++++++++++++++++++++++++
src/data.h | 1 +
src/main.c | 1 +
src/manage.c | 2 +-
5 files changed, 38 insertions(+), 1 deletion(-)
6 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/doc/ratpoison.mdoc.1 b/doc/ratpoison.mdoc.1
index 4db1a7d..c791317 100644
Expand All @@ -40,6 +44,36 @@ index 4db1a7d..c791317 100644
.It Cm rudeness Ar number
Show or set what kind of windows are allowed to jostle into the
foreground.
diff --git a/doc/ratpoison.texi b/doc/ratpoison.texi
index 165e715..dee9e30 100644
--- a/doc/ratpoison.texi
+++ b/doc/ratpoison.texi
@@ -330,6 +330,17 @@ find this counter-intuitive, set this variable to @code{0}.
When called with no arguments, the current setting is returned.
@end deffn

+@deffn Command {set obeyresizehints} @var{n}
+Obey ICCCM window resize hints. By default this variable is set
+(@code{1}) and ratpoison obeys resize hints, which can result in a
+gap between windows and the frame. Set this variable to @code{0} if
+you want to force windows to be the exact sizes of their containing
+frame. Currently this applies only to normal windows, not transient
+ones.
+
+When called with no arguments, the current setting is returned.
+@end deffn
+
@deffn Command {set winname} @var{name}
There are three resources ratpoison can get a window's name from: the
WMNAME hint, the res_name from the WMCLASS hint, or the res_class from
@@ -1682,6 +1693,7 @@ Here is a list of variables that can be set:
@item framemsgwait
@item startupmessage
@item warp
+@item obeyresizehints
@end itemize

@end deffn
diff --git a/src/actions.c b/src/actions.c
index e65ca0c..b4f18a1 100644
--- a/src/actions.c
Expand Down Expand Up @@ -129,5 +163,5 @@ index 510f730..78be591 100644
int amount;
int delta;
--
2.43.0
2.44.0

6 changes: 3 additions & 3 deletions ratpoison/0002-fix-dedicate-frame.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7e40b0709e9959b93ac0bd40a758a6b930315516 Mon Sep 17 00:00:00 2001
From 341e67eaa0fa631c41c78ad165d575d2b28592ee Mon Sep 17 00:00:00 2001
From: Alexandr Savca <[email protected]>
Date: Sat, 3 Feb 2024 03:01:01 +0200
Subject: [PATCH 2/8] fix dedicate frame
Subject: [PATCH 2/9] fix dedicate frame

Mujo:
>> I noticed the dedicate frame functionality to toggle promiscuous
Expand All @@ -26,5 +26,5 @@ index dd65a93..12f9f96 100644

list_for_each_entry (cur, &screen->frames, node)
--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 064b9208c09ddf1cc787fedfab788d5d929dec0b Mon Sep 17 00:00:00 2001
From 93ddcc51a10ccdf99830d6ede4e293ccfc448027 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <[email protected]>
Date: Sat, 3 Feb 2024 03:05:57 +0200
Subject: [PATCH 3/8] fix edge case for find_frame_[left,right,up,down]
Subject: [PATCH 3/9] fix edge case for find_frame_[left,right,up,down]
function

Daniel Maturana:
Expand Down Expand Up @@ -98,5 +98,5 @@ index eed0f50..a652eaf 100644
{
if (frame_right_abs (frame) == frame_left_abs (cur))
--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
From 12892030a08828d7cb364f36e4af946ceb2cac27 Mon Sep 17 00:00:00 2001
From 190583d74fa8fa7958812f8db85f6d1206c098e0 Mon Sep 17 00:00:00 2001
From: Alexandr Savca <[email protected]>
Date: Sat, 3 Feb 2024 03:11:04 +0200
Subject: [PATCH 4/8] ctrl-w as backspace
Subject: [PATCH 4/9] editor: support C-w for backward-kill-word

Reference: https://lists.nongnu.org/archive/html/ratpoison-devel/2018-05/msg00003.html

Updates:
- Document the keybinding in the info page.
---
src/editor.c | 1 +
1 file changed, 1 insertion(+)
doc/ratpoison.texi | 1 +
src/editor.c | 1 +
2 files changed, 2 insertions(+)

diff --git a/doc/ratpoison.texi b/doc/ratpoison.texi
index dee9e30..b5d3551 100644
--- a/doc/ratpoison.texi
+++ b/doc/ratpoison.texi
@@ -1776,6 +1776,7 @@ delete the word at point.
delete the character before the point.

@item M-backspace
+@itemx C-w
delete the word before the point.

@item C-k
diff --git a/src/editor.c b/src/editor.c
index b1beebc..45d0a3d 100644
--- a/src/editor.c
Expand All @@ -21,5 +37,5 @@ index b1beebc..45d0a3d 100644
{{XK_k, RP_CONTROL_MASK}, editor_kill_line},
{{XK_u, RP_CONTROL_MASK}, editor_backward_kill_line},
--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7044d27be30f133019bd9ae3298cd91a4155ee90 Mon Sep 17 00:00:00 2001
From 5698c69e8d76986f05e9f9407f8e19659c12c45b Mon Sep 17 00:00:00 2001
From: Antoine Busque <[email protected]>
Date: Wed, 2 Aug 2017 01:45:58 -0400
Subject: [PATCH 5/8] Fix: only set active frame when needed in sync_wins
Subject: [PATCH 5/9] Fix: only set active frame when needed in sync_wins

Only set the active frame after destryoing a normal window in
`sync_wins` if this window was on the current screen. This mirrors the
Expand All @@ -28,5 +28,5 @@ index b4f18a1..1208902 100644
}
withdraw_window (win);
--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2ca71fef6a59b15fae1b30802f391586a1e30ca3 Mon Sep 17 00:00:00 2001
From a84ec10a2ce5e4fd9d144d60e82da532cf72c588 Mon Sep 17 00:00:00 2001
From: Antoine Busque <[email protected]>
Date: Thu, 21 Sep 2017 20:01:53 -0400
Subject: [PATCH 6/8] Fix: don't draw help window beyond screen height
Subject: [PATCH 6/9] Fix: don't draw help window beyond screen height

The current computation for the drawing of the help window uses the
value `s->top + s->height` as the bottom edge of the screen, even
Expand Down Expand Up @@ -32,5 +32,5 @@ index 1208902..a568717 100644
if (drawing_keys)
{
--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ea4ca118251160965057c12283297267670d61e4 Mon Sep 17 00:00:00 2001
From 1aec970783b369d66d4fa788237975ca177fbba6 Mon Sep 17 00:00:00 2001
From: Antoine Busque <[email protected]>
Date: Thu, 21 Sep 2017 20:16:06 -0400
Subject: [PATCH 7/8] Fix: draw the license text centered on multi-screen setup
Subject: [PATCH 7/9] Fix: draw the license text centered on multi-screen setup

The current implementation of the license command uses the `s->top`
and `s->left` values, combined with the screen's height and width to
Expand Down Expand Up @@ -35,5 +35,5 @@ index a568717..7e15462 100644
if (y < 0) y = 0;

--
2.43.0
2.44.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b798f26c04ab955d0aae8be545a92179decc8479 Mon Sep 17 00:00:00 2001
From f1efc75d171259a7f41d30cbad3b02583521a28d Mon Sep 17 00:00:00 2001
From: Antoine Busque <[email protected]>
Date: Sun, 4 Feb 2018 22:08:30 -0500
Subject: [PATCH 8/8] Fix: exclude degenerate case from frame overlap
Subject: [PATCH 8/9] Fix: exclude degenerate case from frame overlap

The current implementation of the find_frame_* functions considered
the degenerate case of frame overlap (i.e. a single pixel overlap, or
Expand Down Expand Up @@ -97,5 +97,5 @@ index a652eaf..27610e2 100644
}
}
--
2.43.0
2.44.0

Loading

0 comments on commit f6cf7a2

Please sign in to comment.