Changeset 350 for trunk/appswitch/appswitch/main.c

Timestamp:

11/07/07 03:32:14 (16 years ago)

Author:

Nicholas Riley

Message:

appswitch.1: Updated for appswitch 1.1.

VERSION: Updated for appswitch 1.1.

main.c: Updated copyright date in one place I forgot. Updated for
appswitch 1.1. Worked around Leopard CPS/Process Manager issue.

README: Updated for appswitch 1.1. Summarized changes. Fixed a
couple of omissions (e.g., -a). Removed now-fixed bugs; added the -S
breakage issue with Leopard and Spaces.

appswitch.xcodeproj: No substantive changes.

File:

• trunk/appswitch/appswitch/main.c (modified) (5 diffs)

trunk/appswitch/appswitch/main.c

@@ -26 +26 @@
 const char *APP_NAME;
 
-#define VERSION "1.1d2"
+#define VERSION "1.1"
 
 struct {
@@ -72 +72 @@
 
 void usage() {
-    fprintf(stderr, "usage: %s [-sShHqklLPfF] [-c creator] [-i bundleID] [-a name] [-p pid] [path]\n"
+    fprintf(stderr, "usage: %s [-sShHqkKlLPfF] [-c creator] [-i bundleID] [-a name] [-p pid] [path]\n"
             "  -s            show application, bring windows to front (do not switch)\n"
             "  -S            show all applications\n"
@@ -90 +90 @@
             "  -a name       match application by name\n"
             , APP_NAME);
-    fprintf(stderr, "appswitch "VERSION" (c) 2003-06 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
+    fprintf(stderr, "appswitch "VERSION" (c) 2003-07 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
             "Please send bugs, suggestions, etc. to <appswitch@sabi.net>.\n");
 
@@ -431 +431 @@
     getargs(argc, argv);
 
-    ProcessSerialNumber psn = matchApplication();
+    ProcessSerialNumber psn;
+    
+    // required in Leopard to prevent paramErr - rdar://problem/5579375
+    err = GetCurrentProcess(&psn);
+    if (err != noErr) osstatusexit(err, "can't contact window server");
+    
+    psn = matchApplication();
 
     const char *verb = NULL;
@@ -438 +444 @@
         case APP_LIST: break; // already handled in matchApplication
         case APP_SWITCH: err = SetFrontProcess(&psn); verb = "set front"; break;
-        // XXX show/hide return paramErr - rdar://problem/5579375 - ask on carbon-dev later
         case APP_SHOW: err = ShowHideProcess(&psn, true); verb = "show"; break;
         case APP_HIDE: err = ShowHideProcess(&psn, false); verb = "hide"; break;