Ticket #8327: scumm-restore-selection-1.diff

common/config-manager.cpp

@@ -123 +123 @@
                         if (t[0] && t[0] != '#') {
                                 if (t[0] == '[') {
                                         // It's a new domain which begins here.
-                                        char *p = strchr(t, ']');
-                                        if (!p) {
+                                        char *p = t + 1;
+                                        while (*p && (isalnum(*p) || *p=='-' || *p=='_'))
+                                        p++;
+
+                                        switch (*p) {
+                                        case '\0':
                                                 error("Config file buggy: no ] at the end of the domain name.\n");
-                                        } else {
+                                        case ']':
                                                 *p = 0;
-                                                // TODO: Some kind of domain name verification might be nice.
-                                                // E.g. restrict to only a-zA-Z0-9 and maybe -_  or so...
                                                 domain = t + 1;
+                                                break;
+                                        default:
+                                                error("Config file buggy: %c is not a valid character of a domain name.\n", *p);
                                         }
                                 } else {
                                         // Skip leading whitespaces
@@ -293 +298 @@
 
 int ConfigManager::getInt(const String &key, const String &dom) const {
         String value(get(key, dom));
-        // Convert the string to an integer.
-        // TODO: We should perform some error checking.
-        return (int)strtol(value.c_str(), 0, 10);
+        char *errpos;
+        int ivalue = (int)strtol(value.c_str(), &errpos, 10);
+        if (value.c_str()==errpos)
+                error("Config file buggy: %s is not a valid integer.\n", errpos);
+
+        return ivalue;
 }
 
 bool ConfigManager::getBool(const String &key, const String &dom) const {

gui/ListWidget.cpp

@@ -51 +51 @@
 ListWidget::~ListWidget() {
 }
 
+void ListWidget::setSelected(int item) {
+        assert( item>=-1 && item<(int)_list.size() );
+
+        if(isEnabled()) {
+                int oldSelectedItem = _selectedItem;
+                _selectedItem = item;
+
+                if (oldSelectedItem != _selectedItem) {
+                        if (_editMode) {
+                                // undo any changes made
+                                _list[oldSelectedItem] = _backupString;
+                                _editMode = false;
+                                drawCaret(true);
+                        }
+                        sendCommand(kListSelectionChangedCmd, _selectedItem);
+                }
+                scrollToCurrent();
+                draw();
+        }
+}
+
 void ListWidget::setList(const StringList &list) {
         if (_editMode && _caretVisible)
                 drawCaret(true);

gui/ListWidget.h

@@ -65 +65 @@
         void setList(const StringList& list);
         const StringList& getList()     const                   { return _list; }
         int getSelected() const                                         { return _selectedItem; }
+        void setSelected(int item);
         const String& getSelectedString() const         { return _list[_selectedItem]; }
         void setNumberingMode(NumberingMode numberingMode)      { _numberingMode = numberingMode; }
         bool isEditable() const                                         { return _editable; }

gui/launcher.cpp

@@ -339 +341 @@
         // Populate the list
         updateListing();
 
-        // TODO - make a default selection (maybe the game user played last?)
-        //_list->setSelected(0);
-
+        // Restore last selection
+        String last = ConfMan.get(String("lastselectedgame"), ConfigManager::kApplicationDomain);
+        if (!last.isEmpty()) {
+                int itemToSelect = 0;
+                StringList::const_iterator iter;
+                for (iter = _domains.begin(); iter != _domains.end(); ++iter, ++itemToSelect) {
+                        if (last == *iter) {
+                                _list->setSelected(itemToSelect);
+                                break;
+                        }
+                }
+        }
+        
         // En-/Disable the buttons depending on the list selection
         updateButtons();
 
@@ -353 +365 @@
         delete _browser;
 }
 
+void LauncherDialog::close() {
+        // Save last selection
+        if (_list->getSelected() >=0)
+                ConfMan.set(String("lastselectedgame"), _domains[_list->getSelected()], ConfigManager::kApplicationDomain);     
+        else
+                ConfMan.removeKey(String("lastselectedgame"), ConfigManager::kApplicationDomain);
+ 
+        ConfMan.flushToDisk();  
+        Dialog::close();
+}
+
 void LauncherDialog::updateListing() {
         Common::StringList l;
 
@@ -569 +592 @@
                 updateButtons();
                 break;
         case kQuitCmd:
-#ifdef __PALM_OS__
                 close();
-#endif
                 g_system->quit();
                 break;
         default:

gui/launcher.h

@@ -45 +45 @@
         Widget                  *_startButton;
         Widget                  *_editButton;
         Widget                  *_removeButton;
+        Widget                  *_moveUpButton;
+        Widget                  *_moveDownButton;
         StringList              _domains;
         GameDetector    &_detector;
         BrowserDialog   *_browser;
@@ -52 +54 @@
         void updateListing();
         void updateButtons();
         
+        void close();
         virtual void addGame();
         void removeGame(int item);
         void editGame(int item);