i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The thread renaming was broken under R5. Cleaned it up a little.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13289 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-06-27 01:58:56 +00:00
parent 9793d44045
commit 84d9f25ac5
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Window.cpp
+11 -12
View File
@@ -1442,7 +1442,7 @@ BWindow::SetTitle(const char *title)
if (title == NULL) if (title == NULL)
title = ""; title = "";
// we will change BWindow's thread name to "w>window_title" // we will change BWindow's thread name to "w>window title"
char threadName[B_OS_NAME_LENGTH]; char threadName[B_OS_NAME_LENGTH];
strcpy(threadName, "w>"); strcpy(threadName, "w>");
@@ -1451,13 +1451,15 @@ BWindow::SetTitle(const char *title)
#else #else
int32 length = strlen(title); int32 length = strlen(title);
length = min_c(length, B_OS_NAME_LENGTH - 3); length = min_c(length, B_OS_NAME_LENGTH - 3);
threadName[B_OS_NAME_LENGTH-1] = '\0'; memcpy(threadName + 2, title, length);
threadName[length] = '\0';
#endif #endif
SetName(threadName);
// if the message loop has been started... // if the message loop has been started...
if (Thread() != B_ERROR )
{ if (Thread() >= B_OK) {
SetName(threadName);
rename_thread(Thread(), threadName); rename_thread(Thread(), threadName);
// we notify the app_server so we can actually see the change // we notify the app_server so we can actually see the change
@@ -1466,8 +1468,7 @@ BWindow::SetTitle(const char *title)
fLink->AttachString(title); fLink->AttachString(title);
fLink->Flush(); fLink->Flush();
Unlock(); Unlock();
} else }
SetName(threadName);
} }
@@ -2050,10 +2051,9 @@ BWindow::InitData(BRect frame, const char* title, window_look look,
// TODO: other initializations! // TODO: other initializations!
// Here, we will contact app_server and let him know that a window has // Create the server-side window
// been created
port_id receivePort = create_port(B_LOOPER_PORT_DEFAULT_CAPACITY, "w_rcv_port");
port_id receivePort = create_port( B_LOOPER_PORT_DEFAULT_CAPACITY ,"w_rcv_port");
if (receivePort < B_OK) { if (receivePort < B_OK) {
debugger("Could not create BWindow's receive port, used for interacting with the app_server!"); debugger("Could not create BWindow's receive port, used for interacting with the app_server!");
delete this; delete this;
@@ -2097,7 +2097,6 @@ BWindow::InitData(BRect frame, const char* title, window_look look,
be_app->Unlock(); be_app->Unlock();
STRACE(("Server says that our send port is %ld\n", sendPort)); STRACE(("Server says that our send port is %ld\n", sendPort));
STRACE(("Window locked?: %s\n", IsLocked() ? "True" : "False")); STRACE(("Window locked?: %s\n", IsLocked() ? "True" : "False"));
// build and register top_view with app_server // build and register top_view with app_server