From 42c486d30d8e6f82d27651e19029e332af86cba3 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Tue, 12 Jun 2012 22:42:28 +0200 Subject: Rename displacement enumeration elements * Rename "LEFT" to "DAY_PREV", "RIGHT" to "DAY_NEXT", "UP" to "WEEK_PREV" and "DOWN" to "WEEK_NEXT" to reflect the semantics of these operations. Remove the unneeded "MOVES" element. * Reorder code to improve consistency. Signed-off-by: Lukas Fleischer --- src/calcurse.c | 20 ++++++++++---------- src/calcurse.h | 15 +++++++-------- src/calendar.c | 16 ++++++++-------- src/help.c | 8 ++++---- src/keys.c | 14 +++++++------- src/wins.c | 16 ++++++++-------- 6 files changed, 44 insertions(+), 45 deletions(-) diff --git a/src/calcurse.c b/src/calcurse.c index 9e42eee..e80e9dc 100644 --- a/src/calcurse.c +++ b/src/calcurse.c @@ -398,19 +398,19 @@ int main(int argc, char **argv) wins_update(FLAG_ALL); break; - case KEY_GENERIC_NEXT_DAY: - case KEY_MOVE_RIGHT: - if (wins_slctd() == CAL || key == KEY_GENERIC_NEXT_DAY) { - calendar_move(RIGHT, count); + case KEY_GENERIC_PREV_DAY: + case KEY_MOVE_LEFT: + if (wins_slctd() == CAL || key == KEY_GENERIC_PREV_DAY) { + calendar_move(DAY_PREV, count); inday = do_storage(1); wins_update(FLAG_CAL | FLAG_APP); } break; - case KEY_GENERIC_PREV_DAY: - case KEY_MOVE_LEFT: - if (wins_slctd() == CAL || key == KEY_GENERIC_PREV_DAY) { - calendar_move(LEFT, count); + case KEY_GENERIC_NEXT_DAY: + case KEY_MOVE_RIGHT: + if (wins_slctd() == CAL || key == KEY_GENERIC_NEXT_DAY) { + calendar_move(DAY_NEXT, count); inday = do_storage(1); wins_update(FLAG_CAL | FLAG_APP); } @@ -419,7 +419,7 @@ int main(int argc, char **argv) case KEY_GENERIC_PREV_WEEK: case KEY_MOVE_UP: if (wins_slctd() == CAL || key == KEY_GENERIC_PREV_WEEK) { - calendar_move(UP, count); + calendar_move(WEEK_PREV, count); inday = do_storage(1); wins_update(FLAG_CAL | FLAG_APP); } else if (wins_slctd() == APP) { @@ -441,7 +441,7 @@ int main(int argc, char **argv) case KEY_GENERIC_NEXT_WEEK: case KEY_MOVE_DOWN: if (wins_slctd() == CAL || key == KEY_GENERIC_NEXT_WEEK) { - calendar_move(DOWN, count); + calendar_move(WEEK_NEXT, count); inday = do_storage(1); wins_update(FLAG_CAL | FLAG_APP); } else if (wins_slctd() == APP) { diff --git a/src/calcurse.h b/src/calcurse.h index be16a98..ec6335f 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -399,10 +399,10 @@ enum key { KEY_GENERIC_REDRAW, KEY_GENERIC_ADD_APPT, KEY_GENERIC_ADD_TODO, - KEY_GENERIC_NEXT_DAY, KEY_GENERIC_PREV_DAY, - KEY_GENERIC_NEXT_WEEK, + KEY_GENERIC_NEXT_DAY, KEY_GENERIC_PREV_WEEK, + KEY_GENERIC_NEXT_WEEK, KEY_GENERIC_SCROLL_DOWN, KEY_GENERIC_SCROLL_UP, KEY_GENERIC_GOTO_TODAY, @@ -534,13 +534,12 @@ enum wday { /* Possible movements inside calendar. */ enum move { - UP, - DOWN, - LEFT, - RIGHT, + DAY_PREV, + DAY_NEXT, + WEEK_PREV, + WEEK_NEXT, WEEK_START, - WEEK_END, - MOVES + WEEK_END }; /* Available color pairs. */ diff --git a/src/calendar.c b/src/calendar.c index f369d8f..dbac9c7 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -614,18 +614,18 @@ void calendar_move(enum move move, int count) t.tm_year = slctd_day.yyyy - 1900; switch (move) { - case UP: - ret = date_change(&t, 0, -count * WEEKINDAYS); - break; - case DOWN: - ret = date_change(&t, 0, count * WEEKINDAYS); - break; - case LEFT: + case DAY_PREV: ret = date_change(&t, 0, -count); break; - case RIGHT: + case DAY_NEXT: ret = date_change(&t, 0, count); break; + case WEEK_PREV: + ret = date_change(&t, 0, -count * WEEKINDAYS); + break; + case WEEK_NEXT: + ret = date_change(&t, 0, count * WEEKINDAYS); + break; case WEEK_START: /* Normalize struct tm to get week day number. */ mktime(&t); diff --git a/src/help.c b/src/help.c index 69bb79d..2cae3cc 100644 --- a/src/help.c +++ b/src/help.c @@ -116,10 +116,10 @@ help_write_pad(struct window *win, char *title, char *text, enum key action) case KEY_GENERIC_REDRAW: case KEY_GENERIC_ADD_APPT: case KEY_GENERIC_ADD_TODO: - case KEY_GENERIC_NEXT_DAY: case KEY_GENERIC_PREV_DAY: - case KEY_GENERIC_NEXT_WEEK: + case KEY_GENERIC_NEXT_DAY: case KEY_GENERIC_PREV_WEEK: + case KEY_GENERIC_NEXT_WEEK: case KEY_GENERIC_GOTO_TODAY: case KEY_GENERIC_CREDITS: case KEY_GENERIC_CUT: @@ -212,10 +212,10 @@ static int wanted_page(int ch) case KEY_GENERIC_REDRAW: case KEY_GENERIC_ADD_APPT: case KEY_GENERIC_ADD_TODO: - case KEY_GENERIC_NEXT_DAY: case KEY_GENERIC_PREV_DAY: - case KEY_GENERIC_NEXT_WEEK: + case KEY_GENERIC_NEXT_DAY: case KEY_GENERIC_PREV_WEEK: + case KEY_GENERIC_NEXT_WEEK: case KEY_GENERIC_GOTO_TODAY: page = HELP_GENERAL; break; diff --git a/src/keys.c b/src/keys.c index 3392cfc..6e6b194 100644 --- a/src/keys.c +++ b/src/keys.c @@ -67,10 +67,10 @@ static struct keydef_s keydef[NBKEYS] = { {"generic-redraw", "C-r"}, {"generic-add-appt", "C-a"}, {"generic-add-todo", "C-t"}, - {"generic-next-day", "C-l"}, {"generic-prev-day", "C-h"}, - {"generic-next-week", "C-j"}, + {"generic-next-day", "C-l"}, {"generic-prev-week", "C-k"}, + {"generic-next-week", "C-j"}, {"generic-scroll-down", "C-n"}, {"generic-scroll-up", "C-p"}, {"generic-goto-today", "C-g"}, @@ -455,17 +455,17 @@ void keys_popup_info(enum key key) _("Add an appointment, whichever panel is currently selected."); info[KEY_GENERIC_ADD_TODO] = _("Add a todo item, whichever panel is currently selected."); - info[KEY_GENERIC_NEXT_DAY] = - _("Move to next day in calendar, whichever panel is currently selected."); info[KEY_GENERIC_PREV_DAY] = _("Move to previous day in calendar, whichever panel is currently " "selected."); - info[KEY_GENERIC_NEXT_WEEK] = - _ - ("Move to next week in calendar, whichever panel is currently selected."); + info[KEY_GENERIC_NEXT_DAY] = + _("Move to next day in calendar, whichever panel is currently selected."); info[KEY_GENERIC_PREV_WEEK] = _("Move to previous week in calendar, whichever panel is currently " "selected"); + info[KEY_GENERIC_NEXT_WEEK] = + _ + ("Move to next week in calendar, whichever panel is currently selected."); info[KEY_GENERIC_SCROLL_DOWN] = _ ("Scroll window down (e.g. when displaying text inside a popup window)."); diff --git a/src/wins.c b/src/wins.c index b45ad6c..7d2f8a2 100644 --- a/src/wins.c +++ b/src/wins.c @@ -597,10 +597,10 @@ void wins_status_bar(void) struct binding draw = { _("Redraw"), KEY_GENERIC_REDRAW }; struct binding appt = { _("Add Appt"), KEY_GENERIC_ADD_APPT }; struct binding todo = { _("Add Todo"), KEY_GENERIC_ADD_TODO }; - struct binding gnday = { _("+1 Day"), KEY_GENERIC_NEXT_DAY }; struct binding gpday = { _("-1 Day"), KEY_GENERIC_PREV_DAY }; - struct binding gnweek = { _("+1 Week"), KEY_GENERIC_NEXT_WEEK }; + struct binding gnday = { _("+1 Day"), KEY_GENERIC_NEXT_DAY }; struct binding gpweek = { _("-1 Week"), KEY_GENERIC_PREV_WEEK }; + struct binding gnweek = { _("+1 Week"), KEY_GENERIC_NEXT_WEEK }; struct binding today = { _("Today"), KEY_GENERIC_GOTO_TODAY }; struct binding nview = { _("Nxt View"), KEY_GENERIC_SCROLL_DOWN }; struct binding pview = { _("Prv View"), KEY_GENERIC_SCROLL_UP }; @@ -625,20 +625,20 @@ void wins_status_bar(void) struct binding *bindings_cal[] = { &help, &quit, &save, &chgvu, &nview, &pview, &up, &down, &left, &right, - &togo, &import, &export, &weekb, &weeke, &appt, &todo, &gnday, &gpday, - &gnweek, &gpweek, &draw, &today, &conf + &togo, &import, &export, &weekb, &weeke, &appt, &todo, &gpday, &gnday, + &gpweek, &gnweek, &draw, &today, &conf }; struct binding *bindings_apoint[] = { &help, &quit, &save, &chgvu, &import, &export, &add, &del, &edit, &view, - &pipe, &draw, &rept, &flag, &enote, &vnote, &up, &down, &gnday, &gpday, - &gnweek, &gpweek, &togo, &today, &conf, &appt, &todo, &cut, &paste + &pipe, &draw, &rept, &flag, &enote, &vnote, &up, &down, &gpday, &gnday, + &gpweek, &gnweek, &togo, &today, &conf, &appt, &todo, &cut, &paste }; struct binding *bindings_todo[] = { &help, &quit, &save, &chgvu, &import, &export, &add, &del, &edit, &view, - &pipe, &flag, &rprio, &lprio, &enote, &vnote, &up, &down, &gnday, &gpday, - &gnweek, &gpweek, &togo, &today, &conf, &appt, &todo, &draw + &pipe, &flag, &rprio, &lprio, &enote, &vnote, &up, &down, &gpday, &gnday, + &gpweek, &gnweek, &togo, &today, &conf, &appt, &todo, &draw }; enum win active_panel = wins_slctd(); -- cgit v1.2.3