Merge branch 'master' of github.com:freecoding/naskpass

2 files changed, 11 insertions, 3 deletions

diff --git a/ui.h b/ui.h
index 5ed5906..c6102e6 100644
--- a/ui.h
+++ b/ui.h
@@ -6,9 +6,8 @@
 
 #define UICB_OK		0
 #define UICB_ERR_UNDEF	1
-#define UICB_ERR_NOP	2
-#define UICB_ERR_CB	3
-#define UICB_ERR_BUF	4
+#define UICB_ERR_CB	2
+#define UICB_ERR_BUF	3
 
 #define UILOOP_TIMEOUT	1
 
diff --git a/ui_input.c b/ui_input.c
index fa286cf..13a33b0 100644
--- a/ui_input.c
+++ b/ui_input.c
@@ -104,6 +104,15 @@ add_input(WINDOW *win, struct input *a, int key)
 int
 del_input(WINDOW *win, struct input *a)
 {
+  if (a == NULL) return (UICB_ERR_UNDEF);
+  memmove((a->input + a->input_pos - 1), (a->input + a->input_pos), a->input_max - a->input_pos);
+  --a->input_len;
+  if (a->input_pos == a->input_len) {
+    --a->input_pos;
+  }
+  print_input(win, a);
+  mvwprintw(win, 10, 1, "w:%d,cp:%d,im:%lu,il:%lu,ip:%lu,s:%s", a->width, a->cur_pos, a->input_max, a->input_len, a->input_pos, a->input);
+  
   return (UICB_OK);
 }