* ResolveSpecifier() used the window's handler name instead of its title for the "Window"

B_NAME_SPECIFIER. This should fix bug #1681.
* Improved ResolveSpecifier() code.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23239 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/app/Application.cpp

@@ -51,12 +51,21 @@ BResources *BApplication::sAppResources = NULL;
 BLocker BApplication::sAppResourcesLock("_app_resources_lock");
 
 
+enum {
+	kWindowByIndex,
+	kWindowByName,
+	kLooperByIndex,
+	kLooperByID,
+	kLooperByName,
+	kApplication
+};
+
 static property_info sPropertyInfo[] = {
 	{
 		"Window",
 		{},
 		{B_INDEX_SPECIFIER, B_REVERSE_INDEX_SPECIFIER},
-		NULL, 0,
+		NULL, kWindowByIndex,
 		{},
 		{},
 		{}
@@ -65,7 +74,7 @@ static property_info sPropertyInfo[] = {
 		"Window",
 		{},
 		{B_NAME_SPECIFIER},
-		NULL, 1,
+		NULL, kWindowByName,
 		{},
 		{},
 		{}
@@ -74,7 +83,7 @@ static property_info sPropertyInfo[] = {
 		"Looper",
 		{},
 		{B_INDEX_SPECIFIER, B_REVERSE_INDEX_SPECIFIER},
-		NULL, 2,
+		NULL, kLooperByIndex,
 		{},
 		{},
 		{}
@@ -83,7 +92,7 @@ static property_info sPropertyInfo[] = {
 		"Looper",
 		{},
 		{B_ID_SPECIFIER},
-		NULL, 3,
+		NULL, kLooperByID,
 		{},
 		{},
 		{}
@@ -92,7 +101,7 @@ static property_info sPropertyInfo[] = {
 		"Looper",
 		{},
 		{B_NAME_SPECIFIER},
-		NULL, 4,
+		NULL, kLooperByName,
 		{},
 		{},
 		{}
@@ -101,7 +110,7 @@ static property_info sPropertyInfo[] = {
 		"Name",
 		{B_GET_PROPERTY},
 		{B_DIRECT_SPECIFIER},
-		NULL, 5,
+		NULL, kApplication,
 		{B_STRING_TYPE},
 		{},
 		{}
@@ -110,7 +119,7 @@ static property_info sPropertyInfo[] = {
 		"Window",
 		{B_COUNT_PROPERTIES},
 		{B_DIRECT_SPECIFIER},
-		NULL, 5,
+		NULL, kApplication,
 		{B_INT32_TYPE},
 		{},
 		{}
@@ -119,7 +128,7 @@ static property_info sPropertyInfo[] = {
 		"Loopers",
 		{B_GET_PROPERTY},
 		{B_DIRECT_SPECIFIER},
-		NULL, 5,
+		NULL, kApplication,
 		{B_MESSENGER_TYPE},
 		{},
 		{}
@@ -128,7 +137,7 @@ static property_info sPropertyInfo[] = {
 		"Windows",
 		{B_GET_PROPERTY},
 		{B_DIRECT_SPECIFIER},
-		NULL, 5,
+		NULL, kApplication,
 		{B_MESSENGER_TYPE},
 		{},
 		{}
@@ -137,7 +146,7 @@ static property_info sPropertyInfo[] = {
 		"Looper",
 		{B_COUNT_PROPERTIES},
 		{B_DIRECT_SPECIFIER},
-		NULL, 5,
+		NULL, kApplication,
 		{B_INT32_TYPE},
 		{},
 		{}
@@ -628,88 +637,95 @@ BApplication::ResolveSpecifier(BMessage *message, int32 index,
 	status_t err = B_OK;
 	uint32 data;
 
-	if (propInfo.FindMatch(message, 0, specifier, what, property, &data) >=0) {
+	if (propInfo.FindMatch(message, 0, specifier, what, property, &data) >= 0) {
 		switch (data) {
-			case 0: {
+			case kWindowByIndex:
-				int32 ind = -1;
+			{
-				err = specifier->FindInt32("index", &ind);
+				int32 index;
+				err = specifier->FindInt32("index", &index);
 				if (err != B_OK)
 					break;
-				if (what == B_REVERSE_INDEX_SPECIFIER)
-					ind = CountWindows() - ind;
-				err = B_BAD_INDEX;
-				BWindow *win = WindowAt(ind);
-				if (win) {
-					if (index <= 0 && message->what == B_GET_PROPERTY)
-						return this;
-					message->PopSpecifier();
-					BMessenger(win).SendMessage(message);
-					return NULL;
-				}
-				break;
-			}
-			case 1: {
-				const char *name;
-				err = specifier->FindString("name", &name);
-				if (err != B_OK)
-					break;
-				err = B_NAME_NOT_FOUND;
-				for (int32 i=0; i<CountWindows(); i++) {
-					BWindow *win = WindowAt(i);
-					if (win && win->Name() && strlen(win->Name()) == strlen(name)
-						&& !strcmp(win->Name(), name)) {
-							if (index <= 0 && message->what == B_GET_PROPERTY)
-								return this;
-							message->PopSpecifier();
-							BMessenger(win).SendMessage(message);
-							return NULL;
-					}
-				}
-				break;
-			}
-			case 2: {
-				int32 ind = -1;
-				err = specifier->FindInt32("index", &ind);
-				if (err != B_OK)
-					break;
-				if (what == B_REVERSE_INDEX_SPECIFIER)
-					ind = CountLoopers() - ind;
-				err = B_BAD_INDEX;
-				BLooper *looper = LooperAt(ind);
-				if (looper) {
-					if (index <= 0)
-						return this;
-					message->PopSpecifier();
-					BMessenger(looper).SendMessage(message);
-					return NULL;
-				}
-				break;
-			}
-			case 3:
-				//if (index == 0)
-				//	return this;
 
+				if (what == B_REVERSE_INDEX_SPECIFIER)
+					index = CountWindows() - index;
+
+				BWindow *window = WindowAt(index);
+				if (window != NULL) {
+					message->PopSpecifier();
+					BMessenger(window).SendMessage(message);
+				} else
+					err = B_BAD_INDEX;
 				break;
-			case 4: {
+			}
+
+			case kWindowByName:
+			{
 				const char *name;
 				err = specifier->FindString("name", &name);
 				if (err != B_OK)
 					break;
+
+				for (int32 i = 0;; i++) {
+					BWindow *window = WindowAt(i);
+					if (window == NULL) {
 						err = B_NAME_NOT_FOUND;
-				for (int32 i=0; i<CountLoopers(); i++) {
+						break;
-					BLooper *looper = LooperAt(i);
+					}
-					if (looper && looper->Name() && strlen(looper->Name()) == strlen(name)
+					if (window->Title() != NULL && !strcmp(window->Title(), name)) {
-						&& !strcmp(looper->Name(), name)) {
-						if (index <= 0)
-							return this;
 						message->PopSpecifier();
-						BMessenger(looper).SendMessage(message);
+						BMessenger(window).SendMessage(message);
-						return NULL;
+						break;
 					}
 				}
 				break;
 			}
-			case 5:
+
+			case kLooperByIndex:
+			{
+				int32 index;
+				err = specifier->FindInt32("index", &index);
+				if (err != B_OK)
+					break;
+
+				if (what == B_REVERSE_INDEX_SPECIFIER)
+					index = CountLoopers() - index;
+
+				BLooper *looper = LooperAt(index);
+				if (looper != NULL) {
+					message->PopSpecifier();
+					BMessenger(looper).SendMessage(message);
+				} else
+					err = B_BAD_INDEX;
+				break;
+			}
+
+			case kLooperByID:
+				// TODO: implement getting looper by ID!
+				break;
+
+			case kLooperByName:
+			{
+				const char *name;
+				err = specifier->FindString("name", &name);
+				if (err != B_OK)
+					break;
+
+				for (int32 i = 0;; i++) {
+					BLooper *looper = LooperAt(i);
+					if (looper == NULL) {
+						err = B_NAME_NOT_FOUND;
+						break;
+					}
+					if (looper->Name() != NULL && !strcmp(looper->Name(), name)) {
+						message->PopSpecifier();
+						BMessenger(looper).SendMessage(message);
+						break;
+					}
+				}
+				break;
+			}
+
+			case kApplication:
 				return this;
 		}
 	} else {
@@ -717,10 +733,12 @@ BApplication::ResolveSpecifier(BMessage *message, int32 index,
 			property);
 	}
 
+	if (err != B_OK) {
 		BMessage reply(B_MESSAGE_NOT_UNDERSTOOD);
 		reply.AddInt32("error", err);
 		reply.AddString("message", strerror(err));
 		message->SendReply(&reply);
+	}
 
 	return NULL;