diff options
Diffstat (limited to 'Source/CursesDialog/cmCursesPathWidget.cxx')
-rw-r--r-- | Source/CursesDialog/cmCursesPathWidget.cxx | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/Source/CursesDialog/cmCursesPathWidget.cxx b/Source/CursesDialog/cmCursesPathWidget.cxx index 6116823..33fffd1 100644 --- a/Source/CursesDialog/cmCursesPathWidget.cxx +++ b/Source/CursesDialog/cmCursesPathWidget.cxx @@ -14,9 +14,9 @@ #include "cmCursesMainForm.h" #include "cmSystemTools.h" -cmCursesPathWidget::cmCursesPathWidget(int width, int height, - int left, int top) : - cmCursesStringWidget(width, height, left, top) +cmCursesPathWidget::cmCursesPathWidget(int width, int height, int left, + int top) + : cmCursesStringWidget(width, height, left, top) { this->Type = cmState::PATH; this->Cycle = false; @@ -33,46 +33,39 @@ void cmCursesPathWidget::OnType(int& key, cmCursesMainForm* fm, WINDOW* w) void cmCursesPathWidget::OnTab(cmCursesMainForm* fm, WINDOW* w) { - if ( !this->GetString() ) - { + if (!this->GetString()) { return; - } + } FORM* form = fm->GetForm(); form_driver(form, REQ_NEXT_FIELD); form_driver(form, REQ_PREV_FIELD); std::string cstr = this->GetString(); - cstr = cstr.substr(0, cstr.find_last_not_of(" \t\n\r")+1); - if ( this->LastString != cstr ) - { + cstr = cstr.substr(0, cstr.find_last_not_of(" \t\n\r") + 1); + if (this->LastString != cstr) { this->Cycle = false; this->CurrentIndex = 0; this->LastGlob = ""; - } + } std::string glob; - if ( this->Cycle ) - { + if (this->Cycle) { glob = this->LastGlob; - } - else - { + } else { glob = cstr + "*"; - } + } std::vector<std::string> dirs; - cmSystemTools::SimpleGlob(glob, dirs, (this->Type == cmState::PATH?-1:0)); - if ( this->CurrentIndex < dirs.size() ) - { + cmSystemTools::SimpleGlob(glob, dirs, + (this->Type == cmState::PATH ? -1 : 0)); + if (this->CurrentIndex < dirs.size()) { cstr = dirs[this->CurrentIndex]; - } - if ( cstr[cstr.size()-1] == '*' ) - { - cstr = cstr.substr(0, cstr.size()-1); - } + } + if (cstr[cstr.size() - 1] == '*') { + cstr = cstr.substr(0, cstr.size() - 1); + } - if ( cmSystemTools::FileIsDirectory(cstr) ) - { + if (cmSystemTools::FileIsDirectory(cstr)) { cstr += "/"; - } + } this->SetString(cstr); touchwin(w); @@ -81,11 +74,10 @@ void cmCursesPathWidget::OnTab(cmCursesMainForm* fm, WINDOW* w) this->LastGlob = glob; this->LastString = cstr; this->Cycle = true; - this->CurrentIndex ++; - if ( this->CurrentIndex >= dirs.size() ) - { + this->CurrentIndex++; + if (this->CurrentIndex >= dirs.size()) { this->CurrentIndex = 0; - } + } } void cmCursesPathWidget::OnReturn(cmCursesMainForm* fm, WINDOW* w) |