diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/interface-curses.cpp (renamed from src/interface-ncurses.cpp) | 42 | ||||
| -rw-r--r-- | src/interface-curses.h (renamed from src/interface-ncurses.h) | 32 | ||||
| -rw-r--r-- | src/interface.h | 4 |
5 files changed, 42 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index db631dc..4e8d886 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ case $INTERFACE in AC_CHECK_HEADERS([curses.h], , [ AC_MSG_ERROR([Curses header missing!]) ]) - AC_DEFINE(INTERFACE_NCURSES, , [Build with curses support]) + AC_DEFINE(INTERFACE_CURSES, , [Build with curses support]) # For Scintilla: CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTERM_PATH" diff --git a/src/Makefile.am b/src/Makefile.am index 4833b6e..af324e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,9 +45,9 @@ libsciteco_base_a_SOURCES += interface-gtk.cpp interface-gtk.h nodist_libsciteco_base_a_SOURCES += gtk-info-popup.c else -# else must be NCurses interface +# else must be Curses interface -libsciteco_base_a_SOURCES += interface-ncurses.cpp interface-ncurses.h +libsciteco_base_a_SOURCES += interface-curses.cpp interface-curses.h endif diff --git a/src/interface-ncurses.cpp b/src/interface-curses.cpp index 32c310c..ad7296f 100644 --- a/src/interface-ncurses.cpp +++ b/src/interface-curses.cpp @@ -42,7 +42,7 @@ #include "qregisters.h" #include "ring.h" #include "interface.h" -#include "interface-ncurses.h" +#include "interface-curses.h" namespace SciTECO { @@ -57,7 +57,7 @@ static void scintilla_notify(Scintilla *sci, int idFrom, ((chtype)COLOR_PAIR(SCI_COLOR_PAIR(f, b))) void -ViewNCurses::initialize_impl(void) +ViewCurses::initialize_impl(void) { WINDOW *window; @@ -70,7 +70,7 @@ ViewNCurses::initialize_impl(void) * positioned. * Perhaps it's better to leave the window * unitialized and set the position in - * InterfaceNCurses::show_view(). + * InterfaceCurses::show_view(). */ wresize(window, 1, 1); /* Set up window position: never changes */ @@ -80,7 +80,7 @@ ViewNCurses::initialize_impl(void) } void -InterfaceNCurses::main_impl(int &argc, char **&argv) +InterfaceCurses::main_impl(int &argc, char **&argv) { init_screen(); cbreak(); @@ -115,7 +115,7 @@ InterfaceNCurses::main_impl(int &argc, char **&argv) #ifdef __PDCURSES__ void -InterfaceNCurses::init_screen(void) +InterfaceCurses::init_screen(void) { #ifdef PDCURSES_WIN32A /* enables window resizing on Win32a port */ @@ -131,7 +131,7 @@ InterfaceNCurses::init_screen(void) #else void -InterfaceNCurses::init_screen(void) +InterfaceCurses::init_screen(void) { /* * Prevent the initial redraw and any escape sequences that may @@ -148,7 +148,7 @@ InterfaceNCurses::init_screen(void) #endif /* !__PDCURSES__ */ void -InterfaceNCurses::resize_all_windows(void) +InterfaceCurses::resize_all_windows(void) { int lines, cols; /* screen dimensions */ @@ -169,7 +169,7 @@ InterfaceNCurses::resize_all_windows(void) } void -InterfaceNCurses::vmsg_impl(MessageType type, const gchar *fmt, va_list ap) +InterfaceCurses::vmsg_impl(MessageType type, const gchar *fmt, va_list ap) { static const chtype type2attr[] = { SCI_COLOR_ATTR(COLOR_BLACK, COLOR_WHITE), /* MSG_USER */ @@ -198,7 +198,7 @@ InterfaceNCurses::vmsg_impl(MessageType type, const gchar *fmt, va_list ap) } void -InterfaceNCurses::msg_clear(void) +InterfaceCurses::msg_clear(void) { if (isendwin()) /* batch mode */ return; @@ -211,7 +211,7 @@ InterfaceNCurses::msg_clear(void) } void -InterfaceNCurses::show_view_impl(ViewNCurses *view) +InterfaceCurses::show_view_impl(ViewCurses *view) { int lines, cols; /* screen dimensions */ @@ -227,7 +227,7 @@ InterfaceNCurses::show_view_impl(ViewNCurses *view) } void -InterfaceNCurses::draw_info(void) +InterfaceCurses::draw_info(void) { if (isendwin()) /* batch mode */ return; @@ -241,7 +241,7 @@ InterfaceNCurses::draw_info(void) } void -InterfaceNCurses::info_update_impl(QRegister *reg) +InterfaceCurses::info_update_impl(QRegister *reg) { g_free(info_current); info_current = g_strdup_printf("%s - <QRegister> %s", PACKAGE_NAME, @@ -251,7 +251,7 @@ InterfaceNCurses::info_update_impl(QRegister *reg) } void -InterfaceNCurses::info_update_impl(Buffer *buffer) +InterfaceCurses::info_update_impl(Buffer *buffer) { g_free(info_current); info_current = g_strdup_printf("%s - <Buffer> %s%s", PACKAGE_NAME, @@ -262,7 +262,7 @@ InterfaceNCurses::info_update_impl(Buffer *buffer) } void -InterfaceNCurses::cmdline_update_impl(const gchar *cmdline) +InterfaceCurses::cmdline_update_impl(const gchar *cmdline) { size_t len; int half_line = (getmaxx(stdscr) - 2) / 2; @@ -288,7 +288,7 @@ InterfaceNCurses::cmdline_update_impl(const gchar *cmdline) } void -InterfaceNCurses::popup_add_impl(PopupEntryType type, +InterfaceCurses::popup_add_impl(PopupEntryType type, const gchar *name, bool highlight) { gchar *entry; @@ -305,7 +305,7 @@ InterfaceNCurses::popup_add_impl(PopupEntryType type, } void -InterfaceNCurses::popup_show_impl(void) +InterfaceCurses::popup_show_impl(void) { int lines, cols; /* screen dimensions */ int popup_lines; @@ -368,7 +368,7 @@ cleanup: } void -InterfaceNCurses::popup_clear_impl(void) +InterfaceCurses::popup_clear_impl(void) { if (!popup.window) return; @@ -393,7 +393,7 @@ InterfaceNCurses::popup_clear_impl(void) * @bug * Can probably be defined as a static method, * so we can avoid declaring it a fried function of - * InterfaceNCurses. + * InterfaceCurses. */ void event_loop_iter() @@ -470,7 +470,7 @@ event_loop_iter() } void -InterfaceNCurses::event_loop_impl(void) +InterfaceCurses::event_loop_impl(void) { /* initial refresh: window might have been changed in batch mode */ current_view->refresh(); @@ -484,7 +484,7 @@ InterfaceNCurses::event_loop_impl(void) #endif } -InterfaceNCurses::Popup::~Popup() +InterfaceCurses::Popup::~Popup() { if (window) delwin(window); @@ -492,7 +492,7 @@ InterfaceNCurses::Popup::~Popup() g_slist_free(list); } -InterfaceNCurses::~InterfaceNCurses() +InterfaceCurses::~InterfaceCurses() { if (info_window) delwin(info_window); diff --git a/src/interface-ncurses.h b/src/interface-curses.h index 53b6b3e..35f7edb 100644 --- a/src/interface-ncurses.h +++ b/src/interface-curses.h @@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __INTERFACE_NCURSES_H -#define __INTERFACE_NCURSES_H +#ifndef __INTERFACE_CURSES_H +#define __INTERFACE_CURSES_H #include <stdarg.h> @@ -31,16 +31,16 @@ namespace SciTECO { -typedef class ViewNCurses : public View<ViewNCurses> { +typedef class ViewCurses : public View<ViewCurses> { Scintilla *sci; public: - ViewNCurses() : sci(NULL) {} + ViewCurses() : sci(NULL) {} /* implementation of View::initialize() */ void initialize_impl(void); - inline ~ViewNCurses() + inline ~ViewCurses() { if (sci) { delwin(get_window()); @@ -68,7 +68,7 @@ public: } } ViewCurrent; -typedef class InterfaceNCurses : public Interface<InterfaceNCurses, ViewNCurses> { +typedef class InterfaceCurses : public Interface<InterfaceCurses, ViewCurses> { SCREEN *screen; FILE *screen_tty; @@ -89,15 +89,15 @@ typedef class InterfaceNCurses : public Interface<InterfaceNCurses, ViewNCurses> } popup; public: - InterfaceNCurses() : Interface(), - screen(NULL), - screen_tty(NULL), - info_window(NULL), - info_current(NULL), - msg_window(NULL), - cmdline_window(NULL), - cmdline_current(NULL) {} - ~InterfaceNCurses(); + InterfaceCurses() : Interface(), + screen(NULL), + screen_tty(NULL), + info_window(NULL), + info_current(NULL), + msg_window(NULL), + cmdline_window(NULL), + cmdline_current(NULL) {} + ~InterfaceCurses(); /* implementation of Interface::main() */ void main_impl(int &argc, char **&argv); @@ -108,7 +108,7 @@ public: void msg_clear(void); /* implementation of Interface::show_view() */ - void show_view_impl(ViewNCurses *view); + void show_view_impl(ViewCurses *view); /* implementation of Interface::info_update() */ void info_update_impl(QRegister *reg); diff --git a/src/interface.h b/src/interface.h index 8fa0112..a883a5f 100644 --- a/src/interface.h +++ b/src/interface.h @@ -327,8 +327,8 @@ public: #ifdef INTERFACE_GTK #include "interface-gtk.h" -#elif defined(INTERFACE_NCURSES) -#include "interface-ncurses.h" +#elif defined(INTERFACE_CURSES) +#include "interface-curses.h" #else #error No interface selected! #endif |