From 5be47cc5a9dc67b5aa206ed9c5a3bc743ab7af06 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Thu, 15 Jan 2015 13:22:54 +0000
Subject: Moved input size variable to ui module

---
 src/profanity.c    | 7 ++-----
 src/ui/core.c      | 9 ++++++---
 src/ui/ui.h        | 2 +-
 tests/ui/stub_ui.c | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/profanity.c b/src/profanity.c
index 30a55b0c..255ff177 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -90,15 +90,12 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
 
     ui_update();
 
-    log_info("Starting main event loop");
-
     jabber_conn_status_t conn_status = jabber_get_connection_status();
-    int size = 0;
     gboolean read_input = TRUE;
     gboolean cmd_result = TRUE;
 
+    log_info("Starting main event loop");
     while(cmd_result == TRUE) {
-        size = 0;
         read_input = TRUE;
         while(read_input) {
             conn_status = jabber_get_connection_status();
@@ -106,7 +103,7 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
                 _handle_idle_time();
             }
 
-            read_input = ui_get_char(inp, &size);
+            read_input = ui_get_char(inp);
 
 #ifdef HAVE_LIBOTR
             otr_poll();
diff --git a/src/ui/core.c b/src/ui/core.c
index 50fa8539..8b89b12e 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -73,6 +73,7 @@
 #include "xmpp/xmpp.h"
 
 static char *win_title;
+static int inp_size;
 
 #ifdef HAVE_LIBXSS
 static Display *display;
@@ -108,6 +109,7 @@ ui_init(void)
     display = XOpenDisplay(0);
 #endif
     ui_idle_time = g_timer_new();
+    inp_size = 0;
     ProfWin *window = wins_get_current();
     win_update_virtual(window);
 }
@@ -175,10 +177,10 @@ ui_close(void)
 }
 
 gboolean
-ui_get_char(char *input, int *size)
+ui_get_char(char *input)
 {
     int result = 0;
-    wint_t ch = inp_get_char(input, size, &result);
+    wint_t ch = inp_get_char(input, &inp_size, &result);
     _win_handle_switch(ch);
     ProfWin *current = wins_get_current();
     win_handle_page(current, ch, result);
@@ -194,7 +196,8 @@ ui_get_char(char *input, int *size)
     }
 
     if (ch == '\n') {
-        input[*size++] = '\0';
+        input[inp_size++] = '\0';
+        inp_size = 0;
     }
 
     return (ch != '\n');
diff --git a/src/ui/ui.h b/src/ui/ui.h
index a482826b..8141ed2a 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -229,7 +229,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
 void ui_about(void);
 void ui_statusbar_new(const int win);
 
-gboolean ui_get_char(char *input, int *size);
+gboolean ui_get_char(char *input);
 void ui_input_clear(void);
 void ui_input_nonblocking(gboolean);
 void ui_replace_input(char *input, const char * const new_input, int *size);
diff --git a/tests/ui/stub_ui.c b/tests/ui/stub_ui.c
index e5588cad..6c2d889c 100644
--- a/tests/ui/stub_ui.c
+++ b/tests/ui/stub_ui.c
@@ -323,7 +323,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
 void ui_about(void) {}
 void ui_statusbar_new(const int win) {}
 
-gboolean ui_get_char(char *input, int *size)
+gboolean ui_get_char(char *input)
 {
     return FALSE;
 }
-- 
cgit 1.4.1-2-gfad0