about summary refs log tree commit diff stats
path: root/src/ui/inputwin.h
diff options
context:
space:
mode:
authorWill Song <incertia9474@gmail.com>2015-05-29 19:53:37 -0500
committerWill Song <incertia9474@gmail.com>2015-05-29 19:53:37 -0500
commit9463c6719036957c8468e1363a48afbfe751fd3e (patch)
treeaed6ccd050fc182a0d4d111bef6f743d28a42a73 /src/ui/inputwin.h
parent7f436d614b11d72893d856f1c3d817ab34b0b9eb (diff)
parent304e08a9c0bfa27ed84dc1ff0a2e2d32b36529f8 (diff)
downloadprofani-tty-9463c6719036957c8468e1363a48afbfe751fd3e.tar.gz
fix conflicts
Diffstat (limited to 'src/ui/inputwin.h')
-rw-r--r--src/ui/inputwin.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/ui/inputwin.h b/src/ui/inputwin.h
index 39fde720..f49a6a76 100644
--- a/src/ui/inputwin.h
+++ b/src/ui/inputwin.h
@@ -1,7 +1,7 @@
 /*
  * inputwin.c
  *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
  *
  * This file is part of Profanity.
  *
@@ -35,15 +35,17 @@
 #ifndef UI_INPUTWIN_H
 #define UI_INPUTWIN_H
 
+#include <glib.h>
+
+#define INP_WIN_MAX 1000
+
 void create_input_window(void);
-char* inp_read(int *key_type, wint_t *ch);
-void inp_win_reset(void);
+char* inp_readline(void);
+void inp_nonblocking(gboolean reset);
+void inp_close(void);
+void inp_win_clear(void);
 void inp_win_resize(void);
 void inp_put_back(void);
-void inp_non_block(gint);
-void inp_block(void);
-void inp_get_password(char *passwd);
-void inp_replace_input(const char * const new_input);
-void inp_history_append(char *inp);
+char* inp_get_password(void);
 
 #endif