diff -r 8fb1c657e0b0 -r d9073c13dc98 sources/interface.h --- a/sources/interface.h Wed Jul 20 13:29:03 2016 +0300 +++ b/sources/interface.h Wed Jul 20 15:03:37 2016 +0300 @@ -49,24 +49,23 @@ }; Interface(); - void handle_input(); + void connect(String address, String password); + void disconnected(); + RCONSession* getSession() { return &m_session; } + void handleCommand(const String& input); + void handleInput(); + void needRefresh(); + void __cdecl print(const char* fmtstr, ...); + void __cdecl printWarning(const char* fmtstr, ...); + void __cdecl printError(const char* fmtstr, ...); + void __cdecl printText(const char* fmtstr, ...); void render(); - void render_full(); - void set_title (const String& message); - void update_statusbar(); - void connect (String address, String password); - void set_player_names (const StringList& names); - void need_refresh(); - void tab_complete (const String& part, String complete); - RCONSession* get_session() { return &m_session; } - void handle_command(const String& input); - void disconnected(); - - void vprint (const char* fmtstr, va_list args); - void __cdecl print (const char* fmtstr, ...); - void __cdecl print_warning (const char* fmtstr, ...); - void __cdecl print_error (const char* fmtstr, ...); - void __cdecl print_text (const char* fmtstr, ...); + void renderFull(); + void setPlayerNames(const StringList& names); + void setTitle(const String& message); + void tabComplete(const String& part, String complete); + void updateStatusBar(); + void vprint(const char* fmtstr, va_list args); private: StringList m_inputHistory; @@ -90,28 +89,28 @@ String m_pasteBuffer; RCONSession m_session; - void render_titlebar(); - void safe_disconnect (std::function afterwards); - int render_colorline (int y, int x0, int width, const ColoredLine& line, bool allowWrap); - int nicklist_width(); - void render_output(); - void render_nicklist(); - void render_input(); - void render_statusbar(); - void position_cursor(); - chtype color_pair (Color fg, Color bg); - const String& current_input(); - void detach_input(); - String& mutable_current_input(); - void move_input_cursor (int delta); - String prompt_string(); - void set_input_state (InputState newstate); - void print_to_console (String message); - void yank (int a, int b); - int find_previous_word(); - int find_next_word(); - void reset_title(); - void flush_input(); + void detachInput(); + int findNextWord(); + int findPreviousWord(); + void flushInput(); + chtype getColorPair(Color fg, Color bg); + const String& getCurrentInput(); + String& getEditableInput(); + String getPromptString(); + void moveInputCursor(int delta); + int nicklistWidth(); + void positionCursor(); + void printToConsole(String message); + int renderColorline(int y, int x0, int width, const ColoredLine& line, bool allowWrap); + void renderInput(); + void renderNicklist(); + void renderOutput(); + void renderStatusBar(); + void renderTitlebar(); + void resetTitle(); + void safeDisconnect(std::function afterwards); + void setInputState(InputState newstate); + void yank(int a, int b); }; END_ZFC_NAMESPACE \ No newline at end of file