Changes in uspace/app/edit/edit.c [c80be58:3e6a98c5] in mainline

File:

• uspace/app/edit/edit.c (modified) (10 diffs)

uspace/app/edit/edit.c

@@ -80 +80 @@
         tag_t sel_start;
 
-        /** Active keyboard modifiers */
-        keymod_t keymod;
-
         /** 
          * Ideal column where the caret should try to get. This is used
@@ -122 +119 @@
 static void cursor_setvis(bool visible);
 
-static void key_handle_press(kbd_event_t *ev);
 static void key_handle_unmod(kbd_event_t const *ev);
 static void key_handle_ctrl(kbd_event_t const *ev);
@@ -128 +124 @@
 static void key_handle_shift_ctrl(kbd_event_t const *ev);
 static void key_handle_movement(unsigned int key, bool shift);
-
-static void pos_handle(pos_event_t *ev);
 
 static int file_save(char const *fname);
@@ -188 +182 @@
 int main(int argc, char *argv[])
 {
-        cons_event_t ev;
+        kbd_event_t ev;
         bool new_file;
         int rc;
@@ -251 +245 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                console_get_kbd_event(con, &ev);
                 pane.rflags = 0;
 
-                switch (ev.type) {
-                case CEV_KEY:
-                        pane.keymod = ev.ev.key.mods;
-                        if (ev.ev.key.type == KEY_PRESS)
-                                key_handle_press(&ev.ev.key);
-                        break;
-                case CEV_POS:
-                        pos_handle(&ev.ev.pos);
-                        break;
+                if (ev.type == KEY_PRESS) {
+                        /* Handle key press. */
+                        if (((ev.mods & KM_ALT) == 0) &&
+                            ((ev.mods & KM_SHIFT) == 0) &&
+                             (ev.mods & KM_CTRL) != 0) {
+                                key_handle_ctrl(&ev);
+                        } else if (((ev.mods & KM_ALT) == 0) &&
+                            ((ev.mods & KM_CTRL) == 0) &&
+                             (ev.mods & KM_SHIFT) != 0) {
+                                key_handle_shift(&ev);
+                        } else if (((ev.mods & KM_ALT) == 0) &&
+                            ((ev.mods & KM_CTRL) != 0) &&
+                             (ev.mods & KM_SHIFT) != 0) {
+                                key_handle_shift_ctrl(&ev);
+                        } else if ((ev.mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
+                                key_handle_unmod(&ev);
+                        }
                 }
 
@@ -284 +286 @@
 
         return 0;
-}
-
-/* Handle key press. */
-static void key_handle_press(kbd_event_t *ev)
-{
-        if (((ev->mods & KM_ALT) == 0) &&
-            ((ev->mods & KM_SHIFT) == 0) &&
-             (ev->mods & KM_CTRL) != 0) {
-                key_handle_ctrl(ev);
-        } else if (((ev->mods & KM_ALT) == 0) &&
-            ((ev->mods & KM_CTRL) == 0) &&
-             (ev->mods & KM_SHIFT) != 0) {
-                key_handle_shift(ev);
-        } else if (((ev->mods & KM_ALT) == 0) &&
-            ((ev->mods & KM_CTRL) != 0) &&
-             (ev->mods & KM_SHIFT) != 0) {
-                key_handle_shift_ctrl(ev);
-        } else if ((ev->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                key_handle_unmod(ev);
-        }
 }
 
@@ -480 +462 @@
 }
 
-static void pos_handle(pos_event_t *ev)
-{
-        coord_t bc;
-        spt_t pt;
-        bool select;
-
-        if (ev->type == POS_PRESS && ev->vpos < (unsigned)pane.rows) {
-                bc.row = pane.sh_row + ev->vpos;
-                bc.column = pane.sh_column + ev->hpos;
-                sheet_get_cell_pt(doc.sh, &bc, dir_before, &pt);
-
-                select = (pane.keymod & KM_SHIFT) != 0;
-
-                caret_move(pt, select, true);
-        }
-}
-
 /** Move caret while preserving or resetting selection. */
 static void caret_move(spt_t new_caret_pt, bool select, bool update_ideal_column)
@@ -627 +592 @@
 static char *prompt(char const *prompt, char const *init_value)
 {
-        cons_event_t ev;
-        kbd_event_t *kev;
+        kbd_event_t ev;
         char *str;
         wchar_t buffer[INFNAME_MAX_LEN + 1];
@@ -648 +612 @@
 
         while (!done) {
-                console_get_event(con, &ev);
-
-                if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS) {
-                        kev = &ev.ev.key;
-
+                console_get_kbd_event(con, &ev);
+
+                if (ev.type == KEY_PRESS) {
                         /* Handle key press. */
-                        if (((kev->mods & KM_ALT) == 0) &&
-                             (kev->mods & KM_CTRL) != 0) {
+                        if (((ev.mods & KM_ALT) == 0) &&
+                             (ev.mods & KM_CTRL) != 0) {
                                 ;
-                        } else if ((kev->mods & (KM_CTRL | KM_ALT)) == 0) {
-                                switch (kev->key) {
+                        } else if ((ev.mods & (KM_CTRL | KM_ALT)) == 0) {
+                                switch (ev.key) {
                                 case KC_ESCAPE:
                                         return NULL;
@@ -672 +634 @@
                                         break;
                                 default:
-                                        if (kev->c >= 32 && nc < max_len) {
-                                                putchar(kev->c);
+                                        if (ev.c >= 32 && nc < max_len) {
+                                                putchar(ev.c);
                                                 console_flush(con);
-                                                buffer[nc++] = kev->c;
+                                                buffer[nc++] = ev.c;
                                         }
                                         break;