| 1 |
opfer 08/02/04 09:18:43 |
| 2 |
|
| 3 |
Modified: elogv-0.6.1-refresh_screen.patch |
| 4 |
Added: elogv-0.6.1-segfault_delete.patch |
| 5 |
elogv-0.6.1-vi_movement.patch |
| 6 |
Log: |
| 7 |
rework fix for segfault, thanks Michał Kiedrowicz <esqualante AT o2 DOT pl> for providing the better fix; split up fixes for two separate bugs in two separate patches; add Vi like movement keys; clean old revision |
| 8 |
(Portage version: 2.1.3.19) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: elogv-0.6.1-refresh_screen.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-refresh_screen.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- elogv-0.6.1-refresh_screen.patch 2 Feb 2008 16:22:48 -0000 1.1 |
| 24 |
+++ elogv-0.6.1-refresh_screen.patch 4 Feb 2008 09:18:43 -0000 1.2 |
| 25 |
@@ -1,31 +1,21 @@ |
| 26 |
---- elogv.py 2007-09-16 20:32:52.000000000 +0200 |
| 27 |
-+++ elogv 2008-02-02 17:17:45.000000000 +0100 |
| 28 |
-@@ -129,13 +129,16 @@ |
| 29 |
+--- elogv.py.orig 2008-02-04 10:14:58.000000000 +0100 |
| 30 |
++++ elogv.py 2008-02-04 10:15:48.000000000 +0100 |
| 31 |
+@@ -129,12 +129,18 @@ |
| 32 |
|
| 33 |
elif c == ord("a"): |
| 34 |
self.sort_method[0] = "alphabetical" |
| 35 |
+ self.init_screen() |
| 36 |
++ self.show_log() |
| 37 |
|
| 38 |
elif c == ord("t"): |
| 39 |
self.sort_method[0] = "date" |
| 40 |
+ self.init_screen() |
| 41 |
++ self.show_log() |
| 42 |
|
| 43 |
elif c == ord("r"): |
| 44 |
self.sort_method[1] = not self.sort_method[1] |
| 45 |
-- |
| 46 |
+ self.init_screen() |
| 47 |
-+ |
| 48 |
++ self.show_log() |
| 49 |
+ |
| 50 |
elif c == ord(" "): |
| 51 |
# Now is used only for scrolling the text |
| 52 |
- self.show_log() |
| 53 |
-@@ -171,7 +174,9 @@ |
| 54 |
- self.remove_file(n) |
| 55 |
- self.file_pad.clear() |
| 56 |
- self.fill_file_pad() |
| 57 |
-- self.refresh_file_pad() |
| 58 |
-+ self.change_usel(-1) |
| 59 |
-+ self.change_usel(+1) |
| 60 |
-+ self.init_screen() |
| 61 |
- |
| 62 |
- elif c == ord("/"): |
| 63 |
- word = "" |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
1.1 app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch |
| 68 |
|
| 69 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch?rev=1.1&view=markup |
| 70 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-segfault_delete.patch?rev=1.1&content-type=text/plain |
| 71 |
|
| 72 |
Index: elogv-0.6.1-segfault_delete.patch |
| 73 |
=================================================================== |
| 74 |
--- elogv.py.orig 2008-02-04 10:10:40.000000000 +0100 |
| 75 |
+++ elogv.py 2008-02-04 10:12:01.000000000 +0100 |
| 76 |
@@ -172,6 +172,7 @@ |
| 77 |
self.file_pad.clear() |
| 78 |
self.fill_file_pad() |
| 79 |
self.refresh_file_pad() |
| 80 |
+ self.show_log() |
| 81 |
|
| 82 |
elif c == ord("/"): |
| 83 |
word = "" |
| 84 |
@@ -274,6 +275,11 @@ |
| 85 |
# so this will prevent a crash |
| 86 |
if self.usel >= len(self.file_list): |
| 87 |
self.usel = len(self.file_list)-1 |
| 88 |
+ # We also have to update self.pposy |
| 89 |
+ if self.pposy > self.usel: |
| 90 |
+ self.pposy = self.usel - 10 |
| 91 |
+ if self.pposy < 0: |
| 92 |
+ self.pposy = 0 |
| 93 |
|
| 94 |
# Sort the list |
| 95 |
if self.sort_method[0] == "alphabetical": |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.1 app-portage/elogv/files/elogv-0.6.1-vi_movement.patch |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch?rev=1.1&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/elogv/files/elogv-0.6.1-vi_movement.patch?rev=1.1&content-type=text/plain |
| 103 |
|
| 104 |
Index: elogv-0.6.1-vi_movement.patch |
| 105 |
=================================================================== |
| 106 |
--- elogv.py.orig 2008-02-04 09:56:41.000000000 +0100 |
| 107 |
+++ elogv.py 2008-02-04 10:03:16.000000000 +0100 |
| 108 |
@@ -33,10 +33,10 @@ |
| 109 |
Elogv is a portage elog viewer based on curses and python, |
| 110 |
you can use these keys to control the behavior of the program: |
| 111 |
|
| 112 |
- - Down arrow -> Scroll the list of files down by 1 unit |
| 113 |
- - Up arrow -> opposite of Down arrow |
| 114 |
- - Pag Down -> Scroll the list down by 10 unit |
| 115 |
- - Pag Up -> opposite of Pag Down |
| 116 |
+ - Down arrow or k -> Scroll the list of files down by 1 unit |
| 117 |
+ - Up arrow or j -> opposite of Down arrow |
| 118 |
+ - PageDown -> Scroll the list down by 10 unit |
| 119 |
+ - PageUp -> opposite of Pag Down |
| 120 |
- End -> Go to the last file of the list |
| 121 |
- Home -> Go to the first file of the list |
| 122 |
- t -> order the list of files by date, most recent on top |
| 123 |
@@ -108,10 +108,10 @@ |
| 124 |
sys.exit() |
| 125 |
|
| 126 |
## Scrolling keys ## |
| 127 |
- elif c == curses.KEY_DOWN: |
| 128 |
+ elif c == curses.KEY_DOWN or c == ord("k"): |
| 129 |
self.change_usel(1) |
| 130 |
|
| 131 |
- elif c == curses.KEY_UP: |
| 132 |
+ elif c == curses.KEY_UP or c == ord("j"): |
| 133 |
self.change_usel(-1) |
| 134 |
|
| 135 |
elif c == curses.KEY_NPAGE: |
| 136 |
|
| 137 |
|
| 138 |
|
| 139 |
-- |
| 140 |
gentoo-commits@l.g.o mailing list |
Archives