Move e key to views

[lackey] / views / events.c

diff --git a/views/events.c b/views/events.c
index b23c0f55cfc7c19f8a24fd92fb42a01eeb657cb0..d5cdf99e6041706b14476b38f5983bc1eaaf82f7 100644 (file)
--- a/views/events.c
+++ b/views/events.c
@@ -15,6 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h>
 #include <ncurses.h>
 
 #include "util.h"
@@ -87,8 +88,10 @@ void events_draw(void)
                        /* Print event info */
                        event_line(win, event, row++-line, 4, COLS-4,
                                        SHOW_DETAILS | SHOW_ACTIVE);
-                       if (event->name && event->desc)
-                               mvwprintw(win, row++-line, 14, "%s", event->desc);
+                       if (event->name && event->desc) {
+                               int n = MIN(COLS-14, strcspn(event->desc, "\n"));
+                               mvwprintw(win, row++-line, 14, "%.*s", n, event->desc);
+                       }
 
                        cur = next;
                        count += 1;
@@ -114,9 +117,8 @@ int events_run(int key, mmask_t btn, int row, int col)
                case 'U':    scroll = -LINES;   break;
                case 'j':    move   =  1;       break;
                case 'k':    move   = -1;       break;
-               case '\012': // enter
-                       view_edit(EDIT_EVENT);
-                       return 1;
+               case 'e':    view_edit(EDIT_EVENT); return 1;
+               case '\012': view_edit(EDIT_EVENT); return 1; // enter
        }
        line   = CLAMP(line+scroll, 0, rows-1);
        for (int i=0; i<move && EVENT && EVENT->next; i++)