From c4f31e4646c7ffde767b062fa677b12531adbc33 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 2 Aug 2013 03:36:31 -0400 Subject: [PATCH 1/3] fixed cursor --- main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.c b/main.c index cdc6dc1..b014a79 100644 --- a/main.c +++ b/main.c @@ -280,6 +280,14 @@ void prepare_window(WINDOW* w) { wresize(w, LINES-2, COLS); } +/* Draws cursor relative to input */ +void position_cursor(WINDOW* w) +{ + int x, y; + getyx(w, y, x); + move(y, x); +} + int main(int argc, char* argv[]) { int ch; ToxWindow* a; @@ -299,6 +307,7 @@ int main(int argc, char* argv[]) { a->blink = false; a->onDraw(a); draw_bar(); + position_cursor(a->window); // Handle input. ch = getch(); From 8eaf96e7bbba81e43c9aa8ac3629815a666845c1 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 2 Aug 2013 04:58:15 -0400 Subject: [PATCH 2/3] remove cursor from friend and chat windows --- main.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/main.c b/main.c index b014a79..6ceab01 100644 --- a/main.c +++ b/main.c @@ -280,12 +280,24 @@ void prepare_window(WINDOW* w) { wresize(w, LINES-2, COLS); } -/* Draws cursor relative to input */ -void position_cursor(WINDOW* w) +/* + * Draws cursor relative to input on prompt window. + * Removes cursor on friends window and chat windows. + * + * TODO: Make it work for chat windows + */ +void position_cursor(WINDOW* w, char* title, ToxWindow* a) { - int x, y; - getyx(w, y, x); - move(y, x); + curs_set(1); + if (strcmp(title, "[prompt]") == 0) { // main/prompt window + int x, y; + getyx(w, y, x); + move(y, x); + } + else if (strcmp(title, "[friends]") == 0) // friends window + curs_set(0); + else // any other window (i.e chat) + curs_set(0); } int main(int argc, char* argv[]) { @@ -307,7 +319,7 @@ int main(int argc, char* argv[]) { a->blink = false; a->onDraw(a); draw_bar(); - position_cursor(a->window); + position_cursor(a->window, a->title, a); // Handle input. ch = getch(); From 64157963ec9bcb7a2aa71fbc109227bb15fb0cbf Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 2 Aug 2013 05:08:04 -0400 Subject: [PATCH 3/3] rm unused arg --- main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index 6ceab01..c596b70 100644 --- a/main.c +++ b/main.c @@ -286,7 +286,7 @@ void prepare_window(WINDOW* w) { * * TODO: Make it work for chat windows */ -void position_cursor(WINDOW* w, char* title, ToxWindow* a) +void position_cursor(WINDOW* w, char* title) { curs_set(1); if (strcmp(title, "[prompt]") == 0) { // main/prompt window @@ -319,7 +319,7 @@ int main(int argc, char* argv[]) { a->blink = false; a->onDraw(a); draw_bar(); - position_cursor(a->window, a->title, a); + position_cursor(a->window, a->title); // Handle input. ch = getch();