From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 644 invoked by alias); 13 Sep 2012 04:46:26 -0000 Received: (qmail 626 invoked by uid 22791); 13 Sep 2012 04:46:24 -0000 X-SWARE-Spam-Status: No, hits=-2.5 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from etr-usa.com (HELO etr-usa.com) (130.94.180.135) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 13 Sep 2012 04:46:10 +0000 Received: (qmail 10350 invoked by uid 13447); 13 Sep 2012 04:46:10 -0000 Received: from unknown (HELO [172.20.0.42]) ([71.210.204.92]) (envelope-sender ) by 130.94.180.135 (qmail-ldap-1.03) with SMTP for ; 13 Sep 2012 04:46:10 -0000 Message-ID: <5051650A.5030702@etr-usa.com> Date: Thu, 13 Sep 2012 04:46:00 -0000 From: Warren Young User-Agent: Mozilla/5.0 (Windows NT 6.0; WOW64; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Cygwin Apps List Subject: [PATCH] setup.exe case-insensitive package sorting Content-Type: multipart/mixed; boundary="------------000205000806080408050807" X-IsSubscribed: yes Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com X-SW-Source: 2012-09/txt/msg00048.txt.bz2 This is a multi-part message in MIME format. --------------000205000806080408050807 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1931 This patch is incomplete, but I've been fighting this for four hours now. I'm tired, hungry, and frustrated, so in case I don't get back to finishing this, I decided to just post what I have so far. The point of the patch is to get the Select Packages screen's package lists to sort case-insensitively. (This saga began after I spent far too long looking for the R package down in the bottom third of the Interpreters category.) The patch works for the flat views only. I have yet to figure out how to do the same for the Category tree view, since that is treated as a completely separate exception case in the code. (Any setup.exe hackers want to opine on whether it's reasonable for it to have required 3 hours of spelunking through the package DB reader, the INI file parser, and the dialog chaining system to find out where to even begin attempting the patch? Did I make par? Was there a map to this twisty maze of global variables that I missed?) When I dove in, I expected to find setup.exe sorting its package list ASCIIbetically somewhere, making this an easy fix, but no. In fact, it doesn't sort the package list internally at all. You can find std::map overridden with casecompare_lt_op sorting in a few places, but I've proven to myself that the solution doesn't lie down this alley. Proof: Open setup.ini in a text editor, and move the R package down to the bottom of the file. Run setup.exe in "install from local disk" mode so it doesn't blow away your changes with a copy from the Internet, get to the Select Packages screen, and open the Interpreters category. R is now at the bottom of the category, instead of at the top. Ergo, setup.exe is getting its package sort order from the ini file, not doing any sorting internally. Not in a way that affects this screen, anyway. I expect fixing upset would have been easier in the end, but I didn't want to be yelled at. (SHTDI!) --------------000205000806080408050807 Content-Type: text/x-patch; name="setup-pkg-sort.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="setup-pkg-sort.patch" Content-length: 2554 Index: ChangeLog =================================================================== RCS file: /cvs/cygwin-apps/setup/ChangeLog,v retrieving revision 2.780 diff -u -p -r2.780 ChangeLog --- ChangeLog 4 Sep 2012 13:55:16 -0000 2.780 +++ ChangeLog 13 Sep 2012 04:32:13 -0000 @@ -1,3 +1,13 @@ +2012-09-12 Warren Young + + Sorting "select packages" UI lists case-insensitively now, + instead of taking setup.ini order, which is ASCIIbetical. + This doesn't fix the category (tree) view, only the flat list + views. + * PickCategoryLine.{cc,h}: Added sort() method + * PickView.cc: Calling new PickCategoryLine::sort() each time + something changes in the package list, just before UI repaint. + 2012-09-04 Yaakov Selkowitz Fix build with mingw-w64 headers. Index: PickCategoryLine.cc =================================================================== RCS file: /cvs/cygwin-apps/setup/PickCategoryLine.cc,v retrieving revision 2.12 diff -u -p -r2.12 PickCategoryLine.cc --- PickCategoryLine.cc 23 Jul 2010 10:21:54 -0000 2.12 +++ PickCategoryLine.cc 13 Sep 2012 04:32:13 -0000 @@ -17,6 +17,8 @@ #include "package_db.h" #include "PickView.h" +#include + void PickCategoryLine::empty (void) { @@ -147,3 +149,14 @@ PickCategoryLine::set_action (packagemet theView.GetParent ()->ClearBusy (); return accum_diff; } + +static bool is_lt_icase(const PickLine* a, const PickLine* b) +{ + return casecompare(a->key, b->key) < 0; +} + +void +PickCategoryLine::sort () +{ + std::sort (bucket.begin (), bucket.end (), is_lt_icase); +} Index: PickCategoryLine.h =================================================================== RCS file: /cvs/cygwin-apps/setup/PickCategoryLine.h,v retrieving revision 2.8 diff -u -p -r2.8 PickCategoryLine.h --- PickCategoryLine.h 21 May 2005 23:04:02 -0000 2.8 +++ PickCategoryLine.h 13 Sep 2012 04:32:13 -0000 @@ -73,6 +73,7 @@ public: } void empty (); virtual int set_action (packagemeta::_actions); + void sort (); private: packagemeta::_actions current_default; Index: PickView.cc =================================================================== RCS file: /cvs/cygwin-apps/setup/PickView.cc,v retrieving revision 2.42 diff -u -p -r2.42 PickView.cc --- PickView.cc 19 Feb 2012 13:57:02 -0000 2.42 +++ PickView.cc 13 Sep 2012 04:32:13 -0000 @@ -207,6 +207,8 @@ PickView::setViewMode (views mode) } } + contents.sort(); + RECT r = GetClientRect (); SCROLLINFO si; memset (&si, 0, sizeof (si)); --------------000205000806080408050807--