25ba03d818
Setting _NET_NUMBER_OF_DESKTOPS may cause Blackbox to explode. The problem is due to a bad loop condition in Screen.cc::clientMessageEvent(). If the difference between the new number of desktops and initial workspaceCount() is odd, the condition is always true, or at least until "number" underflows or overflows. BB will usually end up munching a lot of memory and dying when it creates thousands of desktops first, though (tracker ID 2306646). Blackbox does not handle transparency correctly in its slit, which causes applications like x11/bbdock to display garbled graphics. Patch suggested by the author of BBDock. Port revision will be bumped separately, as there are more changes coming. Approved by: maintainer
20 lines
775 B
C++
20 lines
775 B
C++
--- src/Screen.cc.orig 2008-11-17 11:30:06.000000000 -0800
|
|
+++ src/Screen.cc 2008-11-17 11:31:37.000000000 -0800
|
|
@@ -1870,11 +1870,12 @@
|
|
|
|
if (event->message_type == _blackbox->ewmh().numberOfDesktops()) {
|
|
unsigned int number = event->data.l[0];
|
|
- if (number > workspaceCount()) {
|
|
- for (; number != workspaceCount(); --number)
|
|
+ unsigned int wsCount = workspaceCount();
|
|
+ if (number > wsCount) {
|
|
+ for (; number != wsCount; --number)
|
|
addWorkspace();
|
|
- } else if (number < workspaceCount()) {
|
|
- for (; number != workspaceCount(); ++number)
|
|
+ } else if (number < wsCount) {
|
|
+ for (; number != wsCount; ++number)
|
|
removeLastWorkspace();
|
|
}
|
|
} else if (event->message_type == _blackbox->ewmh().desktopNames()) {
|