public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
* SETUP: default to mintty
@ 2011-07-25  9:12 Corinna Vinschen
  2011-07-25 11:49 ` Andy Koppe
  0 siblings, 1 reply; 168+ messages in thread
From: Corinna Vinschen @ 2011-07-25  9:12 UTC (permalink / raw)
  To: cygwin-apps

[This time *with* patch...]

Hi guys,

we discussed this back in May already, but somehow we didn't get a
final result.  The thread was kind of confusing, so I re-open a new
one now.

We talked about using mintty as our default shell.  I created a setup
patch which I attached to this mail again.  Instead of "Cygwin Bash
Shell" in the start menu and "Cygwin" on the desktop, it creates 
"Cygwin Terminal" shortcuts in both of them.

Is that ok?

If not, what should we do better?

Apart from that, why is mintty still not in the "Base" category?
Just laziness on our side?  Some really important reason?


Corinna


Index: desktop.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/desktop.cc,v
retrieving revision 2.56
diff -u -p -r2.56 desktop.cc
--- desktop.cc	25 Jul 2011 08:59:15 -0000	2.56
+++ desktop.cc	25 Jul 2011 09:10:47 -0000
@@ -20,7 +20,7 @@
 
 #if 0
 static const char *cvsid =
-  "\n%%% $Id: desktop.cc,v 2.56 2011/07/25 08:59:15 corinna Exp $\n";
+  "\n%%% $Id: desktop.cc,v 2.55 2010/11/19 15:49:54 cgf Exp $\n";
 #endif
 
 #include "win32.h"
@@ -78,7 +78,8 @@ DesktopSetupPage::DesktopSetupPage ()
 static void
 make_link (const std::string& linkpath,
            const std::string& title,
-           const std::string& target)
+           const std::string& target,
+           const std::string& arg)
 {
   std::string fname = linkpath + "/" + title + ".lnk";
 
@@ -96,7 +97,7 @@ make_link (const std::string& linkpath,
   if (IsWindowsNT ())
     {
       exepath = target;
-      argbuf = " ";
+      argbuf = arg;
     }
   else
     {
@@ -105,6 +106,8 @@ make_link (const std::string& linkpath,
       GetWindowsDirectory (windir, sizeof (windir));
       exepath = std::string(windir) + "\\command.com";
       argbuf = "/E:4096 /c " + target;
+      if (arg.size ())
+	argbuf += " " + arg;
     }
 
   msg ("make_link_2 (%s, %s, %s, %s)",
@@ -115,7 +118,8 @@ make_link (const std::string& linkpath,
 }
 
 static void
-start_menu (const std::string& title, const std::string& target)
+start_menu (const std::string& title, const std::string& target,
+	    const std::string& arg)
 {
   LPITEMIDLIST id;
   int issystem = (root_scope == IDC_ROOT_SYSTEM) ? 1 : 0;
@@ -137,11 +141,12 @@ start_menu (const std::string& title, co
     }
 // end of Win95 addition
   path += "/Cygwin";
-  make_link (path, title, target);
+  make_link (path, title, target, arg);
 }
 
 static void
-desktop_icon (const std::string& title, const std::string& target)
+desktop_icon (const std::string& title, const std::string& target,
+	      const std::string& arg)
 {
   char path[MAX_PATH];
   LPITEMIDLIST id;
@@ -161,7 +166,7 @@ desktop_icon (const std::string& title, 
       msg ("Desktop directory for deskop link changed to: %s", path);
     }
 // end of Win95 addition
-  make_link (path, title, target);
+  make_link (path, title, target, arg);
 }
 
 static void
@@ -243,15 +248,17 @@ do_desktop_setup ()
 
   make_cygwin_bat ();
 
+  std::string target;
+
+  target = is_legacy ? batname : backslash (cygpath ("/bin/mintty"));
+
   if (root_menu)
-    {
-      start_menu ("Cygwin Bash Shell", batname);
-    }
+    start_menu (is_legacy ? "Cygwin Bash Shell" : "Cygwin Terminal", target,
+    		is_legacy ? "" : "-");
 
   if (root_desktop)
-    {
-      desktop_icon ("Cygwin", batname);
-    }
+    desktop_icon (is_legacy ? "Cygwin" : "Cygwin Terminal", target,
+		  is_legacy ? "" : "-");
 }
 
 static int da[] = { IDC_ROOT_DESKTOP, 0 };
@@ -425,8 +432,11 @@ DesktopSetupPage::OnActivate ()
       else
 	{
 	  root_menu =
-	    check_startmenu ("Cygwin Bash Shell",
-			     backslash (cygpath ("/cygwin.bat")));
+	    is_legacy
+	    ? check_startmenu ("Cygwin Bash Shell",
+			       backslash (cygpath ("/cygwin.bat")))
+	    : check_startmenu ("Cygwin Terminal",
+			       backslash (cygpath ("/bin/mintty")));
 	}
 
       if (NoDesktopOption) 
@@ -436,7 +446,10 @@ DesktopSetupPage::OnActivate ()
       else
 	{
 	  root_desktop =
-	    check_desktop ("Cygwin", backslash (cygpath ("/cygwin.bat")));
+	    is_legacy
+	    ? check_desktop ("Cygwin", backslash (cygpath ("/cygwin.bat")))
+	    : check_desktop ("Cygwin Terminal",
+			     backslash (cygpath ("/bin/mintty")));
 	}
     }
 


-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat

^ permalink raw reply	[flat|nested] 168+ messages in thread
* SETUP: default to mintty
@ 2011-07-25  9:09 Corinna Vinschen
  0 siblings, 0 replies; 168+ messages in thread
From: Corinna Vinschen @ 2011-07-25  9:09 UTC (permalink / raw)
  To: cygwin-apps

Hi guys,

we discussed this back in May already, but somehow we didn't get a
final result.  The thread was kind of confusing, so I re-open a new
one now.

We talked about using mintty as our default shell.  I created a setup
patch which I attached to this mail again.  Instead of "Cygwin Bash
Shell" in the start menu and "Cygwin" on the desktop, it creates 
"Cygwin Terminal" shortcuts in both of them.

Is that ok?

If not, what should we do better?

Apart from that, why is mintty still not in the "Base" category?
Just laziness on our side?  Some really important reason?


Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Project Co-Leader          cygwin AT cygwin DOT com
Red Hat

^ permalink raw reply	[flat|nested] 168+ messages in thread

end of thread, other threads:[~2011-09-01  7:33 UTC | newest]

Thread overview: 168+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-25  9:12 SETUP: default to mintty Corinna Vinschen
2011-07-25 11:49 ` Andy Koppe
2011-07-25 12:24   ` Corinna Vinschen
2011-07-25 20:18   ` Andy Koppe
2011-07-25 23:42     ` Chris Sutcliffe
2011-07-26  0:10       ` Charles Wilson
2011-07-26  0:20         ` Charles Wilson
2011-07-26 11:02           ` Corinna Vinschen
2011-07-26 12:55             ` 256x256 px icons Warren Young
2011-07-27  7:42               ` Corinna Vinschen
2011-07-27 17:31                 ` Warren Young
2011-07-27 20:04                   ` Andy Koppe
2011-07-27 21:11                     ` Warren Young
2011-07-28  5:50                       ` Andy Koppe
2011-07-28  9:09                         ` Corinna Vinschen
2011-07-28 10:27                           ` Corinna Vinschen
2011-07-28 10:54                             ` Corinna Vinschen
2011-07-29  9:15                           ` Warren Young
2011-07-29  9:43                             ` Corinna Vinschen
2011-07-29 11:26                               ` Corinna Vinschen
2011-07-29 14:12                               ` Warren Young
2011-07-29 15:22                                 ` Buchbinder, Barry (NIH/NIAID) [E]
2011-07-29 15:32                                   ` Warren Young
2011-07-29 16:22                                 ` Warren Young
2011-07-30 18:34                                   ` Corinna Vinschen
2011-07-29 20:29                                 ` Andy Koppe
2011-07-30 18:37                                   ` Corinna Vinschen
2011-07-30 20:22                                     ` Andy Koppe
2011-07-31 20:21                                       ` Andy Koppe
2011-08-01  8:08                                         ` Corinna Vinschen
2011-08-01 20:05                                           ` Andy Koppe
2011-08-02 14:50                                             ` Andy Koppe
2011-08-02 15:25                                               ` Corinna Vinschen
2011-08-02 15:45                                                 ` Charles Wilson
2011-08-02 16:07                                                   ` Corinna Vinschen
2011-08-03  5:55                                                     ` Andy Koppe
2011-08-03  7:00                                                       ` Corinna Vinschen
2011-08-04  5:50                                                 ` Andy Koppe
2011-08-04  8:39                                                   ` Corinna Vinschen
2011-08-04 13:19                                                     ` Charles Wilson
2011-08-04 14:30                                                       ` Corinna Vinschen
2011-08-04 17:24                                                         ` Charles Wilson
2011-08-04 18:17                                                           ` Corinna Vinschen
2011-08-05 17:47                                                             ` Warren Young
2011-08-05 15:06                                                         ` Andy Koppe
2011-08-05 15:47                                                           ` Corinna Vinschen
2011-08-05 15:57                                                           ` Charles Wilson
2011-08-05 20:23                                                             ` Andy Koppe
2011-08-05 16:13                                                           ` Warren Young
2011-08-05 17:51                                                             ` Corinna Vinschen
2011-08-05 18:41                                                               ` Warren Young
2011-08-05 17:35                                                   ` Warren Young
2011-08-05 19:08                                                     ` Andy Koppe
2011-08-05 20:24                                                       ` Warren Young
2011-08-06  8:29                                                     ` Corinna Vinschen
2011-08-06 10:47                                                       ` Andy Koppe
2011-08-06 17:44                                                         ` Corinna Vinschen
2011-08-06 18:28                                                           ` Corinna Vinschen
2011-08-07 10:08                                                             ` Andy Koppe
2011-08-08 16:44                                                               ` Warren Young
2011-08-08 17:10                                                             ` Warren Young
2011-08-08 20:40                                                               ` Corinna Vinschen
2011-08-08 16:43                                                           ` Warren Young
2011-08-08 20:44                                                             ` Corinna Vinschen
2011-08-08 22:28                                                               ` Warren Young
2011-08-09  7:26                                                                 ` Corinna Vinschen
2011-08-10  8:48                                                                   ` Warren Young
2011-08-10 10:08                                                                     ` Corinna Vinschen
2011-08-10 10:24                                                                       ` Corinna Vinschen
2011-08-10 14:02                                                                         ` Warren Young
2011-08-11 10:39                                                                           ` Corinna Vinschen
2011-08-11 21:06                                                                             ` Warren Young
2011-08-12  7:00                                                                               ` Corinna Vinschen
2011-08-12  9:13                                                                                 ` Corinna Vinschen
2011-08-12 19:38                                                                                   ` Andy Koppe
2011-08-15 14:33                                                                                   ` Warren Young
2011-08-15 15:45                                                                                     ` Charles Wilson
2011-08-15 16:00                                                                                       ` Corinna Vinschen
2011-08-15 18:26                                                                                         ` Charles Wilson
2011-08-15 18:00                                                                                       ` Warren Young
2011-08-15 15:57                                                                                     ` Corinna Vinschen
2011-08-12 19:38                                                                                 ` Andy Koppe
2011-08-13  7:59                                                                                   ` Corinna Vinschen
2011-08-13 20:35                                                                                     ` Andy Koppe
2011-08-14 11:13                                                                                       ` Corinna Vinschen
2011-08-15 19:46                                                                                         ` Andy Koppe
2011-08-16  9:09                                                                                           ` Corinna Vinschen
2011-08-16 14:16                                                                                             ` Andy Koppe
2011-08-16 14:32                                                                                               ` Corinna Vinschen
2011-08-16 18:41                                                                                                 ` Andy Koppe
2011-08-17 15:14                                                                                                   ` Corinna Vinschen
2011-08-15 17:52                                                                                 ` Warren Young
2011-08-15 17:58                                                                                   ` Chris Sutcliffe
2011-08-15 18:02                                                                                     ` Warren Young
2011-08-15 19:52                                                                                   ` Andy Koppe
2011-08-15 21:10                                                                                     ` Warren Young
2011-08-16  8:36                                                                                       ` Corinna Vinschen
2011-08-16 19:28                                                                                         ` Warren Young
2011-08-17 15:47                                                                                           ` Corinna Vinschen
2011-08-17 19:03                                                                                             ` Charles Wilson
2011-08-18 11:26                                                                                               ` Corinna Vinschen
2011-08-18 21:07                                                                                             ` setup.exe opening page graphic Warren Young
2011-08-19 15:40                                                                                               ` Corinna Vinschen
2011-08-19 22:23                                                                                                 ` Warren Young
2011-08-19 22:25                                                                                                   ` Warren Young
2011-08-20 11:17                                                                                                   ` Corinna Vinschen
2011-08-22 18:36                                                                                                     ` Warren Young
2011-08-23 14:15                                                                                                       ` Corinna Vinschen
2011-08-30  8:32                                                                                                         ` Corinna Vinschen
2011-08-30 19:52                                                                                                           ` Warren Young
2011-08-31  9:42                                                                                                             ` Corinna Vinschen
2011-08-31 13:56                                                                                                               ` Charles Wilson
2011-08-31 18:49                                                                                                               ` Warren Young
2011-08-31 20:57                                                                                                                 ` Charles Wilson
2011-09-01  7:28                                                                                                                   ` Corinna Vinschen
2011-09-01  7:27                                                                                                                 ` Corinna Vinschen
2011-09-01  7:33                                                                                                                   ` Corinna Vinschen
2011-08-16  7:51                                                                                   ` 256x256 px icons Corinna Vinschen
2011-08-16 16:17                                                                                     ` Warren Young
2011-08-10 10:09                                                                     ` Corinna Vinschen
2011-08-08 16:57                                                       ` Warren Young
2011-08-08 20:46                                                         ` Corinna Vinschen
2011-08-08 22:38                                                           ` Warren Young
2011-08-09  7:18                                                             ` Corinna Vinschen
2011-08-09  8:02                                                               ` Corinna Vinschen
2011-07-29 20:51                                 ` Corinna Vinschen
2011-07-30 18:34                                 ` Corinna Vinschen
2011-07-30 20:24                                   ` Cygwin Icons (Re: 256x256 px icons) Corinna Vinschen
2011-07-31  8:26                                 ` 256x256 px icons Andy Koppe
2011-07-29  8:25                         ` Warren Young
2011-07-27 22:26                   ` Charles Wilson
2011-07-28  5:52                     ` Andy Koppe
2011-08-14  8:18                   ` Andy Koppe
2011-08-14 11:16                     ` Corinna Vinschen
2011-08-15 14:44                       ` Warren Young
2011-08-15 16:03                         ` Corinna Vinschen
2011-07-26 13:46             ` SETUP: default to mintty Charles Wilson
2011-07-26 15:01               ` Warren Young
2011-07-25 23:59     ` Christopher Faylor
2011-07-26  8:17     ` Corinna Vinschen
2011-07-26 13:20       ` modernized icon Warren Young
2011-07-26 19:37       ` SETUP: default to mintty Andy Koppe
2011-07-26 19:52         ` Charles Wilson
2011-07-27  7:24           ` Andy Koppe
2011-07-27  7:46             ` Corinna Vinschen
2011-07-27  8:07               ` Andy Koppe
2011-07-27  9:44                 ` Corinna Vinschen
2011-07-27 15:15                   ` Andy Koppe
2011-07-27 15:53                     ` Corinna Vinschen
2011-07-27 16:38                       ` Christopher Faylor
2011-08-03 14:44                       ` Corinna Vinschen
2011-08-03 15:45                         ` Charles Wilson
2011-08-03 20:37                         ` Andy Koppe
2011-08-03 23:38                           ` Warren Young
2011-08-04  5:18                             ` Andy Koppe
2011-08-04  9:09                               ` Corinna Vinschen
2011-08-04 10:26                               ` Corinna Vinschen
2011-08-05 20:05                                 ` Andy Koppe
2011-08-05 20:46                                   ` Warren Young
2011-08-06  8:11                                     ` Andy Koppe
2011-08-05 21:26                                   ` Charles Wilson
2011-08-06  8:30                                   ` Corinna Vinschen
2011-08-04  9:08                           ` Corinna Vinschen
2011-08-04  9:41                             ` Corinna Vinschen
2011-07-26 22:03         ` Warren Young
2011-07-27  7:08         ` Corinna Vinschen
2011-07-27  7:30           ` Andy Koppe
  -- strict thread matches above, loose matches on Subject: below --
2011-07-25  9:09 Corinna Vinschen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).