Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "José María Alonso" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/conf-update:master commit in: /
Date: Sun, 05 Feb 2012 18:50:49
Message-Id: 3a660867801a31659255a1a7a51ac4aa53ced1ce.nimiux@gentoo
1 commit: 3a660867801a31659255a1a7a51ac4aa53ced1ce
2 Author: José María Alonso <nimiux.gentoo.org>
3 AuthorDate: Sun Feb 5 18:48:41 2012 +0000
4 Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 5 18:48:41 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/conf-update.git;a=commit;h=3a660867
7
8 Keys alphabetically ordered
9
10 ---
11 conf-update.c | 125 +++++++++++++++++++++++++++++----------------------------
12 1 files changed, 64 insertions(+), 61 deletions(-)
13
14 diff --git a/conf-update.c b/conf-update.c
15 index 5143500..009f566 100644
16 --- a/conf-update.c
17 +++ b/conf-update.c
18 @@ -192,28 +192,6 @@ int main(int argc, char **argv) {
19 menu_changed = FALSE;
20 while ((item_count(mymenu) > 1) && (c = wgetch(inner)) != 'q' && c != 'Q') {
21 switch(c) {
22 - // navigation 1up/down
23 - case KEY_DOWN:
24 - menu_driver(mymenu, REQ_DOWN_ITEM);
25 - break;
26 - case KEY_UP:
27 - menu_driver(mymenu, REQ_UP_ITEM);
28 - break;
29 - //navigation 1 page up/down
30 - case KEY_PPAGE:
31 - menu_driver(mymenu, REQ_SCR_UPAGE);
32 - break;
33 - case KEY_NPAGE:
34 - menu_driver(mymenu, REQ_SCR_DPAGE);
35 - break;
36 - // navigation top/bottom
37 - case KEY_HOME:
38 - menu_driver(mymenu, REQ_FIRST_ITEM);
39 - break;
40 - case KEY_END:
41 - menu_driver(mymenu, REQ_LAST_ITEM);
42 - break;
43 -
44 // select single
45 case ' ':
46 if ((strrchr(item_name(current_item(mymenu)), '/'))) {
47 @@ -256,26 +234,28 @@ int main(int argc, char **argv) {
48 }
49 menu_driver(mymenu, REQ_FIRST_ITEM);
50 break;
51 - // deselect all
52 - case 'u':
53 - case 'U':
54 - menu_driver(mymenu, REQ_LAST_ITEM);
55 + // delete update
56 + case 'd':
57 + case 'D':
58 + firstrun = config.check_actions;
59 + doit = TRUE;
60 for (i=0;i<item_count(mymenu);i++) {
61 - menu_driver(mymenu, REQ_UP_ITEM);
62 - set_item_value(current_item(mymenu), FALSE);
63 - }
64 - menu_driver(mymenu, REQ_FIRST_ITEM);
65 - break;
66 - // disp diff
67 - case '\n':
68 - case KEY_ENTER:
69 - if (item_userptr(current_item(mymenu))) {
70 - endwin();
71 - int ret = show_diff(*((char **)item_userptr(current_item(mymenu))));
72 - if (!ret) {
73 - fprintf(stderr, "show_diff failed with error code: %d\n", ret);
74 + if (item_value(items_list[i]) == TRUE || (current_item(mymenu) == items_list[i] && item_userptr(items_list[i]))) {
75 + if (firstrun) {
76 + doit = get_confirmation(inner, "delete");
77 + firstrun = false;
78 + }
79 + if (doit) {
80 + myupdate = (char **)item_userptr(items_list[i]);
81 + exit_error(!unlink(*(myupdate)), *(myupdate));
82 + removed_updates_ct++;
83 + removed_updates_report = (char**)realloc(removed_updates_report, removed_updates_ct * sizeof(char *));
84 + removed_updates_report[removed_updates_ct-1] = get_real_filename(*myupdate);
85 + free(*myupdate);
86 + *myupdate = SKIP_ENTRY;
87 + menu_changed = TRUE;
88 + }
89 }
90 - reset_prog_mode();
91 }
92 break;
93 // edit update
94 @@ -290,6 +270,16 @@ int main(int argc, char **argv) {
95 reset_prog_mode();
96 }
97 break;
98 + // down
99 + case KEY_DOWN:
100 + case 'j':
101 + menu_driver(mymenu, REQ_DOWN_ITEM);
102 + break;
103 + // up
104 + case KEY_UP:
105 + case 'k':
106 + menu_driver(mymenu, REQ_UP_ITEM);
107 + break;
108 // merge interactively
109 case 'm':
110 case 'M':
111 @@ -300,7 +290,6 @@ int main(int argc, char **argv) {
112 menu_changed = TRUE;
113 }
114 break;
115 -
116 // merge/replace update
117 case 'r':
118 case 'R':
119 @@ -330,28 +319,42 @@ int main(int argc, char **argv) {
120 }
121 }
122 break;
123 - // delete update
124 - case 'd':
125 - case 'D':
126 - firstrun = config.check_actions;
127 - doit = TRUE;
128 + // deselect all
129 + case 'u':
130 + case 'U':
131 + menu_driver(mymenu, REQ_LAST_ITEM);
132 for (i=0;i<item_count(mymenu);i++) {
133 - if (item_value(items_list[i]) == TRUE || (current_item(mymenu) == items_list[i] && item_userptr(items_list[i]))) {
134 - if (firstrun) {
135 - doit = get_confirmation(inner, "delete");
136 - firstrun = false;
137 - }
138 - if (doit) {
139 - myupdate = (char **)item_userptr(items_list[i]);
140 - exit_error(!unlink(*(myupdate)), *(myupdate));
141 - removed_updates_ct++;
142 - removed_updates_report = (char**)realloc(removed_updates_report, removed_updates_ct * sizeof(char *));
143 - removed_updates_report[removed_updates_ct-1] = get_real_filename(*myupdate);
144 - free(*myupdate);
145 - *myupdate = SKIP_ENTRY;
146 - menu_changed = TRUE;
147 - }
148 + menu_driver(mymenu, REQ_UP_ITEM);
149 + set_item_value(current_item(mymenu), FALSE);
150 + }
151 + menu_driver(mymenu, REQ_FIRST_ITEM);
152 + break;
153 + // page up
154 + case KEY_PPAGE:
155 + menu_driver(mymenu, REQ_SCR_UPAGE);
156 + break;
157 + // page down
158 + case KEY_NPAGE:
159 + menu_driver(mymenu, REQ_SCR_DPAGE);
160 + break;
161 + // top
162 + case KEY_HOME:
163 + menu_driver(mymenu, REQ_FIRST_ITEM);
164 + break;
165 + // bottom
166 + case KEY_END:
167 + menu_driver(mymenu, REQ_LAST_ITEM);
168 + break;
169 + // show differences
170 + case '\n':
171 + case KEY_ENTER:
172 + if (item_userptr(current_item(mymenu))) {
173 + endwin();
174 + int ret = show_diff(*((char **)item_userptr(current_item(mymenu))));
175 + if (!ret) {
176 + fprintf(stderr, "show_diff failed with error code: %d\n", ret);
177 }
178 + reset_prog_mode();
179 }
180 break;
181 case KEY_RESIZE:
Report Message
Find on MARC Find on Google Groups