sources/interface.cpp

Sat, 23 Jul 2016 12:22:23 +0300

author
Teemu Piippo <teemu@compsta2.com>
date
Sat, 23 Jul 2016 12:22:23 +0300
changeset 163
5948441a1951
parent 156
ce66d7e374bf
child 159
970d58a01e8b
child 179
7fc34735178e
permissions
-rw-r--r--

Added the ByteArray::quote() method to return a string representation of the byte array, and used it to print out the contents of unparseable packets.

14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
1 /*
109
e4966d7e615d Happy new year 2016
Teemu Piippo <crimsondusk64@gmail.com>
parents: 105
diff changeset
2 Copyright 2014 - 2016 Teemu Piippo
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
3 All rights reserved.
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
4
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
5 Redistribution and use in source and binary forms, with or without
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
6 modification, are permitted provided that the following conditions
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
7 are met:
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
8
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
9 1. Redistributions of source code must retain the above copyright
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
10 notice, this list of conditions and the following disclaimer.
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
11 2. Redistributions in binary form must reproduce the above copyright
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
12 notice, this list of conditions and the following disclaimer in the
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
13 documentation and/or other materials provided with the distribution.
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
14 3. Neither the name of the copyright holder nor the names of its
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
15 contributors may be used to endorse or promote products derived from
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
16 this software without specific prior written permission.
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
17
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
18 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
19 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
20 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
21 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
22 OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
23 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
24 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
25 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
26 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
27 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
28 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
29 */
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
30
88
08ccaf26cffd Now works with MSVC 2010/pdcurses-win32a
Teemu Piippo <tsapii@utu.fi>
parents: 86
diff changeset
31 #include <curses.h>
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
32 #include <string.h>
51
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
33 #include <time.h>
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
34 #include "interface.h"
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
35 #include "network/rconsession.h"
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
36 #include "network/ipaddress.h"
46
19be47c9bab7 - renamed RendererLine to ColoredLine and split it into its own files
Teemu Piippo <crimsondusk64@gmail.com>
parents: 45
diff changeset
37 #include "coloredline.h"
88
08ccaf26cffd Now works with MSVC 2010/pdcurses-win32a
Teemu Piippo <tsapii@utu.fi>
parents: 86
diff changeset
38 BEGIN_ZFC_NAMESPACE
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
39
128
e5d185b62b7f Renamed g_pageSize
Teemu Piippo <crimsondusk64@gmail.com>
parents: 127
diff changeset
40 static const int PAGE_SIZE = 10;
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
41
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
42 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
43 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
44 chtype Interface::getColorPair(Color fg, Color bg)
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
45 {
117
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
46 if (fg == DEFAULT && bg == DEFAULT)
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
47 return 0;
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
48 else
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
49 return COLOR_PAIR(1 + (int(fg) * NUM_COLORS) + int(bg));
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
50 }
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
51
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
52 // -------------------------------------------------------------------------------------------------
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
53 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
54 const String& Interface::getCurrentInput()
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
55 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
56 return m_inputHistory[m_inputCursor];
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
57 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
58
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
59 // -------------------------------------------------------------------------------------------------
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
60 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
61 // Makes current_input() the lastmost input(so that we won't modify history)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
62 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
63 void Interface::detachInput()
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
64 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
65 if (m_inputCursor > 0)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
66 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
67 m_inputHistory[0] = getCurrentInput();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
68 m_inputCursor = 0;
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
69 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
70 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
71
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
72 // -------------------------------------------------------------------------------------------------
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
73 // A version of current_input() that allows changing the contents of it.
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
74 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
75 String& Interface::getEditableInput()
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
76 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
77 detachInput();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
78 return m_inputHistory[m_inputCursor];
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
79 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
80
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
81 // -------------------------------------------------------------------------------------------------
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
82 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
83 void Interface::moveInputCursor(int delta)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
84 {
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
85 // No input history when inputting addresses or passwords
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
86 if (m_inputState != INPUTSTATE_NORMAL)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
87 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
88 m_inputCursor = 0;
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
89 return;
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
90 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
91
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
92 int oldcursor = m_inputCursor;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
93 m_inputCursor = clamp(m_inputCursor + delta, 0, m_inputHistory.size() - 1);
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
94
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
95 if (m_inputCursor != oldcursor)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
96 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
97 m_cursorPosition = getCurrentInput().length();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
98 m_needInputRender = true;
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
99 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
100 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
101
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
102 // -------------------------------------------------------------------------------------------------
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
103 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
104 String Interface::getPromptString()
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
105 {
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
106 String prompt;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
107
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
108 switch (m_inputState)
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
109 {
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
110 case INPUTSTATE_NORMAL: prompt = ">"; break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
111 case INPUTSTATE_ADDRESS: prompt = "address:"; break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
112 case INPUTSTATE_PASSWORD: prompt = "password:"; break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
113 case INPUTSTATE_CONFIRM_DISCONNECTION: break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
114 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
115
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
116 return prompt;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
117 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
118
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
119 // -------------------------------------------------------------------------------------------------
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
120 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
121 void Interface::setInputState(InputState newstate)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
122 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
123 // Clear the input row(unless going to or from confirm state)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
124 if (newstate != INPUTSTATE_CONFIRM_DISCONNECTION
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
125 and m_inputState != INPUTSTATE_CONFIRM_DISCONNECTION)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
126 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
127 m_inputCursor = 0;
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
128 getEditableInput().clear();
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
129 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
130
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
131 switch (newstate)
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
132 {
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
133 case INPUTSTATE_ADDRESS:
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
134 if (m_remoteAddress.host != 0)
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
135 getEditableInput() = m_remoteAddress.to_string(IPAddress::WITH_PORT);
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
136 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
137
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
138 default:
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
139 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
140 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
141
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
142 m_inputState = newstate;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
143 m_needInputRender = true;
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
144 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
145
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
146 // -------------------------------------------------------------------------------------------------
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
147 //
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
148 Interface::Interface() :
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
149 m_inputCursor(0),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
150 m_cursorPosition(0),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
151 m_inputPanning(0),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
152 m_needRefresh(false),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
153 m_needStatusBarRender(false),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
154 m_needInputRender(false),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
155 m_needOutputRender(false),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
156 m_needNicklistRender(false),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
157 m_outputScroll(0),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
158 m_inputState(INPUTSTATE_NORMAL),
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
159 m_disconnectCallback(nullptr)
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
160 {
92
39947c46ed17 Suppress more MSVC warnings
Teemu Piippo <tsapii@utu.fi>
parents: 91
diff changeset
161 ::initscr();
86
3c02a728a681 Use raw mode instead of cbreak mode, otherwise ctrl+q doesn't appear to work right
Teemu Piippo <crimsondusk64@gmail.com>
parents: 83
diff changeset
162 ::raw();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
163 ::keypad(stdscr, true);
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
164 ::noecho();
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
165 ::refresh();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
166 ::timeout(0);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
167 m_inputHistory.clear();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
168 m_inputHistory << "";
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
169 m_outputLines.clear();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
170 m_outputLines << ColoredLine();
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
171 m_session.setInterface(this);
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
172 resetTitle();
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
173
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
174 if (::has_colors())
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
175 {
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
176 ::start_color();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
177 bool hasDefaultColors =(::use_default_colors() == OK);
119
9eb47f1899be Fixed some warning on MSVC
Teemu Piippo <crimsondusk64@gmail.com>
parents: 118
diff changeset
178 int defaultFg = hasDefaultColors ? -1 : COLOR_WHITE;
9eb47f1899be Fixed some warning on MSVC
Teemu Piippo <crimsondusk64@gmail.com>
parents: 118
diff changeset
179 int defaultBg = hasDefaultColors ? -1 : COLOR_BLACK;
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
180
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
181 // Initialize color pairs
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
182 for (int i : range<int>(NUM_COLORS))
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
183 for (int j : range<int>(NUM_COLORS))
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
184 {
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
185 int pairnum = 1 + (i * NUM_COLORS + j);
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
186 int fg =(i == DEFAULT) ? defaultFg : i;
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
187 int bg =(j == DEFAULT) ? defaultBg : j;
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
188
117
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
189 if (fg != -1 || bg != -1)
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
190 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
191 if (::init_pair(pairnum, fg, bg) == ERR)
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
192 printWarning("Unable to initialize color pair %d(%d, %d)\n", pairnum, fg, bg);
117
39e05a6ba8d7 Improved the color handling a tad
Teemu Piippo <crimsondusk64@gmail.com>
parents: 116
diff changeset
193 }
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
194 }
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
195 }
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
196
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
197 renderFull();
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
198 refresh();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
199 m_needRefresh = false;
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
200 }
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
201
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
202 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
203 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
204 void Interface::renderTitlebar()
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
205 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
206 if (m_title.length() <= COLS)
23
f7221183a994 - the prompt is now colored
Teemu Piippo <crimsondusk64@gmail.com>
parents: 20
diff changeset
207 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
208 chtype pair = getColorPair(WHITE, BLUE);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
209 int startx =(COLS - m_title.length()) / 2;
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
210 int endx = startx + m_title.length();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
211 attron(pair);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
212 mvprintw(0, startx, "%s", m_title.chars());
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
213 mvhline(0, 0, ' ', startx);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
214 mvhline(0, endx, ' ', COLS - endx);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
215 attroff(pair);
23
f7221183a994 - the prompt is now colored
Teemu Piippo <crimsondusk64@gmail.com>
parents: 20
diff changeset
216 }
f7221183a994 - the prompt is now colored
Teemu Piippo <crimsondusk64@gmail.com>
parents: 20
diff changeset
217
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
218 m_needRefresh = true;
20
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
219 }
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
220
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
221 // -------------------------------------------------------------------------------------------------
5f8cdc8febbb - now in color! (titlebar at least anyway)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 17
diff changeset
222 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
223 void Interface::setTitle(const String& title)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
224 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
225 m_title = title;
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
226 renderTitlebar();
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
227 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
228
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
229 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
230 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
231 void Interface::safeDisconnect(std::function<void(bool)> afterwards)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
232 {
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
233 if (m_session.isActive())
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
234 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
235 m_disconnectCallback = afterwards;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
236 setInputState(INPUTSTATE_CONFIRM_DISCONNECTION);
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
237 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
238 else
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
239 afterwards(false);
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
240 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
241
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
242 // -------------------------------------------------------------------------------------------------
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
243 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
244 int Interface::nicklistWidth()
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
245 {
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
246 // Allocate at least 12 characters, at most 24 characters, for the nicklist. If we cannot
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
247 // afford that(o_O) then we probably shouldn't draw the nicklist at all I think.
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
248 int nicklistWidth = COLS / 4;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
249
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
250 if (nicklistWidth < 12)
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
251 return 0;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
252
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
253 return min(nicklistWidth, 24);
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
254 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
255
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
256 // -------------------------------------------------------------------------------------------------
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
257 // Renders the given colored line onto the screen. Will wrap if allowWrap is true. Returns the
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
258 // 'y' value for the next line.
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
259 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
260 int Interface::renderColorline(int y, int x0, int width, const ColoredLine& line, bool allowWrap)
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
261 {
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
262 int x = x0;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
263
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
264 for (int byte : line.data())
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
265 {
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
266 if (x == x0 + width)
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
267 {
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
268 if (not allowWrap)
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
269 return y;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
270
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
271 x = x0;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
272 ++y;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
273 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
274
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
275 if (byte < 256 && isprint(byte))
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
276 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
277 mvaddch(y, x, char(byte));
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
278 ++x;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
279 }
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
280 else if (byte >= RLINE_ON_COLOR and byte <(RLINE_ON_COLOR + 16))
101
71f1cd8154a9 Slight refactor on the fix in the previous commit
Teemu Piippo <tsapii@utu.fi>
parents: 100
diff changeset
281 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
282 auto attrfunction =(byte < RLINE_OFF_COLOR ? &attron : &attroff);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
283 (*attrfunction)(getColorPair(Color((byte - RLINE_ON_COLOR) & 7), DEFAULT));
101
71f1cd8154a9 Slight refactor on the fix in the previous commit
Teemu Piippo <tsapii@utu.fi>
parents: 100
diff changeset
284 }
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
285 else switch (byte)
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
286 {
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
287 case RLINE_ON_BOLD:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
288 attron(A_BOLD);
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
289 break;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
290
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
291 case RLINE_OFF_BOLD:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
292 attroff(A_BOLD);
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
293 break;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
294 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
295 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
296
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
297 return y + 1;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
298 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
299
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
300 // -------------------------------------------------------------------------------------------------
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
301 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
302 void Interface::renderOutput()
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
303 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
304 if (m_outputLines.size() == 1)
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
305 return;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
306
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
307 m_outputScroll = clamp(m_outputScroll, 0, m_outputLines.size() - 1);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
308
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
309 int height = LINES - 3;
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
310 int width = COLS - nicklistWidth();
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
311 int printOffset = 0;
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
312 int end = m_outputLines.size() - 1 - m_outputScroll;
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
313 int start = end;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
314 int usedHeight = 0;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
315 int y = 1;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
316 bool tightFit = false;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
317
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
318 // Where to start?
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
319 while (start > 0)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
320 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
321 int rows = m_outputLines[start - 1].rows(width);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
322
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
323 if (usedHeight + rows > height)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
324 {
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
325 // This line won't fit anymore.
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
326 tightFit = true;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
327 break;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
328 }
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
329
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
330 start--;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
331 usedHeight += rows;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
332 }
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
333
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
334 // See if there's any more rows to use(end may be too small)
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
335 if (not tightFit)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
336 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
337 while (end < m_outputLines.size())
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
338 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
339 int rows = m_outputLines[end].rows(width);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
340
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
341 if (usedHeight + rows > height)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
342 {
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
343 tightFit = true;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
344 break;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
345 }
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
346
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
347 end++;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
348 usedHeight += rows;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
349 }
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
350 }
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
351
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
352 if (start > 0)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
353 printOffset = height - usedHeight;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
354
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
355 m_outputScroll = m_outputLines.size() - 1 - end;
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
356
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
357 if (start < 0 or start == end or printOffset >= height)
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
358 return;
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
359
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
360 assert(start <= end and start - end <= height);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
361
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
362 // Clear the display
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
363 for (int i : range(height))
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
364 mvhline(y + i, 0, ' ', width);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
365
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
366 // Print the lines
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
367 y += printOffset;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
368
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
369 for (int i : range(start, end))
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
370 y = renderColorline(y, 0, width, m_outputLines[i], true);
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
371
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
372 m_needOutputRender = false;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
373 m_needRefresh = true;
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
374 }
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
375
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
376 // -------------------------------------------------------------------------------------------------
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
377 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
378 void Interface::renderNicklist()
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
379 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
380 int width = nicklistWidth();
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
381 int height = LINES- 3;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
382 int y = 1;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
383 int x = COLS - width;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
384
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
385 if (width > 0)
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
386 return;
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
387
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
388 for (int i : range(height))
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
389 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
390 mvhline(y, x, ' ', width);
32
ee770597a281 - added support for in-game colors
Teemu Piippo <crimsondusk64@gmail.com>
parents: 31
diff changeset
391
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
392 if (i < m_playerNames.size())
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
393 renderColorline(y, x, width, m_playerNames[i], false);
32
ee770597a281 - added support for in-game colors
Teemu Piippo <crimsondusk64@gmail.com>
parents: 31
diff changeset
394
47
35b968619b0c - added a nicklist!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 46
diff changeset
395 y++;
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
396 }
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
397
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
398 m_needNicklistRender = false;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
399 m_needRefresh = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
400 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
401
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
402 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
403 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
404 void Interface::renderInput()
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
405 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
406 chtype promptColor = getColorPair(WHITE, BLUE);
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
407
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
408 // If we're asking the user if they want to disconnect, we don't render any input strings,
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
409 // just the confirmation message.
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
410 if (m_inputState == INPUTSTATE_CONFIRM_DISCONNECTION)
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
411 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
412 attron(promptColor);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
413 mvhline(LINES - 2, 0, ' ', COLS);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
414 mvprintw(LINES - 2, 0, "Are you sure you want to disconnect? y/n");
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
415 attroff(promptColor);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
416 m_needRefresh = true;
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
417 return;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
418 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
419
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
420 String prompt = getPromptString();
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
421 int displayLength = COLS - prompt.length() - 2;
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
422 String displayString = getCurrentInput();
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
423 int y = LINES - 2;
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
424
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
425 // If we're inputting a password, replace it with asterisks
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
426 if (m_inputState == INPUTSTATE_PASSWORD)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
427 {
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
428 for (char &ch : displayString)
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
429 ch = '*';
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
430 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
431
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
432 // Ensure the cursor is within bounds
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
433 m_cursorPosition = clamp(m_cursorPosition, 0, displayString.length());
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
434
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
435 // Ensure that the cursor is always in view, adjust panning if this is not the case
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
436 if (m_cursorPosition > m_inputPanning + displayLength)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
437 m_inputPanning = m_cursorPosition - displayLength; // cursor went too far right
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
438 else if (m_cursorPosition < m_inputPanning)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
439 m_inputPanning = m_cursorPosition; // cursor went past the pan value to the left
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
440
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
441 // What part of the string to draw?
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
442 int start = m_inputPanning;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
443 int end = min<int>(displayString.length(), start + displayLength);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
444 assert(m_cursorPosition >= start and m_cursorPosition <= end);
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
445
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
446 // Render the input string
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
447 mvhline(LINES - 2, 0, ' ', COLS);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
448 mvprintw(y, prompt.length() + 1, "%s", displayString.mid(start, end).chars());
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
449
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
450 // Render the prompt
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
451 attron(promptColor);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
452 mvprintw(y, 0, "%s", prompt.chars());
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
453 attroff(promptColor);
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
454
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
455 // Store in memory where the cursor is now(so that we can re-draw it to position the terminal
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
456 // cursor).
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
457 m_cursorCharacter.ch = m_cursorPosition != 0 ? displayString[m_cursorPosition - 1] : '\0';
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
458 m_cursorCharacter.x = prompt.length() + (m_cursorPosition - m_inputPanning);
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
459 m_needRefresh = true;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
460 m_needInputRender = false;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
461 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
462
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
463 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
464 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
465 void Interface::renderStatusBar()
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
466 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
467 chtype color = getColorPair(WHITE, BLUE);
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
468 int y = LINES - 1;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
469 attron(color);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
470 mvhline(y, 0, ' ', COLS);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
471 mvprintw(y, 0, "%s", m_statusBarText.chars());
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
472 attroff(color);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
473 m_needRefresh = true;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
474 m_needStatusBarRender = false;
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
475 }
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
476
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
477 // -------------------------------------------------------------------------------------------------
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
478 //
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
479 void Interface::updateStatusBar()
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
480 {
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
481 String text;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
482
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
483 switch (m_session.getState())
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
484 {
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
485 case RCON_DISCONNECTED:
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
486 text = "Disconnected.";
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
487 break;
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
488
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
489 case RCON_CONNECTING:
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
490 case RCON_AUTHENTICATING:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
491 text = "Connecting to " + m_session.address().to_string(IPAddress::WITH_PORT) + "...";
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
492 break;
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
493
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
494 case RCON_CONNECTED:
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
495 {
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
496 String adminText;
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
497
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
498 if (m_session.getAdminCount() == 0)
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
499 {
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
500 adminText = "No other admins";
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
501 }
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
502 else
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
503 {
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
504 adminText.sprintf("%d other admin%s", m_session.getAdminCount(),
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
505 m_session.getAdminCount() != 1 ? "s" : "");
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
506 }
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
507
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
508 text.sprintf("%s | %s | %s",
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
509 m_session.address().to_string(IPAddress::WITH_PORT).chars(),
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
510 m_session.getLevel().chars(),
88
08ccaf26cffd Now works with MSVC 2010/pdcurses-win32a
Teemu Piippo <tsapii@utu.fi>
parents: 86
diff changeset
511 adminText.chars());
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
512 }
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
513 break;
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
514 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
515
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
516 if (not text.isEmpty())
28
3cc042af3090 - added a help message to the statusbar
Teemu Piippo <crimsondusk64@gmail.com>
parents: 27
diff changeset
517 text += " | ";
3cc042af3090 - added a help message to the statusbar
Teemu Piippo <crimsondusk64@gmail.com>
parents: 27
diff changeset
518
115
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
519 text += "Ctrl+N to connect, Ctrl+Q to ";
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
520 text +=(m_session.getState() == RCON_DISCONNECTED) ? "quit" : "disconnect";
28
3cc042af3090 - added a help message to the statusbar
Teemu Piippo <crimsondusk64@gmail.com>
parents: 27
diff changeset
521
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
522 if (text != m_statusBarText)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
523 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
524 m_statusBarText = text;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
525 m_needStatusBarRender = true;
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
526 }
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
527 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
528
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
529 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
530 //
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
531 void Interface::renderFull()
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
532 {
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
533 updateStatusBar();
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
534 renderTitlebar();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
535 renderOutput();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
536 renderStatusBar();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
537 renderInput();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
538 renderNicklist();
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
539 }
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
540
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
541 // -------------------------------------------------------------------------------------------------
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
542 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
543 void Interface::positionCursor()
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
544 {
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
545 // This is only relevant if the input string is being drawn
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
546 if (m_inputState == INPUTSTATE_CONFIRM_DISCONNECTION)
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
547 return;
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
548
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
549 int y = LINES - 2;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
550
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
551 if (m_cursorCharacter.ch != '\0')
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
552 mvprintw(y, m_cursorCharacter.x, "%c", m_cursorCharacter.ch);
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
553 else
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
554 mvprintw(y, getPromptString().length(), " ");
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
555 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
556
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
557 // -------------------------------------------------------------------------------------------------
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
558 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
559 int Interface::findPreviousWord()
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
560 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
561 const String& input = getCurrentInput();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
562 int pos = m_cursorPosition;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
563
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
564 // Move past whitespace
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
565 while (pos > 0 and isspace(input[pos - 1]))
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
566 pos--;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
567
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
568 // Move past the word
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
569 while (pos > 0 and not isspace(input[pos - 1]))
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
570 pos--;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
571
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
572 return pos;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
573 }
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
574
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
575 // -------------------------------------------------------------------------------------------------
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
576 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
577 int Interface::findNextWord()
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
578 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
579 const String& input = getCurrentInput();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
580 int pos = m_cursorPosition;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
581
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
582 // Move past current whitespace
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
583 while (pos < input.length() and isspace(input[pos]))
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
584 pos++;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
585
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
586 // Move past the word
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
587 while (input[pos] != '\0' and not isspace(input[pos]))
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
588 pos++;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
589
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
590 return pos;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
591 }
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
592
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
593 // -------------------------------------------------------------------------------------------------
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
594 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
595 void Interface::yank(int a, int b)
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
596 {
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
597 if (a >= b)
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
598 return;
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
599
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
600 if (m_cursorPosition > a and m_cursorPosition <= b)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
601 m_cursorPosition = a;
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
602
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
603 String& input = getEditableInput();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
604 m_pasteBuffer = input.mid(a, b);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
605 input.remove(a, b - a);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
606 m_needInputRender = true;
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
607 }
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
608
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
609 // -------------------------------------------------------------------------------------------------
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
610 //
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
611 void Interface::handleInput()
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
612 {
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
613 int ch = ::getch();
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
614
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
615 if (ch < 0)
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
616 return;
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
617
33
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
618 if (ch == KEY_RESIZE)
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
619 {
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
620 ::clear();
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
621 renderFull();
33
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
622 return;
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
623 }
bb209480d0ec - handle resizing 8-)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 32
diff changeset
624
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
625 if (m_inputState == INPUTSTATE_CONFIRM_DISCONNECTION)
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
626 {
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
627 if (ch == 'y' or ch == 'Y')
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
628 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
629 m_session.disconnect();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
630 m_disconnectCallback(true);
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
631 }
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
632 else if (ch == 'n' or ch == 'N')
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
633 setInputState(INPUTSTATE_NORMAL);
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
634
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
635 return;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
636 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
637
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
638 if (ch >= 0x20 and ch <= 0x7E)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
639 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
640 getEditableInput().insert(m_cursorPosition++, char(ch));
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
641 m_needInputRender = true;
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
642 }
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
643 else switch (ch)
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
644 {
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
645 case 'Q' - 'A' + 1: // ^Q
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
646 switch (m_inputState)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
647 {
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
648 case INPUTSTATE_CONFIRM_DISCONNECTION:
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
649 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
650
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
651 case INPUTSTATE_NORMAL:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
652 safeDisconnect([&](bool hadsession)
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
653 {
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
654 if (hadsession)
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
655 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
656 setInputState(INPUTSTATE_NORMAL);
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
657 }
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
658 else
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
659 {
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
660 endwin();
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
661 throw Exitception();
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
662 }
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
663 });
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
664 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
665
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
666 case INPUTSTATE_PASSWORD:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
667 setInputState(INPUTSTATE_ADDRESS);
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
668 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
669
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
670 case INPUTSTATE_ADDRESS:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
671 setInputState(INPUTSTATE_NORMAL);
27
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
672 }
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
673 break;
089e37c0887e - now exits cleanly with ^Q!
Teemu Piippo <crimsondusk64@gmail.com>
parents: 25
diff changeset
674
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
675 case KEY_LEFT:
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
676 case 'B' - 'A' + 1: // readline ^B
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
677 if (m_cursorPosition > 0)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
678 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
679 m_cursorPosition--;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
680 m_needInputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
681 }
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
682 break;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
683
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
684 case KEY_RIGHT:
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
685 case 'F' - 'A' + 1: // readline ^F
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
686 if (m_cursorPosition < getCurrentInput().length())
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
687 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
688 m_cursorPosition++;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
689 m_needInputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
690 }
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
691 break;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
692
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
693 case KEY_DOWN:
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
694 case KEY_UP:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
695 moveInputCursor(ch == KEY_DOWN ? -1 : 1);
31
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
696 break;
b5b5a6a96d91 - added input history (use up/down to navigate)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 30
diff changeset
697
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
698 case KEY_HOME:
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
699 case 'A' - 'A' + 1: // readline ^A
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
700 if (m_cursorPosition != 0)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
701 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
702 m_cursorPosition = 0;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
703 m_needInputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
704 }
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
705 break;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
706
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
707 case KEY_END:
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
708 case 'E' - 'A' + 1: // readline ^E
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
709 if (m_cursorPosition != getCurrentInput().length())
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
710 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
711 m_cursorPosition = getCurrentInput().length();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
712 m_needInputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
713 }
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
714 break;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
715
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
716 case KEY_BACKSPACE:
81
a18aaf460648 Allow compilation on Windows/MinGW
Teemu Piippo <crimsondusk64@gmail.com>
parents: 73
diff changeset
717 case '\b':
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
718 if (m_cursorPosition > 0)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
719 {
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
720 getEditableInput().removeAt(--m_cursorPosition);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
721 m_needInputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
722 }
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
723 break;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
724
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
725 case KEY_DC:
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
726 case 'D' - 'A' + 1: // readline ^D
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
727 if (m_cursorPosition < getCurrentInput().length())
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
728 {
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
729 getEditableInput().removeAt(m_cursorPosition);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
730 m_needInputRender = true;
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
731 }
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
732 break;
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
733
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
734 case KEY_PPAGE:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
735 m_outputScroll += min(PAGE_SIZE, LINES / 2);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
736 m_needOutputRender = true;
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
737 break;
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
738
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
739 case KEY_NPAGE:
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
740 m_outputScroll -= min(PAGE_SIZE, LINES / 2);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
741 m_needOutputRender = true;
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
742 break;
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
743
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
744 case 'U' - 'A' + 1: // readline ^U - delete from start to cursor
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
745 if (m_cursorPosition > 0)
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
746 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
747 yank(0, m_cursorPosition);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
748 m_cursorPosition = 0;
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
749 }
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
750 break;
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
751
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
752 case 'K' - 'A' + 1: // readline ^K - delete from cursor to end
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
753 yank(m_cursorPosition, getEditableInput().length());
42
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
754 break;
9699687081df - added readline shortcuts: ^B, ^F, ^A, ^E, ^D (aliases to keyboard presses), ^U, ^K (new functionality)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 34
diff changeset
755
44
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
756 case 'W' - 'A' + 1: // readline ^W - delete from previous word bounary to current
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
757 yank(findPreviousWord(), m_cursorPosition);
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
758 break;
44
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
759
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
760 case 'Y' - 'A' + 1: // readline ^Y - paste previously deleted text
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
761 if (not m_pasteBuffer.isEmpty())
53
8f1a6f40d1b4 - added yanking/pasting (support for readline ^Y)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 52
diff changeset
762 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
763 getEditableInput().insert(m_cursorPosition, m_pasteBuffer);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
764 m_cursorPosition += m_pasteBuffer.length();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
765 m_needInputRender = true;
44
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
766 }
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
767 break;
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
768
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
769 case '\t':
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
770 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
771 int space = getCurrentInput().find(" ");
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
772
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
773 if (m_inputState == INPUTSTATE_NORMAL
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
774 and m_cursorPosition > 0
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
775 and(space == -1 or space >= m_cursorPosition))
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
776 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
777 String start = getCurrentInput().mid(0, m_cursorPosition);
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
778 m_session.requestTabCompletion(start);
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
779 }
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
780 }
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
781 break;
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
782
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
783 case '\n':
89
777b2a10b835 Add support for standard pdcurses, thanks to Leonard for pointing out the solutions to a few mysteries.
Teemu Piippo <tsapii@utu.fi>
parents: 88
diff changeset
784 case '\r':
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
785 case KEY_ENTER:
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
786 switch (m_inputState)
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
787 {
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
788 case INPUTSTATE_CONFIRM_DISCONNECTION:
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
789 break; // handled above
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
790
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
791 case INPUTSTATE_ADDRESS:
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
792 try
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
793 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
794 m_remoteAddress = IPAddress::from_string(getCurrentInput());
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
795 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
796 catch (std::exception& e)
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
797 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
798 print("%s\n", e.what());
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
799 return;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
800 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
801
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
802 if (m_remoteAddress.port == 0)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
803 m_remoteAddress.port = 10666;
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
804
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
805 setInputState(INPUTSTATE_PASSWORD);
25
88b41eea08e0 - cleanup, refactor + better input handling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 24
diff changeset
806 break;
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
807
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
808 case INPUTSTATE_PASSWORD:
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
809 if (m_inputState == INPUTSTATE_PASSWORD and not getCurrentInput().isEmpty())
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
810 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
811 m_session.disconnect();
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
812 m_session.setPassword(getCurrentInput());
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
813 m_session.connect(m_remoteAddress);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
814 setInputState(INPUTSTATE_NORMAL);
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
815 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
816 break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
817
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
818 case INPUTSTATE_NORMAL:
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
819 if (getCurrentInput()[0] == '/')
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
820 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
821 handleCommand(getCurrentInput());
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
822 flushInput();
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
823 }
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
824 else if (m_session.sendCommand(getCurrentInput()))
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
825 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
826 flushInput();
24
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
827 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
828 break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
829 }
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
830 break;
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
831
e651d02802c0 - the interface is now able to connect to arbitrary hosts (uses ^N to start the prompt) instead of the hardcoded localhost:10666
Teemu Piippo <crimsondusk64@gmail.com>
parents: 23
diff changeset
832 case 'N' - 'A' + 1: // ^N
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
833 if (m_inputState == INPUTSTATE_NORMAL)
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
834 safeDisconnect([&](bool){setInputState(INPUTSTATE_ADDRESS);});
16
33bac54867bf - added backlog scrolling
Teemu Piippo <crimsondusk64@gmail.com>
parents: 15
diff changeset
835 break;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
836
91
ac02cf1c3576 '\e' is non-standard use '\x1b' instead
Teemu Piippo <tsapii@utu.fi>
parents: 89
diff changeset
837 case '\x1b': // Escape
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
838 // We may have an alt key coming
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
839 ch = ::getch();
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
840
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
841 if (ch != ERR)
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
842 {
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
843 switch (ch)
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
844 {
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
845 case 'b':
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
846 case 'B':
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
847 // readline alt-b - move one word to the left
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
848 m_cursorPosition = findPreviousWord();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
849 m_needInputRender = true;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
850 break;
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
851
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
852 case 'f':
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
853 case 'F':
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
854 // readline alt-f - move one word to the right
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
855 m_cursorPosition = findNextWord();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
856 m_needInputRender = true;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
857 break;
44
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
858
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
859 case 'd':
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
860 case 'D':
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
861 // readline alt-d - delete from here till next word boundary
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
862 yank(m_cursorPosition, findNextWord());
44
693d7751fff0 - added readline alt-d and ^w support (delete till word boundaries)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 43
diff changeset
863 break;
118
ae284bf1b5ff Added support for alt+backspace, which removes the previous word
Teemu Piippo <crimsondusk64@gmail.com>
parents: 117
diff changeset
864
ae284bf1b5ff Added support for alt+backspace, which removes the previous word
Teemu Piippo <crimsondusk64@gmail.com>
parents: 117
diff changeset
865 case KEY_BACKSPACE: // alt+backspace, remove previous word
ae284bf1b5ff Added support for alt+backspace, which removes the previous word
Teemu Piippo <crimsondusk64@gmail.com>
parents: 117
diff changeset
866 case '\b':
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
867 yank(findPreviousWord(), m_cursorPosition);
118
ae284bf1b5ff Added support for alt+backspace, which removes the previous word
Teemu Piippo <crimsondusk64@gmail.com>
parents: 117
diff changeset
868 break;
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
869 }
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
870 }
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
871 else
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
872 {
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
873 // No alt-key, handle pure escape
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
874 if (m_inputState == INPUTSTATE_PASSWORD)
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
875 setInputState(INPUTSTATE_ADDRESS);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
876 else if (m_inputState == INPUTSTATE_ADDRESS)
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
877 setInputState(INPUTSTATE_NORMAL);
43
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
878 }
0bc07f54f522 - added readline alt-b and alt-f support (skip past words)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 42
diff changeset
879 break;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
880 }
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
881
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
882 render();
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
883 }
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
884
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
885 // -------------------------------------------------------------------------------------------------
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
886 //
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
887 void Interface::render()
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
888 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
889 if (m_needStatusBarRender) renderStatusBar();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
890 if (m_needInputRender) renderInput();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
891 if (m_needOutputRender) renderOutput();
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
892 if (m_needNicklistRender) renderNicklist();
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
893
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
894 if (m_needRefresh)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
895 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
896 positionCursor();
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
897 refresh();
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
898 m_needRefresh = false;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
899 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
900 }
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
901
17
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
902 // -------------------------------------------------------------------------------------------------
50341dec533e - added command sending
Teemu Piippo <crimsondusk64@gmail.com>
parents: 16
diff changeset
903 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
904 void Interface::vprint(const char* fmtstr, va_list args)
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
905 {
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
906 String message;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
907 message.vsprintf(fmtstr, args);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
908 printToConsole(message);
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
909 }
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
910
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
911 // -------------------------------------------------------------------------------------------------
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
912 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
913 void __cdecl Interface::printText(const char* fmtstr, ...)
115
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
914 {
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
915 va_list args;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
916 va_start(args, fmtstr);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
917 vprint(fmtstr, args);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
918 va_end(args);
115
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
919 }
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
920
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
921 // -------------------------------------------------------------------------------------------------
bb7ef7c33dad ZFC's own messages are now printed in blue to distinguish them from messages from the server.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 112
diff changeset
922 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
923 void __cdecl Interface::print(const char* fmtstr, ...)
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
924 {
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
925 va_list args;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
926 va_start(args, fmtstr);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
927 printToConsole(TEXTCOLOR_BrightBlue);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
928 vprint(fmtstr, args);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
929 va_end(args);
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
930 }
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
931
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
932 // -------------------------------------------------------------------------------------------------
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
933 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
934 void __cdecl Interface::printWarning(const char* fmtstr, ...)
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
935 {
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
936 va_list args;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
937 va_start(args, fmtstr);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
938 printToConsole(TEXTCOLOR_BrightYellow "-!- ");
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
939 vprint(fmtstr, args);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
940 va_end(args);
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
941 }
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
942
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
943 // -------------------------------------------------------------------------------------------------
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
944 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
945 void __cdecl Interface::printError(const char* fmtstr, ...)
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
946 {
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
947 va_list args;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
948 va_start(args, fmtstr);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
949 printToConsole(TEXTCOLOR_BrightRed "!!! ");
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
950 vprint(fmtstr, args);
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
951 va_end(args);
83
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
952 }
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
953
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
954 // -------------------------------------------------------------------------------------------------
08bfc3d9d2ae Removed format.cpp and format.h, use built-in formatting instead
Teemu Piippo <crimsondusk64@gmail.com>
parents: 82
diff changeset
955 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
956 void Interface::printToConsole(String message)
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
957 {
72
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
958 // Zandronum sometimes sends color codes as "\\c" and sometimes as "\x1C".
1b9c53e0c846 Massive refactor
Teemu Piippo <crimsondusk64@gmail.com>
parents: 71
diff changeset
959 // Let's correct that on our end and hope this won't cause conflicts.
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
960 message.replace("\\c", "\x1C");
32
ee770597a281 - added support for in-game colors
Teemu Piippo <crimsondusk64@gmail.com>
parents: 31
diff changeset
961
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
962 for (char ch : message)
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
963 {
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
964 if (ch == '\n')
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
965 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
966 m_outputLines.last().finalize();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
967 m_outputLines << ColoredLine();
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
968 continue;
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
969 }
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
970
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
971 if (m_outputLines.last().length() == 0)
51
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
972 {
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
973 time_t now;
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
974 time(&now);
51
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
975 char timestamp[32];
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
976 strftime(timestamp, sizeof timestamp, "[%H:%M:%S] ", localtime(&now));
51
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
977
137
485cb6d6b98c Made Range not include the 'max' parameter, replaced a lot of for()-loops with C++11-style range-for-loops
Teemu Piippo <teemu@compsta2.com>
parents: 132
diff changeset
978 for (char ch : String(timestamp))
143
b9993733952a Renamed the methods of ColoredLine
Teemu Piippo <teemu@compsta2.com>
parents: 140
diff changeset
979 m_outputLines.last().addChar(ch);
51
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
980 }
481073b016a9 - added timestamps to output
Teemu Piippo <crimsondusk64@gmail.com>
parents: 50
diff changeset
981
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
982 // Remove some lines if there's too many of them. 20,000 should be enough, I hope.
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
983 while (m_outputLines.size() > 20000)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
984 m_outputLines.remove_at(0);
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
985
143
b9993733952a Renamed the methods of ColoredLine
Teemu Piippo <teemu@compsta2.com>
parents: 140
diff changeset
986 m_outputLines.last().addChar(ch);
15
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
987 }
33da84af4bba - log area done, re-enabled the rcon connection
Teemu Piippo <crimsondusk64@gmail.com>
parents: 14
diff changeset
988
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
989 m_needOutputRender = true;
14
33b8f428bacb - begin work on interface - input line works for the most part :)
Teemu Piippo <crimsondusk64@gmail.com>
parents:
diff changeset
990 }
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
991
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
992 // -------------------------------------------------------------------------------------------------
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
993 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
994 void Interface::connect(String address, String password)
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
995 {
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
996 try
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
997 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
998 m_remoteAddress = IPAddress::from_string(address);
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
999 }
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
1000 catch (std::exception& e)
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
1001 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1002 print("%s\n", e.what());
30
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
1003 return;
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
1004 }
21fba5183768 - added a simple command-line interface (you can now supply host and password on the command-line)
Teemu Piippo <crimsondusk64@gmail.com>
parents: 29
diff changeset
1005
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1006 if (m_remoteAddress.port == 0)
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1007 m_remoteAddress.port = 10666;
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1008
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1009 m_session.disconnect();
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
1010 m_session.setPassword(password);
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1011 m_session.connect(m_remoteAddress);
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1012 }
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1013
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1014 // -------------------------------------------------------------------------------------------------
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1015 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1016 void Interface::setPlayerNames(const StringList& names)
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1017 {
132
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1018 m_playerNames.clear();
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1019
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1020 for (const String& name : names)
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1021 {
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1022 ColoredLine coloredname;
143
b9993733952a Renamed the methods of ColoredLine
Teemu Piippo <teemu@compsta2.com>
parents: 140
diff changeset
1023 coloredname.addString(name);
132
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1024 coloredname.finalize();
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1025 m_playerNames.append(coloredname);
132
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1026 }
8a4690db252e Added support for colored nicknames
Teemu Piippo <crimsondusk64@gmail.com>
parents: 128
diff changeset
1027
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1028 m_needNicklistRender = true;
34
3caf69e7350b - added line-wrapping to the output widget: lines to output are now first compiled into renderer-friendly format. the output view then uses these pre-processed lines to determine what lines to render. Phew! What a monster of a commit.
Teemu Piippo <crimsondusk64@gmail.com>
parents: 33
diff changeset
1029 }
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1030
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1031 // -------------------------------------------------------------------------------------------------
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1032 //
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1033 void Interface::tabComplete(const String& part, String complete)
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1034 {
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
1035 String& input = getEditableInput();
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1036
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
1037 if (input.startsWith(part))
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1038 {
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1039 if (input[part.length()] != ' ')
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1040 complete += ' ';
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1041
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1042 input.replace(0, part.length(), complete);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1043 m_cursorPosition = complete.length();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1044 m_needInputRender = true;
41
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1045 }
9ab869656b9e - re-commit tab-complete
Teemu Piippo <crimsondusk64@gmail.com>
parents: 40
diff changeset
1046 }
88
08ccaf26cffd Now works with MSVC 2010/pdcurses-win32a
Teemu Piippo <tsapii@utu.fi>
parents: 86
diff changeset
1047
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1048 // -------------------------------------------------------------------------------------------------
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1049 //
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
1050 void Interface::handleCommand(const String& input)
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1051 {
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1052 if (input[0] != '/')
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1053 return;
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1054
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1055 StringList args = input.right(input.length() - 1).split(" ");
145
d0aedc9be448 Renamed String methods, and reformatted mystring.h
Teemu Piippo <teemu@compsta2.com>
parents: 143
diff changeset
1056 String command = args[0].toLowerCase();
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1057 args.remove_at(0);
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1058
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1059 if (command == "connect")
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1060 {
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1061 if (args.size() != 2)
120
32ba3ae4daf1 Fixed missing newline in /connect usage message
Teemu Piippo <crimsondusk64@gmail.com>
parents: 119
diff changeset
1062 {
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
1063 printError("Usage: /connect <address> <password>\n");
120
32ba3ae4daf1 Fixed missing newline in /connect usage message
Teemu Piippo <crimsondusk64@gmail.com>
parents: 119
diff changeset
1064 }
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1065 else
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1066 {
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1067 IPAddress address;
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1068
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1069 try
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1070 {
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1071 address = IPAddress::from_string(args[0]);
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1072 }
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1073 catch (std::exception& e)
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1074 {
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
1075 printError("%s\n", e.what());
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1076 return;
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1077 }
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1078
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1079 if (address.port == 0)
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1080 address.port = 10666;
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1081
156
ce66d7e374bf Restyled RCONSession method names and paren style
Teemu Piippo <teemu@compsta2.com>
parents: 145
diff changeset
1082 m_session.setPassword(args[1]);
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1083 m_session.disconnect();
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1084 m_session.connect(m_remoteAddress = address);
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1085 }
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1086 }
112
c062273efa33 Added /disconnect
Teemu Piippo <crimsondusk64@gmail.com>
parents: 111
diff changeset
1087 else if (command == "disconnect")
c062273efa33 Added /disconnect
Teemu Piippo <crimsondusk64@gmail.com>
parents: 111
diff changeset
1088 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1089 m_session.disconnect();
112
c062273efa33 Added /disconnect
Teemu Piippo <crimsondusk64@gmail.com>
parents: 111
diff changeset
1090 }
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1091 else if (command == "quit")
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1092 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1093 m_session.disconnect();
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1094 endwin();
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1095 throw Exitception();
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1096 }
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1097 else
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
1098 printError("Unknown command: %s\n", command.chars());
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1099 }
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1100
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1101 // -------------------------------------------------------------------------------------------------
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1102 //
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1103 void Interface::disconnected()
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1104 {
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1105 print("Disconnected from %s\n", m_session.address().to_string(IPAddress::WITH_PORT).chars());
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
1106 resetTitle();
138
c909c38ca886 Restyled Interface's public method names
Teemu Piippo <teemu@compsta2.com>
parents: 137
diff changeset
1107 renderFull();
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1108 }
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1109
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1110 // -------------------------------------------------------------------------------------------------
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1111 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
1112 void Interface::resetTitle()
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1113 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1114 m_title.sprintf("%s %s (%s)", application_name(), full_version_string(), changeset_date_string());
111
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1115 }
51c93a0cc317 Now disconnects properly without instantly quitting
Teemu Piippo <crimsondusk64@gmail.com>
parents: 109
diff changeset
1116
116
552909484712 Fixed: sending a message from earlier history did not flush to a new input line, instead just up a single level in history
Teemu Piippo <crimsondusk64@gmail.com>
parents: 115
diff changeset
1117 // -------------------------------------------------------------------------------------------------
552909484712 Fixed: sending a message from earlier history did not flush to a new input line, instead just up a single level in history
Teemu Piippo <crimsondusk64@gmail.com>
parents: 115
diff changeset
1118 //
139
da7d5a8e608f Restyled the names of the private methods of Interface
Teemu Piippo <teemu@compsta2.com>
parents: 138
diff changeset
1119 void Interface::flushInput()
116
552909484712 Fixed: sending a message from earlier history did not flush to a new input line, instead just up a single level in history
Teemu Piippo <crimsondusk64@gmail.com>
parents: 115
diff changeset
1120 {
140
e49aa4aa98c0 Reformatted parentheses in interface.cpp.
Teemu Piippo <teemu@compsta2.com>
parents: 139
diff changeset
1121 m_inputHistory.insert(0, "");
127
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1122 m_inputCursor = 0;
6610b8b29848 Restyled the names of Interface's private members
Teemu Piippo <crimsondusk64@gmail.com>
parents: 126
diff changeset
1123 m_needInputRender = true;
116
552909484712 Fixed: sending a message from earlier history did not flush to a new input line, instead just up a single level in history
Teemu Piippo <crimsondusk64@gmail.com>
parents: 115
diff changeset
1124 }
552909484712 Fixed: sending a message from earlier history did not flush to a new input line, instead just up a single level in history
Teemu Piippo <crimsondusk64@gmail.com>
parents: 115
diff changeset
1125
105
b4466472aecd Added some basic IRC-like commands that can be used to do what keystrokes can do without actually using keystrokes
Teemu Piippo <crimsondusk64@gmail.com>
parents: 102
diff changeset
1126 END_ZFC_NAMESPACE

mercurial