Shared: introduce font size for StatusView based on scrollbar size

Change-Id: Ie3b8678678c0d940981f1785418aa8ab354d01c5

headers/private/shared/FontUtil.h

@@ -0,0 +1,7 @@
+#include "Font.h"
+
+namespace BPrivate {
+
+float GetFontSizeForPixel(float maxSize, BFont font);
+
+} // namespace BPrivate

src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp

@@ -1011,6 +1011,9 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
 	TRACE("  ReadData(): %" B_PRIuSIZE " bytes kept.",
 		fReceiveQueue.Available());
 
+	if (fReceiveQueue.Available() == 0 && fState == FINISH_RECEIVED)
+		socket->receive.low_water_mark = 0;
+
 	// if we are opening the window, check if we should send an ACK
 	if (!clone)
 		SendAcknowledge(false);
@@ -1438,7 +1441,7 @@ TCPEndpoint::_ShouldReceive() const
 		return false;
 
 	return fState == ESTABLISHED || fState == FINISH_SENT
-		|| fState == FINISH_ACKNOWLEDGED;
+		|| fState == FINISH_ACKNOWLEDGED || fState == FINISH_RECEIVED;
 }
 
 

src/add-ons/kernel/network/protocols/tcp/tcp.cpp

@@ -429,7 +429,7 @@ add_tcp_header(net_address_module_info* addressModule,
 			optionsLength);
 	}
 
-	TRACE(("add_tcp_header(): buffer %p, flags 0x%x, seq %lu, ack %lu, up %u, "
+	TRACE(("add_tcp_header(): buffer %p, flags 0x%x, seq %" B_PRIu32 ", ack %" B_PRIu32 ", up %u, "
 		"win %u\n", buffer, segment.flags, segment.sequence,
 		segment.acknowledge, segment.urgent_offset, segment.advertised_window));
 

src/apps/stylededit/StatusView.cpp

@@ -9,6 +9,7 @@
 
 
 #include "StatusView.h"
+#include <private/shared/FontUtil.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -63,7 +64,7 @@ void
 StatusView::AttachedToWindow()
 {
 	SetFont(be_plain_font);
-	SetFontSize(10. * be_plain_font->Size() / 12.f);
+	SetFontSize(BPrivate::GetFontSizeForPixel(be_control_look->GetScrollBarWidth(), be_plain_font));
 
 	BMessage message(UPDATE_STATUS);
 	message.AddInt32("line", 1);

src/bin/debug/strace/NetworkTypes.cpp

@@ -134,11 +134,7 @@ format_signed_number(int32 value)
 static string
 read_pollfd(Context &context, void *data)
 {
-	nfds_t numfds = 0;
-	if (context.GetContents(Context::INPUT_VALUES))
-		numfds = get_value<nfds_t>(context.GetValue(context.GetSibling(1)));
-	else if (context.GetContents(Context::OUTPUT_VALUES))
-		numfds = context.GetReturnValue();
+	nfds_t numfds = get_value<nfds_t>(context.GetValue(context.GetSibling(1)));
 	if ((int64)numfds <= 0)
 		return string();
 
@@ -157,6 +153,10 @@ read_pollfd(Context &context, void *data)
 	r = "[";
 
 	for (nfds_t i = 0; i < numfds && added < 8; i++) {
+		if ((tmp[i].fd == -1 || tmp[i].revents == 0)
+			&& context.GetContents(Context::OUTPUT_VALUES)) {
+			continue;
+		}
 		if (added > 0)
 			r += ", ";
 		r += "{fd=" + format_signed_number(tmp[i].fd);
@@ -176,7 +176,7 @@ read_pollfd(Context &context, void *data)
 				flags++;
 			}
 		}
-		if (tmp[i].fd != -1 && context.GetContents(Context::OUTPUT_VALUES)) {
+		if (context.GetContents(Context::OUTPUT_VALUES)) {
 			r += ", revents=";
 			int flags = 0;
 			if ((tmp[i].revents & POLLIN) != 0) {

src/kits/shared/FontUtil.cpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021, Pascal R. G. Abresch, nep@packageloss.eu.
+ * Distributed under the terms of the MIT License.
+ */
+
+#include <ControlLook.h>
+#include <View.h>
+
+
+namespace BPrivate {
+
+status_t GetFontSizeForPixel(float maxSize, BFont font) {
+	float currentSize;
+	font_height fontHeight;
+	for (float fontSize = 9.0F; fontSize < maxSize; fontSize++) {
+		font.SetSize(fontSize);
+		font.GetHeight(&fontHeight);
+		currentSize = fontHeight.ascent + fontHeight.descent;
+		if (currentSize > maxSize) {
+			return fontSize -1.0F;
+		}
+	}
+	return maxSize;
+}
+
+
+} // namespace BPrivate

src/kits/shared/Jamfile

@@ -38,6 +38,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			CommandPipe.cpp
 			DragTrackingFilter.cpp
 			DriverSettingsMessageAdapter.cpp
+			FontUtil.cpp
 			HashString.cpp
 			IconButton.cpp
 			IconView.cpp