Fixed XTOP responsivity

kala13x · Nov 26, 2024 · 0286574 · 0286574
1 parent 8bb5cce
commit 0286574
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/sys/xtop.c b/src/sys/xtop.c
@@ -138,6 +138,14 @@ int XTop_GetNetworkStats(xtop_stats_t *pStats, xarray_t *pIfaces)
         if (pDstIface == NULL) continue;
 
         memcpy(pDstIface, pSrcIface, sizeof(xnet_iface_t));
+        if (strnlen(pDstIface->sName, sizeof(pDstIface->sName) - 1) > 12)
+        {
+            pDstIface->sName[9] = '.';
+            pDstIface->sName[10] = '.';
+            pDstIface->sName[11] = '.';
+            pDstIface->sName[12] = XSTR_NUL;
+        }
+
         if (XArray_AddData(pIfaces, pDstIface, 0) < 0) free(pDstIface); 
     }
 

diff --git a/src/xver.h b/src/xver.h
@@ -12,7 +12,7 @@
 
 #define XUTILS_VERSION_MAX     2
 #define XUTILS_VERSION_MIN     6
-#define XUTILS_BUILD_NUMBER    11
+#define XUTILS_BUILD_NUMBER    12
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/tools/xtop.c b/tools/xtop.c
@@ -683,19 +683,19 @@ XSTATUS XTOPApp_AddCPUExtra(xcli_win_t *pWin, xtop_args_t *pArgs, xcli_bar_t *pB
 
 static uint8_t XTOPApp_GetAddrSpacePadding(xcli_win_t *pWin)
 {
-    uint8_t nSpacePadding = (pWin->frame.nColumns < 106) ? 7 : 8;
-    nSpacePadding = (pWin->frame.nColumns < 104) ? 6 : nSpacePadding;
-    nSpacePadding = (pWin->frame.nColumns < 102) ? 5 : nSpacePadding;
-    nSpacePadding = (pWin->frame.nColumns < 100) ? 4 : nSpacePadding;
-    nSpacePadding = (pWin->frame.nColumns < 98) ? 5 : nSpacePadding;
-    nSpacePadding = (pWin->frame.nColumns < 91) ? 4 : nSpacePadding;
-    nSpacePadding = (pWin->frame.nColumns < 89) ? 3 : nSpacePadding;
+    uint8_t nSpacePadding = (pWin->frame.nColumns < 112) ? 7 : 8;
+    nSpacePadding = (pWin->frame.nColumns < 110) ? 6 : nSpacePadding;
+    nSpacePadding = (pWin->frame.nColumns < 108) ? 5 : nSpacePadding;
+    nSpacePadding = (pWin->frame.nColumns < 106) ? 4 : nSpacePadding;
+    nSpacePadding = (pWin->frame.nColumns < 104) ? 5 : nSpacePadding;
+    nSpacePadding = (pWin->frame.nColumns < 97) ? 4 : nSpacePadding;
+    nSpacePadding = (pWin->frame.nColumns < 95) ? 3 : nSpacePadding;
     return nSpacePadding;
 }
 
 static xbool_t XTOPApp_IsNarrowInterface(xcli_win_t *pWin)
 {
-    return (pWin->frame.nColumns < 98) ? XTRUE : XFALSE;
+    return (pWin->frame.nColumns < 104) ? XTRUE : XFALSE;
 }
 
 static uint8_t XTOPApp_GetIfaceSpacePadding(xcli_win_t *pWin, xbool_t bIsHeader)