Changeset 265 for trunk

Timestamp:

07/20/06 11:16:20 (18 years ago)

Author:

Nicholas Riley

Message:

VERSION: Updated for 1.1d2.

main.c: Updated for 1.1d2. Added -L. Updated to new date formatting
APIs.

launch.xcodeproj: Set deployment target to 10.4.

README: Updated for 1.1d2.

Location:

trunk/launch/launch

Files:

• README (modified) (3 diffs)
• VERSION (modified) (1 diff)
• launch.xcodeproj/project.pbxproj (modified) (3 diffs)
• main.c (modified) (6 diffs)

trunk/launch/launch/README

@@ -1 @@
-launch 1.0.1 [3 April 2005]
+launch 1.1d2 [unreleased]
 ============
 
@@ -63 +63 @@
 An Xcode project, 'launch.xcodeproj', is included.  A precompiled Universal
 binary is also provided.  'launch' was developed and tested under Mac OS X 
-10.4.5 with Xcode 2.2.1, and does not require any additional software to
+10.4.7 with Xcode 2.3, and does not require any additional software to
 build.
 
@@ -223 +223 @@
 
 1.1 - unreleased
+ - -L: send "launch" (ascr/noop) event to app, bypasses automatic
  - -o: pass command-line arguments (broken, r. 4474993)
+   opening of untitled document, etc.
  - display content type ID (UTI)    
  - switched to new LSOpen APIs (now requires Mac OS X 10.4 or later)
+ - switched to new date formatting APIs (the old ones are deprecated)
  - for compatibility with open(1), take app path as argument to -a
 1.0.1 - 3 April 2005

trunk/launch/launch/VERSION

@@ -1 @@
-1.1d1
+1.1d2

trunk/launch/launch/launch.xcodeproj/project.pbxproj

@@ -206 +206 @@
                                         i386,
                                 );
-                                MACOSX_DEPLOYMENT_TARGET = 10.2;
+                                MACOSX_DEPLOYMENT_TARGET = 10.4;
                                 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                         };
@@ -218 +218 @@
                                         i386,
                                 );
-                                MACOSX_DEPLOYMENT_TARGET = 10.2;
+                                MACOSX_DEPLOYMENT_TARGET = 10.4;
                                 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                         };
@@ -230 +230 @@
                                         i386,
                                 );
-                                MACOSX_DEPLOYMENT_TARGET = 10.2;
+                                MACOSX_DEPLOYMENT_TARGET = 10.4;
                                 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                         };

trunk/launch/launch/main.c

@@ -33 +33 @@
 const char *APP_NAME;
 
-#define VERSION "1.1d1"
+#define VERSION "1.1d2"
 
 #define STRBUF_LEN 1024
@@ -92 +92 @@
 
 void usage() {
-    fprintf(stderr, "usage: %s [-npswbmhCXU] [-c creator] [-i bundleID] [-u URL] [-a name] [-o argument] [item ...] [-]\n"
-                    "   or: %s [-npflswbmhCXU] [-o argument] item ...\n", APP_NAME, APP_NAME);
+    fprintf(stderr, "usage: %s [-npswbmhCXLU] [-c creator] [-i bundleID] [-u URL] [-a name] [-o argument] [item ...] [-]\n"
+                    "   or: %s [-npflswbmhCXLU] [-o argument] item ...\n", APP_NAME, APP_NAME);
     fprintf(stderr,
         "  -n            print matching paths/URLs instead of opening them\n"
@@ -108 +108 @@
         "  -C            force CFM/PEF Carbon application to launch in Classic\n"
         "  -X            don't start Classic for this app if Classic isn't running\n"
+        "  -L            suppress normal opening behavior (e.g. untitled window)\n"
         "  -U            interpret items as URLs, even if same-named files exist\n"
         "  -c creator    match application by four-character creator code ('ToyS')\n"
@@ -331 +332 @@
     if (argc == 1) usage();
     
-    while ( (ch = getopt(argc, argv, "npflswbmhCXUc:i:u:a:o:")) != -1) {
+    while ( (ch = getopt(argc, argv, "npflswbmhCXLUc:i:u:a:o:")) != -1) {
         switch (ch) {
         case 'n':
@@ -374 +375 @@
         case 'C': LPARAMS.flags |= kLSLaunchInClassic; break;  // force Classic
         case 'X': LPARAMS.flags ^= kLSLaunchStartClassic; break;// don't start Classic for app
+        case 'L':
+        {
+            OSStatus err;
+            LPARAMS.initialEvent = malloc(sizeof(AppleEvent));
+            err = AECreateAppleEvent(kASAppleScriptSuite, kASLaunchEvent, NULL, kAutoGenerateReturnID, kAnyTransactionID, LPARAMS.initialEvent);
+            if (err != noErr) osstatusexit(err, "unable to construct launch Apple Event", argv[0]);
+        }
         case 'U': OPTS.forceURLs = true; break;
         case 'c':
@@ -531 +539 @@
 
 void printDateTime(const char *label, UTCDateTime *utcTime, const char *postLabel, Boolean printIfEmpty) {
-    static Str255 dateStr, timeStr;
-    LocalDateTime localTime;
-    LongDateTime longTime;
+    static CFDateFormatterRef formatter = NULL;
+    static char strBuffer[STRBUF_LEN];
+    if (formatter == NULL) {
+        formatter = CFDateFormatterCreate(NULL, CFLocaleCopyCurrent(), kCFDateFormatterShortStyle, kCFDateFormatterMediumStyle);
+    }
+    CFAbsoluteTime absoluteTime;
     OSStatus err;
 
-    err = ConvertUTCToLocalDateTime(utcTime, &localTime);
+    err = UCConvertUTCDateTimeToCFAbsoluteTime(utcTime, &absoluteTime);
     if (err == kUTCUnderflowErr) {
         if (printIfEmpty) printf("\t%s: (not set)\n", label);
         return;
     }
-    if (err != noErr) osstatusexit(err, "unable to convert UTC %s date to local", label);
-
-    longTime = localTime.highSeconds;
-    longTime <<= 32;
-    longTime |= localTime.lowSeconds;
-
-    // strings include trailing newlines; strip them.
-    LongDateString(&longTime, shortDate, dateStr, nil); dateStr[dateStr[0] + 1] = '\0';
-    LongTimeString(&longTime, true, timeStr, nil); timeStr[timeStr[0] + 1] = '\0';
-    printf("\t%s: %s %s%s\n", label, dateStr + 1, timeStr + 1, postLabel);
+    if (err != noErr) osstatusexit(err, "unable to convert UTC %s time", label);
+
+    CFStringRef dateTimeString = CFDateFormatterCreateStringWithAbsoluteTime(NULL, formatter, absoluteTime);
+    CFStringGetCString(dateTimeString, strBuffer, STRBUF_LEN, kCFStringEncodingUTF8);
+    
+    printf("\t%s: %s%s\n", label, strBuffer, postLabel);
 }