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

Fixed a crash when running beshare with our BTextView (thanks to Andrew Bachmann for reporting), though it's a bit hackish, added some printfs to TextView.cpp to help finding/fixing bugs, a small optimization to WidthBuffer. Should convert and commit WidthBuffer's tests to cppunit tests sooner or later.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6989 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-03-15 07:19:27 +00:00
parent 80127f8edb
commit 7446a252ed
2 changed files with 209 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+162 -17
View File
File diff suppressed because it is too large Load Diff
src/kits/interface/BTextView/WidthBuffer.cpp
+44 -36
View File
@@ -28,6 +28,8 @@
#include <cstdio> #include <cstdio>
//#define USE_DANO_WIDTHBUFFER
const uint32 kTableCount = 128; const uint32 kTableCount = 128;
struct hashed_escapement struct hashed_escapement
@@ -171,10 +173,12 @@ _BWidthBuffer_::FindTable(const BFont *inStyle, int32 *outIndex)
int32 tableIndex = -1; int32 tableIndex = -1;
for (int32 i = 0; i < fItemCount; i++) { for (int32 i = 0; i < fItemCount; i++) {
#if B_BEOS_VERSION_DANO
#ifdef USE_DANO_WIDTHBUFFER
if (*inStyle == fBuffer[i].font) { if (*inStyle == fBuffer[i].font) {
#else #else
if (fontSize == fBuffer[i].fontSize && fontCode == fBuffer[i].fontCode) { if (fontSize == fBuffer[i].fontSize
&& fontCode == fBuffer[i].fontCode) {
#endif #endif
tableIndex = i; tableIndex = i;
break; break;
@@ -196,12 +200,14 @@ _BWidthBuffer_::InsertTable(const BFont *font)
{ {
_width_table_ table; _width_table_ table;
hashed_escapement *deltas = new hashed_escapement[kTableCount]; hashed_escapement *deltas = new hashed_escapement[kTableCount];
#if B_BEOS_VERSION_DANO
table.font = font; #if USE_DANO_WIDTHBUFFER
table.font = *font;
#else #else
table.fontSize = font->Size(); table.fontSize = font->Size();
table.fontCode = font->FamilyAndStyle(); table.fontCode = font->FamilyAndStyle();
#endif #endif
table.hashCount = 0; table.hashCount = 0;
table.tableCount = kTableCount; table.tableCount = kTableCount;
table.widths = deltas; table.widths = deltas;
@@ -237,8 +243,8 @@ _BWidthBuffer_::GetEscapement(uint32 value, int32 index, float *escapement)
while ((found = widths[hashed].code) != (uint32)-1) { while ((found = widths[hashed].code) != (uint32)-1) {
if (found == value) if (found == value)
break; break;
hashed++;
if (hashed >= (uint32)table->tableCount) if (++hashed >= (uint32)table->tableCount)
hashed = 0; hashed = 0;
DEBUG_ONLY(iterations++;) DEBUG_ONLY(iterations++;)
} }
@@ -311,44 +317,46 @@ _BWidthBuffer_::HashEscapements(const char *inText, int32 numChars, int32 textLe
if (++hashed >= (uint32)table->tableCount) if (++hashed >= (uint32)table->tableCount)
hashed = 0; hashed = 0;
} }
if (found == (uint32)-1) { if (found == (uint32)-1) {
// The value is not in the table. Add it. // The value is not in the table. Add it.
widths[hashed].code = value; widths[hashed].code = value;
widths[hashed].escapement = escapements[charCount]; widths[hashed].escapement = escapements[charCount];
table->hashCount++; table->hashCount++;
}
// We always keep some free space in the hash table
// TODO: Not sure how much space, currently we double
// the current size when hashCount is at least 2/3 of
// the total size.
if (table->tableCount * 2 / 3 <= table->hashCount) {
table->hashCount = 0;
int32 newSize = table->tableCount * 2;
// Create and initialize a new hash table // We always keep some free space in the hash table
hashed_escapement *newWidths = new hashed_escapement[newSize]; // TODO: Not sure how much space, currently we double
for (int32 x = 0; x < newSize; x++) { // the current size when hashCount is at least 2/3 of
newWidths[x].code = (uint32)-1; // the total size.
newWidths[x].escapement = 0; if (table->tableCount * 2 / 3 <= table->hashCount) {
} table->hashCount = 0;
// Rehash the values, and put them into the new table int32 newSize = table->tableCount * 2;
for (int32 oldPos = 0; oldPos < table->tableCount; oldPos++) {
if (widths[oldPos].code != (uint32) -1) { // Create and initialize a new hash table
uint32 newPos = Hash(widths[oldPos].code) & (newSize - 1); hashed_escapement *newWidths = new hashed_escapement[newSize];
while (newWidths[newPos].code != (uint32)-1) { for (int32 x = 0; x < newSize; x++) {
if (++newPos >= (uint32)newSize) newWidths[x].code = (uint32)-1;
newPos = 0; newWidths[x].escapement = 0;
}
newWidths[newPos].code = widths[oldPos].code;
newWidths[newPos].escapement = widths[oldPos].escapement;
table->hashCount++;
} }
} // Rehash the values, and put them into the new table
table->tableCount = newSize; for (int32 oldPos = 0; oldPos < table->tableCount; oldPos++) {
if (widths[oldPos].code != (uint32) -1) {
uint32 newPos = Hash(widths[oldPos].code) & (newSize - 1);
while (newWidths[newPos].code != (uint32)-1) {
if (++newPos >= (uint32)newSize)
newPos = 0;
}
newWidths[newPos].code = widths[oldPos].code;
newWidths[newPos].escapement = widths[oldPos].escapement;
table->hashCount++;
}
}
table->tableCount = newSize;
// Delete the old table, and put the new pointer into the _width_table_ // Delete the old table, and put the new pointer into the _width_table_
delete[] widths; delete[] widths;
widths = newWidths; widths = newWidths;
}
} }
} }
charCount++; charCount++;