Adding upstream version 3.3.0.upstream/3.3.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

325 files changed, 48172 insertions, 0 deletions

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..dd881dd
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# EditorConfig configuration for htop
+# http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file, utf-8 charset
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+# match C source and header files, set indent to three spaces
+[*.{c,h}]
+indent_style = space
+indent_size = 3
+trim_trailing_whitespace = true
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..6ba9da6
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: htop
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..5516fd6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+---
+
+version: 2
+
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
new file mode 100644
index 0000000..2bdf443
--- /dev/null
+++ b/.github/workflows/build_release.yml
@@ -0,0 +1,51 @@
+name: Build Source Release
+
+# Trigger whenever a release is created
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+
+    - name: archive
+      id: archive
+      run: |
+        VERSION=${{ github.event.release.tag_name }}
+        PKGNAME="htop-$VERSION"
+        SHASUM=$PKGNAME.tar.xz.sha256
+        autoreconf -i
+        mkdir -p /tmp/$PKGNAME
+        mv * /tmp/$PKGNAME
+        mv /tmp/$PKGNAME .
+        TARBALL=$PKGNAME.tar.xz
+        tar cJf $TARBALL $PKGNAME
+        sha256sum $TARBALL > $SHASUM
+        echo "::set-output name=tarball::$TARBALL"
+        echo "::set-output name=shasum::$SHASUM"
+    - name: upload tarball
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.archive.outputs.tarball }}
+        asset_name: ${{ steps.archive.outputs.tarball }}
+        asset_content_type: application/gzip
+
+    - name: upload shasum
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.archive.outputs.shasum }}
+        asset_name: ${{ steps.archive.outputs.shasum }}
+        asset_content_type: text/plain
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..0582e05
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,205 @@
+name: CI
+
+on: [ push, pull_request ]
+
+env:
+  # Enable format attributes in ncurses headers
+  # Enable fortified memory/string handling
+  CPPFLAGS: -DGCC_PRINTF -DGCC_SCANF -D_FORTIFY_SOURCE=2
+
+jobs:
+  build-ubuntu-latest-minimal-gcc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libncursesw5-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors || (cat config.log; exit 1)
+    - name: Enable compatibility modes
+      run: |
+        sed -i 's/#define HAVE_FSTATAT 1/#undef HAVE_FSTATAT/g' config.h
+        sed -i 's/#define HAVE_OPENAT 1/#undef HAVE_OPENAT/g' config.h
+        sed -i 's/#define HAVE_READLINKAT 1/#undef HAVE_READLINKAT/g' config.h
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-werror --enable-affinity --disable-unicode --disable-sensors"
+
+  build-ubuntu-latest-minimal-clang:
+    runs-on: ubuntu-latest
+    env:
+      CC: clang-16
+    steps:
+    - uses: actions/checkout@v4
+    - name: install clang repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
+        sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
+        sudo apt-get update -q
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends clang-16 libncursesw5-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-werror --enable-affinity --disable-unicode --disable-sensors"
+
+  build-ubuntu-latest-full-featured-gcc:
+    runs-on: ubuntu-latest
+    # Enable LTO, might trigger additional warnings on advanced inlining
+    env:
+      CFLAGS: -O3 -g -flto
+      LDFLAGS: -O3 -g -flto -Wl,--as-needed
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS='--enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities'
+
+  build-ubuntu-latest-full-featured-clang:
+    runs-on: ubuntu-latest
+    env:
+      CC: clang-16
+    steps:
+    - uses: actions/checkout@v4
+    - name: install clang repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
+        sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
+        sudo apt-get update -q
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends clang-16 libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS='--enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities'
+
+  build-ubuntu-latest-gcc-static:
+    runs-on: ubuntu-latest
+    # Enable LTO, might trigger additional warnings on advanced inlining
+    env:
+      CFLAGS: -O3 -g -flto
+      LDFLAGS: -O3 -g -flto
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libncursesw5-dev libtinfo-dev libgpm-dev libsensors4-dev libcap-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-static --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --disable-hwloc --disable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS='--enable-static --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --disable-hwloc --disable-delayacct --enable-sensors --enable-capabilities'
+
+  build-ubuntu-latest-pcp:
+    # we want PCP v5.2.3+
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libpcp3-dev libncursesw5-dev libtinfo-dev libgpm-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-pcp --enable-unicode || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+
+  build-ubuntu-latest-clang-analyzer:
+    runs-on: ubuntu-latest
+    env:
+      CC: clang-16
+    steps:
+    - uses: actions/checkout@v4
+    - name: install clang repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
+        sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
+        sudo apt-get update -q
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends clang-16 clang-tools-16 libncursesw5-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: scan-build-16 -analyze-headers --status-bugs ./configure --enable-debug --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
+    - name: Build
+      run: scan-build-16 -analyze-headers --status-bugs make -j"$(nproc)"
+
+  build-ubuntu-latest-clang-sanitizer:
+    runs-on: ubuntu-latest
+    env:
+      CC: clang-16
+      CFLAGS: '-O1 -g -ftrivial-auto-var-init=pattern -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-address-use-after-return=always -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=nullability -fsanitize=implicit-conversion -fsanitize=integer -fsanitize=float-divide-by-zero -fsanitize=local-bounds'
+      LDFLAGS: '-ftrivial-auto-var-init=pattern -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-address-use-after-return=always -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=nullability -fsanitize=implicit-conversion -fsanitize=integer -fsanitize=float-divide-by-zero -fsanitize=local-bounds'
+      ASAN_OPTIONS: strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
+      UBSAN_OPTIONS: print_stacktrace=1:print_summary=1:halt_on_error=1
+      TERM: xterm-color
+      HTOPRC: .github/workflows/htoprc
+    steps:
+    - uses: actions/checkout@v4
+    - name: install clang repo
+      run: |
+        wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
+        sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
+        sudo apt-get update -q
+    - name: Install LLVM Toolchain
+      run: sudo apt-get install --no-install-recommends clang-16 libclang-rt-16-dev llvm-16
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Run sanitized htop (1)
+      run: ./htop -h
+    - name: Run sanitized htop (2)
+      run: ./htop -n 5
+    - name: Run sanitized htop (3)
+      run: ./htop -n 5 -t
+    - name: Run sanitized htop (4)
+      run: ./htop -d 1 -n 50
+
+  build-macos-latest-clang:
+    runs-on: macOS-latest
+    env:
+      CC: clang
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Dependencies
+      run: brew install automake pkg-config
+    - name: Bootstrap
+      run: ./autogen.sh
+    - name: Configure
+      run: ./configure --enable-werror || ( cat config.log; exit 1; )
+    - name: Build
+      run: make -k
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-werror"
+
+  whitespace_check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: check-whitespaces
+        run: git diff-tree --check $(git hash-object -t tree /dev/null) HEAD
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..47383a7
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,49 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: '0 1 * * 0'
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      security-events: write
+
+    env:
+        # Enable format attributes in ncurses headers
+        # Enable fortified memory/string handling
+        CPPFLAGS: -DGCC_PRINTF -DGCC_SCANF -D_FORTIFY_SOURCE=2
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: cpp
+
+    - name: Install Dependencies
+      run: sudo apt-get install --no-install-recommends libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
+
+    - name: Bootstrap
+      run: ./autogen.sh
+
+    - name: Configure
+      run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities
+
+    - name: Build
+      run: make
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/htoprc b/.github/workflows/htoprc
new file mode 100644
index 0000000..6c058ec
--- /dev/null
+++ b/.github/workflows/htoprc
@@ -0,0 +1,71 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+htop_version=3.3.0-dev
+config_reader_min_version=3
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+hide_kernel_threads=1
+hide_userland_threads=0
+hide_running_in_container=0
+shadow_other_users=1
+show_thread_names=1
+show_program_path=1
+highlight_base_name=1
+highlight_deleted_exe=1
+shadow_distribution_path_prefix=1
+highlight_megabytes=1
+highlight_threads=1
+highlight_changes=1
+highlight_changes_delay_secs=5
+find_comm_in_cmdline=1
+strip_exe_from_cmdline=1
+show_merged_command=1
+header_margin=1
+screen_tabs=1
+detailed_cpu_time=1
+cpu_count_from_one=0
+show_cpu_usage=1
+show_cpu_frequency=1
+show_cpu_temperature=1
+degree_fahrenheit=0
+update_process_names=1
+account_guest_in_cpu_meter=1
+color_scheme=0
+enable_mouse=1
+delay=15
+hide_function_bar=0
+header_layout=two_50_50
+column_meters_0=LeftCPUs4 CPU Memory Swap MemorySwap Zram Clock Date DateTime ZFSARC ZFSCARC SELinux SystemdUser FileDescriptors
+column_meter_modes_0=1 1 1 1 1 1 2 2 2 2 2 2 2 2
+column_meters_1=RightCPUs4 Tasks LoadAverage Load Uptime Battery System HugePages Hostname Blank PressureStallCPUSome PressureStallIOSome PressureStallIOFull PressureStallIRQFull PressureStallMemorySome PressureStallMemoryFull DiskIO NetworkIO
+column_meter_modes_1=1 2 2 2 2 2 2 1 2 2 2 2 2 2 2 2 2 2
+tree_view=0
+sort_key=46
+tree_sort_key=0
+sort_direction=-1
+tree_sort_direction=1
+tree_view_always_by_pid=0
+all_branches_collapsed=0
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
+.sort_key=PERCENT_CPU
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
+.sort_key=IO_RATE
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=-1
+.tree_sort_direction=1
+.all_branches_collapsed=0
+screen:Dump=PID SCHEDULERPOLICY SYSCR CGROUP CCGROUP OOM IO_PRIORITY PERCENT_CPU_DELAY CTXT SECATTR CWD AUTOGROUP_ID Command
+.sort_key=PID
+.tree_sort_key=PID
+.tree_view_always_by_pid=0
+.tree_view=0
+.sort_direction=1
+.tree_sort_direction=1
+.all_branches_collapsed=0
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..50f3bd1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,56 @@
+# the binaries:
+htop
+pcp-htop
+
+# all object files
+*.o
+
+# skip all backups
+*.bak
+*~
+.*.sw?
+
+# skip coverage files
+*.gcda
+*/*.gcda
+*.gcno
+*/*.gcno
+*.h.gch
+*/.dirstamp
+
+# automake/autoconf related files
+.deps/
+Makefile
+Makefile.in
+INSTALL
+aclocal.m4
+autom4te.cache/
+compile
+conf*/
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.cache
+config.sub
+configure
+depcomp
+htop.1
+pcp-htop.5
+install-sh
+libtool
+ltmain.sh
+m4/
+missing
+stamp-h1
+
+# files related to valgrind/callgrind
+callgrind.out.*
+
+# IDE workspace configurations
+/.idea/
+/.vscode/
+
+# Language Servers
+/.cache/clangd/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..f62e42f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+os:
+  - freebsd
+
+script:
+  - ./autogen.sh
+  - ./configure --enable-werror
+  - make -k
+  - make distcheck DISTCHECK_CONFIGURE_FLAGS=--enable-werror
+  - sudo make install
+  - make installcheck
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..a4cc7c6
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,11 @@
+Originally authored by:
+ Hisham H. Muhammad
+
+Currently maintained by the htop dev team:
+ Benny Baumann
+ Christian Göttsche
+ Daniel Lange
+ Nathan Scott
+
+For the full list of contributors see:
+ git log --format="%aN" | sort -u
diff --git a/Action.c b/Action.c
new file mode 100644
index 0000000..4049a95
--- /dev/null
+++ b/Action.c
@@ -0,0 +1,948 @@
+/*
+htop - Action.c
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Action.h"
+
+#include <assert.h>
+#include <pwd.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "CategoriesPanel.h"
+#include "CommandScreen.h"
+#include "DynamicColumn.h"
+#include "EnvScreen.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "IncSet.h"
+#include "InfoScreen.h"
+#include "ListItem.h"
+#include "Macros.h"
+#include "MainPanel.h"
+#include "OpenFilesScreen.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "ProvideCurses.h"
+#include "Row.h"
+#include "RowField.h"
+#include "Scheduling.h"
+#include "ScreenManager.h"
+#include "SignalsPanel.h"
+#include "Table.h"
+#include "TraceScreen.h"
+#include "UsersTable.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+#if (defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY))
+#include "Affinity.h"
+#include "AffinityPanel.h"
+#endif
+
+
+Object* Action_pickFromVector(State* st, Panel* list, int x, bool follow) {
+   MainPanel* mainPanel = st->mainPanel;
+   Header* header = st->header;
+   Machine* host = st->host;
+
+   int y = ((Panel*)mainPanel)->y;
+   ScreenManager* scr = ScreenManager_new(header, host, st, false);
+   scr->allowFocusChange = false;
+   ScreenManager_add(scr, list, x);
+   ScreenManager_add(scr, (Panel*)mainPanel, -1);
+   Panel* panelFocus;
+   int ch;
+   bool unfollow = false;
+   int row = follow ? MainPanel_selectedRow(mainPanel) : -1;
+   if (follow && host->activeTable->following == -1) {
+      host->activeTable->following = row;
+      unfollow = true;
+   }
+   ScreenManager_run(scr, &panelFocus, &ch, NULL);
+   if (unfollow) {
+      host->activeTable->following = -1;
+   }
+   ScreenManager_delete(scr);
+   Panel_move((Panel*)mainPanel, 0, y);
+   Panel_resize((Panel*)mainPanel, COLS, LINES - y - 1);
+   if (panelFocus == list && ch == 13) {
+      if (follow) {
+         const Row* selected = (const Row*)Panel_getSelected((Panel*)mainPanel);
+         if (selected && selected->id == row)
+            return Panel_getSelected(list);
+
+         beep();
+      } else {
+         return Panel_getSelected(list);
+      }
+   }
+
+   return NULL;
+}
+
+// ----------------------------------------
+
+static void Action_runSetup(State* st) {
+   const Settings* settings = st->host->settings;
+   ScreenManager* scr = ScreenManager_new(st->header, st->host, st, true);
+   CategoriesPanel_new(scr, st->header, st->host);
+   ScreenManager_run(scr, NULL, NULL, "Setup");
+   ScreenManager_delete(scr);
+   if (settings->changed) {
+      CRT_setMouse(settings->enableMouse);
+      Header_writeBackToSettings(st->header);
+   }
+}
+
+static bool changePriority(MainPanel* panel, int delta) {
+   bool anyTagged;
+   bool ok = MainPanel_foreachRow(panel, Process_rowChangePriorityBy, (Arg) { .i = delta }, &anyTagged);
+   if (!ok)
+      beep();
+   return anyTagged;
+}
+
+static void addUserToVector(ht_key_t key, void* userCast, void* panelCast) {
+   const char* user = userCast;
+   Panel* panel = panelCast;
+   Panel_add(panel, (Object*) ListItem_new(user, key));
+}
+
+bool Action_setUserOnly(const char* userName, uid_t* userId) {
+   const struct passwd* user = getpwnam(userName);
+   if (user) {
+      *userId = user->pw_uid;
+      return true;
+   }
+   *userId = (uid_t)-1;
+   return false;
+}
+
+static void tagAllChildren(Panel* panel, Row* parent) {
+   parent->tag = true;
+   int parent_id = parent->id;
+   for (int i = 0; i < Panel_size(panel); i++) {
+      Row* row = (Row*) Panel_get(panel, i);
+      if (!row->tag && Row_isChildOf(row, parent_id)) {
+         tagAllChildren(panel, row);
+      }
+   }
+}
+
+static bool expandCollapse(Panel* panel) {
+   Row* row = (Row*) Panel_getSelected(panel);
+   if (!row)
+      return false;
+
+   row->showChildren = !row->showChildren;
+   return true;
+}
+
+static bool collapseIntoParent(Panel* panel) {
+   const Row* r = (Row*) Panel_getSelected(panel);
+   if (!r)
+      return false;
+
+   int parent_id = Row_getGroupOrParent(r);
+   for (int i = 0; i < Panel_size(panel); i++) {
+      Row* row = (Row*) Panel_get(panel, i);
+      if (row->id == parent_id) {
+         row->showChildren = false;
+         Panel_setSelected(panel, i);
+         return true;
+      }
+   }
+   return false;
+}
+
+Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey) {
+   ScreenSettings_setSortKey(settings->ss, (RowField) sortKey);
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_UPDATE_PANELHDR | HTOP_KEEP_FOLLOWING;
+}
+
+// ----------------------------------------
+
+static bool Action_writeableProcess(State* st) {
+   const Settings* settings = st->host->settings;
+   bool readonly = Settings_isReadonly() || settings->ss->dynamic;
+   return !readonly;
+}
+
+static bool Action_readableProcess(State* st) {
+   const Settings* settings = st->host->settings;
+   return !settings->ss->dynamic;
+}
+
+static Htop_Reaction actionSetSortColumn(State* st) {
+   Htop_Reaction reaction = HTOP_OK;
+   Panel* sortPanel = Panel_new(0, 0, 0, 0, Class(ListItem), true, FunctionBar_newEnterEsc("Sort   ", "Cancel "));
+   Panel_setHeader(sortPanel, "Sort by");
+   Machine* host = st->host;
+   Settings* settings = host->settings;
+   const RowField* fields = settings->ss->fields;
+   Hashtable* dynamicColumns = settings->dynamicColumns;
+   for (int i = 0; fields[i]; i++) {
+      char* name = NULL;
+      if (fields[i] >= ROW_DYNAMIC_FIELDS) {
+         DynamicColumn* column = Hashtable_get(dynamicColumns, fields[i]);
+         if (!column)
+            continue;
+         name = xStrdup(column->caption ? column->caption : column->name);
+      } else {
+         name = String_trim(Process_fields[fields[i]].name);
+      }
+      Panel_add(sortPanel, (Object*) ListItem_new(name, fields[i]));
+      if (fields[i] == ScreenSettings_getActiveSortKey(settings->ss))
+         Panel_setSelected(sortPanel, i);
+
+      free(name);
+   }
+   const ListItem* field = (const ListItem*) Action_pickFromVector(st, sortPanel, 14, false);
+   if (field) {
+      reaction |= Action_setSortKey(settings, field->key);
+   }
+   Object_delete(sortPanel);
+
+   host->activeTable->needsSort = true;
+
+   return reaction | HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+static Htop_Reaction actionSortByPID(State* st) {
+   return Action_setSortKey(st->host->settings, PID);
+}
+
+static Htop_Reaction actionSortByMemory(State* st) {
+   return Action_setSortKey(st->host->settings, PERCENT_MEM);
+}
+
+static Htop_Reaction actionSortByCPU(State* st) {
+   return Action_setSortKey(st->host->settings, PERCENT_CPU);
+}
+
+static Htop_Reaction actionSortByTime(State* st) {
+   return Action_setSortKey(st->host->settings, TIME);
+}
+
+static Htop_Reaction actionToggleKernelThreads(State* st) {
+   Settings* settings = st->host->settings;
+   settings->hideKernelThreads = !settings->hideKernelThreads;
+   settings->lastUpdate++;
+
+   Machine_scanTables(st->host); // needed to not have a visible delay showing wrong data
+
+   return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionToggleUserlandThreads(State* st) {
+   Settings* settings = st->host->settings;
+   settings->hideUserlandThreads = !settings->hideUserlandThreads;
+   settings->lastUpdate++;
+
+   Machine_scanTables(st->host); // needed to not have a visible delay showing wrong data
+
+   return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionToggleRunningInContainer(State* st) {
+   Settings* settings = st->host->settings;
+   settings->hideRunningInContainer = !settings->hideRunningInContainer;
+   settings->lastUpdate++;
+
+   return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionToggleProgramPath(State* st) {
+   Settings* settings = st->host->settings;
+   settings->showProgramPath = !settings->showProgramPath;
+   settings->lastUpdate++;
+
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionToggleMergedCommand(State* st) {
+   Settings* settings = st->host->settings;
+   settings->showMergedCommand = !settings->showMergedCommand;
+   settings->lastUpdate++;
+
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_UPDATE_PANELHDR;
+}
+
+static Htop_Reaction actionToggleTreeView(State* st) {
+   Machine* host = st->host;
+   ScreenSettings* ss = host->settings->ss;
+   ss->treeView = !ss->treeView;
+
+   if (!ss->allBranchesCollapsed)
+      Table_expandTree(host->activeTable);
+
+   host->activeTable->needsSort = true;
+
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+static Htop_Reaction actionToggleHideMeters(State* st) {
+   st->hideMeters = !st->hideMeters;
+   return HTOP_RESIZE | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionExpandOrCollapseAllBranches(State* st) {
+   Machine* host = st->host;
+   ScreenSettings* ss = host->settings->ss;
+   if (!ss->treeView) {
+      return HTOP_OK;
+   }
+   ss->allBranchesCollapsed = !ss->allBranchesCollapsed;
+   if (ss->allBranchesCollapsed)
+      Table_collapseAllBranches(host->activeTable);
+   else
+      Table_expandTree(host->activeTable);
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS;
+}
+
+static Htop_Reaction actionIncFilter(State* st) {
+   Machine* host = st->host;
+   IncSet* inc = (st->mainPanel)->inc;
+   IncSet_activate(inc, INC_FILTER, (Panel*)st->mainPanel);
+   host->activeTable->incFilter = IncSet_filter(inc);
+   return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionIncSearch(State* st) {
+   IncSet_reset(st->mainPanel->inc, INC_SEARCH);
+   IncSet_activate(st->mainPanel->inc, INC_SEARCH, (Panel*)st->mainPanel);
+   return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionHigherPriority(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   bool changed = changePriority(st->mainPanel, -1);
+   return changed ? HTOP_REFRESH : HTOP_OK;
+}
+
+static Htop_Reaction actionLowerPriority(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   bool changed = changePriority(st->mainPanel, 1);
+   return changed ? HTOP_REFRESH : HTOP_OK;
+}
+
+static Htop_Reaction actionInvertSortOrder(State* st) {
+   Machine* host = st->host;
+   ScreenSettings_invertSortOrder(host->settings->ss);
+   host->activeTable->needsSort = true;
+   return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_UPDATE_PANELHDR;
+}
+
+static Htop_Reaction actionExpandOrCollapse(State* st) {
+   if (!st->host->settings->ss->treeView)
+      return HTOP_OK;
+
+   bool changed = expandCollapse((Panel*)st->mainPanel);
+   return changed ? HTOP_RECALCULATE : HTOP_OK;
+}
+
+static Htop_Reaction actionCollapseIntoParent(State* st) {
+   if (!st->host->settings->ss->treeView) {
+      return HTOP_OK;
+   }
+   bool changed = collapseIntoParent((Panel*)st->mainPanel);
+   return changed ? HTOP_RECALCULATE : HTOP_OK;
+}
+
+static Htop_Reaction actionExpandCollapseOrSortColumn(State* st) {
+   return st->host->settings->ss->treeView ? actionExpandOrCollapse(st) : actionSetSortColumn(st);
+}
+
+static inline void setActiveScreen(Settings* settings, State* st, unsigned int ssIdx) {
+   assert(settings->ssIndex == ssIdx);
+   Machine* host = st->host;
+
+   settings->ss = settings->screens[ssIdx];
+   if (!settings->ss->table)
+      settings->ss->table = host->processTable;
+   host->activeTable = settings->ss->table;
+
+   // set correct functionBar - readonly if requested, and/or with non-process screens
+   bool readonly = Settings_isReadonly() || (host->activeTable != host->processTable);
+   MainPanel_setFunctionBar(st->mainPanel, readonly);
+}
+
+static Htop_Reaction actionNextScreen(State* st) {
+   Settings* settings = st->host->settings;
+   settings->ssIndex++;
+   if (settings->ssIndex == settings->nScreens) {
+      settings->ssIndex = 0;
+   }
+   setActiveScreen(settings, st, settings->ssIndex);
+   return HTOP_UPDATE_PANELHDR | HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionPrevScreen(State* st) {
+   Settings* settings = st->host->settings;
+   if (settings->ssIndex == 0) {
+      settings->ssIndex = settings->nScreens - 1;
+   } else {
+      settings->ssIndex--;
+   }
+   setActiveScreen(settings, st, settings->ssIndex);
+   return HTOP_UPDATE_PANELHDR | HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+Htop_Reaction Action_setScreenTab(State* st, int x) {
+   Settings* settings = st->host->settings;
+   int s = 2;
+   for (unsigned int i = 0; i < settings->nScreens; i++) {
+      if (x < s) {
+         return 0;
+      }
+      const char* tab = settings->screens[i]->heading;
+      int len = strlen(tab);
+      if (x <= s + len + 1) {
+         settings->ssIndex = i;
+         setActiveScreen(settings, st, i);
+         return HTOP_UPDATE_PANELHDR | HTOP_REFRESH | HTOP_REDRAW_BAR;
+      }
+      s += len + 3;
+   }
+   return 0;
+}
+
+static Htop_Reaction actionQuit(ATTR_UNUSED State* st) {
+   return HTOP_QUIT;
+}
+
+static Htop_Reaction actionSetAffinity(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   Machine* host = st->host;
+   if (host->activeCPUs == 1)
+      return HTOP_OK;
+
+#if (defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY))
+   const Row* row = (const Row*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!row)
+      return HTOP_OK;
+
+   Affinity* affinity1 = Affinity_rowGet(row, host);
+   if (!affinity1)
+      return HTOP_OK;
+
+   int width;
+   Panel* affinityPanel = AffinityPanel_new(host, affinity1, &width);
+   Affinity_delete(affinity1);
+
+   const void* set = Action_pickFromVector(st, affinityPanel, width, true);
+   if (set) {
+      Affinity* affinity2 = AffinityPanel_getAffinity(affinityPanel, host);
+      bool ok = MainPanel_foreachRow(st->mainPanel, Affinity_rowSet, (Arg) { .v = affinity2 }, NULL);
+      if (!ok)
+         beep();
+      Affinity_delete(affinity2);
+   }
+   Object_delete(affinityPanel);
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+#else
+   return HTOP_OK;
+#endif
+}
+
+#ifdef SCHEDULER_SUPPORT
+static Htop_Reaction actionSetSchedPolicy(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_KEEP_FOLLOWING;
+
+   static int preSelectedPolicy = SCHEDULINGPANEL_INITSELECTEDPOLICY;
+   static int preSelectedPriority = SCHEDULINGPANEL_INITSELECTEDPRIORITY;
+
+   Panel* schedPanel = Scheduling_newPolicyPanel(preSelectedPolicy);
+
+   const ListItem* policy;
+   for (;;) {
+      policy = (const ListItem*) Action_pickFromVector(st, schedPanel, 18, true);
+
+      if (!policy || policy->key != -1)
+         break;
+
+      Scheduling_togglePolicyPanelResetOnFork(schedPanel);
+   }
+
+   if (policy) {
+      preSelectedPolicy = policy->key;
+
+      Panel* prioPanel = Scheduling_newPriorityPanel(policy->key, preSelectedPriority);
+      if (prioPanel) {
+         const ListItem* prio = (const ListItem*) Action_pickFromVector(st, prioPanel, 14, true);
+         if (prio)
+            preSelectedPriority = prio->key;
+
+         Panel_delete((Object*) prioPanel);
+      }
+
+      SchedulingArg v = { .policy = preSelectedPolicy, .priority = preSelectedPriority };
+
+      bool ok = MainPanel_foreachRow(st->mainPanel, Scheduling_rowSetPolicy, (Arg) { .v = &v }, NULL);
+      if (!ok)
+         beep();
+   }
+
+   Panel_delete((Object*)schedPanel);
+
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_KEEP_FOLLOWING;
+}
+#endif  /* SCHEDULER_SUPPORT */
+
+static Htop_Reaction actionKill(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   static int preSelectedSignal = SIGNALSPANEL_INITSELECTEDSIGNAL;
+
+   Panel* signalsPanel = SignalsPanel_new(preSelectedSignal);
+   const ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 14, true);
+   if (sgn && sgn->key != 0) {
+      preSelectedSignal = sgn->key;
+      Panel_setHeader((Panel*)st->mainPanel, "Sending...");
+      Panel_draw((Panel*)st->mainPanel, false, true, true, State_hideFunctionBar(st));
+      refresh();
+      bool ok = MainPanel_foreachRow(st->mainPanel, Process_rowSendSignal, (Arg) { .i = sgn->key }, NULL);
+      if (!ok) {
+         beep();
+      }
+      napms(500);
+   }
+   Panel_delete((Object*)signalsPanel);
+
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+static Htop_Reaction actionFilterByUser(State* st) {
+   Panel* usersPanel = Panel_new(0, 0, 0, 0, Class(ListItem), true, FunctionBar_newEnterEsc("Show   ", "Cancel "));
+   Panel_setHeader(usersPanel, "Show processes of:");
+   Machine* host = st->host;
+   UsersTable_foreach(host->usersTable, addUserToVector, usersPanel);
+   Vector_insertionSort(usersPanel->items);
+   ListItem* allUsers = ListItem_new("All users", -1);
+   Panel_insert(usersPanel, 0, (Object*) allUsers);
+   const ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 19, false);
+   if (picked) {
+      if (picked == allUsers) {
+         host->userId = (uid_t)-1;
+      } else {
+         Action_setUserOnly(ListItem_getRef(picked), &host->userId);
+      }
+   }
+   Panel_delete((Object*)usersPanel);
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+Htop_Reaction Action_follow(State* st) {
+   st->host->activeTable->following = MainPanel_selectedRow(st->mainPanel);
+   Panel_setSelectionColor((Panel*)st->mainPanel, PANEL_SELECTION_FOLLOW);
+   return HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionSetup(State* st) {
+   Action_runSetup(st);
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR | HTOP_RESIZE;
+}
+
+static Htop_Reaction actionLsof(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   const Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+
+   OpenFilesScreen* ofs = OpenFilesScreen_new(p);
+   InfoScreen_run((InfoScreen*)ofs);
+   OpenFilesScreen_delete((Object*)ofs);
+   clear();
+   CRT_enableDelay();
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionShowLocks(State* st) {
+   if (!Action_readableProcess(st))
+      return HTOP_OK;
+
+   const Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+
+   ProcessLocksScreen* pls = ProcessLocksScreen_new(p);
+   InfoScreen_run((InfoScreen*)pls);
+   ProcessLocksScreen_delete((Object*)pls);
+   clear();
+   CRT_enableDelay();
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionStrace(State* st) {
+   if (!Action_writeableProcess(st))
+      return HTOP_OK;
+
+   const Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+
+   TraceScreen* ts = TraceScreen_new(p);
+   bool ok = TraceScreen_forkTracer(ts);
+   if (ok) {
+      InfoScreen_run((InfoScreen*)ts);
+   }
+   TraceScreen_delete((Object*)ts);
+   clear();
+   CRT_enableDelay();
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionTag(State* st) {
+   Row* r = (Row*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!r)
+      return HTOP_OK;
+
+   Row_toggleTag(r);
+   Panel_onKey((Panel*)st->mainPanel, KEY_DOWN);
+   return HTOP_OK;
+}
+
+static Htop_Reaction actionRedraw(ATTR_UNUSED State* st) {
+   clear();
+   // HTOP_RECALCULATE here to make Ctrl-L also refresh the data and not only redraw
+   return HTOP_RECALCULATE | HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionTogglePauseUpdate(State* st) {
+   st->pauseUpdate = !st->pauseUpdate;
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static const struct {
+   const char* key;
+   bool roInactive;
+   const char* info;
+} helpLeft[] = {
+   { .key = "      #: ",  .roInactive = false, .info = "hide/show header meters" },
+   { .key = "    Tab: ",  .roInactive = false, .info = "switch to next screen tab" },
+   { .key = " Arrows: ",  .roInactive = false, .info = "scroll process list" },
+   { .key = " Digits: ",  .roInactive = false, .info = "incremental PID search" },
+   { .key = "   F3 /: ",  .roInactive = false, .info = "incremental name search" },
+   { .key = "   F4 \\: ", .roInactive = false, .info = "incremental name filtering" },
+   { .key = "   F5 t: ",  .roInactive = false, .info = "tree view" },
+   { .key = "      p: ",  .roInactive = false, .info = "toggle program path" },
+   { .key = "      m: ",  .roInactive = false, .info = "toggle merged command" },
+   { .key = "      Z: ",  .roInactive = false, .info = "pause/resume process updates" },
+   { .key = "      u: ",  .roInactive = false, .info = "show processes of a single user" },
+   { .key = "      H: ",  .roInactive = false, .info = "hide/show user process threads" },
+   { .key = "      K: ",  .roInactive = false, .info = "hide/show kernel threads" },
+   { .key = "      O: ",  .roInactive = false, .info = "hide/show processes in containers" },
+   { .key = "      F: ",  .roInactive = false, .info = "cursor follows process" },
+   { .key = "  + - *: ",  .roInactive = false, .info = "expand/collapse tree/toggle all" },
+   { .key = "N P M T: ",  .roInactive = false, .info = "sort by PID, CPU%, MEM% or TIME" },
+   { .key = "      I: ",  .roInactive = false, .info = "invert sort order" },
+   { .key = " F6 > .: ",  .roInactive = false, .info = "select sort column" },
+   { .key = NULL, .info = NULL }
+};
+
+static const struct {
+   const char* key;
+   bool roInactive;
+   const char* info;
+} helpRight[] = {
+   { .key = "  S-Tab: ", .roInactive = false, .info = "switch to previous screen tab" },
+   { .key = "  Space: ", .roInactive = false, .info = "tag process" },
+   { .key = "      c: ", .roInactive = false, .info = "tag process and its children" },
+   { .key = "      U: ", .roInactive = false, .info = "untag all processes" },
+   { .key = "   F9 k: ", .roInactive = true,  .info = "kill process/tagged processes" },
+   { .key = "   F7 ]: ", .roInactive = true,  .info = "higher priority (root only)" },
+   { .key = "   F8 [: ", .roInactive = true,  .info = "lower priority (+ nice)" },
+#if (defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY))
+   { .key = "      a: ", .roInactive = true, .info = "set CPU affinity" },
+#endif
+   { .key = "      e: ", .roInactive = false, .info = "show process environment" },
+   { .key = "      i: ", .roInactive = true,  .info = "set IO priority" },
+   { .key = "      l: ", .roInactive = true,  .info = "list open files with lsof" },
+   { .key = "      x: ", .roInactive = false, .info = "list file locks of process" },
+   { .key = "      s: ", .roInactive = true,  .info = "trace syscalls with strace" },
+   { .key = "      w: ", .roInactive = false, .info = "wrap process command in multiple lines" },
+#ifdef SCHEDULER_SUPPORT
+   { .key = "      Y: ", .roInactive = true,  .info = "set scheduling policy" },
+#endif
+   { .key = " F2 C S: ", .roInactive = false, .info = "setup" },
+   { .key = " F1 h ?: ", .roInactive = false, .info = "show this help screen" },
+   { .key = "  F10 q: ", .roInactive = false, .info = "quit" },
+   { .key = NULL, .info = NULL }
+};
+
+static inline void addattrstr( int attr, const char* str) {
+   attrset(attr);
+   addstr(str);
+}
+
+static Htop_Reaction actionHelp(State* st) {
+   clear();
+   attrset(CRT_colors[HELP_BOLD]);
+
+   for (int i = 0; i < LINES - 1; i++)
+      mvhline(i, 0, ' ', COLS);
+
+   int line = 0;
+
+   mvaddstr(line++, 0, "htop " VERSION " - " COPYRIGHT);
+   mvaddstr(line++, 0, "Released under the GNU GPLv2+. See 'man' page for more info.");
+
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   line++;
+   mvaddstr(line++, 0, "CPU usage bar: ");
+
+#define addbartext(attr, prefix, text)               \
+   do {                                              \
+      addattrstr(CRT_colors[DEFAULT_COLOR], prefix); \
+      addattrstr(attr, text);                        \
+   } while(0)
+
+   addattrstr(CRT_colors[BAR_BORDER], "[");
+   addbartext(CRT_colors[CPU_NICE_TEXT], "", "low");
+   addbartext(CRT_colors[CPU_NORMAL], "/", "normal");
+   addbartext(CRT_colors[CPU_SYSTEM], "/", "kernel");
+   if (st->host->settings->detailedCPUTime) {
+      addbartext(CRT_colors[CPU_IRQ], "/", "irq");
+      addbartext(CRT_colors[CPU_SOFTIRQ], "/", "soft-irq");
+      addbartext(CRT_colors[CPU_STEAL], "/", "steal");
+      addbartext(CRT_colors[CPU_GUEST], "/", "guest");
+      addbartext(CRT_colors[CPU_IOWAIT], "/", "io-wait");
+      addbartext(CRT_colors[BAR_SHADOW], " ", "used%");
+   } else {
+      addbartext(CRT_colors[CPU_GUEST], "/", "guest");
+      addbartext(CRT_colors[BAR_SHADOW], "                  ", "used%");
+   }
+   addattrstr(CRT_colors[BAR_BORDER], "]");
+
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   mvaddstr(line++, 0, "Memory bar:    ");
+   addattrstr(CRT_colors[BAR_BORDER], "[");
+   addbartext(CRT_colors[MEMORY_USED], "", "used");
+   addbartext(CRT_colors[MEMORY_SHARED], "/", "shared");
+   addbartext(CRT_colors[MEMORY_COMPRESSED], "/", "compressed");
+   addbartext(CRT_colors[MEMORY_BUFFERS_TEXT], "/", "buffers");
+   addbartext(CRT_colors[MEMORY_CACHE], "/", "cache");
+   addbartext(CRT_colors[BAR_SHADOW], "          ", "used");
+   addbartext(CRT_colors[BAR_SHADOW], "/", "total");
+   addattrstr(CRT_colors[BAR_BORDER], "]");
+
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   mvaddstr(line++, 0, "Swap bar:      ");
+   addattrstr(CRT_colors[BAR_BORDER], "[");
+   addbartext(CRT_colors[SWAP], "", "used");
+#ifdef HTOP_LINUX
+   addbartext(CRT_colors[SWAP_CACHE], "/", "cache");
+   addbartext(CRT_colors[SWAP_FRONTSWAP], "/", "frontswap");
+#else
+   addbartext(CRT_colors[SWAP_CACHE], "      ", "");
+#endif
+   addbartext(CRT_colors[BAR_SHADOW], "                          ", "used");
+   addbartext(CRT_colors[BAR_SHADOW], "/", "total");
+   addattrstr(CRT_colors[BAR_BORDER], "]");
+
+   line++;
+
+#undef addbartext
+
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   mvaddstr(line++, 0, "Type and layout of header meters are configurable in the setup screen.");
+   if (CRT_colorScheme == COLORSCHEME_MONOCHROME) {
+      mvaddstr(line, 0, "In monochrome, meters display as different chars, in order: |#*@$%&.");
+   }
+   line++;
+
+#define addattrstatestr(attr, state, desc)              \
+   do {                                                 \
+      addattrstr(attr, state);                          \
+      addattrstr(CRT_colors[DEFAULT_COLOR], ": " desc); \
+   } while(0)
+
+   mvaddstr(line, 0, "Process state: ");
+   addattrstatestr(CRT_colors[PROCESS_RUN_STATE], "R", "running; ");
+   addattrstatestr(CRT_colors[PROCESS_SHADOW], "S", "sleeping; ");
+   addattrstatestr(CRT_colors[PROCESS_RUN_STATE], "t", "traced/stopped; ");
+   addattrstatestr(CRT_colors[PROCESS_D_STATE], "Z", "zombie; ");
+   addattrstatestr(CRT_colors[PROCESS_D_STATE], "D", "disk sleep");
+   attrset(CRT_colors[DEFAULT_COLOR]);
+
+#undef addattrstatestr
+
+   line += 2;
+
+   const bool readonly = Settings_isReadonly();
+
+   int item;
+   for (item = 0; helpLeft[item].key; item++) {
+      attrset((helpLeft[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[DEFAULT_COLOR]);
+      mvaddstr(line + item, 10, helpLeft[item].info);
+      attrset((helpLeft[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[HELP_BOLD]);
+      mvaddstr(line + item, 1,  helpLeft[item].key);
+      if (String_eq(helpLeft[item].key, "      H: ")) {
+         attrset((helpLeft[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[PROCESS_THREAD]);
+         mvaddstr(line + item, 33, "threads");
+      } else if (String_eq(helpLeft[item].key, "      K: ")) {
+         attrset((helpLeft[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[PROCESS_THREAD]);
+         mvaddstr(line + item, 27, "threads");
+      }
+   }
+   int leftHelpItems = item;
+
+   for (item = 0; helpRight[item].key; item++) {
+      attrset((helpRight[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[HELP_BOLD]);
+      mvaddstr(line + item, 43, helpRight[item].key);
+      attrset((helpRight[item].roInactive && readonly) ? CRT_colors[HELP_SHADOW] : CRT_colors[DEFAULT_COLOR]);
+      mvaddstr(line + item, 52, helpRight[item].info);
+   }
+   line += MAXIMUM(leftHelpItems, item);
+   line++;
+
+   attrset(CRT_colors[HELP_BOLD]);
+   mvaddstr(line++, 0, "Press any key to return.");
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   refresh();
+   CRT_readKey();
+   clear();
+
+   return HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_KEEP_FOLLOWING;
+}
+
+static Htop_Reaction actionUntagAll(State* st) {
+   for (int i = 0; i < Panel_size((Panel*)st->mainPanel); i++) {
+      Row* row = (Row*) Panel_get((Panel*)st->mainPanel, i);
+      row->tag = false;
+   }
+   return HTOP_REFRESH;
+}
+
+static Htop_Reaction actionTagAllChildren(State* st) {
+   Row* row = (Row*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!row)
+      return HTOP_OK;
+
+   tagAllChildren((Panel*)st->mainPanel, row);
+   return HTOP_OK;
+}
+
+static Htop_Reaction actionShowEnvScreen(State* st) {
+   if (!Action_readableProcess(st))
+      return HTOP_OK;
+
+   Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+
+   EnvScreen* es = EnvScreen_new(p);
+   InfoScreen_run((InfoScreen*)es);
+   EnvScreen_delete((Object*)es);
+   clear();
+   CRT_enableDelay();
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+static Htop_Reaction actionShowCommandScreen(State* st) {
+   if (!Action_readableProcess(st))
+      return HTOP_OK;
+
+   Process* p = (Process*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+
+   CommandScreen* cmdScr = CommandScreen_new(p);
+   InfoScreen_run((InfoScreen*)cmdScr);
+   CommandScreen_delete((Object*)cmdScr);
+   clear();
+   CRT_enableDelay();
+   return HTOP_REFRESH | HTOP_REDRAW_BAR;
+}
+
+void Action_setBindings(Htop_Action* keys) {
+   keys[' '] = actionTag;
+   keys['#'] = actionToggleHideMeters;
+   keys['*'] = actionExpandOrCollapseAllBranches;
+   keys['+'] = actionExpandOrCollapse;
+   keys[','] = actionSetSortColumn;
+   keys['-'] = actionExpandOrCollapse;
+   keys['.'] = actionSetSortColumn;
+   keys['/'] = actionIncSearch;
+   keys['<'] = actionSetSortColumn;
+   keys['='] = actionExpandOrCollapse;
+   keys['>'] = actionSetSortColumn;
+   keys['?'] = actionHelp;
+   keys['C'] = actionSetup;
+   keys['F'] = Action_follow;
+   keys['H'] = actionToggleUserlandThreads;
+   keys['I'] = actionInvertSortOrder;
+   keys['K'] = actionToggleKernelThreads;
+   keys['M'] = actionSortByMemory;
+   keys['N'] = actionSortByPID;
+   keys['O'] = actionToggleRunningInContainer;
+   keys['P'] = actionSortByCPU;
+   keys['S'] = actionSetup;
+   keys['T'] = actionSortByTime;
+   keys['U'] = actionUntagAll;
+#ifdef SCHEDULER_SUPPORT
+   keys['Y'] = actionSetSchedPolicy;
+#endif
+   keys['Z'] = actionTogglePauseUpdate;
+   keys['['] = actionLowerPriority;
+   keys['\014'] = actionRedraw; // Ctrl+L
+   keys['\177'] = actionCollapseIntoParent;
+   keys['\\'] = actionIncFilter;
+   keys[']'] = actionHigherPriority;
+   keys['a'] = actionSetAffinity;
+   keys['c'] = actionTagAllChildren;
+   keys['e'] = actionShowEnvScreen;
+   keys['h'] = actionHelp;
+   keys['k'] = actionKill;
+   keys['l'] = actionLsof;
+   keys['m'] = actionToggleMergedCommand;
+   keys['p'] = actionToggleProgramPath;
+   keys['q'] = actionQuit;
+   keys['s'] = actionStrace;
+   keys['t'] = actionToggleTreeView;
+   keys['u'] = actionFilterByUser;
+   keys['w'] = actionShowCommandScreen;
+   keys['x'] = actionShowLocks;
+   keys[KEY_F(1)] = actionHelp;
+   keys[KEY_F(2)] = actionSetup;
+   keys[KEY_F(3)] = actionIncSearch;
+   keys[KEY_F(4)] = actionIncFilter;
+   keys[KEY_F(5)] = actionToggleTreeView;
+   keys[KEY_F(6)] = actionSetSortColumn;
+   keys[KEY_F(7)] = actionHigherPriority;
+   keys[KEY_F(8)] = actionLowerPriority;
+   keys[KEY_F(9)] = actionKill;
+   keys[KEY_F(10)] = actionQuit;
+   keys[KEY_F(18)] = actionExpandCollapseOrSortColumn;
+   keys[KEY_RECLICK] = actionExpandOrCollapse;
+   keys[KEY_SHIFT_TAB] = actionPrevScreen;
+   keys['\t'] = actionNextScreen;
+}
diff --git a/Action.h b/Action.h
new file mode 100644
index 0000000..caade03
--- /dev/null
+++ b/Action.h
@@ -0,0 +1,63 @@
+#ifndef HEADER_Action
+#define HEADER_Action
+/*
+htop - Action.h
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Header.h"
+#include "Machine.h"
+#include "Object.h"
+#include "Panel.h"
+#include "Process.h"
+#include "Settings.h"
+
+
+typedef enum {
+   HTOP_OK              = 0x00,
+   HTOP_REFRESH         = 0x01,
+   HTOP_RECALCULATE     = 0x02 | HTOP_REFRESH,
+   HTOP_SAVE_SETTINGS   = 0x04,
+   HTOP_KEEP_FOLLOWING  = 0x08,
+   HTOP_QUIT            = 0x10,
+   HTOP_REDRAW_BAR      = 0x20,
+   HTOP_UPDATE_PANELHDR = 0x40 | HTOP_REFRESH,
+   HTOP_RESIZE          = 0x80 | HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR,
+} Htop_Reaction;
+
+struct MainPanel_; // IWYU pragma: keep
+
+typedef struct State_ {
+   Machine* host;
+   struct MainPanel_* mainPanel;
+   Header* header;
+   bool pauseUpdate;
+   bool hideSelection;
+   bool hideMeters;
+} State;
+
+static inline bool State_hideFunctionBar(const State* st) {
+   const Settings* settings = st->host->settings;
+   return settings->hideFunctionBar == 2 || (settings->hideFunctionBar == 1 && st->hideSelection);
+}
+
+typedef Htop_Reaction (*Htop_Action)(State* st);
+
+Object* Action_pickFromVector(State* st, Panel* list, int x, bool follow);
+
+bool Action_setUserOnly(const char* userName, uid_t* userId);
+
+Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey);
+
+Htop_Reaction Action_setScreenTab(State* st, int x);
+
+Htop_Reaction Action_follow(State* st);
+
+void Action_setBindings(Htop_Action* keys);
+
+#endif
diff --git a/Affinity.c b/Affinity.c
new file mode 100644
index 0000000..fab239e
--- /dev/null
+++ b/Affinity.c
@@ -0,0 +1,132 @@
+/*
+htop - Affinity.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Affinity.h"
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include "Process.h"
+#include "XUtils.h"
+
+#if defined(HAVE_LIBHWLOC)
+#include <hwloc.h>
+#include <hwloc/bitmap.h>
+#ifdef __linux__
+#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_THREAD
+#else
+#define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_PROCESS
+#endif
+#elif defined(HAVE_AFFINITY)
+#include <sched.h>
+#endif
+
+
+Affinity* Affinity_new(Machine* host) {
+   Affinity* this = xCalloc(1, sizeof(Affinity));
+   this->size = 8;
+   this->cpus = xCalloc(this->size, sizeof(unsigned int));
+   this->host = host;
+   return this;
+}
+
+void Affinity_delete(Affinity* this) {
+   free(this->cpus);
+   free(this);
+}
+
+void Affinity_add(Affinity* this, unsigned int id) {
+   if (this->used == this->size) {
+      this->size *= 2;
+      this->cpus = xRealloc(this->cpus, sizeof(unsigned int) * this->size);
+   }
+   this->cpus[this->used] = id;
+   this->used++;
+}
+
+#if defined(HAVE_LIBHWLOC)
+
+static Affinity* Affinity_get(const Process* p, Machine* host) {
+   hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
+   bool ok = (hwloc_get_proc_cpubind(host->topology, Process_getPid(p), cpuset, HTOP_HWLOC_CPUBIND_FLAG) == 0);
+   Affinity* affinity = NULL;
+   if (ok) {
+      affinity = Affinity_new(host);
+      if (hwloc_bitmap_last(cpuset) == -1) {
+         for (unsigned int i = 0; i < host->existingCPUs; i++) {
+            Affinity_add(affinity, i);
+         }
+      } else {
+         int id;
+         hwloc_bitmap_foreach_begin(id, cpuset)
+            Affinity_add(affinity, (unsigned)id);
+         hwloc_bitmap_foreach_end();
+      }
+   }
+   hwloc_bitmap_free(cpuset);
+   return affinity;
+}
+
+static bool Affinity_set(Process* p, Arg arg) {
+   Affinity* this = arg.v;
+   hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
+   for (unsigned int i = 0; i < this->used; i++) {
+      hwloc_bitmap_set(cpuset, this->cpus[i]);
+   }
+   bool ok = (hwloc_set_proc_cpubind(this->host->topology, Process_getPid(p), cpuset, HTOP_HWLOC_CPUBIND_FLAG) == 0);
+   hwloc_bitmap_free(cpuset);
+   return ok;
+}
+
+#elif defined(HAVE_AFFINITY)
+
+static Affinity* Affinity_get(const Process* p, Machine* host) {
+   cpu_set_t cpuset;
+   bool ok = (sched_getaffinity(Process_getPid(p), sizeof(cpu_set_t), &cpuset) == 0);
+   if (!ok)
+      return NULL;
+
+   Affinity* affinity = Affinity_new(host);
+   for (unsigned int i = 0; i < host->existingCPUs; i++) {
+      if (CPU_ISSET(i, &cpuset)) {
+         Affinity_add(affinity, i);
+      }
+   }
+   return affinity;
+}
+
+static bool Affinity_set(Process* p, Arg arg) {
+   Affinity* this = arg.v;
+   cpu_set_t cpuset;
+   CPU_ZERO(&cpuset);
+   for (unsigned int i = 0; i < this->used; i++) {
+      CPU_SET(this->cpus[i], &cpuset);
+   }
+   bool ok = (sched_setaffinity(Process_getPid(p), sizeof(unsigned long), &cpuset) == 0);
+   return ok;
+}
+
+#endif
+
+#if defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY)
+
+bool Affinity_rowSet(Row* row, Arg arg) {
+   Process* p = (Process*) row;
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+   return Affinity_set(p, arg);
+}
+
+Affinity* Affinity_rowGet(const Row* row, Machine* host) {
+   const Process* p = (const Process*) row;
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+   return Affinity_get(p, host);
+}
+
+#endif /* HAVE_LIBHWLOC || HAVE_AFFINITY */
diff --git a/Affinity.h b/Affinity.h
new file mode 100644
index 0000000..c218906
--- /dev/null
+++ b/Affinity.h
@@ -0,0 +1,47 @@
+#ifndef HEADER_Affinity
+#define HEADER_Affinity
+/*
+htop - Affinity.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020,2023 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Machine.h"
+
+#if defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY)
+#include <stdbool.h>
+
+#include "Object.h"
+#include "Row.h"
+#endif
+
+
+#if defined(HAVE_LIBHWLOC) && defined(HAVE_AFFINITY)
+#error hwloc and affinity support are mutual exclusive.
+#endif
+
+
+typedef struct Affinity_ {
+   Machine* host;
+   unsigned int size;
+   unsigned int used;
+   unsigned int* cpus;
+} Affinity;
+
+Affinity* Affinity_new(Machine* host);
+
+void Affinity_delete(Affinity* this);
+
+void Affinity_add(Affinity* this, unsigned int id);
+
+#if defined(HAVE_LIBHWLOC) || defined(HAVE_AFFINITY)
+
+Affinity* Affinity_rowGet(const Row* row, Machine* host);
+
+bool Affinity_rowSet(Row* row, Arg arg);
+
+#endif /* HAVE_LIBHWLOC || HAVE_AFFINITY */
+
+#endif
diff --git a/AffinityPanel.c b/AffinityPanel.c
new file mode 100644
index 0000000..f400908
--- /dev/null
+++ b/AffinityPanel.c
@@ -0,0 +1,442 @@
+/*
+htop - AffinityPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "AffinityPanel.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+#ifdef HAVE_LIBHWLOC
+#include <hwloc.h>
+#include <hwloc/bitmap.h>
+#endif
+
+
+typedef struct MaskItem_ {
+   Object super;
+   char* text;
+   char* indent; /* used also as an condition whether this is a tree node */
+   int value; /* tri-state: 0 - off, 1 - some set, 2 - all set */
+   int sub_tree; /* tri-state: 0 - no sub-tree, 1 - open sub-tree, 2 - closed sub-tree */
+   Vector* children;
+   #ifdef HAVE_LIBHWLOC
+   bool ownCpuset;
+   hwloc_bitmap_t cpuset;
+   #else
+   int cpu;
+   #endif
+} MaskItem;
+
+static void MaskItem_delete(Object* cast) {
+   MaskItem* this = (MaskItem*) cast;
+   free(this->text);
+   free(this->indent);
+   Vector_delete(this->children);
+   #ifdef HAVE_LIBHWLOC
+   if (this->ownCpuset)
+      hwloc_bitmap_free(this->cpuset);
+   #endif
+   free(this);
+}
+
+static void MaskItem_display(const Object* cast, RichString* out) {
+   const MaskItem* this = (const MaskItem*)cast;
+   assert (this != NULL);
+   RichString_appendAscii(out, CRT_colors[CHECK_BOX], "[");
+   if (this->value == 2) {
+      RichString_appendAscii(out, CRT_colors[CHECK_MARK], "x");
+   } else if (this->value == 1) {
+      RichString_appendAscii(out, CRT_colors[CHECK_MARK], "o");
+   } else {
+      RichString_appendAscii(out, CRT_colors[CHECK_MARK], " ");
+   }
+   RichString_appendAscii(out, CRT_colors[CHECK_BOX], "]");
+   RichString_appendAscii(out, CRT_colors[CHECK_TEXT], " ");
+   if (this->indent) {
+      RichString_appendWide(out, CRT_colors[PROCESS_TREE], this->indent);
+      RichString_appendWide(out, CRT_colors[PROCESS_TREE],
+                            this->sub_tree == 2
+                            ? CRT_treeStr[TREE_STR_OPEN]
+                            : CRT_treeStr[TREE_STR_SHUT]);
+      RichString_appendAscii(out, CRT_colors[CHECK_TEXT], " ");
+   }
+   RichString_appendWide(out, CRT_colors[CHECK_TEXT], this->text);
+}
+
+static const ObjectClass MaskItem_class = {
+   .display = MaskItem_display,
+   .delete  = MaskItem_delete
+};
+
+#ifdef HAVE_LIBHWLOC
+
+static MaskItem* MaskItem_newMask(const char* text, const char* indent, hwloc_bitmap_t cpuset, bool owner) {
+   MaskItem* this = AllocThis(MaskItem);
+   this->text = xStrdup(text);
+   this->indent = xStrdup(indent); /* nonnull for tree node */
+   this->value = 0;
+   this->ownCpuset = owner;
+   this->cpuset = cpuset;
+   this->sub_tree = hwloc_bitmap_weight(cpuset) > 1 ? 1 : 0;
+   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+   return this;
+}
+
+#endif
+
+static MaskItem* MaskItem_newSingleton(const char* text, int cpu, bool isSet) {
+   MaskItem* this = AllocThis(MaskItem);
+   this->text = xStrdup(text);
+   this->indent = NULL; /* not a tree node */
+   this->sub_tree = 0;
+   this->children = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+
+   #ifdef HAVE_LIBHWLOC
+   this->ownCpuset = true;
+   this->cpuset = hwloc_bitmap_alloc();
+   hwloc_bitmap_set(this->cpuset, cpu);
+   #else
+   this->cpu = cpu;
+   #endif
+   this->value = isSet ? 2 : 0;
+
+   return this;
+}
+
+typedef struct AffinityPanel_ {
+   Panel super;
+   Machine* host;
+   bool topoView;
+   Vector* cpuids;
+   unsigned width;
+
+   #ifdef HAVE_LIBHWLOC
+   MaskItem* topoRoot;
+   hwloc_const_cpuset_t allCpuset;
+   hwloc_bitmap_t workCpuset;
+   #endif
+} AffinityPanel;
+
+static void AffinityPanel_delete(Object* cast) {
+   AffinityPanel* this = (AffinityPanel*) cast;
+   Panel* super = (Panel*) this;
+   Panel_done(super);
+   Vector_delete(this->cpuids);
+   #ifdef HAVE_LIBHWLOC
+   hwloc_bitmap_free(this->workCpuset);
+   MaskItem_delete((Object*) this->topoRoot);
+   #endif
+   free(this);
+}
+
+#ifdef HAVE_LIBHWLOC
+
+static void AffinityPanel_updateItem(AffinityPanel* this, MaskItem* item) {
+   Panel* super = (Panel*) this;
+
+   item->value = hwloc_bitmap_isincluded(item->cpuset, this->workCpuset) ? 2 :
+                 hwloc_bitmap_intersects(item->cpuset, this->workCpuset) ? 1 : 0;
+
+   Panel_add(super, (Object*) item);
+}
+
+static void AffinityPanel_updateTopo(AffinityPanel* this, MaskItem* item) {
+   AffinityPanel_updateItem(this, item);
+
+   if (item->sub_tree == 2)
+      return;
+
+   for (int i = 0; i < Vector_size(item->children); i++)
+      AffinityPanel_updateTopo(this, (MaskItem*) Vector_get(item->children, i));
+}
+
+#endif
+
+static void AffinityPanel_update(AffinityPanel* this, bool keepSelected) {
+   Panel* super = (Panel*) this;
+
+   FunctionBar_setLabel(super->currentBar, KEY_F(3), this->topoView ? "Collapse/Expand" : "");
+
+   int oldSelected = Panel_getSelectedIndex(super);
+   Panel_prune(super);
+
+   #ifdef HAVE_LIBHWLOC
+   if (this->topoView) {
+      AffinityPanel_updateTopo(this, this->topoRoot);
+   } else {
+      for (int i = 0; i < Vector_size(this->cpuids); i++) {
+         AffinityPanel_updateItem(this, (MaskItem*) Vector_get(this->cpuids, i));
+      }
+   }
+   #else
+   Panel_splice(super, this->cpuids);
+   #endif
+
+   if (keepSelected)
+      Panel_setSelected(super, oldSelected);
+
+   super->needsRedraw = true;
+}
+
+static HandlerResult AffinityPanel_eventHandler(Panel* super, int ch) {
+   AffinityPanel* this = (AffinityPanel*) super;
+   HandlerResult result = IGNORED;
+   MaskItem* selected = (MaskItem*) Panel_getSelected(super);
+   bool keepSelected = true;
+
+   switch (ch) {
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+      case ' ':
+         #ifdef HAVE_LIBHWLOC
+         if (selected->value == 2) {
+            /* Item was selected, so remove this mask from the top cpuset. */
+            hwloc_bitmap_andnot(this->workCpuset, this->workCpuset, selected->cpuset);
+            selected->value = 0;
+         } else {
+            /* Item was not or only partial selected, so set all bits from this object
+               in the top cpuset. */
+            hwloc_bitmap_or(this->workCpuset, this->workCpuset, selected->cpuset);
+            selected->value = 2;
+         }
+         #else
+         selected->value = selected->value ? 0 : 2; /* toggle between 0 and 2 */
+         #endif
+
+         result = HANDLED;
+         break;
+
+#ifdef HAVE_LIBHWLOC
+
+      case KEY_F(1):
+         hwloc_bitmap_copy(this->workCpuset, this->allCpuset);
+         result = HANDLED;
+         break;
+
+      case KEY_F(2):
+         this->topoView = !this->topoView;
+         keepSelected = false;
+
+         result = HANDLED;
+         break;
+
+      case KEY_F(3):
+      case '-':
+      case '+':
+         if (selected->sub_tree)
+            selected->sub_tree = 1 + !(selected->sub_tree - 1); /* toggle between 1 and 2 */
+
+         result = HANDLED;
+         break;
+
+#endif
+
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+         result = BREAK_LOOP;
+         break;
+   }
+
+   if (HANDLED == result)
+      AffinityPanel_update(this, keepSelected);
+
+   return result;
+}
+
+#ifdef HAVE_LIBHWLOC
+
+static MaskItem* AffinityPanel_addObject(AffinityPanel* this, hwloc_obj_t obj, unsigned indent, MaskItem* parent) {
+   const char* type_name = hwloc_obj_type_string(obj->type);
+   const char* index_prefix = "#";
+   unsigned depth = obj->depth;
+   unsigned index = obj->logical_index;
+   size_t off = 0, left = 10 * depth;
+   char buf[64], indent_buf[left + 1];
+
+   if (obj->type == HWLOC_OBJ_PU) {
+      index = Settings_cpuId(this->host->settings, obj->os_index);
+      type_name = "CPU";
+      index_prefix = "";
+   }
+
+   indent_buf[0] = '\0';
+   if (depth > 0) {
+      for (unsigned i = 1; i < depth; i++) {
+         xSnprintf(&indent_buf[off], left, "%s  ", (indent & (1U << i)) ? CRT_treeStr[TREE_STR_VERT] : " ");
+         size_t len = strlen(&indent_buf[off]);
+         off += len;
+         left -= len;
+      }
+      xSnprintf(&indent_buf[off], left, "%s",
+                obj->next_sibling ? CRT_treeStr[TREE_STR_RTEE] : CRT_treeStr[TREE_STR_BEND]);
+      // Uncomment when further appending to indent_buf
+      //size_t len = strlen(&indent_buf[off]);
+      //off += len;
+      //left -= len;
+   }
+
+   xSnprintf(buf, sizeof(buf), "%s %s%u", type_name, index_prefix, index);
+
+   MaskItem* item = MaskItem_newMask(buf, indent_buf, obj->complete_cpuset, false);
+   if (parent)
+      Vector_add(parent->children, item);
+
+   if (item->sub_tree && parent && parent->sub_tree == 1) {
+      /* if obj is fully included or fully excluded, collapse the item */
+      hwloc_bitmap_t result = hwloc_bitmap_alloc();
+      hwloc_bitmap_and(result, obj->complete_cpuset, this->workCpuset);
+      int weight = hwloc_bitmap_weight(result);
+      hwloc_bitmap_free(result);
+      if (weight == 0 || weight == (hwloc_bitmap_weight(this->workCpuset) + hwloc_bitmap_weight(obj->complete_cpuset))) {
+         item->sub_tree = 2;
+      }
+   }
+
+   /* "[x] " + "|- " * depth + ("- ")?(if root node) + name */
+   unsigned width = 4 + 3 * depth + (2 * !depth) + strlen(buf);
+   if (width > this->width) {
+      this->width = width;
+   }
+
+   return item;
+}
+
+static MaskItem* AffinityPanel_buildTopology(AffinityPanel* this, hwloc_obj_t obj, unsigned indent, MaskItem* parent) {
+   MaskItem* item = AffinityPanel_addObject(this, obj, indent, parent);
+   if (obj->next_sibling) {
+      indent |= (1U << obj->depth);
+   } else {
+      indent &= ~(1U << obj->depth);
+   }
+
+   for (unsigned i = 0; i < obj->arity; i++) {
+      AffinityPanel_buildTopology(this, obj->children[i], indent, item);
+   }
+
+   return parent == NULL ? item : NULL;
+}
+
+#endif
+
+const PanelClass AffinityPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = AffinityPanel_delete
+   },
+   .eventHandler = AffinityPanel_eventHandler
+};
+
+static const char* const AffinityPanelFunctions[] = {
+   "Set    ",
+   "Cancel ",
+   #ifdef HAVE_LIBHWLOC
+   "All",
+   "Topology",
+   "               ",
+   #endif
+   NULL
+};
+static const char* const AffinityPanelKeys[] = {"Enter", "Esc", "F1", "F2", "F3"};
+static const int AffinityPanelEvents[] = {13, 27, KEY_F(1), KEY_F(2), KEY_F(3)};
+
+Panel* AffinityPanel_new(Machine* host, const Affinity* affinity, int* width) {
+   AffinityPanel* this = AllocThis(AffinityPanel);
+   Panel* super = (Panel*) this;
+   Panel_init(super, 1, 1, 1, 1, Class(MaskItem), false, FunctionBar_new(AffinityPanelFunctions, AffinityPanelKeys, AffinityPanelEvents));
+
+   this->host = host;
+   /* defaults to 15, this also includes the gap between the panels,
+    * but this will be added by the caller */
+   this->width = 14;
+
+   this->cpuids   = Vector_new(Class(MaskItem), true, DEFAULT_SIZE);
+
+   #ifdef HAVE_LIBHWLOC
+   this->topoView = host->settings->topologyAffinity;
+   #else
+   this->topoView = false;
+   #endif
+
+   #ifdef HAVE_LIBHWLOC
+   this->allCpuset  = hwloc_topology_get_complete_cpuset(host->topology);
+   this->workCpuset = hwloc_bitmap_alloc();
+   #endif
+
+   Panel_setHeader(super, "Use CPUs:");
+
+   unsigned int curCpu = 0;
+   for (unsigned int i = 0; i < host->existingCPUs; i++) {
+      if (!Machine_isCPUonline(host, i))
+         continue;
+
+      char number[16];
+      xSnprintf(number, 9, "CPU %d", Settings_cpuId(host->settings, i));
+      unsigned cpu_width = 4 + strlen(number);
+      if (cpu_width > this->width) {
+         this->width = cpu_width;
+      }
+
+      bool isSet = false;
+      if (curCpu < affinity->used && affinity->cpus[curCpu] == i) {
+         #ifdef HAVE_LIBHWLOC
+         hwloc_bitmap_set(this->workCpuset, i);
+         #endif
+         isSet = true;
+         curCpu++;
+      }
+
+      MaskItem* cpuItem = MaskItem_newSingleton(number, i, isSet);
+      Vector_add(this->cpuids, (Object*) cpuItem);
+   }
+
+   #ifdef HAVE_LIBHWLOC
+   this->topoRoot = AffinityPanel_buildTopology(this, hwloc_get_root_obj(host->topology), 0, NULL);
+   #endif
+
+   if (width) {
+      *width = this->width;
+   }
+
+   AffinityPanel_update(this, false);
+
+   return super;
+}
+
+Affinity* AffinityPanel_getAffinity(Panel* super, Machine* host) {
+   const AffinityPanel* this = (AffinityPanel*) super;
+   Affinity* affinity = Affinity_new(host);
+
+   #ifdef HAVE_LIBHWLOC
+   int i;
+   hwloc_bitmap_foreach_begin(i, this->workCpuset)
+      Affinity_add(affinity, (unsigned)i);
+   hwloc_bitmap_foreach_end();
+   #else
+   for (int i = 0; i < Vector_size(this->cpuids); i++) {
+      const MaskItem* item = (const MaskItem*)Vector_get(this->cpuids, i);
+      if (item->value) {
+         Affinity_add(affinity, item->cpu);
+      }
+   }
+   #endif
+
+   return affinity;
+}
diff --git a/AffinityPanel.h b/AffinityPanel.h
new file mode 100644
index 0000000..f5b97b9
--- /dev/null
+++ b/AffinityPanel.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_AffinityPanel
+#define HEADER_AffinityPanel
+/*
+htop - AffinityPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Affinity.h"
+#include "Machine.h"
+#include "Panel.h"
+
+
+extern const PanelClass AffinityPanel_class;
+
+Panel* AffinityPanel_new(Machine* host, const Affinity* affinity, int* width);
+
+Affinity* AffinityPanel_getAffinity(Panel* super, Machine* host);
+
+#endif
diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
new file mode 100644
index 0000000..545ef7d
--- /dev/null
+++ b/AvailableColumnsPanel.c
@@ -0,0 +1,142 @@
+/*
+htop - AvailableColumnsPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "AvailableColumnsPanel.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "ColumnsPanel.h"
+#include "DynamicColumn.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "Platform.h"
+#include "Process.h"
+#include "ProvideCurses.h"
+#include "RowField.h"
+#include "XUtils.h"
+
+
+static const char* const AvailableColumnsFunctions[] = {"      ", "      ", "      ", "      ", "Add   ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static void AvailableColumnsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   AvailableColumnsPanel* this = (AvailableColumnsPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static void AvailableColumnsPanel_insert(AvailableColumnsPanel* this, int at, int key) {
+   const char* name;
+   if (key >= ROW_DYNAMIC_FIELDS)
+      name = DynamicColumn_name(key);
+   else
+      name = Process_fields[key].name;
+   Panel_insert(this->columns, at, (Object*) ListItem_new(name, key));
+}
+
+static HandlerResult AvailableColumnsPanel_eventHandler(Panel* super, int ch) {
+   AvailableColumnsPanel* this = (AvailableColumnsPanel*) super;
+   HandlerResult result = IGNORED;
+
+   switch (ch) {
+      case 13:
+      case KEY_ENTER:
+      case KEY_F(5): {
+         const ListItem* selected = (ListItem*) Panel_getSelected(super);
+         if (!selected)
+            break;
+
+         int at = Panel_getSelectedIndex(this->columns);
+         AvailableColumnsPanel_insert(this, at, selected->key);
+         Panel_setSelected(this->columns, at + 1);
+         ColumnsPanel_update(this->columns);
+         result = HANDLED;
+         break;
+      }
+      default:
+         if (0 < ch && ch < 255 && isgraph((unsigned char)ch))
+            result = Panel_selectByTyping(super, ch);
+         break;
+   }
+   return result;
+}
+
+const PanelClass AvailableColumnsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = AvailableColumnsPanel_delete
+   },
+   .eventHandler = AvailableColumnsPanel_eventHandler
+};
+
+static void AvailableColumnsPanel_addDynamicColumn(ht_key_t key, void* value, void* data) {
+   const DynamicColumn* column = (const DynamicColumn*) value;
+   if (column->table) /* DynamicScreen, handled differently */
+      return;
+   AvailableColumnsPanel* this = (AvailableColumnsPanel*) data;
+   const char* title = column->heading ? column->heading : column->name;
+   const char* text = column->description ? column->description : column->caption;
+   char description[256];
+   if (text)
+      xSnprintf(description, sizeof(description), "%s - %s", title, text);
+   else
+      xSnprintf(description, sizeof(description), "%s", title);
+   Panel_add(&this->super, (Object*) ListItem_new(description, key));
+}
+
+// Handle DynamicColumns entries in the AvailableColumnsPanel
+static void AvailableColumnsPanel_addDynamicColumns(AvailableColumnsPanel* this, Hashtable* dynamicColumns) {
+   assert(dynamicColumns);
+   Hashtable_foreach(dynamicColumns, AvailableColumnsPanel_addDynamicColumn, this);
+}
+
+// Handle remaining Platform Meter entries in the AvailableColumnsPanel
+static void AvailableColumnsPanel_addPlatformColumns(AvailableColumnsPanel* this) {
+   for (int i = 1; i < LAST_PROCESSFIELD; i++) {
+      if (i != COMM && Process_fields[i].description) {
+         char description[256];
+         xSnprintf(description, sizeof(description), "%s - %s", Process_fields[i].name, Process_fields[i].description);
+         Panel_add(&this->super, (Object*) ListItem_new(description, i));
+      }
+   }
+}
+
+// Handle DynamicColumns entries associated with DynamicScreens
+static void AvailableColumnsPanel_addDynamicScreens(AvailableColumnsPanel* this, const char* screen) {
+   Platform_addDynamicScreenAvailableColumns(&this->super, screen);
+}
+
+void AvailableColumnsPanel_fill(AvailableColumnsPanel* this, const char* dynamicScreen, Hashtable* dynamicColumns) {
+   Panel* super = (Panel*) this;
+   Panel_prune(super);
+   if (dynamicScreen) {
+      AvailableColumnsPanel_addDynamicScreens(this, dynamicScreen);
+   } else {
+      AvailableColumnsPanel_addPlatformColumns(this);
+      AvailableColumnsPanel_addDynamicColumns(this, dynamicColumns);
+   }
+}
+
+AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns, Hashtable* dynamicColumns) {
+   AvailableColumnsPanel* this = AllocThis(AvailableColumnsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(AvailableColumnsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+   Panel_setHeader(super, "Available Columns");
+
+   this->columns = columns;
+   AvailableColumnsPanel_fill(this, NULL, dynamicColumns);
+
+   return this;
+}
diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h
new file mode 100644
index 0000000..0d8709f
--- /dev/null
+++ b/AvailableColumnsPanel.h
@@ -0,0 +1,25 @@
+#ifndef HEADER_AvailableColumnsPanel
+#define HEADER_AvailableColumnsPanel
+/*
+htop - AvailableColumnsPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Hashtable.h"
+#include "Panel.h"
+
+
+typedef struct AvailableColumnsPanel_ {
+   Panel super;
+   Panel* columns;
+} AvailableColumnsPanel;
+
+extern const PanelClass AvailableColumnsPanel_class;
+
+AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns, Hashtable* dynamicColumns);
+
+void AvailableColumnsPanel_fill(AvailableColumnsPanel* this, const char* dynamicScreen, Hashtable* dynamicColumns);
+
+#endif
diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c
new file mode 100644
index 0000000..9a1d367
--- /dev/null
+++ b/AvailableMetersPanel.c
@@ -0,0 +1,174 @@
+/*
+htop - AvailableMetersPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "AvailableMetersPanel.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "CPUMeter.h"
+#include "DynamicMeter.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "Header.h"
+#include "ListItem.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "MetersPanel.h"
+#include "Object.h"
+#include "Platform.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static void AvailableMetersPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   AvailableMetersPanel* this = (AvailableMetersPanel*) object;
+   Panel_done(super);
+   free(this->meterPanels);
+   free(this);
+}
+
+static inline void AvailableMetersPanel_addMeter(Header* header, MetersPanel* panel, const MeterClass* type, unsigned int param, size_t column) {
+   const Meter* meter = Header_addMeterByClass(header, type, param, column);
+   Panel_add((Panel*)panel, (Object*) Meter_toListItem(meter, false));
+   Panel_setSelected((Panel*)panel, Panel_size((Panel*)panel) - 1);
+   MetersPanel_setMoving(panel, true);
+}
+
+static HandlerResult AvailableMetersPanel_eventHandler(Panel* super, int ch) {
+   AvailableMetersPanel* this = (AvailableMetersPanel*) super;
+   Header* header = this->header;
+
+   const ListItem* selected = (ListItem*) Panel_getSelected(super);
+   if (!selected)
+      return IGNORED;
+
+   unsigned int param = selected->key & 0xffff;
+   int type = selected->key >> 16;
+   HandlerResult result = IGNORED;
+   bool update = false;
+
+   switch (ch) {
+      case KEY_F(5):
+      case 'l':
+      case 'L':
+         AvailableMetersPanel_addMeter(header, this->meterPanels[0], Platform_meterTypes[type], param, 0);
+         result = HANDLED;
+         update = true;
+         break;
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+      case KEY_F(6):
+      case 'r':
+      case 'R':
+         AvailableMetersPanel_addMeter(header, this->meterPanels[this->columns - 1], Platform_meterTypes[type], param, this->columns - 1);
+         result = (KEY_LEFT << 16) | SYNTH_KEY;
+         update = true;
+         break;
+   }
+
+   if (update) {
+      Settings* settings = this->host->settings;
+      settings->changed = true;
+      settings->lastUpdate++;
+      Header_calculateHeight(header);
+      Header_updateData(header);
+      Header_draw(header);
+      ScreenManager_resize(this->scr);
+   }
+
+   return result;
+}
+
+const PanelClass AvailableMetersPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = AvailableMetersPanel_delete
+   },
+   .eventHandler = AvailableMetersPanel_eventHandler
+};
+
+// Handle (&CPUMeter_class) entries in the AvailableMetersPanel
+static void AvailableMetersPanel_addCPUMeters(Panel* super, const MeterClass* type, const Machine* host) {
+   if (host->existingCPUs > 1) {
+      Panel_add(super, (Object*) ListItem_new("CPU average", 0));
+      for (unsigned int i = 1; i <= host->existingCPUs; i++) {
+         char buffer[50];
+         xSnprintf(buffer, sizeof(buffer), "%s %d", type->uiName, Settings_cpuId(host->settings, i - 1));
+         Panel_add(super, (Object*) ListItem_new(buffer, i));
+      }
+   } else {
+      Panel_add(super, (Object*) ListItem_new(type->uiName, 1));
+   }
+}
+
+typedef struct {
+   Panel* super;
+   unsigned int id;
+   unsigned int offset;
+} DynamicIterator;
+
+static void AvailableMetersPanel_addDynamicMeter(ATTR_UNUSED ht_key_t key, void* value, void* data) {
+   const DynamicMeter* meter = (const DynamicMeter*)value;
+   DynamicIterator* iter = (DynamicIterator*)data;
+   unsigned int identifier = (iter->offset << 16) | iter->id;
+   const char* label = meter->description ? meter->description : meter->caption;
+   if (!label)
+      label = meter->name; /* last fallback to name, guaranteed set */
+   Panel_add(iter->super, (Object*) ListItem_new(label, identifier));
+   iter->id++;
+}
+
+// Handle (&DynamicMeter_class) entries in the AvailableMetersPanel
+static void AvailableMetersPanel_addDynamicMeters(Panel* super, const Settings* settings, unsigned int offset) {
+   DynamicIterator iter = { .super = super, .id = 1, .offset = offset };
+   Hashtable* dynamicMeters = settings->dynamicColumns;
+   assert(dynamicMeters != NULL);
+   Hashtable_foreach(dynamicMeters, AvailableMetersPanel_addDynamicMeter, &iter);
+}
+
+// Handle remaining Platform Meter entries in the AvailableMetersPanel
+static void AvailableMetersPanel_addPlatformMeter(Panel* super, const MeterClass* type, unsigned int offset) {
+   const char* label = type->description ? type->description : type->uiName;
+   Panel_add(super, (Object*) ListItem_new(label, offset << 16));
+}
+
+AvailableMetersPanel* AvailableMetersPanel_new(Machine* host, Header* header, size_t columns, MetersPanel** meterPanels, ScreenManager* scr) {
+   AvailableMetersPanel* this = AllocThis(AvailableMetersPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_newEnterEsc("Add   ", "Done   ");
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->host = host;
+   this->header = header;
+   this->columns = columns;
+   this->meterPanels = meterPanels;
+   this->scr = scr;
+
+   Panel_setHeader(super, "Available meters");
+   // Platform_meterTypes[0] should be always (&CPUMeter_class) which we will
+   // handle separately in the code below.  Likewise, identifiers for Dynamic
+   // Meters are handled separately - similar to CPUs, this allows generation
+   // of multiple different Meters (also using 'param' to distinguish them).
+   for (unsigned int i = 1; Platform_meterTypes[i]; i++) {
+      const MeterClass* type = Platform_meterTypes[i];
+      assert(type != &CPUMeter_class);
+      if (type == &DynamicMeter_class)
+         AvailableMetersPanel_addDynamicMeters(super, host->settings, i);
+      else
+         AvailableMetersPanel_addPlatformMeter(super, type, i);
+   }
+   AvailableMetersPanel_addCPUMeters(super, &CPUMeter_class, host);
+
+   return this;
+}
diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h
new file mode 100644
index 0000000..fad1e6e
--- /dev/null
+++ b/AvailableMetersPanel.h
@@ -0,0 +1,32 @@
+#ifndef HEADER_AvailableMetersPanel
+#define HEADER_AvailableMetersPanel
+/*
+htop - AvailableMetersPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+
+#include "Header.h"
+#include "Machine.h"
+#include "MetersPanel.h"
+#include "Panel.h"
+#include "ScreenManager.h"
+
+
+typedef struct AvailableMetersPanel_ {
+   Panel super;
+   ScreenManager* scr;
+   Machine* host;
+   Header* header;
+   size_t columns;
+   MetersPanel** meterPanels;
+} AvailableMetersPanel;
+
+extern const PanelClass AvailableMetersPanel_class;
+
+AvailableMetersPanel* AvailableMetersPanel_new(Machine* host, Header* header, size_t columns, MetersPanel** meterPanels, ScreenManager* scr);
+
+#endif
diff --git a/BatteryMeter.c b/BatteryMeter.c
new file mode 100644
index 0000000..dad7754
--- /dev/null
+++ b/BatteryMeter.c
@@ -0,0 +1,71 @@
+/*
+htop - BatteryMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+
+This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "BatteryMeter.h"
+
+#include <math.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "XUtils.h"
+
+
+static const int BatteryMeter_attributes[] = {
+   BATTERY
+};
+
+static void BatteryMeter_updateValues(Meter* this) {
+   ACPresence isOnAC;
+   double percent;
+
+   Platform_getBattery(&percent, &isOnAC);
+
+   if (!isNonnegative(percent)) {
+      this->values[0] = NAN;
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "N/A");
+      return;
+   }
+
+   this->values[0] = percent;
+
+   const char* text;
+   switch (isOnAC) {
+      case AC_PRESENT:
+         text = this->mode == TEXT_METERMODE ? " (Running on A/C)" : "(A/C)";
+         break;
+      case AC_ABSENT:
+         text = this->mode == TEXT_METERMODE ? " (Running on battery)" : "(bat)";
+         break;
+      case AC_ERROR:
+      default:
+         text = "";
+         break;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.1f%%%s", percent, text);
+}
+
+const MeterClass BatteryMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = BatteryMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100.0,
+   .attributes = BatteryMeter_attributes,
+   .name = "Battery",
+   .uiName = "Battery",
+   .caption = "Battery: "
+};
diff --git a/BatteryMeter.h b/BatteryMeter.h
new file mode 100644
index 0000000..d0818b7
--- /dev/null
+++ b/BatteryMeter.h
@@ -0,0 +1,23 @@
+#ifndef HEADER_BatteryMeter
+#define HEADER_BatteryMeter
+/*
+htop - BatteryMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+
+This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
+*/
+
+#include "Meter.h"
+
+
+typedef enum ACPresence_ {
+   AC_ABSENT,
+   AC_PRESENT,
+   AC_ERROR
+} ACPresence;
+
+extern const MeterClass BatteryMeter_class;
+
+#endif
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..dd759c2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,45 @@
+Contributing Guide
+==================
+
+Thank you so much for taking the time to contribute in to htop!
+
+Bug Reports
+-----------
+
+Bug reports should be posted in the [Github issue
+tracker](https://github.com/htop-dev/htop/issues).
+Bug reports are extremely important since it's impossible for us to test
+htop in every possible system, distribution and scenario. Your feedback
+is what keeps the tool stable and always improving!  Thank you!
+
+Pull Requests
+-------------
+
+Code contributions are most welcome! Just [fork the
+repo](https://github.com/htop-dev/htop) and send a [pull
+request](https://github.com/htop-dev/htop/pulls).  Help is especially
+appreciated for support of platforms other than Linux.  If proposing new
+features, please be mindful that htop is a system tool that needs to keep a
+small footprint and perform well on systems under stress -- so unfortunately
+we can't accept every new feature proposed, as we need to keep the tool slim
+and maintainable.  Great ideas backed by a PR are always carefully considered
+for inclusion though!  Also, PRs containing bug fixes and portability tweaks
+are always included, please send those in!
+
+Feature Requests
+----------------
+
+Please label Github issues that are feature requests with one of the `feature request`
+labels. If you can't do this yourself, don't worry. The friendly folks from the
+core team will distribute and fixup Github labels as part of the regular reviews.
+
+Style Guide
+-----------
+
+To make working with the code easier a set of guidelines have evolved in
+the past that new contributions should try to follow. While they are not set
+in stone and always up for changes should the need arise they still provide
+a first orientation to go by when contributing to this repository.
+
+The details of the coding style as well as what to take care about with your
+contributions can be found in our [style guide](docs/styleguide.md).
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/CPUMeter.c b/CPUMeter.c
new file mode 100644
index 0000000..afcddeb
--- /dev/null
+++ b/CPUMeter.c
@@ -0,0 +1,625 @@
+/*
+htop - CPUMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CPUMeter.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static const int CPUMeter_attributes[] = {
+   CPU_NICE,
+   CPU_NORMAL,
+   CPU_SYSTEM,
+   CPU_IRQ,
+   CPU_SOFTIRQ,
+   CPU_STEAL,
+   CPU_GUEST,
+   CPU_IOWAIT
+};
+
+typedef struct CPUMeterData_ {
+   unsigned int cpus;
+   Meter** meters;
+} CPUMeterData;
+
+static void CPUMeter_init(Meter* this) {
+   unsigned int cpu = this->param;
+   const Machine* host = this->host;
+   if (cpu == 0) {
+      Meter_setCaption(this, "Avg");
+   } else if (host->activeCPUs > 1) {
+      char caption[10];
+      xSnprintf(caption, sizeof(caption), "%3u", Settings_cpuId(host->settings, cpu - 1));
+      Meter_setCaption(this, caption);
+   }
+}
+
+// Custom uiName runtime logic to include the param (processor)
+static void CPUMeter_getUiName(const Meter* this, char* buffer, size_t length) {
+   if (this->param > 0)
+      xSnprintf(buffer, length, "%s %u", Meter_uiName(this), this->param);
+   else
+      xSnprintf(buffer, length, "%s", Meter_uiName(this));
+}
+
+static void CPUMeter_updateValues(Meter* this) {
+   memset(this->values, 0, sizeof(double) * CPU_METER_ITEMCOUNT);
+
+   const Machine* host = this->host;
+   const Settings* settings = host->settings;
+
+   unsigned int cpu = this->param;
+   if (cpu > host->existingCPUs) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "absent");
+      return;
+   }
+
+   double percent = Platform_setCPUValues(this, cpu);
+   if (!isNonnegative(percent)) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "offline");
+      return;
+   }
+
+   char cpuUsageBuffer[8] = { 0 };
+   char cpuFrequencyBuffer[16] = { 0 };
+   char cpuTemperatureBuffer[16] = { 0 };
+
+   if (settings->showCPUUsage) {
+      xSnprintf(cpuUsageBuffer, sizeof(cpuUsageBuffer), "%.1f%%", percent);
+   }
+
+   if (settings->showCPUFrequency) {
+      double cpuFrequency = this->values[CPU_METER_FREQUENCY];
+      if (isNonnegative(cpuFrequency)) {
+         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%4uMHz", (unsigned)cpuFrequency);
+      } else {
+         xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A");
+      }
+   }
+
+   #ifdef BUILD_WITH_CPU_TEMP
+   if (settings->showCPUTemperature) {
+      double cpuTemperature = this->values[CPU_METER_TEMPERATURE];
+      if (isNaN(cpuTemperature))
+         xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "N/A");
+      else if (settings->degreeFahrenheit)
+         xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "%3d%sF", (int)(cpuTemperature * 9 / 5 + 32), CRT_degreeSign);
+      else
+         xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "%d%sC", (int)cpuTemperature, CRT_degreeSign);
+   }
+   #endif
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s%s%s%s%s",
+             cpuUsageBuffer,
+             (cpuUsageBuffer[0] && (cpuFrequencyBuffer[0] || cpuTemperatureBuffer[0])) ? " " : "",
+             cpuFrequencyBuffer,
+             (cpuFrequencyBuffer[0] && cpuTemperatureBuffer[0]) ? " " : "",
+             cpuTemperatureBuffer);
+}
+
+static void CPUMeter_display(const Object* cast, RichString* out) {
+   char buffer[50];
+   int len;
+   const Meter* this = (const Meter*)cast;
+   const Machine* host = this->host;
+   const Settings* settings = host->settings;
+
+   if (this->param > host->existingCPUs) {
+      RichString_appendAscii(out, CRT_colors[METER_SHADOW], " absent");
+      return;
+   }
+
+   if (this->curItems == 0) {
+      RichString_appendAscii(out, CRT_colors[METER_SHADOW], " offline");
+      return;
+   }
+
+   len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NORMAL]);
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], ":");
+   RichString_appendnAscii(out, CRT_colors[CPU_NORMAL], buffer, len);
+   if (settings->detailedCPUTime) {
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "sy:");
+      RichString_appendnAscii(out, CRT_colors[CPU_SYSTEM], buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "ni:");
+      RichString_appendnAscii(out, CRT_colors[CPU_NICE_TEXT], buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_IRQ]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "hi:");
+      RichString_appendnAscii(out, CRT_colors[CPU_IRQ], buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_SOFTIRQ]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "si:");
+      RichString_appendnAscii(out, CRT_colors[CPU_SOFTIRQ], buffer, len);
+      if (isNonnegative(this->values[CPU_METER_STEAL])) {
+         len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_STEAL]);
+         RichString_appendAscii(out, CRT_colors[METER_TEXT], "st:");
+         RichString_appendnAscii(out, CRT_colors[CPU_STEAL], buffer, len);
+      }
+      if (isNonnegative(this->values[CPU_METER_GUEST])) {
+         len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_GUEST]);
+         RichString_appendAscii(out, CRT_colors[METER_TEXT], "gu:");
+         RichString_appendnAscii(out, CRT_colors[CPU_GUEST], buffer, len);
+      }
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_IOWAIT]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "wa:");
+      RichString_appendnAscii(out, CRT_colors[CPU_IOWAIT], buffer, len);
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_KERNEL]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "sys:");
+      RichString_appendnAscii(out, CRT_colors[CPU_SYSTEM], buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_NICE]);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "low:");
+      RichString_appendnAscii(out, CRT_colors[CPU_NICE_TEXT], buffer, len);
+      if (isNonnegative(this->values[CPU_METER_IRQ])) {
+         len = xSnprintf(buffer, sizeof(buffer), "%5.1f%% ", this->values[CPU_METER_IRQ]);
+         RichString_appendAscii(out, CRT_colors[METER_TEXT], "vir:");
+         RichString_appendnAscii(out, CRT_colors[CPU_GUEST], buffer, len);
+      }
+   }
+
+   if (settings->showCPUFrequency) {
+      char cpuFrequencyBuffer[10];
+      double cpuFrequency = this->values[CPU_METER_FREQUENCY];
+      if (isNonnegative(cpuFrequency)) {
+         len = xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "%4uMHz ", (unsigned)cpuFrequency);
+      } else {
+         len = xSnprintf(cpuFrequencyBuffer, sizeof(cpuFrequencyBuffer), "N/A     ");
+      }
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "freq: ");
+      RichString_appendnWide(out, CRT_colors[METER_VALUE], cpuFrequencyBuffer, len);
+   }
+
+   #ifdef BUILD_WITH_CPU_TEMP
+   if (settings->showCPUTemperature) {
+      char cpuTemperatureBuffer[10];
+      double cpuTemperature = this->values[CPU_METER_TEMPERATURE];
+      if (isNaN(cpuTemperature)) {
+         len = xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "N/A");
+      } else if (settings->degreeFahrenheit) {
+         len = xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "%5.1f%sF", cpuTemperature * 9 / 5 + 32, CRT_degreeSign);
+      } else {
+         len = xSnprintf(cpuTemperatureBuffer, sizeof(cpuTemperatureBuffer), "%5.1f%sC", cpuTemperature, CRT_degreeSign);
+      }
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "temp:");
+      RichString_appendnWide(out, CRT_colors[METER_VALUE], cpuTemperatureBuffer, len);
+   }
+   #endif
+}
+
+static void AllCPUsMeter_getRange(const Meter* this, int* start, int* count) {
+   const CPUMeterData* data = this->meterData;
+   unsigned int cpus = data->cpus;
+   switch (Meter_name(this)[0]) {
+      default:
+      case 'A': // All
+         *start = 0;
+         *count = cpus;
+         break;
+      case 'L': // First Half
+         *start = 0;
+         *count = (cpus + 1) / 2;
+         break;
+      case 'R': // Second Half
+         *start = (cpus + 1) / 2;
+         *count = cpus / 2;
+         break;
+   }
+}
+
+static void AllCPUsMeter_updateValues(Meter* this) {
+   CPUMeterData* data = this->meterData;
+   Meter** meters = data->meters;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   for (int i = 0; i < count; i++)
+      Meter_updateValues(meters[i]);
+}
+
+static void CPUMeterCommonInit(Meter* this, int ncol) {
+   unsigned int cpus = this->host->existingCPUs;
+   CPUMeterData* data = this->meterData;
+   if (!data) {
+      data = this->meterData = xMalloc(sizeof(CPUMeterData));
+      data->cpus = cpus;
+      data->meters = xCalloc(cpus, sizeof(Meter*));
+   }
+   Meter** meters = data->meters;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   for (int i = 0; i < count; i++) {
+      if (!meters[i])
+         meters[i] = Meter_new(this->host, start + i + 1, (const MeterClass*) Class(CPUMeter));
+
+      Meter_init(meters[i]);
+   }
+
+   if (this->mode == 0)
+      this->mode = BAR_METERMODE;
+
+   int h = Meter_modes[this->mode]->h;
+   this->h = h * ((count + ncol - 1) / ncol);
+}
+
+static void CPUMeterCommonUpdateMode(Meter* this, int mode, int ncol) {
+   CPUMeterData* data = this->meterData;
+   Meter** meters = data->meters;
+   this->mode = mode;
+   int h = Meter_modes[mode]->h;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   for (int i = 0; i < count; i++) {
+      Meter_setMode(meters[i], mode);
+   }
+   this->h = h * ((count + ncol - 1) / ncol);
+}
+
+static void AllCPUsMeter_done(Meter* this) {
+   CPUMeterData* data = this->meterData;
+   Meter** meters = data->meters;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   for (int i = 0; i < count; i++)
+      Meter_delete((Object*)meters[i]);
+   free(data->meters);
+   free(data);
+}
+
+static void SingleColCPUsMeter_init(Meter* this) {
+   CPUMeterCommonInit(this, 1);
+}
+
+static void SingleColCPUsMeter_updateMode(Meter* this, int mode) {
+   CPUMeterCommonUpdateMode(this, mode, 1);
+}
+
+static void DualColCPUsMeter_init(Meter* this) {
+   CPUMeterCommonInit(this, 2);
+}
+
+static void DualColCPUsMeter_updateMode(Meter* this, int mode) {
+   CPUMeterCommonUpdateMode(this, mode, 2);
+}
+
+static void QuadColCPUsMeter_init(Meter* this) {
+   CPUMeterCommonInit(this, 4);
+}
+
+static void QuadColCPUsMeter_updateMode(Meter* this, int mode) {
+   CPUMeterCommonUpdateMode(this, mode, 4);
+}
+
+static void OctoColCPUsMeter_init(Meter* this) {
+   CPUMeterCommonInit(this, 8);
+}
+
+static void OctoColCPUsMeter_updateMode(Meter* this, int mode) {
+   CPUMeterCommonUpdateMode(this, mode, 8);
+}
+
+static void CPUMeterCommonDraw(Meter* this, int x, int y, int w, int ncol) {
+   CPUMeterData* data = this->meterData;
+   Meter** meters = data->meters;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   int colwidth = (w - ncol) / ncol + 1;
+   int diff = (w - (colwidth * ncol));
+   int nrows = (count + ncol - 1) / ncol;
+   for (int i = 0; i < count; i++) {
+      int d = (i / nrows) > diff ? diff : (i / nrows); // dynamic spacer
+      int xpos = x + ((i / nrows) * colwidth) + d;
+      int ypos = y + ((i % nrows) * meters[0]->h);
+      meters[i]->draw(meters[i], xpos, ypos, colwidth);
+   }
+}
+
+static void DualColCPUsMeter_draw(Meter* this, int x, int y, int w) {
+   CPUMeterCommonDraw(this, x, y, w, 2);
+}
+
+static void QuadColCPUsMeter_draw(Meter* this, int x, int y, int w) {
+   CPUMeterCommonDraw(this, x, y, w, 4);
+}
+
+static void OctoColCPUsMeter_draw(Meter* this, int x, int y, int w) {
+   CPUMeterCommonDraw(this, x, y, w, 8);
+}
+
+
+static void SingleColCPUsMeter_draw(Meter* this, int x, int y, int w) {
+   CPUMeterData* data = this->meterData;
+   Meter** meters = data->meters;
+   int start, count;
+   AllCPUsMeter_getRange(this, &start, &count);
+   for (int i = 0; i < count; i++) {
+      meters[i]->draw(meters[i], x, y, w);
+      y += meters[i]->h;
+   }
+}
+
+
+const MeterClass CPUMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = CPUMeter_updateValues,
+   .getUiName = CPUMeter_getUiName,
+   .defaultMode = BAR_METERMODE,
+   .maxItems = CPU_METER_ITEMCOUNT,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "CPU",
+   .uiName = "CPU",
+   .caption = "CPU",
+   .init = CPUMeter_init
+};
+
+const MeterClass AllCPUsMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "AllCPUs",
+   .uiName = "CPUs (1/1)",
+   .description = "CPUs (1/1): all CPUs",
+   .caption = "CPU",
+   .draw = SingleColCPUsMeter_draw,
+   .init = SingleColCPUsMeter_init,
+   .updateMode = SingleColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass AllCPUs2Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "AllCPUs2",
+   .uiName = "CPUs (1&2/2)",
+   .description = "CPUs (1&2/2): all CPUs in 2 shorter columns",
+   .caption = "CPU",
+   .draw = DualColCPUsMeter_draw,
+   .init = DualColCPUsMeter_init,
+   .updateMode = DualColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass LeftCPUsMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "LeftCPUs",
+   .uiName = "CPUs (1/2)",
+   .description = "CPUs (1/2): first half of list",
+   .caption = "CPU",
+   .draw = SingleColCPUsMeter_draw,
+   .init = SingleColCPUsMeter_init,
+   .updateMode = SingleColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass RightCPUsMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "RightCPUs",
+   .uiName = "CPUs (2/2)",
+   .description = "CPUs (2/2): second half of list",
+   .caption = "CPU",
+   .draw = SingleColCPUsMeter_draw,
+   .init = SingleColCPUsMeter_init,
+   .updateMode = SingleColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass LeftCPUs2Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "LeftCPUs2",
+   .uiName = "CPUs (1&2/4)",
+   .description = "CPUs (1&2/4): first half in 2 shorter columns",
+   .caption = "CPU",
+   .draw = DualColCPUsMeter_draw,
+   .init = DualColCPUsMeter_init,
+   .updateMode = DualColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass RightCPUs2Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "RightCPUs2",
+   .uiName = "CPUs (3&4/4)",
+   .description = "CPUs (3&4/4): second half in 2 shorter columns",
+   .caption = "CPU",
+   .draw = DualColCPUsMeter_draw,
+   .init = DualColCPUsMeter_init,
+   .updateMode = DualColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass AllCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "AllCPUs4",
+   .uiName = "CPUs (1&2&3&4/4)",
+   .description = "CPUs (1&2&3&4/4): all CPUs in 4 shorter columns",
+   .caption = "CPU",
+   .draw = QuadColCPUsMeter_draw,
+   .init = QuadColCPUsMeter_init,
+   .updateMode = QuadColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass LeftCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "LeftCPUs4",
+   .uiName = "CPUs (1-4/8)",
+   .description = "CPUs (1-4/8): first half in 4 shorter columns",
+   .caption = "CPU",
+   .draw = QuadColCPUsMeter_draw,
+   .init = QuadColCPUsMeter_init,
+   .updateMode = QuadColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass RightCPUs4Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "RightCPUs4",
+   .uiName = "CPUs (5-8/8)",
+   .description = "CPUs (5-8/8): second half in 4 shorter columns",
+   .caption = "CPU",
+   .draw = QuadColCPUsMeter_draw,
+   .init = QuadColCPUsMeter_init,
+   .updateMode = QuadColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass AllCPUs8Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "AllCPUs8",
+   .uiName = "CPUs (1-8/8)",
+   .description = "CPUs (1-8/8): all CPUs in 8 shorter columns",
+   .caption = "CPU",
+   .draw = OctoColCPUsMeter_draw,
+   .init = OctoColCPUsMeter_init,
+   .updateMode = OctoColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass LeftCPUs8Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "LeftCPUs8",
+   .uiName = "CPUs (1-8/16)",
+   .description = "CPUs (1-8/16): first half in 8 shorter columns",
+   .caption = "CPU",
+   .draw = OctoColCPUsMeter_draw,
+   .init = OctoColCPUsMeter_init,
+   .updateMode = OctoColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
+
+const MeterClass RightCPUs8Meter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = CPUMeter_display
+   },
+   .updateValues = AllCPUsMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .total = 100.0,
+   .attributes = CPUMeter_attributes,
+   .name = "RightCPUs8",
+   .uiName = "CPUs (9-16/16)",
+   .description = "CPUs (9-16/16): second half in 8 shorter columns",
+   .caption = "CPU",
+   .draw = OctoColCPUsMeter_draw,
+   .init = OctoColCPUsMeter_init,
+   .updateMode = OctoColCPUsMeter_updateMode,
+   .done = AllCPUsMeter_done
+};
diff --git a/CPUMeter.h b/CPUMeter.h
new file mode 100644
index 0000000..7f2ddb1
--- /dev/null
+++ b/CPUMeter.h
@@ -0,0 +1,53 @@
+#ifndef HEADER_CPUMeter
+#define HEADER_CPUMeter
+/*
+htop - CPUMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+typedef enum {
+   CPU_METER_NICE = 0,
+   CPU_METER_NORMAL = 1,
+   CPU_METER_KERNEL = 2,
+   CPU_METER_IRQ = 3,
+   CPU_METER_SOFTIRQ = 4,
+   CPU_METER_STEAL = 5,
+   CPU_METER_GUEST = 6,
+   CPU_METER_IOWAIT = 7,
+   CPU_METER_FREQUENCY = 8,
+   CPU_METER_TEMPERATURE = 9,
+   CPU_METER_ITEMCOUNT = 10, // number of entries in this enum
+} CPUMeterValues;
+
+extern const MeterClass CPUMeter_class;
+
+extern const MeterClass AllCPUsMeter_class;
+
+extern const MeterClass AllCPUs2Meter_class;
+
+extern const MeterClass LeftCPUsMeter_class;
+
+extern const MeterClass RightCPUsMeter_class;
+
+extern const MeterClass LeftCPUs2Meter_class;
+
+extern const MeterClass RightCPUs2Meter_class;
+
+extern const MeterClass AllCPUs4Meter_class;
+
+extern const MeterClass LeftCPUs4Meter_class;
+
+extern const MeterClass RightCPUs4Meter_class;
+
+extern const MeterClass AllCPUs8Meter_class;
+
+extern const MeterClass LeftCPUs8Meter_class;
+
+extern const MeterClass RightCPUs8Meter_class;
+
+#endif
diff --git a/CRT.c b/CRT.c
new file mode 100644
index 0000000..bd5453b
--- /dev/null
+++ b/CRT.c
@@ -0,0 +1,1277 @@
+/*
+htop - CRT.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CRT.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <langinfo.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "CommandLine.h"
+#include "ProvideCurses.h"
+#include "ProvideTerm.h"
+#include "XUtils.h"
+
+#if !defined(NDEBUG) && defined(HAVE_MEMFD_CREATE)
+#include <sys/mman.h>
+#endif
+
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LIBUNWIND)
+# define PRINT_BACKTRACE
+# define UNW_LOCAL_ONLY
+# include <libunwind.h>
+# if defined(HAVE_DLADDR)
+#  include <dlfcn.h>
+# endif
+#elif defined(HAVE_EXECINFO_H)
+# define PRINT_BACKTRACE
+# include <execinfo.h>
+#endif
+
+
+#define ColorIndex(i,j) ((7-(i))*8+(j))
+
+#define ColorPair(i,j) COLOR_PAIR(ColorIndex(i,j))
+
+#define Black   COLOR_BLACK
+#define Red     COLOR_RED
+#define Green   COLOR_GREEN
+#define Yellow  COLOR_YELLOW
+#define Blue    COLOR_BLUE
+#define Magenta COLOR_MAGENTA
+#define Cyan    COLOR_CYAN
+#define White   COLOR_WHITE
+
+#define ColorPairGrayBlack  ColorPair(Magenta,Magenta)
+#define ColorIndexGrayBlack ColorIndex(Magenta,Magenta)
+
+#define ColorPairWhiteDefault  ColorPair(Red, Red)
+#define ColorIndexWhiteDefault ColorIndex(Red, Red)
+
+static const char* const CRT_treeStrAscii[LAST_TREE_STR] = {
+   [TREE_STR_VERT] = "|",
+   [TREE_STR_RTEE] = "`",
+   [TREE_STR_BEND] = "`",
+   [TREE_STR_TEND] = ",",
+   [TREE_STR_OPEN] = "+",
+   [TREE_STR_SHUT] = "-",
+   [TREE_STR_ASC]  = "+",
+   [TREE_STR_DESC] = "-",
+};
+
+#ifdef HAVE_LIBNCURSESW
+
+static const char* const CRT_treeStrUtf8[LAST_TREE_STR] = {
+   [TREE_STR_VERT] = "\xe2\x94\x82", // │
+   [TREE_STR_RTEE] = "\xe2\x94\x9c", // ├
+   [TREE_STR_BEND] = "\xe2\x94\x94", // └
+   [TREE_STR_TEND] = "\xe2\x94\x8c", // ┌
+   [TREE_STR_OPEN] = "+",            // +, TODO use 🮯 'BOX DRAWINGS LIGHT HORIZONTAL
+                                     // WITH VERTICAL STROKE' (U+1FBAF, "\xf0\x9f\xae\xaf") when
+                                     // Unicode 13 is common
+   [TREE_STR_SHUT] = "\xe2\x94\x80", // ─
+   [TREE_STR_ASC]  = "\xe2\x96\xb3", // △
+   [TREE_STR_DESC] = "\xe2\x96\xbd", // ▽
+};
+
+bool CRT_utf8 = false;
+
+#endif
+
+const char* const* CRT_treeStr = CRT_treeStrAscii;
+
+static const Settings* CRT_crashSettings;
+static const int* CRT_delay;
+
+const char* CRT_degreeSign;
+
+static const char* initDegreeSign(void) {
+#ifdef HAVE_LIBNCURSESW
+   if (CRT_utf8)
+      return "\xc2\xb0";
+
+   static char buffer[4];
+   // this might fail if the current locale does not support wide characters
+   int r = snprintf(buffer, sizeof(buffer), "%lc", 176);
+   if (r > 0)
+      return buffer;
+#endif
+
+   return "";
+}
+
+const int* CRT_colors;
+
+static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+   [COLORSCHEME_DEFAULT] = {
+      [RESET_COLOR] = ColorPair(White, Black),
+      [DEFAULT_COLOR] = ColorPair(White, Black),
+      [FUNCTION_BAR] = ColorPair(Black, Cyan),
+      [FUNCTION_KEY] = ColorPair(White, Black),
+      [PANEL_HEADER_FOCUS] = ColorPair(Black, Green),
+      [PANEL_HEADER_UNFOCUS] = ColorPair(Black, Green),
+      [PANEL_SELECTION_FOCUS] = ColorPair(Black, Cyan),
+      [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
+      [PANEL_SELECTION_UNFOCUS] = ColorPair(Black, White),
+      [FAILED_SEARCH] = ColorPair(Red, Cyan),
+      [FAILED_READ] = A_BOLD | ColorPair(Red, Black),
+      [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
+      [UPTIME] = A_BOLD | ColorPair(Cyan, Black),
+      [BATTERY] = A_BOLD | ColorPair(Cyan, Black),
+      [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
+      [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [METER_TEXT] = ColorPair(Cyan, Black),
+      [METER_VALUE] = A_BOLD | ColorPair(Cyan, Black),
+      [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
+      [METER_VALUE_IOREAD] = ColorPair(Green, Black),
+      [METER_VALUE_IOWRITE] = A_BOLD | ColorPair(Blue, Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White, Black),
+      [METER_VALUE_OK] = ColorPair(Green, Black),
+      [METER_VALUE_WARN] = A_BOLD | ColorPair(Yellow, Black),
+      [LED_COLOR] = ColorPair(Green, Black),
+      [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
+      [PROCESS] = A_NORMAL,
+      [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [PROCESS_TAG] = A_BOLD | ColorPair(Yellow, Black),
+      [PROCESS_MEGABYTES] = ColorPair(Cyan, Black),
+      [PROCESS_GIGABYTES] = ColorPair(Green, Black),
+      [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan, Black),
+      [PROCESS_TREE] = ColorPair(Cyan, Black),
+      [PROCESS_RUN_STATE] = ColorPair(Green, Black),
+      [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black),
+      [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black),
+      [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black),
+      [PROCESS_NEW] = ColorPair(Black, Green),
+      [PROCESS_TOMB] = ColorPair(Black, Red),
+      [PROCESS_THREAD] = ColorPair(Green, Black),
+      [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green, Black),
+      [PROCESS_COMM] = ColorPair(Magenta, Black),
+      [PROCESS_THREAD_COMM] = A_BOLD | ColorPair(Blue, Black),
+      [PROCESS_PRIV] = ColorPair(Magenta, Black),
+      [BAR_BORDER] = A_BOLD,
+      [BAR_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [SWAP] = ColorPair(Red, Black),
+      [SWAP_CACHE] = ColorPair(Yellow, Black),
+      [SWAP_FRONTSWAP] = A_BOLD | ColorPairGrayBlack,
+      [GRAPH_1] = A_BOLD | ColorPair(Cyan, Black),
+      [GRAPH_2] = ColorPair(Cyan, Black),
+      [MEMORY_USED] = ColorPair(Green, Black),
+      [MEMORY_BUFFERS] = A_BOLD | ColorPair(Blue, Black),
+      [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue, Black),
+      [MEMORY_CACHE] = ColorPair(Yellow, Black),
+      [MEMORY_SHARED] = ColorPair(Magenta, Black),
+      [MEMORY_COMPRESSED] = A_BOLD | ColorPairGrayBlack,
+      [HUGEPAGE_1] = ColorPair(Green, Black),
+      [HUGEPAGE_2] = ColorPair(Yellow, Black),
+      [HUGEPAGE_3] = ColorPair(Red, Black),
+      [HUGEPAGE_4] = A_BOLD | ColorPair(Blue, Black),
+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Cyan, Black),
+      [LOAD_AVERAGE_FIVE] = A_BOLD | ColorPair(Cyan, Black),
+      [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White, Black),
+      [LOAD] = A_BOLD,
+      [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Black),
+      [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [CLOCK] = A_BOLD,
+      [DATE] = A_BOLD,
+      [DATETIME] = A_BOLD,
+      [CHECK_BOX] = ColorPair(Cyan, Black),
+      [CHECK_MARK] = A_BOLD,
+      [CHECK_TEXT] = A_NORMAL,
+      [HOSTNAME] = A_BOLD,
+      [CPU_NICE] = A_BOLD | ColorPair(Blue, Black),
+      [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue, Black),
+      [CPU_NORMAL] = ColorPair(Green, Black),
+      [CPU_SYSTEM] = ColorPair(Red, Black),
+      [CPU_IOWAIT] = A_BOLD | ColorPairGrayBlack,
+      [CPU_IRQ] = ColorPair(Yellow, Black),
+      [CPU_SOFTIRQ] = ColorPair(Magenta, Black),
+      [CPU_STEAL] = ColorPair(Cyan, Black),
+      [CPU_GUEST] = ColorPair(Cyan, Black),
+      [PANEL_EDIT] = ColorPair(White, Blue),
+      [SCREENS_OTH_BORDER] = ColorPair(Blue, Blue),
+      [SCREENS_OTH_TEXT] = ColorPair(Black, Blue),
+      [SCREENS_CUR_BORDER] = ColorPair(Green, Green),
+      [SCREENS_CUR_TEXT] = ColorPair(Black, Green),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Cyan, Black),
+      [PRESSURE_STALL_SIXTY] = A_BOLD | ColorPair(Cyan, Black),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(White, Black),
+      [FILE_DESCRIPTOR_USED] = ColorPair(Green, Black),
+      [FILE_DESCRIPTOR_MAX] = A_BOLD | ColorPair(Blue, Black),
+      [ZFS_MFU] = A_BOLD | ColorPair(Blue, Black),
+      [ZFS_MRU] = ColorPair(Yellow, Black),
+      [ZFS_ANON] = ColorPair(Magenta, Black),
+      [ZFS_HEADER] = ColorPair(Cyan, Black),
+      [ZFS_OTHER] = ColorPair(Magenta, Black),
+      [ZFS_COMPRESSED] = A_BOLD | ColorPair(Blue, Black),
+      [ZFS_RATIO] = ColorPair(Magenta, Black),
+      [ZRAM_COMPRESSED] = A_BOLD | ColorPair(Blue, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
+      [DYNAMIC_GRAY] = ColorPairGrayBlack,
+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
+      [DYNAMIC_RED] = ColorPair(Red, Black),
+      [DYNAMIC_GREEN] = ColorPair(Green, Black),
+      [DYNAMIC_BLUE] = A_BOLD | ColorPair(Blue, Black),
+      [DYNAMIC_CYAN] = ColorPair(Cyan, Black),
+      [DYNAMIC_MAGENTA] = ColorPair(Magenta, Black),
+      [DYNAMIC_YELLOW] = ColorPair(Yellow, Black),
+      [DYNAMIC_WHITE] = ColorPair(White, Black),
+   },
+   [COLORSCHEME_MONOCHROME] = {
+      [RESET_COLOR] = A_NORMAL,
+      [DEFAULT_COLOR] = A_NORMAL,
+      [FUNCTION_BAR] = A_REVERSE,
+      [FUNCTION_KEY] = A_NORMAL,
+      [PANEL_HEADER_FOCUS] = A_REVERSE,
+      [PANEL_HEADER_UNFOCUS] = A_REVERSE,
+      [PANEL_SELECTION_FOCUS] = A_REVERSE,
+      [PANEL_SELECTION_FOLLOW] = A_REVERSE,
+      [PANEL_SELECTION_UNFOCUS] = A_BOLD,
+      [FAILED_SEARCH] = A_REVERSE | A_BOLD,
+      [FAILED_READ] = A_BOLD,
+      [PAUSED] = A_BOLD | A_REVERSE,
+      [UPTIME] = A_BOLD,
+      [BATTERY] = A_BOLD,
+      [LARGE_NUMBER] = A_BOLD,
+      [METER_SHADOW] = A_DIM,
+      [METER_TEXT] = A_NORMAL,
+      [METER_VALUE] = A_BOLD,
+      [METER_VALUE_ERROR] = A_BOLD,
+      [METER_VALUE_IOREAD] = A_NORMAL,
+      [METER_VALUE_IOWRITE] = A_NORMAL,
+      [METER_VALUE_NOTICE] = A_BOLD,
+      [METER_VALUE_OK] = A_NORMAL,
+      [METER_VALUE_WARN] = A_BOLD,
+      [LED_COLOR] = A_NORMAL,
+      [TASKS_RUNNING] = A_BOLD,
+      [PROCESS] = A_NORMAL,
+      [PROCESS_SHADOW] = A_DIM,
+      [PROCESS_TAG] = A_BOLD,
+      [PROCESS_MEGABYTES] = A_BOLD,
+      [PROCESS_GIGABYTES] = A_BOLD,
+      [PROCESS_BASENAME] = A_BOLD,
+      [PROCESS_TREE] = A_BOLD,
+      [PROCESS_RUN_STATE] = A_BOLD,
+      [PROCESS_D_STATE] = A_BOLD,
+      [PROCESS_HIGH_PRIORITY] = A_BOLD,
+      [PROCESS_LOW_PRIORITY] = A_DIM,
+      [PROCESS_NEW] = A_BOLD,
+      [PROCESS_TOMB] = A_DIM,
+      [PROCESS_THREAD] = A_BOLD,
+      [PROCESS_THREAD_BASENAME] = A_REVERSE,
+      [PROCESS_COMM] = A_BOLD,
+      [PROCESS_THREAD_COMM] = A_REVERSE,
+      [PROCESS_PRIV] = A_BOLD,
+      [BAR_BORDER] = A_BOLD,
+      [BAR_SHADOW] = A_DIM,
+      [SWAP] = A_BOLD,
+      [SWAP_CACHE] = A_NORMAL,
+      [SWAP_FRONTSWAP] = A_DIM,
+      [GRAPH_1] = A_BOLD,
+      [GRAPH_2] = A_NORMAL,
+      [MEMORY_USED] = A_BOLD,
+      [MEMORY_BUFFERS] = A_NORMAL,
+      [MEMORY_BUFFERS_TEXT] = A_NORMAL,
+      [MEMORY_CACHE] = A_NORMAL,
+      [MEMORY_SHARED] = A_NORMAL,
+      [MEMORY_COMPRESSED] = A_DIM,
+      [HUGEPAGE_1] = A_BOLD,
+      [HUGEPAGE_2] = A_NORMAL,
+      [HUGEPAGE_3] = A_REVERSE | A_BOLD,
+      [HUGEPAGE_4] = A_REVERSE,
+      [LOAD_AVERAGE_FIFTEEN] = A_DIM,
+      [LOAD_AVERAGE_FIVE] = A_NORMAL,
+      [LOAD_AVERAGE_ONE] = A_BOLD,
+      [LOAD] = A_BOLD,
+      [HELP_BOLD] = A_BOLD,
+      [HELP_SHADOW] = A_DIM,
+      [CLOCK] = A_BOLD,
+      [DATE] = A_BOLD,
+      [DATETIME] = A_BOLD,
+      [CHECK_BOX] = A_BOLD,
+      [CHECK_MARK] = A_NORMAL,
+      [CHECK_TEXT] = A_NORMAL,
+      [HOSTNAME] = A_BOLD,
+      [CPU_NICE] = A_NORMAL,
+      [CPU_NICE_TEXT] = A_NORMAL,
+      [CPU_NORMAL] = A_BOLD,
+      [CPU_SYSTEM] = A_BOLD,
+      [CPU_IOWAIT] = A_NORMAL,
+      [CPU_IRQ] = A_BOLD,
+      [CPU_SOFTIRQ] = A_BOLD,
+      [CPU_STEAL] = A_DIM,
+      [CPU_GUEST] = A_DIM,
+      [PANEL_EDIT] = A_BOLD,
+      [SCREENS_OTH_BORDER] = A_DIM,
+      [SCREENS_OTH_TEXT] = A_DIM,
+      [SCREENS_CUR_BORDER] = A_REVERSE,
+      [SCREENS_CUR_TEXT] = A_REVERSE,
+      [PRESSURE_STALL_THREEHUNDRED] = A_DIM,
+      [PRESSURE_STALL_SIXTY] = A_NORMAL,
+      [PRESSURE_STALL_TEN] = A_BOLD,
+      [FILE_DESCRIPTOR_USED] = A_BOLD,
+      [FILE_DESCRIPTOR_MAX] = A_BOLD,
+      [ZFS_MFU] = A_NORMAL,
+      [ZFS_MRU] = A_NORMAL,
+      [ZFS_ANON] = A_DIM,
+      [ZFS_HEADER] = A_BOLD,
+      [ZFS_OTHER] = A_DIM,
+      [ZFS_COMPRESSED] = A_BOLD,
+      [ZFS_RATIO] = A_BOLD,
+      [ZRAM_COMPRESSED] = A_NORMAL,
+      [ZRAM_UNCOMPRESSED] = A_NORMAL,
+      [DYNAMIC_GRAY] = A_DIM,
+      [DYNAMIC_DARKGRAY] = A_DIM,
+      [DYNAMIC_RED] = A_BOLD,
+      [DYNAMIC_GREEN] = A_NORMAL,
+      [DYNAMIC_BLUE] = A_NORMAL,
+      [DYNAMIC_CYAN] = A_BOLD,
+      [DYNAMIC_MAGENTA] = A_NORMAL,
+      [DYNAMIC_YELLOW] = A_NORMAL,
+      [DYNAMIC_WHITE] = A_BOLD,
+   },
+   [COLORSCHEME_BLACKONWHITE] = {
+      [RESET_COLOR] = ColorPair(Black, White),
+      [DEFAULT_COLOR] = ColorPair(Black, White),
+      [FUNCTION_BAR] = ColorPair(Black, Cyan),
+      [FUNCTION_KEY] = ColorPair(Black, White),
+      [PANEL_HEADER_FOCUS] = ColorPair(Black, Green),
+      [PANEL_HEADER_UNFOCUS] = ColorPair(Black, Green),
+      [PANEL_SELECTION_FOCUS] = ColorPair(Black, Cyan),
+      [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
+      [PANEL_SELECTION_UNFOCUS] = ColorPair(Blue, White),
+      [FAILED_SEARCH] = ColorPair(Red, Cyan),
+      [FAILED_READ] = ColorPair(Red, White),
+      [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
+      [UPTIME] = ColorPair(Yellow, White),
+      [BATTERY] = ColorPair(Yellow, White),
+      [LARGE_NUMBER] = ColorPair(Red, White),
+      [METER_SHADOW] = ColorPair(Blue, White),
+      [METER_TEXT] = ColorPair(Blue, White),
+      [METER_VALUE] = ColorPair(Black, White),
+      [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, White),
+      [METER_VALUE_IOREAD] = ColorPair(Green, White),
+      [METER_VALUE_IOWRITE] = ColorPair(Yellow, White),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(Yellow, White),
+      [METER_VALUE_OK] = ColorPair(Green, White),
+      [METER_VALUE_WARN] = A_BOLD | ColorPair(Yellow, White),
+      [LED_COLOR] = ColorPair(Green, White),
+      [TASKS_RUNNING] = ColorPair(Green, White),
+      [PROCESS] = ColorPair(Black, White),
+      [PROCESS_SHADOW] = A_BOLD | ColorPair(Black, White),
+      [PROCESS_TAG] = ColorPair(White, Blue),
+      [PROCESS_MEGABYTES] = ColorPair(Blue, White),
+      [PROCESS_GIGABYTES] = ColorPair(Green, White),
+      [PROCESS_BASENAME] = ColorPair(Blue, White),
+      [PROCESS_TREE] = ColorPair(Green, White),
+      [PROCESS_RUN_STATE] = ColorPair(Green, White),
+      [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, White),
+      [PROCESS_HIGH_PRIORITY] = ColorPair(Red, White),
+      [PROCESS_LOW_PRIORITY] = ColorPair(Green, White),
+      [PROCESS_NEW] = ColorPair(White, Green),
+      [PROCESS_TOMB] = ColorPair(White, Red),
+      [PROCESS_THREAD] = ColorPair(Blue, White),
+      [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue, White),
+      [PROCESS_COMM] = ColorPair(Magenta, White),
+      [PROCESS_THREAD_COMM] = ColorPair(Green, White),
+      [PROCESS_PRIV] = ColorPair(Magenta, White),
+      [BAR_BORDER] = ColorPair(Blue, White),
+      [BAR_SHADOW] = ColorPair(Black, White),
+      [SWAP] = ColorPair(Red, White),
+      [SWAP_CACHE] = ColorPair(Yellow, White),
+      [SWAP_FRONTSWAP] = A_BOLD | ColorPair(Black, White),
+      [GRAPH_1] = A_BOLD | ColorPair(Blue, White),
+      [GRAPH_2] = ColorPair(Blue, White),
+      [MEMORY_USED] = ColorPair(Green, White),
+      [MEMORY_BUFFERS] = ColorPair(Cyan, White),
+      [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan, White),
+      [MEMORY_CACHE] = ColorPair(Yellow, White),
+      [MEMORY_SHARED] = ColorPair(Magenta, White),
+      [MEMORY_COMPRESSED] = A_BOLD | ColorPair(Black, White),
+      [HUGEPAGE_1] = ColorPair(Green, White),
+      [HUGEPAGE_2] = ColorPair(Yellow, White),
+      [HUGEPAGE_3] = ColorPair(Red, White),
+      [HUGEPAGE_4] = ColorPair(Blue, White),
+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Black, White),
+      [LOAD_AVERAGE_FIVE] = ColorPair(Black, White),
+      [LOAD_AVERAGE_ONE] = ColorPair(Black, White),
+      [LOAD] = ColorPair(Black, White),
+      [HELP_BOLD] = ColorPair(Blue, White),
+      [HELP_SHADOW] = A_BOLD | ColorPair(Black, White),
+      [CLOCK] = ColorPair(Black, White),
+      [DATE] = ColorPair(Black, White),
+      [DATETIME] = ColorPair(Black, White),
+      [CHECK_BOX] = ColorPair(Blue, White),
+      [CHECK_MARK] = ColorPair(Black, White),
+      [CHECK_TEXT] = ColorPair(Black, White),
+      [HOSTNAME] = ColorPair(Black, White),
+      [CPU_NICE] = ColorPair(Cyan, White),
+      [CPU_NICE_TEXT] = ColorPair(Cyan, White),
+      [CPU_NORMAL] = ColorPair(Green, White),
+      [CPU_SYSTEM] = ColorPair(Red, White),
+      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, White),
+      [CPU_IRQ] = ColorPair(Blue, White),
+      [CPU_SOFTIRQ] = ColorPair(Blue, White),
+      [CPU_STEAL] = ColorPair(Cyan, White),
+      [CPU_GUEST] = ColorPair(Cyan, White),
+      [PANEL_EDIT] = ColorPair(White, Blue),
+      [SCREENS_OTH_BORDER] = A_BOLD | ColorPair(Black, White),
+      [SCREENS_OTH_TEXT] = A_BOLD | ColorPair(Black, White),
+      [SCREENS_CUR_BORDER] = ColorPair(Green, Green),
+      [SCREENS_CUR_TEXT] = ColorPair(Black, Green),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Black, White),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Black, White),
+      [PRESSURE_STALL_TEN] = ColorPair(Black, White),
+      [FILE_DESCRIPTOR_USED] = ColorPair(Green, White),
+      [FILE_DESCRIPTOR_MAX] = ColorPair(Blue, White),
+      [ZFS_MFU] = ColorPair(Cyan, White),
+      [ZFS_MRU] = ColorPair(Yellow, White),
+      [ZFS_ANON] = ColorPair(Magenta, White),
+      [ZFS_HEADER] = ColorPair(Yellow, White),
+      [ZFS_OTHER] = ColorPair(Magenta, White),
+      [ZFS_COMPRESSED] = ColorPair(Cyan, White),
+      [ZFS_RATIO] = ColorPair(Magenta, White),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, White),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, White),
+      [DYNAMIC_GRAY] = ColorPair(Black, White),
+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPair(Black, White),
+      [DYNAMIC_RED] = ColorPair(Red, White),
+      [DYNAMIC_GREEN] = ColorPair(Green, White),
+      [DYNAMIC_BLUE] = ColorPair(Blue, White),
+      [DYNAMIC_CYAN] = ColorPair(Yellow, White),
+      [DYNAMIC_MAGENTA] = ColorPair(Magenta, White),
+      [DYNAMIC_YELLOW] = ColorPair(Yellow, White),
+      [DYNAMIC_WHITE] = A_BOLD | ColorPair(Black, White),
+   },
+   [COLORSCHEME_LIGHTTERMINAL] = {
+      [RESET_COLOR] = ColorPair(Black, Black),
+      [DEFAULT_COLOR] = ColorPair(Black, Black),
+      [FUNCTION_BAR] = ColorPair(Black, Cyan),
+      [FUNCTION_KEY] = ColorPair(Black, Black),
+      [PANEL_HEADER_FOCUS] = ColorPair(Black, Green),
+      [PANEL_HEADER_UNFOCUS] = ColorPair(Black, Green),
+      [PANEL_SELECTION_FOCUS] = ColorPair(Black, Cyan),
+      [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
+      [PANEL_SELECTION_UNFOCUS] = ColorPair(Blue, Black),
+      [FAILED_SEARCH] = ColorPair(Red, Cyan),
+      [FAILED_READ] = ColorPair(Red, Black),
+      [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
+      [UPTIME] = ColorPair(Yellow, Black),
+      [BATTERY] = ColorPair(Yellow, Black),
+      [LARGE_NUMBER] = ColorPair(Red, Black),
+      [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [METER_TEXT] = ColorPair(Blue, Black),
+      [METER_VALUE] = ColorPair(Black, Black),
+      [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
+      [METER_VALUE_IOREAD] = ColorPair(Green, Black),
+      [METER_VALUE_IOWRITE] = ColorPair(Yellow, Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPairWhiteDefault,
+      [METER_VALUE_OK] = ColorPair(Green, Black),
+      [METER_VALUE_WARN] = A_BOLD | ColorPair(Yellow, Black),
+      [LED_COLOR] = ColorPair(Green, Black),
+      [TASKS_RUNNING] = ColorPair(Green, Black),
+      [PROCESS] = ColorPair(Black, Black),
+      [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [PROCESS_TAG] = ColorPair(White, Blue),
+      [PROCESS_MEGABYTES] = ColorPair(Blue, Black),
+      [PROCESS_GIGABYTES] = ColorPair(Green, Black),
+      [PROCESS_BASENAME] = ColorPair(Green, Black),
+      [PROCESS_TREE] = ColorPair(Blue, Black),
+      [PROCESS_RUN_STATE] = ColorPair(Green, Black),
+      [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black),
+      [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black),
+      [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black),
+      [PROCESS_NEW] = ColorPair(Black, Green),
+      [PROCESS_TOMB] = ColorPair(Black, Red),
+      [PROCESS_THREAD] = ColorPair(Blue, Black),
+      [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue, Black),
+      [PROCESS_COMM] = ColorPair(Magenta, Black),
+      [PROCESS_THREAD_COMM] = ColorPair(Yellow, Black),
+      [PROCESS_PRIV] = ColorPair(Magenta, Black),
+      [BAR_BORDER] = ColorPair(Blue, Black),
+      [BAR_SHADOW] = ColorPairGrayBlack,
+      [SWAP] = ColorPair(Red, Black),
+      [SWAP_CACHE] = ColorPair(Yellow, Black),
+      [SWAP_FRONTSWAP] = ColorPairGrayBlack,
+      [GRAPH_1] = A_BOLD | ColorPair(Cyan, Black),
+      [GRAPH_2] = ColorPair(Cyan, Black),
+      [MEMORY_USED] = ColorPair(Green, Black),
+      [MEMORY_BUFFERS] = ColorPair(Cyan, Black),
+      [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan, Black),
+      [MEMORY_CACHE] = ColorPair(Yellow, Black),
+      [MEMORY_SHARED] = ColorPair(Magenta, Black),
+      [MEMORY_COMPRESSED] = ColorPairGrayBlack,
+      [HUGEPAGE_1] = ColorPair(Green, Black),
+      [HUGEPAGE_2] = ColorPair(Yellow, Black),
+      [HUGEPAGE_3] = ColorPair(Red, Black),
+      [HUGEPAGE_4] = ColorPair(Blue, Black),
+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Black, Black),
+      [LOAD_AVERAGE_FIVE] = ColorPair(Black, Black),
+      [LOAD_AVERAGE_ONE] = ColorPair(Black, Black),
+      [LOAD] = ColorPairWhiteDefault,
+      [HELP_BOLD] = ColorPair(Blue, Black),
+      [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [CLOCK] = ColorPairWhiteDefault,
+      [DATE] = ColorPairWhiteDefault,
+      [DATETIME] = ColorPairWhiteDefault,
+      [CHECK_BOX] = ColorPair(Blue, Black),
+      [CHECK_MARK] = ColorPair(Black, Black),
+      [CHECK_TEXT] = ColorPair(Black, Black),
+      [HOSTNAME] = ColorPairWhiteDefault,
+      [CPU_NICE] = ColorPair(Cyan, Black),
+      [CPU_NICE_TEXT] = ColorPair(Cyan, Black),
+      [CPU_NORMAL] = ColorPair(Green, Black),
+      [CPU_SYSTEM] = ColorPair(Red, Black),
+      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black),
+      [CPU_IRQ] = A_BOLD | ColorPair(Blue, Black),
+      [CPU_SOFTIRQ] = ColorPair(Blue, Black),
+      [CPU_STEAL] = ColorPair(Black, Black),
+      [CPU_GUEST] = ColorPair(Black, Black),
+      [PANEL_EDIT] = ColorPair(White, Blue),
+      [SCREENS_OTH_BORDER] = ColorPair(Blue, Black),
+      [SCREENS_OTH_TEXT] = ColorPair(Blue, Black),
+      [SCREENS_CUR_BORDER] = ColorPair(Green, Green),
+      [SCREENS_CUR_TEXT] = ColorPair(Black, Green),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Black, Black),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Black, Black),
+      [PRESSURE_STALL_TEN] = ColorPair(Black, Black),
+      [FILE_DESCRIPTOR_USED] = ColorPair(Green, Black),
+      [FILE_DESCRIPTOR_MAX] = A_BOLD | ColorPair(Blue, Black),
+      [ZFS_MFU] = ColorPair(Cyan, Black),
+      [ZFS_MRU] = ColorPair(Yellow, Black),
+      [ZFS_ANON] = A_BOLD | ColorPair(Magenta, Black),
+      [ZFS_HEADER] = ColorPair(Black, Black),
+      [ZFS_OTHER] = A_BOLD | ColorPair(Magenta, Black),
+      [ZFS_COMPRESSED] = ColorPair(Cyan, Black),
+      [ZFS_RATIO] = A_BOLD | ColorPair(Magenta, Black),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
+      [DYNAMIC_GRAY] = ColorPairGrayBlack,
+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
+      [DYNAMIC_RED] = ColorPair(Red, Black),
+      [DYNAMIC_GREEN] = ColorPair(Green, Black),
+      [DYNAMIC_BLUE] = ColorPair(Blue, Black),
+      [DYNAMIC_CYAN] = ColorPair(Cyan, Black),
+      [DYNAMIC_MAGENTA] = ColorPair(Magenta, Black),
+      [DYNAMIC_YELLOW] = ColorPair(Yellow, Black),
+      [DYNAMIC_WHITE] = ColorPairWhiteDefault,
+   },
+   [COLORSCHEME_MIDNIGHT] = {
+      [RESET_COLOR] = ColorPair(White, Blue),
+      [DEFAULT_COLOR] = ColorPair(White, Blue),
+      [FUNCTION_BAR] = ColorPair(Black, Cyan),
+      [FUNCTION_KEY] = A_NORMAL,
+      [PANEL_HEADER_FOCUS] = ColorPair(Black, Cyan),
+      [PANEL_HEADER_UNFOCUS] = ColorPair(Black, Cyan),
+      [PANEL_SELECTION_FOCUS] = ColorPair(Black, White),
+      [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
+      [PANEL_SELECTION_UNFOCUS] = A_BOLD | ColorPair(Yellow, Blue),
+      [FAILED_SEARCH] = ColorPair(Red, Cyan),
+      [FAILED_READ] = A_BOLD | ColorPair(Red, Blue),
+      [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
+      [UPTIME] = A_BOLD | ColorPair(Yellow, Blue),
+      [BATTERY] = A_BOLD | ColorPair(Yellow, Blue),
+      [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Blue),
+      [METER_SHADOW] = ColorPair(Cyan, Blue),
+      [METER_TEXT] = ColorPair(Cyan, Blue),
+      [METER_VALUE] = A_BOLD | ColorPair(Cyan, Blue),
+      [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Blue),
+      [METER_VALUE_IOREAD] = ColorPair(Green, Blue),
+      [METER_VALUE_IOWRITE] = ColorPair(Black, Blue),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White, Blue),
+      [METER_VALUE_OK] = ColorPair(Green, Blue),
+      [METER_VALUE_WARN] = A_BOLD | ColorPair(Yellow, Black),
+      [LED_COLOR] = ColorPair(Green, Blue),
+      [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Blue),
+      [PROCESS] = ColorPair(White, Blue),
+      [PROCESS_SHADOW] = A_BOLD | ColorPair(Black, Blue),
+      [PROCESS_TAG] = A_BOLD | ColorPair(Yellow, Blue),
+      [PROCESS_MEGABYTES] = ColorPair(Cyan, Blue),
+      [PROCESS_GIGABYTES] = ColorPair(Green, Blue),
+      [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan, Blue),
+      [PROCESS_TREE] = ColorPair(Cyan, Blue),
+      [PROCESS_RUN_STATE] = ColorPair(Green, Blue),
+      [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Blue),
+      [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Blue),
+      [PROCESS_LOW_PRIORITY] = ColorPair(Green, Blue),
+      [PROCESS_NEW] = ColorPair(Blue, Green),
+      [PROCESS_TOMB] = ColorPair(Blue, Red),
+      [PROCESS_THREAD] = ColorPair(Green, Blue),
+      [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green, Blue),
+      [PROCESS_COMM] = ColorPair(Magenta, Blue),
+      [PROCESS_THREAD_COMM] = ColorPair(Black, Blue),
+      [PROCESS_PRIV] = ColorPair(Magenta, Blue),
+      [BAR_BORDER] = A_BOLD | ColorPair(Yellow, Blue),
+      [BAR_SHADOW] = ColorPair(Cyan, Blue),
+      [SWAP] = ColorPair(Red, Blue),
+      [SWAP_CACHE] = A_BOLD | ColorPair(Yellow, Blue),
+      [SWAP_FRONTSWAP] = A_BOLD | ColorPair(Black, Blue),
+      [GRAPH_1] = A_BOLD | ColorPair(Cyan, Blue),
+      [GRAPH_2] = ColorPair(Cyan, Blue),
+      [MEMORY_USED] = A_BOLD | ColorPair(Green, Blue),
+      [MEMORY_BUFFERS] = A_BOLD | ColorPair(Cyan, Blue),
+      [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Cyan, Blue),
+      [MEMORY_CACHE] = A_BOLD | ColorPair(Yellow, Blue),
+      [MEMORY_SHARED] = A_BOLD | ColorPair(Magenta, Blue),
+      [MEMORY_COMPRESSED] = A_BOLD | ColorPair(Black, Blue),
+      [HUGEPAGE_1] = A_BOLD | ColorPair(Green, Blue),
+      [HUGEPAGE_2] = A_BOLD | ColorPair(Yellow, Blue),
+      [HUGEPAGE_3] = A_BOLD | ColorPair(Red, Blue),
+      [HUGEPAGE_4] = A_BOLD | ColorPair(White, Blue),
+      [LOAD_AVERAGE_FIFTEEN] = A_BOLD | ColorPair(Black, Blue),
+      [LOAD_AVERAGE_FIVE] = A_NORMAL | ColorPair(White, Blue),
+      [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(White, Blue),
+      [LOAD] = A_BOLD | ColorPair(White, Blue),
+      [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Blue),
+      [HELP_SHADOW] = A_BOLD | ColorPair(Black, Blue),
+      [CLOCK] = ColorPair(White, Blue),
+      [DATE] = ColorPair(White, Blue),
+      [DATETIME] = ColorPair(White, Blue),
+      [CHECK_BOX] = ColorPair(Cyan, Blue),
+      [CHECK_MARK] = A_BOLD | ColorPair(White, Blue),
+      [CHECK_TEXT] = A_NORMAL | ColorPair(White, Blue),
+      [HOSTNAME] = ColorPair(White, Blue),
+      [CPU_NICE] = A_BOLD | ColorPair(Cyan, Blue),
+      [CPU_NICE_TEXT] = A_BOLD | ColorPair(Cyan, Blue),
+      [CPU_NORMAL] = A_BOLD | ColorPair(Green, Blue),
+      [CPU_SYSTEM] = A_BOLD | ColorPair(Red, Blue),
+      [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Blue),
+      [CPU_IRQ] = A_BOLD | ColorPair(Black, Blue),
+      [CPU_SOFTIRQ] = ColorPair(Black, Blue),
+      [CPU_STEAL] = ColorPair(White, Blue),
+      [CPU_GUEST] = ColorPair(White, Blue),
+      [PANEL_EDIT] = ColorPair(White, Blue),
+      [SCREENS_OTH_BORDER] = A_BOLD | ColorPair(Yellow, Blue),
+      [SCREENS_OTH_TEXT] = ColorPair(Cyan, Blue),
+      [SCREENS_CUR_BORDER] = ColorPair(Cyan, Cyan),
+      [SCREENS_CUR_TEXT] = ColorPair(Black, Cyan),
+      [PRESSURE_STALL_THREEHUNDRED] = A_BOLD | ColorPair(Black, Blue),
+      [PRESSURE_STALL_SIXTY] = A_NORMAL | ColorPair(White, Blue),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(White, Blue),
+      [FILE_DESCRIPTOR_USED] = A_BOLD | ColorPair(Green, Blue),
+      [FILE_DESCRIPTOR_MAX] = A_BOLD | ColorPair(Red, Blue),
+      [ZFS_MFU] = A_BOLD | ColorPair(White, Blue),
+      [ZFS_MRU] = A_BOLD | ColorPair(Yellow, Blue),
+      [ZFS_ANON] = A_BOLD | ColorPair(Magenta, Blue),
+      [ZFS_HEADER] = A_BOLD | ColorPair(Yellow, Blue),
+      [ZFS_OTHER] = A_BOLD | ColorPair(Magenta, Blue),
+      [ZFS_COMPRESSED] = A_BOLD | ColorPair(White, Blue),
+      [ZFS_RATIO] = A_BOLD | ColorPair(Magenta, Blue),
+      [ZRAM_COMPRESSED] = ColorPair(Cyan, Blue),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Blue),
+      [DYNAMIC_GRAY] = ColorPairGrayBlack,
+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
+      [DYNAMIC_RED] = ColorPair(Red, Blue),
+      [DYNAMIC_GREEN] = ColorPair(Green, Blue),
+      [DYNAMIC_BLUE] = ColorPair(Black, Blue),
+      [DYNAMIC_CYAN] = ColorPair(Cyan, Blue),
+      [DYNAMIC_MAGENTA] = ColorPair(Magenta, Blue),
+      [DYNAMIC_YELLOW] = ColorPair(Yellow, Blue),
+      [DYNAMIC_WHITE] = ColorPair(White, Blue),
+   },
+   [COLORSCHEME_BLACKNIGHT] = {
+      [RESET_COLOR] = ColorPair(Cyan, Black),
+      [DEFAULT_COLOR] = ColorPair(Cyan, Black),
+      [FUNCTION_BAR] = ColorPair(Black, Green),
+      [FUNCTION_KEY] = ColorPair(Cyan, Black),
+      [PANEL_HEADER_FOCUS] = ColorPair(Black, Green),
+      [PANEL_HEADER_UNFOCUS] = ColorPair(Black, Green),
+      [PANEL_SELECTION_FOCUS] = ColorPair(Black, Cyan),
+      [PANEL_SELECTION_FOLLOW] = ColorPair(Black, Yellow),
+      [PANEL_SELECTION_UNFOCUS] = ColorPair(Black, White),
+      [FAILED_SEARCH] = ColorPair(Red, Green),
+      [FAILED_READ] = A_BOLD | ColorPair(Red, Black),
+      [PAUSED] = A_BOLD | ColorPair(Yellow, Green),
+      [UPTIME] = ColorPair(Green, Black),
+      [BATTERY] = ColorPair(Green, Black),
+      [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
+      [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [METER_TEXT] = ColorPair(Cyan, Black),
+      [METER_VALUE] = ColorPair(Green, Black),
+      [METER_VALUE_ERROR] = A_BOLD | ColorPair(Red, Black),
+      [METER_VALUE_IOREAD] = ColorPair(Green, Black),
+      [METER_VALUE_IOWRITE] = ColorPair(Blue, Black),
+      [METER_VALUE_NOTICE] = A_BOLD | ColorPair(White, Black),
+      [METER_VALUE_OK] = ColorPair(Green, Black),
+      [METER_VALUE_WARN] = A_BOLD | ColorPair(Yellow, Black),
+      [LED_COLOR] = ColorPair(Green, Black),
+      [TASKS_RUNNING] = A_BOLD | ColorPair(Green, Black),
+      [PROCESS] = ColorPair(Cyan, Black),
+      [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [PROCESS_TAG] = A_BOLD | ColorPair(Yellow, Black),
+      [PROCESS_MEGABYTES] = A_BOLD | ColorPair(Green, Black),
+      [PROCESS_GIGABYTES] = A_BOLD | ColorPair(Yellow, Black),
+      [PROCESS_BASENAME] = A_BOLD | ColorPair(Green, Black),
+      [PROCESS_TREE] = ColorPair(Cyan, Black),
+      [PROCESS_THREAD] = ColorPair(Green, Black),
+      [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue, Black),
+      [PROCESS_COMM] = ColorPair(Magenta, Black),
+      [PROCESS_THREAD_COMM] = ColorPair(Yellow, Black),
+      [PROCESS_RUN_STATE] = ColorPair(Green, Black),
+      [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black),
+      [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black),
+      [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black),
+      [PROCESS_NEW] = ColorPair(Black, Green),
+      [PROCESS_TOMB] = ColorPair(Black, Red),
+      [PROCESS_PRIV] = ColorPair(Magenta, Black),
+      [BAR_BORDER] = A_BOLD | ColorPair(Green, Black),
+      [BAR_SHADOW] = ColorPair(Cyan, Black),
+      [SWAP] = ColorPair(Red, Black),
+      [SWAP_CACHE] = ColorPair(Yellow, Black),
+      [SWAP_FRONTSWAP] = ColorPair(Yellow, Black),
+      [GRAPH_1] = A_BOLD | ColorPair(Green, Black),
+      [GRAPH_2] = ColorPair(Green, Black),
+      [MEMORY_USED] = ColorPair(Green, Black),
+      [MEMORY_BUFFERS] = ColorPair(Blue, Black),
+      [MEMORY_BUFFERS_TEXT] = A_BOLD | ColorPair(Blue, Black),
+      [MEMORY_CACHE] = ColorPair(Yellow, Black),
+      [MEMORY_SHARED] = ColorPair(Magenta, Black),
+      [MEMORY_COMPRESSED] = ColorPair(Yellow, Black),
+      [HUGEPAGE_1] = ColorPair(Green, Black),
+      [HUGEPAGE_2] = ColorPair(Yellow, Black),
+      [HUGEPAGE_3] = ColorPair(Red, Black),
+      [HUGEPAGE_4] = ColorPair(Blue, Black),
+      [LOAD_AVERAGE_FIFTEEN] = ColorPair(Green, Black),
+      [LOAD_AVERAGE_FIVE] = ColorPair(Green, Black),
+      [LOAD_AVERAGE_ONE] = A_BOLD | ColorPair(Green, Black),
+      [LOAD] = A_BOLD,
+      [HELP_BOLD] = A_BOLD | ColorPair(Cyan, Black),
+      [HELP_SHADOW] = A_BOLD | ColorPairGrayBlack,
+      [CLOCK] = ColorPair(Green, Black),
+      [CHECK_BOX] = ColorPair(Green, Black),
+      [CHECK_MARK] = A_BOLD | ColorPair(Green, Black),
+      [CHECK_TEXT] = ColorPair(Cyan, Black),
+      [HOSTNAME] = ColorPair(Green, Black),
+      [CPU_NICE] = ColorPair(Blue, Black),
+      [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue, Black),
+      [CPU_NORMAL] = ColorPair(Green, Black),
+      [CPU_SYSTEM] = ColorPair(Red, Black),
+      [CPU_IOWAIT] = ColorPair(Yellow, Black),
+      [CPU_IRQ] = A_BOLD | ColorPair(Blue, Black),
+      [CPU_SOFTIRQ] = ColorPair(Blue, Black),
+      [CPU_STEAL] = ColorPair(Cyan, Black),
+      [CPU_GUEST] = ColorPair(Cyan, Black),
+      [PANEL_EDIT] = ColorPair(White, Cyan),
+      [SCREENS_OTH_BORDER] = ColorPair(White, Black),
+      [SCREENS_OTH_TEXT] = ColorPair(Cyan, Black),
+      [SCREENS_CUR_BORDER] = A_BOLD | ColorPair(White, Black),
+      [SCREENS_CUR_TEXT] = A_BOLD | ColorPair(Green, Black),
+      [PRESSURE_STALL_THREEHUNDRED] = ColorPair(Green, Black),
+      [PRESSURE_STALL_SIXTY] = ColorPair(Green, Black),
+      [PRESSURE_STALL_TEN] = A_BOLD | ColorPair(Green, Black),
+      [FILE_DESCRIPTOR_USED] = ColorPair(Green, Black),
+      [FILE_DESCRIPTOR_MAX] = A_BOLD | ColorPair(Blue, Black),
+      [ZFS_MFU] = ColorPair(Blue, Black),
+      [ZFS_MRU] = ColorPair(Yellow, Black),
+      [ZFS_ANON] = ColorPair(Magenta, Black),
+      [ZFS_HEADER] = ColorPair(Yellow, Black),
+      [ZFS_OTHER] = ColorPair(Magenta, Black),
+      [ZFS_COMPRESSED] = ColorPair(Blue, Black),
+      [ZFS_RATIO] = ColorPair(Magenta, Black),
+      [ZRAM_COMPRESSED] = ColorPair(Blue, Black),
+      [ZRAM_UNCOMPRESSED] = ColorPair(Yellow, Black),
+      [DYNAMIC_GRAY] = ColorPairGrayBlack,
+      [DYNAMIC_DARKGRAY] = A_BOLD | ColorPairGrayBlack,
+      [DYNAMIC_RED] = ColorPair(Red, Black),
+      [DYNAMIC_GREEN] = ColorPair(Green, Black),
+      [DYNAMIC_BLUE] = ColorPair(Blue, Black),
+      [DYNAMIC_CYAN] = ColorPair(Cyan, Black),
+      [DYNAMIC_MAGENTA] = ColorPair(Magenta, Black),
+      [DYNAMIC_YELLOW] = ColorPair(Yellow, Black),
+      [DYNAMIC_WHITE] = ColorPair(White, Black),
+   },
+   [COLORSCHEME_BROKENGRAY] = { 0 } // dynamically generated.
+};
+
+static bool CRT_retainScreenOnExit = false;
+
+int CRT_scrollHAmount = 5;
+
+int CRT_scrollWheelVAmount = 10;
+
+ColorScheme CRT_colorScheme = COLORSCHEME_DEFAULT;
+
+ATTR_NORETURN
+static void CRT_handleSIGTERM(ATTR_UNUSED int sgn) {
+   CRT_done();
+   _exit(0);
+}
+
+#ifndef NDEBUG
+
+static int stderrRedirectNewFd = -1;
+static int stderrRedirectBackupFd = -1;
+
+static int createStderrCacheFile(void) {
+#if defined(HAVE_MEMFD_CREATE)
+   return memfd_create("htop.stderr-redirect", 0);
+#elif defined(O_TMPFILE)
+   return open("/tmp", O_TMPFILE | O_CREAT | O_EXCL | O_RDWR, S_IRUSR | S_IWUSR);
+#else
+   char tmpName[] = "htop.stderr-redirectXXXXXX";
+   mode_t curUmask = umask(S_IXUSR | S_IRWXG | S_IRWXO);
+   int r = mkstemp(tmpName);
+   umask(curUmask);
+   if (r < 0)
+      return r;
+
+   (void) unlink(tmpName);
+
+   return r;
+#endif /* HAVE_MEMFD_CREATE */
+}
+
+static void redirectStderr(void) {
+   stderrRedirectNewFd = createStderrCacheFile();
+   if (stderrRedirectNewFd < 0) {
+      /* ignore failure */
+      return;
+   }
+
+   stderrRedirectBackupFd = dup(STDERR_FILENO);
+   dup2(stderrRedirectNewFd, STDERR_FILENO);
+}
+
+static void dumpStderr(void) {
+   if (stderrRedirectNewFd < 0)
+      return;
+
+   fsync(STDERR_FILENO);
+   dup2(stderrRedirectBackupFd, STDERR_FILENO);
+   close(stderrRedirectBackupFd);
+   stderrRedirectBackupFd = -1;
+   lseek(stderrRedirectNewFd, 0, SEEK_SET);
+
+   bool header = false;
+   char buffer[8192];
+   for (;;) {
+      errno = 0;
+      ssize_t res = read(stderrRedirectNewFd, buffer, sizeof(buffer));
+      if (res < 0) {
+         if (errno == EINTR)
+            continue;
+
+         break;
+      }
+
+      if (res == 0) {
+         break;
+      }
+
+      if (res > 0) {
+         if (!header) {
+            fprintf(stderr, ">>>>>>>>>> stderr output >>>>>>>>>>\n");
+            header = true;
+         }
+         full_write(STDERR_FILENO, buffer, res);
+      }
+   }
+
+   if (header)
+      fprintf(stderr, "\n<<<<<<<<<< stderr output <<<<<<<<<<\n");
+
+   close(stderrRedirectNewFd);
+   stderrRedirectNewFd = -1;
+}
+
+void CRT_debug_impl(const char* file, size_t lineno, const char* func, const char* fmt, ...)  {
+   va_list args;
+
+   fprintf(stderr, "[%s:%zu (%s)]: ", file, lineno, func);
+   va_start(args, fmt);
+   vfprintf(stderr, fmt, args);
+   va_end(args);
+   fprintf(stderr, "\n");
+}
+
+#else /* !NDEBUG */
+
+static void redirectStderr(void) {
+}
+
+static void dumpStderr(void) {
+}
+
+#endif /* !NDEBUG */
+
+static struct sigaction old_sig_handler[32];
+
+static void CRT_installSignalHandlers(void) {
+   struct sigaction act;
+   sigemptyset(&act.sa_mask);
+   act.sa_flags = (int)SA_RESETHAND | SA_NODEFER;
+   act.sa_handler = CRT_handleSIGSEGV;
+   sigaction(SIGSEGV, &act, &old_sig_handler[SIGSEGV]);
+   sigaction(SIGFPE, &act, &old_sig_handler[SIGFPE]);
+   sigaction(SIGILL, &act, &old_sig_handler[SIGILL]);
+   sigaction(SIGBUS, &act, &old_sig_handler[SIGBUS]);
+   sigaction(SIGPIPE, &act, &old_sig_handler[SIGPIPE]);
+   sigaction(SIGSYS, &act, &old_sig_handler[SIGSYS]);
+   sigaction(SIGABRT, &act, &old_sig_handler[SIGABRT]);
+
+   signal(SIGCHLD, SIG_DFL);
+   signal(SIGINT, CRT_handleSIGTERM);
+   signal(SIGTERM, CRT_handleSIGTERM);
+   signal(SIGQUIT, CRT_handleSIGTERM);
+}
+
+void CRT_resetSignalHandlers(void) {
+   sigaction(SIGSEGV, &old_sig_handler[SIGSEGV], NULL);
+   sigaction(SIGFPE, &old_sig_handler[SIGFPE], NULL);
+   sigaction(SIGILL, &old_sig_handler[SIGILL], NULL);
+   sigaction(SIGBUS, &old_sig_handler[SIGBUS], NULL);
+   sigaction(SIGPIPE, &old_sig_handler[SIGPIPE], NULL);
+   sigaction(SIGSYS, &old_sig_handler[SIGSYS], NULL);
+   sigaction(SIGABRT, &old_sig_handler[SIGABRT], NULL);
+
+   signal(SIGINT, SIG_DFL);
+   signal(SIGTERM, SIG_DFL);
+   signal(SIGQUIT, SIG_DFL);
+}
+
+#ifdef HAVE_GETMOUSE
+void CRT_setMouse(bool enabled) {
+   if (enabled) {
+#if NCURSES_MOUSE_VERSION > 1
+      mousemask(BUTTON1_RELEASED | BUTTON4_PRESSED | BUTTON5_PRESSED, NULL);
+#else
+      mousemask(BUTTON1_RELEASED, NULL);
+#endif
+   } else {
+      mousemask(0, NULL);
+   }
+}
+#endif
+
+void CRT_init(const Settings* settings, bool allowUnicode, bool retainScreenOnExit) {
+   initscr();
+
+   if (retainScreenOnExit) {
+      CRT_retainScreenOnExit = true;
+      refresh();
+      tputs(exit_ca_mode, 0, putchar);
+      tputs(clear_screen, 0, putchar);
+      fflush(stdout);
+      enter_ca_mode = 0;
+      exit_ca_mode = 0;
+   }
+
+   redirectStderr();
+   noecho();
+   CRT_crashSettings = settings;
+   CRT_delay = &(settings->delay);
+   CRT_colors = CRT_colorSchemes[settings->colorScheme];
+   CRT_colorScheme = settings->colorScheme;
+
+   for (int i = 0; i < LAST_COLORELEMENT; i++) {
+      unsigned int color = CRT_colorSchemes[COLORSCHEME_DEFAULT][i];
+      CRT_colorSchemes[COLORSCHEME_BROKENGRAY][i] = color == (A_BOLD | ColorPairGrayBlack) ? ColorPair(White, Black) : color;
+   }
+
+   halfdelay(*CRT_delay);
+   nonl();
+   intrflush(stdscr, false);
+   keypad(stdscr, true);
+#ifdef HAVE_GETMOUSE
+   mouseinterval(0);
+#endif
+   curs_set(0);
+
+   if (has_colors()) {
+      start_color();
+   }
+
+   const char* termType = getenv("TERM");
+   if (termType && String_eq(termType, "linux")) {
+      CRT_scrollHAmount = 20;
+   } else {
+      CRT_scrollHAmount = 5;
+   }
+
+   if (termType && (String_startsWith(termType, "xterm") || String_eq(termType, "vt220"))) {
+#ifdef HTOP_NETBSD
+#define define_key(s_, k_) define_key((char*)s_, k_)
+IGNORE_WCASTQUAL_BEGIN
+#endif
+      define_key("\033[H", KEY_HOME);
+      define_key("\033[F", KEY_END);
+      define_key("\033[7~", KEY_HOME);
+      define_key("\033[8~", KEY_END);
+      define_key("\033OP", KEY_F(1));
+      define_key("\033OQ", KEY_F(2));
+      define_key("\033OR", KEY_F(3));
+      define_key("\033OS", KEY_F(4));
+      define_key("\033O2R", KEY_F(15));
+      define_key("\033[11~", KEY_F(1));
+      define_key("\033[12~", KEY_F(2));
+      define_key("\033[13~", KEY_F(3));
+      define_key("\033[14~", KEY_F(4));
+      define_key("\033[14;2~", KEY_F(15));
+      define_key("\033[17;2~", KEY_F(18));
+      define_key("\033[Z", KEY_SHIFT_TAB);
+      char sequence[3] = "\033a";
+      for (char c = 'a'; c <= 'z'; c++) {
+         sequence[1] = c;
+         define_key(sequence, KEY_ALT('A' + (c - 'a')));
+      }
+#ifdef HTOP_NETBSD
+IGNORE_WCASTQUAL_END
+#undef define_key
+#endif
+   }
+   if (termType && (String_startsWith(termType, "rxvt"))) {
+      define_key("\033[Z", KEY_SHIFT_TAB);
+   }
+
+   CRT_installSignalHandlers();
+
+   use_default_colors();
+   if (!has_colors())
+      CRT_colorScheme = COLORSCHEME_MONOCHROME;
+   CRT_setColors(CRT_colorScheme);
+
+#ifdef HAVE_LIBNCURSESW
+   if (allowUnicode && String_eq(nl_langinfo(CODESET), "UTF-8")) {
+      CRT_utf8 = true;
+   } else {
+      CRT_utf8 = false;
+   }
+#else
+   (void) allowUnicode;
+#endif
+
+   CRT_treeStr =
+#ifdef HAVE_LIBNCURSESW
+      CRT_utf8 ? CRT_treeStrUtf8 :
+#endif
+      CRT_treeStrAscii;
+
+   CRT_setMouse(settings->enableMouse);
+
+   CRT_degreeSign = initDegreeSign();
+}
+
+void CRT_done(void) {
+   int resetColor = CRT_colors ? CRT_colors[RESET_COLOR] : CRT_colorSchemes[COLORSCHEME_DEFAULT][RESET_COLOR];
+
+   attron(resetColor);
+   mvhline(LINES - 1, 0, ' ', COLS);
+   attroff(resetColor);
+   refresh();
+
+   if (CRT_retainScreenOnExit) {
+      mvcur(-1, -1, LINES - 1, 0);
+   }
+
+   curs_set(1);
+   endwin();
+
+   dumpStderr();
+}
+
+void CRT_fatalError(const char* note) {
+   const char* sysMsg = strerror(errno);
+   CRT_done();
+   fprintf(stderr, "%s: %s\n", note, sysMsg);
+   exit(2);
+}
+
+int CRT_readKey(void) {
+   nocbreak();
+   cbreak();
+   nodelay(stdscr, FALSE);
+   int ret = getch();
+   halfdelay(*CRT_delay);
+   return ret;
+}
+
+void CRT_disableDelay(void) {
+   nocbreak();
+   cbreak();
+   nodelay(stdscr, TRUE);
+}
+
+void CRT_enableDelay(void) {
+   halfdelay(*CRT_delay);
+}
+
+void CRT_setColors(int colorScheme) {
+   CRT_colorScheme = colorScheme;
+
+   for (short int i = 0; i < 8; i++) {
+      for (short int j = 0; j < 8; j++) {
+         if (ColorIndex(i, j) != ColorIndexGrayBlack && ColorIndex(i, j) != ColorIndexWhiteDefault) {
+            short int bg = (colorScheme != COLORSCHEME_BLACKNIGHT) && (j == 0) ? -1 : j;
+            init_pair(ColorIndex(i, j), i, bg);
+         }
+      }
+   }
+
+   short int grayBlackFg = COLORS > 8 ? 8 : 0;
+   short int grayBlackBg = (colorScheme != COLORSCHEME_BLACKNIGHT) ? -1 : 0;
+   init_pair(ColorIndexGrayBlack, grayBlackFg, grayBlackBg);
+
+   init_pair(ColorIndexWhiteDefault, White, -1);
+
+   CRT_colors = CRT_colorSchemes[colorScheme];
+}
+
+#ifdef PRINT_BACKTRACE
+static void print_backtrace(void) {
+#if defined(HAVE_LIBUNWIND_H) && defined(HAVE_LIBUNWIND)
+   unw_context_t context;
+   unw_getcontext(&context);
+
+   unw_cursor_t cursor;
+   unw_init_local(&cursor, &context);
+
+   unsigned int item = 0;
+
+   while (unw_step(&cursor) > 0) {
+      unw_word_t pc;
+      unw_get_reg(&cursor, UNW_REG_IP, &pc);
+      if (pc == 0)
+         break;
+
+      char symbolName[256] = "?";
+      unw_word_t offset = 0;
+      unw_get_proc_name(&cursor, symbolName, sizeof(symbolName), &offset);
+
+      unw_proc_info_t pip;
+      pip.unwind_info = 0;
+
+      const char* fname = "?";
+      const void* ptr = 0;
+      if (unw_get_proc_info(&cursor, &pip) == 0) {
+         ptr = (const void*)(pip.start_ip + offset);
+
+         #ifdef HAVE_DLADDR
+         Dl_info dlinfo;
+         if (dladdr(ptr, &dlinfo) && dlinfo.dli_fname && *dlinfo.dli_fname)
+            fname = dlinfo.dli_fname;
+         #endif
+      }
+
+      const bool is_signal_frame = unw_is_signal_frame(&cursor) > 0;
+      const char* frame = is_signal_frame ? "  {signal frame}" : "";
+
+      fprintf(stderr, "%2u: %#14lx  %s  (%s+%#lx)  [%p]%s\n", item++, pc, fname, symbolName, offset, ptr, frame);
+   }
+#elif defined(HAVE_EXECINFO_H)
+   void* backtraceArray[256];
+
+   size_t size = backtrace(backtraceArray, ARRAYSIZE(backtraceArray));
+   backtrace_symbols_fd(backtraceArray, size, STDERR_FILENO);
+#else
+#error No implementation for print_backtrace()!
+#endif
+}
+#endif
+
+void CRT_handleSIGSEGV(int signal) {
+   CRT_done();
+
+   fprintf(stderr, "\n\n"
+      "FATAL PROGRAM ERROR DETECTED\n"
+      "============================\n"
+      "Please check at https://htop.dev/issues whether this issue has already been reported.\n"
+      "If no similar issue has been reported before, please create a new issue with the following information:\n"
+      "  - Your %s version: '"VERSION"'\n"
+      "  - Your OS and kernel version (uname -a)\n"
+      "  - Your distribution and release (lsb_release -a)\n"
+      "  - Likely steps to reproduce (How did it happen?)\n",
+      program
+   );
+
+#ifdef PRINT_BACKTRACE
+   fprintf(stderr, "  - Backtrace of the issue (see below)\n");
+#endif
+
+   fprintf(stderr,
+      "\n"
+   );
+
+   const char* signal_str = strsignal(signal);
+   if (!signal_str) {
+      signal_str = "unknown reason";
+   }
+   fprintf(stderr,
+      "Error information:\n"
+      "------------------\n"
+      "A signal %d (%s) was received.\n"
+      "\n",
+      signal, signal_str
+   );
+
+   fprintf(stderr,
+      "Setting information:\n"
+      "--------------------\n");
+   Settings_write(CRT_crashSettings, true);
+   fprintf(stderr, "\n\n");
+
+#ifdef PRINT_BACKTRACE
+   fprintf(stderr,
+      "Backtrace information:\n"
+      "----------------------\n"
+   );
+
+   print_backtrace();
+
+   fprintf(stderr,
+      "\n"
+      "To make the above information more practical to work with, "
+      "please also provide a disassembly of your %s binary. "
+      "This can usually be done by running the following command:\n"
+      "\n",
+      program
+   );
+
+#ifdef HTOP_DARWIN
+   fprintf(stderr, "   otool -tvV `which %s` > ~/%s.otool\n", program, program);
+#else
+   fprintf(stderr, "   objdump -d -S -w `which %s` > ~/%s.objdump\n", program, program);
+#endif
+
+   fprintf(stderr,
+      "\n"
+      "Please include the generated file in your report.\n"
+   );
+#endif
+
+   fprintf(stderr,
+      "Running this program with debug symbols or inside a debugger may provide further insights.\n"
+      "\n"
+      "Thank you for helping to improve %s!\n"
+      "\n",
+      program
+   );
+
+   /* Call old sigsegv handler; may be default exit or third party one (e.g. ASAN) */
+   if (sigaction(signal, &old_sig_handler[signal], NULL) < 0) {
+      /* This avoids an infinite loop in case the handler could not be reset. */
+      fprintf(stderr,
+         "!!! Chained handler could not be restored. Forcing exit.\n"
+      );
+      _exit(1);
+   }
+
+   /* Trigger the previous signal handler. */
+   raise(signal);
+
+   // Always terminate, even if installed handler returns
+   fprintf(stderr,
+      "!!! Chained handler did not exit. Forcing exit.\n"
+   );
+   _exit(1);
+}
diff --git a/CRT.h b/CRT.h
new file mode 100644
index 0000000..5809798
--- /dev/null
+++ b/CRT.h
@@ -0,0 +1,212 @@
+#ifndef HEADER_CRT
+#define HEADER_CRT
+/*
+htop - CRT.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Macros.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+
+
+typedef enum TreeStr_ {
+   TREE_STR_VERT,
+   TREE_STR_RTEE,
+   TREE_STR_BEND,
+   TREE_STR_TEND,
+   TREE_STR_OPEN,
+   TREE_STR_SHUT,
+   TREE_STR_ASC,
+   TREE_STR_DESC,
+   LAST_TREE_STR
+} TreeStr;
+
+typedef enum ColorScheme_ {
+   COLORSCHEME_DEFAULT,
+   COLORSCHEME_MONOCHROME,
+   COLORSCHEME_BLACKONWHITE,
+   COLORSCHEME_LIGHTTERMINAL,
+   COLORSCHEME_MIDNIGHT,
+   COLORSCHEME_BLACKNIGHT,
+   COLORSCHEME_BROKENGRAY,
+   LAST_COLORSCHEME
+} ColorScheme;
+
+typedef enum ColorElements_ {
+   RESET_COLOR,
+   DEFAULT_COLOR,
+   FUNCTION_BAR,
+   FUNCTION_KEY,
+   FAILED_SEARCH,
+   FAILED_READ,
+   PAUSED,
+   PANEL_HEADER_FOCUS,
+   PANEL_HEADER_UNFOCUS,
+   PANEL_SELECTION_FOCUS,
+   PANEL_SELECTION_FOLLOW,
+   PANEL_SELECTION_UNFOCUS,
+   LARGE_NUMBER,
+   METER_SHADOW,
+   METER_TEXT,
+   METER_VALUE,
+   METER_VALUE_ERROR,
+   METER_VALUE_IOREAD,
+   METER_VALUE_IOWRITE,
+   METER_VALUE_NOTICE,
+   METER_VALUE_OK,
+   METER_VALUE_WARN,
+   LED_COLOR,
+   UPTIME,
+   BATTERY,
+   TASKS_RUNNING,
+   SWAP,
+   SWAP_CACHE,
+   SWAP_FRONTSWAP,
+   PROCESS,
+   PROCESS_SHADOW,
+   PROCESS_TAG,
+   PROCESS_MEGABYTES,
+   PROCESS_GIGABYTES,
+   PROCESS_TREE,
+   PROCESS_RUN_STATE,
+   PROCESS_D_STATE,
+   PROCESS_BASENAME,
+   PROCESS_HIGH_PRIORITY,
+   PROCESS_LOW_PRIORITY,
+   PROCESS_NEW,
+   PROCESS_TOMB,
+   PROCESS_THREAD,
+   PROCESS_THREAD_BASENAME,
+   PROCESS_COMM,
+   PROCESS_THREAD_COMM,
+   PROCESS_PRIV,
+   BAR_BORDER,
+   BAR_SHADOW,
+   GRAPH_1,
+   GRAPH_2,
+   MEMORY_USED,
+   MEMORY_BUFFERS,
+   MEMORY_BUFFERS_TEXT,
+   MEMORY_CACHE,
+   MEMORY_SHARED,
+   MEMORY_COMPRESSED,
+   HUGEPAGE_1,
+   HUGEPAGE_2,
+   HUGEPAGE_3,
+   HUGEPAGE_4,
+   LOAD,
+   LOAD_AVERAGE_FIFTEEN,
+   LOAD_AVERAGE_FIVE,
+   LOAD_AVERAGE_ONE,
+   CHECK_BOX,
+   CHECK_MARK,
+   CHECK_TEXT,
+   CLOCK,
+   DATE,
+   DATETIME,
+   HELP_BOLD,
+   HELP_SHADOW,
+   HOSTNAME,
+   CPU_NICE,
+   CPU_NICE_TEXT,
+   CPU_NORMAL,
+   CPU_SYSTEM,
+   CPU_IOWAIT,
+   CPU_IRQ,
+   CPU_SOFTIRQ,
+   CPU_STEAL,
+   CPU_GUEST,
+   PANEL_EDIT,
+   SCREENS_OTH_BORDER,
+   SCREENS_OTH_TEXT,
+   SCREENS_CUR_BORDER,
+   SCREENS_CUR_TEXT,
+   PRESSURE_STALL_TEN,
+   PRESSURE_STALL_SIXTY,
+   PRESSURE_STALL_THREEHUNDRED,
+   FILE_DESCRIPTOR_USED,
+   FILE_DESCRIPTOR_MAX,
+   ZFS_MFU,
+   ZFS_MRU,
+   ZFS_ANON,
+   ZFS_HEADER,
+   ZFS_OTHER,
+   ZFS_COMPRESSED,
+   ZFS_RATIO,
+   ZRAM_COMPRESSED,
+   ZRAM_UNCOMPRESSED,
+   DYNAMIC_GRAY,
+   DYNAMIC_DARKGRAY,
+   DYNAMIC_RED,
+   DYNAMIC_GREEN,
+   DYNAMIC_BLUE,
+   DYNAMIC_CYAN,
+   DYNAMIC_MAGENTA,
+   DYNAMIC_YELLOW,
+   DYNAMIC_WHITE,
+   LAST_COLORELEMENT
+} ColorElements;
+
+void CRT_fatalError(const char* note) ATTR_NORETURN;
+
+#ifdef NDEBUG
+# define CRT_debug(...)
+#else
+void CRT_debug_impl(const char* file, size_t lineno, const char* func, const char* fmt, ...) ATTR_FORMAT(printf, 4, 5);
+# define CRT_debug(...) CRT_debug_impl(__FILE__, __LINE__, __func__, __VA_ARGS__)
+#endif
+
+void CRT_handleSIGSEGV(int signal) ATTR_NORETURN;
+
+#define KEY_WHEELUP   KEY_F(30)
+#define KEY_WHEELDOWN KEY_F(31)
+#define KEY_RECLICK   KEY_F(32)
+#define KEY_SHIFT_TAB KEY_F(33)
+#define KEY_ALT(x)    (KEY_F(64 - 26) + ((x) - 'A'))
+
+extern const char* CRT_degreeSign;
+
+#ifdef HAVE_LIBNCURSESW
+
+extern bool CRT_utf8;
+
+#endif
+
+extern const char* const* CRT_treeStr;
+
+extern const int* CRT_colors;
+
+extern int CRT_cursorX;
+
+extern int CRT_scrollHAmount;
+
+extern int CRT_scrollWheelVAmount;
+
+extern ColorScheme CRT_colorScheme;
+
+#ifdef HAVE_GETMOUSE
+void CRT_setMouse(bool enabled);
+#else
+#define CRT_setMouse(enabled)
+#endif
+
+void CRT_init(const Settings* settings, bool allowUnicode, bool retainScreenOnExit);
+
+void CRT_done(void);
+
+void CRT_resetSignalHandlers(void);
+
+int CRT_readKey(void);
+
+void CRT_disableDelay(void);
+
+void CRT_enableDelay(void);
+
+void CRT_setColors(int colorScheme);
+
+#endif
diff --git a/CategoriesPanel.c b/CategoriesPanel.c
new file mode 100644
index 0000000..64a3f06
--- /dev/null
+++ b/CategoriesPanel.c
@@ -0,0 +1,189 @@
+/*
+htop - CategoriesPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CategoriesPanel.h"
+
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "AvailableMetersPanel.h"
+#include "ColorsPanel.h"
+#include "DisplayOptionsPanel.h"
+#include "FunctionBar.h"
+#include "Header.h"
+#include "HeaderLayout.h"
+#include "HeaderOptionsPanel.h"
+#include "ListItem.h"
+#include "Macros.h"
+#include "MetersPanel.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+#include "ScreensPanel.h"
+#include "ScreenTabsPanel.h"
+#include "Settings.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+
+static const char* const CategoriesFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static void CategoriesPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   CategoriesPanel* this = (CategoriesPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static void CategoriesPanel_makeMetersPage(CategoriesPanel* this) {
+   size_t columns = HeaderLayout_getColumns(this->scr->header->headerLayout);
+   MetersPanel** meterPanels = xMallocArray(columns, sizeof(MetersPanel*));
+   Settings* settings = this->host->settings;
+
+   for (size_t i = 0; i < columns; i++) {
+      char titleBuffer[32];
+      xSnprintf(titleBuffer, sizeof(titleBuffer), "Column %zu", i + 1);
+      meterPanels[i] = MetersPanel_new(settings, titleBuffer, this->header->columns[i], this->scr);
+
+      if (i != 0) {
+         meterPanels[i]->leftNeighbor = meterPanels[i - 1];
+         meterPanels[i - 1]->rightNeighbor = meterPanels[i];
+      }
+
+      ScreenManager_add(this->scr, (Panel*) meterPanels[i], 20);
+   }
+
+   Panel* availableMeters = (Panel*) AvailableMetersPanel_new(this->host, this->header, columns, meterPanels, this->scr);
+   ScreenManager_add(this->scr, availableMeters, -1);
+}
+
+static void CategoriesPanel_makeDisplayOptionsPage(CategoriesPanel* this) {
+   Settings* settings = this->host->settings;
+   Panel* displayOptions = (Panel*) DisplayOptionsPanel_new(settings, this->scr);
+   ScreenManager_add(this->scr, displayOptions, -1);
+}
+
+static void CategoriesPanel_makeColorsPage(CategoriesPanel* this) {
+   Settings* settings = this->host->settings;
+   Panel* colors = (Panel*) ColorsPanel_new(settings);
+   ScreenManager_add(this->scr, colors, -1);
+}
+
+#if defined(HTOP_PCP)   /* all platforms supporting dynamic screens */
+static void CategoriesPanel_makeScreenTabsPage(CategoriesPanel* this) {
+   Settings* settings = this->host->settings;
+   Panel* screenTabs = (Panel*) ScreenTabsPanel_new(settings);
+   Panel* screenNames = (Panel*) ((ScreenTabsPanel*)screenTabs)->names;
+   ScreenManager_add(this->scr, screenTabs, 20);
+   ScreenManager_add(this->scr, screenNames, -1);
+}
+#endif
+
+static void CategoriesPanel_makeScreensPage(CategoriesPanel* this) {
+   Settings* settings = this->host->settings;
+   Panel* screens = (Panel*) ScreensPanel_new(settings);
+   Panel* columns = (Panel*) ((ScreensPanel*)screens)->columns;
+   Panel* availableColumns = (Panel*) ((ScreensPanel*)screens)->availableColumns;
+   ScreenManager_add(this->scr, screens, 20);
+   ScreenManager_add(this->scr, columns, 20);
+   ScreenManager_add(this->scr, availableColumns, -1);
+}
+
+static void CategoriesPanel_makeHeaderOptionsPage(CategoriesPanel* this) {
+   Settings* settings = this->host->settings;
+   Panel* colors = (Panel*) HeaderOptionsPanel_new(settings, this->scr);
+   ScreenManager_add(this->scr, colors, -1);
+}
+
+typedef void (* CategoriesPanel_makePageFunc)(CategoriesPanel* ref);
+typedef struct CategoriesPanelPage_ {
+   const char* name;
+   CategoriesPanel_makePageFunc ctor;
+} CategoriesPanelPage;
+
+static CategoriesPanelPage categoriesPanelPages[] = {
+   { .name = "Display options", .ctor = CategoriesPanel_makeDisplayOptionsPage },
+   { .name = "Header layout", .ctor = CategoriesPanel_makeHeaderOptionsPage },
+   { .name = "Meters", .ctor = CategoriesPanel_makeMetersPage },
+#if defined(HTOP_PCP)   /* all platforms supporting dynamic screens */
+   { .name = "Screen tabs", .ctor = CategoriesPanel_makeScreenTabsPage },
+#endif
+   { .name = "Screens", .ctor = CategoriesPanel_makeScreensPage },
+   { .name = "Colors", .ctor = CategoriesPanel_makeColorsPage },
+};
+
+static HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) {
+   CategoriesPanel* this = (CategoriesPanel*) super;
+
+   HandlerResult result = IGNORED;
+
+   int selected = Panel_getSelectedIndex(super);
+   switch (ch) {
+      case EVENT_SET_SELECTED:
+         result = HANDLED;
+         break;
+      case KEY_UP:
+      case KEY_CTRL('P'):
+      case KEY_DOWN:
+      case KEY_CTRL('N'):
+      case KEY_NPAGE:
+      case KEY_PPAGE:
+      case KEY_HOME:
+      case KEY_END: {
+         int previous = selected;
+         Panel_onKey(super, ch);
+         selected = Panel_getSelectedIndex(super);
+         if (previous != selected)
+            result = HANDLED;
+         break;
+      }
+      default:
+         if (0 < ch && ch < 255 && isgraph((unsigned char)ch))
+            result = Panel_selectByTyping(super, ch);
+         if (result == BREAK_LOOP)
+            result = IGNORED;
+         break;
+   }
+   if (result == HANDLED) {
+      int size = ScreenManager_size(this->scr);
+      for (int i = 1; i < size; i++)
+         ScreenManager_remove(this->scr, 1);
+
+      if (selected >= 0 && (size_t)selected < ARRAYSIZE(categoriesPanelPages)) {
+         categoriesPanelPages[selected].ctor(this);
+      }
+   }
+   return result;
+}
+
+const PanelClass CategoriesPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = CategoriesPanel_delete
+   },
+   .eventHandler = CategoriesPanel_eventHandler
+};
+
+CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Header* header, Machine* host) {
+   CategoriesPanel* this = AllocThis(CategoriesPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(CategoriesFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->scr = scr;
+   this->host = host;
+   this->header = header;
+   Panel_setHeader(super, "Categories");
+   for (size_t i = 0; i < ARRAYSIZE(categoriesPanelPages); i++)
+      Panel_add(super, (Object*) ListItem_new(categoriesPanelPages[i].name, 0));
+
+   ScreenManager_add(scr, super, 16);
+   categoriesPanelPages[0].ctor(this);
+   return this;
+}
diff --git a/CategoriesPanel.h b/CategoriesPanel.h
new file mode 100644
index 0000000..1f50b8a
--- /dev/null
+++ b/CategoriesPanel.h
@@ -0,0 +1,27 @@
+#ifndef HEADER_CategoriesPanel
+#define HEADER_CategoriesPanel
+/*
+htop - CategoriesPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Header.h"
+#include "Machine.h"
+#include "Panel.h"
+#include "ScreenManager.h"
+
+
+typedef struct CategoriesPanel_ {
+   Panel super;
+   ScreenManager* scr;
+   Machine* host;
+   Header* header;
+} CategoriesPanel;
+
+extern const PanelClass CategoriesPanel_class;
+
+CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Header* header, Machine* host);
+
+#endif
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b4cdf6a
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,1148 @@
+What's new in version 3.3.0
+
+* Multiple refactorings and code improvements
+* Shorten docker container IDs to 12 characters
+* Settings: preserve empty header
+* Fix execlp() argument without pointer cast
+* OpenFilesScreen: Make column sizing dynamic for file size, offset and inode
+* Add support for "truss" (FreeBSD equivalent of "strace")
+* Darwin: add NetworkIOMeter support
+* HeaderLayout: add "3 columns - 40/30/30", "... 30/40/30" & "... 30/30/40"
+* Meter: use correct unicode characters for digit '9'
+* Note in manual re default memory units of KiB
+* Add column for process container name
+* Add logic to filter the container name (+type) from the CGroup name
+* Change NetworkIOMeter value unit from KiB/s to bytes/second
+* Cap DiskIOMeter "utilisation" percentage at 100%
+* PCP platform implementation of frontswap and zswap accounting
+* Shorten podman/libpod container IDs to 12 characters
+* Write configuration to temporary file first
+* Incorporate shared memory in bar text
+* Move shared memory next to used memory
+* Correct order of memory meter in help
+* Add recalculate to Ctrl-L refresh
+* Update process list on thread visibility toggling
+* Support dynamic screens with 'top-most' entities beyond processes
+* Introduce Row and Table classes for screens beyond top-processes
+* Rework ZramMeter and remove MeterClass.comprisedValues
+* More robust logic for CPU process percentages (Linux & PCP)
+* Show year as start time for processes older than a year
+* Short-term fix for docker container detection
+* default color preset: use bold blue for better visibility
+* Document 'O' keyboard shortcut
+* Implement logic for '--max-iterations'
+* Update F5 key label on tab switch (Tree <-> List)
+* Force re-sorting of the process list view after switching between list/treeview mode
+* Linux: (hack) work around the fact that Zswapped pages may be SwapCached
+* Linux: implement zswap support
+* {Memory,Swap}Meter: add "compressed memory" metrics
+* Darwin: add DiskIOMeter support
+* Fix scroll relative to followed process
+* ZramMeter: update bar mode
+* Use shared real memory on FreeBSD
+* Increase Search and Filter max string length to 128
+* Improve CPU computation code
+* Remove LXC special handling for the CPU count
+* Create new File Descriptor meter
+* PCP: add IRQ PSI meter
+* Linux: add IRQ PSI meter
+* Linux: highlight username if process has elevated privileges
+* Add support for scheduling policies
+* Add a systemd user meter to monitor user units.
+* FreeBSD: remove duplicate zfs ARC size subtraction
+
+What's new in version 3.2.2
+
+* CPUMeter now can show frequency in text mode
+* Add option to render distribution path prefixes shadowed
+* DiskIOMeter converts to bytes per second (not per interval)
+* DiskIOMeter uses complete units, including missing "iB/s"
+* DiskIOMeter indicates read and write in meter mode
+* NetworkIOMeter converts to packets per second, shows packet rate
+* Allow continued process following when changing display settings
+* Update the panel header when changing to another tab
+* Drop margin around the header if there are no meters
+* Use Unicode replacement character for non-printable characters
+* Default color preset uses bold blue for better visibility
+* Update the Panel header on sort order inversions ('I')
+* Toggle the header meters with pound key
+* Fix ScreenPanel to handle quitting the panel while renaming
+* Add fallback for HOME environment variable using passwd database
+* Replace meaningless ID column with FD column in lock screen
+* Use device format in the lock screen matching the files screen
+* On Linux, improvements to file-descriptor lock detection
+* On Linux, further distinguish systemd states in the SystemdMeter
+* On Linux, improvements to cgroup and container identification
+* On Linux, support openat(2) without readlinkat(2) platforms
+* On Darwin, fix current process buffer handling for busy systems
+* On DragonFly BSD, fix incorrect processor time of processes
+* On FreeBSD, fix an issue with the memory graph not showing correctly
+* On FreeBSD, add support for displaying shared memory usage
+* On PCP, use pmLookupDescs(3) if available for efficiency
+* On PCP, normalize generic columns values for consistent display
+* On PCP, changes preparing for configurable, dynamic screens
+* Handle invalid process columns from the configuration file
+* Avoid undefined behaviour with deeply nested processes
+* Fix crash when removing the currently active screen
+* Prevent possible crash on a very early error path
+* Include automake for Debian/Ubuntu
+* Restore non-mouse support
+* Reject unsupported command line arguments
+* Document idle process state
+* Clarify M_TRS/M_DRS columns
+
+What's new in version 3.2.1
+
+* Fix setting to show all branches collapsed by default
+* Restore functionality of stripExeFromCmdline setting
+* Fix some command line display settings not being honored without restart
+* Display single digit precision for CPU% greater than 99.9%
+* On Linux, FreeBSD and PCP consider only shrinkable ZFS ARC as cache
+* On Linux, increase field width of CPUD% and SWAPD% columns
+* Colorize process state characters in help screen
+* Use mousemask(3X) to enable and disable mouse control
+* Fix heap buffer overflow in Vector_compact
+* On Solaris, fix a process time scaling error
+* On Solaris, fix the build
+* On NetBSD, OpenBSD and Solaris ensure env buffer size is sufficient
+* On Linux, resolve processes exiting interfering with sampling
+* Fix ProcessTable quadratic removal when scanning processes
+* Under LXC, limit CPU count to that given by /proc/cpuinfo
+* Improve container detection for LXC
+* Some minor documentation fixes
+
+What's new in version 3.2.0
+
+* Support for displaying multiple tabs in the user interface
+* Allow multiple filter and search terms (logical OR, separate by "|")
+* Set correct default sorting direction (defaultSortDesc)
+* Improve performance for process lookup and update
+* Rework the IOMeters initial display
+* Removed duplicate sections on COMM and EXE
+* Highlight process UNINTERRUPTIBLE_WAIT state (D)
+* Show only integer value when CPU% more than 99.9%
+* Handle rounding ambiguity between 99.9 and 100.0%
+* No longer leaves empty the last column in header
+* Fix header layout and meters reset if a header column is empty
+* Fix PID and UID column widths off-by-one error
+* On Linux, read generic sysfs batteries
+* On Linux, do not collect LRS per thread (it is process-wide)
+* On Linux, dynamically adjust the SECATTR and CGROUP column widths
+* On Linux, fix a crash in LXD
+* On FreeBSD, add support for showing process emulation
+* On Darwin, lazily set process TTY name
+* Always set SIGCHLD to default handling
+* Avoid zombie processes on signal races
+* Ensure last line is cleared when SIGINT is received
+* Instead of SIGTERM, pre-select the last sent signal
+* Internal Hashtable performance and sizing improvements
+* Add heuristics for guessing LXC or Docker from /proc/1/mounts
+* Force elapsed time display to zero if process started in the future
+* Avoid extremely large year values when printing time
+* Fix division by zero when calculating IO rates
+* Fix out of boundary writes in XUtils
+* Fix custom thread name display issue
+* Use AC_CANONICAL_HOST, not AC_CANONICAL_TARGET in configure.ac
+* Support libunwind of LLVM
+
+What's new in version 3.1.2
+
+* Bugfix for crash when storing modified settings at exit
+* Generate xz-compressed source tarball (with configure) using github actions
+* Allow -u UID with numerical value as argument
+* Added documentation for obsolete/state libraries/program files highlighting
+* Some obsolete/stale library highlighting refinements
+* Column width issues resolved
+* Dynamic UID column sizing improved
+* Discard stale information from Disk and Network I/O meters
+* Refined Linux kernel thread detection
+* Reworked process state handling
+* New CCGROUP column showing abbreviated cgroup name
+* New OFFSET column in the list of open files screen
+
+What's new in version 3.1.1
+
+* Update license headers to explicitly say GPLv2+
+* Document minimum version for libcap (thanks to James Brown)
+* Fix mouse wheel collision with autogroups nice adjustment
+* Adjust Makefile.am macro definitions for older automake versions
+* Ensure consistent reporting of MemoryMeter 'used' memory
+* Report hugepage memory as real and used memory (as before)
+* Handle procExeDeleted, usesDeletedLib without mergedCommandline mode
+* Validate meter configuration before proceeding beyond htoprc parsing
+* Properly release memory on partially read configuration
+* Handle interrupted sampling from within libpcp PDU transfers
+* On Linux, provide O_PATH value if not defined
+* On Linux, always compute procExeDeleted if already set
+* Workaround for Rosetta 2 on Darwin (thanks to Alexander Momchilov)
+* Fix FreeBSD cmdline memory leak in Process_updateCmdline, and
+* Plug a Disk I/O meter memory leak on FreeBSD (thanks to Ximalas)
+
+What's new in version 3.1.0
+
+* Updated COPYING file to remove the PLPA exemption (appendix 2)
+  With this change the license is now GPLv2 without any additional wording.
+* Improved default sort ordering
+  Note for users: This may lead to an inverted sort order on startup of
+  htop 3.1.0 compared to previous versions.
+  This is due to what is stored in your htoprc file. Solution: Press I
+  (to invert sort order).
+  This changed setting will be saved by htop on exit as long as it can
+  write to your htoprc file.
+* The compile-time option to cater specifically for running htop as
+  setuid has been removed
+* Add read-only option
+  This allows htop to be run in an non-intrusive fashion where it acts only
+  as a process viewer disabling all functions to manipulate system state.
+  Note: This is not a security feature!
+* Move the code for handling the command line formatting related tasks
+  to be shared across all platforms
+  This means important features like stale binary/library highlighting
+  can now be available on all supported platforms.
+* Make the EXE and COMM columns available on all platforms
+  All supported platforms have the name of the executable (EXE) and a
+  self-chosen thread/command name (COMM) available one way or the other.
+  Moving this column to be handled as a platform-independently available
+  information simplifies the markup of the command line.
+* Introduce configuration file versioning and config_reader_min_version
+  Starting with this version the configuration file contains a version
+  identifying the minimum version of the configuration parser needed to
+  fully understand the configuration file format.
+  Old configuration file formats are automatically upgraded when
+  saving the config file (htoprc).
+* Make the configuration parser friendlier to users (thanks to Bart Bakker)
+  With this change only settings that cannot be parsed properly are
+  reset to their defaults.
+* Improve default display for systems with many CPUs
+* Add the process ELAPSED time column
+* Improve the process STATE column sorting
+* Reworked handling resize and redrawing of the UI
+* Fixed an issue where the LED meter mode could overflow allotted space
+* Allow text mode Meters to span empty neighbors to the right
+* Rescale graph meters when value of total changes
+  (thanks to Michael Schönitzer)
+* Update generic process field display
+  Usually "uninteresting" values in columns like 1 thread, nice value
+  of 0, CPU and memory of 0%, idle/sleeping state, etc. are shown with
+  reduced intensity (dark grey)
+* Option and key ("*") to collapse / expand all branches under PID 1
+  (and PID 2 if kernel threads are shown) (thanks to Krishna Chaitanya)
+* Keep following a process when inverting the sort order, displaying
+  the help screen or hiding/unhiding userland threads.
+  If a thread is currently selected the selection is updated to point
+  to the thread's parent process. (thanks to Gonzalo, et.al.)
+* Reorder process scanning to be performed before updating the display
+  of the meters in the header
+* Always check the user for a process for any changes.
+  This affects multiple platforms that previously didn't correctly handle
+  the user field for a process to change at runtime (e.g. due to seteuid
+  or similar syscalls).
+* Disable mouse option when support is unavailable
+* Support curses libraries without ncurses mouse support
+  (thanks to Santhosh Raju)
+* Support offline and hot-swapping of CPUs on all platforms
+* Fix the CPU Meter for machines with more than 256 CPUs
+* Supplemented the "show updated/deleted executables" feature (red basename)
+  to indicate when linked libraries were updated (yellow basename)
+* Apply the stale binary highlighting for the EXE column in addition to
+  the command line field
+* Add new combined Memory and Swap meter
+* Implement bar and graph mode for NetworkIO Meter
+  (thanks to Michael F. Schönitzer)
+* Rework TTY column to be more consistent across platforms
+* Make the CWD column generally available on all platforms
+  (thanks to Santhosh Raju et. al.)
+* Add Performance Co-Pilot (PCP) platform support
+  This is added via a separate pcp-htop(1) binary which provides remote host
+  analysis, new Meters for any PCP metric and new Columns for any PCP process
+  metric - see the pcp-htop(5) man page for further details.
+  (thanks to Sohaib Mohamed)
+* Add Linux columns and key bindings for process autogroup identifier
+  and nice value
+* Change available and used memory reporting on Linux to be based on
+  MemAvailable (Kernel 3.14+) (thanks to Chris Cheney and Tomas Wido)
+* Add a new SysArchMeter showing kernel and platform information
+  (thanks to ahgamut)
+* Linux memory usage explicitly treats tmpfs memory usage as shared memory
+  This is to make memory used by tmpfs visible as this cannot be freed
+  unlike normal filesystem cache data.
+* Exclude zram devices when calculating DiskIO on Linux
+* Use PATH lookup for systemctl in systemd meter (thanks to Scott Olson)
+* Add native platform support for NetBSD
+  This allows htop to run on NetBSD without the need for active Linux
+  emulation of the procfs filesystem.
+  (thanks to Santhosh Raju and Nia Alarie)
+* Add NetworkIO, DiskIO, CPU frequency, and battery meter support on NetBSD
+  (thanks to Nia Alarie)
+* Fix NetBSD display of in-use and cached memory (thanks to Nia Alarie)
+* Rework NetBSD CPU and memory accounting (thanks to Santhosh Raju)
+* Fix NetBSD accounting of user and kernel threads (thanks to Santhosh Raju)
+* Initial work to allow building with default libcurses on NetBSD
+  (thanks to Santhosh Raju)
+* FreeBSD updates - implement process majflt and processor column values
+* Add FreeBSD support for CPU frequency and temperature
+* Fixes and cleanups for ZFS Meters and metrics
+* Correctly color the ZFS ARC ratio (thanks to Ross Williams)
+* Bugfixes related to CPU time display/calculations for darwin on M1 systems
+  (thanks to Alexander Momchilov)
+* Harmonize the handling of multiple batteries across different platforms.
+  The system is now considered to run on AC if at least one power supply
+  marked as AC is found in the system.
+  Battery capacity is summed up over all batteries found.
+  This also changes the old behavior that batteries reported by the
+  system after the first AC adapter where sometimes ignored.
+* Correctly handle multiple batteries on Darwin.
+  Resolves a possible memory leak on systems with multiple batteries.
+* Handle Linux Shmem being part of Cached in the MemoryMeter
+* Add SwapCached to the Linux swap meter (thanks to David Zarzycki)
+* Convert process time to days if applicable (thanks to David Zarzycki)
+* Always show the number of threads in the TaskMeter, even when threads
+  are not shown in the process list
+* Fix Linux --drop-capabilities option handling
+* Correctly detect failure to initialize Linux boottime
+* Overhaul the Linux memory fields to partition them like free(1) now does
+* Improve the Linux process I/O column values
+* Rework the libsensors parsing on Linux
+* Update the MemoryMeter to display shared memory
+* Update OpenBSD platform - implement additional columns, scan LWP,
+  proper markup for STATE, show CPU frequency
+* Fix the tree view on OpenBSD when hiding kernel threads
+* Remove old InfoScreen lines before re-scanning (thanks to Øystein Hiåsen)
+* Document historic naming of Light-Weight Processes column aka threads
+* Improve user interaction when the last process entry is selected
+* Draw the panel header on the TraceScreen (thanks to Youngjae Lee)
+* Add mouse wheel scroll and fix mouse selection on the InfoScreen
+  (thanks to Youngjae Lee)
+* Add a HugepageMeter and subtract hugepages from normal memory
+* Display wide characters in LED meters and restore non-wide ncurses support
+* Add command line option to drop Linux capabilities
+* Support scheduler affinity on platforms beyond Linux
+* Report on any failure to write the configuration file
+* Cache stderr to be able to print assert messages.
+  These messages are shown in case htop terminates unexpectedly.
+* Print current settings on crash
+* Reset signal handlers on program exit
+* Add configure script option to create a static htop binary
+* Resolved longer-standing compilation issues on Solaris/Illumos
+* Check for availability of set_escdelay in configure
+  (thanks to Stefan Polluks)
+* Build system updates for autotools 2.70
+
+What's new in version 3.0.5
+
+* BUGFIX / SECURITY: InfoScreen: fix uncontrolled format string
+* BUGFIX: Improve white text in the Light Terminal colour scheme
+  (both of the above thanks to V)
+* Enable the function bar on the main screen to be hidden (see Setup -> Display options)
+* BUGFIX: Reduce layout issues esp. around printing wide characters (not complete yet)
+* BUGFIX: Make the follow function exit cleanly after followed process died
+* Solaris: make Process callbacks static
+* Update help and man page for improved -t / -s options
+* Drop usage of formatted error messages from <err.h>
+* Show arrow indicating order of sorted process column
+* Lots of plumbing around the internal Hashtable, hardening and code cleanups
+* LibSensors: add support for Ryzen CPUs
+  (thanks to Matej Dian)
+* BUGFIX: Fix CPU percentage on M1 silicon Macs
+  (thanks to Luke Groeninger)
+* LoadMeter: dynamically adjust color and total of bar
+* Find libsensors.so.4 for Fedora and friends
+* Add support to display CPU frequencies on Solarish platforms
+  (thanks to Dominik Hassler)
+* Enable going back to previous search matches (Shift-F3)
+* Added keybind 'N' for sorting by PID (drops 'n'/'N' as not used before much)
+  (thanks to Jake Mannens)
+
+What's new in version 3.0.4
+
+* Separate tree and list sort orders
+* Invert Process_compare so that superclass matches run first
+  (thanks to Hisham Muhammad)
+* Unhardcode Mac OS tick-to-milliseconds conversion
+  (thanks to Alexander Momchilov)
+* Check if clock_gettime needs linking of librt
+* Define O_PATH if not already defined
+  (thanks to Chris Burr)
+* Add column on Mac for processes running under translation
+  (thanks to Dániel Bakai)
+* Configure check for additional linker flags for keypad(3)
+* PSI Meter: constant width and only print ten-duration as bar
+* Sort in paused mode after inverting sort order
+* Handle absence of package CPU temperature
+* Meter: restore non-wide-character build
+* LibSensors: restore temperature for Raspberry Pi
+* MainPanel: do not reset hideProcessSelection on KEY_SHUFFLE
+* BarMeter: rework text padding
+* Panel: rework drawing of FunctionBar
+* Meter: fix artifacts with very tiny width
+* DragonFlyBSD updates
+* BUGFIX: Fix dlopen issue for libsensors5 for some platforms
+* BUGFIX: Fix broken tree display on inverted sort order
+* BUGFIX: Fix pause mode ("Z") in tree view
+* BUGFIX: Correct timebase for non-x86 CPUs on Darwin
+* BUGFIX: Avoid NULL dereference on zombie processes
+* Document dynamic bindings and assumed external configuration
+* Update key mapping documentation for sorting
+
+What's new in version 3.0.3
+
+* Process sorting in 'tree' mode
+  (thanks to Maxim Zhiburt)
+* Improved command display/sort functionality
+  (thanks to Narendran Gopalakrishnan)
+* Add screen for active file locks
+  (thanks to Fynn J. Wulf)
+* Calculate library size (M_LRS column) from maps file
+  (thanks to Fynn J. Wulf)
+* Add a Zram meter
+  (thanks to Murloc Knight)
+* Add Linux cwd process column
+* Dynamically load libsensors at runtime
+* Improve PressureStall Meter display strings
+* Hide process selection on ESC
+* Fully support non-ascii characters in Meter-Bar
+* Add support to change numeric options in settings screen
+* Rename virtual memory column from M_SIZE to M_VIRT
+* Add process column for normalized CPU usage
+* Show CPU temperature in CPU meter
+* Drop hideThreads Setting
+* Add a systemd meter
+* Add a network IO meter
+* Add a SELinux meter
+* Compress size of default FunctionBar
+* Updates to the OpenFiles screen
+* Continue updating header data in paused mode
+* BUGFIX: Handle data wraparounds in IO meters
+* BUGFIX: Update InfoScreen content on resize
+* Add security attribute process column
+* Add DiskIOMeter for IO read/write usage
+* Read CPU frequency from sysfs by default
+* Add Linux process column for context switches
+* Several FreeBSD and Mac OS X platform updates
+  (thanks to Christian Göttsche)
+* Add process environment for FreeBSD
+  (thanks to Ross Williams)
+* Parse POWER_SUPPLY_CAPACITY for Linux Battery meter
+  (thanks to Jan Palus)
+* Add octuple-column CPU meters.
+* BUGFIX: On Linux consider ZFS ARC to be cache
+  (thanks to @multi)
+* BUGFIX: Limit screen title length to window width
+* Show selected command wrapped in a separate window
+  (thanks to @ryenus)
+* Allow to pass '/' for item search
+* Document implicit incremental search
+* Handle 'q' as quit if first character
+* Avoid expensive build of process tree when not using it
+* Include documentation for COMM and EXE
+* Distinguish display of no permissions for reading M_LRS
+* Only calculate M_LRS size every 2 seconds
+* Improvements to comm / cmdline display functionality
+* Merged view for COMM, EXE and cmdline
+  (thanks to Narendran Gopalakrishnan and Benny Baumann)
+* Consistent kernel thread display for COMM/EXE columns
+* Central fault handling for all platforms
+* Handle parsing envID & VPid from process status file
+* Use threshold for display of guest/steal/irq meters
+* Enhance highlighting of semi-large and large numbers
+* Documentation on the repository style guide
+  (thanks to Benny Baumann)
+* Align processor identifier to the right
+  (thanks to Christian Hesse)
+* Document M_PSS, M_PSSWP, M_SWAP in man page
+* Add Date and DateTime meters
+  (thanks to Michael F. Schönitzer)
+* BUGFIX: Fix Solaris 11.4 due to missing ZFS ARC kstats
+  (thanks to @senjan)
+* Code hardening, speedups, fd and memory leak fixes
+  (thanks to Christian Göttsche and Benny Baumann)
+* Number CPUs from zero by default
+  (thanks to Zev Weiss)
+* Remove residual python checks during the build process
+  (thanks to Stephen Gregoratto)
+
+What's new in version 3.0.2
+
+* BUGFIX: Drop 'vim_mode' - several issues, needs rethink
+* BUGFIX: fix regression in -u optional-argument handling
+* Build system rework to remove python, header generation
+  (thanks to Zev Weiss and Hugo Musso Gualandi)
+* BUGFIX: report nice level correctly on Solaris
+  (thanks to Dominik Hassler)
+* CI, code quality improvements
+  (thanks to Tobias Kortkamp, Christian Hesse, Benny Baumann)
+
+What's new in version 3.0.1
+
+* Coverity fixes, CI improvements, documentation updates
+* BUGFIX: Fix early exit with longer sysfs battery paths
+* BUGFIX: Improve OOM output, fix sorting
+  (thanks to Christian Göttsche)
+* Rework check buttons and tree open/closed
+  (thanks to Bert Wesarg)
+* Add -U/--no-unicode option to disable unicode
+  (thanks to Christian Hesse)
+* Improvements to the affinity panel
+  (thanks to Bert Wesarg)
+
+What's new in version 3.0.0
+
+* New maintainers - after a prolonged period of inactivity
+  from Hisham, the creator and original maintainer, a team
+  of community maintainers have volunteered to take over a
+  fork at https://htop.dev and https://github.com/htop-dev
+  to keep the project going.
+* Support ZFS ARC statistics
+  (thanks to Ross Williams)
+* Support more than 2 smaller CPU meter columns
+  (thanks to Christoph Budziszewski)
+* Support Linux proportional set size metrics
+  (thanks to @linvinus, @ntninja and @himikof)
+* Support Linux pressure stall information metrics
+  (thanks to Ran Benita)
+* New display option to show CPU frequency in CPU meters
+  (thanks to Arnav Singh)
+* Update Linux sysfs battery discovery for recent kernels
+  (thanks to @smattie)
+* Add hardware topology information in the affinity panel
+  (thanks to Bert Wesarg)
+* Add timestamp reporting to the strace screen
+  (thanks to Mario Harjac)
+* Add simple, optional vim key mapping mode
+  (thanks to Daniel Flanagan)
+* Added an option to disable the mouse
+  (thanks to MartinJM)
+* Add Solaris11 compatibility
+  (thanks to Jan Senolt)
+* Without an argument -u uses $USER value automatically
+  (thanks to @solanav)
+* Support less(1) search navigation shortcuts
+  (thanks to @syrrim)
+* Update the FreeBSD maximum PID to match FreeBSD change
+  (thanks to @multiplexd)
+* Report values larger than 100 terabytes
+  (thanks to @adrien1018)
+* Widen ST_UID (UID) column to allow for UIDs > 9999
+  (thanks to DLange)
+* BUGFIX: fix makefiles for building with clang
+  (thanks to Jorge Pereira)
+* BUGFIX: fix <sys/sysmacros.h> major() usage
+  (thanks to @wataash and Kang-Che Sung)
+* BUGFIX: fix the STARTTIME column on FreeBSD
+  (thanks to Rob Crowston)
+* BUGFIX: truncate overwide jail names on FreeBSD
+  (thanks to Rob Crowston)
+* BUGFIX: fix reported memory values on FreeBSD
+  (thanks to Tobias Kortkamp)
+* BUGFIX: fix reported CPU meter values on OpenBSD
+  (thanks to @motet-a)
+* BUGFIX: correctly identify other types of zombie process
+  (thanks to @joder)
+* BUGFIX: improve follow-process handling in some situations
+  (thanks to @wangqr)
+* BUGFIX: fix custom meters reverting to unexpected setting
+  (thanks to @wangqr)
+* BUGFIX: close pipe after running lsof(1)
+  (thanks to Jesin)
+* BUGFIX: meters honour setting of counting CPUs from 0/1
+  (thanks to @rnsanchez)
+
+What's new in version 2.2.0
+
+* Solaris/Illumos/OpenIndiana support
+  (thanks to Guy M. Broome)
+* -t/--tree flag for starting in tree-view mode
+  (thanks to Daniel Flanagan)
+* macOS: detects High Sierra version to avoid OS bug
+  (thanks to Pierre Malhaire)
+* OpenBSD: read battery data
+  (thanks to @nerd972)
+* Various automake and build improvements
+  (thanks to Kang-Che Sung)
+* Check for pkg-config when building with --enable-delayacct
+  (thanks to @florian2833z for the report)
+* Avoid some bashisms in configure script
+  (thanks to Jesin)
+* Use CFLAGS from ncurses*-config if present
+  (thanks to Michael Klein)
+* Header generator supports non-UTF-8 environments
+  (thanks to @volkov-am)
+* Linux: changed detection of kernel threads
+* Collapse current subtree pressing Backspace
+* BUGFIX: fix behavior of SYSCR column
+  (thanks to Marc Kleine-Budde)
+* BUGFIX: obtain exit code of lsof correctly
+  (thanks to @wangqr)
+* BUGFIX: fix crash with particular keycodes
+  (thanks to Wellington Torrejais da Silva for the report)
+* BUGFIX: fix issue with small terminals
+  (thanks to Daniel Elf for the report)
+* BUGFIX: fix terminal color issues
+  (thanks to Kang-Che Sung for the report)
+* BUGFIX: preserve LDFLAGS when building
+  (thanks to Lance Frederickson for the report)
+* BUGFIX: fixed overflow for systems with >= 100 signals
+
+What's new in version 2.1.0
+
+* Linux: Delay accounting metrics
+  (thanks to André Carvalho)
+* DragonFlyBSD support
+  (thanks to Diederik de Groot)
+* Support for real-time signals
+  (thanks to Kang-Che Sung)
+* 'c' key now works with threads as well
+* Session column renamed from SESN to SID
+  (thanks to Kamyar Rasta)
+* Improved UI for meter style selection
+  (thanks to Kang-Che Sung)
+* Improved code for constructing process tree
+  (thanks to wangqr)
+* Compile-time option to disable setuid
+* Error checking of various standard library operations
+* Replacement of sprintf with snprintf
+  (thanks to Tomasz Kramkowski)
+* Linux: performance improvements in battery meter
+* Linux: update process TTY device
+* Linux: add support for sorting TASK_IDLE
+  (thanks to Vladimir Panteleev)
+* Linux: add upper-bound to running process counter
+  (thanks to Lucas Correia Villa Real)
+* BUGFIX: avoid crash when battery is removed
+  (thanks to Jan Chren)
+* BUGFIX: macOS: fix infinite loop in tree view
+  (thanks to Wataru Ashihara)
+
+What's new in version 2.0.2
+
+* Mac OS X: stop trying when task_for_pid fails for a process,
+  stops spamming logs with errors.
+* Add Ctrl+A and Ctrl+E to go to beginning and end of line
+* FreeBSD: fixes for CPU calculation
+  (thanks to Tim Creech, Andy Pilate)
+* Usability: auto-follow process after a search.
+* Use Linux backend on GNU Hurd
+* Improvement for reproducible builds.
+* BUGFIX: Fix behavior of Alt-key combinations
+  (thanks to Kang-Che Sung)
+* Various code tweaks and cleanups
+  (thanks to Kang-Che Sung)
+
+What's new in version 2.0.1
+
+* OpenBSD: Various fixes and improvements
+  (thanks to Michael McConville and Juan Francisco Cantero Hurtado)
+* FreeBSD: fix CPU and memory readings
+  (thanks to Tim Creech, Hung-Yi Chen, Bernard Spil, Greg V)
+* FreeBSD: add battery support
+  (thanks to Greg V)
+* Linux: Retain last-obtained name of a zombie process
+* Mac OS X: Improve portability for OS X versions
+  (thanks to Michael Klein)
+* Mac OS X: Fix reading command-line arguments and basename
+* Mac OS X: Fix process state information
+* Mac OS X: Fix tree view collapsing/expanding
+* Mac OS X: Fix tree organization
+* Mac OS X: Fix memory accounting
+* Fix crash when emptying a column of meters
+* Make Esc key more responsive
+
+What's new in version 2.0.0
+
+* Platform abstraction layer
+* Initial FreeBSD support
+* Initial Mac OS X support
+  (thanks to David Hunt)
+* Swap meter for Mac OSX
+  (thanks to Ștefan Rusu)
+* OpenBSD port
+  (thanks to Michael McConville)
+* FreeBSD support improvements
+  (thanks to Martin Misuth)
+* Support for NCurses 6 ABI, including mouse wheel support
+* Much improved mouse responsiveness
+* Process environment variables screen
+  (thanks to Michael Klein)
+* Higher-resolution UTF-8 based Graph mode
+  (Thanks to James Hall from vtop for the idea!)
+* Show program path settings
+  (thanks to Tobias Geerinckx-Rice)
+* BUGFIX: Fix crash when scrolling an empty filtered list.
+* Use dynamic units for text display, and several fixes
+  (thanks to Christian Hesse)
+* BUGFIX: fix error caused by overflow in usertime calculation.
+  (thanks to Patrick Marlier)
+* Catch all memory allocation errors
+  (thanks to Michael McConville for the push)
+* Several tweaks and bugfixes
+  (See the Git log for details and contributors!)
+
+What's new in version 1.0.3
+
+* Tag all children ('c' key)
+* Fixes in accounting of guest time when using virtualization
+  (thanks to Patrick Marlier)
+* Performance improvements
+  (thanks to Jann Horn)
+* Further performance improvements due to conditional parsing
+  of IO data depending on selected fields.
+* Better consistency in coloring.
+* Increase limit of buffer when tracing a deep nested process tree.
+* Display pagefault stats.
+* BUGFIX: Fix crash when adding meters and toggling detailed CPU time.
+  (thanks to Dawid Gajownik)
+* Add column to track the OOM-killer score of processes
+  (thanks to Leigh Simpson)
+
+What's new in version 1.0.2
+
+* Add IO priority support ('i' key)
+* Avoid deleting .htoprc if it is a symlink
+* Fail gracefully when /proc is not mounted
+  (thanks to Philipp Hagemeister)
+* Option to update process names on every refresh
+  (thanks to Rob Hoelz)
+* BUGFIX: Fix crashes when process list is empty
+
+What's new in version 1.0.1
+
+* Move .htoprc to XDG-compliant path ~/.config/htop/htoprc,
+  respecting $XDG_CONFIG_HOME
+  (thanks to Hadzhimurad Ustarkhan for the suggestion.)
+* Safer behavior on the kill screen, to make it harder to kill the wrong process.
+* Fix for building in FreeBSD 8.2
+  (thanks to Trond Endrestol)
+* BUGFIX: behavior of 'F' (follow) key was broken, also affecting the
+  persistence of mouse selections.
+* BUGFIX: keep main panel up-to-date when running the screen manager,
+  to fix crash when processes die while on the F9/Kill screen.
+
+What's new in version 1.0
+
+* Performance improvements
+* Support for splitting CPU meters into two or four columns
+  (thanks to Wim Heirman)
+* Switch from PLPA, which is now deprecated, to HWLOC.
+* Bring back support for native Linux sched_setaffinity,
+  so we don't have to use HWLOC where we don't need to.
+* Support for typing in user names and column fields in selection panels.
+* Support for UTF-8 tree drawing
+  (thanks to Bin Guo)
+* Option for counting CPUs from zero
+  (thanks to Sean Noonan)
+* Meters update in every screen (no longer halting while on Setup, etc.)
+* Stricter checks for command-line options
+  (thanks to Sebastian Pipping)
+* Incremental filtering
+  (thanks to Seth Heeren for the idea and initial implementation)
+* Try harder to find the ncurses header
+  (thanks to Moritz Barsnick)
+* Man page updates
+  (thanks to Vincent Launchbury)
+* BUGFIX: Support larger numbers for process times.
+  (thanks to Tristan Nakagawa for the report.)
+* BUGFIX: Segfault in BarMeterMode_draw() for small terminal widths
+  (patch by Sebastian Pipping)
+
+What's new in version 0.9
+
+* Add support for "steal"/guest CPU time measurement
+  in virtualization environments
+* Expand and collapse subtrees using '+' and '-' when in tree-view
+* Support for cgroups
+  (thanks to Guillaume Zitta and Daniel Lezcano)
+* Show custom thread names
+  (thanks to Anders Torger)
+* Add support for STARTTIME field
+* Upgrade PLPA to version 1.3.2
+* Fix license terms with regard to PLPA
+  (thanks to Tom Callaway)
+* getopt-based long options and --no-color
+  (thanks to Vincent Launchbury)
+* BUGFIX: Fix display of nan% in CPU meters
+  (thanks to Steven Hampson)
+* BUGFIX: Fix memory leak
+  (thanks to Pavol Rusnak)
+* Add Bash/emacs style navigation keys
+  (thanks to Daniel Schuler)
+* Improve battery meter support
+  (thanks to Richard W.)
+* BUGFIX: Fix IO-wait color in "Black on White" scheme
+* BUGFIX: Fix search by process name when list is filtered by user.
+  (thanks to Sergej Pupykin for the report.)
+* BUGFIX: Fix alignment for display of memory values above 100G (sign of the times!)
+  (thanks to Jan van Haarst for the report.)
+
+What's new in version 0.8.3
+
+* BUGFIX: Fix crash on F6 key
+  (thanks to Rainer Suhm)
+* BUGFIX: Fix a minor bug which affected the build process.
+
+What's new in version 0.8.2
+
+* Integrated lsof (press 'l')
+* Fix display of gigabyte-sized values
+  (thanks to Andika Triwidada)
+* Option to display hostname in the meters area
+* Rename VEID to CTID in OpenVZ systems
+  (thanks to Thorsten Schifferdecker)
+* Corrections to the desktop entry file
+  (thanks by Samuli Suominen)
+* BUGFIX: Correct page size calculation for FreeBSD systems
+  (thanks to Andrew Paulsen)
+* Allow compilation without PLPA on systems that don't support it
+  (thanks to Timothy Redaelli)
+* BUGFIX: Fix missing tree view when userland threads are hidden
+  (thanks to Josh Stone)
+* BUGFIX: Fix for VPID on OpenVZ systems
+  (thanks to Wolfgang Frisch)
+
+What's new in version 0.8.1
+
+* Linux-VServer support
+  (thanks to Jonathan Sambrook and Benedikt Bohm)
+* Battery meter
+  (thanks to Ian Page Hands)
+* BUGFIX: Fix collection of IO stats in multithreaded processes
+  (thanks to Gerhard Heift)
+* Remove assertion that fails on hardened kernels
+  (thanks to Wolfram Schlich for the report)
+
+What's new in version 0.8
+
+* Ability to change sort column with the mouse by
+  clicking column titles (click again to invert order)
+* Add support for Linux per-process IO statistics,
+  enabled with the --enable-taskstats flag, which
+  requires a kernel compiled with taskstats support.
+  (thanks to Tobias Oetiker)
+* Add Unicode support, enabled with the --enable-unicode
+  flag, which requires libncursesw.
+  (thanks to Sergej Pupykin)
+* BUGFIX: Fix display of CPU count for threaded processes.
+  When user threads are hidden, process now shows the
+  sum of processor usage for all processors. When user
+  threads are displayed, each thread shows its own
+  processor usage, including the root thread.
+  (thanks to Bert Wesarg for the report)
+* BUGFIX: avoid crashing when using many meters
+  (thanks to David Cho for the report)
+
+What's new in version 0.7
+
+* CPU affinity configuration ('a' key)
+* Improve display of tree view, properly nesting
+  threads of the same app based on TGID.
+* IO-wait time now counts as idle time, which is a more
+  accurate description. It is still available in
+  split time, now called detailed CPU time.
+  (thanks to Samuel Thibault for the report)
+* BUGFIX: Correct display of TPGID field
+* Add TGID field
+* BUGFIX: Don't crash with invalid command-line flags
+  (thanks to Nico Golde for the report)
+* Fix GCC 4.3 compilation issues
+  (thanks to Martin Michlmayr for the report)
+* OpenVZ support, enabled at compile-time with
+  the --enable-openvz flag.
+  (thanks to Sergey Lychko)
+
+What's new in version 0.6.6
+
+* Add support of NLWP field
+  (thanks to Bert Wesarg)
+* BUGFIX: Fix use of configurable /proc location
+  (thanks to Florent Thoumie)
+* Fix memory percentage calculation and make it saner
+  (thanks to Olev Kartau for the report)
+* Added display of DRS, DT, LRS and TRS
+  (thanks to Matthias Lederhofer)
+* BUGFIX: LRS and DRS memory values were flipped
+  (thanks to Matthias Lederhofer)
+* BUGFIX: Don't crash on very high UIDs
+  (thanks to Egmont Koblinger)
+
+What's new in version 0.6.5
+
+* Add hardened-debug flags for debugging with Hardened GCC
+* BUGFIX: Handle error condition when a directory vanishes
+  from /proc
+* BUGFIX: Fix leak of process command line
+* BUGFIX: Collect orphaned items when arranging the tree view.
+  (thanks to Wolfram Schlich for assistance with debugging)
+* Separate proc and memory debugging into separate #defines.
+* BUGFIX: Fix message when configure fails due to
+  missing libraries
+  (thanks to Jon)
+* BUGFIX: Don't truncate value when displaying a very large
+  process
+  (thanks to Bo Liu)
+
+What's new in version 0.6.4
+
+* Add an option to split the display of kernel time
+  in the CPU meter into system, IO-wait, IRQ and soft-IRQ.
+  (thanks to Philipp Richter)
+* --sort-key flag in the command-line, overriding the
+  saved setting in .htoprc for the session.
+  (thanks to Rodolfo Borges)
+* BUGFIX: Fixed string overflow on uptime display.
+  (thanks to Marc Cahalan)
+
+What's new in version 0.6.3
+
+* Performance improvements: uses much less CPU than the
+  previous release with the default setup.
+* Use 64-bit values when storing processor times to
+  avoid overflow.
+* Memory consumption improvements, compensating storage
+  of 64-bit values.
+* Internal change: rename TypedVector to Vector and
+  ListBox (and related classes) to Panel.
+* Have configure actually fail when needed libraries or
+  headers are not found.
+* Horizontally scroll in larger increments when on the
+  Linux console because of slow update of unaccelerated fb
+* No longer untag processes after sending a signal
+  (useful for when SIGTERM fails and one wants to try again
+  with SIGKILL). All processes can be untagged at once with 'U'.
+  (thanks to A. Costa for the suggestion)
+
+What's new in version 0.6.2
+
+* BUGFIX: Fixed crash when using some .htoprc files from 0.6
+  (thanks to Wolfram Schlich and John Thomas for the reports)
+* BUGFIX: Ensure changes to color scheme are saved
+* BUGFIX: Make configure behave correctly with --with-proc
+* Minor addition to .desktop file.
+
+What's new in version 0.6.1
+
+* New meter type: "All CPUs", which dynamically adjusts
+  to the number of CPUs present in the machine. Note that
+  because of this, older versions of htop may crash when
+  using an .htoprc file modified my the newer version.
+* Accept --with-proc=<dir> in configure, to specify
+  alternative procfs locations (making htop friendlier
+  to the Linux compatibility layer in FreeBSD)
+* Included icon .desktop and desktop entry
+  (thanks to Peter Hyman)
+* Added a check to make sure that a root-user htop closes
+  when its parent non-root terminal is closed.
+  (thanks to Ilya Evseev for the report)
+* BUGFIX: does not crash anymore when $HOME is not set
+  (thanks to Henning Schild for the report)
+* Wait for strace child process to die properly.
+  (thanks to Marcus Fritzsch)
+* Support $HTOPRC
+  (thanks to Luis Limon)
+
+What's new in version 0.6
+
+* Configuration of columns merged into the Setup screen
+* Integrated strace (press 's')
+  (thanks to Marinho Barcellos for the help)
+* BUGFIX: some fixes, aided by Valgrind
+  (thanks to Wolfram Schlich for the report)
+* BUGFIX: fixed bug when switching meter modes
+  (thanks to Eduardo Righes for the report)
+* Show processes of a single user
+* "SortBy" function now menu-based
+* Improved mouse handling
+* ...and on top of that reduced memory consumption!
+
+What's new in version 0.5.4
+
+* Color schemes
+* -d flag, to configure delay between updates.
+  Note that the delay value is saved in ~/.htoprc.
+* BUGFIX: Update of meters was halting after help screen.
+  (thanks to Matt Moore)
+* BUGFIX: No longer display incorrect information
+  in first frame.
+* BUGFIX: Fix auto-detection of /proc/stat,
+  correcting CPU usage information on multiprocessor
+  systems.
+
+What's new in version 0.5.3
+
+* Read new field "steal" on newer /proc/stat files
+* Auto-detects format of /proc/stat, to cope
+  with patched 2.4 kernels which display 2.6-style
+  information (most notably those on RHEL 3)
+  (thanks to Fernando Dotta for the report)
+* Support $HOME_ETC initiative
+  (see http://www.pld-linux.org/Docs/home-etc)
+  (thanks to Roman Barczynski for the tip)
+* The configure script now tests for /proc, so
+  that it fails early on unsupported platforms
+  instead of during compilation/execution.
+* Made presentation of the function keys in the
+  status bar consistent across views
+  (thanks to David Mathog for the report)
+* Minor changes to make the codebase more friendly
+  to possible future ports
+  (thanks to Jari Aalto and David Mathog for the reports)
+
+What's new in version 0.5.2
+
+* BUGFIX: Correct display of user field
+  (thanks to Marcin Miroslaw for the report)
+* Keyboard support improvements
+  (thanks to Aury Fink Filho for the report)
+
+What's new in version 0.5.1
+
+* BUGFIX: Correctly displays NPTL threads from
+  /proc/<pid>/task subdirectories
+  (thanks to Mike Pot for the report)
+* BUGFIX: Fixes key handling on Signals listbox
+  (thanks to Ondrej Vlach)
+* Renicing no longer displays temporary illegal values
+  (thanks to Ondrej Vlach)
+* 'Hide userland threads' feature for NPTL threads
+
+What's new in version 0.5
+
+* Tree view
+* New column, TIME (user + system time,
+  like in top, 'T' switches to "sort by time")
+* Major reorganization of the underlying code of the
+  setup screen, to manage setup pages
+* New setup page: Display options
+* Hide kernel threads ('K' key)
+* Colorized memory numbers
+* Vastly improved support for monochromatic terminals
+* Shadow processes that do not belong to user ('U' key)
+* Header margin configuration accessible via setup screen
+* Visual feedback on failing incremental search
+* BUGFIX: fixed keyboard input issues on 64-bit machines
+* BUGFIX: hopefully fixed the incorrect values
+  that show on status bars in some systems
+* BUGFIX: doesn't mess with fields list anymore when
+  canceling after changing the number of items
+* Uptime meter no longer says "1 days" ;)
+
+What's new in version 0.4.1
+
+* BUGFIX: compiles on 64-bit architectures again
+  (thanks to Bartosz Fenski for the report)
+* BUGFIX: multi-processor support fixed on kernels 2.6
+  (thanks to Wolfram Schlich for the report)
+
+What's new in version 0.4
+
+* Support for multiple processors!
+* Basic mouse support
+* Modular header based on configurable meters;
+  supports 4 view modes: bar, text, LED, graph
+* Uptime, load average meters
+  (thanks to Marc Calahan)
+* Meters setup screen; should eventually evolve into a
+  general setup screen, with column setup, keybindings, etc.
+* Thread hiding toggleable
+  (press 'T' to hide the nonstandard dotfiles in /proc)
+* BUGFIX: Do not flicker screen on column configuration screen
+* Clock and load average meters
+  (thanks to Marc Calahan)
+* BUGFIX: numeric swap indicator was printing bogus value
+* BUGFIX: internal fixes on Panel widget
+* Clear the bottom line when exiting
+* Press "F3" during search to walk through the results
+* Improved navigation on column configuration screen
+* BUGFIX: fix segfault on kernels with restricted /proc
+  enabled
+* BUGFIX: a few last-minute bugfixes in the setup UI
+  (thanks to Gaspare Bruno for the reports)
+
+
+What's new in version 0.3.3
+
+* Saves column and sorting configuration in ~/.htoprc
+* Displays "hidden" threads on RedHat 9
+  (Thanks to Leonardo Godinho)
+* BUGFIX: supports process names with spaces
+  (Thanks to Marc Calahan)
+* BUGFIX: ...and parentheses :)
+* BUGFIX: long process names overflowed RichString
+  (Thanks to Marc Calahan)
+
+What's new in version 0.3.2
+
+* Performance and memory usage improvements, aided by gprof
+* BUGFIX: quite a few fixes, aided by Valgrind
+* Header preview on column configuration screen
+  (Thanks to Marc Calahan)
+
+What's new in version 0.3.1
+
+* BUGFIX: crash fixes related to process list handling
+  (thanks to Marc Calahan)
+* Man page
+  (thanks to Bartosz Fenski)
+* Tag processes with the space bar
+* Kill multiple process based on tag
+* BUGFIX: corrected processing order of updates in list
+* Screen refresh function on Ctrl-L
+* Large numbers are shown in MB/GB notation in order to fit screen
+  (thanks to Marc Calahan)
+* Realtime priority is correctly displayed
+  (thanks to Marc Calahan)
+* Preliminary support for configurable columns, with 'C'
+  (thanks to Marc Calahan)
+  -- not all columns display properly yet
+
+What's new in version 0.3
+
+* BUGFIX: no dirt left on screen on horizontal scrolling
+* Signal selection on "kill" command
+* Color-coding for users, nice and process status
+* "Follow" function
+* Fully selectable sort order
+* Function bar on last line
+* Build system now uses autotools
+
+What's new in version 0.2.1
+
+* Sorting by process or memory usage ('P' and 'M', like top)
+* Quicker default update (1.5 second, not yet configurable)
+* Now the order of the elements in the process list stay
+  'locked' for a while after you move the cursor to ease
+  selecting a process
+* Corrected the installation instructions in README
+  (Thanks to Jeremy Eglen)
+* Should now compile cleanly on Conectiva 9 and similar systems
+  (Thanks to Adriano Frare for the report)
+* Friendlier Makefile
+* Help screen ('h')
+
+What's new in version 0.2
+
+* Memory indicators in header now show used and total, in MB
+* Preliminary support for sorting (CPU% only)
+* Memory percentage field (resident memory / used memory)
+* BUGFIX: identified source of spurious crashes
+* Can search names containing numbers
+  (Thanks to Rafael Jeffman)
+* Correctly calculates memory page size
+  (Thanks to Rafael Jeffman)
+
+What's new in version 0.13
+
+* Handles terminal resize
+* Display all user names (not only those in /etc/passwd)
+  (Thanks to Julio Biason)
+
+What's new in version 0.12
+
+* Support for 2.6 kernels
+* Uses terminal default colors as a background
+
+What's new in version 0.11
+
+* BUGFIX: does not crash when UID is not in /etc/passwd
+
+What's new in version 0.1
+
+* Everything!
diff --git a/ClockMeter.c b/ClockMeter.c
new file mode 100644
index 0000000..38f0591
--- /dev/null
+++ b/ClockMeter.c
@@ -0,0 +1,46 @@
+/*
+htop - ClockMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ClockMeter.h"
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Object.h"
+
+
+static const int ClockMeter_attributes[] = {
+   CLOCK
+};
+
+static void ClockMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+
+   struct tm result;
+   const struct tm* lt = localtime_r(&host->realtime.tv_sec, &result);
+   this->values[0] = lt->tm_hour * 60 + lt->tm_min;
+   strftime(this->txtBuffer, sizeof(this->txtBuffer), "%H:%M:%S", lt);
+}
+
+const MeterClass ClockMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = ClockMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 1440, /* 24*60 */
+   .attributes = ClockMeter_attributes,
+   .name = "Clock",
+   .uiName = "Clock",
+   .caption = "Time: ",
+};
diff --git a/ClockMeter.h b/ClockMeter.h
new file mode 100644
index 0000000..def0460
--- /dev/null
+++ b/ClockMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_ClockMeter
+#define HEADER_ClockMeter
+/*
+htop - ClockMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass ClockMeter_class;
+
+#endif
diff --git a/ColorsPanel.c b/ColorsPanel.c
new file mode 100644
index 0000000..581c3a0
--- /dev/null
+++ b/ColorsPanel.c
@@ -0,0 +1,108 @@
+/*
+htop - ColorsPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ColorsPanel.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Object.h"
+#include "OptionItem.h"
+#include "ProvideCurses.h"
+
+
+// TO ADD A NEW SCHEME:
+// * Increment the size of bool check in ColorsPanel.h
+// * Add the entry in the ColorSchemeNames array below in the file
+// * Add a define in CRT.h that matches the order of the array
+// * Add the colors in CRT_setColors
+
+
+static const char* const ColorsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static const char* const ColorSchemeNames[] = {
+   "Default",
+   "Monochromatic",
+   "Black on White",
+   "Light Terminal",
+   "MC",
+   "Black Night",
+   "Broken Gray",
+   NULL
+};
+
+static void ColorsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   ColorsPanel* this = (ColorsPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static HandlerResult ColorsPanel_eventHandler(Panel* super, int ch) {
+   ColorsPanel* this = (ColorsPanel*) super;
+
+   HandlerResult result = IGNORED;
+
+   switch (ch) {
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+      case ' ': {
+         int mark = Panel_getSelectedIndex(super);
+         assert(mark >= 0);
+         assert(mark < LAST_COLORSCHEME);
+
+         for (int i = 0; ColorSchemeNames[i] != NULL; i++)
+            CheckItem_set((CheckItem*)Panel_get(super, i), false);
+         CheckItem_set((CheckItem*)Panel_get(super, mark), true);
+
+         this->settings->colorScheme = mark;
+         this->settings->changed = true;
+         this->settings->lastUpdate++;
+
+         CRT_setColors(mark);
+         clear();
+
+         result = HANDLED | REDRAW;
+      }
+   }
+
+   return result;
+}
+
+const PanelClass ColorsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = ColorsPanel_delete
+   },
+   .eventHandler = ColorsPanel_eventHandler
+};
+
+ColorsPanel* ColorsPanel_new(Settings* settings) {
+   ColorsPanel* this = AllocThis(ColorsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(ColorsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(CheckItem), true, fuBar);
+
+   this->settings = settings;
+
+   assert(ARRAYSIZE(ColorSchemeNames) == LAST_COLORSCHEME + 1);
+
+   Panel_setHeader(super, "Colors");
+   for (int i = 0; ColorSchemeNames[i] != NULL; i++) {
+      Panel_add(super, (Object*) CheckItem_newByVal(ColorSchemeNames[i], false));
+   }
+   CheckItem_set((CheckItem*)Panel_get(super, settings->colorScheme), true);
+   return this;
+}
diff --git a/ColorsPanel.h b/ColorsPanel.h
new file mode 100644
index 0000000..373ec65
--- /dev/null
+++ b/ColorsPanel.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_ColorsPanel
+#define HEADER_ColorsPanel
+/*
+htop - ColorsPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Panel.h"
+#include "Settings.h"
+
+
+typedef struct ColorsPanel_ {
+   Panel super;
+
+   Settings* settings;
+} ColorsPanel;
+
+extern const PanelClass ColorsPanel_class;
+
+ColorsPanel* ColorsPanel_new(Settings* settings);
+
+#endif
diff --git a/ColumnsPanel.c b/ColumnsPanel.c
new file mode 100644
index 0000000..6662566
--- /dev/null
+++ b/ColumnsPanel.c
@@ -0,0 +1,165 @@
+/*
+htop - ColumnsPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ColumnsPanel.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "Process.h"
+#include "ProvideCurses.h"
+#include "RowField.h"
+#include "XUtils.h"
+
+
+static const char* const ColumnsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "MoveUp", "MoveDn", "Remove", "Done  ", NULL};
+
+static void ColumnsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   ColumnsPanel* this = (ColumnsPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static HandlerResult ColumnsPanel_eventHandler(Panel* super, int ch) {
+   ColumnsPanel* const this = (ColumnsPanel*) super;
+
+   int selected = Panel_getSelectedIndex(super);
+   HandlerResult result = IGNORED;
+   int size = Panel_size(super);
+
+   switch (ch) {
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+         if (selected < size - 1) {
+            this->moving = !(this->moving);
+            Panel_setSelectionColor(super, this->moving ? PANEL_SELECTION_FOLLOW : PANEL_SELECTION_FOCUS);
+            ListItem* selectedItem = (ListItem*) Panel_getSelected(super);
+            if (selectedItem)
+               selectedItem->moving = this->moving;
+            result = HANDLED;
+         }
+         break;
+      case KEY_UP:
+         if (!this->moving)
+            break;
+         /* else fallthrough */
+      case KEY_F(7):
+      case '[':
+      case '-':
+         if (selected < size - 1)
+            Panel_moveSelectedUp(super);
+         result = HANDLED;
+         break;
+      case KEY_DOWN:
+         if (!this->moving)
+            break;
+         /* else fallthrough */
+      case KEY_F(8):
+      case ']':
+      case '+':
+         if (selected < size - 2)
+            Panel_moveSelectedDown(super);
+         result = HANDLED;
+         break;
+      case KEY_F(9):
+      case KEY_DC:
+         if (selected < size - 1)
+            Panel_remove(super, selected);
+         result = HANDLED;
+         break;
+      default:
+         if (0 < ch && ch < 255 && isgraph((unsigned char)ch))
+            result = Panel_selectByTyping(super, ch);
+         if (result == BREAK_LOOP)
+            result = IGNORED;
+         break;
+   }
+
+   if (result == HANDLED)
+      ColumnsPanel_update(super);
+
+   return result;
+}
+
+const PanelClass ColumnsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = ColumnsPanel_delete
+   },
+   .eventHandler = ColumnsPanel_eventHandler
+};
+
+static void ColumnsPanel_add(Panel* super, unsigned int key, Hashtable* columns) {
+   const char* name;
+   if (key < LAST_PROCESSFIELD) {
+      name = Process_fields[key].name;
+   } else {
+      const DynamicColumn* column = Hashtable_get(columns, key);
+      assert(column);
+      if (!column) {
+         name = NULL;
+      } else {
+         /* heading preferred here but name is always available */
+         name = column->heading ? column->heading : column->name;
+      }
+   }
+   if (name == NULL)
+      name = "- ";
+   Panel_add(super, (Object*) ListItem_new(name, key));
+}
+
+void ColumnsPanel_fill(ColumnsPanel* this, ScreenSettings* ss, Hashtable* columns) {
+   Panel* super = (Panel*) this;
+   Panel_prune(super);
+   for (const RowField* fields = ss->fields; *fields; fields++)
+      ColumnsPanel_add(super, *fields, columns);
+   this->ss = ss;
+}
+
+ColumnsPanel* ColumnsPanel_new(ScreenSettings* ss, Hashtable* columns, bool* changed) {
+   ColumnsPanel* this = AllocThis(ColumnsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(ColumnsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->ss = ss;
+   this->changed = changed;
+   this->moving = false;
+   Panel_setHeader(super, "Active Columns");
+
+   ColumnsPanel_fill(this, ss, columns);
+
+   return this;
+}
+
+void ColumnsPanel_update(Panel* super) {
+   ColumnsPanel* this = (ColumnsPanel*) super;
+   int size = Panel_size(super);
+   *(this->changed) = true;
+   this->ss->fields = xRealloc(this->ss->fields, sizeof(ProcessField) * (size + 1));
+   this->ss->flags = 0;
+   for (int i = 0; i < size; i++) {
+      int key = ((ListItem*) Panel_get(super, i))->key;
+      this->ss->fields[i] = key;
+      if (key < LAST_PROCESSFIELD)
+         this->ss->flags |= Process_fields[key].flags;
+   }
+   this->ss->fields[size] = 0;
+}
diff --git a/ColumnsPanel.h b/ColumnsPanel.h
new file mode 100644
index 0000000..723369f
--- /dev/null
+++ b/ColumnsPanel.h
@@ -0,0 +1,33 @@
+#ifndef HEADER_ColumnsPanel
+#define HEADER_ColumnsPanel
+/*
+htop - ColumnsPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Hashtable.h"
+#include "Panel.h"
+#include "Settings.h"
+
+
+typedef struct ColumnsPanel_ {
+   Panel super;
+   ScreenSettings* ss;
+   bool* changed;
+
+   bool moving;
+} ColumnsPanel;
+
+extern const PanelClass ColumnsPanel_class;
+
+ColumnsPanel* ColumnsPanel_new(ScreenSettings* ss, Hashtable* columns, bool* changed);
+
+void ColumnsPanel_fill(ColumnsPanel* this, ScreenSettings* ss, Hashtable* columns);
+
+void ColumnsPanel_update(Panel* super);
+
+#endif
diff --git a/CommandLine.c b/CommandLine.c
new file mode 100644
index 0000000..09e67b8
--- /dev/null
+++ b/CommandLine.c
@@ -0,0 +1,439 @@
+/*
+htop - CommandLine.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CommandLine.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <locale.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "Action.h"
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "DynamicMeter.h"
+#include "DynamicScreen.h"
+#include "Hashtable.h"
+#include "Header.h"
+#include "IncSet.h"
+#include "Machine.h"
+#include "MainPanel.h"
+#include "MetersPanel.h"
+#include "Panel.h"
+#include "Platform.h"
+#include "Process.h"
+#include "ProcessTable.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+#include "Table.h"
+#include "UsersTable.h"
+#include "XUtils.h"
+
+
+static void printVersionFlag(const char* name) {
+   printf("%s " VERSION "\n", name);
+}
+
+static void printHelpFlag(const char* name) {
+   printf("%s " VERSION "\n"
+          COPYRIGHT "\n"
+          "Released under the GNU GPLv2+.\n\n"
+          "-C --no-color                   Use a monochrome color scheme\n"
+          "-d --delay=DELAY                Set the delay between updates, in tenths of seconds\n"
+          "-F --filter=FILTER              Show only the commands matching the given filter\n"
+          "-h --help                       Print this help screen\n"
+          "-H --highlight-changes[=DELAY]  Highlight new and old processes\n", name);
+#ifdef HAVE_GETMOUSE
+   printf("-M --no-mouse                   Disable the mouse\n");
+#endif
+   printf("-n --max-iterations=NUMBER      Exit htop after NUMBER iterations/frame updates\n"
+          "-p --pid=PID[,PID,PID...]       Show only the given PIDs\n"
+          "   --readonly                   Disable all system and process changing features\n"
+          "-s --sort-key=COLUMN            Sort by COLUMN in list view (try --sort-key=help for a list)\n"
+          "-t --tree                       Show the tree view (can be combined with -s)\n"
+          "-u --user[=USERNAME]            Show only processes for a given user (or $USER)\n"
+          "-U --no-unicode                 Do not use unicode but plain ASCII\n"
+          "-V --version                    Print version info\n");
+   Platform_longOptionsUsage(name);
+   printf("\n"
+          "Press F1 inside %s for online help.\n"
+          "See 'man %s' for more information.\n", name, name);
+}
+
+// ----------------------------------------
+
+typedef struct CommandLineSettings_ {
+   Hashtable* pidMatchList;
+   char* commFilter;
+   uid_t userId;
+   int sortKey;
+   int delay;
+   int iterationsRemaining;
+   bool useColors;
+#ifdef HAVE_GETMOUSE
+   bool enableMouse;
+#endif
+   bool treeView;
+   bool allowUnicode;
+   bool highlightChanges;
+   int highlightDelaySecs;
+   bool readonly;
+} CommandLineSettings;
+
+static CommandLineStatus parseArguments(int argc, char** argv, CommandLineSettings* flags) {
+
+   *flags = (CommandLineSettings) {
+      .pidMatchList = NULL,
+      .commFilter = NULL,
+      .userId = (uid_t)-1, // -1 is guaranteed to be an invalid uid_t (see setreuid(2))
+      .sortKey = 0,
+      .delay = -1,
+      .iterationsRemaining = -1,
+      .useColors = true,
+#ifdef HAVE_GETMOUSE
+      .enableMouse = true,
+#endif
+      .treeView = false,
+      .allowUnicode = true,
+      .highlightChanges = false,
+      .highlightDelaySecs = -1,
+      .readonly = false,
+   };
+
+   const struct option long_opts[] =
+   {
+      {"help",       no_argument,         0, 'h'},
+      {"version",    no_argument,         0, 'V'},
+      {"delay",      required_argument,   0, 'd'},
+      {"max-iterations", required_argument, 0, 'n'},
+      {"sort-key",   required_argument,   0, 's'},
+      {"user",       optional_argument,   0, 'u'},
+      {"no-color",   no_argument,         0, 'C'},
+      {"no-colour",  no_argument,         0, 'C'},
+      {"no-mouse",   no_argument,         0, 'M'},
+      {"no-unicode", no_argument,         0, 'U'},
+      {"tree",       no_argument,         0, 't'},
+      {"pid",        required_argument,   0, 'p'},
+      {"filter",     required_argument,   0, 'F'},
+      {"highlight-changes", optional_argument, 0, 'H'},
+      {"readonly",   no_argument,         0, 128},
+      PLATFORM_LONG_OPTIONS
+      {0, 0, 0, 0}
+   };
+
+   int opt, opti = 0;
+   /* Parse arguments */
+   while ((opt = getopt_long(argc, argv, "hVMCs:td:n:u::Up:F:H::", long_opts, &opti))) {
+      if (opt == EOF)
+         break;
+
+      switch (opt) {
+         case 'h':
+            printHelpFlag(program);
+            return STATUS_OK_EXIT;
+         case 'V':
+            printVersionFlag(program);
+            return STATUS_OK_EXIT;
+         case 's':
+            assert(optarg); /* please clang analyzer, cause optarg can be NULL in the 'u' case */
+            if (String_eq(optarg, "help")) {
+               for (int j = 1; j < LAST_PROCESSFIELD; j++) {
+                  const char* name = Process_fields[j].name;
+                  const char* description = Process_fields[j].description;
+                  if (name)
+                     printf("%19s %s\n", name, description);
+               }
+               return STATUS_OK_EXIT;
+            }
+            flags->sortKey = 0;
+            for (int j = 1; j < LAST_PROCESSFIELD; j++) {
+               if (Process_fields[j].name == NULL)
+                  continue;
+               if (String_eq(optarg, Process_fields[j].name)) {
+                  flags->sortKey = j;
+                  break;
+               }
+            }
+            if (flags->sortKey == 0) {
+               fprintf(stderr, "Error: invalid column \"%s\".\n", optarg);
+               return STATUS_ERROR_EXIT;
+            }
+            break;
+         case 'd':
+            if (sscanf(optarg, "%16d", &(flags->delay)) == 1) {
+               if (flags->delay < 1)
+                  flags->delay = 1;
+               if (flags->delay > 100)
+                  flags->delay = 100;
+            } else {
+               fprintf(stderr, "Error: invalid delay value \"%s\".\n", optarg);
+               return STATUS_ERROR_EXIT;
+            }
+            break;
+         case 'n':
+            if (sscanf(optarg, "%16d", &flags->iterationsRemaining) == 1) {
+               if (flags->iterationsRemaining <= 0) {
+                  fprintf(stderr, "Error: maximum iteration count must be positive.\n");
+                  return STATUS_ERROR_EXIT;
+               }
+            } else {
+               fprintf(stderr, "Error: invalid maximum iteration count \"%s\".\n", optarg);
+               return STATUS_ERROR_EXIT;
+            }
+            break;
+         case 'u': {
+            const char* username = optarg;
+            if (!username && optind < argc && argv[optind] != NULL &&
+                (argv[optind][0] != '\0' && argv[optind][0] != '-')) {
+               username = argv[optind++];
+            }
+
+            if (!username) {
+               flags->userId = geteuid();
+            } else if (!Action_setUserOnly(username, &(flags->userId))) {
+               for (const char* itr = username; *itr; ++itr)
+                  if (!isdigit((unsigned char)*itr)) {
+                     fprintf(stderr, "Error: invalid user \"%s\".\n", username);
+                     return STATUS_ERROR_EXIT;
+                  }
+               flags->userId = atol(username);
+            }
+            break;
+         }
+         case 'C':
+            flags->useColors = false;
+            break;
+         case 'M':
+#ifdef HAVE_GETMOUSE
+            flags->enableMouse = false;
+#endif
+            break;
+         case 'U':
+            flags->allowUnicode = false;
+            break;
+         case 't':
+            flags->treeView = true;
+            break;
+         case 'p': {
+            assert(optarg); /* please clang analyzer, cause optarg can be NULL in the 'u' case */
+            char* argCopy = xStrdup(optarg);
+            char* saveptr;
+            const char* pid = strtok_r(argCopy, ",", &saveptr);
+
+            if (!flags->pidMatchList) {
+               flags->pidMatchList = Hashtable_new(8, false);
+            }
+
+            while (pid) {
+               unsigned int num_pid = atoi(pid);
+               //  deepcode ignore CastIntegerToAddress: we just want a non-NULL pointer here
+               Hashtable_put(flags->pidMatchList, num_pid, (void*) 1);
+               pid = strtok_r(NULL, ",", &saveptr);
+            }
+            free(argCopy);
+
+            break;
+         }
+         case 'F':
+            assert(optarg);
+            free_and_xStrdup(&flags->commFilter, optarg);
+            break;
+         case 'H': {
+            const char* delay = optarg;
+            if (!delay && optind < argc && argv[optind] != NULL &&
+                (argv[optind][0] != '\0' && argv[optind][0] != '-')) {
+               delay = argv[optind++];
+            }
+            if (delay) {
+               if (sscanf(delay, "%16d", &(flags->highlightDelaySecs)) == 1) {
+                  if (flags->highlightDelaySecs < 1)
+                     flags->highlightDelaySecs = 1;
+               } else {
+                  fprintf(stderr, "Error: invalid highlight delay value \"%s\".\n", delay);
+                  return STATUS_ERROR_EXIT;
+               }
+            }
+            flags->highlightChanges = true;
+            break;
+         }
+         case 128:
+            flags->readonly = true;
+            break;
+
+         default: {
+            CommandLineStatus status;
+            if ((status = Platform_getLongOption(opt, argc, argv)) != STATUS_OK)
+               return status;
+            break;
+         }
+      }
+   }
+
+   if (optind < argc) {
+      fprintf(stderr, "Error: unsupported non-option ARGV-elements:");
+      while (optind < argc)
+         fprintf(stderr, " %s", argv[optind++]);
+      fprintf(stderr, "\n");
+      return STATUS_ERROR_EXIT;
+   }
+
+   return STATUS_OK;
+}
+
+static void CommandLine_delay(Machine* host, unsigned long millisec) {
+   struct timespec req = {
+      .tv_sec = 0,
+      .tv_nsec = millisec * 1000000L
+   };
+   while (nanosleep(&req, &req) == -1)
+      continue;
+   Platform_gettime_realtime(&host->realtime, &host->realtimeMs);
+}
+
+static void setCommFilter(State* state, char** commFilter) {
+   Table* table = state->host->activeTable;
+   IncSet* inc = state->mainPanel->inc;
+
+   IncSet_setFilter(inc, *commFilter);
+   table->incFilter = IncSet_filter(inc);
+
+   free(*commFilter);
+   *commFilter = NULL;
+}
+
+int CommandLine_run(int argc, char** argv) {
+
+   /* initialize locale */
+   const char* lc_ctype;
+   if ((lc_ctype = getenv("LC_CTYPE")) || (lc_ctype = getenv("LC_ALL")))
+      setlocale(LC_CTYPE, lc_ctype);
+   else
+      setlocale(LC_CTYPE, "");
+
+   CommandLineStatus status = STATUS_OK;
+   CommandLineSettings flags = { 0 };
+
+   if ((status = parseArguments(argc, argv, &flags)) != STATUS_OK)
+      return status != STATUS_OK_EXIT ? 1 : 0;
+
+   if (flags.readonly)
+      Settings_enableReadonly();
+
+   if (!Platform_init())
+      return 1;
+
+   UsersTable* ut = UsersTable_new();
+   Hashtable* dm = DynamicMeters_new();
+   Hashtable* dc = DynamicColumns_new();
+   Hashtable* ds = DynamicScreens_new();
+
+   Machine* host = Machine_new(ut, flags.userId);
+   ProcessTable* pt = ProcessTable_new(host, flags.pidMatchList);
+   Settings* settings = Settings_new(host->activeCPUs, dm, dc, ds);
+   Machine_populateTablesFromSettings(host, settings, &pt->super);
+
+   Header* header = Header_new(host, 2);
+   Header_populateFromSettings(header);
+
+   if (flags.delay != -1)
+      settings->delay = flags.delay;
+   if (!flags.useColors)
+      settings->colorScheme = COLORSCHEME_MONOCHROME;
+#ifdef HAVE_GETMOUSE
+   if (!flags.enableMouse)
+      settings->enableMouse = false;
+#endif
+   if (flags.treeView)
+      settings->ss->treeView = true;
+   if (flags.highlightChanges)
+      settings->highlightChanges = true;
+   if (flags.highlightDelaySecs != -1)
+      settings->highlightDelaySecs = flags.highlightDelaySecs;
+   if (flags.sortKey > 0) {
+      // -t -s <key> means "tree sorted by key"
+      // -s <key> means "list sorted by key" (previous existing behavior)
+      if (!flags.treeView) {
+         settings->ss->treeView = false;
+      }
+      ScreenSettings_setSortKey(settings->ss, flags.sortKey);
+   }
+
+   host->iterationsRemaining = flags.iterationsRemaining;
+   CRT_init(settings, flags.allowUnicode, flags.iterationsRemaining != -1);
+
+   MainPanel* panel = MainPanel_new();
+   Machine_setTablesPanel(host, (Panel*) panel);
+
+   MainPanel_updateLabels(panel, settings->ss->treeView, flags.commFilter);
+
+   State state = {
+      .host = host,
+      .mainPanel = panel,
+      .header = header,
+      .pauseUpdate = false,
+      .hideSelection = false,
+      .hideMeters = false,
+   };
+
+   MainPanel_setState(panel, &state);
+   if (flags.commFilter)
+      setCommFilter(&state, &(flags.commFilter));
+
+   ScreenManager* scr = ScreenManager_new(header, host, &state, true);
+   ScreenManager_add(scr, (Panel*) panel, -1);
+
+   Machine_scan(host);
+   Machine_scanTables(host);
+   CommandLine_delay(host, 75);
+   Machine_scan(host);
+   Machine_scanTables(host);
+
+   if (settings->ss->allBranchesCollapsed)
+      Table_collapseAllBranches(&pt->super);
+
+   ScreenManager_run(scr, NULL, NULL, NULL);
+
+   Platform_done();
+
+   CRT_done();
+
+   if (settings->changed) {
+      int r = Settings_write(settings, false);
+      if (r < 0)
+         fprintf(stderr, "Can not save configuration to %s: %s\n", settings->filename, strerror(-r));
+   }
+
+   Header_delete(header);
+   Machine_delete(host);
+
+   ScreenManager_delete(scr);
+   MetersPanel_cleanup();
+
+   UsersTable_delete(ut);
+
+   if (flags.pidMatchList)
+      Hashtable_delete(flags.pidMatchList);
+
+   CRT_resetSignalHandlers();
+
+   /* Delete these last, since they can get accessed in the crash handler */
+   Settings_delete(settings);
+   DynamicColumns_delete(dc);
+   DynamicMeters_delete(dm);
+   DynamicScreens_delete(ds);
+
+   return 0;
+}
diff --git a/CommandLine.h b/CommandLine.h
new file mode 100644
index 0000000..1839500
--- /dev/null
+++ b/CommandLine.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_CommandLine
+#define HEADER_CommandLine
+/*
+htop - CommandLine.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+typedef enum {
+   STATUS_OK,
+   STATUS_ERROR_EXIT,
+   STATUS_OK_EXIT
+} CommandLineStatus;
+
+extern const char* program;
+
+int CommandLine_run(int argc, char** argv);
+
+#endif
diff --git a/CommandScreen.c b/CommandScreen.c
new file mode 100644
index 0000000..465e4c2
--- /dev/null
+++ b/CommandScreen.c
@@ -0,0 +1,76 @@
+/*
+htop - CommandScreen.c
+(C) 2017,2020 ryenus
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CommandScreen.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Macros.h"
+#include "Panel.h"
+#include "ProvideCurses.h"
+
+
+static void CommandScreen_scan(InfoScreen* this) {
+   Panel* panel = this->display;
+   int idx = MAXIMUM(Panel_getSelectedIndex(panel), 0);
+   Panel_prune(panel);
+
+   const char* p = Process_getCommand(this->process);
+   char line[COLS + 1];
+   int line_offset = 0, last_spc = -1, len;
+   for (; *p != '\0'; p++, line_offset++) {
+      assert(line_offset >= 0 && (size_t)line_offset < sizeof(line));
+      line[line_offset] = *p;
+      if (*p == ' ') {
+         last_spc = line_offset;
+      }
+
+      if (line_offset == COLS) {
+         len = (last_spc == -1) ? line_offset : last_spc;
+         line[len] = '\0';
+         InfoScreen_addLine(this, line);
+
+         line_offset -= len;
+         last_spc = -1;
+         memcpy(line, p - line_offset, line_offset + 1);
+      }
+   }
+
+   if (line_offset > 0) {
+      line[line_offset] = '\0';
+      InfoScreen_addLine(this, line);
+   }
+
+   Panel_setSelected(panel, idx);
+}
+
+static void CommandScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Command of process %d - %s", Process_getPid(this->process), Process_getCommand(this->process));
+}
+
+const InfoScreenClass CommandScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = CommandScreen_delete
+   },
+   .scan = CommandScreen_scan,
+   .draw = CommandScreen_draw
+};
+
+CommandScreen* CommandScreen_new(Process* process) {
+   CommandScreen* this = AllocThis(CommandScreen);
+   return (CommandScreen*) InfoScreen_init(&this->super, process, NULL, LINES - 2, " ");
+}
+
+void CommandScreen_delete(Object* this) {
+   free(InfoScreen_done((InfoScreen*)this));
+}
diff --git a/CommandScreen.h b/CommandScreen.h
new file mode 100644
index 0000000..2eef5e5
--- /dev/null
+++ b/CommandScreen.h
@@ -0,0 +1,26 @@
+#ifndef HEADER_CommandScreen
+#define HEADER_CommandScreen
+/*
+htop - CommandScreen.h
+(C) 2017,2020 ryenus
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct CommandScreen_ {
+   InfoScreen super;
+} CommandScreen;
+
+extern const InfoScreenClass CommandScreen_class;
+
+CommandScreen* CommandScreen_new(Process* process);
+
+void CommandScreen_delete(Object* this);
+
+#endif
diff --git a/Compat.c b/Compat.c
new file mode 100644
index 0000000..d0ad2cc
--- /dev/null
+++ b/Compat.c
@@ -0,0 +1,156 @@
+/*
+htop - Compat.c
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Compat.h"
+
+#include <errno.h>
+#include <fcntl.h> // IWYU pragma: keep
+#include <limits.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h> // IWYU pragma: keep
+
+#include "XUtils.h" // IWYU pragma: keep
+
+
+/* GNU/Hurd does not have PATH_MAX in limits.h */
+#ifndef PATH_MAX
+# define PATH_MAX 4096
+#endif
+
+
+int Compat_faccessat(int dirfd,
+                     const char* pathname,
+                     int mode,
+                     int flags) {
+   int ret;
+
+#ifdef HAVE_FACCESSAT
+
+   // Implementation note: AT_SYMLINK_NOFOLLOW unsupported on FreeBSD, fallback to lstat in that case
+
+   errno = 0;
+
+   ret = faccessat(dirfd, pathname, mode, flags);
+   if (!ret || errno != EINVAL)
+      return ret;
+
+#endif
+
+   // Error out on unsupported configurations
+   if (dirfd != (int)AT_FDCWD || mode != F_OK) {
+      errno = EINVAL;
+      return -1;
+   }
+
+   // Fallback to stat(2)/lstat(2) depending on flags
+   struct stat statinfo;
+   if (flags) {
+      ret = lstat(pathname, &statinfo);
+   } else {
+      ret = stat(pathname, &statinfo);
+   }
+
+   return ret;
+}
+
+int Compat_fstatat(int dirfd,
+                   const char* dirpath,
+                   const char* pathname,
+                   struct stat* statbuf,
+                   int flags) {
+
+#ifdef HAVE_FSTATAT
+
+   (void)dirpath;
+
+   return fstatat(dirfd, pathname, statbuf, flags);
+
+#else
+
+   (void)dirfd;
+
+   char path[4096];
+   xSnprintf(path, sizeof(path), "%s/%s", dirpath, pathname);
+
+   if (flags & AT_SYMLINK_NOFOLLOW)
+      return lstat(path, statbuf);
+
+   return stat(path, statbuf);
+
+#endif
+}
+
+#ifndef HAVE_OPENAT
+
+int Compat_openat(const char* dirpath,
+                  const char* pathname,
+                  int flags) {
+
+   char path[4096];
+   xSnprintf(path, sizeof(path), "%s/%s", dirpath, pathname);
+
+   return open(path, flags);
+}
+
+#endif /* !HAVE_OPENAT */
+
+ssize_t Compat_readlinkat(int dirfd,
+                          const char* dirpath,
+                          const char* pathname,
+                          char* buf,
+                          size_t bufsize) {
+
+#ifdef HAVE_READLINKAT
+
+   (void)dirpath;
+
+   return readlinkat(dirfd, pathname, buf, bufsize);
+
+#else
+
+   (void)dirfd;
+
+   char path[4096];
+   xSnprintf(path, sizeof(path), "%s/%s", dirpath, pathname);
+
+   return readlink(path, buf, bufsize);
+
+#endif
+}
+
+ssize_t Compat_readlink(openat_arg_t dirfd,
+                        const char* pathname,
+                        char* buf,
+                        size_t bufsize) {
+
+#ifdef HAVE_OPENAT
+
+   char fdPath[32];
+   xSnprintf(fdPath, sizeof(fdPath), "/proc/self/fd/%d", dirfd);
+
+   char dirPath[PATH_MAX + 1];
+   ssize_t r = readlink(fdPath, dirPath, sizeof(dirPath) - 1);
+   if (r < 0)
+      return r;
+
+   dirPath[r] = '\0';
+
+   char linkPath[PATH_MAX + 1];
+   xSnprintf(linkPath, sizeof(linkPath), "%s/%s", dirPath, pathname);
+
+#else
+
+   char linkPath[PATH_MAX + 1];
+   xSnprintf(linkPath, sizeof(linkPath), "%s/%s", dirfd, pathname);
+
+#endif /* HAVE_OPENAT */
+
+   return readlink(linkPath, buf, bufsize);
+}
diff --git a/Compat.h b/Compat.h
new file mode 100644
index 0000000..2bc12dc
--- /dev/null
+++ b/Compat.h
@@ -0,0 +1,85 @@
+#ifndef HEADER_Compat
+#define HEADER_Compat
+/*
+htop - Compat.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <assert.h> // IWYU pragma: keep
+#include <fcntl.h>
+#include <stddef.h> // IWYU pragma: keep
+#include <unistd.h>
+#include <sys/stat.h> // IWYU pragma: keep
+
+
+int Compat_faccessat(int dirfd,
+                     const char* pathname,
+                     int mode,
+                     int flags);
+
+int Compat_fstatat(int dirfd,
+                   const char* dirpath,
+                   const char* pathname,
+                   struct stat* statbuf,
+                   int flags);
+
+#ifdef HAVE_OPENAT
+
+typedef int openat_arg_t;
+
+static inline void Compat_openatArgClose(openat_arg_t dirfd) {
+   close(dirfd);
+}
+
+static inline int Compat_openat(openat_arg_t dirfd, const char* pathname, int flags) {
+   return openat(dirfd, pathname, flags);
+}
+
+#else /* HAVE_OPENAT */
+
+typedef const char* openat_arg_t;
+
+static inline void Compat_openatArgClose(openat_arg_t dirpath) {
+   (void)dirpath;
+}
+
+int Compat_openat(openat_arg_t dirpath, const char* pathname, int flags);
+
+#endif /* HAVE_OPENAT */
+
+ssize_t Compat_readlinkat(int dirfd,
+                          const char* dirpath,
+                          const char* pathname,
+                          char* buf,
+                          size_t bufsize);
+
+ssize_t Compat_readlink(openat_arg_t dirfd,
+                        const char* pathname,
+                        char* buf,
+                        size_t bufsize);
+
+/*
+ * static_assert() hack for pre-C11
+ * TODO: drop after moving to -std=c11 or newer
+ */
+
+/* C11 guarantees _Static_assert is a keyword */
+#if (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 201112L
+# if !defined(_Static_assert)
+#  define _Static_assert(expr, msg)                                    \
+   extern int (*__Static_assert_function (void))                       \
+      [!!sizeof (struct { int __error_if_negative: (expr) ? 2 : -1; })]
+# endif
+#endif
+
+/* C23 will guarantee static_assert is a keyword or a macro */
+/* FIXME: replace 202300L with proper value once C23 is published */
+#if (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) < 202300L
+# if !defined(static_assert)
+#  define static_assert(expr, msg) _Static_assert(expr, msg)
+# endif
+#endif
+
+#endif /* HEADER_Compat */
diff --git a/DateMeter.c b/DateMeter.c
new file mode 100644
index 0000000..0bdb30a
--- /dev/null
+++ b/DateMeter.c
@@ -0,0 +1,52 @@
+/*
+htop - DateMeter.c
+(C) 2004-2020 Hisham H. Muhammad, Michael Schönitzer
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DateMeter.h"
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Object.h"
+
+
+static const int DateMeter_attributes[] = {
+   DATE
+};
+
+static void DateMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+
+   struct tm result;
+   const struct tm* lt = localtime_r(&host->realtime.tv_sec, &result);
+   this->values[0] = lt->tm_yday;
+   int year = lt->tm_year + 1900;
+   if (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) {
+      this->total = 366;
+   } else {
+      this->total = 365;
+   }
+   strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F", lt);
+}
+
+const MeterClass DateMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = DateMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 365,
+   .attributes = DateMeter_attributes,
+   .name = "Date",
+   .uiName = "Date",
+   .caption = "Date: ",
+};
diff --git a/DateMeter.h b/DateMeter.h
new file mode 100644
index 0000000..ecbfa99
--- /dev/null
+++ b/DateMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_DateMeter
+#define HEADER_DateMeter
+/*
+htop - DateMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass DateMeter_class;
+
+#endif
diff --git a/DateTimeMeter.c b/DateTimeMeter.c
new file mode 100644
index 0000000..dcd85ea
--- /dev/null
+++ b/DateTimeMeter.c
@@ -0,0 +1,52 @@
+/*
+htop - DateTimeMeter.c
+(C) 2004-2020 Hisham H. Muhammad, Michael Schönitzer
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DateTimeMeter.h"
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Object.h"
+
+
+static const int DateTimeMeter_attributes[] = {
+   DATETIME
+};
+
+static void DateTimeMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+
+   struct tm result;
+   const struct tm* lt = localtime_r(&host->realtime.tv_sec, &result);
+   int year = lt->tm_year + 1900;
+   if (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0)) {
+      this->total = 366;
+   } else {
+      this->total = 365;
+   }
+   this->values[0] = lt->tm_yday;
+   strftime(this->txtBuffer, sizeof(this->txtBuffer), "%F %H:%M:%S", lt);
+}
+
+const MeterClass DateTimeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = DateTimeMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 365,
+   .attributes = DateTimeMeter_attributes,
+   .name = "DateTime",
+   .uiName = "Date and Time",
+   .caption = "Date & Time: ",
+};
diff --git a/DateTimeMeter.h b/DateTimeMeter.h
new file mode 100644
index 0000000..5196dd3
--- /dev/null
+++ b/DateTimeMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_DateTimeMeter
+#define HEADER_DateTimeMeter
+/*
+htop - DateTimeMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass DateTimeMeter_class;
+
+#endif
diff --git a/DiskIOMeter.c b/DiskIOMeter.c
new file mode 100644
index 0000000..8d658de
--- /dev/null
+++ b/DiskIOMeter.c
@@ -0,0 +1,161 @@
+/*
+htop - DiskIOMeter.c
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DiskIOMeter.h"
+
+#include <stdbool.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "Row.h"
+#include "XUtils.h"
+
+
+static const int DiskIOMeter_attributes[] = {
+   METER_VALUE_NOTICE,
+   METER_VALUE_IOREAD,
+   METER_VALUE_IOWRITE,
+};
+
+static MeterRateStatus status = RATESTATUS_INIT;
+static char cached_read_diff_str[6];
+static char cached_write_diff_str[6];
+static double cached_utilisation_diff;
+
+static void DiskIOMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+
+   static uint64_t cached_last_update;
+   uint64_t passedTimeInMs = host->realtimeMs - cached_last_update;
+   bool hasNewData = false;
+   DiskIOData data;
+
+   /* update only every 500ms to have a sane span for rate calculation */
+   if (passedTimeInMs > 500) {
+      hasNewData = Platform_getDiskIO(&data);
+      if (!hasNewData) {
+         status = RATESTATUS_NODATA;
+      } else if (cached_last_update == 0) {
+         status = RATESTATUS_INIT;
+      } else if (passedTimeInMs > 30000) {
+         status = RATESTATUS_STALE;
+      } else {
+         status = RATESTATUS_DATA;
+      }
+
+      cached_last_update = host->realtimeMs;
+   }
+
+   if (hasNewData) {
+      static uint64_t cached_read_total;
+      static uint64_t cached_write_total;
+      static uint64_t cached_msTimeSpend_total;
+
+      if (status != RATESTATUS_INIT) {
+         uint64_t diff;
+
+         if (data.totalBytesRead > cached_read_total) {
+            diff = data.totalBytesRead - cached_read_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to B/s */
+            diff /= ONE_K; /* convert to KiB/s */
+         } else {
+            diff = 0;
+         }
+         Meter_humanUnit(cached_read_diff_str, diff, sizeof(cached_read_diff_str));
+
+         if (data.totalBytesWritten > cached_write_total) {
+            diff = data.totalBytesWritten - cached_write_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to B/s */
+            diff /= ONE_K; /* convert to KiB/s */
+         } else {
+            diff = 0;
+         }
+         Meter_humanUnit(cached_write_diff_str, diff, sizeof(cached_write_diff_str));
+
+         if (data.totalMsTimeSpend > cached_msTimeSpend_total) {
+            diff = data.totalMsTimeSpend - cached_msTimeSpend_total;
+            cached_utilisation_diff = 100.0 * (double)diff / passedTimeInMs;
+            cached_utilisation_diff = MINIMUM(cached_utilisation_diff, 100.0);
+         } else {
+            cached_utilisation_diff = 0.0;
+         }
+      }
+
+      cached_read_total = data.totalBytesRead;
+      cached_write_total = data.totalBytesWritten;
+      cached_msTimeSpend_total = data.totalMsTimeSpend;
+   }
+
+   this->values[0] = cached_utilisation_diff;
+
+   if (status == RATESTATUS_NODATA) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "no data");
+      return;
+   }
+   if (status == RATESTATUS_INIT) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "init");
+      return;
+   }
+   if (status == RATESTATUS_STALE) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "stale");
+      return;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "r:%siB/s w:%siB/s %.1f%%", cached_read_diff_str, cached_write_diff_str, cached_utilisation_diff);
+}
+
+static void DiskIOMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   switch (status) {
+      case RATESTATUS_NODATA:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_ERROR], "no data");
+         return;
+      case RATESTATUS_INIT:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE], "initializing...");
+         return;
+      case RATESTATUS_STALE:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_WARN], "stale data");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   char buffer[16];
+
+   int color = cached_utilisation_diff > 40.0 ? METER_VALUE_NOTICE : METER_VALUE;
+   int len = xSnprintf(buffer, sizeof(buffer), "%.1f%%", cached_utilisation_diff);
+   RichString_appendnAscii(out, CRT_colors[color], buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " read: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], cached_read_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], "iB/s");
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " write: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], cached_write_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], "iB/s");
+}
+
+const MeterClass DiskIOMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = DiskIOMeter_display
+   },
+   .updateValues = DiskIOMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100.0,
+   .attributes = DiskIOMeter_attributes,
+   .name = "DiskIO",
+   .uiName = "Disk IO",
+   .caption = "Disk IO: "
+};
diff --git a/DiskIOMeter.h b/DiskIOMeter.h
new file mode 100644
index 0000000..5ac9c48
--- /dev/null
+++ b/DiskIOMeter.h
@@ -0,0 +1,23 @@
+#ifndef HEADER_DiskIOMeter
+#define HEADER_DiskIOMeter
+/*
+htop - DiskIOMeter.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdint.h>
+
+#include "Meter.h"
+
+
+typedef struct DiskIOData_ {
+   uint64_t totalBytesRead;
+   uint64_t totalBytesWritten;
+   uint64_t totalMsTimeSpend;
+} DiskIOData;
+
+extern const MeterClass DiskIOMeter_class;
+
+#endif /* HEADER_DiskIOMeter */
diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c
new file mode 100644
index 0000000..66793e1
--- /dev/null
+++ b/DisplayOptionsPanel.c
@@ -0,0 +1,162 @@
+/*
+htop - DisplayOptionsPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DisplayOptionsPanel.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Header.h"
+#include "Object.h"
+#include "OptionItem.h"
+#include "ProvideCurses.h"
+#include "ScreensPanel.h"
+
+
+static const char* const DisplayOptionsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static void DisplayOptionsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   DisplayOptionsPanel* this = (DisplayOptionsPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) {
+   DisplayOptionsPanel* this = (DisplayOptionsPanel*) super;
+
+   HandlerResult result = IGNORED;
+   OptionItem* selected = (OptionItem*) Panel_getSelected(super);
+
+   switch (ch) {
+      case '\n':
+      case '\r':
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+      case ' ':
+         switch (OptionItem_kind(selected)) {
+            case OPTION_ITEM_TEXT:
+               break;
+            case OPTION_ITEM_CHECK:
+               CheckItem_toggle((CheckItem*)selected);
+               result = HANDLED;
+               break;
+            case OPTION_ITEM_NUMBER:
+               NumberItem_toggle((NumberItem*)selected);
+               result = HANDLED;
+               break;
+         }
+         break;
+      case '-':
+         if (OptionItem_kind(selected) == OPTION_ITEM_NUMBER) {
+            NumberItem_decrease((NumberItem*)selected);
+            result = HANDLED;
+         }
+         break;
+      case '+':
+         if (OptionItem_kind(selected) == OPTION_ITEM_NUMBER) {
+            NumberItem_increase((NumberItem*)selected);
+            result = HANDLED;
+         }
+         break;
+   }
+
+   if (result == HANDLED) {
+      this->settings->changed = true;
+      this->settings->lastUpdate++;
+      Header* header = this->scr->header;
+      Header_calculateHeight(header);
+      Header_reinit(header);
+      Header_updateData(header);
+      Header_draw(header);
+      ScreenManager_resize(this->scr);
+   }
+
+   return result;
+}
+
+const PanelClass DisplayOptionsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = DisplayOptionsPanel_delete
+   },
+   .eventHandler = DisplayOptionsPanel_eventHandler
+};
+
+DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* scr) {
+   DisplayOptionsPanel* this = AllocThis(DisplayOptionsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(DisplayOptionsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(OptionItem), true, fuBar);
+
+   this->settings = settings;
+   this->scr = scr;
+
+   Panel_setHeader(super, "Display options");
+
+   #define TABMSG "For current screen tab: \0"
+   char tabheader[sizeof(TABMSG) + SCREEN_NAME_LEN + 1] = TABMSG;
+   strncat(tabheader, settings->ss->heading, SCREEN_NAME_LEN);
+   Panel_add(super, (Object*) TextItem_new(tabheader));
+   #undef TABMSG
+
+   Panel_add(super, (Object*) CheckItem_newByRef("Tree view", &(settings->ss->treeView)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Tree view is always sorted by PID (htop 2 behavior)", &(settings->ss->treeViewAlwaysByPID)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Tree view is collapsed by default", &(settings->ss->allBranchesCollapsed)));
+   Panel_add(super, (Object*) TextItem_new("Global options:"));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show tabs for screens", &(settings->screenTabs)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Shadow other users' processes", &(settings->shadowOtherUsers)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Hide kernel threads", &(settings->hideKernelThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Hide userland process threads", &(settings->hideUserlandThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Hide processes running in containers", &(settings->hideRunningInContainer)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Display threads in a different color", &(settings->highlightThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show custom thread names", &(settings->showThreadNames)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show program path", &(settings->showProgramPath)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight program \"basename\"", &(settings->highlightBaseName)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight out-dated/removed programs (red) / libraries (yellow)", &(settings->highlightDeletedExe)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Shadow distribution path prefixes", &(settings->shadowDistPathPrefix)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Merge exe, comm and cmdline in Command", &(settings->showMergedCommand)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Try to find comm in cmdline (when Command is merged)", &(settings->findCommInCmdline)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Try to strip exe from cmdline (when Command is merged)", &(settings->stripExeFromCmdline)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight large numbers in memory counters", &(settings->highlightMegabytes)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Leave a margin around header", &(settings->headerMargin)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Detailed CPU time (System/IO-Wait/Hard-IRQ/Soft-IRQ/Steal/Guest)", &(settings->detailedCPUTime)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Count CPUs from 1 instead of 0", &(settings->countCPUsFromOne)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Update process names on every refresh", &(settings->updateProcessNames)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Add guest time in CPU meter percentage", &(settings->accountGuestInCPUMeter)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU percentage numerically", &(settings->showCPUUsage)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU frequency", &(settings->showCPUFrequency)));
+   #ifdef BUILD_WITH_CPU_TEMP
+   Panel_add(super, (Object*) CheckItem_newByRef(
+   #if defined(HTOP_LINUX)
+                                                 "Also show CPU temperature (requires libsensors)",
+   #elif defined(HTOP_FREEBSD)
+                                                 "Also show CPU temperature",
+   #else
+   #error Unknown temperature implementation!
+   #endif
+                                                 &(settings->showCPUTemperature)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Show temperature in degree Fahrenheit instead of Celsius", &(settings->degreeFahrenheit)));
+   #endif
+   #ifdef HAVE_GETMOUSE
+   Panel_add(super, (Object*) CheckItem_newByRef("Enable the mouse", &(settings->enableMouse)));
+   #endif
+   Panel_add(super, (Object*) NumberItem_newByRef("Update interval (in seconds)", &(settings->delay), -1, 1, 255));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight new and old processes", &(settings->highlightChanges)));
+   Panel_add(super, (Object*) NumberItem_newByRef("- Highlight time (in seconds)", &(settings->highlightDelaySecs), 0, 1, 24 * 60 * 60));
+   Panel_add(super, (Object*) NumberItem_newByRef("Hide main function bar (0 - off, 1 - on ESC until next input, 2 - permanently)", &(settings->hideFunctionBar), 0, 0, 2));
+   #ifdef HAVE_LIBHWLOC
+   Panel_add(super, (Object*) CheckItem_newByRef("Show topology when selecting affinity by default", &(settings->topologyAffinity)));
+   #endif
+   return this;
+}
diff --git a/DisplayOptionsPanel.h b/DisplayOptionsPanel.h
new file mode 100644
index 0000000..5e87a63
--- /dev/null
+++ b/DisplayOptionsPanel.h
@@ -0,0 +1,26 @@
+#ifndef HEADER_DisplayOptionsPanel
+#define HEADER_DisplayOptionsPanel
+/*
+htop - DisplayOptionsPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Panel.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+
+
+typedef struct DisplayOptionsPanel_ {
+   Panel super;
+
+   Settings* settings;
+   ScreenManager* scr;
+} DisplayOptionsPanel;
+
+extern const PanelClass DisplayOptionsPanel_class;
+
+DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager* scr);
+
+#endif
diff --git a/DynamicColumn.c b/DynamicColumn.c
new file mode 100644
index 0000000..5f02174
--- /dev/null
+++ b/DynamicColumn.c
@@ -0,0 +1,76 @@
+/*
+htop - DynamicColumn.c
+(C) 2021 Sohaib Mohammed
+(C) 2021 htop dev team
+(C) 2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DynamicColumn.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+Hashtable* DynamicColumns_new(void) {
+   Hashtable* dynamics = Platform_dynamicColumns();
+   if (!dynamics)
+      dynamics = Hashtable_new(0, true);
+   return dynamics;
+}
+
+void DynamicColumns_delete(Hashtable* dynamics) {
+   if (dynamics) {
+      Platform_dynamicColumnsDone(dynamics);
+      Hashtable_delete(dynamics);
+   }
+}
+
+const char* DynamicColumn_name(unsigned int key) {
+   return Platform_dynamicColumnName(key);
+}
+
+void DynamicColumn_done(DynamicColumn* this) {
+   free(this->heading);
+   free(this->caption);
+   free(this->description);
+}
+
+typedef struct {
+   const char* name;
+   const DynamicColumn* data;
+   unsigned int key;
+} DynamicIterator;
+
+static void DynamicColumn_compare(ht_key_t key, void* value, void* data) {
+   const DynamicColumn* column = (const DynamicColumn*)value;
+   DynamicIterator* iter = (DynamicIterator*)data;
+   if (String_eq(iter->name, column->name)) {
+      iter->data = column;
+      iter->key = key;
+   }
+}
+
+const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* key) {
+   DynamicIterator iter = { .key = 0, .data = NULL, .name = name };
+   if (dynamics)
+      Hashtable_foreach(dynamics, DynamicColumn_compare, &iter);
+   if (key)
+      *key = iter.key;
+   return iter.data;
+}
+
+const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key) {
+   return (const DynamicColumn*) Hashtable_get(dynamics, key);
+}
+
+bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key) {
+   return Platform_dynamicColumnWriteField(proc, str, key);
+}
diff --git a/DynamicColumn.h b/DynamicColumn.h
new file mode 100644
index 0000000..bdce82d
--- /dev/null
+++ b/DynamicColumn.h
@@ -0,0 +1,45 @@
+#ifndef HEADER_DynamicColumn
+#define HEADER_DynamicColumn
+/*
+htop - DynamicColumn.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Hashtable.h"
+#include "Process.h"
+#include "RichString.h"
+#include "Table.h"
+
+
+#define DYNAMIC_MAX_COLUMN_WIDTH 64
+#define DYNAMIC_DEFAULT_COLUMN_WIDTH -5
+
+typedef struct DynamicColumn_ {
+   char name[32];           /* unique, internal-only name */
+   char* heading;           /* displayed in main screen */
+   char* caption;           /* displayed in setup menu (short name) */
+   char* description;       /* displayed in setup menu (detail) */
+   int width;               /* display width +/- for value alignment */
+   bool enabled;            /* false == ignore this column (until enabled) */
+   Table* table;            /* pointer to DynamicScreen or ProcessTable */
+} DynamicColumn;
+
+Hashtable* DynamicColumns_new(void);
+
+void DynamicColumns_delete(Hashtable* dynamics);
+
+const char* DynamicColumn_name(unsigned int key);
+
+void DynamicColumn_done(DynamicColumn* this);
+
+const DynamicColumn* DynamicColumn_lookup(Hashtable* dynamics, unsigned int key);
+
+const DynamicColumn* DynamicColumn_search(Hashtable* dynamics, const char* name, unsigned int* key);
+
+bool DynamicColumn_writeField(const Process* proc, RichString* str, unsigned int key);
+
+#endif
diff --git a/DynamicMeter.c b/DynamicMeter.c
new file mode 100644
index 0000000..15d853b
--- /dev/null
+++ b/DynamicMeter.c
@@ -0,0 +1,132 @@
+/*
+htop - DynamicMeter.c
+(C) 2021 htop dev team
+(C) 2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DynamicMeter.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static const int DynamicMeter_attributes[] = {
+   DYNAMIC_GRAY,
+   DYNAMIC_DARKGRAY,
+   DYNAMIC_RED,
+   DYNAMIC_GREEN,
+   DYNAMIC_BLUE,
+   DYNAMIC_CYAN,
+   DYNAMIC_MAGENTA,
+   DYNAMIC_YELLOW,
+   DYNAMIC_WHITE
+};
+
+Hashtable* DynamicMeters_new(void) {
+   return Platform_dynamicMeters();
+}
+
+void DynamicMeters_delete(Hashtable* dynamics) {
+   if (dynamics) {
+      Platform_dynamicMetersDone(dynamics);
+      Hashtable_delete(dynamics);
+   }
+}
+
+typedef struct {
+   unsigned int key;
+   const char* name;
+   bool found;
+} DynamicIterator;
+
+static void DynamicMeter_compare(ht_key_t key, void* value, void* data) {
+   const DynamicMeter* meter = (const DynamicMeter*)value;
+   DynamicIterator* iter = (DynamicIterator*)data;
+   if (String_eq(iter->name, meter->name)) {
+      iter->found = true;
+      iter->key = key;
+   }
+}
+
+bool DynamicMeter_search(Hashtable* dynamics, const char* name, unsigned int* key) {
+   DynamicIterator iter = { .key = 0, .name = name, .found = false };
+   if (dynamics)
+      Hashtable_foreach(dynamics, DynamicMeter_compare, &iter);
+   if (key)
+      *key = iter.key;
+   return iter.found;
+}
+
+const char* DynamicMeter_lookup(Hashtable* dynamics, unsigned int key) {
+   const DynamicMeter* meter = Hashtable_get(dynamics, key);
+   return meter ? meter->name : NULL;
+}
+
+static void DynamicMeter_init(Meter* meter) {
+   Platform_dynamicMeterInit(meter);
+}
+
+static void DynamicMeter_updateValues(Meter* meter) {
+   Platform_dynamicMeterUpdateValues(meter);
+}
+
+static void DynamicMeter_display(const Object* cast, RichString* out) {
+   const Meter* meter = (const Meter*)cast;
+   Platform_dynamicMeterDisplay(meter, out);
+}
+
+static const char* DynamicMeter_getCaption(const Meter* this) {
+   const Settings* settings = this->host->settings;
+   const DynamicMeter* meter = Hashtable_get(settings->dynamicMeters, this->param);
+   if (meter)
+      return meter->caption ? meter->caption : meter->name;
+   return this->caption;
+}
+
+static void DynamicMeter_getUiName(const Meter* this, char* name, size_t length) {
+   const Settings* settings = this->host->settings;
+   const DynamicMeter* meter = Hashtable_get(settings->dynamicMeters, this->param);
+   if (meter) {
+      const char* uiName = meter->caption;
+      if (uiName) {
+         int len = strlen(uiName);
+         if (len > 2 && uiName[len - 2] == ':')
+            len -= 2;
+         xSnprintf(name, length, "%.*s", len, uiName);
+      } else {
+         xSnprintf(name, length, "%s", meter->name);
+      }
+   }
+}
+
+const MeterClass DynamicMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = DynamicMeter_display
+   },
+   .init = DynamicMeter_init,
+   .updateValues = DynamicMeter_updateValues,
+   .getCaption = DynamicMeter_getCaption,
+   .getUiName = DynamicMeter_getUiName,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = DynamicMeter_attributes,
+   .name = "Dynamic",
+   .uiName = "Dynamic",
+   .caption = "",
+};
diff --git a/DynamicMeter.h b/DynamicMeter.h
new file mode 100644
index 0000000..2bc3cba
--- /dev/null
+++ b/DynamicMeter.h
@@ -0,0 +1,35 @@
+#ifndef HEADER_DynamicMeter
+#define HEADER_DynamicMeter
+/*
+htop - DynamicMeter.h
+(C) 2021 htop dev team
+(C) 2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Hashtable.h"
+#include "Meter.h"
+
+
+typedef struct DynamicMeter_ {
+   char name[32];  /* unique name, cannot contain spaces */
+   char* caption;
+   char* description;
+   unsigned int type;
+   double maximum;
+} DynamicMeter;
+
+Hashtable* DynamicMeters_new(void);
+
+void DynamicMeters_delete(Hashtable* dynamics);
+
+const char* DynamicMeter_lookup(Hashtable* dynamics, unsigned int key);
+
+bool DynamicMeter_search(Hashtable* dynamics, const char* name, unsigned int* key);
+
+extern const MeterClass DynamicMeter_class;
+
+#endif
diff --git a/DynamicScreen.c b/DynamicScreen.c
new file mode 100644
index 0000000..9e3d5e4
--- /dev/null
+++ b/DynamicScreen.c
@@ -0,0 +1,68 @@
+/*
+htop - DynamicScreen.c
+(C) 2022 Sohaib Mohammed
+(C) 2022-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "DynamicScreen.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "Hashtable.h"
+#include "Platform.h"
+#include "XUtils.h"
+
+
+Hashtable* DynamicScreens_new(void) {
+   return Platform_dynamicScreens();
+}
+
+void DynamicScreens_delete(Hashtable* screens) {
+   if (screens) {
+      Platform_dynamicScreensDone(screens);
+      Hashtable_delete(screens);
+   }
+}
+
+void DynamicScreen_done(DynamicScreen* this) {
+   free(this->caption);
+   free(this->fields);
+   free(this->heading);
+   free(this->sortKey);
+   free(this->columnKeys);
+}
+
+typedef struct {
+   ht_key_t key;
+   const char* name;
+   bool found;
+} DynamicIterator;
+
+static void DynamicScreen_compare(ht_key_t key, void* value, void* data) {
+   const DynamicScreen* screen = (const DynamicScreen*)value;
+   DynamicIterator* iter = (DynamicIterator*)data;
+   if (String_eq(iter->name, screen->name)) {
+      iter->found = true;
+      iter->key = key;
+   }
+}
+
+bool DynamicScreen_search(Hashtable* screens, const char* name, ht_key_t* key) {
+   DynamicIterator iter = { .key = 0, .name = name, .found = false };
+   if (screens)
+      Hashtable_foreach(screens, DynamicScreen_compare, &iter);
+   if (key)
+      *key = iter.key;
+   return iter.found;
+}
+
+const char* DynamicScreen_lookup(Hashtable* screens, ht_key_t key) {
+   const DynamicScreen* screen = Hashtable_get(screens, key);
+   return screen ? screen->name : NULL;
+}
diff --git a/DynamicScreen.h b/DynamicScreen.h
new file mode 100644
index 0000000..fb08ebc
--- /dev/null
+++ b/DynamicScreen.h
@@ -0,0 +1,38 @@
+#ifndef HEADER_DynamicScreen
+#define HEADER_DynamicScreen
+/*
+htop - DynamicColumn.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Hashtable.h"
+#include "Panel.h"
+
+
+typedef struct DynamicScreen_ {
+   char name[32];  /* unique name cannot contain any spaces */
+   char* heading;  /* user-settable more readable name */
+   char* caption;  /* explanatory text for screen */
+   char* fields;
+   char* sortKey;
+   char* columnKeys;
+   int direction;
+} DynamicScreen;
+
+Hashtable* DynamicScreens_new(void);
+
+void DynamicScreens_delete(Hashtable* dynamics);
+
+void DynamicScreen_done(DynamicScreen* this);
+
+void DynamicScreens_addAvailableColumns(Panel* availableColumns, char* screen);
+
+const char* DynamicScreen_lookup(Hashtable* screens, unsigned int key);
+
+bool DynamicScreen_search(Hashtable* screens, const char* name, unsigned int* key);
+
+#endif
diff --git a/EnvScreen.c b/EnvScreen.c
new file mode 100644
index 0000000..4a36b31
--- /dev/null
+++ b/EnvScreen.c
@@ -0,0 +1,67 @@
+/*
+htop - EnvScreen.c
+(C) 2015,2016 Michael Klein
+(C) 2016,2017 Hisham H. Muhammad
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "EnvScreen.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "Macros.h"
+#include "Panel.h"
+#include "Platform.h"
+#include "ProvideCurses.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+
+EnvScreen* EnvScreen_new(Process* process) {
+   EnvScreen* this = xMalloc(sizeof(EnvScreen));
+   Object_setClass(this, Class(EnvScreen));
+   return (EnvScreen*) InfoScreen_init(&this->super, process, NULL, LINES - 2, " ");
+}
+
+void EnvScreen_delete(Object* this) {
+   free(InfoScreen_done((InfoScreen*)this));
+}
+
+static void EnvScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Environment of process %d - %s", Process_getPid(this->process), Process_getCommand(this->process));
+}
+
+static void EnvScreen_scan(InfoScreen* this) {
+   Panel* panel = this->display;
+   int idx = MAXIMUM(Panel_getSelectedIndex(panel), 0);
+
+   Panel_prune(panel);
+
+   char* env = Platform_getProcessEnv(Process_getPid(this->process));
+   if (env) {
+      for (const char* p = env; *p; p = strrchr(p, 0) + 1)
+         InfoScreen_addLine(this, p);
+      free(env);
+   }
+   else {
+      InfoScreen_addLine(this, "Could not read process environment.");
+   }
+
+   Vector_insertionSort(this->lines);
+   Vector_insertionSort(panel->items);
+   Panel_setSelected(panel, idx);
+}
+
+const InfoScreenClass EnvScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = EnvScreen_delete
+   },
+   .scan = EnvScreen_scan,
+   .draw = EnvScreen_draw
+};
diff --git a/EnvScreen.h b/EnvScreen.h
new file mode 100644
index 0000000..118c271
--- /dev/null
+++ b/EnvScreen.h
@@ -0,0 +1,27 @@
+#ifndef HEADER_EnvScreen
+#define HEADER_EnvScreen
+/*
+htop - EnvScreen.h
+(C) 2015,2016 Michael Klein
+(C) 2016,2017 Hisham H. Muhammad
+(C) 2020,2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct EnvScreen_ {
+   InfoScreen super;
+} EnvScreen;
+
+extern const InfoScreenClass EnvScreen_class;
+
+EnvScreen* EnvScreen_new(Process* process);
+
+void EnvScreen_delete(Object* this);
+
+#endif
diff --git a/FileDescriptorMeter.c b/FileDescriptorMeter.c
new file mode 100644
index 0000000..cf1ec93
--- /dev/null
+++ b/FileDescriptorMeter.c
@@ -0,0 +1,118 @@
+/*
+htop - FileDescriptorMeter.c
+(C) 2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "FileDescriptorMeter.h"
+
+#include <math.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+#define FD_EFFECTIVE_UNLIMITED(x) (!isgreaterequal((double)(1<<30), (x)))
+
+static const int FileDescriptorMeter_attributes[] = {
+   FILE_DESCRIPTOR_USED,
+   FILE_DESCRIPTOR_MAX
+};
+
+static void FileDescriptorMeter_updateValues(Meter* this) {
+   this->values[0] = 0;
+   this->values[1] = 1;
+
+   Platform_getFileDescriptors(&this->values[0], &this->values[1]);
+
+   /* only print bar for first value */
+   this->curItems = 1;
+
+   /* Use maximum value for scaling of bar mode
+    *
+    * As the plain total value can be very large compared to
+    * the actually used value, this is capped in the following way:
+    *
+    * 1. If the maximum value is below (or equal to) 1<<16, use it directly
+    * 2. If the maximum value is above, use powers of 2 starting at 1<<16 and
+    *    double it until it's larger than 16 times the used file handles
+    *    (capped at the maximum number of files)
+    * 3. If the maximum is effectively unlimited (AKA > 1<<30),
+    *    Do the same as for 2, but cap at 1<<30.
+    */
+   if (this->values[1] <= 1 << 16) {
+      this->total = this->values[1];
+   } else {
+      if (this->total < 16 * this->values[0]) {
+         for (this->total = 1 << 16; this->total < 16 * this->values[0]; this->total *= 2) {
+            if (this->total >= 1 << 30) {
+               break;
+            }
+         }
+      }
+
+      if (this->total > this->values[1]) {
+         this->total = this->values[1];
+      }
+
+      if (this->total > 1 << 30) {
+         this->total = 1 << 30;
+      }
+   }
+
+   if (!isNonnegative(this->values[0])) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "unknown/unknown");
+   } else if (FD_EFFECTIVE_UNLIMITED(this->values[1])) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.0lf/unlimited", this->values[0]);
+   } else {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.0lf/%.0lf", this->values[0], this->values[1]);
+   }
+}
+
+static void FileDescriptorMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+   char buffer[50];
+   int len;
+
+   if (!isNonnegative(this->values[0])) {
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], "unknown");
+      return;
+   }
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], "used: ");
+   len = xSnprintf(buffer, sizeof(buffer), "%.0lf", this->values[0]);
+   RichString_appendnAscii(out, CRT_colors[FILE_DESCRIPTOR_USED], buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " max: ");
+   if (FD_EFFECTIVE_UNLIMITED(this->values[1])) {
+      RichString_appendAscii(out, CRT_colors[FILE_DESCRIPTOR_MAX], "unlimited");
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%.0lf", this->values[1]);
+      RichString_appendnAscii(out, CRT_colors[FILE_DESCRIPTOR_MAX], buffer, len);
+   }
+}
+
+const MeterClass FileDescriptorMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = FileDescriptorMeter_display,
+   },
+   .updateValues = FileDescriptorMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 2,
+   .total = 65536.0,
+   .attributes = FileDescriptorMeter_attributes,
+   .name = "FileDescriptors",
+   .uiName = "File Descriptors",
+   .caption = "FDs: ",
+   .description = "Number of allocated/available file descriptors"
+};
diff --git a/FileDescriptorMeter.h b/FileDescriptorMeter.h
new file mode 100644
index 0000000..e1b4f5f
--- /dev/null
+++ b/FileDescriptorMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_FileDescriptorMeter
+#define HEADER_FileDescriptorMeter
+/*
+htop - FileDescriptorMeter.h
+(C) 2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass FileDescriptorMeter_class;
+
+#endif
diff --git a/FunctionBar.c b/FunctionBar.c
new file mode 100644
index 0000000..0850037
--- /dev/null
+++ b/FunctionBar.c
@@ -0,0 +1,155 @@
+/*
+htop - FunctionBar.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "FunctionBar.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "ProvideCurses.h"
+#include "XUtils.h"
+
+
+static const char* const FunctionBar_FKeys[] = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", NULL};
+
+static const char* const FunctionBar_FLabels[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", NULL};
+
+static int FunctionBar_FEvents[] = {KEY_F(1), KEY_F(2), KEY_F(3), KEY_F(4), KEY_F(5), KEY_F(6), KEY_F(7), KEY_F(8), KEY_F(9), KEY_F(10)};
+
+static const char* const FunctionBar_EnterEscKeys[] = {"Enter", "Esc", NULL};
+static const int FunctionBar_EnterEscEvents[] = {13, 27};
+
+static int currentLen = 0;
+
+FunctionBar* FunctionBar_newEnterEsc(const char* enter, const char* esc) {
+   const char* functions[] = {enter, esc, NULL};
+   return FunctionBar_new(functions, FunctionBar_EnterEscKeys, FunctionBar_EnterEscEvents);
+}
+
+FunctionBar* FunctionBar_new(const char* const* functions, const char* const* keys, const int* events) {
+   FunctionBar* this = xCalloc(1, sizeof(FunctionBar));
+   this->functions = xCalloc(16, sizeof(char*));
+   if (!functions) {
+      functions = FunctionBar_FLabels;
+   }
+   for (int i = 0; i < 15 && functions[i]; i++) {
+      this->functions[i] = xStrdup(functions[i]);
+   }
+   if (keys && events) {
+      this->staticData = false;
+      this->keys.keys = xCalloc(15, sizeof(char*));
+      this->events = xCalloc(15, sizeof(int));
+      int i = 0;
+      while (i < 15 && functions[i]) {
+         this->keys.keys[i] = xStrdup(keys[i]);
+         this->events[i] = events[i];
+         i++;
+      }
+      this->size = i;
+   } else {
+      this->staticData = true;
+      this->keys.constKeys = FunctionBar_FKeys;
+      this->events = FunctionBar_FEvents;
+      this->size = ARRAYSIZE(FunctionBar_FEvents);
+   }
+   return this;
+}
+
+void FunctionBar_delete(FunctionBar* this) {
+   for (int i = 0; i < 15 && this->functions[i]; i++) {
+      free(this->functions[i]);
+   }
+   free(this->functions);
+   if (!this->staticData) {
+      for (int i = 0; i < this->size; i++) {
+         free(this->keys.keys[i]);
+      }
+      free(this->keys.keys);
+      free(this->events);
+   }
+   free(this);
+}
+
+void FunctionBar_setLabel(FunctionBar* this, int event, const char* text) {
+   for (int i = 0; i < this->size; i++) {
+      if (this->events[i] == event) {
+         free(this->functions[i]);
+         this->functions[i] = xStrdup(text);
+         break;
+      }
+   }
+}
+
+int FunctionBar_draw(const FunctionBar* this) {
+   return FunctionBar_drawExtra(this, NULL, -1, false);
+}
+
+int FunctionBar_drawExtra(const FunctionBar* this, const char* buffer, int attr, bool setCursor) {
+   int cursorX = 0;
+   attrset(CRT_colors[FUNCTION_BAR]);
+   mvhline(LINES - 1, 0, ' ', COLS);
+   int x = 0;
+   for (int i = 0; i < this->size; i++) {
+      attrset(CRT_colors[FUNCTION_KEY]);
+      mvaddstr(LINES - 1, x, this->keys.constKeys[i]);
+      x += strlen(this->keys.constKeys[i]);
+      attrset(CRT_colors[FUNCTION_BAR]);
+      mvaddstr(LINES - 1, x, this->functions[i]);
+      x += strlen(this->functions[i]);
+   }
+
+   if (buffer) {
+      if (attr == -1) {
+         attrset(CRT_colors[FUNCTION_BAR]);
+      } else {
+         attrset(attr);
+      }
+      mvaddstr(LINES - 1, x, buffer);
+      x += strlen(buffer);
+      cursorX = x;
+   }
+
+   attrset(CRT_colors[RESET_COLOR]);
+
+   if (setCursor) {
+      curs_set(1);
+   } else {
+      curs_set(0);
+   }
+
+   currentLen = x;
+
+   return cursorX;
+}
+
+void FunctionBar_append(const char* buffer, int attr) {
+   if (attr == -1) {
+      attrset(CRT_colors[FUNCTION_BAR]);
+   } else {
+      attrset(attr);
+   }
+   mvaddstr(LINES - 1, currentLen + 1, buffer);
+   attrset(CRT_colors[RESET_COLOR]);
+
+   currentLen += strlen(buffer) + 1;
+}
+
+int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos) {
+   int x = 0;
+   for (int i = 0; i < this->size; i++) {
+      x += strlen(this->keys.constKeys[i]);
+      x += strlen(this->functions[i]);
+      if (pos < x) {
+         return this->events[i];
+      }
+   }
+   return ERR;
+}
diff --git a/FunctionBar.h b/FunctionBar.h
new file mode 100644
index 0000000..f01a5ef
--- /dev/null
+++ b/FunctionBar.h
@@ -0,0 +1,40 @@
+#ifndef HEADER_FunctionBar
+#define HEADER_FunctionBar
+/*
+htop - FunctionBar.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+
+typedef struct FunctionBar_ {
+   int size;
+   char** functions;
+   union {
+      char** keys;
+      const char* const* constKeys;
+   } keys;
+   int* events;
+   bool staticData;
+} FunctionBar;
+
+FunctionBar* FunctionBar_newEnterEsc(const char* enter, const char* esc);
+
+FunctionBar* FunctionBar_new(const char* const* functions, const char* const* keys, const int* events);
+
+void FunctionBar_delete(FunctionBar* this);
+
+void FunctionBar_setLabel(FunctionBar* this, int event, const char* text);
+
+int FunctionBar_draw(const FunctionBar* this);
+
+int FunctionBar_drawExtra(const FunctionBar* this, const char* buffer, int attr, bool setCursor);
+
+void FunctionBar_append(const char* buffer, int attr);
+
+int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos);
+
+#endif
diff --git a/Hashtable.c b/Hashtable.c
new file mode 100644
index 0000000..2756b23
--- /dev/null
+++ b/Hashtable.c
@@ -0,0 +1,330 @@
+/*
+htop - Hashtable.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Hashtable.h"
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "XUtils.h"
+
+#ifndef NDEBUG
+#include <stdio.h>
+#endif
+
+
+typedef struct HashtableItem_ {
+   ht_key_t key;
+   size_t probe;
+   void* value;
+} HashtableItem;
+
+struct Hashtable_ {
+   size_t size;
+   HashtableItem* buckets;
+   size_t items;
+   bool owner;
+};
+
+
+#ifndef NDEBUG
+
+static void Hashtable_dump(const Hashtable* this) {
+   fprintf(stderr, "Hashtable %p: size=%zu items=%zu owner=%s\n",
+           (const void*)this,
+           this->size,
+           this->items,
+           this->owner ? "yes" : "no");
+
+   size_t items = 0;
+   for (size_t i = 0; i < this->size; i++) {
+      fprintf(stderr, "  item %5zu: key = %5u probe = %2zu value = %p\n",
+              i,
+              this->buckets[i].key,
+              this->buckets[i].probe,
+              this->buckets[i].value);
+
+      if (this->buckets[i].value)
+         items++;
+   }
+
+   fprintf(stderr, "Hashtable %p: items=%zu counted=%zu\n",
+           (const void*)this,
+           this->items,
+           items);
+}
+
+static bool Hashtable_isConsistent(const Hashtable* this) {
+   size_t items = 0;
+   for (size_t i = 0; i < this->size; i++) {
+      if (this->buckets[i].value)
+         items++;
+   }
+   bool res = items == this->items;
+   if (!res)
+      Hashtable_dump(this);
+   return res;
+}
+
+size_t Hashtable_count(const Hashtable* this) {
+   size_t items = 0;
+   for (size_t i = 0; i < this->size; i++) {
+      if (this->buckets[i].value)
+         items++;
+   }
+   assert(items == this->items);
+   return items;
+}
+
+#endif /* NDEBUG */
+
+/* https://oeis.org/A014234 */
+static const uint64_t OEISprimes[] = {
+   7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191,
+   16381, 32749, 65521, 131071, 262139, 524287, 1048573,
+   2097143, 4194301, 8388593, 16777213, 33554393,
+   67108859, 134217689, 268435399, 536870909, 1073741789,
+   2147483647, 4294967291, 8589934583, 17179869143,
+   34359738337, 68719476731, 137438953447
+};
+
+static size_t nextPrime(size_t n) {
+   /* on 32-bit make sure we do not return primes not fitting in size_t */
+   for (size_t i = 0; i < ARRAYSIZE(OEISprimes) && OEISprimes[i] < SIZE_MAX; i++) {
+      if (n <= OEISprimes[i])
+         return OEISprimes[i];
+   }
+
+   CRT_fatalError("Hashtable: no prime found");
+}
+
+Hashtable* Hashtable_new(size_t size, bool owner) {
+   Hashtable* this;
+
+   this = xMalloc(sizeof(Hashtable));
+   this->items = 0;
+   this->size = size ? nextPrime(size) : 13;
+   this->buckets = (HashtableItem*) xCalloc(this->size, sizeof(HashtableItem));
+   this->owner = owner;
+
+   assert(Hashtable_isConsistent(this));
+   return this;
+}
+
+void Hashtable_delete(Hashtable* this) {
+   Hashtable_clear(this);
+
+   free(this->buckets);
+   free(this);
+}
+
+void Hashtable_clear(Hashtable* this) {
+   assert(Hashtable_isConsistent(this));
+
+   if (this->owner)
+      for (size_t i = 0; i < this->size; i++)
+         free(this->buckets[i].value);
+
+   memset(this->buckets, 0, this->size * sizeof(HashtableItem));
+   this->items = 0;
+
+   assert(Hashtable_isConsistent(this));
+}
+
+static void insert(Hashtable* this, ht_key_t key, void* value) {
+   size_t index = key % this->size;
+   size_t probe = 0;
+#ifndef NDEBUG
+   size_t origIndex = index;
+#endif
+
+   for (;;) {
+      if (!this->buckets[index].value) {
+         this->items++;
+         this->buckets[index].key = key;
+         this->buckets[index].probe = probe;
+         this->buckets[index].value = value;
+         return;
+      }
+
+      if (this->buckets[index].key == key) {
+         if (this->owner && this->buckets[index].value != value)
+            free(this->buckets[index].value);
+         this->buckets[index].value = value;
+         return;
+      }
+
+      /* Robin Hood swap */
+      if (probe > this->buckets[index].probe) {
+         HashtableItem tmp = this->buckets[index];
+
+         this->buckets[index].key = key;
+         this->buckets[index].probe = probe;
+         this->buckets[index].value = value;
+
+         key = tmp.key;
+         probe = tmp.probe;
+         value = tmp.value;
+      }
+
+      index = (index + 1) % this->size;
+      probe++;
+
+      assert(index != origIndex);
+   }
+}
+
+void Hashtable_setSize(Hashtable* this, size_t size) {
+
+   assert(Hashtable_isConsistent(this));
+
+   if (size <= this->items)
+      return;
+
+   size_t newSize = nextPrime(size);
+   if (newSize == this->size)
+      return;
+
+   HashtableItem* oldBuckets = this->buckets;
+   size_t oldSize = this->size;
+
+   this->size = newSize;
+   this->buckets = (HashtableItem*) xCalloc(this->size, sizeof(HashtableItem));
+   this->items = 0;
+
+   /* rehash */
+   for (size_t i = 0; i < oldSize; i++) {
+      if (!oldBuckets[i].value)
+         continue;
+
+      insert(this, oldBuckets[i].key, oldBuckets[i].value);
+   }
+
+   free(oldBuckets);
+
+   assert(Hashtable_isConsistent(this));
+}
+
+void Hashtable_put(Hashtable* this, ht_key_t key, void* value) {
+
+   assert(Hashtable_isConsistent(this));
+   assert(this->size > 0);
+   assert(value);
+
+   /* grow on load-factor > 0.7 */
+   if (10 * this->items > 7 * this->size) {
+      if (SIZE_MAX / 2 < this->size)
+         CRT_fatalError("Hashtable: size overflow");
+
+      Hashtable_setSize(this, 2 * this->size);
+   }
+
+   insert(this, key, value);
+
+   assert(Hashtable_isConsistent(this));
+   assert(Hashtable_get(this, key) != NULL);
+   assert(this->size > this->items);
+}
+
+void* Hashtable_remove(Hashtable* this, ht_key_t key) {
+   size_t index = key % this->size;
+   size_t probe = 0;
+#ifndef NDEBUG
+   size_t origIndex = index;
+#endif
+
+   assert(Hashtable_isConsistent(this));
+
+   void* res = NULL;
+
+   while (this->buckets[index].value) {
+      if (this->buckets[index].key == key) {
+         if (this->owner) {
+            free(this->buckets[index].value);
+         } else {
+            res = this->buckets[index].value;
+         }
+
+         size_t next = (index + 1) % this->size;
+
+         while (this->buckets[next].value && this->buckets[next].probe > 0) {
+            this->buckets[index] = this->buckets[next];
+            this->buckets[index].probe -= 1;
+
+            index = next;
+            next = (index + 1) % this->size;
+         }
+
+         /* set empty after backward shifting */
+         this->buckets[index].value = NULL;
+         this->items--;
+
+         break;
+      }
+
+      if (this->buckets[index].probe < probe)
+         break;
+
+      index = (index + 1) % this->size;
+      probe++;
+
+      assert(index != origIndex);
+   }
+
+   assert(Hashtable_isConsistent(this));
+   assert(Hashtable_get(this, key) == NULL);
+
+   /* shrink on load-factor < 0.125 */
+   if (8 * this->items < this->size)
+      Hashtable_setSize(this, this->size / 3); /* account for nextPrime rounding up */
+
+   return res;
+}
+
+void* Hashtable_get(Hashtable* this, ht_key_t key) {
+   size_t index = key % this->size;
+   size_t probe = 0;
+   void* res = NULL;
+#ifndef NDEBUG
+   size_t origIndex = index;
+#endif
+
+   assert(Hashtable_isConsistent(this));
+
+   while (this->buckets[index].value) {
+      if (this->buckets[index].key == key) {
+         res = this->buckets[index].value;
+         break;
+      }
+
+      if (this->buckets[index].probe < probe)
+         break;
+
+      index = (index + 1) != this->size ? (index + 1) : 0;
+      probe++;
+
+      assert(index != origIndex);
+   }
+
+   return res;
+}
+
+void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData) {
+   assert(Hashtable_isConsistent(this));
+   for (size_t i = 0; i < this->size; i++) {
+      HashtableItem* walk = &this->buckets[i];
+      if (walk->value)
+         f(walk->key, walk->value, userData);
+   }
+   assert(Hashtable_isConsistent(this));
+}
diff --git a/Hashtable.h b/Hashtable.h
new file mode 100644
index 0000000..f51a294
--- /dev/null
+++ b/Hashtable.h
@@ -0,0 +1,42 @@
+#ifndef HEADER_Hashtable
+#define HEADER_Hashtable
+/*
+htop - Hashtable.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+
+
+typedef unsigned int ht_key_t;
+
+typedef void(*Hashtable_PairFunction)(ht_key_t key, void* value, void* userdata);
+
+typedef struct Hashtable_ Hashtable;
+
+#ifndef NDEBUG
+
+size_t Hashtable_count(const Hashtable* this);
+
+#endif /* NDEBUG */
+
+Hashtable* Hashtable_new(size_t size, bool owner);
+
+void Hashtable_delete(Hashtable* this);
+
+void Hashtable_clear(Hashtable* this);
+
+void Hashtable_setSize(Hashtable* this, size_t size);
+
+void Hashtable_put(Hashtable* this, ht_key_t key, void* value);
+
+void* Hashtable_remove(Hashtable* this, ht_key_t key);
+
+void* Hashtable_get(Hashtable* this, ht_key_t key);
+
+void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
+
+#endif
diff --git a/Header.c b/Header.c
new file mode 100644
index 0000000..4fee26b
--- /dev/null
+++ b/Header.c
@@ -0,0 +1,310 @@
+/*
+htop - Header.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Header.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "CPUMeter.h"
+#include "DynamicMeter.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+Header* Header_new(Machine* host, HeaderLayout hLayout) {
+   Header* this = xCalloc(1, sizeof(Header));
+   this->columns = xMallocArray(HeaderLayout_getColumns(hLayout), sizeof(Vector*));
+   this->headerLayout = hLayout;
+   this->host = host;
+
+   Header_forEachColumn(this, i) {
+      this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE);
+   }
+
+   return this;
+}
+
+void Header_delete(Header* this) {
+   Header_forEachColumn(this, i) {
+      Vector_delete(this->columns[i]);
+   }
+
+   free(this->columns);
+   free(this);
+}
+
+void Header_setLayout(Header* this, HeaderLayout hLayout) {
+   size_t oldColumns = HeaderLayout_getColumns(this->headerLayout);
+   size_t newColumns = HeaderLayout_getColumns(hLayout);
+
+   this->headerLayout = hLayout;
+
+   if (newColumns == oldColumns)
+      return;
+
+   if (newColumns > oldColumns) {
+      this->columns = xReallocArray(this->columns, newColumns, sizeof(Vector*));
+      for (size_t i = oldColumns; i < newColumns; i++)
+         this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE);
+   } else {
+      // move meters from to-be-deleted columns into last one
+      for (size_t i = newColumns; i < oldColumns; i++) {
+         for (int j = this->columns[i]->items - 1; j >= 0; j--) {
+            Vector_add(this->columns[newColumns - 1], Vector_take(this->columns[i], j));
+         }
+         Vector_delete(this->columns[i]);
+      }
+      this->columns = xReallocArray(this->columns, newColumns, sizeof(Vector*));
+   }
+
+   Header_calculateHeight(this);
+}
+
+static void Header_addMeterByName(Header* this, const char* name, MeterModeId mode, unsigned int column) {
+   assert(column < HeaderLayout_getColumns(this->headerLayout));
+
+   Vector* meters = this->columns[column];
+
+   const char* paren = strchr(name, '(');
+   unsigned int param = 0;
+   size_t nameLen;
+   if (paren) {
+      int ok = sscanf(paren, "(%10u)", &param); // CPUMeter
+      if (!ok) {
+         char dynamic[32] = {0};
+         if (sscanf(paren, "(%30s)", dynamic)) { // DynamicMeter
+            char* end;
+            if ((end = strrchr(dynamic, ')')) == NULL)
+               return;    // htoprc parse failure
+            *end = '\0';
+            const Settings* settings = this->host->settings;
+            if (!DynamicMeter_search(settings->dynamicMeters, dynamic, &param))
+               return;    // name lookup failure
+         } else {
+            param = 0;
+         }
+      }
+      nameLen = paren - name;
+   } else {
+      nameLen = strlen(name);
+   }
+
+   for (const MeterClass* const* type = Platform_meterTypes; *type; type++) {
+      if (0 == strncmp(name, (*type)->name, nameLen) && (*type)->name[nameLen] == '\0') {
+         Meter* meter = Meter_new(this->host, param, *type);
+         if (mode != 0) {
+            Meter_setMode(meter, mode);
+         }
+         Vector_add(meters, meter);
+         break;
+      }
+   }
+}
+
+void Header_populateFromSettings(Header* this) {
+   const Settings* settings = this->host->settings;
+   Header_setLayout(this, settings->hLayout);
+
+   Header_forEachColumn(this, col) {
+      const MeterColumnSetting* colSettings = &settings->hColumns[col];
+      Vector_prune(this->columns[col]);
+      for (size_t i = 0; i < colSettings->len; i++) {
+         Header_addMeterByName(this, colSettings->names[i], colSettings->modes[i], col);
+      }
+   }
+
+   Header_calculateHeight(this);
+}
+
+void Header_writeBackToSettings(const Header* this) {
+   Settings* settings = this->host->settings;
+   Settings_setHeaderLayout(settings, this->headerLayout);
+
+   Header_forEachColumn(this, col) {
+      MeterColumnSetting* colSettings = &settings->hColumns[col];
+
+      if (colSettings->names) {
+         for (size_t j = 0; j < colSettings->len; j++)
+            free(colSettings->names[j]);
+         free(colSettings->names);
+      }
+      free(colSettings->modes);
+
+      const Vector* vec = this->columns[col];
+      int len = Vector_size(vec);
+
+      colSettings->names = len ? xCalloc(len + 1, sizeof(char*)) : NULL;
+      colSettings->modes = len ? xCalloc(len, sizeof(int)) : NULL;
+      colSettings->len = len;
+
+      for (int i = 0; i < len; i++) {
+         const Meter* meter = (Meter*) Vector_get(vec, i);
+         char* name;
+         if (meter->param && As_Meter(meter) == &DynamicMeter_class) {
+            const char* dynamic = DynamicMeter_lookup(settings->dynamicMeters, meter->param);
+            xAsprintf(&name, "%s(%s)", As_Meter(meter)->name, dynamic);
+         } else if (meter->param && As_Meter(meter) == &CPUMeter_class) {
+            xAsprintf(&name, "%s(%u)", As_Meter(meter)->name, meter->param);
+         } else {
+            xAsprintf(&name, "%s", As_Meter(meter)->name);
+         }
+         colSettings->names[i] = name;
+         colSettings->modes[i] = meter->mode;
+      }
+   }
+}
+
+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column) {
+   assert(column < HeaderLayout_getColumns(this->headerLayout));
+
+   Vector* meters = this->columns[column];
+
+   Meter* meter = Meter_new(this->host, param, type);
+   Vector_add(meters, meter);
+   return meter;
+}
+
+void Header_reinit(Header* this) {
+   Header_forEachColumn(this, col) {
+      for (int i = 0; i < Vector_size(this->columns[col]); i++) {
+         Meter* meter = (Meter*) Vector_get(this->columns[col], i);
+         if (Meter_initFn(meter)) {
+            Meter_init(meter);
+         }
+      }
+   }
+}
+
+void Header_draw(const Header* this) {
+   const int height = this->height;
+   const int pad = this->pad;
+   attrset(CRT_colors[RESET_COLOR]);
+   for (int y = 0; y < height; y++) {
+      mvhline(y, 0, ' ', COLS);
+   }
+   const int numCols = HeaderLayout_getColumns(this->headerLayout);
+   const int width = COLS - 2 * pad - (numCols - 1);
+   int x = pad;
+   float roundingLoss = 0.0F;
+
+   Header_forEachColumn(this, col) {
+      Vector* meters = this->columns[col];
+      float colWidth = (float)width * HeaderLayout_layouts[this->headerLayout].widths[col] / 100.0F;
+
+      roundingLoss += colWidth - floorf(colWidth);
+      if (roundingLoss >= 1.0F) {
+         colWidth += 1.0F;
+         roundingLoss -= 1.0F;
+      }
+
+      for (int y = (pad / 2), i = 0; i < Vector_size(meters); i++) {
+         Meter* meter = (Meter*) Vector_get(meters, i);
+
+         float actualWidth = colWidth;
+
+         /* Let meters in text mode expand to the right on empty neighbors;
+            except for multi column meters. */
+         if (meter->mode == TEXT_METERMODE && !Meter_isMultiColumn(meter)) {
+            for (int j = 1; j < meter->columnWidthCount; j++) {
+               actualWidth++; /* separator column */
+               actualWidth += (float)width * HeaderLayout_layouts[this->headerLayout].widths[col + j] / 100.0F;
+            }
+         }
+
+         assert(meter->draw);
+         meter->draw(meter, x, y, floorf(actualWidth));
+         y += meter->h;
+      }
+
+      x += floorf(colWidth);
+      x++; /* separator column */
+   }
+}
+
+void Header_updateData(Header* this) {
+   Header_forEachColumn(this, col) {
+      Vector* meters = this->columns[col];
+      int items = Vector_size(meters);
+      for (int i = 0; i < items; i++) {
+         Meter* meter = (Meter*) Vector_get(meters, i);
+         Meter_updateValues(meter);
+      }
+   }
+}
+
+/*
+ * Calculate how many columns the current meter is allowed to span,
+ * by counting how many columns to the right are empty or contain a BlankMeter.
+ * Returns the number of columns to span, i.e. if the direct neighbor is occupied 1.
+ */
+static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const int pad, const unsigned int curColumn, const int curHeight) {
+   for (size_t i = curColumn + 1; i < HeaderLayout_getColumns(this->headerLayout); i++) {
+      const Vector* meters = this->columns[i];
+
+      int height = pad;
+      for (int j = 0; j < Vector_size(meters); j++) {
+         const Meter* meter = (const Meter*) Vector_get(meters, j);
+
+         if (height >= curHeight + curMeter->h)
+            break;
+
+         height += meter->h;
+         if (height <= curHeight)
+            continue;
+
+         if (!Object_isA((const Object*) meter, (const ObjectClass*) &BlankMeter_class))
+            return i - curColumn;
+      }
+   }
+
+   return HeaderLayout_getColumns(this->headerLayout) - curColumn;
+}
+
+int Header_calculateHeight(Header* this) {
+   const Settings* settings = this->host->settings;
+   const int pad = settings->headerMargin ? 2 : 0;
+   int maxHeight = pad;
+
+   Header_forEachColumn(this, col) {
+      const Vector* meters = this->columns[col];
+      int height = pad;
+      for (int i = 0; i < Vector_size(meters); i++) {
+         Meter* meter = (Meter*) Vector_get(meters, i);
+         meter->columnWidthCount = calcColumnWidthCount(this, meter, pad, col, height);
+         height += meter->h;
+      }
+      maxHeight = MAXIMUM(maxHeight, height);
+   }
+
+   if (maxHeight == pad) {
+      maxHeight = 0;
+      this->pad = 0;
+   } else {
+      this->pad = pad;
+   }
+
+   if (settings->screenTabs) {
+      maxHeight++;
+   }
+
+   this->height = maxHeight;
+
+   return maxHeight;
+}
diff --git a/Header.h b/Header.h
new file mode 100644
index 0000000..2cc78ab
--- /dev/null
+++ b/Header.h
@@ -0,0 +1,48 @@
+#ifndef HEADER_Header
+#define HEADER_Header
+/*
+htop - Header.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+
+#include "HeaderLayout.h"
+#include "Machine.h"
+#include "Meter.h"
+#include "Vector.h"
+
+
+typedef struct Header_ {
+   Vector** columns;
+   Machine* host;
+   HeaderLayout headerLayout;
+   int pad;
+   int height;
+} Header;
+
+#define Header_forEachColumn(this_, i_) for (size_t (i_)=0, H_fEC_numColumns_ = HeaderLayout_getColumns((this_)->headerLayout); (i_) < H_fEC_numColumns_; ++(i_))
+
+Header* Header_new(Machine* host, HeaderLayout hLayout);
+
+void Header_delete(Header* this);
+
+void Header_setLayout(Header* this, HeaderLayout hLayout);
+
+void Header_populateFromSettings(Header* this);
+
+void Header_writeBackToSettings(const Header* this);
+
+Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int param, unsigned int column);
+
+void Header_reinit(Header* this);
+
+void Header_draw(const Header* this);
+
+void Header_updateData(Header* this);
+
+int Header_calculateHeight(Header* this);
+
+#endif
diff --git a/HeaderLayout.h b/HeaderLayout.h
new file mode 100644
index 0000000..473936e
--- /dev/null
+++ b/HeaderLayout.h
@@ -0,0 +1,82 @@
+#ifndef HEADER_HeaderLayout
+#define HEADER_HeaderLayout
+/*
+htop - HeaderLayout.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "Macros.h"
+#include "XUtils.h"
+
+
+typedef enum HeaderLayout_ {
+   HF_INVALID = -1,
+   HF_TWO_50_50,
+   HF_TWO_33_67,
+   HF_TWO_67_33,
+   HF_THREE_33_34_33,
+   HF_THREE_25_25_50,
+   HF_THREE_25_50_25,
+   HF_THREE_50_25_25,
+   HF_THREE_40_30_30,
+   HF_THREE_30_40_30,
+   HF_THREE_30_30_40,
+   HF_THREE_40_20_40,
+   HF_FOUR_25_25_25_25,
+   LAST_HEADER_LAYOUT
+} HeaderLayout;
+
+static const struct {
+   uint8_t columns;
+   const uint8_t widths[4];
+   const char* name;
+   const char* description;
+} HeaderLayout_layouts[LAST_HEADER_LAYOUT] = {
+   [HF_TWO_50_50]        = { 2, { 50, 50,  0,  0 }, "two_50_50",        "2 columns - 50/50 (default)", },
+   [HF_TWO_33_67]        = { 2, { 33, 67,  0,  0 }, "two_33_67",        "2 columns - 33/67",           },
+   [HF_TWO_67_33]        = { 2, { 67, 33,  0,  0 }, "two_67_33",        "2 columns - 67/33",           },
+   [HF_THREE_33_34_33]   = { 3, { 33, 34, 33,  0 }, "three_33_34_33",   "3 columns - 33/34/33",        },
+   [HF_THREE_25_25_50]   = { 3, { 25, 25, 50,  0 }, "three_25_25_50",   "3 columns - 25/25/50",        },
+   [HF_THREE_25_50_25]   = { 3, { 25, 50, 25,  0 }, "three_25_50_25",   "3 columns - 25/50/25",        },
+   [HF_THREE_50_25_25]   = { 3, { 50, 25, 25,  0 }, "three_50_25_25",   "3 columns - 50/25/25",        },
+   [HF_THREE_40_30_30]   = { 3, { 40, 30, 30,  0 }, "three_40_30_30",   "3 columns - 40/30/30",        },
+   [HF_THREE_30_40_30]   = { 3, { 30, 40, 30,  0 }, "three_30_40_30",   "3 columns - 30/40/30",        },
+   [HF_THREE_30_30_40]   = { 3, { 30, 30, 40,  0 }, "three_30_30_40",   "3 columns - 30/30/40",        },
+   [HF_THREE_40_20_40]   = { 3, { 40, 20, 40,  0 }, "three_40_20_40",   "3 columns - 40/20/40",        },
+   [HF_FOUR_25_25_25_25] = { 4, { 25, 25, 25, 25 }, "four_25_25_25_25", "4 columns - 25/25/25/25",     },
+};
+
+static inline size_t HeaderLayout_getColumns(HeaderLayout hLayout) {
+   /* assert the layout is initialized */
+   assert(0 <= hLayout);
+   assert(hLayout < LAST_HEADER_LAYOUT);
+   assert(HeaderLayout_layouts[hLayout].name[0]);
+   assert(HeaderLayout_layouts[hLayout].description[0]);
+   return HeaderLayout_layouts[hLayout].columns;
+}
+
+static inline const char* HeaderLayout_getName(HeaderLayout hLayout) {
+   /* assert the layout is initialized */
+   assert(0 <= hLayout);
+   assert(hLayout < LAST_HEADER_LAYOUT);
+   assert(HeaderLayout_layouts[hLayout].name[0]);
+   assert(HeaderLayout_layouts[hLayout].description[0]);
+   return HeaderLayout_layouts[hLayout].name;
+}
+
+static inline HeaderLayout HeaderLayout_fromName(const char* name) {
+   for (size_t i = 0; i < LAST_HEADER_LAYOUT; i++) {
+      if (String_eq(HeaderLayout_layouts[i].name, name))
+         return (HeaderLayout) i;
+   }
+
+   return LAST_HEADER_LAYOUT;
+}
+
+#endif /* HEADER_HeaderLayout */
diff --git a/HeaderOptionsPanel.c b/HeaderOptionsPanel.c
new file mode 100644
index 0000000..7b5c81b
--- /dev/null
+++ b/HeaderOptionsPanel.c
@@ -0,0 +1,90 @@
+/*
+htop - HeaderOptionsPanel.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "HeaderOptionsPanel.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Header.h"
+#include "HeaderLayout.h"
+#include "Object.h"
+#include "OptionItem.h"
+#include "ProvideCurses.h"
+
+
+static const char* const HeaderOptionsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static void HeaderOptionsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   HeaderOptionsPanel* this = (HeaderOptionsPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+static HandlerResult HeaderOptionsPanel_eventHandler(Panel* super, int ch) {
+   HeaderOptionsPanel* this = (HeaderOptionsPanel*) super;
+
+   HandlerResult result = IGNORED;
+
+   switch (ch) {
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+      case ' ': {
+         int mark = Panel_getSelectedIndex(super);
+         assert(mark >= 0);
+         assert(mark < LAST_HEADER_LAYOUT);
+
+         for (int i = 0; i < LAST_HEADER_LAYOUT; i++)
+            CheckItem_set((CheckItem*)Panel_get(super, i), false);
+         CheckItem_set((CheckItem*)Panel_get(super, mark), true);
+
+         Header_setLayout(this->scr->header, mark);
+         this->settings->changed = true;
+         this->settings->lastUpdate++;
+
+         ScreenManager_resize(this->scr);
+
+         result = HANDLED;
+      }
+   }
+
+   return result;
+}
+
+const PanelClass HeaderOptionsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = HeaderOptionsPanel_delete
+   },
+   .eventHandler = HeaderOptionsPanel_eventHandler
+};
+
+HeaderOptionsPanel* HeaderOptionsPanel_new(Settings* settings, ScreenManager* scr) {
+   HeaderOptionsPanel* this = AllocThis(HeaderOptionsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(HeaderOptionsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(CheckItem), true, fuBar);
+
+   this->scr = scr;
+   this->settings = settings;
+
+   Panel_setHeader(super, "Header Layout");
+   for (int i = 0; i < LAST_HEADER_LAYOUT; i++) {
+      Panel_add(super, (Object*) CheckItem_newByVal(HeaderLayout_layouts[i].description, false));
+   }
+   CheckItem_set((CheckItem*)Panel_get(super, scr->header->headerLayout), true);
+   return this;
+}
diff --git a/HeaderOptionsPanel.h b/HeaderOptionsPanel.h
new file mode 100644
index 0000000..aee9328
--- /dev/null
+++ b/HeaderOptionsPanel.h
@@ -0,0 +1,26 @@
+#ifndef HEADER_HeaderOptionsPanel
+#define HEADER_HeaderOptionsPanel
+/*
+htop - ColorsPanel.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Panel.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+
+
+typedef struct HeaderOptionsPanel_ {
+   Panel super;
+
+   ScreenManager* scr;
+   Settings* settings;
+} HeaderOptionsPanel;
+
+extern const PanelClass HeaderOptionsPanel_class;
+
+HeaderOptionsPanel* HeaderOptionsPanel_new(Settings* settings, ScreenManager* scr);
+
+#endif /* HEADER_HeaderOptionsPanel */
diff --git a/HostnameMeter.c b/HostnameMeter.c
new file mode 100644
index 0000000..78444ea
--- /dev/null
+++ b/HostnameMeter.c
@@ -0,0 +1,38 @@
+/*
+htop - HostnameMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "HostnameMeter.h"
+
+#include "CRT.h"
+#include "Object.h"
+#include "Platform.h"
+
+
+static const int HostnameMeter_attributes[] = {
+   HOSTNAME
+};
+
+static void HostnameMeter_updateValues(Meter* this) {
+   Platform_getHostname(this->txtBuffer, sizeof(this->txtBuffer));
+}
+
+const MeterClass HostnameMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = HostnameMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = HostnameMeter_attributes,
+   .name = "Hostname",
+   .uiName = "Hostname",
+   .caption = "Hostname: ",
+};
diff --git a/HostnameMeter.h b/HostnameMeter.h
new file mode 100644
index 0000000..ec1b63a
--- /dev/null
+++ b/HostnameMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_HostnameMeter
+#define HEADER_HostnameMeter
+/*
+htop - HostnameMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass HostnameMeter_class;
+
+#endif
diff --git a/IncSet.c b/IncSet.c
new file mode 100644
index 0000000..71edf1c
--- /dev/null
+++ b/IncSet.c
@@ -0,0 +1,247 @@
+/*
+htop - IncSet.c
+(C) 2005-2012 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "IncSet.h"
+
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+#include "XUtils.h"
+
+
+static void IncMode_reset(IncMode* mode) {
+   mode->index = 0;
+   mode->buffer[0] = 0;
+}
+
+void IncSet_reset(IncSet* this, IncType type) {
+   IncMode_reset(&this->modes[type]);
+}
+
+void IncSet_setFilter(IncSet* this, const char* filter) {
+   IncMode* mode = &this->modes[INC_FILTER];
+   size_t len = String_safeStrncpy(mode->buffer, filter, sizeof(mode->buffer));
+   mode->index = len;
+   this->filtering = true;
+}
+
+static const char* const searchFunctions[] = {"Next  ", "Prev   ", "Cancel ", " Search: ", NULL};
+static const char* const searchKeys[] = {"F3", "S-F3", "Esc", "  "};
+static const int searchEvents[] = {KEY_F(3), KEY_F(15), 27, ERR};
+
+static inline void IncMode_initSearch(IncMode* search) {
+   memset(search, 0, sizeof(IncMode));
+   search->bar = FunctionBar_new(searchFunctions, searchKeys, searchEvents);
+   search->isFilter = false;
+}
+
+static const char* const filterFunctions[] = {"Done  ", "Clear ", " Filter: ", NULL};
+static const char* const filterKeys[] = {"Enter", "Esc", "  "};
+static const int filterEvents[] = {13, 27, ERR};
+
+static inline void IncMode_initFilter(IncMode* filter) {
+   memset(filter, 0, sizeof(IncMode));
+   filter->bar = FunctionBar_new(filterFunctions, filterKeys, filterEvents);
+   filter->isFilter = true;
+}
+
+static inline void IncMode_done(IncMode* mode) {
+   FunctionBar_delete(mode->bar);
+}
+
+IncSet* IncSet_new(FunctionBar* bar) {
+   IncSet* this = xMalloc(sizeof(IncSet));
+   IncMode_initSearch(&(this->modes[INC_SEARCH]));
+   IncMode_initFilter(&(this->modes[INC_FILTER]));
+   this->active = NULL;
+   this->defaultBar = bar;
+   this->filtering = false;
+   this->found = false;
+   return this;
+}
+
+void IncSet_delete(IncSet* this) {
+   IncMode_done(&(this->modes[0]));
+   IncMode_done(&(this->modes[1]));
+   free(this);
+}
+
+static void updateWeakPanel(const IncSet* this, Panel* panel, Vector* lines) {
+   const Object* selected = Panel_getSelected(panel);
+   Panel_prune(panel);
+   if (this->filtering) {
+      int n = 0;
+      const char* incFilter = this->modes[INC_FILTER].buffer;
+      for (int i = 0; i < Vector_size(lines); i++) {
+         ListItem* line = (ListItem*)Vector_get(lines, i);
+         if (String_contains_i(line->value, incFilter, true)) {
+            Panel_add(panel, (Object*)line);
+            if (selected == (Object*)line) {
+               Panel_setSelected(panel, n);
+            }
+
+            n++;
+         }
+      }
+   } else {
+      for (int i = 0; i < Vector_size(lines); i++) {
+         Object* line = Vector_get(lines, i);
+         Panel_add(panel, line);
+         if (selected == line) {
+            Panel_setSelected(panel, i);
+         }
+      }
+   }
+}
+
+static bool search(const IncSet* this, Panel* panel, IncMode_GetPanelValue getPanelValue) {
+   int size = Panel_size(panel);
+   for (int i = 0; i < size; i++) {
+      if (String_contains_i(getPanelValue(panel, i), this->active->buffer, true)) {
+         Panel_setSelected(panel, i);
+         return true;
+      }
+   }
+
+   return false;
+}
+
+void IncSet_activate(IncSet* this, IncType type, Panel* panel) {
+   this->active = &(this->modes[type]);
+   panel->currentBar = this->active->bar;
+   panel->cursorOn = true;
+   this->panel = panel;
+   IncSet_drawBar(this, CRT_colors[FUNCTION_BAR]);
+}
+
+static void IncSet_deactivate(IncSet* this, Panel* panel) {
+   this->active = NULL;
+   Panel_setDefaultBar(panel);
+   panel->cursorOn = false;
+   FunctionBar_draw(this->defaultBar);
+}
+
+static bool IncMode_find(const IncMode* mode, Panel* panel, IncMode_GetPanelValue getPanelValue, int step) {
+   int size = Panel_size(panel);
+   int here = Panel_getSelectedIndex(panel);
+   int i = here;
+   for (;;) {
+      i += step;
+      if (i == size) {
+         i = 0;
+      }
+      if (i == -1) {
+         i = size - 1;
+      }
+      if (i == here) {
+         return false;
+      }
+
+      if (String_contains_i(getPanelValue(panel, i), mode->buffer, true)) {
+         Panel_setSelected(panel, i);
+         return true;
+      }
+   }
+}
+
+bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines) {
+   if (ch == ERR)
+      return true;
+
+   IncMode* mode = this->active;
+   int size = Panel_size(panel);
+   bool filterChanged = false;
+   bool doSearch = true;
+   if (ch == KEY_F(3) || ch == KEY_F(15)) {
+      if (size == 0)
+         return true;
+
+      IncMode_find(mode, panel, getPanelValue, ch == KEY_F(3) ? 1 : -1);
+      doSearch = false;
+   } else if (0 < ch && ch < 255 && isprint((unsigned char)ch)) {
+      if (mode->index < INCMODE_MAX) {
+         mode->buffer[mode->index] = (char) ch;
+         mode->index++;
+         mode->buffer[mode->index] = 0;
+         if (mode->isFilter) {
+            filterChanged = true;
+            if (mode->index == 1) {
+               this->filtering = true;
+            }
+         }
+      }
+   } else if (ch == KEY_BACKSPACE || ch == 127) {
+      if (mode->index > 0) {
+         mode->index--;
+         mode->buffer[mode->index] = 0;
+         if (mode->isFilter) {
+            filterChanged = true;
+            if (mode->index == 0) {
+               this->filtering = false;
+               IncMode_reset(mode);
+            }
+         }
+      } else {
+         doSearch = false;
+      }
+   } else if (ch == KEY_RESIZE) {
+      doSearch = (mode->index > 0);
+   } else {
+      if (mode->isFilter) {
+         filterChanged = true;
+         if (ch == 27) {
+            this->filtering = false;
+            IncMode_reset(mode);
+         }
+      } else {
+         if (ch == 27) {
+            IncMode_reset(mode);
+         }
+      }
+      IncSet_deactivate(this, panel);
+      doSearch = false;
+   }
+   if (doSearch) {
+      this->found = search(this, panel, getPanelValue);
+   }
+   if (filterChanged && lines) {
+      updateWeakPanel(this, panel, lines);
+   }
+   return filterChanged;
+}
+
+const char* IncSet_getListItemValue(Panel* panel, int i) {
+   const ListItem* l = (const ListItem*) Panel_get(panel, i);
+   return l ? l->value : "";
+}
+
+void IncSet_drawBar(const IncSet* this, int attr) {
+   if (this->active) {
+      if (!this->active->isFilter && !this->found)
+         attr = CRT_colors[FAILED_SEARCH];
+      int cursorX = FunctionBar_drawExtra(this->active->bar, this->active->buffer, attr, true);
+      this->panel->cursorY = LINES - 1;
+      this->panel->cursorX = cursorX;
+   } else {
+      FunctionBar_draw(this->defaultBar);
+   }
+}
+
+int IncSet_synthesizeEvent(IncSet* this, int x) {
+   if (this->active) {
+      return FunctionBar_synthesizeEvent(this->active->bar, x);
+   } else {
+      return FunctionBar_synthesizeEvent(this->defaultBar, x);
+   }
+}
diff --git a/IncSet.h b/IncSet.h
new file mode 100644
index 0000000..a84407e
--- /dev/null
+++ b/IncSet.h
@@ -0,0 +1,65 @@
+#ifndef HEADER_IncSet
+#define HEADER_IncSet
+/*
+htop - IncSet.h
+(C) 2005-2012 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "FunctionBar.h"
+#include "Panel.h"
+#include "Vector.h"
+
+
+#define INCMODE_MAX 128
+
+typedef enum {
+   INC_SEARCH = 0,
+   INC_FILTER = 1
+} IncType;
+
+typedef struct IncMode_ {
+   char buffer[INCMODE_MAX + 1];
+   int index;
+   FunctionBar* bar;
+   bool isFilter;
+} IncMode;
+
+typedef struct IncSet_ {
+   IncMode modes[2];
+   IncMode* active;
+   Panel* panel;
+   FunctionBar* defaultBar;
+   bool filtering;
+   bool found;
+} IncSet;
+
+static inline const char* IncSet_filter(const IncSet* this) {
+   return this->filtering ? this->modes[INC_FILTER].buffer : NULL;
+}
+
+void IncSet_setFilter(IncSet* this, const char* filter);
+
+typedef const char* (*IncMode_GetPanelValue)(Panel*, int);
+
+void IncSet_reset(IncSet* this, IncType type);
+
+IncSet* IncSet_new(FunctionBar* bar);
+
+void IncSet_delete(IncSet* this);
+
+bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines);
+
+const char* IncSet_getListItemValue(Panel* panel, int i);
+
+void IncSet_activate(IncSet* this, IncType type, Panel* panel);
+
+void IncSet_drawBar(const IncSet* this, int attr);
+
+int IncSet_synthesizeEvent(IncSet* this, int x);
+
+#endif
diff --git a/InfoScreen.c b/InfoScreen.c
new file mode 100644
index 0000000..c602cd4
--- /dev/null
+++ b/InfoScreen.c
@@ -0,0 +1,185 @@
+/*
+htop - InfoScreen.c
+(C) 2016 Hisham H. Muhammad
+(C) 2020,2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "InfoScreen.h"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "IncSet.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+#include "XUtils.h"
+
+
+static const char* const InfoScreenFunctions[] = {"Search ", "Filter ", "Refresh", "Done   ", NULL};
+
+static const char* const InfoScreenKeys[] = {"F3", "F4", "F5", "Esc"};
+
+static const int InfoScreenEvents[] = {KEY_F(3), KEY_F(4), KEY_F(5), 27};
+
+InfoScreen* InfoScreen_init(InfoScreen* this, const Process* process, FunctionBar* bar, int height, const char* panelHeader) {
+   this->process = process;
+   if (!bar) {
+      bar = FunctionBar_new(InfoScreenFunctions, InfoScreenKeys, InfoScreenEvents);
+   }
+   this->display = Panel_new(0, 1, COLS, height, Class(ListItem), false, bar);
+   this->inc = IncSet_new(bar);
+   this->lines = Vector_new(Vector_type(this->display->items), true, DEFAULT_SIZE);
+   Panel_setHeader(this->display, panelHeader);
+   return this;
+}
+
+InfoScreen* InfoScreen_done(InfoScreen* this) {
+   Panel_delete((Object*)this->display);
+   IncSet_delete(this->inc);
+   Vector_delete(this->lines);
+   return this;
+}
+
+void InfoScreen_drawTitled(InfoScreen* this, const char* fmt, ...) {
+   va_list ap;
+   va_start(ap, fmt);
+
+   char title[COLS + 1];
+   int len = vsnprintf(title, sizeof(title), fmt, ap);
+   va_end(ap);
+
+   if (len > COLS) {
+      memset(&title[COLS - 3], '.', 3);
+   }
+
+   attrset(CRT_colors[METER_TEXT]);
+   mvhline(0, 0, ' ', COLS);
+   mvaddstr(0, 0, title);
+   attrset(CRT_colors[DEFAULT_COLOR]);
+   Panel_draw(this->display, true, true, true, false);
+
+   IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+}
+
+void InfoScreen_addLine(InfoScreen* this, const char* line) {
+   Vector_add(this->lines, (Object*) ListItem_new(line, 0));
+   const char* incFilter = IncSet_filter(this->inc);
+   if (!incFilter || String_contains_i(line, incFilter, true)) {
+      Panel_add(this->display, Vector_get(this->lines, Vector_size(this->lines) - 1));
+   }
+}
+
+void InfoScreen_appendLine(InfoScreen* this, const char* line) {
+   ListItem* last = (ListItem*)Vector_get(this->lines, Vector_size(this->lines) - 1);
+   ListItem_append(last, line);
+   const char* incFilter = IncSet_filter(this->inc);
+   if (incFilter && Panel_get(this->display, Panel_size(this->display) - 1) != (Object*)last && String_contains_i(line, incFilter, true)) {
+      Panel_add(this->display, (Object*)last);
+   }
+}
+
+void InfoScreen_run(InfoScreen* this) {
+   Panel* panel = this->display;
+
+   if (As_InfoScreen(this)->scan)
+      InfoScreen_scan(this);
+
+   InfoScreen_draw(this);
+
+   bool looping = true;
+   while (looping) {
+
+      Panel_draw(panel, false, true, true, false);
+      IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+
+      int ch = Panel_getCh(panel);
+
+      if (ch == ERR) {
+         if (As_InfoScreen(this)->onErr) {
+            InfoScreen_onErr(this);
+            continue;
+         }
+      }
+
+#ifdef HAVE_GETMOUSE
+      if (ch == KEY_MOUSE) {
+         MEVENT mevent;
+         int ok = getmouse(&mevent);
+         if (ok == OK) {
+            if (mevent.bstate & BUTTON1_RELEASED) {
+               if (mevent.y >= panel->y && mevent.y < LINES - 1) {
+                  Panel_setSelected(panel, mevent.y - panel->y + panel->scrollV - 1);
+                  ch = 0;
+               } else if (mevent.y == LINES - 1) {
+                  ch = IncSet_synthesizeEvent(this->inc, mevent.x);
+               }
+            }
+            #if NCURSES_MOUSE_VERSION > 1
+            else if (mevent.bstate & BUTTON4_PRESSED) {
+               ch = KEY_WHEELUP;
+            } else if (mevent.bstate & BUTTON5_PRESSED) {
+               ch = KEY_WHEELDOWN;
+            }
+            #endif
+         }
+      }
+#endif
+
+      if (this->inc->active) {
+         IncSet_handleKey(this->inc, ch, panel, IncSet_getListItemValue, this->lines);
+         continue;
+      }
+
+      switch (ch) {
+         case ERR:
+            continue;
+         case KEY_F(3):
+         case '/':
+            IncSet_activate(this->inc, INC_SEARCH, panel);
+            break;
+         case KEY_F(4):
+         case '\\':
+            IncSet_activate(this->inc, INC_FILTER, panel);
+            break;
+         case KEY_F(5):
+            clear();
+            if (As_InfoScreen(this)->scan) {
+               Vector_prune(this->lines);
+               InfoScreen_scan(this);
+            }
+
+            InfoScreen_draw(this);
+            break;
+         case '\014': // Ctrl+L
+            clear();
+            InfoScreen_draw(this);
+            break;
+         case 27:
+         case 'q':
+         case KEY_F(10):
+            looping = false;
+            break;
+         case KEY_RESIZE:
+            Panel_resize(panel, COLS, LINES - 2);
+            if (As_InfoScreen(this)->scan) {
+               Vector_prune(this->lines);
+               InfoScreen_scan(this);
+            }
+
+            InfoScreen_draw(this);
+            break;
+         default:
+            if (As_InfoScreen(this)->onKey && InfoScreen_onKey(this, ch)) {
+               continue;
+            }
+            Panel_onKey(panel, ch);
+      }
+   }
+}
diff --git a/InfoScreen.h b/InfoScreen.h
new file mode 100644
index 0000000..469c270
--- /dev/null
+++ b/InfoScreen.h
@@ -0,0 +1,62 @@
+#ifndef HEADER_InfoScreen
+#define HEADER_InfoScreen
+/*
+htop - InfoScreen.h
+(C) 2016 Hisham H. Muhammad
+(C) 2020,2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "FunctionBar.h"
+#include "IncSet.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Panel.h"
+#include "Process.h"
+#include "Vector.h"
+
+
+typedef struct InfoScreen_ {
+   Object super;
+   const Process* process;
+   Panel* display;
+   IncSet* inc;
+   Vector* lines;
+} InfoScreen;
+
+typedef void(*InfoScreen_Scan)(InfoScreen*);
+typedef void(*InfoScreen_Draw)(InfoScreen*);
+typedef void(*InfoScreen_OnErr)(InfoScreen*);
+typedef bool(*InfoScreen_OnKey)(InfoScreen*, int);
+
+typedef struct InfoScreenClass_ {
+   const ObjectClass super;
+   const InfoScreen_Scan scan;
+   const InfoScreen_Draw draw;
+   const InfoScreen_OnErr onErr;
+   const InfoScreen_OnKey onKey;
+} InfoScreenClass;
+
+#define As_InfoScreen(this_)          ((const InfoScreenClass*)(((InfoScreen*)(this_))->super.klass))
+#define InfoScreen_scan(this_)        As_InfoScreen(this_)->scan((InfoScreen*)(this_))
+#define InfoScreen_draw(this_)        As_InfoScreen(this_)->draw((InfoScreen*)(this_))
+#define InfoScreen_onErr(this_)       As_InfoScreen(this_)->onErr((InfoScreen*)(this_))
+#define InfoScreen_onKey(this_, ch_)  As_InfoScreen(this_)->onKey((InfoScreen*)(this_), ch_)
+
+InfoScreen* InfoScreen_init(InfoScreen* this, const Process* process, FunctionBar* bar, int height, const char* panelHeader);
+
+InfoScreen* InfoScreen_done(InfoScreen* this);
+
+ATTR_FORMAT(printf, 2, 3)
+void InfoScreen_drawTitled(InfoScreen* this, const char* fmt, ...);
+
+void InfoScreen_addLine(InfoScreen* this, const char* line);
+
+void InfoScreen_appendLine(InfoScreen* this, const char* line);
+
+void InfoScreen_run(InfoScreen* this);
+
+#endif
diff --git a/ListItem.c b/ListItem.c
new file mode 100644
index 0000000..246bc5d
--- /dev/null
+++ b/ListItem.c
@@ -0,0 +1,72 @@
+/*
+htop - ListItem.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ListItem.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+void ListItem_delete(Object* cast) {
+   ListItem* this = (ListItem*)cast;
+   free(this->value);
+   free(this);
+}
+
+void ListItem_display(const Object* cast, RichString* out) {
+   const ListItem* const this = (const ListItem*)cast;
+   assert (this != NULL);
+
+   if (this->moving) {
+      RichString_writeWide(out, CRT_colors[DEFAULT_COLOR],
+#ifdef HAVE_LIBNCURSESW
+                           CRT_utf8 ? "↕ " :
+#endif
+                           "+ ");
+   }
+   RichString_appendWide(out, CRT_colors[DEFAULT_COLOR], this->value);
+}
+
+void ListItem_init(ListItem* this, const char* value, int key) {
+   this->value = xStrdup(value);
+   this->key = key;
+   this->moving = false;
+}
+
+ListItem* ListItem_new(const char* value, int key) {
+   ListItem* this = AllocThis(ListItem);
+   ListItem_init(this, value, key);
+   return this;
+}
+
+void ListItem_append(ListItem* this, const char* text) {
+   size_t oldLen = strlen(this->value);
+   size_t textLen = strlen(text);
+   size_t newLen = oldLen + textLen;
+   this->value = xRealloc(this->value, newLen + 1);
+   memcpy(this->value + oldLen, text, textLen);
+   this->value[newLen] = '\0';
+}
+
+int ListItem_compare(const void* cast1, const void* cast2) {
+   const ListItem* obj1 = (const ListItem*) cast1;
+   const ListItem* obj2 = (const ListItem*) cast2;
+   return strcmp(obj1->value, obj2->value);
+}
+
+const ObjectClass ListItem_class = {
+   .display = ListItem_display,
+   .delete = ListItem_delete,
+   .compare = ListItem_compare
+};
diff --git a/ListItem.h b/ListItem.h
new file mode 100644
index 0000000..5efe874
--- /dev/null
+++ b/ListItem.h
@@ -0,0 +1,41 @@
+#ifndef HEADER_ListItem
+#define HEADER_ListItem
+/*
+htop - ListItem.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Object.h"
+#include "RichString.h"
+
+
+typedef struct ListItem_ {
+   Object super;
+   char* value;
+   int key;
+   bool moving;
+} ListItem;
+
+extern const ObjectClass ListItem_class;
+
+void ListItem_delete(Object* cast);
+
+void ListItem_display(const Object* cast, RichString* out);
+
+void ListItem_init(ListItem* this, const char* value, int key);
+
+ListItem* ListItem_new(const char* value, int key);
+
+void ListItem_append(ListItem* this, const char* text);
+
+int ListItem_compare(const void* cast1, const void* cast2);
+
+static inline const char* ListItem_getRef(const ListItem* this) {
+   return this->value;
+}
+
+#endif
diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
new file mode 100644
index 0000000..30c58bb
--- /dev/null
+++ b/LoadAverageMeter.c
@@ -0,0 +1,136 @@
+/*
+htop - LoadAverageMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "LoadAverageMeter.h"
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+static const int LoadAverageMeter_attributes[] = {
+   LOAD_AVERAGE_ONE,
+   LOAD_AVERAGE_FIVE,
+   LOAD_AVERAGE_FIFTEEN
+};
+
+static const int LoadMeter_attributes[] = {
+   LOAD
+};
+
+static const int OK_attributes[] = {
+   METER_VALUE_OK
+};
+
+static const int Medium_attributes[] = {
+   METER_VALUE_WARN
+};
+
+static const int High_attributes[] = {
+   METER_VALUE_ERROR
+};
+
+static void LoadAverageMeter_updateValues(Meter* this) {
+   Platform_getLoadAverage(&this->values[0], &this->values[1], &this->values[2]);
+
+   // only show bar for 1min value
+   this->curItems = 1;
+
+   // change bar color and total based on value
+   if (this->values[0] < 1.0) {
+      this->curAttributes = OK_attributes;
+      this->total = 1.0;
+   } else if (this->values[0] < this->host->activeCPUs) {
+      this->curAttributes = Medium_attributes;
+      this->total = this->host->activeCPUs;
+   } else {
+      this->curAttributes = High_attributes;
+      this->total = 2 * this->host->activeCPUs;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.2f/%.2f/%.2f", this->values[0], this->values[1], this->values[2]);
+}
+
+static void LoadAverageMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+   char buffer[20];
+   int len;
+
+   len = xSnprintf(buffer, sizeof(buffer), "%.2f ", this->values[0]);
+   RichString_appendnAscii(out, CRT_colors[LOAD_AVERAGE_ONE], buffer, len);
+   len = xSnprintf(buffer, sizeof(buffer), "%.2f ", this->values[1]);
+   RichString_appendnAscii(out, CRT_colors[LOAD_AVERAGE_FIVE], buffer, len);
+   len = xSnprintf(buffer, sizeof(buffer), "%.2f ", this->values[2]);
+   RichString_appendnAscii(out, CRT_colors[LOAD_AVERAGE_FIFTEEN], buffer, len);
+}
+
+static void LoadMeter_updateValues(Meter* this) {
+   double five, fifteen;
+   Platform_getLoadAverage(&this->values[0], &five, &fifteen);
+
+   // change bar color and total based on value
+   if (this->values[0] < 1.0) {
+      this->curAttributes = OK_attributes;
+      this->total = 1.0;
+   } else if (this->values[0] < this->host->activeCPUs) {
+      this->curAttributes = Medium_attributes;
+      this->total = this->host->activeCPUs;
+   } else {
+      this->curAttributes = High_attributes;
+      this->total = 2 * this->host->activeCPUs;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%.2f", this->values[0]);
+}
+
+static void LoadMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+   char buffer[20];
+   int len;
+
+   len = xSnprintf(buffer, sizeof(buffer), "%.2f ", this->values[0]);
+   RichString_appendnAscii(out, CRT_colors[LOAD], buffer, len);
+}
+
+const MeterClass LoadAverageMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = LoadAverageMeter_display,
+   },
+   .updateValues = LoadAverageMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = LoadAverageMeter_attributes,
+   .name = "LoadAverage",
+   .uiName = "Load average",
+   .description = "Load averages: 1 minute, 5 minutes, 15 minutes",
+   .caption = "Load average: "
+};
+
+const MeterClass LoadMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = LoadMeter_display,
+   },
+   .updateValues = LoadMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100.0,
+   .attributes = LoadMeter_attributes,
+   .name = "Load",
+   .uiName = "Load",
+   .description = "Load: average of ready processes in the last minute",
+   .caption = "Load: "
+};
diff --git a/LoadAverageMeter.h b/LoadAverageMeter.h
new file mode 100644
index 0000000..a34a4a3
--- /dev/null
+++ b/LoadAverageMeter.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_LoadAverageMeter
+#define HEADER_LoadAverageMeter
+/*
+htop - LoadAverageMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass LoadAverageMeter_class;
+
+extern const MeterClass LoadMeter_class;
+
+#endif
diff --git a/Machine.c b/Machine.c
new file mode 100644
index 0000000..44aa27c
--- /dev/null
+++ b/Machine.c
@@ -0,0 +1,124 @@
+/*
+htop - Machine.c
+(C) 2023 Red Hat, Inc.
+(C) 2004,2005 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Machine.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "Object.h"
+#include "Platform.h"
+#include "Row.h"
+#include "XUtils.h"
+
+
+void Machine_init(Machine* this, UsersTable* usersTable, uid_t userId) {
+   this->usersTable = usersTable;
+   this->userId = userId;
+
+   this->htopUserId = getuid();
+
+   // discover fixed column width limits
+   Row_setPidColumnWidth(Platform_getMaxPid());
+
+   // always maintain valid realtime timestamps
+   Platform_gettime_realtime(&this->realtime, &this->realtimeMs);
+
+#ifdef HAVE_LIBHWLOC
+   this->topologyOk = false;
+   if (hwloc_topology_init(&this->topology) == 0) {
+      this->topologyOk =
+         #if HWLOC_API_VERSION < 0x00020000
+         /* try to ignore the top-level machine object type */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_MACHINE) &&
+         /* ignore caches, which don't add structure */
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CORE) &&
+         0 == hwloc_topology_ignore_type_keep_structure(this->topology, HWLOC_OBJ_CACHE) &&
+         0 == hwloc_topology_set_flags(this->topology, HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM) &&
+         #else
+         0 == hwloc_topology_set_all_types_filter(this->topology, HWLOC_TYPE_FILTER_KEEP_STRUCTURE) &&
+         #endif
+         0 == hwloc_topology_load(this->topology);
+   }
+#endif
+}
+
+void Machine_done(Machine* this) {
+#ifdef HAVE_LIBHWLOC
+   if (this->topologyOk) {
+      hwloc_topology_destroy(this->topology);
+   }
+#endif
+   Object_delete(this->processTable);
+   free(this->tables);
+}
+
+static void Machine_addTable(Machine* this, Table* table) {
+   /* check that this table has not been seen previously */
+   for (size_t i = 0; i < this->tableCount; i++)
+      if (this->tables[i] == table)
+         return;
+
+   size_t nmemb = this->tableCount + 1;
+   Table** tables = xReallocArray(this->tables, nmemb, sizeof(Table*));
+   tables[nmemb - 1] = table;
+   this->tables = tables;
+   this->tableCount++;
+}
+
+void Machine_populateTablesFromSettings(Machine* this, Settings* settings, Table* processTable) {
+   this->settings = settings;
+   this->processTable = processTable;
+
+   for (size_t i = 0; i < settings->nScreens; i++) {
+      ScreenSettings* ss = settings->screens[i];
+      Table* table = ss->table;
+      if (!table)
+         table = ss->table = processTable;
+      if (i == 0)
+         this->activeTable = table;
+
+      Machine_addTable(this, table);
+   }
+}
+
+void Machine_setTablesPanel(Machine* this, Panel* panel) {
+   for (size_t i = 0; i < this->tableCount; i++) {
+      Table_setPanel(this->tables[i], panel);
+   }
+}
+
+void Machine_scanTables(Machine* this) {
+   // set scan timestamp
+   static bool firstScanDone = false;
+
+   if (firstScanDone)
+      Platform_gettime_monotonic(&this->monotonicMs);
+   else
+      firstScanDone = true;
+
+   this->maxUserId = 0;
+   Row_resetFieldWidths();
+
+   for (size_t i = 0; i < this->tableCount; i++) {
+      Table* table = this->tables[i];
+
+      // pre-processing of each row
+      Table_scanPrepare(table);
+
+      // scan values for this table
+      Table_scanIterate(table);
+
+      // post-process after scanning
+      Table_scanCleanup(table);
+   }
+
+   Row_setUidColumnWidth(this->maxUserId);
+}
diff --git a/Machine.h b/Machine.h
new file mode 100644
index 0000000..419911c
--- /dev/null
+++ b/Machine.h
@@ -0,0 +1,96 @@
+#ifndef HEADER_Machine
+#define HEADER_Machine
+/*
+htop - Machine.h
+(C) 2023 Red Hat, Inc.
+(C) 2004,2005 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "Panel.h"
+#include "Settings.h"
+#include "Table.h"
+#include "UsersTable.h"
+
+#ifdef HAVE_LIBHWLOC
+#include <hwloc.h>
+#endif
+
+
+#ifndef MAX_NAME
+#define MAX_NAME 128
+#endif
+
+#ifndef MAX_READ
+#define MAX_READ 2048
+#endif
+
+typedef unsigned long long int memory_t;
+#define MEMORY_MAX ULLONG_MAX
+
+typedef struct Machine_ {
+   struct Settings_* settings;
+
+   struct timeval realtime;   /* time of the current sample */
+   uint64_t realtimeMs;       /* current time in milliseconds */
+   uint64_t monotonicMs;      /* same, but from monotonic clock */
+
+   int64_t iterationsRemaining;
+
+   #ifdef HAVE_LIBHWLOC
+   hwloc_topology_t topology;
+   bool topologyOk;
+   #endif
+
+   memory_t totalMem;
+   memory_t usedMem;
+   memory_t buffersMem;
+   memory_t cachedMem;
+   memory_t sharedMem;
+   memory_t availableMem;
+
+   memory_t totalSwap;
+   memory_t usedSwap;
+   memory_t cachedSwap;
+
+   unsigned int activeCPUs;
+   unsigned int existingCPUs;
+
+   UsersTable* usersTable;
+   uid_t htopUserId;
+   uid_t maxUserId;  /* recently observed */
+   uid_t userId;  /* selected row user ID */
+
+   size_t tableCount;
+   Table **tables;
+   Table *activeTable;
+   Table *processTable;
+} Machine;
+
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId);
+
+void Machine_init(Machine* this, UsersTable* usersTable, uid_t userId);
+
+void Machine_delete(Machine* this);
+
+void Machine_done(Machine* this);
+
+bool Machine_isCPUonline(const Machine* this, unsigned int id);
+
+void Machine_populateTablesFromSettings(Machine* this, Settings* settings, Table* processTable);
+
+void Machine_setTablesPanel(Machine* host, Panel* panel);
+
+void Machine_scan(Machine* this);
+
+void Machine_scanTables(Machine* this);
+
+#endif
diff --git a/Macros.h b/Macros.h
new file mode 100644
index 0000000..051bedb
--- /dev/null
+++ b/Macros.h
@@ -0,0 +1,145 @@
+#ifndef HEADER_Macros
+#define HEADER_Macros
+/*
+htop - Macros.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <assert.h> // IWYU pragma: keep
+#include <math.h>
+#include <stdbool.h>
+#include <string.h> // IWYU pragma: keep
+
+
+#ifndef MINIMUM
+#define MINIMUM(a, b)                  ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef MAXIMUM
+#define MAXIMUM(a, b)                  ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef CLAMP
+#define CLAMP(x, low, high)            (assert((low) <= (high)), ((x) > (high)) ? (high) : MAXIMUM(x, low))
+#endif
+
+#ifndef ARRAYSIZE
+#define ARRAYSIZE(x)                   (sizeof(x) / sizeof((x)[0]))
+#endif
+
+#ifndef SPACESHIP_NUMBER
+#define SPACESHIP_NUMBER(a, b)         (((a) > (b)) - ((a) < (b)))
+#endif
+
+#ifndef SPACESHIP_NULLSTR
+#define SPACESHIP_NULLSTR(a, b)        strcmp((a) ? (a) : "", (b) ? (b) : "")
+#endif
+
+#ifndef SPACESHIP_DEFAULTSTR
+#define SPACESHIP_DEFAULTSTR(a, b, s)  strcmp((a) ? (a) : (s), (b) ? (b) : (s))
+#endif
+
+#ifdef  __GNUC__  // defined by GCC and Clang
+
+#define ATTR_FORMAT(type, index, check) __attribute__((format (type, index, check)))
+#define ATTR_NORETURN                   __attribute__((noreturn))
+#define ATTR_UNUSED                     __attribute__((unused))
+#define ATTR_MALLOC                     __attribute__((malloc))
+
+#else /* __GNUC__ */
+
+#define ATTR_FORMAT(type, index, check)
+#define ATTR_NORETURN
+#define ATTR_UNUSED
+#define ATTR_MALLOC
+
+#endif /* __GNUC__ */
+
+#ifdef HAVE_ATTR_NONNULL
+
+#define ATTR_NONNULL                    __attribute__((nonnull))
+#define ATTR_NONNULL_N(...)             __attribute__((nonnull(__VA_ARGS__)))
+
+#else
+
+#define ATTR_NONNULL
+#define ATTR_NONNULL_N(...)
+
+#endif /* HAVE_ATTR_NONNULL */
+
+#ifdef HAVE_ATTR_ALLOC_SIZE
+
+#define ATTR_ALLOC_SIZE1(a)             __attribute__((alloc_size (a)))
+#define ATTR_ALLOC_SIZE2(a, b)          __attribute__((alloc_size (a, b)))
+
+#else
+
+#define ATTR_ALLOC_SIZE1(a)
+#define ATTR_ALLOC_SIZE2(a, b)
+
+#endif /* HAVE_ATTR_ALLOC_SIZE */
+
+#ifdef HAVE_ATTR_ACCESS
+
+#define ATTR_ACCESS2(mode, ref)         __attribute__((access (mode, ref)))
+#define ATTR_ACCESS3(mode, ref, size)   __attribute__((access (mode, ref, size)))
+
+#else
+
+#define ATTR_ACCESS2(mode, ref)
+#define ATTR_ACCESS3(mode, ref, size)
+
+#endif /* HAVE_ATTR_ACCESS */
+
+#define ATTR_ACCESS2_R(ref)              ATTR_ACCESS2(read_only, ref)
+#define ATTR_ACCESS3_R(ref, size)        ATTR_ACCESS3(read_only, ref, size)
+
+#define ATTR_ACCESS2_RW(ref)             ATTR_ACCESS2(read_write, ref)
+#define ATTR_ACCESS3_RW(ref, size)       ATTR_ACCESS3(read_write, ref, size)
+
+#define ATTR_ACCESS2_W(ref)              ATTR_ACCESS2(write_only, ref)
+#define ATTR_ACCESS3_W(ref, size)        ATTR_ACCESS3(write_only, ref, size)
+
+// ignore casts discarding const specifier, e.g.
+//     const char []     ->  char * / void *
+//     const char *[2]'  ->  char *const *
+#if defined(__clang__)
+#define IGNORE_WCASTQUAL_BEGIN  _Pragma("clang diagnostic push") \
+                                _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#define IGNORE_WCASTQUAL_END    _Pragma("clang diagnostic pop")
+#elif defined(__GNUC__)
+#define IGNORE_WCASTQUAL_BEGIN  _Pragma("GCC diagnostic push") \
+                                _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#define IGNORE_WCASTQUAL_END    _Pragma("GCC diagnostic pop")
+#else
+#define IGNORE_WCASTQUAL_BEGIN
+#define IGNORE_WCASTQUAL_END
+#endif
+
+/* Cheaper function for checking NaNs. Unlike the standard isnan(), this may
+   throw an FP exception on a "signaling NaN".
+   (ISO/IEC TS 18661-1 and the C23 standard stated that isnan() throws no
+   exceptions even with a "signaling NaN") */
+static inline bool isNaN(double x) {
+   return !isgreaterequal(x, x);
+}
+
+/* Checks if x >= 0.0 but returns false if x is NaN. Because IEEE 754 considers
+   -0.0 == 0.0, this function treats both zeros as nonnegative. */
+static inline bool isNonnegative(double x) {
+   return isgreaterequal(x, 0.0);
+}
+
+/* Checks if x > 0.0 but returns false if x is NaN. */
+static inline bool isPositive(double x) {
+   return isgreater(x, 0.0);
+}
+
+/* This subtraction is used by Linux / NetBSD / OpenBSD for calculation of CPU usage items. */
+static inline unsigned long long saturatingSub(unsigned long long a, unsigned long long b) {
+   return a > b ? a - b : 0;
+}
+
+#endif
diff --git a/MainPanel.c b/MainPanel.c
new file mode 100644
index 0000000..8349023
--- /dev/null
+++ b/MainPanel.c
@@ -0,0 +1,247 @@
+/*
+htop - ColumnsPanel.c
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "MainPanel.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Machine.h"
+#include "Platform.h"
+#include "ProvideCurses.h"
+#include "Row.h"
+#include "RowField.h"
+#include "Settings.h"
+#include "Table.h"
+#include "XUtils.h"
+
+
+static const char* const MainFunctions[]     = {"Help  ", "Setup ", "Search", "Filter", "Tree  ", "SortBy", "Nice -", "Nice +", "Kill  ", "Quit  ", NULL};
+static const char* const MainFunctions_ro[]  = {"Help  ", "Setup ", "Search", "Filter", "Tree  ", "SortBy", "      ", "      ", "      ", "Quit  ", NULL};
+
+void MainPanel_updateLabels(MainPanel* this, bool list, bool filter) {
+   FunctionBar* bar = MainPanel_getFunctionBar(this);
+   FunctionBar_setLabel(bar, KEY_F(5), list   ? "List  " : "Tree  ");
+   FunctionBar_setLabel(bar, KEY_F(4), filter ? "FILTER" : "Filter");
+}
+
+static void MainPanel_idSearch(MainPanel* this, int ch) {
+   Panel* super = (Panel*) this;
+   pid_t id = ch - 48 + this->idSearch;
+   for (int i = 0; i < Panel_size(super); i++) {
+      const Row* row = (const Row*) Panel_get(super, i);
+      if (row && row->id == id) {
+         Panel_setSelected(super, i);
+         break;
+      }
+   }
+   this->idSearch = id * 10;
+   if (this->idSearch > 10000000) {
+      this->idSearch = 0;
+   }
+}
+
+static const char* MainPanel_getValue(Panel* this, int i) {
+   Row* row = (Row*) Panel_get(this, i);
+   return Row_sortKeyString(row);
+}
+
+static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
+   MainPanel* this = (MainPanel*) super;
+   Machine* host = this->state->host;
+   Htop_Reaction reaction = HTOP_OK;
+   HandlerResult result = IGNORED;
+
+   /* Let supervising ScreenManager handle resize */
+   if (ch == KEY_RESIZE)
+      return IGNORED;
+
+   /* reset on every normal key */
+   bool needReset = ch != ERR;
+   #ifdef HAVE_GETMOUSE
+   /* except mouse events while mouse support is disabled */
+   if (!(ch != KEY_MOUSE || host->settings->enableMouse))
+      needReset = false;
+   #endif
+   if (needReset)
+      this->state->hideSelection = false;
+
+   Settings* settings = host->settings;
+   ScreenSettings* ss = settings->ss;
+
+   if (EVENT_IS_HEADER_CLICK(ch)) {
+      int x = EVENT_HEADER_CLICK_GET_X(ch);
+      int hx = super->scrollH + x + 1;
+      RowField field = RowField_keyAt(settings, hx);
+      if (ss->treeView && ss->treeViewAlwaysByPID) {
+         ss->treeView = false;
+         ss->direction = 1;
+         reaction |= Action_setSortKey(settings, field);
+      } else if (field == ScreenSettings_getActiveSortKey(ss)) {
+         ScreenSettings_invertSortOrder(ss);
+      } else {
+         reaction |= Action_setSortKey(settings, field);
+      }
+      reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_SAVE_SETTINGS;
+      result = HANDLED;
+   } else if (EVENT_IS_SCREEN_TAB_CLICK(ch)) {
+      int x = EVENT_SCREEN_TAB_GET_X(ch);
+      reaction |= Action_setScreenTab(this->state, x);
+      result = HANDLED;
+   } else if (ch != ERR && this->inc->active) {
+      bool filterChanged = IncSet_handleKey(this->inc, ch, super, MainPanel_getValue, NULL);
+      if (filterChanged) {
+         host->activeTable->incFilter = IncSet_filter(this->inc);
+         reaction = HTOP_REFRESH | HTOP_REDRAW_BAR;
+      }
+      if (this->inc->found) {
+         reaction |= Action_follow(this->state);
+         reaction |= HTOP_KEEP_FOLLOWING;
+      }
+      result = HANDLED;
+   } else if (ch == 27) {
+      this->state->hideSelection = true;
+      return HANDLED;
+   } else if (ch != ERR && ch > 0 && ch < KEY_MAX && this->keys[ch]) {
+      reaction |= (this->keys[ch])(this->state);
+      result = HANDLED;
+   } else if (0 < ch && ch < 255 && isdigit((unsigned char)ch)) {
+      MainPanel_idSearch(this, ch);
+   } else {
+      if (ch != ERR) {
+         this->idSearch = 0;
+      } else {
+         reaction |= HTOP_KEEP_FOLLOWING;
+      }
+   }
+
+   if ((reaction & HTOP_REDRAW_BAR) == HTOP_REDRAW_BAR) {
+      MainPanel_updateLabels(this, settings->ss->treeView, host->activeTable->incFilter);
+   }
+   if ((reaction & HTOP_RESIZE) == HTOP_RESIZE) {
+      result |= RESIZE;
+   }
+   if ((reaction & HTOP_UPDATE_PANELHDR) == HTOP_UPDATE_PANELHDR) {
+      result |= REDRAW;
+   }
+   if ((reaction & HTOP_REFRESH) == HTOP_REFRESH) {
+      result |= REFRESH;
+   }
+   if ((reaction & HTOP_RECALCULATE) == HTOP_RECALCULATE) {
+      result |= RESCAN;
+   }
+   if ((reaction & HTOP_SAVE_SETTINGS) == HTOP_SAVE_SETTINGS) {
+      host->settings->changed = true;
+   }
+   if ((reaction & HTOP_QUIT) == HTOP_QUIT) {
+      return BREAK_LOOP;
+   }
+   if ((reaction & HTOP_KEEP_FOLLOWING) != HTOP_KEEP_FOLLOWING) {
+      host->activeTable->following = -1;
+      Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+   }
+   return result;
+}
+
+int MainPanel_selectedRow(MainPanel* this) {
+   const Row* row = (const Row*) Panel_getSelected((Panel*)this);
+   return row ? row->id : -1;
+}
+
+bool MainPanel_foreachRow(MainPanel* this, MainPanel_foreachRowFn fn, Arg arg, bool* wasAnyTagged) {
+   Panel* super = (Panel*) this;
+   bool ok = true;
+   bool anyTagged = false;
+   for (int i = 0; i < Panel_size(super); i++) {
+      Row* row = (Row*) Panel_get(super, i);
+      if (row->tag) {
+         ok &= fn(row, arg);
+         anyTagged = true;
+      }
+   }
+   if (!anyTagged) {
+      Row* row = (Row*) Panel_getSelected(super);
+      if (row) {
+         ok &= fn(row, arg);
+      }
+   }
+
+   if (wasAnyTagged)
+      *wasAnyTagged = anyTagged;
+
+   return ok;
+}
+
+static void MainPanel_drawFunctionBar(Panel* super, bool hideFunctionBar) {
+   MainPanel* this = (MainPanel*) super;
+
+   // Do not hide active search and filter bar.
+   if (hideFunctionBar && !this->inc->active)
+      return;
+
+   IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+   if (this->state->pauseUpdate) {
+      FunctionBar_append("PAUSED", CRT_colors[PAUSED]);
+   }
+}
+
+static void MainPanel_printHeader(Panel* super) {
+   MainPanel* this = (MainPanel*) super;
+   Machine* host = this->state->host;
+   Table_printHeader(host->settings, &super->header);
+}
+
+const PanelClass MainPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = MainPanel_delete
+   },
+   .eventHandler = MainPanel_eventHandler,
+   .drawFunctionBar = MainPanel_drawFunctionBar,
+   .printHeader = MainPanel_printHeader
+};
+
+MainPanel* MainPanel_new(void) {
+   MainPanel* this = AllocThis(MainPanel);
+   this->processBar = FunctionBar_new(MainFunctions, NULL, NULL);
+   this->readonlyBar = FunctionBar_new(MainFunctions_ro, NULL, NULL);
+   FunctionBar* activeBar = Settings_isReadonly() ? this->readonlyBar : this->processBar;
+   Panel_init((Panel*) this, 1, 1, 1, 1, Class(Row), false, activeBar);
+   this->keys = xCalloc(KEY_MAX, sizeof(Htop_Action));
+   this->inc = IncSet_new(activeBar);
+
+   Action_setBindings(this->keys);
+   Platform_setBindings(this->keys);
+
+   return this;
+}
+
+void MainPanel_setState(MainPanel* this, State* state) {
+   this->state = state;
+}
+
+void MainPanel_setFunctionBar(MainPanel* this, bool readonly) {
+   this->super.defaultBar = readonly ? this->readonlyBar : this->processBar;
+   this->inc->defaultBar = this->super.defaultBar;
+}
+
+void MainPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   MainPanel* this = (MainPanel*) object;
+   MainPanel_setFunctionBar(this, false);
+   FunctionBar_delete(this->readonlyBar);
+   Panel_done(super);
+   IncSet_delete(this->inc);
+   free(this->keys);
+   free(this);
+}
diff --git a/MainPanel.h b/MainPanel.h
new file mode 100644
index 0000000..105b46d
--- /dev/null
+++ b/MainPanel.h
@@ -0,0 +1,52 @@
+#ifndef HEADER_MainPanel
+#define HEADER_MainPanel
+/*
+htop - ColumnsPanel.h
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Action.h"
+#include "FunctionBar.h"
+#include "IncSet.h"
+#include "Object.h"
+#include "Panel.h"
+#include "Row.h"
+
+
+typedef struct MainPanel_ {
+   Panel super;
+   State* state;
+   IncSet* inc;
+   Htop_Action* keys;
+   FunctionBar* processBar;  /* function bar with process-specific actions */
+   FunctionBar* readonlyBar;  /* function bar without process actions (ro) */
+   unsigned int idSearch;
+} MainPanel;
+
+typedef bool(*MainPanel_foreachRowFn)(Row*, Arg);
+
+#define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar)
+
+// update the Label Keys in the MainPanel bar, list: list / tree mode, filter: filter (inc) active / inactive
+void MainPanel_updateLabels(MainPanel* this, bool list, bool filter);
+
+int MainPanel_selectedRow(MainPanel* this);
+
+bool MainPanel_foreachRow(MainPanel* this, MainPanel_foreachRowFn fn, Arg arg, bool* wasAnyTagged);
+
+extern const PanelClass MainPanel_class;
+
+MainPanel* MainPanel_new(void);
+
+void MainPanel_setState(MainPanel* this, State* state);
+
+void MainPanel_setFunctionBar(MainPanel* this, bool readonly);
+
+void MainPanel_delete(Object* object);
+
+#endif
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..ed92afa
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,512 @@
+if !HTOP_PCP
+bin_PROGRAMS = htop
+myhtopplatprogram = htop.c
+else
+bin_PROGRAMS = pcp-htop
+myhtopplatprogram = pcp-htop.c
+endif
+
+dist_man_MANS = htop.1
+EXTRA_DIST = \
+	$(dist_man_MANS) \
+	autogen.sh \
+	htop.desktop \
+	htop.png \
+	htop.svg \
+	build-aux/compile \
+	build-aux/depcomp \
+	build-aux/install-sh \
+	build-aux/missing
+applicationsdir = $(datadir)/applications
+applications_DATA = htop.desktop
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = htop.png
+appicondir = $(datadir)/icons/hicolor/scalable/apps
+appicon_DATA = htop.svg
+
+AM_CFLAGS += -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"$(sysconfdir)\"" -I"$(top_srcdir)/$(my_htop_platform)"
+AM_LDFLAGS =
+
+myhtopsources = \
+	Action.c \
+	Affinity.c \
+	AffinityPanel.c \
+	AvailableColumnsPanel.c \
+	AvailableMetersPanel.c \
+	BatteryMeter.c \
+	CategoriesPanel.c \
+	ClockMeter.c \
+	ColorsPanel.c \
+	ColumnsPanel.c \
+	CommandLine.c \
+	CommandScreen.c \
+	Compat.c \
+	CPUMeter.c \
+	CRT.c \
+	DateMeter.c \
+	DateTimeMeter.c \
+	DiskIOMeter.c \
+	DisplayOptionsPanel.c \
+	DynamicColumn.c \
+	DynamicMeter.c \
+	DynamicScreen.c \
+	EnvScreen.c \
+	FileDescriptorMeter.c \
+	FunctionBar.c \
+	Hashtable.c \
+	Header.c \
+	HeaderOptionsPanel.c \
+	HostnameMeter.c \
+	IncSet.c \
+	InfoScreen.c \
+	ListItem.c \
+	LoadAverageMeter.c \
+	Machine.c \
+	MainPanel.c \
+	MemoryMeter.c \
+	MemorySwapMeter.c \
+	Meter.c \
+	MetersPanel.c \
+	NetworkIOMeter.c \
+	Object.c \
+	OpenFilesScreen.c \
+	OptionItem.c \
+	Panel.c \
+	Process.c \
+	ProcessLocksScreen.c \
+	ProcessTable.c \
+	Row.c \
+	RichString.c \
+	Scheduling.c \
+	ScreenManager.c \
+	ScreensPanel.c \
+	ScreenTabsPanel.c \
+	Settings.c \
+	SignalsPanel.c \
+	SwapMeter.c \
+	SysArchMeter.c \
+	Table.c \
+	TasksMeter.c \
+	TraceScreen.c \
+	UptimeMeter.c \
+	UsersTable.c \
+	Vector.c \
+	XUtils.c
+
+myhtopheaders = \
+	Action.h \
+	Affinity.h \
+	AffinityPanel.h \
+	AvailableColumnsPanel.h \
+	AvailableMetersPanel.h \
+	BatteryMeter.h \
+	CPUMeter.h \
+	CRT.h \
+	CategoriesPanel.h \
+	ClockMeter.h \
+	ColorsPanel.h \
+	ColumnsPanel.h \
+	CommandLine.h \
+	CommandScreen.h \
+	Compat.h \
+	DateMeter.h \
+	DateTimeMeter.h \
+	DiskIOMeter.h \
+	DisplayOptionsPanel.h \
+	DynamicColumn.h \
+	DynamicMeter.h \
+	DynamicScreen.h \
+	EnvScreen.h \
+	FileDescriptorMeter.h \
+	FunctionBar.h \
+	Hashtable.h \
+	Header.h \
+	HeaderLayout.h \
+	HeaderOptionsPanel.h \
+	HostnameMeter.h \
+	IncSet.h \
+	InfoScreen.h \
+	ListItem.h \
+	LoadAverageMeter.h \
+	Machine.h \
+	Macros.h \
+	MainPanel.h \
+	MemoryMeter.h \
+	MemorySwapMeter.h \
+	Meter.h \
+	MetersPanel.h \
+	NetworkIOMeter.h \
+	Object.h \
+	OpenFilesScreen.h \
+	OptionItem.h \
+	Panel.h \
+	Process.h \
+	ProcessLocksScreen.h \
+	ProcessTable.h \
+	ProvideCurses.h \
+	ProvideTerm.h \
+	RichString.h \
+	Row.h \
+	RowField.h \
+	Scheduling.h \
+	ScreenManager.h \
+	ScreensPanel.h \
+	ScreenTabsPanel.h \
+	Settings.h \
+	SignalsPanel.h \
+	SwapMeter.h \
+	SysArchMeter.h \
+	Table.h \
+	TasksMeter.h \
+	TraceScreen.h \
+	UptimeMeter.h \
+	UsersTable.h \
+	Vector.h \
+	XUtils.h
+
+# Linux
+# -----
+
+linux_platform_headers = \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/uname.h \
+	linux/CGroupUtils.h \
+	linux/HugePageMeter.h \
+	linux/IOPriority.h \
+	linux/IOPriorityPanel.h \
+	linux/LibSensors.h \
+	linux/LinuxMachine.h \
+	linux/LinuxProcess.h \
+	linux/LinuxProcessTable.h \
+	linux/Platform.h \
+	linux/PressureStallMeter.h \
+	linux/ProcessField.h \
+	linux/SELinuxMeter.h \
+	linux/SystemdMeter.h \
+	linux/ZramMeter.h \
+	linux/ZramStats.h \
+	linux/ZswapStats.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/ZfsCompressedArcMeter.h
+
+linux_platform_sources = \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/uname.c \
+	linux/CGroupUtils.c \
+	linux/HugePageMeter.c \
+	linux/IOPriorityPanel.c \
+	linux/LibSensors.c \
+	linux/LinuxMachine.c \
+	linux/LinuxProcess.c \
+	linux/LinuxProcessTable.c \
+	linux/Platform.c \
+	linux/PressureStallMeter.c \
+	linux/SELinuxMeter.c \
+	linux/SystemdMeter.c \
+	linux/ZramMeter.c \
+	zfs/ZfsArcMeter.c \
+	zfs/ZfsCompressedArcMeter.c
+
+if HTOP_LINUX
+AM_LDFLAGS += -rdynamic
+myhtopplatheaders = $(linux_platform_headers)
+myhtopplatsources = $(linux_platform_sources)
+endif
+
+# FreeBSD
+# -------
+
+freebsd_platform_headers = \
+	freebsd/FreeBSDMachine.h \
+	freebsd/FreeBSDProcessTable.h \
+	freebsd/FreeBSDProcess.h \
+	freebsd/Platform.h \
+	freebsd/ProcessField.h \
+	generic/fdstat_sysctl.h \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/openzfs_sysctl.h \
+	generic/uname.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/ZfsCompressedArcMeter.h
+
+freebsd_platform_sources = \
+	freebsd/Platform.c \
+	freebsd/FreeBSDMachine.c \
+	freebsd/FreeBSDProcessTable.c \
+	freebsd/FreeBSDProcess.c \
+	generic/fdstat_sysctl.c \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/openzfs_sysctl.c \
+	generic/uname.c \
+	zfs/ZfsArcMeter.c \
+	zfs/ZfsCompressedArcMeter.c
+
+if HTOP_FREEBSD
+myhtopplatheaders = $(freebsd_platform_headers)
+myhtopplatsources = $(freebsd_platform_sources)
+endif
+
+# DragonFlyBSD
+# ------------
+
+dragonflybsd_platform_headers = \
+	dragonflybsd/DragonFlyBSDMachine.h \
+	dragonflybsd/DragonFlyBSDProcessTable.h \
+	dragonflybsd/DragonFlyBSDProcess.h \
+	dragonflybsd/Platform.h \
+	dragonflybsd/ProcessField.h \
+	generic/fdstat_sysctl.h \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/uname.h
+
+dragonflybsd_platform_sources = \
+	dragonflybsd/DragonFlyBSDMachine.c \
+	dragonflybsd/DragonFlyBSDProcessTable.c \
+	dragonflybsd/DragonFlyBSDProcess.c \
+	dragonflybsd/Platform.c \
+	generic/fdstat_sysctl.c \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/uname.c
+
+if HTOP_DRAGONFLYBSD
+myhtopplatheaders = $(dragonflybsd_platform_headers)
+myhtopplatsources = $(dragonflybsd_platform_sources)
+endif
+
+# NetBSD
+# -------
+
+netbsd_platform_headers = \
+	generic/fdstat_sysctl.h \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/uname.h \
+	netbsd/Platform.h \
+	netbsd/ProcessField.h \
+	netbsd/NetBSDMachine.h \
+	netbsd/NetBSDProcess.h \
+	netbsd/NetBSDProcessTable.h
+
+netbsd_platform_sources = \
+	generic/fdstat_sysctl.c \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/uname.c \
+	netbsd/Platform.c \
+	netbsd/NetBSDMachine.c \
+	netbsd/NetBSDProcess.c \
+	netbsd/NetBSDProcessTable.c
+
+if HTOP_NETBSD
+myhtopplatheaders = $(netbsd_platform_headers)
+myhtopplatsources = $(netbsd_platform_sources)
+endif
+
+# OpenBSD
+# -------
+
+openbsd_platform_headers = \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/uname.h \
+	openbsd/OpenBSDMachine.h \
+	openbsd/OpenBSDProcessTable.h \
+	openbsd/OpenBSDProcess.h \
+	openbsd/Platform.h \
+	openbsd/ProcessField.h
+
+openbsd_platform_sources = \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/uname.c \
+	openbsd/OpenBSDMachine.c \
+	openbsd/OpenBSDProcessTable.c \
+	openbsd/OpenBSDProcess.c \
+	openbsd/Platform.c
+
+if HTOP_OPENBSD
+myhtopplatheaders = $(openbsd_platform_headers)
+myhtopplatsources = $(openbsd_platform_sources)
+endif
+
+# Darwin
+# ------
+
+darwin_platform_headers = \
+	darwin/DarwinMachine.h \
+	darwin/DarwinProcess.h \
+	darwin/DarwinProcessTable.h \
+	darwin/Platform.h \
+	darwin/PlatformHelpers.h \
+	darwin/ProcessField.h \
+	generic/fdstat_sysctl.h \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/openzfs_sysctl.h \
+	generic/uname.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/ZfsCompressedArcMeter.h
+
+darwin_platform_sources = \
+	darwin/Platform.c \
+	darwin/PlatformHelpers.c \
+	darwin/DarwinMachine.c \
+	darwin/DarwinProcess.c \
+	darwin/DarwinProcessTable.c \
+	generic/fdstat_sysctl.c \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/openzfs_sysctl.c \
+	generic/uname.c \
+	zfs/ZfsArcMeter.c \
+	zfs/ZfsCompressedArcMeter.c
+
+if HTOP_DARWIN
+AM_LDFLAGS += -framework IOKit -framework CoreFoundation
+myhtopplatheaders = $(darwin_platform_headers)
+myhtopplatsources = $(darwin_platform_sources)
+endif
+
+# Solaris
+# -------
+
+solaris_platform_headers = \
+	generic/gettime.h \
+	generic/hostname.h \
+	generic/uname.h \
+	solaris/ProcessField.h \
+	solaris/Platform.h \
+	solaris/SolarisMachine.h \
+	solaris/SolarisProcess.h \
+	solaris/SolarisProcessTable.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/ZfsCompressedArcMeter.h
+
+solaris_platform_sources = \
+	generic/gettime.c \
+	generic/hostname.c \
+	generic/uname.c \
+	solaris/Platform.c \
+	solaris/SolarisMachine.c \
+	solaris/SolarisProcess.c \
+	solaris/SolarisProcessTable.c \
+	zfs/ZfsArcMeter.c \
+	zfs/ZfsCompressedArcMeter.c
+
+if HTOP_SOLARIS
+myhtopplatheaders = $(solaris_platform_headers)
+myhtopplatsources = $(solaris_platform_sources)
+endif
+
+# Performance Co-Pilot (PCP)
+# --------------------------
+
+pcp_platform_headers = \
+	linux/CGroupUtils.h \
+	linux/PressureStallMeter.h \
+	linux/ZramMeter.h \
+	linux/ZramStats.h \
+	pcp/Instance.h \
+	pcp/InDomTable.h \
+	pcp/Metric.h \
+	pcp/Platform.h \
+	pcp/ProcessField.h \
+	pcp/PCPDynamicColumn.h \
+	pcp/PCPDynamicMeter.h \
+	pcp/PCPDynamicScreen.h \
+	pcp/PCPMachine.h \
+	pcp/PCPProcess.h \
+	pcp/PCPProcessTable.h \
+	zfs/ZfsArcMeter.h \
+	zfs/ZfsArcStats.h \
+	zfs/ZfsCompressedArcMeter.h
+
+pcp_platform_sources = \
+	linux/CGroupUtils.c \
+	linux/PressureStallMeter.c \
+	linux/ZramMeter.c \
+	pcp/Instance.c \
+	pcp/InDomTable.c \
+	pcp/Metric.c \
+	pcp/Platform.c \
+	pcp/PCPDynamicColumn.c \
+	pcp/PCPDynamicMeter.c \
+	pcp/PCPDynamicScreen.c \
+	pcp/PCPMachine.c \
+	pcp/PCPProcess.c \
+	pcp/PCPProcessTable.c \
+	zfs/ZfsArcMeter.c \
+	zfs/ZfsCompressedArcMeter.c
+
+if HTOP_PCP
+myhtopplatheaders = $(pcp_platform_headers)
+myhtopplatsources = $(pcp_platform_sources)
+pcp_htop_SOURCES  = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
+endif
+
+# Unsupported
+# -----------
+
+unsupported_platform_headers = \
+	generic/gettime.h \
+	unsupported/Platform.h \
+	unsupported/ProcessField.h \
+	unsupported/UnsupportedMachine.h \
+	unsupported/UnsupportedProcess.h \
+	unsupported/UnsupportedProcessTable.h
+
+unsupported_platform_sources = \
+	generic/gettime.c \
+	unsupported/Platform.c \
+	unsupported/UnsupportedMachine.c \
+	unsupported/UnsupportedProcess.c \
+	unsupported/UnsupportedProcessTable.c
+
+if HTOP_UNSUPPORTED
+myhtopplatsources = $(unsupported_platform_sources)
+myhtopplatheaders = $(unsupported_platform_headers)
+endif
+
+# ----
+
+htop_SOURCES = $(myhtopplatprogram) $(myhtopheaders) $(myhtopplatheaders) $(myhtopsources) $(myhtopplatsources)
+nodist_htop_SOURCES = config.h
+
+target:
+	echo $(htop_SOURCES)
+
+profile:
+	$(MAKE) all AM_CPPFLAGS="-pg -O2 -DNDEBUG"
+
+debug:
+	$(MAKE) all AM_CPPFLAGS="-ggdb3 -Og" CFLAGS="`printf ' %s ' "$(CFLAGS)"|sed -E 's#[[:space:]]-O[^[:space:]]+[[:space:]]# #g'` -ggdb3 -Og"
+
+coverage:
+	$(MAKE) all AM_CPPFLAGS="-fprofile-arcs -ftest-coverage" AM_LDFLAGS="-lgcov"
+
+cppcheck:
+	cppcheck -q -v . --enable=all -DHAVE_OPENVZ
+
+dist-hook: $(top_distdir)/configure
+	@if grep 'pkg_m4_absent' '$(top_distdir)/configure'; then \
+	   echo 'configure is generated without pkg.m4. Please supply pkg.m4 and run ./autogen.sh to rebuild the configure script.'>&2; \
+	   (exit 1); \
+	else :; \
+	fi
+
+.PHONY: lcov
+
+lcov:
+	mkdir -p lcov
+	lcov --capture --directory . --output-file coverage.info
+	genhtml coverage.info --output-directory lcov
diff --git a/MemoryMeter.c b/MemoryMeter.c
new file mode 100644
index 0000000..573b898
--- /dev/null
+++ b/MemoryMeter.c
@@ -0,0 +1,118 @@
+/*
+htop - MemoryMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "MemoryMeter.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+
+
+static const int MemoryMeter_attributes[] = {
+   MEMORY_USED,
+   MEMORY_SHARED,
+   MEMORY_COMPRESSED,
+   MEMORY_BUFFERS,
+   MEMORY_CACHE
+};
+
+static void MemoryMeter_updateValues(Meter* this) {
+   char* buffer = this->txtBuffer;
+   size_t size = sizeof(this->txtBuffer);
+   int written;
+
+   /* shared, compressed and available memory are not supported on all platforms */
+   this->values[MEMORY_METER_SHARED] = NAN;
+   this->values[MEMORY_METER_COMPRESSED] = NAN;
+   this->values[MEMORY_METER_AVAILABLE] = NAN;
+   Platform_setMemoryValues(this);
+
+   /* Do not print available memory in bar mode */
+   static_assert(MEMORY_METER_AVAILABLE + 1 == MEMORY_METER_ITEMCOUNT,
+      "MEMORY_METER_AVAILABLE is not the last item in MemoryMeterValues");
+   this->curItems = MEMORY_METER_AVAILABLE;
+
+   /* we actually want to show "used + shared + compressed" */
+   double used = this->values[MEMORY_METER_USED];
+   if (isPositive(this->values[MEMORY_METER_SHARED]))
+      used += this->values[MEMORY_METER_SHARED];
+   if (isPositive(this->values[MEMORY_METER_COMPRESSED]))
+      used += this->values[MEMORY_METER_COMPRESSED];
+
+   written = Meter_humanUnit(buffer, used, size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '/');
+
+   Meter_humanUnit(buffer, this->total, size);
+}
+
+static void MemoryMeter_display(const Object* cast, RichString* out) {
+   char buffer[50];
+   const Meter* this = (const Meter*)cast;
+
+   RichString_writeAscii(out, CRT_colors[METER_TEXT], ":");
+   Meter_humanUnit(buffer, this->total, sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+
+   Meter_humanUnit(buffer, this->values[MEMORY_METER_USED], sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:");
+   RichString_appendAscii(out, CRT_colors[MEMORY_USED], buffer);
+
+   /* shared memory is not supported on all platforms */
+   if (isNonnegative(this->values[MEMORY_METER_SHARED])) {
+      Meter_humanUnit(buffer, this->values[MEMORY_METER_SHARED], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " shared:");
+      RichString_appendAscii(out, CRT_colors[MEMORY_SHARED], buffer);
+   }
+
+   /* compressed memory is not supported on all platforms */
+   if (isNonnegative(this->values[MEMORY_METER_COMPRESSED])) {
+      Meter_humanUnit(buffer, this->values[MEMORY_METER_COMPRESSED], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " compressed:");
+      RichString_appendAscii(out, CRT_colors[MEMORY_COMPRESSED], buffer);
+   }
+
+   Meter_humanUnit(buffer, this->values[MEMORY_METER_BUFFERS], sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " buffers:");
+   RichString_appendAscii(out, CRT_colors[MEMORY_BUFFERS_TEXT], buffer);
+
+   Meter_humanUnit(buffer, this->values[MEMORY_METER_CACHE], sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:");
+   RichString_appendAscii(out, CRT_colors[MEMORY_CACHE], buffer);
+
+   /* available memory is not supported on all platforms */
+   if (isNonnegative(this->values[MEMORY_METER_AVAILABLE])) {
+      Meter_humanUnit(buffer, this->values[MEMORY_METER_AVAILABLE], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " available:");
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+   }
+}
+
+const MeterClass MemoryMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = MemoryMeter_display,
+   },
+   .updateValues = MemoryMeter_updateValues,
+   .defaultMode = BAR_METERMODE,
+   .maxItems = MEMORY_METER_ITEMCOUNT,
+   .total = 100.0,
+   .attributes = MemoryMeter_attributes,
+   .name = "Memory",
+   .uiName = "Memory",
+   .caption = "Mem"
+};
diff --git a/MemoryMeter.h b/MemoryMeter.h
new file mode 100644
index 0000000..e39b3bd
--- /dev/null
+++ b/MemoryMeter.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_MemoryMeter
+#define HEADER_MemoryMeter
+/*
+htop - MemoryMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+typedef enum {
+   MEMORY_METER_USED = 0,
+   MEMORY_METER_SHARED = 1,
+   MEMORY_METER_COMPRESSED = 2,
+   MEMORY_METER_BUFFERS = 3,
+   MEMORY_METER_CACHE = 4,
+   MEMORY_METER_AVAILABLE = 5,
+   MEMORY_METER_ITEMCOUNT = 6, // number of entries in this enum
+} MemoryMeterValues;
+
+extern const MeterClass MemoryMeter_class;
+
+#endif
diff --git a/MemorySwapMeter.c b/MemorySwapMeter.c
new file mode 100644
index 0000000..82eddee
--- /dev/null
+++ b/MemorySwapMeter.c
@@ -0,0 +1,110 @@
+/*
+htop - MemorySwapMeter.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "MemorySwapMeter.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "Object.h"
+#include "SwapMeter.h"
+#include "XUtils.h"
+
+
+typedef struct MemorySwapMeterData_ {
+   Meter* memoryMeter;
+   Meter* swapMeter;
+} MemorySwapMeterData;
+
+static void MemorySwapMeter_updateValues(Meter* this) {
+   MemorySwapMeterData* data = this->meterData;
+
+   Meter_updateValues(data->memoryMeter);
+   Meter_updateValues(data->swapMeter);
+}
+
+static void MemorySwapMeter_draw(Meter* this, int x, int y, int w) {
+   MemorySwapMeterData* data = this->meterData;
+
+   /* Use the same width for each sub meter to align with CPU meter */
+   const int colwidth = w / 2;
+   const int diff = w - colwidth * 2;
+
+   assert(data->memoryMeter->draw);
+   data->memoryMeter->draw(data->memoryMeter, x, y, colwidth);
+   assert(data->swapMeter->draw);
+   data->swapMeter->draw(data->swapMeter, x + colwidth + diff, y, colwidth);
+}
+
+static void MemorySwapMeter_init(Meter* this) {
+   MemorySwapMeterData* data = this->meterData;
+
+   if (!data) {
+      data = this->meterData = xMalloc(sizeof(MemorySwapMeterData));
+      data->memoryMeter = NULL;
+      data->swapMeter = NULL;
+   }
+
+   if (!data->memoryMeter)
+      data->memoryMeter = Meter_new(this->host, 0, (const MeterClass*) Class(MemoryMeter));
+   if (!data->swapMeter)
+      data->swapMeter = Meter_new(this->host, 0, (const MeterClass*) Class(SwapMeter));
+
+   if (Meter_initFn(data->memoryMeter))
+      Meter_init(data->memoryMeter);
+   if (Meter_initFn(data->swapMeter))
+      Meter_init(data->swapMeter);
+
+   if (this->mode == 0)
+      this->mode = BAR_METERMODE;
+
+   this->h = MAXIMUM(Meter_modes[data->memoryMeter->mode]->h, Meter_modes[data->swapMeter->mode]->h);
+}
+
+static void MemorySwapMeter_updateMode(Meter* this, int mode) {
+   MemorySwapMeterData* data = this->meterData;
+
+   this->mode = mode;
+
+   Meter_setMode(data->memoryMeter, mode);
+   Meter_setMode(data->swapMeter, mode);
+
+   this->h = MAXIMUM(Meter_modes[data->memoryMeter->mode]->h, Meter_modes[data->swapMeter->mode]->h);
+}
+
+static void MemorySwapMeter_done(Meter* this) {
+   MemorySwapMeterData* data = this->meterData;
+
+   Meter_delete((Object*)data->swapMeter);
+   Meter_delete((Object*)data->memoryMeter);
+
+   free(data);
+}
+
+const MeterClass MemorySwapMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+   },
+   .updateValues = MemorySwapMeter_updateValues,
+   .defaultMode = CUSTOM_METERMODE,
+   .isMultiColumn = true,
+   .name = "MemorySwap",
+   .uiName = "Memory & Swap",
+   .description = "Combined memory and swap usage",
+   .caption = "M&S",
+   .draw = MemorySwapMeter_draw,
+   .init = MemorySwapMeter_init,
+   .updateMode = MemorySwapMeter_updateMode,
+   .done = MemorySwapMeter_done
+};
diff --git a/MemorySwapMeter.h b/MemorySwapMeter.h
new file mode 100644
index 0000000..a98d5e6
--- /dev/null
+++ b/MemorySwapMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_MemorySwapMeter
+#define HEADER_MemorySwapMeter
+/*
+htop - MemorySwapMeter.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass MemorySwapMeter_class;
+
+#endif
diff --git a/Meter.c b/Meter.c
new file mode 100644
index 0000000..86f8885
--- /dev/null
+++ b/Meter.c
@@ -0,0 +1,504 @@
+/*
+htop - Meter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Meter.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+#include "RichString.h"
+#include "Row.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+#define GRAPH_HEIGHT 4 /* Unit: rows (lines) */
+
+const MeterClass Meter_class = {
+   .super = {
+      .extends = Class(Object)
+   }
+};
+
+Meter* Meter_new(const Machine* host, unsigned int param, const MeterClass* type) {
+   Meter* this = xCalloc(1, sizeof(Meter));
+   Object_setClass(this, type);
+   this->h = 1;
+   this->param = param;
+   this->host = host;
+   this->curItems = type->maxItems;
+   this->curAttributes = NULL;
+   this->values = type->maxItems ? xCalloc(type->maxItems, sizeof(double)) : NULL;
+   this->total = type->total;
+   this->caption = xStrdup(type->caption);
+   if (Meter_initFn(this)) {
+      Meter_init(this);
+   }
+   Meter_setMode(this, type->defaultMode);
+   return this;
+}
+
+/* Converts 'value' in kibibytes into a human readable string.
+   Example output strings: "0K", "1023K", "98.7M" and "1.23G" */
+int Meter_humanUnit(char* buffer, double value, size_t size) {
+   size_t i = 0;
+
+   assert(value >= 0.0);
+   while (value >= ONE_K) {
+      if (i >= ARRAYSIZE(unitPrefixes) - 1) {
+         if (value > 9999.0) {
+            return xSnprintf(buffer, size, "inf");
+         }
+         break;
+      }
+
+      value /= ONE_K;
+      ++i;
+   }
+
+   int precision = 0;
+
+   if (i > 0) {
+      // Fraction digits for mebibytes and above
+      precision = value <= 99.9 ? (value <= 9.99 ? 2 : 1) : 0;
+
+      // Round up if 'value' is in range (99.9, 100) or (9.99, 10)
+      if (precision < 2) {
+         double limit = precision == 1 ? 10.0 : 100.0;
+         if (value < limit) {
+            value = limit;
+         }
+      }
+   }
+
+   return xSnprintf(buffer, size, "%.*f%c", precision, value, unitPrefixes[i]);
+}
+
+void Meter_delete(Object* cast) {
+   if (!cast)
+      return;
+
+   Meter* this = (Meter*) cast;
+   if (Meter_doneFn(this)) {
+      Meter_done(this);
+   }
+   free(this->drawData.values);
+   free(this->caption);
+   free(this->values);
+   free(this);
+}
+
+void Meter_setCaption(Meter* this, const char* caption) {
+   free_and_xStrdup(&this->caption, caption);
+}
+
+static inline void Meter_displayBuffer(const Meter* this, RichString* out) {
+   if (Object_displayFn(this)) {
+      Object_display(this, out);
+   } else {
+      RichString_writeWide(out, CRT_colors[Meter_attributes(this)[0]], this->txtBuffer);
+   }
+}
+
+void Meter_setMode(Meter* this, int modeIndex) {
+   if (modeIndex > 0 && modeIndex == this->mode) {
+      return;
+   }
+
+   if (!modeIndex) {
+      modeIndex = 1;
+   }
+
+   assert(modeIndex < LAST_METERMODE);
+   if (Meter_defaultMode(this) == CUSTOM_METERMODE) {
+      this->draw = Meter_drawFn(this);
+      if (Meter_updateModeFn(this)) {
+         Meter_updateMode(this, modeIndex);
+      }
+   } else {
+      assert(modeIndex >= 1);
+      free(this->drawData.values);
+      this->drawData.values = NULL;
+      this->drawData.nValues = 0;
+
+      const MeterMode* mode = Meter_modes[modeIndex];
+      this->draw = mode->draw;
+      this->h = mode->h;
+   }
+   this->mode = modeIndex;
+}
+
+ListItem* Meter_toListItem(const Meter* this, bool moving) {
+   char mode[20];
+   if (this->mode) {
+      xSnprintf(mode, sizeof(mode), " [%s]", Meter_modes[this->mode]->uiName);
+   } else {
+      mode[0] = '\0';
+   }
+   char name[32];
+   if (Meter_getUiNameFn(this))
+      Meter_getUiName(this, name, sizeof(name));
+   else
+      xSnprintf(name, sizeof(name), "%s", Meter_uiName(this));
+   char buffer[50];
+   xSnprintf(buffer, sizeof(buffer), "%s%s", name, mode);
+   ListItem* li = ListItem_new(buffer, 0);
+   li->moving = moving;
+   return li;
+}
+
+/* ---------- TextMeterMode ---------- */
+
+static void TextMeterMode_draw(Meter* this, int x, int y, int w) {
+   const char* caption = Meter_getCaption(this);
+   attrset(CRT_colors[METER_TEXT]);
+   mvaddnstr(y, x, caption, w);
+   attrset(CRT_colors[RESET_COLOR]);
+
+   int captionLen = strlen(caption);
+   x += captionLen;
+   w -= captionLen;
+   if (w <= 0)
+      return;
+
+   RichString_begin(out);
+   Meter_displayBuffer(this, &out);
+   RichString_printoffnVal(out, y, x, 0, w);
+   RichString_delete(&out);
+}
+
+/* ---------- BarMeterMode ---------- */
+
+static const char BarMeterMode_characters[] = "|#*@$%&.";
+
+static void BarMeterMode_draw(Meter* this, int x, int y, int w) {
+   const char* caption = Meter_getCaption(this);
+   attrset(CRT_colors[METER_TEXT]);
+   int captionLen = 3;
+   mvaddnstr(y, x, caption, captionLen);
+   x += captionLen;
+   w -= captionLen;
+   attrset(CRT_colors[BAR_BORDER]);
+   mvaddch(y, x, '[');
+   w--;
+   mvaddch(y, x + MAXIMUM(w, 0), ']');
+   w--;
+   attrset(CRT_colors[RESET_COLOR]);
+
+   x++;
+
+   if (w < 1)
+      return;
+
+   // The text in the bar is right aligned;
+   // Pad with maximal spaces and then calculate needed starting position offset
+   RichString_begin(bar);
+   RichString_appendChr(&bar, 0, ' ', w);
+   RichString_appendWide(&bar, 0, this->txtBuffer);
+   int startPos = RichString_sizeVal(bar) - w;
+   if (startPos > w) {
+      // Text is too large for bar
+      // Truncate meter text at a space character
+      for (int pos = 2 * w; pos > w; pos--) {
+         if (RichString_getCharVal(bar, pos) == ' ') {
+            while (pos > w && RichString_getCharVal(bar, pos - 1) == ' ')
+               pos--;
+            startPos = pos - w;
+            break;
+         }
+      }
+
+      // If still too large, print the start not the end
+      startPos = MINIMUM(startPos, w);
+   }
+   assert(startPos >= 0);
+   assert(startPos <= w);
+   assert(startPos + w <= RichString_sizeVal(bar));
+
+   int blockSizes[10];
+
+   // First draw in the bar[] buffer...
+   int offset = 0;
+   for (uint8_t i = 0; i < this->curItems; i++) {
+      double value = this->values[i];
+      if (isPositive(value) && this->total > 0.0) {
+         value = MINIMUM(value, this->total);
+         blockSizes[i] = ceil((value / this->total) * w);
+      } else {
+         blockSizes[i] = 0;
+      }
+      int nextOffset = offset + blockSizes[i];
+      // (Control against invalid values)
+      nextOffset = CLAMP(nextOffset, 0, w);
+      for (int j = offset; j < nextOffset; j++)
+         if (RichString_getCharVal(bar, startPos + j) == ' ') {
+            if (CRT_colorScheme == COLORSCHEME_MONOCHROME) {
+               assert(i < strlen(BarMeterMode_characters));
+               RichString_setChar(&bar, startPos + j, BarMeterMode_characters[i]);
+            } else {
+               RichString_setChar(&bar, startPos + j, '|');
+            }
+         }
+      offset = nextOffset;
+   }
+
+   // ...then print the buffer.
+   offset = 0;
+   for (uint8_t i = 0; i < this->curItems; i++) {
+      int attr = this->curAttributes ? this->curAttributes[i] : Meter_attributes(this)[i];
+      RichString_setAttrn(&bar, CRT_colors[attr], startPos + offset, blockSizes[i]);
+      RichString_printoffnVal(bar, y, x + offset, startPos + offset, MINIMUM(blockSizes[i], w - offset));
+      offset += blockSizes[i];
+      offset = CLAMP(offset, 0, w);
+   }
+   if (offset < w) {
+      RichString_setAttrn(&bar, CRT_colors[BAR_SHADOW], startPos + offset, w - offset);
+      RichString_printoffnVal(bar, y, x + offset, startPos + offset, w - offset);
+   }
+
+   RichString_delete(&bar);
+
+   move(y, x + w + 1);
+   attrset(CRT_colors[RESET_COLOR]);
+}
+
+/* ---------- GraphMeterMode ---------- */
+
+#ifdef HAVE_LIBNCURSESW
+
+#define PIXPERROW_UTF8 4
+static const char* const GraphMeterMode_dotsUtf8[] = {
+   /*00*/" ", /*01*/"⢀", /*02*/"⢠", /*03*/"⢰", /*04*/ "⢸",
+   /*10*/"⡀", /*11*/"⣀", /*12*/"⣠", /*13*/"⣰", /*14*/ "⣸",
+   /*20*/"⡄", /*21*/"⣄", /*22*/"⣤", /*23*/"⣴", /*24*/ "⣼",
+   /*30*/"⡆", /*31*/"⣆", /*32*/"⣦", /*33*/"⣶", /*34*/ "⣾",
+   /*40*/"⡇", /*41*/"⣇", /*42*/"⣧", /*43*/"⣷", /*44*/ "⣿"
+};
+
+#endif
+
+#define PIXPERROW_ASCII 2
+static const char* const GraphMeterMode_dotsAscii[] = {
+   /*00*/" ", /*01*/".", /*02*/":",
+   /*10*/".", /*11*/".", /*12*/":",
+   /*20*/":", /*21*/":", /*22*/":"
+};
+
+static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
+   const char* caption = Meter_getCaption(this);
+   attrset(CRT_colors[METER_TEXT]);
+   const int captionLen = 3;
+   mvaddnstr(y, x, caption, captionLen);
+   x += captionLen;
+   w -= captionLen;
+
+   GraphData* data = &this->drawData;
+   assert(data->nValues / 2 <= INT_MAX);
+   if (w > (int)(data->nValues / 2) && MAX_METER_GRAPHDATA_VALUES > data->nValues) {
+      size_t oldNValues = data->nValues;
+      data->nValues = MAXIMUM(oldNValues + oldNValues / 2, (size_t)w * 2);
+      data->nValues = MINIMUM(data->nValues, MAX_METER_GRAPHDATA_VALUES);
+      data->values = xReallocArray(data->values, data->nValues, sizeof(*data->values));
+      memmove(data->values + (data->nValues - oldNValues), data->values, oldNValues * sizeof(*data->values));
+      memset(data->values, 0, (data->nValues - oldNValues) * sizeof(*data->values));
+   }
+
+   const size_t nValues = data->nValues;
+   if (nValues < 1)
+      return;
+
+   const Machine* host = this->host;
+   if (!timercmp(&host->realtime, &(data->time), <)) {
+      int globalDelay = host->settings->delay;
+      struct timeval delay = { .tv_sec = globalDelay / 10, .tv_usec = (globalDelay % 10) * 100000L };
+      timeradd(&host->realtime, &delay, &(data->time));
+
+      memmove(&data->values[0], &data->values[1], (nValues - 1) * sizeof(*data->values));
+
+      data->values[nValues - 1] = sumPositiveValues(this->values, this->curItems);
+   }
+
+   if (w <= 0)
+      return;
+
+   if ((size_t)w > nValues / 2) {
+      x += w - nValues / 2;
+      w = nValues / 2;
+   }
+
+   const char* const* GraphMeterMode_dots;
+   int GraphMeterMode_pixPerRow;
+#ifdef HAVE_LIBNCURSESW
+   if (CRT_utf8) {
+      GraphMeterMode_dots = GraphMeterMode_dotsUtf8;
+      GraphMeterMode_pixPerRow = PIXPERROW_UTF8;
+   } else
+#endif
+   {
+      GraphMeterMode_dots = GraphMeterMode_dotsAscii;
+      GraphMeterMode_pixPerRow = PIXPERROW_ASCII;
+   }
+
+   size_t i = nValues - (size_t)w * 2;
+   for (int col = 0; i < nValues - 1; i += 2, col++) {
+      int pix = GraphMeterMode_pixPerRow * GRAPH_HEIGHT;
+      double total = MAXIMUM(this->total, 1);
+      int v1 = CLAMP((int) lround(data->values[i] / total * pix), 1, pix);
+      int v2 = CLAMP((int) lround(data->values[i + 1] / total * pix), 1, pix);
+
+      int colorIdx = GRAPH_1;
+      for (int line = 0; line < GRAPH_HEIGHT; line++) {
+         int line1 = CLAMP(v1 - (GraphMeterMode_pixPerRow * (GRAPH_HEIGHT - 1 - line)), 0, GraphMeterMode_pixPerRow);
+         int line2 = CLAMP(v2 - (GraphMeterMode_pixPerRow * (GRAPH_HEIGHT - 1 - line)), 0, GraphMeterMode_pixPerRow);
+
+         attrset(CRT_colors[colorIdx]);
+         mvaddstr(y + line, x + col, GraphMeterMode_dots[line1 * (GraphMeterMode_pixPerRow + 1) + line2]);
+         colorIdx = GRAPH_2;
+      }
+   }
+   attrset(CRT_colors[RESET_COLOR]);
+}
+
+/* ---------- LEDMeterMode ---------- */
+
+static const char* const LEDMeterMode_digitsAscii[] = {
+   " __ ", "    ", " __ ", " __ ", "    ", " __ ", " __ ", " __ ", " __ ", " __ ",
+   "|  |", "   |", " __|", " __|", "|__|", "|__ ", "|__ ", "   |", "|__|", "|__|",
+   "|__|", "   |", "|__ ", " __|", "   |", " __|", "|__|", "   |", "|__|", " __|"
+};
+
+#ifdef HAVE_LIBNCURSESW
+
+static const char* const LEDMeterMode_digitsUtf8[] = {
+   "┌──┐", "  ┐ ", "╶──┐", "╶──┐", "╷  ╷", "┌──╴", "┌──╴", "╶──┐", "┌──┐", "┌──┐",
+   "│  │", "  │ ", "┌──┘", " ──┤", "└──┤", "└──┐", "├──┐", "   │", "├──┤", "└──┤",
+   "└──┘", "  ╵ ", "└──╴", "╶──┘", "   ╵", "╶──┘", "└──┘", "   ╵", "└──┘", "╶──┘"
+};
+
+#endif
+
+static const char* const* LEDMeterMode_digits;
+
+static void LEDMeterMode_drawDigit(int x, int y, int n) {
+   for (int i = 0; i < 3; i++)
+      mvaddstr(y + i, x, LEDMeterMode_digits[i * 10 + n]);
+}
+
+static void LEDMeterMode_draw(Meter* this, int x, int y, int w) {
+#ifdef HAVE_LIBNCURSESW
+   if (CRT_utf8)
+      LEDMeterMode_digits = LEDMeterMode_digitsUtf8;
+   else
+#endif
+      LEDMeterMode_digits = LEDMeterMode_digitsAscii;
+
+   RichString_begin(out);
+   Meter_displayBuffer(this, &out);
+
+   int yText =
+#ifdef HAVE_LIBNCURSESW
+      CRT_utf8 ? y + 1 :
+#endif
+      y + 2;
+   attrset(CRT_colors[LED_COLOR]);
+   const char* caption = Meter_getCaption(this);
+   mvaddstr(yText, x, caption);
+   int xx = x + strlen(caption);
+   int len = RichString_sizeVal(out);
+   for (int i = 0; i < len; i++) {
+      int c = RichString_getCharVal(out, i);
+      if (c >= '0' && c <= '9') {
+         if (xx - x + 4 > w)
+            break;
+
+         LEDMeterMode_drawDigit(xx, y, c - '0');
+         xx += 4;
+      } else {
+         if (xx - x + 1 > w)
+            break;
+#ifdef HAVE_LIBNCURSESW
+         const cchar_t wc = { .chars = { c, '\0' }, .attr = 0 }; /* use LED_COLOR from attrset() */
+         mvadd_wch(yText, xx, &wc);
+#else
+         mvaddch(yText, xx, c);
+#endif
+         xx += 1;
+      }
+   }
+   attrset(CRT_colors[RESET_COLOR]);
+   RichString_delete(&out);
+}
+
+static MeterMode BarMeterMode = {
+   .uiName = "Bar",
+   .h = 1,
+   .draw = BarMeterMode_draw,
+};
+
+static MeterMode TextMeterMode = {
+   .uiName = "Text",
+   .h = 1,
+   .draw = TextMeterMode_draw,
+};
+
+static MeterMode GraphMeterMode = {
+   .uiName = "Graph",
+   .h = GRAPH_HEIGHT,
+   .draw = GraphMeterMode_draw,
+};
+
+static MeterMode LEDMeterMode = {
+   .uiName = "LED",
+   .h = 3,
+   .draw = LEDMeterMode_draw,
+};
+
+const MeterMode* const Meter_modes[] = {
+   NULL,
+   &BarMeterMode,
+   &TextMeterMode,
+   &GraphMeterMode,
+   &LEDMeterMode,
+   NULL
+};
+
+/* Blank meter */
+
+static void BlankMeter_updateValues(Meter* this) {
+   this->txtBuffer[0] = '\0';
+}
+
+static void BlankMeter_display(ATTR_UNUSED const Object* cast, ATTR_UNUSED RichString* out) {
+}
+
+static const int BlankMeter_attributes[] = {
+   DEFAULT_COLOR
+};
+
+const MeterClass BlankMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = BlankMeter_display,
+   },
+   .updateValues = BlankMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = BlankMeter_attributes,
+   .name = "Blank",
+   .uiName = "Blank",
+   .caption = ""
+};
diff --git a/Meter.h b/Meter.h
new file mode 100644
index 0000000..17d77f3
--- /dev/null
+++ b/Meter.h
@@ -0,0 +1,163 @@
+#ifndef HEADER_Meter
+#define HEADER_Meter
+/*
+htop - Meter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/time.h>
+
+#include "ListItem.h"
+#include "Machine.h"
+#include "Object.h"
+
+
+#define METER_TXTBUFFER_LEN 256
+#define MAX_METER_GRAPHDATA_VALUES 32768
+
+#define METER_BUFFER_CHECK(buffer, size, written)          \
+   do {                                                    \
+      if ((written) < 0 || (size_t)(written) >= (size)) {  \
+         return;                                           \
+      }                                                    \
+      (buffer) += (written);                               \
+      (size) -= (size_t)(written);                         \
+   } while (0)
+
+#define METER_BUFFER_APPEND_CHR(buffer, size, c)           \
+   do {                                                    \
+      if ((size) < 2) {                                    \
+         return;                                           \
+      }                                                    \
+      *(buffer)++ = c;                                     \
+      *(buffer) = '\0';                                    \
+      (size)--;                                            \
+      if ((size) == 0) {                                   \
+         return;                                           \
+      }                                                    \
+   } while (0)
+
+
+struct Meter_;
+typedef struct Meter_ Meter;
+
+typedef void(*Meter_Init)(Meter*);
+typedef void(*Meter_Done)(Meter*);
+typedef void(*Meter_UpdateMode)(Meter*, int);
+typedef void(*Meter_UpdateValues)(Meter*);
+typedef void(*Meter_Draw)(Meter*, int, int, int);
+typedef const char* (*Meter_GetCaption)(const Meter*);
+typedef void(*Meter_GetUiName)(const Meter*, char*, size_t);
+
+typedef struct MeterClass_ {
+   const ObjectClass super;
+   const Meter_Init init;
+   const Meter_Done done;
+   const Meter_UpdateMode updateMode;
+   const Meter_UpdateValues updateValues;
+   const Meter_Draw draw;
+   const Meter_GetCaption getCaption;
+   const Meter_GetUiName getUiName;
+   const int defaultMode;
+   const double total;
+   const int* const attributes;
+   const char* const name;                 /* internal name of the meter, must not contain any space */
+   const char* const uiName;               /* display name in header setup menu */
+   const char* const caption;              /* prefix in the actual header */
+   const char* const description;          /* optional meter description in header setup menu */
+   const uint8_t maxItems;
+   const bool isMultiColumn;               /* whether the meter draws multiple sub-columns (defaults to false) */
+} MeterClass;
+
+#define As_Meter(this_)                ((const MeterClass*)((this_)->super.klass))
+#define Meter_initFn(this_)            As_Meter(this_)->init
+#define Meter_init(this_)              As_Meter(this_)->init((Meter*)(this_))
+#define Meter_done(this_)              As_Meter(this_)->done((Meter*)(this_))
+#define Meter_updateModeFn(this_)      As_Meter(this_)->updateMode
+#define Meter_updateMode(this_, m_)    As_Meter(this_)->updateMode((Meter*)(this_), m_)
+#define Meter_drawFn(this_)            As_Meter(this_)->draw
+#define Meter_doneFn(this_)            As_Meter(this_)->done
+#define Meter_updateValues(this_)      As_Meter(this_)->updateValues((Meter*)(this_))
+#define Meter_getUiNameFn(this_)       As_Meter(this_)->getUiName
+#define Meter_getUiName(this_,n_,l_)   As_Meter(this_)->getUiName((const Meter*)(this_),n_,l_)
+#define Meter_getCaptionFn(this_)      As_Meter(this_)->getCaption
+#define Meter_getCaption(this_)        (Meter_getCaptionFn(this_) ? As_Meter(this_)->getCaption((const Meter*)(this_)) : (this_)->caption)
+#define Meter_defaultMode(this_)       As_Meter(this_)->defaultMode
+#define Meter_attributes(this_)        As_Meter(this_)->attributes
+#define Meter_name(this_)              As_Meter(this_)->name
+#define Meter_uiName(this_)            As_Meter(this_)->uiName
+#define Meter_isMultiColumn(this_)     As_Meter(this_)->isMultiColumn
+
+typedef struct GraphData_ {
+   struct timeval time;
+   size_t nValues;
+   double* values;
+} GraphData;
+
+struct Meter_ {
+   Object super;
+   Meter_Draw draw;
+   const Machine* host;
+
+   char* caption;
+   int mode;
+   unsigned int param;
+   GraphData drawData;
+   int h;
+   int columnWidthCount;      /**< only used internally by the Header */
+   uint8_t curItems;
+   const int* curAttributes;
+   char txtBuffer[METER_TXTBUFFER_LEN];
+   double* values;
+   double total;
+   void* meterData;
+};
+
+typedef struct MeterMode_ {
+   Meter_Draw draw;
+   const char* uiName;
+   int h;
+} MeterMode;
+
+typedef enum {
+   CUSTOM_METERMODE = 0,
+   BAR_METERMODE,
+   TEXT_METERMODE,
+   GRAPH_METERMODE,
+   LED_METERMODE,
+   LAST_METERMODE
+} MeterModeId;
+
+typedef enum {
+   RATESTATUS_DATA,
+   RATESTATUS_INIT,
+   RATESTATUS_NODATA,
+   RATESTATUS_STALE
+} MeterRateStatus;
+
+extern const MeterClass Meter_class;
+
+Meter* Meter_new(const Machine* host, unsigned int param, const MeterClass* type);
+
+/* Converts 'value' in kibibytes into a human readable string.
+   Example output strings: "0K", "1023K", "98.7M" and "1.23G" */
+int Meter_humanUnit(char* buffer, double value, size_t size);
+
+void Meter_delete(Object* cast);
+
+void Meter_setCaption(Meter* this, const char* caption);
+
+void Meter_setMode(Meter* this, int modeIndex);
+
+ListItem* Meter_toListItem(const Meter* this, bool moving);
+
+extern const MeterMode* const Meter_modes[];
+
+extern const MeterClass BlankMeter_class;
+
+#endif
diff --git a/MetersPanel.c b/MetersPanel.c
new file mode 100644
index 0000000..2678fb2
--- /dev/null
+++ b/MetersPanel.c
@@ -0,0 +1,209 @@
+/*
+htop - MetersPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "MetersPanel.h"
+
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Header.h"
+#include "ListItem.h"
+#include "Meter.h"
+#include "Object.h"
+#include "ProvideCurses.h"
+
+
+// Note: In code the meters are known to have bar/text/graph "Modes", but in UI
+// we call them "Styles".
+static const char* const MetersFunctions[] = {"Style ", "Move  ", "                                         ", "Delete", "Done  ", NULL};
+static const char* const MetersKeys[] = {"Space", "Enter", "", "Del", "F10"};
+static const int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)};
+
+// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
+// terminals, breaking our aligning.
+// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
+// considered "Ambiguous characters".
+static const char* const MetersMovingFunctions[] = {"Style ", "Lock  ", "Up    ", "Down  ", "Left  ", "Right ", "       ", "Delete", "Done  ", NULL};
+static const char* const MetersMovingKeys[] = {"Space", "Enter", "Up", "Dn", "<-", "->", "  ", "Del", "F10"};
+static const int MetersMovingEvents[] = {' ', 13, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, ERR, KEY_DC, KEY_F(10)};
+static FunctionBar* Meters_movingBar = NULL;
+
+void MetersPanel_cleanup(void) {
+   if (Meters_movingBar) {
+      FunctionBar_delete(Meters_movingBar);
+      Meters_movingBar = NULL;
+   }
+}
+
+static void MetersPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   MetersPanel* this = (MetersPanel*) object;
+   Panel_done(super);
+   free(this);
+}
+
+void MetersPanel_setMoving(MetersPanel* this, bool moving) {
+   Panel* super = (Panel*) this;
+   this->moving = moving;
+   ListItem* selected = (ListItem*)Panel_getSelected(super);
+   if (selected) {
+      selected->moving = moving;
+   }
+   if (!moving) {
+      Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+      Panel_setDefaultBar(super);
+   } else {
+      Panel_setSelectionColor(super, PANEL_SELECTION_FOLLOW);
+      super->currentBar = Meters_movingBar;
+   }
+}
+
+static inline bool moveToNeighbor(MetersPanel* this, MetersPanel* neighbor, int selected) {
+   Panel* super = (Panel*) this;
+   if (this->moving) {
+      if (neighbor) {
+         if (selected < Vector_size(this->meters)) {
+            MetersPanel_setMoving(this, false);
+
+            Meter* meter = (Meter*) Vector_take(this->meters, selected);
+            Panel_remove(super, selected);
+            Vector_insert(neighbor->meters, selected, meter);
+            Panel_insert(&(neighbor->super), selected, (Object*) Meter_toListItem(meter, false));
+            Panel_setSelected(&(neighbor->super), selected);
+
+            MetersPanel_setMoving(neighbor, true);
+            return true;
+         }
+      }
+   }
+   return false;
+}
+
+static HandlerResult MetersPanel_eventHandler(Panel* super, int ch) {
+   MetersPanel* this = (MetersPanel*) super;
+
+   int selected = Panel_getSelectedIndex(super);
+   HandlerResult result = IGNORED;
+   bool sideMove = false;
+
+   switch (ch) {
+      case 0x0a:
+      case 0x0d:
+      case KEY_ENTER:
+         if (!Vector_size(this->meters))
+            break;
+         MetersPanel_setMoving(this, !(this->moving));
+         result = HANDLED;
+         break;
+      case ' ':
+      case KEY_F(4):
+      case 't': {
+         if (!Vector_size(this->meters))
+            break;
+         Meter* meter = (Meter*) Vector_get(this->meters, selected);
+         int mode = meter->mode + 1;
+         if (mode == LAST_METERMODE)
+            mode = 1;
+         Meter_setMode(meter, mode);
+         Panel_set(super, selected, (Object*) Meter_toListItem(meter, this->moving));
+         result = HANDLED;
+         break;
+      }
+      case KEY_UP:
+         if (!this->moving)
+            break;
+         /* else fallthrough */
+      case KEY_F(7):
+      case '[':
+      case '-':
+         Vector_moveUp(this->meters, selected);
+         Panel_moveSelectedUp(super);
+         result = HANDLED;
+         break;
+      case KEY_DOWN:
+         if (!this->moving)
+            break;
+         /* else fallthrough */
+      case KEY_F(8):
+      case ']':
+      case '+':
+         Vector_moveDown(this->meters, selected);
+         Panel_moveSelectedDown(super);
+         result = HANDLED;
+         break;
+      case KEY_RIGHT:
+         sideMove = moveToNeighbor(this, this->rightNeighbor, selected);
+         if (this->moving && !sideMove) {
+            // lock user here until it exits positioning-mode
+            result = HANDLED;
+         }
+         // if user is free, don't set HANDLED;
+         // let ScreenManager handle focus.
+         break;
+      case KEY_LEFT:
+         sideMove = moveToNeighbor(this, this->leftNeighbor, selected);
+         if (this->moving && !sideMove) {
+            result = HANDLED;
+         }
+         break;
+      case KEY_F(9):
+      case KEY_DC:
+         if (!Vector_size(this->meters))
+            break;
+         if (selected < Vector_size(this->meters)) {
+            Vector_remove(this->meters, selected);
+            Panel_remove(super, selected);
+         }
+         MetersPanel_setMoving(this, false);
+         result = HANDLED;
+         break;
+   }
+
+   if (result == HANDLED || sideMove) {
+      Header* header = this->scr->header;
+      this->settings->changed = true;
+      this->settings->lastUpdate++;
+      Header_calculateHeight(header);
+      ScreenManager_resize(this->scr);
+   }
+
+   return result;
+}
+
+const PanelClass MetersPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = MetersPanel_delete
+   },
+   .eventHandler = MetersPanel_eventHandler
+};
+
+MetersPanel* MetersPanel_new(Settings* settings, const char* header, Vector* meters, ScreenManager* scr) {
+   MetersPanel* this = AllocThis(MetersPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(MetersFunctions, MetersKeys, MetersEvents);
+   if (!Meters_movingBar) {
+      Meters_movingBar = FunctionBar_new(MetersMovingFunctions, MetersMovingKeys, MetersMovingEvents);
+   }
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->settings = settings;
+   this->meters = meters;
+   this->scr = scr;
+   this->moving = false;
+   this->rightNeighbor = NULL;
+   this->leftNeighbor = NULL;
+   Panel_setHeader(super, header);
+   for (int i = 0; i < Vector_size(meters); i++) {
+      const Meter* meter = (const Meter*) Vector_get(meters, i);
+      Panel_add(super, (Object*) Meter_toListItem(meter, false));
+   }
+   return this;
+}
diff --git a/MetersPanel.h b/MetersPanel.h
new file mode 100644
index 0000000..679c12d
--- /dev/null
+++ b/MetersPanel.h
@@ -0,0 +1,40 @@
+#ifndef HEADER_MetersPanel
+#define HEADER_MetersPanel
+/*
+htop - MetersPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Panel.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+#include "Vector.h"
+
+
+struct MetersPanel_;
+typedef struct MetersPanel_ MetersPanel;
+
+struct MetersPanel_ {
+   Panel super;
+
+   Settings* settings;
+   Vector* meters;
+   ScreenManager* scr;
+   MetersPanel* leftNeighbor;
+   MetersPanel* rightNeighbor;
+   bool moving;
+};
+
+void MetersPanel_cleanup(void);
+
+void MetersPanel_setMoving(MetersPanel* this, bool moving);
+
+extern const PanelClass MetersPanel_class;
+
+MetersPanel* MetersPanel_new(Settings* settings, const char* header, Vector* meters, ScreenManager* scr);
+
+#endif
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..27fd578
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,4 @@
+
+See the commit history for news of the past.
+See the bug tracker for news of the future.
+Run the program for news of the present.
diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c
new file mode 100644
index 0000000..6bc2d08
--- /dev/null
+++ b/NetworkIOMeter.c
@@ -0,0 +1,178 @@
+/*
+htop - NetworkIOMeter.c
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "NetworkIOMeter.h"
+
+#include <stdbool.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "Row.h"
+#include "XUtils.h"
+
+
+static const int NetworkIOMeter_attributes[] = {
+   METER_VALUE_IOREAD,
+   METER_VALUE_IOWRITE,
+};
+
+static MeterRateStatus status = RATESTATUS_INIT;
+static double cached_rxb_diff;
+static char cached_rxb_diff_str[6];
+static uint32_t cached_rxp_diff;
+static double cached_txb_diff;
+static char cached_txb_diff_str[6];
+static uint32_t cached_txp_diff;
+
+static void NetworkIOMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+
+   static uint64_t cached_last_update = 0;
+   uint64_t passedTimeInMs = host->realtimeMs - cached_last_update;
+   bool hasNewData = false;
+   NetworkIOData data;
+
+   /* update only every 500ms to have a sane span for rate calculation */
+   if (passedTimeInMs > 500) {
+      hasNewData = Platform_getNetworkIO(&data);
+      if (!hasNewData) {
+         status = RATESTATUS_NODATA;
+      } else if (cached_last_update == 0) {
+         status = RATESTATUS_INIT;
+      } else if (passedTimeInMs > 30000) {
+         status = RATESTATUS_STALE;
+      } else {
+         status = RATESTATUS_DATA;
+      }
+
+      cached_last_update = host->realtimeMs;
+   }
+
+   if (hasNewData) {
+      static uint64_t cached_rxb_total;
+      static uint64_t cached_rxp_total;
+      static uint64_t cached_txb_total;
+      static uint64_t cached_txp_total;
+
+      if (status != RATESTATUS_INIT) {
+         uint64_t diff;
+
+         if (data.bytesReceived > cached_rxb_total) {
+            diff = data.bytesReceived - cached_rxb_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to B/s */
+            cached_rxb_diff = diff;
+         } else {
+            cached_rxb_diff = 0;
+         }
+         Meter_humanUnit(cached_rxb_diff_str, cached_rxb_diff / ONE_K, sizeof(cached_rxb_diff_str));
+
+         if (data.packetsReceived > cached_rxp_total) {
+            diff = data.packetsReceived - cached_rxp_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to pkts/s */
+            cached_rxp_diff = (uint32_t)diff;
+         } else {
+            cached_rxp_diff = 0;
+         }
+
+         if (data.bytesTransmitted > cached_txb_total) {
+            diff = data.bytesTransmitted - cached_txb_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to B/s */
+            cached_txb_diff = diff;
+         } else {
+            cached_txb_diff = 0;
+         }
+         Meter_humanUnit(cached_txb_diff_str, cached_txb_diff / ONE_K, sizeof(cached_txb_diff_str));
+
+         if (data.packetsTransmitted > cached_txp_total) {
+            diff = data.packetsTransmitted - cached_txp_total;
+            diff = (1000 * diff) / passedTimeInMs; /* convert to pkts/s */
+            cached_txp_diff = (uint32_t)diff;
+         } else {
+            cached_txp_diff = 0;
+         }
+      }
+
+      cached_rxb_total = data.bytesReceived;
+      cached_rxp_total = data.packetsReceived;
+      cached_txb_total = data.bytesTransmitted;
+      cached_txp_total = data.packetsTransmitted;
+   }
+
+   this->values[0] = cached_rxb_diff;
+   this->values[1] = cached_txb_diff;
+   if (cached_rxb_diff + cached_txb_diff > this->total) {
+      this->total = cached_rxb_diff + cached_txb_diff;
+   }
+
+   if (status == RATESTATUS_NODATA) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "no data");
+      return;
+   }
+   if (status == RATESTATUS_INIT) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "init");
+      return;
+   }
+   if (status == RATESTATUS_STALE) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "stale");
+      return;
+   }
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "rx:%siB/s tx:%siB/s %u/%upkts/s",
+      cached_rxb_diff_str, cached_txb_diff_str, cached_rxp_diff, cached_txp_diff);
+}
+
+static void NetworkIOMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   switch (status) {
+      case RATESTATUS_NODATA:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_ERROR], "no data");
+         return;
+      case RATESTATUS_INIT:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE], "initializing...");
+         return;
+      case RATESTATUS_STALE:
+         RichString_writeAscii(out, CRT_colors[METER_VALUE_WARN], "stale data");
+         return;
+      case RATESTATUS_DATA:
+         break;
+   }
+
+   char buffer[64];
+
+   RichString_writeAscii(out, CRT_colors[METER_TEXT], "rx: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], cached_rxb_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOREAD], "iB/s");
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " tx: ");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], cached_txb_diff_str);
+   RichString_appendAscii(out, CRT_colors[METER_VALUE_IOWRITE], "iB/s");
+
+   int len = xSnprintf(buffer, sizeof(buffer), " (%u/%u pkts/s) ", cached_rxp_diff, cached_txp_diff);
+   RichString_appendnAscii(out, CRT_colors[METER_TEXT], buffer, len);
+}
+
+const MeterClass NetworkIOMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = NetworkIOMeter_display
+   },
+   .updateValues = NetworkIOMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 2,
+   .total = 100.0,
+   .attributes = NetworkIOMeter_attributes,
+   .name = "NetworkIO",
+   .uiName = "Network IO",
+   .caption = "Network: "
+};
diff --git a/NetworkIOMeter.h b/NetworkIOMeter.h
new file mode 100644
index 0000000..355b815
--- /dev/null
+++ b/NetworkIOMeter.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_NetworkIOMeter
+#define HEADER_NetworkIOMeter
+/*
+htop - NetworkIOMeter.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdint.h>
+
+#include "Meter.h"
+
+
+typedef struct NetworkIOData_ {
+   uint64_t bytesReceived;
+   uint64_t packetsReceived;
+   uint64_t bytesTransmitted;
+   uint64_t packetsTransmitted;
+} NetworkIOData;
+
+extern const MeterClass NetworkIOMeter_class;
+
+#endif /* HEADER_NetworkIOMeter */
diff --git a/Object.c b/Object.c
new file mode 100644
index 0000000..ae4d33f
--- /dev/null
+++ b/Object.c
@@ -0,0 +1,31 @@
+/*
+htop - Object.c
+(C) 2004-2012 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Object.h"
+
+#include <stddef.h>
+
+
+const ObjectClass Object_class = {
+   .extends = NULL
+};
+
+bool Object_isA(const Object* o, const ObjectClass* klass) {
+   if (!o)
+      return false;
+
+   for (const ObjectClass* type = o->klass; type; type = type->extends) {
+      if (type == klass) {
+         return true;
+      }
+   }
+
+   return false;
+}
diff --git a/Object.h b/Object.h
new file mode 100644
index 0000000..4d7d653
--- /dev/null
+++ b/Object.h
@@ -0,0 +1,57 @@
+#ifndef HEADER_Object
+#define HEADER_Object
+/*
+htop - Object.h
+(C) 2004-2012 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <assert.h>
+#include <stdbool.h>
+
+#include "RichString.h"
+#include "XUtils.h" // IWYU pragma: keep
+
+
+struct Object_;
+typedef struct Object_ Object;
+
+typedef void(*Object_Display)(const Object*, RichString*);
+typedef int(*Object_Compare)(const void*, const void*);
+typedef void(*Object_Delete)(Object*);
+
+#define Object_getClass(obj_)         ((const Object*)(obj_))->klass
+#define Object_setClass(obj_, class_) (((Object*)(obj_))->klass = (const ObjectClass*) (class_))
+
+#define Object_delete(obj_)           (assert(Object_getClass(obj_)->delete), Object_getClass(obj_)->delete((Object*)(obj_)))
+#define Object_displayFn(obj_)        Object_getClass(obj_)->display
+#define Object_display(obj_, str_)    (assert(Object_getClass(obj_)->display), Object_getClass(obj_)->display((const Object*)(obj_), str_))
+#define Object_compare(obj_, other_)  (assert(Object_getClass(obj_)->compare), Object_getClass(obj_)->compare((const void*)(obj_), other_))
+
+#define Class(class_)                 ((const ObjectClass*)(&(class_ ## _class)))
+
+#define AllocThis(class_) (class_*)   xMalloc(sizeof(class_)); Object_setClass(this, Class(class_))
+
+typedef struct ObjectClass_ {
+   const void* const extends;
+   const Object_Display display;
+   const Object_Delete delete;
+   const Object_Compare compare;
+} ObjectClass;
+
+struct Object_ {
+   const ObjectClass* klass;
+};
+
+typedef union {
+   int i;
+   void* v;
+} Arg;
+
+extern const ObjectClass Object_class;
+
+bool Object_isA(const Object* o, const ObjectClass* klass);
+
+#endif
diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c
new file mode 100644
index 0000000..d6d663c
--- /dev/null
+++ b/OpenFilesScreen.c
@@ -0,0 +1,315 @@
+/*
+htop - OpenFilesScreen.c
+(C) 2005-2006 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "OpenFilesScreen.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+
+#include "Macros.h"
+#include "Panel.h"
+#include "ProvideCurses.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+
+// cf. getIndexForType; must be larger than the maximum value returned.
+#define LSOF_DATACOL_COUNT 8
+
+typedef struct OpenFiles_Data_ {
+   char* data[LSOF_DATACOL_COUNT];
+} OpenFiles_Data;
+
+typedef struct OpenFiles_ProcessData_ {
+   OpenFiles_Data data;
+   int error;
+   int cols[LSOF_DATACOL_COUNT];
+   struct OpenFiles_FileData_* files;
+} OpenFiles_ProcessData;
+
+typedef struct OpenFiles_FileData_ {
+   OpenFiles_Data data;
+   struct OpenFiles_FileData_* next;
+} OpenFiles_FileData;
+
+static size_t getIndexForType(char type) {
+   switch (type) {
+      case 'f':
+         return 0;
+      case 'a':
+         return 1;
+      case 'D':
+         return 2;
+      case 'i':
+         return 3;
+      case 'n':
+         return 4;
+      case 's':
+         return 5;
+      case 't':
+         return 6;
+      case 'o':
+         return 7;
+   }
+
+   /* should never reach here */
+   abort();
+}
+
+static const char* getDataForType(const OpenFiles_Data* data, char type) {
+   size_t index = getIndexForType(type);
+   return data->data[index] ? data->data[index] : "";
+}
+
+OpenFilesScreen* OpenFilesScreen_new(const Process* process) {
+   OpenFilesScreen* this = xCalloc(1, sizeof(OpenFilesScreen));
+   Object_setClass(this, Class(OpenFilesScreen));
+   if (Process_isThread(process)) {
+      this->pid = Process_getThreadGroup(process);
+   } else {
+      this->pid = Process_getPid(process);
+   }
+   return (OpenFilesScreen*) InfoScreen_init(&this->super, process, NULL, LINES - 2, "   FD TYPE    MODE DEVICE           SIZE     OFFSET       NODE  NAME");
+}
+
+void OpenFilesScreen_delete(Object* this) {
+   free(InfoScreen_done((InfoScreen*)this));
+}
+
+static void OpenFilesScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Snapshot of files open in process %d - %s", ((OpenFilesScreen*)this)->pid, Process_getCommand(this->process));
+}
+
+static OpenFiles_ProcessData* OpenFilesScreen_getProcessData(pid_t pid) {
+   OpenFiles_ProcessData* pdata = xCalloc(1, sizeof(OpenFiles_ProcessData));
+   pdata->cols[getIndexForType('s')] = 8;
+   pdata->cols[getIndexForType('o')] = 8;
+   pdata->cols[getIndexForType('i')] = 8;
+
+   int fdpair[2] = {0, 0};
+   if (pipe(fdpair) == -1) {
+      pdata->error = 1;
+      return pdata;
+   }
+
+   pid_t child = fork();
+   if (child == -1) {
+      close(fdpair[1]);
+      close(fdpair[0]);
+      pdata->error = 1;
+      return pdata;
+   }
+
+   if (child == 0) {
+      close(fdpair[0]);
+      dup2(fdpair[1], STDOUT_FILENO);
+      close(fdpair[1]);
+      int fdnull = open("/dev/null", O_WRONLY);
+      if (fdnull < 0) {
+         exit(1);
+      }
+
+      dup2(fdnull, STDERR_FILENO);
+      close(fdnull);
+      char buffer[32] = {0};
+      xSnprintf(buffer, sizeof(buffer), "%d", pid);
+      // Use of NULL in variadic functions must have a pointer cast.
+      // The NULL constant is not required by standard to have a pointer type.
+      execlp("lsof", "lsof", "-P", "-o", "-p", buffer, "-F", (char*)NULL);
+      exit(127);
+   }
+   close(fdpair[1]);
+
+   OpenFiles_Data* item = &(pdata->data);
+   OpenFiles_FileData* fdata = NULL;
+   bool lsofIncludesFileSize = false;
+
+   FILE* fd = fdopen(fdpair[0], "r");
+   if (!fd) {
+      pdata->error = 1;
+      return pdata;
+   }
+   for (;;) {
+      char* line = String_readLine(fd);
+      if (!line) {
+         break;
+      }
+
+      unsigned char cmd = line[0];
+      switch (cmd) {
+         case 'f':  /* file descriptor */
+         {
+            OpenFiles_FileData* nextFile = xCalloc(1, sizeof(OpenFiles_FileData));
+            if (fdata == NULL) {
+               pdata->files = nextFile;
+            } else {
+               fdata->next = nextFile;
+            }
+            fdata = nextFile;
+            item = &(fdata->data);
+         } /* FALLTHRU */
+         case 'a':  /* file access mode */
+         case 'D':  /* file's major/minor device number */
+         case 'i':  /* file's inode number */
+         case 'n':  /* file name, comment, Internet address */
+         case 's':  /* file's size */
+         case 't':  /* file's type */
+         {
+            size_t index = getIndexForType(cmd);
+            free_and_xStrdup(&item->data[index], line + 1);
+            size_t dlen = strlen(item->data[index]);
+            if (dlen > (size_t)pdata->cols[index]) {
+               pdata->cols[index] = (int)CLAMP(dlen, 0, INT16_MAX);
+            }
+            break;
+         }
+         case 'o':  /* file's offset */
+         {
+            size_t index = getIndexForType(cmd);
+            if (String_startsWith(line + 1, "0t")) {
+               free_and_xStrdup(&item->data[index], line + 3);
+            } else {
+               free_and_xStrdup(&item->data[index], line + 1);
+            }
+            size_t dlen = strlen(item->data[index]);
+            if (dlen > (size_t)pdata->cols[index]) {
+               pdata->cols[index] = (int)CLAMP(dlen, 0, INT16_MAX);
+            }
+            break;
+         }
+         case 'c':  /* process command name  */
+         case 'd':  /* file's device character code */
+         case 'g':  /* process group ID */
+         case 'G':  /* file flags */
+         case 'k':  /* link count */
+         case 'l':  /* file's lock status */
+         case 'L':  /* process login name */
+         case 'p':  /* process ID */
+         case 'P':  /* protocol name */
+         case 'R':  /* parent process ID */
+         case 'T':  /* TCP/TPI information, identified by prefixes */
+         case 'u':  /* process user ID */
+            /* ignore */
+            break;
+      }
+
+      if (cmd == 's')
+         lsofIncludesFileSize = true;
+
+      free(line);
+   }
+   fclose(fd);
+
+   int wstatus;
+   while (waitpid(child, &wstatus, 0) == -1)
+      if (errno != EINTR) {
+         pdata->error = 1;
+         return pdata;
+      }
+
+   if (!WIFEXITED(wstatus)) {
+      pdata->error = 1;
+   } else {
+      pdata->error = WEXITSTATUS(wstatus);
+   }
+
+   /* We got all information we need; no post-processing needed */
+   if (lsofIncludesFileSize)
+      return pdata;
+
+   /* On linux, `lsof -o -F` omits SIZE, so add it back. */
+   /* On macOS, `lsof -o -F` includes SIZE, so this block isn't needed.  If no open files have a filesize, this will still run, unfortunately. */
+   size_t fileSizeIndex = getIndexForType('s');
+   for (fdata = pdata->files; fdata != NULL; fdata = fdata->next) {
+      item = &fdata->data;
+      const char* filename = getDataForType(item, 'n');
+
+      struct stat st;
+      if (stat(filename, &st) == 0) {
+         char fileSizeBuf[21]; /* 20 (long long) + 1 (NULL) */
+         xSnprintf(fileSizeBuf, sizeof(fileSizeBuf), "%"PRIu64, (uint64_t)st.st_size); /* st.st_size is long long on macOS, long on linux */
+         free_and_xStrdup(&item->data[fileSizeIndex], fileSizeBuf);
+      }
+   }
+
+   return pdata;
+}
+
+static void OpenFiles_Data_clear(OpenFiles_Data* data) {
+   for (size_t i = 0; i < ARRAYSIZE(data->data); i++)
+      free(data->data[i]);
+}
+
+static void OpenFilesScreen_scan(InfoScreen* super) {
+   Panel* panel = super->display;
+   int idx = Panel_getSelectedIndex(panel);
+   Panel_prune(panel);
+   OpenFiles_ProcessData* pdata = OpenFilesScreen_getProcessData(((OpenFilesScreen*)super)->pid);
+   if (pdata->error == 127) {
+      InfoScreen_addLine(super, "Could not execute 'lsof'. Please make sure it is available in your $PATH.");
+   } else if (pdata->error == 1) {
+      InfoScreen_addLine(super, "Failed listing open files.");
+   } else {
+      char hdrbuf[128] = {0};
+      snprintf(hdrbuf, sizeof(hdrbuf), "%5.5s %-7.7s %-4.4s %6.6s %*s %*s %*s  %s",
+         "FD", "TYPE", "MODE", "DEVICE",
+         pdata->cols[getIndexForType('s')], "SIZE",
+         pdata->cols[getIndexForType('o')], "OFFSET",
+         pdata->cols[getIndexForType('i')], "NODE",
+         "NAME"
+      );
+      Panel_setHeader(panel, hdrbuf);
+
+      OpenFiles_FileData* fdata = pdata->files;
+      while (fdata) {
+         OpenFiles_Data* data = &fdata->data;
+         char* entry = NULL;
+         xAsprintf(&entry, "%5.5s %-7.7s %-4.4s %6.6s %*s %*s %*s  %s",
+                   getDataForType(data, 'f'),
+                   getDataForType(data, 't'),
+                   getDataForType(data, 'a'),
+                   getDataForType(data, 'D'),
+                   pdata->cols[getIndexForType('s')],
+                   getDataForType(data, 's'),
+                   pdata->cols[getIndexForType('o')],
+                   getDataForType(data, 'o'),
+                   pdata->cols[getIndexForType('i')],
+                   getDataForType(data, 'i'),
+                   getDataForType(data, 'n'));
+         InfoScreen_addLine(super, entry);
+         free(entry);
+         OpenFiles_Data_clear(data);
+         OpenFiles_FileData* old = fdata;
+         fdata = fdata->next;
+         free(old);
+      }
+      OpenFiles_Data_clear(&pdata->data);
+   }
+   free(pdata);
+   Vector_insertionSort(super->lines);
+   Vector_insertionSort(panel->items);
+   Panel_setSelected(panel, idx);
+}
+
+const InfoScreenClass OpenFilesScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = OpenFilesScreen_delete
+   },
+   .scan = OpenFilesScreen_scan,
+   .draw = OpenFilesScreen_draw
+};
diff --git a/OpenFilesScreen.h b/OpenFilesScreen.h
new file mode 100644
index 0000000..43f95ea
--- /dev/null
+++ b/OpenFilesScreen.h
@@ -0,0 +1,28 @@
+#ifndef HEADER_OpenFilesScreen
+#define HEADER_OpenFilesScreen
+/*
+htop - OpenFilesScreen.h
+(C) 2005-2006 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <sys/types.h>
+
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct OpenFilesScreen_ {
+   InfoScreen super;
+   pid_t pid;
+} OpenFilesScreen;
+
+extern const InfoScreenClass OpenFilesScreen_class;
+
+OpenFilesScreen* OpenFilesScreen_new(const Process* process);
+
+void OpenFilesScreen_delete(Object* this);
+
+#endif
diff --git a/OptionItem.c b/OptionItem.c
new file mode 100644
index 0000000..728113b
--- /dev/null
+++ b/OptionItem.c
@@ -0,0 +1,217 @@
+/*
+htop - OptionItem.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "OptionItem.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+static void OptionItem_delete(Object* cast) {
+   OptionItem* this = (OptionItem*)cast;
+   assert (this != NULL);
+
+   free(this->text);
+   free(this);
+}
+
+static void TextItem_display(const Object* cast, RichString* out) {
+   const TextItem* this = (const TextItem*)cast;
+   assert (this != NULL);
+
+   RichString_appendWide(out, CRT_colors[HELP_BOLD], this->super.text);
+}
+
+static void CheckItem_display(const Object* cast, RichString* out) {
+   const CheckItem* this = (const CheckItem*)cast;
+   assert (this != NULL);
+
+   RichString_writeAscii(out, CRT_colors[CHECK_BOX], "[");
+   if (CheckItem_get(this)) {
+      RichString_appendAscii(out, CRT_colors[CHECK_MARK], "x");
+   } else {
+      RichString_appendAscii(out, CRT_colors[CHECK_MARK], " ");
+   }
+   RichString_appendAscii(out, CRT_colors[CHECK_BOX], "]    ");
+   RichString_appendWide(out, CRT_colors[CHECK_TEXT], this->super.text);
+}
+
+static void NumberItem_display(const Object* cast, RichString* out) {
+   const NumberItem* this = (const NumberItem*)cast;
+   assert (this != NULL);
+
+   char buffer[12];
+   RichString_writeAscii(out, CRT_colors[CHECK_BOX], "[");
+   int written;
+   if (this->scale < 0) {
+      written = xSnprintf(buffer, sizeof(buffer), "%.*f", -this->scale, pow(10, this->scale) * NumberItem_get(this));
+   } else if (this->scale > 0) {
+      written = xSnprintf(buffer, sizeof(buffer), "%d", (int) (pow(10, this->scale) * NumberItem_get(this)));
+   } else {
+      written = xSnprintf(buffer, sizeof(buffer), "%d", NumberItem_get(this));
+   }
+   RichString_appendnAscii(out, CRT_colors[CHECK_MARK], buffer, written);
+   RichString_appendAscii(out, CRT_colors[CHECK_BOX], "]");
+   for (int i = written; i < 5; i++) {
+      RichString_appendAscii(out, CRT_colors[CHECK_BOX], " ");
+   }
+   RichString_appendWide(out, CRT_colors[CHECK_TEXT], this->super.text);
+}
+
+const OptionItemClass OptionItem_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = OptionItem_delete
+   }
+};
+
+const OptionItemClass TextItem_class = {
+   .super = {
+      .extends = Class(OptionItem),
+      .delete = OptionItem_delete,
+      .display = TextItem_display
+   },
+   .kind = OPTION_ITEM_TEXT
+};
+
+
+const OptionItemClass CheckItem_class = {
+   .super = {
+      .extends = Class(OptionItem),
+      .delete = OptionItem_delete,
+      .display = CheckItem_display
+   },
+   .kind = OPTION_ITEM_CHECK
+};
+
+
+const OptionItemClass NumberItem_class = {
+   .super = {
+      .extends = Class(OptionItem),
+      .delete = OptionItem_delete,
+      .display = NumberItem_display
+   },
+   .kind = OPTION_ITEM_NUMBER
+};
+
+TextItem* TextItem_new(const char* text) {
+   TextItem* this = AllocThis(TextItem);
+   this->super.text = xStrdup(text);
+   return this;
+}
+
+CheckItem* CheckItem_newByRef(const char* text, bool* ref) {
+   CheckItem* this = AllocThis(CheckItem);
+   this->super.text = xStrdup(text);
+   this->value = false;
+   this->ref = ref;
+   return this;
+}
+
+CheckItem* CheckItem_newByVal(const char* text, bool value) {
+   CheckItem* this = AllocThis(CheckItem);
+   this->super.text = xStrdup(text);
+   this->value = value;
+   this->ref = NULL;
+   return this;
+}
+
+bool CheckItem_get(const CheckItem* this) {
+   if (this->ref) {
+      return *(this->ref);
+   } else {
+      return this->value;
+   }
+}
+
+void CheckItem_set(CheckItem* this, bool value) {
+   if (this->ref) {
+      *(this->ref) = value;
+   } else {
+      this->value = value;
+   }
+}
+
+void CheckItem_toggle(CheckItem* this) {
+   if (this->ref) {
+      *(this->ref) = !*(this->ref);
+   } else {
+      this->value = !this->value;
+   }
+}
+
+NumberItem* NumberItem_newByRef(const char* text, int* ref, int scale, int min, int max) {
+   assert(min <= max);
+
+   NumberItem* this = AllocThis(NumberItem);
+   this->super.text = xStrdup(text);
+   this->value = 0;
+   this->ref = ref;
+   this->scale = scale;
+   this->min = min;
+   this->max = max;
+   return this;
+}
+
+NumberItem* NumberItem_newByVal(const char* text, int value, int scale, int min, int max) {
+   assert(min <= max);
+
+   NumberItem* this = AllocThis(NumberItem);
+   this->super.text = xStrdup(text);
+   this->value = CLAMP(value, min, max);
+   this->ref = NULL;
+   this->scale = scale;
+   this->min = min;
+   this->max = max;
+   return this;
+}
+
+int NumberItem_get(const NumberItem* this) {
+   if (this->ref) {
+      return *(this->ref);
+   } else {
+      return this->value;
+   }
+}
+
+void NumberItem_decrease(NumberItem* this) {
+   if (this->ref) {
+      *(this->ref) = CLAMP(*(this->ref) - 1, this->min, this->max);
+   } else {
+      this->value = CLAMP(this->value - 1, this->min, this->max);
+   }
+}
+
+void NumberItem_increase(NumberItem* this) {
+   if (this->ref) {
+      *(this->ref) = CLAMP(*(this->ref) + 1, this->min, this->max);
+   } else {
+      this->value = CLAMP(this->value + 1, this->min, this->max);
+   }
+}
+
+void NumberItem_toggle(NumberItem* this) {
+   if (this->ref) {
+      if (*(this->ref) >= this->max)
+         *(this->ref) = this->min;
+      else
+         *(this->ref) += 1;
+   } else {
+      if (this->value >= this->max)
+         this->value = this->min;
+      else
+         this->value += 1;
+   }
+}
diff --git a/OptionItem.h b/OptionItem.h
new file mode 100644
index 0000000..ba28775
--- /dev/null
+++ b/OptionItem.h
@@ -0,0 +1,80 @@
+#ifndef HEADER_OptionItem
+#define HEADER_OptionItem
+/*
+htop - OptionItem.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Object.h"
+
+
+enum OptionItemType {
+   OPTION_ITEM_TEXT,
+   OPTION_ITEM_CHECK,
+   OPTION_ITEM_NUMBER,
+};
+
+typedef struct OptionItemClass_ {
+   const ObjectClass super;
+
+   enum OptionItemType kind;
+} OptionItemClass;
+
+#define As_OptionItem(this_)                ((const OptionItemClass*)((this_)->super.klass))
+#define OptionItem_kind(this_)              As_OptionItem(this_)->kind
+
+typedef struct OptionItem_ {
+   Object super;
+
+   char* text;
+} OptionItem;
+
+typedef struct TextItem_ {
+   OptionItem super;
+
+   char* text;
+} TextItem;
+
+typedef struct CheckItem_ {
+   OptionItem super;
+
+   bool* ref;
+   bool value;
+} CheckItem;
+
+typedef struct NumberItem_ {
+   OptionItem super;
+
+   char* text;
+   int* ref;
+   int value;
+   int scale;
+   int min;
+   int max;
+} NumberItem;
+
+extern const OptionItemClass OptionItem_class;
+extern const OptionItemClass TextItem_class;
+extern const OptionItemClass CheckItem_class;
+extern const OptionItemClass NumberItem_class;
+
+TextItem* TextItem_new(const char* text);
+
+CheckItem* CheckItem_newByRef(const char* text, bool* ref);
+CheckItem* CheckItem_newByVal(const char* text, bool value);
+bool CheckItem_get(const CheckItem* this);
+void CheckItem_set(CheckItem* this, bool value);
+void CheckItem_toggle(CheckItem* this);
+
+NumberItem* NumberItem_newByRef(const char* text, int* ref, int scale, int min, int max);
+NumberItem* NumberItem_newByVal(const char* text, int value, int scale, int min, int max);
+int NumberItem_get(const NumberItem* this);
+void NumberItem_decrease(NumberItem* this);
+void NumberItem_increase(NumberItem* this);
+void NumberItem_toggle(NumberItem* this);
+
+#endif
diff --git a/Panel.c b/Panel.c
new file mode 100644
index 0000000..4784a65
--- /dev/null
+++ b/Panel.c
@@ -0,0 +1,515 @@
+/*
+htop - Panel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Panel.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include "CRT.h"
+#include "ListItem.h"
+#include "Macros.h"
+#include "ProvideCurses.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+const PanelClass Panel_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = Panel_delete
+   },
+   .eventHandler = Panel_selectByTyping,
+};
+
+Panel* Panel_new(int x, int y, int w, int h, const ObjectClass* type, bool owner, FunctionBar* fuBar) {
+   Panel* this;
+   this = xMalloc(sizeof(Panel));
+   Object_setClass(this, Class(Panel));
+   Panel_init(this, x, y, w, h, type, owner, fuBar);
+   return this;
+}
+
+void Panel_delete(Object* cast) {
+   Panel* this = (Panel*)cast;
+   Panel_done(this);
+   free(this);
+}
+
+void Panel_init(Panel* this, int x, int y, int w, int h, const ObjectClass* type, bool owner, FunctionBar* fuBar) {
+   this->x = x;
+   this->y = y;
+   this->w = w;
+   this->h = h;
+   this->cursorX = 0;
+   this->cursorY = 0;
+   this->eventHandlerState = NULL;
+   this->items = Vector_new(type, owner, DEFAULT_SIZE);
+   this->scrollV = 0;
+   this->scrollH = 0;
+   this->selected = 0;
+   this->oldSelected = 0;
+   this->selectedLen = 0;
+   this->needsRedraw = true;
+   this->cursorOn = false;
+   this->wasFocus = false;
+   RichString_beginAllocated(this->header);
+   this->defaultBar = fuBar;
+   this->currentBar = fuBar;
+   this->selectionColorId = PANEL_SELECTION_FOCUS;
+}
+
+void Panel_done(Panel* this) {
+   assert (this != NULL);
+   free(this->eventHandlerState);
+   Vector_delete(this->items);
+   FunctionBar_delete(this->defaultBar);
+   RichString_delete(&this->header);
+}
+
+void Panel_setCursorToSelection(Panel* this) {
+   this->cursorY = this->y + this->selected - this->scrollV + 1;
+   this->cursorX = this->x + this->selectedLen - this->scrollH;
+}
+
+void Panel_setSelectionColor(Panel* this, ColorElements colorId) {
+   this->selectionColorId = colorId;
+}
+
+inline void Panel_setHeader(Panel* this, const char* header) {
+   RichString_writeWide(&(this->header), CRT_colors[PANEL_HEADER_FOCUS], header);
+   this->needsRedraw = true;
+}
+
+void Panel_move(Panel* this, int x, int y) {
+   assert (this != NULL);
+
+   this->x = x;
+   this->y = y;
+   this->needsRedraw = true;
+}
+
+void Panel_resize(Panel* this, int w, int h) {
+   assert (this != NULL);
+
+   this->w = w;
+   this->h = h;
+   this->needsRedraw = true;
+}
+
+void Panel_prune(Panel* this) {
+   assert (this != NULL);
+
+   Vector_prune(this->items);
+   this->scrollV = 0;
+   this->selected = 0;
+   this->oldSelected = 0;
+   this->needsRedraw = true;
+}
+
+void Panel_add(Panel* this, Object* o) {
+   assert (this != NULL);
+
+   Vector_add(this->items, o);
+   this->needsRedraw = true;
+}
+
+void Panel_insert(Panel* this, int i, Object* o) {
+   assert (this != NULL);
+
+   Vector_insert(this->items, i, o);
+   this->needsRedraw = true;
+}
+
+void Panel_set(Panel* this, int i, Object* o) {
+   assert (this != NULL);
+
+   Vector_set(this->items, i, o);
+}
+
+Object* Panel_get(Panel* this, int i) {
+   assert (this != NULL);
+
+   return Vector_get(this->items, i);
+}
+
+Object* Panel_remove(Panel* this, int i) {
+   assert (this != NULL);
+
+   this->needsRedraw = true;
+   Object* removed = Vector_remove(this->items, i);
+   if (this->selected > 0 && this->selected >= Vector_size(this->items)) {
+      this->selected--;
+   }
+
+   return removed;
+}
+
+Object* Panel_getSelected(Panel* this) {
+   assert (this != NULL);
+   if (Vector_size(this->items) > 0) {
+      return Vector_get(this->items, this->selected);
+   } else {
+      return NULL;
+   }
+}
+
+void Panel_moveSelectedUp(Panel* this) {
+   assert (this != NULL);
+
+   Vector_moveUp(this->items, this->selected);
+   if (this->selected > 0) {
+      this->selected--;
+   }
+}
+
+void Panel_moveSelectedDown(Panel* this) {
+   assert (this != NULL);
+
+   Vector_moveDown(this->items, this->selected);
+   if (this->selected + 1 < Vector_size(this->items)) {
+      this->selected++;
+   }
+}
+
+int Panel_getSelectedIndex(const Panel* this) {
+   assert (this != NULL);
+
+   return this->selected;
+}
+
+int Panel_size(const Panel* this) {
+   assert (this != NULL);
+
+   return Vector_size(this->items);
+}
+
+void Panel_setSelected(Panel* this, int selected) {
+   assert (this != NULL);
+
+   int size = Vector_size(this->items);
+   if (selected >= size) {
+      selected = size - 1;
+   }
+   if (selected < 0) {
+      selected = 0;
+   }
+   this->selected = selected;
+   if (Panel_eventHandlerFn(this)) {
+      Panel_eventHandler(this, EVENT_SET_SELECTED);
+   }
+}
+
+void Panel_splice(Panel* this, Vector* from) {
+   assert (this != NULL);
+   assert (from != NULL);
+
+   Vector_splice(this->items, from);
+   this->needsRedraw = true;
+}
+
+void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelected, bool hideFunctionBar) {
+   assert (this != NULL);
+
+   int size = Vector_size(this->items);
+   int scrollH = this->scrollH;
+   int y = this->y;
+   int x = this->x;
+   int h = this->h;
+
+   if (hideFunctionBar)
+      h++;
+
+   const int header_attr = focus
+                         ? CRT_colors[PANEL_HEADER_FOCUS]
+                         : CRT_colors[PANEL_HEADER_UNFOCUS];
+   if (force_redraw) {
+      if (Panel_printHeaderFn(this))
+         Panel_printHeader(this);
+      else
+         RichString_setAttr(&this->header, header_attr);
+   }
+   int headerLen = RichString_sizeVal(this->header);
+   if (headerLen > 0) {
+      attrset(header_attr);
+      mvhline(y, x, ' ', this->w);
+      if (scrollH < headerLen) {
+         RichString_printoffnVal(this->header, y, x, scrollH,
+            MINIMUM(headerLen - scrollH, this->w));
+      }
+      attrset(CRT_colors[RESET_COLOR]);
+      y++;
+      h--;
+   }
+
+   // ensure scroll area is on screen
+   if (this->scrollV < 0) {
+      this->scrollV = 0;
+      this->needsRedraw = true;
+   } else if (this->scrollV > size - h) {
+      this->scrollV = MAXIMUM(size - h, 0);
+      this->needsRedraw = true;
+   }
+   // ensure selection is on screen
+   if (this->selected < this->scrollV) {
+      this->scrollV = this->selected;
+      this->needsRedraw = true;
+   } else if (this->selected >= this->scrollV + h) {
+      this->scrollV = this->selected - h + 1;
+      this->needsRedraw = true;
+   }
+
+   int first = this->scrollV;
+   int upTo = MINIMUM(first + h, size);
+
+   int selectionColor = focus
+      ? CRT_colors[this->selectionColorId]
+      : CRT_colors[PANEL_SELECTION_UNFOCUS];
+
+   if (this->needsRedraw || force_redraw) {
+      int line = 0;
+      for (int i = first; line < h && i < upTo; i++) {
+         const Object* itemObj = Vector_get(this->items, i);
+         RichString_begin(item);
+         Object_display(itemObj, &item);
+         int itemLen = RichString_sizeVal(item);
+         int amt = MINIMUM(itemLen - scrollH, this->w);
+         if (highlightSelected && i == this->selected) {
+            item.highlightAttr = selectionColor;
+         }
+         if (item.highlightAttr) {
+            attrset(item.highlightAttr);
+            RichString_setAttr(&item, item.highlightAttr);
+            this->selectedLen = itemLen;
+         }
+         mvhline(y + line, x, ' ', this->w);
+         if (amt > 0)
+            RichString_printoffnVal(item, y + line, x, scrollH, amt);
+         if (item.highlightAttr)
+            attrset(CRT_colors[RESET_COLOR]);
+         RichString_delete(&item);
+         line++;
+      }
+      while (line < h) {
+         mvhline(y + line, x, ' ', this->w);
+         line++;
+      }
+
+   } else {
+      const Object* oldObj = Vector_get(this->items, this->oldSelected);
+      RichString_begin(old);
+      Object_display(oldObj, &old);
+      int oldLen = RichString_sizeVal(old);
+      const Object* newObj = Vector_get(this->items, this->selected);
+      RichString_begin(new);
+      Object_display(newObj, &new);
+      int newLen = RichString_sizeVal(new);
+      this->selectedLen = newLen;
+      mvhline(y + this->oldSelected - first, x + 0, ' ', this->w);
+      if (scrollH < oldLen)
+         RichString_printoffnVal(old, y + this->oldSelected - first, x,
+            scrollH, MINIMUM(oldLen - scrollH, this->w));
+      attrset(selectionColor);
+      mvhline(y + this->selected - first, x + 0, ' ', this->w);
+      RichString_setAttr(&new, selectionColor);
+      if (scrollH < newLen)
+         RichString_printoffnVal(new, y + this->selected - first, x,
+            scrollH, MINIMUM(newLen - scrollH, this->w));
+      attrset(CRT_colors[RESET_COLOR]);
+      RichString_delete(&new);
+      RichString_delete(&old);
+   }
+
+   if (focus && (this->needsRedraw || force_redraw || !this->wasFocus)) {
+      if (Panel_drawFunctionBarFn(this))
+         Panel_drawFunctionBar(this, hideFunctionBar);
+      else if (!hideFunctionBar)
+         FunctionBar_draw(this->currentBar);
+   }
+
+   this->oldSelected = this->selected;
+   this->wasFocus = focus;
+   this->needsRedraw = false;
+}
+
+static int Panel_headerHeight(const Panel* this) {
+   return RichString_sizeVal(this->header) > 0 ? 1 : 0;
+}
+
+bool Panel_onKey(Panel* this, int key) {
+   assert (this != NULL);
+
+   const int size = Vector_size(this->items);
+
+   #define PANEL_SCROLL(amount)                                                                                     \
+   do {                                                                                                             \
+      this->selected += (amount);                                                                                   \
+      this->scrollV = CLAMP(this->scrollV + (amount), 0, MAXIMUM(0, (size - this->h - Panel_headerHeight(this))));  \
+      this->needsRedraw = true;                                                                                     \
+   } while (0)
+
+   switch (key) {
+      case KEY_DOWN:
+      case KEY_CTRL('N'):
+      #ifdef KEY_C_DOWN
+      case KEY_C_DOWN:
+      #endif
+         this->selected++;
+         break;
+
+      case KEY_UP:
+      case KEY_CTRL('P'):
+      #ifdef KEY_C_UP
+      case KEY_C_UP:
+      #endif
+         this->selected--;
+         break;
+
+      case KEY_LEFT:
+      case KEY_CTRL('B'):
+         if (this->scrollH > 0) {
+            this->scrollH -= MAXIMUM(CRT_scrollHAmount, 0);
+            this->needsRedraw = true;
+         }
+         break;
+
+      case KEY_RIGHT:
+      case KEY_CTRL('F'):
+         this->scrollH += CRT_scrollHAmount;
+         this->needsRedraw = true;
+         break;
+
+      case KEY_PPAGE:
+         PANEL_SCROLL(-(this->h - Panel_headerHeight(this)));
+         break;
+
+      case KEY_NPAGE:
+         PANEL_SCROLL(+(this->h - Panel_headerHeight(this)));
+         break;
+
+      case KEY_WHEELUP:
+         PANEL_SCROLL(-CRT_scrollWheelVAmount);
+         break;
+
+      case KEY_WHEELDOWN:
+         PANEL_SCROLL(+CRT_scrollWheelVAmount);
+         break;
+
+      case KEY_HOME:
+         this->selected = 0;
+         break;
+
+      case KEY_END:
+         this->selected = size - 1;
+         break;
+
+      case KEY_CTRL('A'):
+      case '^':
+         this->scrollH = 0;
+         this->needsRedraw = true;
+         break;
+
+      case KEY_CTRL('E'):
+      case '$':
+         this->scrollH = MAXIMUM(this->selectedLen - this->w, 0);
+         this->needsRedraw = true;
+         break;
+
+      default:
+         return false;
+   }
+
+   #undef PANEL_SCROLL
+
+   // ensure selection within bounds
+   if (this->selected < 0 || size == 0) {
+      this->selected = 0;
+      this->needsRedraw = true;
+   } else if (this->selected >= size) {
+      this->selected = size - 1;
+      this->needsRedraw = true;
+   }
+
+   return true;
+}
+
+
+HandlerResult Panel_selectByTyping(Panel* this, int ch) {
+   int size = Panel_size(this);
+
+   if (ch == '#')
+      return IGNORED;
+
+   if (!this->eventHandlerState)
+      this->eventHandlerState = xCalloc(100, sizeof(char));
+   char* buffer = this->eventHandlerState;
+
+   if (0 < ch && ch < 255 && isgraph((unsigned char)ch)) {
+      int len = strlen(buffer);
+      if (!len) {
+         if ('/' == ch) {
+            ch = '\001';
+         } else if ('q' == ch) {
+            return BREAK_LOOP;
+         }
+      } else if (1 == len && '\001' == buffer[0]) {
+         len--;
+      }
+
+      if (len < 99) {
+         buffer[len] = (char) ch;
+         buffer[len + 1] = '\0';
+      }
+
+      for (int try = 0; try < 2; try++) {
+         len = strlen(buffer);
+         for (int i = 0; i < size; i++) {
+            const char* cur = ((ListItem*) Panel_get(this, i))->value;
+            while (*cur == ' ')
+               cur++;
+            if (strncasecmp(cur, buffer, len) == 0) {
+               Panel_setSelected(this, i);
+               return HANDLED;
+            }
+         }
+
+         // if current word did not match,
+         // retry considering the character the start of a new word.
+         buffer[0] = (char) ch;
+         buffer[1] = '\0';
+      }
+
+      return HANDLED;
+   } else if (ch != ERR) {
+      buffer[0] = '\0';
+   }
+
+   if (ch == 13) {
+      return BREAK_LOOP;
+   }
+
+   return IGNORED;
+}
+
+int Panel_getCh(Panel* this) {
+   if (this->cursorOn) {
+      move(this->cursorY, this->cursorX);
+      curs_set(1);
+   } else {
+      curs_set(0);
+   }
+#ifdef HAVE_SET_ESCDELAY
+   set_escdelay(25);
+#endif
+   return getch();
+}
diff --git a/Panel.h b/Panel.h
new file mode 100644
index 0000000..286e446
--- /dev/null
+++ b/Panel.h
@@ -0,0 +1,141 @@
+#ifndef HEADER_Panel
+#define HEADER_Panel
+/*
+htop - Panel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <assert.h>
+#include <stdbool.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Object.h"
+#include "RichString.h"
+#include "Vector.h"
+
+
+struct Panel_;
+typedef struct Panel_ Panel;
+
+typedef enum HandlerResult_ {
+   HANDLED     = 0x01,
+   IGNORED     = 0x02,
+   BREAK_LOOP  = 0x04,
+   REFRESH     = 0x08,
+   REDRAW      = 0x10,
+   RESCAN      = 0x20,
+   RESIZE      = 0x40,
+   SYNTH_KEY   = 0x80,
+} HandlerResult;
+
+#define EVENT_SET_SELECTED (-1)
+
+#define EVENT_HEADER_CLICK(x_) (-10000 + (x_))
+#define EVENT_IS_HEADER_CLICK(ev_) ((ev_) >= -10000 && (ev_) <= -9000)
+#define EVENT_HEADER_CLICK_GET_X(ev_) ((ev_) + 10000)
+
+#define EVENT_SCREEN_TAB_CLICK(x_) (-20000 + (x_))
+#define EVENT_IS_SCREEN_TAB_CLICK(ev_) ((ev_) >= -20000 && (ev_) < -10000)
+#define EVENT_SCREEN_TAB_GET_X(ev_) ((ev_) + 20000)
+
+typedef HandlerResult (*Panel_EventHandler)(Panel*, int);
+typedef void (*Panel_DrawFunctionBar)(Panel*, bool);
+typedef void (*Panel_PrintHeader)(Panel*);
+
+typedef struct PanelClass_ {
+   const ObjectClass super;
+   const Panel_EventHandler eventHandler;
+   const Panel_DrawFunctionBar drawFunctionBar;
+   const Panel_PrintHeader printHeader;
+} PanelClass;
+
+#define As_Panel(this_)                        ((const PanelClass*)((this_)->super.klass))
+#define Panel_eventHandlerFn(this_)            As_Panel(this_)->eventHandler
+#define Panel_eventHandler(this_, ev_)         (assert(As_Panel(this_)->eventHandler), As_Panel(this_)->eventHandler((Panel*)(this_), ev_))
+#define Panel_drawFunctionBarFn(this_)         As_Panel(this_)->drawFunctionBar
+#define Panel_drawFunctionBar(this_, hideFB_)  (assert(As_Panel(this_)->drawFunctionBar), As_Panel(this_)->drawFunctionBar((Panel*)(this_), hideFB_))
+#define Panel_printHeaderFn(this_)             As_Panel(this_)->printHeader
+#define Panel_printHeader(this_)               (assert(As_Panel(this_)->printHeader), As_Panel(this_)->printHeader((Panel*)(this_)))
+
+struct Panel_ {
+   Object super;
+   int x, y, w, h;
+   int cursorX, cursorY;
+   Vector* items;
+   int selected;
+   int oldSelected;
+   int selectedLen;
+   void* eventHandlerState;
+   int scrollV;
+   int scrollH;
+   bool needsRedraw;
+   bool cursorOn;
+   bool wasFocus;
+   FunctionBar* currentBar;
+   FunctionBar* defaultBar;
+   RichString header;
+   ColorElements selectionColorId;
+};
+
+#define Panel_setDefaultBar(this_) do { (this_)->currentBar = (this_)->defaultBar; } while (0)
+
+#define KEY_CTRL(l) ((l)-'A'+1)
+
+extern const PanelClass Panel_class;
+
+Panel* Panel_new(int x, int y, int w, int h, const ObjectClass* type, bool owner, FunctionBar* fuBar);
+
+void Panel_delete(Object* cast);
+
+void Panel_init(Panel* this, int x, int y, int w, int h, const ObjectClass* type, bool owner, FunctionBar* fuBar);
+
+void Panel_done(Panel* this);
+
+void Panel_setCursorToSelection(Panel* this);
+
+void Panel_setSelectionColor(Panel* this, ColorElements colorId);
+
+void Panel_setHeader(Panel* this, const char* header);
+
+void Panel_move(Panel* this, int x, int y);
+
+void Panel_resize(Panel* this, int w, int h);
+
+void Panel_prune(Panel* this);
+
+void Panel_add(Panel* this, Object* o);
+
+void Panel_insert(Panel* this, int i, Object* o);
+
+void Panel_set(Panel* this, int i, Object* o);
+
+Object* Panel_get(Panel* this, int i);
+
+Object* Panel_remove(Panel* this, int i);
+
+Object* Panel_getSelected(Panel* this);
+
+void Panel_moveSelectedUp(Panel* this);
+
+void Panel_moveSelectedDown(Panel* this);
+
+int Panel_getSelectedIndex(const Panel* this);
+
+int Panel_size(const Panel* this);
+
+void Panel_setSelected(Panel* this, int selected);
+
+void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelected, bool hideFunctionBar);
+
+void Panel_splice(Panel* this, Vector* from);
+
+bool Panel_onKey(Panel* this, int key);
+
+HandlerResult Panel_selectByTyping(Panel* this, int ch);
+
+int Panel_getCh(Panel* this);
+
+#endif
diff --git a/Process.c b/Process.c
new file mode 100644
index 0000000..a36ab6c
--- /dev/null
+++ b/Process.c
@@ -0,0 +1,1093 @@
+/*
+htop - Process.c
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Process.h"
+
+#include <assert.h>
+#include <math.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/resource.h>
+
+#include "CRT.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "ProcessTable.h"
+#include "DynamicColumn.h"
+#include "RichString.h"
+#include "Scheduling.h"
+#include "Settings.h"
+#include "Table.h"
+#include "XUtils.h"
+
+#if defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#endif
+
+
+/* Used to identify kernel threads in Comm and Exe columns */
+static const char* const kthreadID = "KTHREAD";
+
+void Process_fillStarttimeBuffer(Process* this) {
+   struct tm date;
+   time_t now = this->super.host->realtime.tv_sec;
+   (void) localtime_r(&this->starttime_ctime, &date);
+
+   strftime(this->starttime_show,
+            sizeof(this->starttime_show) - 1,
+            (this->starttime_ctime > now - 86400) ? "%R " : (this->starttime_ctime > now - 364 * 86400) ? "%b%d " : " %Y ",
+            &date);
+}
+
+/*
+ * TASK_COMM_LEN is defined to be 16 for /proc/[pid]/comm in man proc(5), but it is
+ * not available in an userspace header - so define it.
+ *
+ * Note: This is taken from LINUX headers, but implicitly taken for other platforms
+ * for sake of brevity.
+ *
+ * Note: when colorizing a basename with the comm prefix, the entire basename
+ * (not just the comm prefix) is colorized for better readability, and it is
+ * implicit that only up to (TASK_COMM_LEN - 1) could be comm.
+ */
+#define TASK_COMM_LEN 16
+
+static bool findCommInCmdline(const char* comm, const char* cmdline, int cmdlineBasenameStart, int* pCommStart, int* pCommEnd) {
+   /* Try to find procComm in tokenized cmdline - this might in rare cases
+    * mis-identify a string or fail, if comm or cmdline had been unsuitably
+    * modified by the process */
+   const char* tokenBase;
+   size_t tokenLen;
+   const size_t commLen = strlen(comm);
+
+   if (cmdlineBasenameStart < 0)
+      return false;
+
+   for (const char* token = cmdline + cmdlineBasenameStart; *token;) {
+      for (tokenBase = token; *token && *token != '\n'; ++token) {
+         if (*token == '/') {
+            tokenBase = token + 1;
+         }
+      }
+      tokenLen = token - tokenBase;
+
+      if ((tokenLen == commLen || (tokenLen > commLen && commLen == (TASK_COMM_LEN - 1))) &&
+          strncmp(tokenBase, comm, commLen) == 0) {
+         *pCommStart = tokenBase - cmdline;
+         *pCommEnd = token - cmdline;
+         return true;
+      }
+
+      if (*token) {
+         do {
+            ++token;
+         } while (*token && '\n' == *token);
+      }
+   }
+   return false;
+}
+
+static int matchCmdlinePrefixWithExeSuffix(const char* cmdline, int cmdlineBaseOffset, const char* exe, int exeBaseOffset, int exeBaseLen) {
+   int matchLen; /* matching length to be returned */
+   char delim;   /* delimiter following basename */
+
+   /* cmdline prefix is an absolute path: it must match whole exe. */
+   if (cmdline[0] == '/') {
+      matchLen = exeBaseLen + exeBaseOffset;
+      if (strncmp(cmdline, exe, matchLen) == 0) {
+         delim = cmdline[matchLen];
+         if (delim == 0 || delim == '\n' || delim == ' ') {
+            return matchLen;
+         }
+      }
+      return 0;
+   }
+
+   /* cmdline prefix is a relative path: We need to first match the basename at
+    * cmdlineBaseOffset and then reverse match the cmdline prefix with the exe
+    * suffix. But there is a catch: Some processes modify their cmdline in ways
+    * that make htop's identification of the basename in cmdline unreliable.
+    * For e.g. /usr/libexec/gdm-session-worker modifies its cmdline to
+    * "gdm-session-worker [pam/gdm-autologin]" and htop ends up with
+    * proccmdlineBasenameEnd at "gdm-autologin]". This issue could arise with
+    * chrome as well as it stores in cmdline its concatenated argument vector,
+    * without NUL delimiter between the arguments (which may contain a '/')
+    *
+    * So if needed, we adjust cmdlineBaseOffset to the previous (if any)
+    * component of the cmdline relative path, and retry the procedure. */
+   bool delimFound; /* if valid basename delimiter found */
+   do {
+      /* match basename */
+      matchLen = exeBaseLen + cmdlineBaseOffset;
+      if (cmdlineBaseOffset < exeBaseOffset &&
+          strncmp(cmdline + cmdlineBaseOffset, exe + exeBaseOffset, exeBaseLen) == 0) {
+         delim = cmdline[matchLen];
+         if (delim == 0 || delim == '\n' || delim == ' ') {
+            int i, j;
+            /* reverse match the cmdline prefix and exe suffix */
+            for (i = cmdlineBaseOffset - 1, j = exeBaseOffset - 1;
+                 i >= 0 && j >= 0 && cmdline[i] == exe[j]; --i, --j)
+               ;
+
+            /* full match, with exe suffix being a valid relative path */
+            if (i < 0 && j >= 0 && exe[j] == '/')
+               return matchLen;
+         }
+      }
+
+      /* Try to find the previous potential cmdlineBaseOffset - it would be
+       * preceded by '/' or nothing, and delimited by ' ' or '\n' */
+      for (delimFound = false, cmdlineBaseOffset -= 2; cmdlineBaseOffset > 0; --cmdlineBaseOffset) {
+         if (delimFound) {
+            if (cmdline[cmdlineBaseOffset - 1] == '/') {
+               break;
+            }
+         } else if (cmdline[cmdlineBaseOffset] == ' ' || cmdline[cmdlineBaseOffset] == '\n') {
+            delimFound = true;
+         }
+      }
+   } while (delimFound);
+
+   return 0;
+}
+
+/* stpcpy, but also converts newlines to spaces */
+static inline char* stpcpyWithNewlineConversion(char* dstStr, const char* srcStr) {
+   for (; *srcStr; ++srcStr) {
+      *dstStr++ = (*srcStr == '\n') ? ' ' : *srcStr;
+   }
+   *dstStr = 0;
+   return dstStr;
+}
+
+/*
+ * This function makes the merged Command string. It also stores the offsets of the
+ * basename, comm w.r.t the merged Command string - these offsets will be used by
+ * Process_writeCommand() for coloring. The merged Command string is also
+ * returned by Process_getCommand() for searching, sorting and filtering.
+ */
+void Process_makeCommandStr(Process* this, const Settings* settings) {
+   ProcessMergedCommand* mc = &this->mergedCommand;
+
+   bool showMergedCommand = settings->showMergedCommand;
+   bool showProgramPath = settings->showProgramPath;
+   bool searchCommInCmdline = settings->findCommInCmdline;
+   bool stripExeFromCmdline = settings->stripExeFromCmdline;
+   bool showThreadNames = settings->showThreadNames;
+   bool shadowDistPathPrefix = settings->shadowDistPathPrefix;
+
+   uint64_t settingsStamp = settings->lastUpdate;
+
+   /* Nothing to do to (Re)Generate the Command string, if the process is:
+    * - a kernel thread, or
+    * - a zombie from before being under htop's watch, or
+    * - a user thread and showThreadNames is not set */
+   if (Process_isKernelThread(this))
+      return;
+   if (this->state == ZOMBIE && !this->mergedCommand.str)
+      return;
+
+   /* this->mergedCommand.str needs updating only if its state or contents changed.
+    * Its content is based on the fields cmdline, comm, and exe. */
+   if (mc->lastUpdate >= settingsStamp)
+      return;
+
+   mc->lastUpdate = settingsStamp;
+
+   /* The field separator "│" has been chosen such that it will not match any
+    * valid string used for searching or filtering */
+   const char* SEPARATOR = CRT_treeStr[TREE_STR_VERT];
+   const int SEPARATOR_LEN = strlen(SEPARATOR);
+
+   /* Accommodate the column text, two field separators and terminating NUL */
+   size_t maxLen = 2 * SEPARATOR_LEN + 1;
+   maxLen += this->cmdline ? strlen(this->cmdline) : strlen("(zombie)");
+   maxLen += this->procComm ? strlen(this->procComm) : 0;
+   maxLen += this->procExe ? strlen(this->procExe) : 0;
+
+   free(mc->str);
+   mc->str = xCalloc(1, maxLen);
+
+   /* Reset all locations that need extra handling when actually displaying */
+   mc->highlightCount = 0;
+   memset(mc->highlights, 0, sizeof(mc->highlights));
+
+   size_t mbMismatch = 0;
+   #define WRITE_HIGHLIGHT(_offset, _length, _attr, _flags)                                   \
+      do {                                                                                    \
+         /* Check if we still have capacity */                                                \
+         assert(mc->highlightCount < ARRAYSIZE(mc->highlights));                              \
+         if (mc->highlightCount >= ARRAYSIZE(mc->highlights))                                 \
+            break;                                                                            \
+                                                                                              \
+         mc->highlights[mc->highlightCount].offset = str - strStart + (_offset) - mbMismatch; \
+         mc->highlights[mc->highlightCount].length = _length;                                 \
+         mc->highlights[mc->highlightCount].attr = _attr;                                     \
+         mc->highlights[mc->highlightCount].flags = _flags;                                   \
+         mc->highlightCount++;                                                                \
+      } while (0)
+
+   #define WRITE_SEPARATOR                                                                    \
+      do {                                                                                    \
+         WRITE_HIGHLIGHT(0, 1, CRT_colors[FAILED_READ], CMDLINE_HIGHLIGHT_FLAG_SEPARATOR);    \
+         mbMismatch += SEPARATOR_LEN - 1;                                                     \
+         str = stpcpy(str, SEPARATOR);                                                        \
+      } while (0)
+
+   #define CHECK_AND_MARK(str_, prefix_)                                                      \
+      if (String_startsWith(str_, prefix_)) {                                                 \
+         WRITE_HIGHLIGHT(0, strlen(prefix_), CRT_colors[PROCESS_SHADOW], CMDLINE_HIGHLIGHT_FLAG_PREFIXDIR); \
+         break;                                                                               \
+      } else (void)0
+
+   #define CHECK_AND_MARK_DIST_PATH_PREFIXES(str_)                                            \
+      do {                                                                                    \
+         if ((str_)[0] != '/') {                                                              \
+            break;                                                                            \
+         }                                                                                    \
+         switch ((str_)[1]) {                                                                 \
+            case 'b':                                                                         \
+               CHECK_AND_MARK(str_, "/bin/");                                                 \
+               break;                                                                         \
+            case 'l':                                                                         \
+               CHECK_AND_MARK(str_, "/lib/");                                                 \
+               CHECK_AND_MARK(str_, "/lib32/");                                               \
+               CHECK_AND_MARK(str_, "/lib64/");                                               \
+               CHECK_AND_MARK(str_, "/libx32/");                                              \
+               break;                                                                         \
+            case 's':                                                                         \
+               CHECK_AND_MARK(str_, "/sbin/");                                                \
+               break;                                                                         \
+            case 'u':                                                                         \
+               if (String_startsWith(str_, "/usr/")) {                                        \
+                  switch ((str_)[5]) {                                                        \
+                     case 'b':                                                                \
+                        CHECK_AND_MARK(str_, "/usr/bin/");                                    \
+                        break;                                                                \
+                     case 'l':                                                                \
+                        CHECK_AND_MARK(str_, "/usr/libexec/");                                \
+                        CHECK_AND_MARK(str_, "/usr/lib/");                                    \
+                        CHECK_AND_MARK(str_, "/usr/lib32/");                                  \
+                        CHECK_AND_MARK(str_, "/usr/lib64/");                                  \
+                        CHECK_AND_MARK(str_, "/usr/libx32/");                                 \
+                                                                                              \
+                        CHECK_AND_MARK(str_, "/usr/local/bin/");                              \
+                        CHECK_AND_MARK(str_, "/usr/local/lib/");                              \
+                        CHECK_AND_MARK(str_, "/usr/local/sbin/");                             \
+                        break;                                                                \
+                     case 's':                                                                \
+                        CHECK_AND_MARK(str_, "/usr/sbin/");                                   \
+                        break;                                                                \
+                  }                                                                           \
+               }                                                                              \
+               break;                                                                         \
+         }                                                                                    \
+      } while (0)
+
+   const int baseAttr = Process_isThread(this) ? CRT_colors[PROCESS_THREAD_BASENAME] : CRT_colors[PROCESS_BASENAME];
+   const int commAttr = Process_isThread(this) ? CRT_colors[PROCESS_THREAD_COMM] : CRT_colors[PROCESS_COMM];
+   const int delExeAttr = CRT_colors[FAILED_READ];
+   const int delLibAttr = CRT_colors[PROCESS_TAG];
+
+   /* Establish some shortcuts to data we need */
+   const char* cmdline = this->cmdline;
+   const char* procComm = this->procComm;
+   const char* procExe = this->procExe;
+
+   char* strStart = mc->str;
+   char* str = strStart;
+
+   int cmdlineBasenameStart = this->cmdlineBasenameStart;
+   int cmdlineBasenameEnd = this->cmdlineBasenameEnd;
+
+   if (!cmdline) {
+      cmdlineBasenameStart = 0;
+      cmdlineBasenameEnd = 0;
+      cmdline = "(zombie)";
+   }
+
+   assert(cmdlineBasenameStart >= 0);
+   assert(cmdlineBasenameStart <= (int)strlen(cmdline));
+
+   if (!showMergedCommand || !procExe || !procComm) { /* fall back to cmdline */
+      if ((showMergedCommand || (Process_isUserlandThread(this) && showThreadNames)) && procComm && strlen(procComm)) { /* set column to or prefix it with comm */
+         if (strncmp(cmdline + cmdlineBasenameStart, procComm, MINIMUM(TASK_COMM_LEN - 1, strlen(procComm))) != 0) {
+            WRITE_HIGHLIGHT(0, strlen(procComm), commAttr, CMDLINE_HIGHLIGHT_FLAG_COMM);
+            str = stpcpy(str, procComm);
+
+            if (!showMergedCommand)
+               return;
+
+            WRITE_SEPARATOR;
+         }
+      }
+
+      if (shadowDistPathPrefix && showProgramPath)
+         CHECK_AND_MARK_DIST_PATH_PREFIXES(cmdline);
+
+      if (cmdlineBasenameEnd > cmdlineBasenameStart)
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, baseAttr, CMDLINE_HIGHLIGHT_FLAG_BASENAME);
+
+      if (this->procExeDeleted)
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, delExeAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+      else if (this->usesDeletedLib)
+         WRITE_HIGHLIGHT(showProgramPath ? cmdlineBasenameStart : 0, cmdlineBasenameEnd - cmdlineBasenameStart, delLibAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+
+      (void)stpcpyWithNewlineConversion(str, cmdline + (showProgramPath ? 0 : cmdlineBasenameStart));
+
+      return;
+   }
+
+   int exeLen = strlen(this->procExe);
+   int exeBasenameOffset = this->procExeBasenameOffset;
+   int exeBasenameLen = exeLen - exeBasenameOffset;
+
+   assert(exeBasenameOffset >= 0);
+   assert(exeBasenameOffset <= (int)strlen(procExe));
+
+   bool haveCommInExe = false;
+   if (procExe && procComm && (!Process_isUserlandThread(this) || showThreadNames)) {
+      haveCommInExe = strncmp(procExe + exeBasenameOffset, procComm, TASK_COMM_LEN - 1) == 0;
+   }
+
+   /* Start with copying exe */
+   if (showProgramPath) {
+      if (shadowDistPathPrefix)
+         CHECK_AND_MARK_DIST_PATH_PREFIXES(procExe);
+      if (haveCommInExe)
+         WRITE_HIGHLIGHT(exeBasenameOffset, exeBasenameLen, commAttr, CMDLINE_HIGHLIGHT_FLAG_COMM);
+      WRITE_HIGHLIGHT(exeBasenameOffset, exeBasenameLen, baseAttr, CMDLINE_HIGHLIGHT_FLAG_BASENAME);
+      if (this->procExeDeleted)
+         WRITE_HIGHLIGHT(exeBasenameOffset, exeBasenameLen, delExeAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+      else if (this->usesDeletedLib)
+         WRITE_HIGHLIGHT(exeBasenameOffset, exeBasenameLen, delLibAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+      str = stpcpy(str, procExe);
+   } else {
+      if (haveCommInExe)
+         WRITE_HIGHLIGHT(0, exeBasenameLen, commAttr, CMDLINE_HIGHLIGHT_FLAG_COMM);
+      WRITE_HIGHLIGHT(0, exeBasenameLen, baseAttr, CMDLINE_HIGHLIGHT_FLAG_BASENAME);
+      if (this->procExeDeleted)
+         WRITE_HIGHLIGHT(0, exeBasenameLen, delExeAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+      else if (this->usesDeletedLib)
+         WRITE_HIGHLIGHT(0, exeBasenameLen, delLibAttr, CMDLINE_HIGHLIGHT_FLAG_DELETED);
+      str = stpcpy(str, procExe + exeBasenameOffset);
+   }
+
+   bool haveCommInCmdline = false;
+   int commStart = 0;
+   int commEnd = 0;
+
+   /* Try to match procComm with procExe's basename: This is reliable (predictable) */
+   if (searchCommInCmdline) {
+      /* commStart/commEnd will be adjusted later along with cmdline */
+      haveCommInCmdline = (!Process_isUserlandThread(this) || showThreadNames) && findCommInCmdline(procComm, cmdline, cmdlineBasenameStart, &commStart, &commEnd);
+   }
+
+   int matchLen = matchCmdlinePrefixWithExeSuffix(cmdline, cmdlineBasenameStart, procExe, exeBasenameOffset, exeBasenameLen);
+
+   bool haveCommField = false;
+
+   if (!haveCommInExe && !haveCommInCmdline && procComm && (!Process_isUserlandThread(this) || showThreadNames)) {
+      WRITE_SEPARATOR;
+      WRITE_HIGHLIGHT(0, strlen(procComm), commAttr, CMDLINE_HIGHLIGHT_FLAG_COMM);
+      str = stpcpy(str, procComm);
+      haveCommField = true;
+   }
+
+   if (matchLen) {
+      if (stripExeFromCmdline) {
+         /* strip the matched exe prefix */
+         cmdline += matchLen;
+
+         commStart -= matchLen;
+         commEnd -= matchLen;
+      } else {
+         matchLen = 0;
+      }
+   }
+
+   if (!matchLen || (haveCommField && *cmdline)) {
+      /* cmdline will be a separate field */
+      WRITE_SEPARATOR;
+   }
+
+   if (shadowDistPathPrefix)
+      CHECK_AND_MARK_DIST_PATH_PREFIXES(cmdline);
+
+   if (!haveCommInExe && haveCommInCmdline && !haveCommField && (!Process_isUserlandThread(this) || showThreadNames))
+      WRITE_HIGHLIGHT(commStart, commEnd - commStart, commAttr, CMDLINE_HIGHLIGHT_FLAG_COMM);
+
+   /* Display cmdline if it hasn't been consumed by procExe */
+   if (*cmdline)
+      (void)stpcpyWithNewlineConversion(str, cmdline);
+
+   #undef CHECK_AND_MARK_DIST_PATH_PREFIXES
+   #undef CHECK_AND_MARK
+   #undef WRITE_SEPARATOR
+   #undef WRITE_HIGHLIGHT
+}
+
+void Process_writeCommand(const Process* this, int attr, int baseAttr, RichString* str) {
+   (void)baseAttr;
+
+   const ProcessMergedCommand* mc = &this->mergedCommand;
+   const char* mergedCommand = mc->str;
+
+   int strStart = RichString_size(str);
+
+   const Settings* settings = this->super.host->settings;
+   const bool highlightBaseName = settings->highlightBaseName;
+   const bool highlightSeparator = true;
+   const bool highlightDeleted = settings->highlightDeletedExe;
+
+   if (!mergedCommand) {
+      int len = 0;
+      const char* cmdline = this->cmdline;
+
+      if (highlightBaseName || !settings->showProgramPath) {
+         int basename = 0;
+         for (int i = 0; i < this->cmdlineBasenameEnd; i++) {
+            if (cmdline[i] == '/') {
+               basename = i + 1;
+            } else if (cmdline[i] == ':') {
+               len = i + 1;
+               break;
+            }
+         }
+         if (len == 0) {
+            if (settings->showProgramPath) {
+               strStart += basename;
+            } else {
+               cmdline += basename;
+            }
+            len = this->cmdlineBasenameEnd - basename;
+         }
+      }
+
+      RichString_appendWide(str, attr, cmdline);
+
+      if (settings->highlightBaseName) {
+         RichString_setAttrn(str, baseAttr, strStart, len);
+      }
+
+      return;
+   }
+
+   RichString_appendWide(str, attr, mergedCommand);
+
+   for (size_t i = 0, hlCount = CLAMP(mc->highlightCount, 0, ARRAYSIZE(mc->highlights)); i < hlCount; i++) {
+      const ProcessCmdlineHighlight* hl = &mc->highlights[i];
+
+      if (!hl->length)
+         continue;
+
+      if (hl->flags & CMDLINE_HIGHLIGHT_FLAG_SEPARATOR)
+         if (!highlightSeparator)
+            continue;
+
+      if (hl->flags & CMDLINE_HIGHLIGHT_FLAG_BASENAME)
+         if (!highlightBaseName)
+            continue;
+
+      if (hl->flags & CMDLINE_HIGHLIGHT_FLAG_DELETED)
+         if (!highlightDeleted)
+            continue;
+
+      if (hl->flags & CMDLINE_HIGHLIGHT_FLAG_PREFIXDIR)
+         if (!highlightDeleted)
+            continue;
+
+      RichString_setAttrn(str, hl->attr, strStart + hl->offset, hl->length);
+   }
+}
+
+static inline char processStateChar(ProcessState state) {
+   switch (state) {
+      case UNKNOWN: return '?';
+      case RUNNABLE: return 'U';
+      case RUNNING: return 'R';
+      case QUEUED: return 'Q';
+      case WAITING: return 'W';
+      case UNINTERRUPTIBLE_WAIT: return 'D';
+      case BLOCKED: return 'B';
+      case PAGING: return 'P';
+      case STOPPED: return 'T';
+      case TRACED: return 't';
+      case ZOMBIE: return 'Z';
+      case DEFUNCT: return 'X';
+      case IDLE: return 'I';
+      case SLEEPING: return 'S';
+      default:
+         assert(0);
+         return '!';
+   }
+}
+
+static void Process_rowWriteField(const Row* super, RichString* str, RowField field) {
+   const Process* this = (const Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   Process_writeField(this, str, field);
+}
+
+void Process_writeField(const Process* this, RichString* str, RowField field) {
+   const Row* super = (const Row*) &this->super;
+   const Machine* host = super->host;
+   const Settings* settings = host->settings;
+
+   bool coloring = settings->highlightMegabytes;
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   case COMM: {
+      int baseattr = CRT_colors[PROCESS_BASENAME];
+      if (settings->highlightThreads && Process_isThread(this)) {
+         attr = CRT_colors[PROCESS_THREAD];
+         baseattr = CRT_colors[PROCESS_THREAD_BASENAME];
+      }
+      const ScreenSettings* ss = settings->ss;
+      if (!ss->treeView || super->indent == 0) {
+         Process_writeCommand(this, attr, baseattr, str);
+         return;
+      }
+
+      char* buf = buffer;
+      const bool lastItem = (super->indent < 0);
+
+      for (uint32_t indent = (super->indent < 0 ? -super->indent : super->indent); indent > 1; indent >>= 1) {
+         int written, ret;
+         if (indent & 1U) {
+            ret = xSnprintf(buf, n, "%s  ", CRT_treeStr[TREE_STR_VERT]);
+         } else {
+            ret = xSnprintf(buf, n, "   ");
+         }
+         if (ret < 0 || (size_t)ret >= n) {
+            written = n;
+         } else {
+            written = ret;
+         }
+         buf += written;
+         n -= written;
+      }
+
+      const char* draw = CRT_treeStr[lastItem ? TREE_STR_BEND : TREE_STR_RTEE];
+      xSnprintf(buf, n, "%s%s ", draw, super->showChildren ? CRT_treeStr[TREE_STR_SHUT] : CRT_treeStr[TREE_STR_OPEN] );
+      RichString_appendWide(str, CRT_colors[PROCESS_TREE], buffer);
+      Process_writeCommand(this, attr, baseattr, str);
+      return;
+   }
+   case PROC_COMM: {
+      const char* procComm;
+      if (this->procComm) {
+         attr = CRT_colors[Process_isUserlandThread(this) ? PROCESS_THREAD_COMM : PROCESS_COMM];
+         procComm = this->procComm;
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         procComm = Process_isKernelThread(this) ? kthreadID : "N/A";
+      }
+
+      Row_printLeftAlignedField(str, attr, procComm, TASK_COMM_LEN - 1);
+      return;
+   }
+   case PROC_EXE: {
+      const char* procExe;
+      if (this->procExe) {
+         attr = CRT_colors[Process_isUserlandThread(this) ? PROCESS_THREAD_BASENAME : PROCESS_BASENAME];
+         if (settings->highlightDeletedExe) {
+            if (this->procExeDeleted)
+               attr = CRT_colors[FAILED_READ];
+            else if (this->usesDeletedLib)
+               attr = CRT_colors[PROCESS_TAG];
+         }
+         procExe = this->procExe + this->procExeBasenameOffset;
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         procExe = Process_isKernelThread(this) ? kthreadID : "N/A";
+      }
+
+      Row_printLeftAlignedField(str, attr, procExe, TASK_COMM_LEN - 1);
+      return;
+   }
+   case CWD: {
+      const char* cwd;
+      if (!this->procCwd) {
+         attr = CRT_colors[PROCESS_SHADOW];
+         cwd = "N/A";
+      } else if (String_startsWith(this->procCwd, "/proc/") && strstr(this->procCwd, " (deleted)") != NULL) {
+         attr = CRT_colors[PROCESS_SHADOW];
+         cwd = "main thread terminated";
+      } else {
+         cwd = this->procCwd;
+      }
+      Row_printLeftAlignedField(str, attr, cwd, 25);
+      return;
+   }
+   case ELAPSED: {
+      const uint64_t rt = host->realtimeMs;
+      const uint64_t st = this->starttime_ctime * 1000;
+      const uint64_t dt =
+         rt < st ? 0 :
+         rt - st;
+      Row_printTime(str, /* convert to hundreds of a second */ dt / 10, coloring);
+      return;
+   }
+   case MAJFLT: Row_printCount(str, this->majflt, coloring); return;
+   case MINFLT: Row_printCount(str, this->minflt, coloring); return;
+   case M_RESIDENT: Row_printKBytes(str, this->m_resident, coloring); return;
+   case M_VIRT: Row_printKBytes(str, this->m_virt, coloring); return;
+   case NICE:
+      xSnprintf(buffer, n, "%3ld ", this->nice);
+      attr = this->nice < 0 ? CRT_colors[PROCESS_HIGH_PRIORITY]
+         : this->nice > 0 ? CRT_colors[PROCESS_LOW_PRIORITY]
+         : CRT_colors[PROCESS_SHADOW];
+      break;
+   case NLWP:
+      if (this->nlwp == 1)
+         attr = CRT_colors[PROCESS_SHADOW];
+
+      xSnprintf(buffer, n, "%4ld ", this->nlwp);
+      break;
+   case PERCENT_CPU: Row_printPercentage(this->percent_cpu, buffer, n, Row_fieldWidths[PERCENT_CPU], &attr); break;
+   case PERCENT_NORM_CPU: {
+      float cpuPercentage = this->percent_cpu / host->activeCPUs;
+      Row_printPercentage(cpuPercentage, buffer, n, Row_fieldWidths[PERCENT_CPU], &attr);
+      break;
+   }
+   case PERCENT_MEM: Row_printPercentage(this->percent_mem, buffer, n, 4, &attr); break;
+   case PGRP: xSnprintf(buffer, n, "%*d ", Process_pidDigits, this->pgrp); break;
+   case PID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, Process_getPid(this)); break;
+   case PPID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, Process_getParent(this)); break;
+   case PRIORITY:
+      if (this->priority <= -100)
+         xSnprintf(buffer, n, " RT ");
+      else
+         xSnprintf(buffer, n, "%3ld ", this->priority);
+      break;
+   case PROCESSOR: xSnprintf(buffer, n, "%3d ", Settings_cpuId(settings, this->processor)); break;
+   case SCHEDULERPOLICY: {
+      const char* schedPolStr = "N/A";
+#ifdef SCHEDULER_SUPPORT
+      if (this->scheduling_policy >= 0)
+         schedPolStr = Scheduling_formatPolicy(this->scheduling_policy);
+#endif
+      xSnprintf(buffer, n, "%-5s ", schedPolStr);
+      break;
+   }
+   case SESSION: xSnprintf(buffer, n, "%*d ", Process_pidDigits, this->session); break;
+   case STARTTIME: xSnprintf(buffer, n, "%s", this->starttime_show); break;
+   case STATE:
+      xSnprintf(buffer, n, "%c ", processStateChar(this->state));
+      switch (this->state) {
+      case RUNNABLE:
+      case RUNNING:
+      case TRACED:
+         attr = CRT_colors[PROCESS_RUN_STATE];
+         break;
+
+      case BLOCKED:
+      case DEFUNCT:
+      case STOPPED:
+      case UNINTERRUPTIBLE_WAIT:
+      case ZOMBIE:
+         attr = CRT_colors[PROCESS_D_STATE];
+         break;
+
+      case QUEUED:
+      case WAITING:
+      case IDLE:
+      case SLEEPING:
+         attr = CRT_colors[PROCESS_SHADOW];
+         break;
+
+      case UNKNOWN:
+      case PAGING:
+         break;
+      }
+      break;
+   case ST_UID: xSnprintf(buffer, n, "%*d ", Process_uidDigits, this->st_uid); break;
+   case TIME: Row_printTime(str, this->time, coloring); return;
+   case TGID:
+      if (Process_getThreadGroup(this) == Process_getPid(this))
+         attr = CRT_colors[PROCESS_SHADOW];
+
+      xSnprintf(buffer, n, "%*d ", Process_pidDigits, Process_getThreadGroup(this));
+      break;
+   case TPGID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, this->tpgid); break;
+   case TTY:
+      if (!this->tty_name) {
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, "(no tty) ");
+      } else {
+         const char* name = String_startsWith(this->tty_name, "/dev/") ? (this->tty_name + strlen("/dev/")) : this->tty_name;
+         xSnprintf(buffer, n, "%-8s ", name);
+      }
+      break;
+   case USER:
+      if (this->elevated_priv)
+         attr = CRT_colors[PROCESS_PRIV];
+      else if (host->htopUserId != this->st_uid)
+         attr = CRT_colors[PROCESS_SHADOW];
+
+      if (this->user) {
+         Row_printLeftAlignedField(str, attr, this->user, 10);
+         return;
+      }
+
+      xSnprintf(buffer, n, "%-10d ", this->st_uid);
+      break;
+   default:
+      if (DynamicColumn_writeField(this, str, field))
+         return;
+      assert(0 && "Process_writeField: default key reached"); /* should never be reached */
+      xSnprintf(buffer, n, "- ");
+      break;
+   }
+
+   RichString_appendAscii(str, attr, buffer);
+}
+
+void Process_done(Process* this) {
+   assert(this != NULL);
+   free(this->cmdline);
+   free(this->procComm);
+   free(this->procExe);
+   free(this->procCwd);
+   free(this->mergedCommand.str);
+   free(this->tty_name);
+}
+
+/* This function returns the string displayed in Command column, so that sorting
+ * happens on what is displayed - whether comm, full path, basename, etc.. So
+ * this follows Process_writeField(COMM) and Process_writeCommand */
+const char* Process_getCommand(const Process* this) {
+   const Settings* settings = this->super.host->settings;
+
+   if ((Process_isUserlandThread(this) && settings->showThreadNames) || !this->mergedCommand.str) {
+      return this->cmdline;
+   }
+
+   return this->mergedCommand.str;
+}
+
+static const char* Process_getSortKey(const Process* this) {
+   return Process_getCommand(this);
+}
+
+const char* Process_rowGetSortKey(Row* super) {
+   const Process* this = (const Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_getSortKey(this);
+}
+
+/* Test whether display must highlight this row (if the htop UID matches) */
+static bool Process_isHighlighted(const Process* this) {
+   const Machine* host = this->super.host;
+   const Settings* settings = host->settings;
+   return settings->shadowOtherUsers && this->st_uid != host->htopUserId;
+}
+
+bool Process_rowIsHighlighted(const Row* super) {
+   const Process* this = (const Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_isHighlighted(this);
+}
+
+/* Test whether display must follow parent process (if this thread is hidden) */
+static bool Process_isVisible(const Process* p, const Settings* settings) {
+   if (settings->hideUserlandThreads)
+      return !Process_isThread(p);
+   return true;
+}
+
+bool Process_rowIsVisible(const Row* super, const Table* table) {
+   const Process* this = (const Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_isVisible(this, table->host->settings);
+}
+
+/* Test whether display must filter out this process (various mechanisms) */
+static bool Process_matchesFilter(const Process* this, const Table* table) {
+   const Machine* host = table->host;
+   if (host->userId != (uid_t) -1 && this->st_uid != host->userId)
+      return true;
+
+   const char* incFilter = table->incFilter;
+   if (incFilter && !String_contains_i(Process_getCommand(this), incFilter, true))
+      return true;
+
+   const ProcessTable* pt = (const ProcessTable*) host->activeTable;
+   assert(Object_isA((const Object*) pt, (const ObjectClass*) &ProcessTable_class));
+   if (pt->pidMatchList && !Hashtable_get(pt->pidMatchList, Process_getThreadGroup(this)))
+      return true;
+
+   return false;
+}
+
+bool Process_rowMatchesFilter(const Row* super, const Table* table) {
+   const Process* this = (const Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_matchesFilter(this, table);
+}
+
+void Process_init(Process* this, const Machine* host) {
+   Row_init(&this->super, host);
+
+   this->cmdlineBasenameEnd = -1;
+   this->st_uid = (uid_t)-1;
+}
+
+static bool Process_setPriority(Process* this, int priority) {
+   if (Settings_isReadonly())
+      return false;
+
+   int old_prio = getpriority(PRIO_PROCESS, Process_getPid(this));
+   int err = setpriority(PRIO_PROCESS, Process_getPid(this), priority);
+
+   if (err == 0 && old_prio != getpriority(PRIO_PROCESS, Process_getPid(this))) {
+      this->nice = priority;
+   }
+   return (err == 0);
+}
+
+bool Process_rowSetPriority(Row* super, int priority) {
+   Process* this = (Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_setPriority(this, priority);
+}
+
+bool Process_rowChangePriorityBy(Row* super, Arg delta) {
+   Process* this = (Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_setPriority(this, this->nice + delta.i);
+}
+
+static bool Process_sendSignal(Process* this, Arg sgn) {
+   return kill(Process_getPid(this), sgn.i) == 0;
+}
+
+bool Process_rowSendSignal(Row* super, Arg sgn) {
+   Process* this = (Process*) super;
+   assert(Object_isA((const Object*) this, (const ObjectClass*) &Process_class));
+   return Process_sendSignal(this, sgn);
+}
+
+int Process_compare(const void* v1, const void* v2) {
+   const Process* p1 = (const Process*)v1;
+   const Process* p2 = (const Process*)v2;
+
+   const ScreenSettings* ss = p1->super.host->settings->ss;
+
+   ProcessField key = ScreenSettings_getActiveSortKey(ss);
+
+   int result = Process_compareByKey(p1, p2, key);
+
+   // Implement tie-breaker (needed to make tree mode more stable)
+   if (!result)
+      return SPACESHIP_NUMBER(Process_getPid(p1), Process_getPid(p2));
+
+   return (ScreenSettings_getActiveDirection(ss) == 1) ? result : -result;
+}
+
+int Process_compareByParent(const Row* r1, const Row* r2) {
+   int result = Row_compareByParent_Base(r1, r2);
+
+   if (result != 0)
+      return result;
+
+   return Process_compare(r1, r2);
+}
+
+int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key) {
+   int r;
+
+   switch (key) {
+   case PERCENT_CPU:
+   case PERCENT_NORM_CPU:
+      return compareRealNumbers(p1->percent_cpu, p2->percent_cpu);
+   case PERCENT_MEM:
+      return SPACESHIP_NUMBER(p1->m_resident, p2->m_resident);
+   case COMM:
+      return SPACESHIP_NULLSTR(Process_getCommand(p1), Process_getCommand(p2));
+   case PROC_COMM: {
+      const char* comm1 = p1->procComm ? p1->procComm : (Process_isKernelThread(p1) ? kthreadID : "");
+      const char* comm2 = p2->procComm ? p2->procComm : (Process_isKernelThread(p2) ? kthreadID : "");
+      return SPACESHIP_NULLSTR(comm1, comm2);
+   }
+   case PROC_EXE: {
+      const char* exe1 = p1->procExe ? (p1->procExe + p1->procExeBasenameOffset) : (Process_isKernelThread(p1) ? kthreadID : "");
+      const char* exe2 = p2->procExe ? (p2->procExe + p2->procExeBasenameOffset) : (Process_isKernelThread(p2) ? kthreadID : "");
+      return SPACESHIP_NULLSTR(exe1, exe2);
+   }
+   case CWD:
+      return SPACESHIP_NULLSTR(p1->procCwd, p2->procCwd);
+   case ELAPSED:
+      r = -SPACESHIP_NUMBER(p1->starttime_ctime, p2->starttime_ctime);
+      return r != 0 ? r : SPACESHIP_NUMBER(Process_getPid(p1), Process_getPid(p2));
+   case MAJFLT:
+      return SPACESHIP_NUMBER(p1->majflt, p2->majflt);
+   case MINFLT:
+      return SPACESHIP_NUMBER(p1->minflt, p2->minflt);
+   case M_RESIDENT:
+      return SPACESHIP_NUMBER(p1->m_resident, p2->m_resident);
+   case M_VIRT:
+      return SPACESHIP_NUMBER(p1->m_virt, p2->m_virt);
+   case NICE:
+      return SPACESHIP_NUMBER(p1->nice, p2->nice);
+   case NLWP:
+      return SPACESHIP_NUMBER(p1->nlwp, p2->nlwp);
+   case PGRP:
+      return SPACESHIP_NUMBER(p1->pgrp, p2->pgrp);
+   case PID:
+      return SPACESHIP_NUMBER(Process_getPid(p1), Process_getPid(p2));
+   case PPID:
+      return SPACESHIP_NUMBER(Process_getParent(p1), Process_getParent(p2));
+   case PRIORITY:
+      return SPACESHIP_NUMBER(p1->priority, p2->priority);
+   case PROCESSOR:
+      return SPACESHIP_NUMBER(p1->processor, p2->processor);
+   case SCHEDULERPOLICY:
+      return SPACESHIP_NUMBER(p1->scheduling_policy, p2->scheduling_policy);
+   case SESSION:
+      return SPACESHIP_NUMBER(p1->session, p2->session);
+   case STARTTIME:
+      r = SPACESHIP_NUMBER(p1->starttime_ctime, p2->starttime_ctime);
+      return r != 0 ? r : SPACESHIP_NUMBER(Process_getPid(p1), Process_getPid(p2));
+   case STATE:
+      return SPACESHIP_NUMBER(p1->state, p2->state);
+   case ST_UID:
+      return SPACESHIP_NUMBER(p1->st_uid, p2->st_uid);
+   case TIME:
+      return SPACESHIP_NUMBER(p1->time, p2->time);
+   case TGID:
+      return SPACESHIP_NUMBER(Process_getThreadGroup(p1), Process_getThreadGroup(p2));
+   case TPGID:
+      return SPACESHIP_NUMBER(p1->tpgid, p2->tpgid);
+   case TTY:
+      /* Order no tty last */
+      return SPACESHIP_DEFAULTSTR(p1->tty_name, p2->tty_name, "\x7F");
+   case USER:
+      return SPACESHIP_NULLSTR(p1->user, p2->user);
+   default:
+      CRT_debug("Process_compareByKey_Base() called with key %d", key);
+      assert(0 && "Process_compareByKey_Base: default key reached"); /* should never be reached */
+      return SPACESHIP_NUMBER(Process_getPid(p1), Process_getPid(p2));
+   }
+}
+
+void Process_updateComm(Process* this, const char* comm) {
+   if (!this->procComm && !comm)
+      return;
+
+   if (this->procComm && comm && String_eq(this->procComm, comm))
+      return;
+
+   free(this->procComm);
+   this->procComm = comm ? xStrdup(comm) : NULL;
+
+   this->mergedCommand.lastUpdate = 0;
+}
+
+static int skipPotentialPath(const char* cmdline, int end) {
+   if (cmdline[0] != '/')
+      return 0;
+
+   int slash = 0;
+   for (int i = 1; i < end; i++) {
+      if (cmdline[i] == '/' && cmdline[i + 1] != '\0') {
+         slash = i + 1;
+         continue;
+      }
+
+      if (cmdline[i] == ' ' && cmdline[i - 1] != '\\')
+         return slash;
+
+      if (cmdline[i] == ':' && cmdline[i + 1] == ' ')
+         return slash;
+   }
+
+   return slash;
+}
+
+void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart, int basenameEnd) {
+   assert(basenameStart >= 0);
+   assert((cmdline && basenameStart < (int)strlen(cmdline)) || (!cmdline && basenameStart == 0));
+   assert((basenameEnd > basenameStart) || (basenameEnd == 0 && basenameStart == 0));
+   assert((cmdline && basenameEnd <= (int)strlen(cmdline)) || (!cmdline && basenameEnd == 0));
+
+   if (!this->cmdline && !cmdline)
+      return;
+
+   if (this->cmdline && cmdline && String_eq(this->cmdline, cmdline))
+      return;
+
+   free(this->cmdline);
+   this->cmdline = cmdline ? xStrdup(cmdline) : NULL;
+   this->cmdlineBasenameStart = (basenameStart || !cmdline) ? basenameStart : skipPotentialPath(cmdline, basenameEnd);
+   this->cmdlineBasenameEnd = basenameEnd;
+
+   this->mergedCommand.lastUpdate = 0;
+}
+
+void Process_updateExe(Process* this, const char* exe) {
+   if (!this->procExe && !exe)
+      return;
+
+   if (this->procExe && exe && String_eq(this->procExe, exe))
+      return;
+
+   free(this->procExe);
+   if (exe) {
+      this->procExe = xStrdup(exe);
+      const char* lastSlash = strrchr(exe, '/');
+      this->procExeBasenameOffset = (lastSlash && *(lastSlash + 1) != '\0' && lastSlash != exe) ? (lastSlash - exe + 1) : 0;
+   } else {
+      this->procExe = NULL;
+      this->procExeBasenameOffset = 0;
+   }
+
+   this->mergedCommand.lastUpdate = 0;
+}
+
+void Process_updateCPUFieldWidths(float percentage) {
+   if (percentage < 99.9F) {
+      Row_updateFieldWidth(PERCENT_CPU, 4);
+      Row_updateFieldWidth(PERCENT_NORM_CPU, 4);
+      return;
+   }
+
+   // Add additional two characters, one for "." and another for precision.
+   uint8_t width = ceil(log10(percentage + 0.1)) + 2;
+
+   Row_updateFieldWidth(PERCENT_CPU, width);
+   Row_updateFieldWidth(PERCENT_NORM_CPU, width);
+}
+
+const ProcessClass Process_class = {
+   .super = {
+      .super = {
+         .extends = Class(Row),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .sortKeyString = Process_rowGetSortKey,
+      .compareByParent = Process_compareByParent,
+      .writeField = Process_rowWriteField
+   },
+};
diff --git a/Process.h b/Process.h
new file mode 100644
index 0000000..3903a40
--- /dev/null
+++ b/Process.h
@@ -0,0 +1,328 @@
+#ifndef HEADER_Process
+#define HEADER_Process
+/*
+htop - Process.h
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "Object.h"
+#include "RichString.h"
+#include "Row.h"
+#include "RowField.h"
+
+
+#define PROCESS_FLAG_IO              0x00000001
+#define PROCESS_FLAG_CWD             0x00000002
+#define PROCESS_FLAG_SCHEDPOL        0x00000004
+
+#define DEFAULT_HIGHLIGHT_SECS 5
+
+/* Core process states (shared by platforms)
+ * NOTE: The enum has an ordering that is important!
+ * See processStateChar in process.c for ProcessSate -> letter mapping */
+typedef enum ProcessState_ {
+   UNKNOWN = 1,
+   RUNNABLE,
+   RUNNING,
+   QUEUED,
+   WAITING,
+   UNINTERRUPTIBLE_WAIT,
+   BLOCKED,
+   PAGING,
+   STOPPED,
+   TRACED,
+   ZOMBIE,
+   DEFUNCT,
+   IDLE,
+   SLEEPING
+} ProcessState;
+
+struct Machine_;  // IWYU pragma: keep
+struct Settings_; // IWYU pragma: keep
+
+/* Holds information about regions of the cmdline that should be
+ * highlighted (e.g. program basename, delimiter, comm). */
+typedef struct ProcessCmdlineHighlight_ {
+   size_t offset; /* first character to highlight */
+   size_t length; /* How many characters to highlight, zero if unused */
+   int attr;      /* The attributes used to highlight */
+   int flags;     /* Special flags used for selective highlighting, zero for always */
+} ProcessCmdlineHighlight;
+
+/* ProcessMergedCommand is populated by Process_makeCommandStr: It
+ * contains the merged Command string, and the information needed by
+ * Process_writeCommand to color the string. str will be NULL for kernel
+ * threads and zombies */
+typedef struct ProcessMergedCommand_ {
+   uint64_t lastUpdate;                        /* Marker based on settings->lastUpdate to track when the rendering needs refreshing */
+   char* str;                                  /* merged Command string */
+   size_t highlightCount;                      /* how many portions of cmdline to highlight */
+   ProcessCmdlineHighlight highlights[8];      /* which portions of cmdline to highlight */
+} ProcessMergedCommand;
+
+typedef struct Process_ {
+   /* Super object for emulated OOP */
+   Row super;
+
+   /* Process group identifier */
+   int pgrp;
+
+   /* Session identifier */
+   int session;
+
+   /* Foreground group identifier of the controlling terminal */
+   int tpgid;
+
+   /* This is a kernel (helper) task */
+   bool isKernelThread;
+
+   /* This is a userland thread / LWP */
+   bool isUserlandThread;
+
+   /* This process is running inside a container */
+   bool isRunningInContainer;
+
+   /* Controlling terminal identifier of the process */
+   unsigned long int tty_nr;
+
+   /* Controlling terminal name of the process */
+   char* tty_name;
+
+   /* User identifier */
+   uid_t st_uid;
+
+   /* User name */
+   const char* user;
+
+   /* Non root owned process with elevated privileges
+    * Linux:
+    *   - from file capabilities
+    *   - inherited from the ambient set
+    */
+   bool elevated_priv;
+
+   /* Process runtime (in hundredth of a second) */
+   unsigned long long int time;
+
+   /*
+    * Process name including arguments.
+    * Use Process_getCommand() for Command actually displayed.
+    */
+   char* cmdline;
+
+   /* End Offset in cmdline of the process basename */
+   int cmdlineBasenameEnd;
+
+   /* Start Offset in cmdline of the process basename */
+   int cmdlineBasenameStart;
+
+   /* The process' "command" name */
+   char* procComm;
+
+   /* The main process executable */
+   char* procExe;
+
+   /* The process/thread working directory */
+   char* procCwd;
+
+   /* Offset in procExe of the process basename */
+   int procExeBasenameOffset;
+
+   /* Tells if the executable has been replaced in the filesystem since start */
+   bool procExeDeleted;
+
+   /* Tells if the process uses replaced shared libraries since start */
+   bool usesDeletedLib;
+
+   /* CPU number last executed on */
+   int processor;
+
+   /* CPU usage during last cycle (in percent) */
+   float percent_cpu;
+
+   /* Memory usage during last cycle (in percent) */
+   float percent_mem;
+
+   /* Scheduling priority */
+   long int priority;
+
+   /* Nice value */
+   long int nice;
+
+   /* Number of threads in this process */
+   long int nlwp;
+
+   /* Process start time (in seconds elapsed since the Epoch) */
+   time_t starttime_ctime;
+
+   /* Process start time (cached formatted string) */
+   char starttime_show[8];
+
+   /* Total program size (in kilobytes) */
+   long m_virt;
+
+   /* Resident set size (in kilobytes) */
+   long m_resident;
+
+   /* Number of minor faults the process has made which have not required loading a memory page from disk */
+   unsigned long int minflt;
+
+   /* Number of major faults the process has made which have required loading a memory page from disk */
+   unsigned long int majflt;
+
+   /* Process state enum field (platform dependent) */
+   ProcessState state;
+
+   /* Current scheduling policy */
+   int scheduling_policy;
+
+   /*
+    * Internal state for merged Command display
+    */
+   ProcessMergedCommand mergedCommand;
+} Process;
+
+typedef struct ProcessFieldData_ {
+   /* Name (displayed in setup menu) */
+   const char* name;
+
+   /* Title (display in main screen); must have same width as the printed values */
+   const char* title;
+
+   /* Description (displayed in setup menu) */
+   const char* description;
+
+   /* Scan flag to enable scan-method otherwise not run */
+   uint32_t flags;
+
+   /* Whether the values are process identifiers; adjusts the width of title and values if true */
+   bool pidColumn;
+
+   /* Whether the column should be sorted in descending order by default */
+   bool defaultSortDesc;
+
+   /* Whether the column width is dynamically adjusted (the minimum width is determined by the title length) */
+   bool autoWidth;
+} ProcessFieldData;
+
+#define LAST_PROCESSFIELD LAST_RESERVED_FIELD
+typedef int32_t ProcessField;  /* see ReservedField list in RowField.h */
+
+// Implemented in platform-specific code:
+void Process_writeField(const Process* row, RichString* str, ProcessField field);
+int Process_compare(const void* v1, const void* v2);
+int Process_compareByParent(const Row* r1, const Row* v2);
+void Process_delete(Object* cast);
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+#define Process_pidDigits Row_pidDigits
+#define Process_uidDigits Row_uidDigits
+
+typedef Process* (*Process_New)(const struct Machine_*);
+typedef int (*Process_CompareByKey)(const Process*, const Process*, ProcessField);
+
+typedef struct ProcessClass_ {
+   const RowClass super;
+   const Process_CompareByKey compareByKey;
+} ProcessClass;
+
+#define As_Process(this_)   ((const ProcessClass*)((this_)->super.super.klass))
+
+#define Process_compareByKey(p1_, p2_, key_)   (As_Process(p1_)->compareByKey ? (As_Process(p1_)->compareByKey(p1_, p2_, key_)) : Process_compareByKey_Base(p1_, p2_, key_))
+
+
+static inline void Process_setPid(Process* this, pid_t pid) {
+   this->super.id = pid;
+}
+
+static inline pid_t Process_getPid(const Process* this) {
+   return (pid_t)this->super.id;
+}
+
+static inline void Process_setThreadGroup(Process* this, pid_t pid) {
+   this->super.group = pid;
+}
+
+static inline pid_t Process_getThreadGroup(const Process* this) {
+   return (pid_t)this->super.group;
+}
+
+static inline void Process_setParent(Process* this, pid_t pid) {
+   this->super.parent = pid;
+}
+
+static inline pid_t Process_getParent(const Process* this) {
+   return (pid_t)this->super.parent;
+}
+
+static inline pid_t Process_getGroupOrParent(const Process* this) {
+   return Row_getGroupOrParent(&this->super);
+}
+
+static inline bool Process_isKernelThread(const Process* this) {
+   return this->isKernelThread;
+}
+
+static inline bool Process_isUserlandThread(const Process* this) {
+   return this->isUserlandThread;
+}
+
+static inline bool Process_isThread(const Process* this) {
+   return Process_isUserlandThread(this) || Process_isKernelThread(this);
+}
+
+#define CMDLINE_HIGHLIGHT_FLAG_SEPARATOR  0x00000001
+#define CMDLINE_HIGHLIGHT_FLAG_BASENAME   0x00000002
+#define CMDLINE_HIGHLIGHT_FLAG_COMM       0x00000004
+#define CMDLINE_HIGHLIGHT_FLAG_DELETED    0x00000008
+#define CMDLINE_HIGHLIGHT_FLAG_PREFIXDIR  0x00000010
+
+void Process_fillStarttimeBuffer(Process* this);
+
+void Process_done(Process* this);
+
+extern const ProcessClass Process_class;
+
+void Process_init(Process* this, const struct Machine_* host);
+
+const char* Process_rowGetSortKey(Row* super);
+
+bool Process_rowSetPriority(Row* super, int priority);
+
+bool Process_rowChangePriorityBy(Row* super, Arg delta);
+
+bool Process_rowSendSignal(Row* super, Arg sgn);
+
+bool Process_rowIsHighlighted(const Row* super);
+
+bool Process_rowIsVisible(const Row* super, const struct Table_* table);
+
+bool Process_rowMatchesFilter(const Row* super, const struct Table_* table);
+
+static inline int Process_pidEqualCompare(const void* v1, const void* v2) {
+   return Row_idEqualCompare(v1, v2);
+}
+
+int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key);
+
+const char* Process_getCommand(const Process* this);
+
+void Process_updateComm(Process* this, const char* comm);
+void Process_updateCmdline(Process* this, const char* cmdline, int basenameStart, int basenameEnd);
+void Process_updateExe(Process* this, const char* exe);
+
+/* This function constructs the string that is displayed by
+ * Process_writeCommand and also returned by Process_getCommand */
+void Process_makeCommandStr(Process* this, const struct Settings_ *settings);
+
+void Process_writeCommand(const Process* this, int attr, int baseAttr, RichString* str);
+
+void Process_updateCPUFieldWidths(float percentage);
+
+#endif
diff --git a/ProcessLocksScreen.c b/ProcessLocksScreen.c
new file mode 100644
index 0000000..36a37f9
--- /dev/null
+++ b/ProcessLocksScreen.c
@@ -0,0 +1,106 @@
+/*
+htop - ProcessLocksScreen.c
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ProcessLocksScreen.h"
+
+#include <inttypes.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#include "Panel.h"
+#include "Platform.h"
+#include "ProvideCurses.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+
+ProcessLocksScreen* ProcessLocksScreen_new(const Process* process) {
+   ProcessLocksScreen* this = xMalloc(sizeof(ProcessLocksScreen));
+   Object_setClass(this, Class(ProcessLocksScreen));
+   if (Process_isThread(process))
+      this->pid = Process_getThreadGroup(process);
+   else
+      this->pid = Process_getPid(process);
+
+   return (ProcessLocksScreen*) InfoScreen_init(&this->super, process, NULL, LINES - 2, "   FD TYPE       EXCLUSION  READ/WRITE DEVICE       NODE               START                 END  FILENAME");
+}
+
+void ProcessLocksScreen_delete(Object* this) {
+   free(InfoScreen_done((InfoScreen*)this));
+}
+
+static void ProcessLocksScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Snapshot of file locks of process %d - %s", ((ProcessLocksScreen*)this)->pid, Process_getCommand(this->process));
+}
+
+static inline void FileLocks_Data_clear(FileLocks_Data* data) {
+   free(data->locktype);
+   free(data->exclusive);
+   free(data->readwrite);
+   free(data->filename);
+}
+
+static void ProcessLocksScreen_scan(InfoScreen* this) {
+   Panel* panel = this->display;
+   int idx = Panel_getSelectedIndex(panel);
+   Panel_prune(panel);
+   FileLocks_ProcessData* pdata = Platform_getProcessLocks(((ProcessLocksScreen*)this)->pid);
+   if (!pdata) {
+      InfoScreen_addLine(this, "This feature is not supported on your platform.");
+   } else if (pdata->error) {
+      InfoScreen_addLine(this, "Could not determine file locks.");
+   } else {
+      FileLocks_LockData* ldata = pdata->locks;
+      if (!ldata) {
+         InfoScreen_addLine(this, "No locks have been found for the selected process.");
+      }
+      while (ldata) {
+         FileLocks_Data* data = &ldata->data;
+
+         char entry[512];
+         if (ULLONG_MAX == data->end) {
+            xSnprintf(entry, sizeof(entry), "%5d %-10s %-10s %-10s %#6"PRIx64" %10"PRIu64" %19"PRIu64" %19s  %s",
+               data->fd,
+               data->locktype, data->exclusive, data->readwrite,
+               (uint64_t) data->dev, data->inode,
+               data->start, "<END OF FILE>",
+               data->filename ? data->filename : "<N/A>"
+            );
+         } else {
+            xSnprintf(entry, sizeof(entry), "%5d %-10s %-10s %-10s %#6"PRIx64" %10"PRIu64" %19"PRIu64" %19"PRIu64"  %s",
+               data->fd,
+               data->locktype, data->exclusive, data->readwrite,
+               (uint64_t) data->dev, data->inode,
+               data->start, data->end,
+               data->filename ? data->filename : "<N/A>"
+            );
+         }
+
+         InfoScreen_addLine(this, entry);
+         FileLocks_Data_clear(&ldata->data);
+
+         FileLocks_LockData* old = ldata;
+         ldata = ldata->next;
+         free(old);
+      }
+   }
+   free(pdata);
+   Vector_insertionSort(this->lines);
+   Vector_insertionSort(panel->items);
+   Panel_setSelected(panel, idx);
+}
+
+const InfoScreenClass ProcessLocksScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = ProcessLocksScreen_delete
+   },
+   .scan = ProcessLocksScreen_scan,
+   .draw = ProcessLocksScreen_draw
+};
diff --git a/ProcessLocksScreen.h b/ProcessLocksScreen.h
new file mode 100644
index 0000000..417df7b
--- /dev/null
+++ b/ProcessLocksScreen.h
@@ -0,0 +1,52 @@
+#ifndef HEADER_ProcessLocksScreen
+#define HEADER_ProcessLocksScreen
+/*
+htop - ProcessLocksScreen.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct ProcessLocksScreen_ {
+   InfoScreen super;
+   pid_t pid;
+} ProcessLocksScreen;
+
+typedef struct FileLocks_Data_ {
+   char* locktype;
+   char* exclusive;
+   char* readwrite;
+   char* filename;
+   int fd;
+   dev_t dev;
+   uint64_t inode;
+   uint64_t start;
+   uint64_t end;
+} FileLocks_Data;
+
+typedef struct FileLocks_LockData_ {
+   FileLocks_Data data;
+   struct FileLocks_LockData_* next;
+} FileLocks_LockData;
+
+typedef struct FileLocks_ProcessData_ {
+   bool error;
+   struct FileLocks_LockData_* locks;
+} FileLocks_ProcessData;
+
+extern const InfoScreenClass ProcessLocksScreen_class;
+
+ProcessLocksScreen* ProcessLocksScreen_new(const Process* process);
+
+void ProcessLocksScreen_delete(Object* this);
+
+#endif
diff --git a/ProcessTable.c b/ProcessTable.c
new file mode 100644
index 0000000..ac6fc70
--- /dev/null
+++ b/ProcessTable.c
@@ -0,0 +1,92 @@
+/*
+htop - ProcessTable.c
+(C) 2004,2005 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ProcessTable.h"
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include "Hashtable.h"
+#include "Row.h"
+#include "Settings.h"
+#include "Vector.h"
+
+
+void ProcessTable_init(ProcessTable* this, const ObjectClass* klass, Machine* host, Hashtable* pidMatchList) {
+   Table_init(&this->super, klass, host);
+
+   this->pidMatchList = pidMatchList;
+}
+
+void ProcessTable_done(ProcessTable* this) {
+   Table_done(&this->super);
+}
+
+Process* ProcessTable_getProcess(ProcessTable* this, pid_t pid, bool* preExisting, Process_New constructor) {
+   const Table* table = &this->super;
+   Process* proc = (Process*) Hashtable_get(table->table, pid);
+   *preExisting = proc != NULL;
+   if (proc) {
+      assert(Vector_indexOf(table->rows, proc, Row_idEqualCompare) != -1);
+      assert(Process_getPid(proc) == pid);
+   } else {
+      proc = constructor(table->host);
+      assert(proc->cmdline == NULL);
+      Process_setPid(proc, pid);
+   }
+   return proc;
+}
+
+static void ProcessTable_prepareEntries(Table* super) {
+   ProcessTable* this = (ProcessTable*) super;
+   this->totalTasks = 0;
+   this->userlandThreads = 0;
+   this->kernelThreads = 0;
+   this->runningTasks = 0;
+
+   Table_prepareEntries(super);
+}
+
+static void ProcessTable_iterateEntries(Table* super) {
+   ProcessTable* this = (ProcessTable*) super;
+   // calling into platform-specific code
+   ProcessTable_goThroughEntries(this);
+}
+
+static void ProcessTable_cleanupEntries(Table* super) {
+   Machine* host = super->host;
+   const Settings* settings = host->settings;
+
+   // Finish process table update, culling any exit'd processes
+   for (int i = Vector_size(super->rows) - 1; i >= 0; i--) {
+      Process* p = (Process*) Vector_get(super->rows, i);
+
+      // tidy up Process state after refreshing the ProcessTable table
+      Process_makeCommandStr(p, settings);
+
+      // keep track of the highest UID for column scaling
+      if (p->st_uid > host->maxUserId)
+         host->maxUserId = p->st_uid;
+
+      Table_cleanupRow(super, (Row*) p, i);
+   }
+
+   // compact the table in case of deletions
+   Table_compact(super);
+}
+
+const TableClass ProcessTable_class = {
+   .super = {
+      .extends = Class(Table),
+      .delete = ProcessTable_delete,
+   },
+   .prepare = ProcessTable_prepareEntries,
+   .iterate = ProcessTable_iterateEntries,
+   .cleanup = ProcessTable_cleanupEntries,
+};
diff --git a/ProcessTable.h b/ProcessTable.h
new file mode 100644
index 0000000..96a517a
--- /dev/null
+++ b/ProcessTable.h
@@ -0,0 +1,52 @@
+#ifndef HEADER_ProcessTable
+#define HEADER_ProcessTable
+/*
+htop - ProcessTable.h
+(C) 2004,2005 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Object.h"
+#include "Process.h"
+#include "Table.h"
+
+
+typedef struct ProcessTable_ {
+   Table super;
+
+   Hashtable* pidMatchList;
+
+   unsigned int totalTasks;
+   unsigned int runningTasks;
+   unsigned int userlandThreads;
+   unsigned int kernelThreads;
+} ProcessTable;
+
+/* Implemented by platforms */
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList);
+void ProcessTable_delete(Object* cast);
+void ProcessTable_goThroughEntries(ProcessTable* this);
+
+void ProcessTable_init(ProcessTable* this, const ObjectClass* klass, Machine* host, Hashtable* pidMatchList);
+
+void ProcessTable_done(ProcessTable* this);
+
+extern const TableClass ProcessTable_class;
+
+static inline void ProcessTable_add(ProcessTable* this, Process* process) {
+   Table_add(&this->super, &process->super);
+}
+
+Process* ProcessTable_getProcess(ProcessTable* this, pid_t pid, bool* preExisting, Process_New constructor);
+
+static inline Process* ProcessTable_findProcess(ProcessTable* this, pid_t pid) {
+   return (Process*) Table_findRow(&this->super, pid);
+}
+
+#endif
diff --git a/ProvideCurses.h b/ProvideCurses.h
new file mode 100644
index 0000000..7ae99e6
--- /dev/null
+++ b/ProvideCurses.h
@@ -0,0 +1,34 @@
+#ifndef HEADER_ProvideCurses
+#define HEADER_ProvideCurses
+/*
+htop - ProvideCurses.h
+(C) 2004,2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#include "config.h" // IWYU pragma: keep
+
+// IWYU pragma: begin_exports
+
+#if defined(HAVE_NCURSESW_CURSES_H)
+#include <ncursesw/curses.h>
+#elif defined(HAVE_NCURSES_NCURSES_H)
+#include <ncurses/ncurses.h>
+#elif defined(HAVE_NCURSES_CURSES_H)
+#include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+#include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+#include <curses.h>
+#endif
+
+#ifdef HAVE_LIBNCURSESW
+#include <wchar.h>
+#include <wctype.h>
+#endif
+
+// IWYU pragma: end_exports
+
+#endif // HEADER_ProvideCurses
diff --git a/ProvideTerm.h b/ProvideTerm.h
new file mode 100644
index 0000000..a8910f1
--- /dev/null
+++ b/ProvideTerm.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_ProvideTerm
+#define HEADER_ProvideTerm
+/*
+htop - ProvideTerm.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+// IWYU pragma: begin_exports
+
+#if defined(HAVE_NCURSESW_TERM_H)
+#include <ncursesw/term.h>
+#elif defined(HAVE_NCURSES_TERM_H)
+#include <ncurses/term.h>
+#elif defined(HAVE_TERM_H)
+#include <term.h>
+#endif
+
+// IWYU pragma: end_exports
+
+#endif // HEADER_ProvideTerm
diff --git a/README b/README
new file mode 100644
index 0000000..7ace7cd
--- /dev/null
+++ b/README
@@ -0,0 +1,188 @@
+# [![htop logo](htop.png)](https://htop.dev)
+
+[![CI](https://github.com/htop-dev/htop/workflows/CI/badge.svg)](https://github.com/htop-dev/htop/actions)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/21665/badge.svg)](https://scan.coverity.com/projects/21665)
+[![Mailing List](https://img.shields.io/badge/Mailing%20List-htop-blue.svg)](https://groups.io/g/htop)
+[![IRC #htop](https://img.shields.io/badge/IRC-htop-blue.svg)](https://web.libera.chat/#htop)
+[![GitHub Release](https://img.shields.io/github/release/htop-dev/htop.svg)](https://github.com/htop-dev/htop/releases/latest)
+[![Packaging status](https://repology.org/badge/tiny-repos/htop.svg)](https://repology.org/project/htop/versions)
+[![License: GPL v2+](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](COPYING?raw=true)
+
+![Screenshot of htop](docs/images/screenshot.png?raw=true)
+
+## Introduction
+
+`htop` is a cross-platform interactive process viewer.
+
+`htop` allows scrolling the list of processes vertically and horizontally to see their full command lines and related information like memory and CPU consumption.
+Also system wide information, like load average or swap usage, is shown.
+
+The information displayed is configurable through a graphical setup and can be sorted and filtered interactively.
+
+Tasks related to processes (e.g. killing and renicing) can be done without entering their PIDs.
+
+Running `htop` requires `ncurses` libraries, typically named libncurses(w).
+
+`htop` is written in C.
+
+For more information and details visit [htop.dev](https://htop.dev).
+
+## Build instructions
+
+### Prerequisite
+List of build-time dependencies:
+  * standard GNU autotools-based C toolchain
+    - C99 compliant compiler
+    - `autoconf`
+    - `automake`
+    - `autotools`
+  * `ncurses`
+
+**Note about `ncurses`:**
+> `htop` requires `ncurses` 6.0. Be aware the appropriate package is sometimes still called libncurses5 (on Debian/Ubuntu). Also `ncurses` usually comes in two flavours:
+>* With Unicode support.
+>* Without Unicode support.
+>
+> This is also something that is reflected in the package name on Debian/Ubuntu (via the additional 'w' - 'w'ide character support).
+
+List of additional build-time dependencies (based on feature flags):
+*  `sensors`
+*  `hwloc`
+*  `libcap` (v2.21 or later)
+*  `libnl-3`
+
+Install these and other required packages for C development from your package manager.
+
+**Debian/Ubuntu**
+~~~ shell
+sudo apt install libncursesw5-dev autotools-dev autoconf automake build-essential
+~~~
+
+**Fedora/RHEL**
+~~~ shell
+sudo dnf install ncurses-devel automake autoconf gcc
+~~~
+
+**Archlinux/Manjaro**
+~~~ shell
+sudo pacman -S ncurses automake autoconf gcc
+~~~
+
+**macOS**
+~~~ shell
+brew install ncurses automake autoconf gcc
+~~~
+
+### Compile from source:
+To compile from source, download from the Git repository (`git clone` or downloads from [GitHub releases](https://github.com/htop-dev/htop/releases/)), then run:
+~~~ shell
+./autogen.sh && ./configure && make
+~~~
+
+### Install
+To install on the local system run `make install`. By default `make install` installs into `/usr/local`. To change this path use `./configure --prefix=/some/path`.
+
+### Build Options
+
+`htop` has several build-time options to enable/disable additional features.
+
+#### Generic
+
+  * `--enable-unicode`:
+    enable Unicode support
+    - dependency: *libncursesw*
+    - default: *yes*
+  * `--enable-affinity`:
+    enable `sched_setaffinity(2)` and `sched_getaffinity(2)` for affinity support; conflicts with hwloc
+    - default: *check*
+  * `--enable-hwloc`:
+    enable hwloc support for CPU affinity; disables affinity support
+    - dependency: *libhwloc*
+    - default: *no*
+  * `--enable-static`:
+    build a static htop binary; hwloc and delay accounting are not supported
+    - default: *no*
+  * `--enable-debug`:
+    Enable asserts and internal sanity checks; implies a performance penalty
+    - default: *no*
+
+#### Performance Co-Pilot
+
+  * `--enable-pcp`:
+    enable Performance Co-Pilot support via a new pcp-htop utility
+    - dependency: *libpcp*
+    - default: *no*
+
+#### Linux
+
+  * `--enable-sensors`:
+    enable libsensors(3) support for reading temperature data
+    - dependencies: *libsensors-dev*(build-time), at runtime *libsensors* is loaded via `dlopen(3)` if available
+    - default: *check*
+  * `--enable-capabilities`:
+    enable Linux capabilities support
+    - dependency: *libcap*
+    - default: *check*
+  * `--with-proc`:
+    location of a Linux-compatible proc filesystem
+    - default: */proc*
+  * `--enable-openvz`:
+    enable OpenVZ support
+    - default: *no*
+  * `--enable-vserver`:
+    enable VServer support
+    - default: *no*
+  * `--enable-ancient-vserver`:
+    enable ancient VServer support (implies `--enable-vserver`)
+    - default: *no*
+  * `--enable-delayacct`:
+    enable Linux delay accounting support
+    - dependencies: *pkg-config*(build-time), *libnl-3* and *libnl-genl-3*
+    - default: *check*
+
+
+## Runtime dependencies:
+`htop` has a set of fixed minimum runtime dependencies, which is kept as minimal as possible:
+* `ncurses` libraries for terminal handling (wide character support).
+
+### Runtime optional dependencies:
+`htop` has a set of fixed optional dependencies, depending on build/configure option used:
+
+#### Linux
+* `libdl`, if not building a static binary, is always required when support for optional dependencies (i.e. `libsensors`, `libsystemd`) is present.
+* `libcap`, user-space interfaces to POSIX 1003.1e capabilities, is always required when `--enable-capabilities` was used to configure `htop`.
+* `libsensors`, readout of temperatures and CPU speeds, is optional even when `--enable-sensors` was used to configure `htop`.
+* `libsystemd` is optional when `--enable-static` was not used to configure `htop`. If building statically and `libsystemd` is not found by `configure`, support for the systemd meter is disabled entirely.
+
+`htop` checks for the availability of the actual runtime libraries as `htop` runs.
+
+#### BSD
+On most BSD systems `kvm` is a requirement to read kernel information.
+
+More information on required and optional dependencies can be found in [configure.ac](configure.ac).
+
+## Usage
+See the manual page (`man htop`) or the help menu (**F1** or **h** inside `htop`) for a list of supported key commands.
+
+## Support
+
+If you have trouble running `htop` please consult your operating system / Linux distribution documentation for getting support and filing bugs.
+
+## Bugs, development feedback
+
+We have a [development mailing list](https://htop.dev/mailinglist.html). Feel free to subscribe for release announcements or asking questions on the development of `htop`.
+
+You can also join our IRC channel [#htop on Libera.Chat](https://web.libera.chat/#htop) and talk to the developers there.
+
+If you have found an issue within the source of `htop`, please check whether this has already been reported in our [GitHub issue tracker](https://github.com/htop-dev/htop/issues).
+If not, please file a new issue describing the problem you have found, the potential location in the source code you are referring to and a possible fix if available.
+
+## History
+
+`htop` was invented, developed and maintained by [Hisham Muhammad](https://hisham.hm/) from 2004 to 2019. His [legacy repository](https://github.com/hishamhm/htop/) has been archived to preserve the history.
+
+In 2020 a [team](https://github.com/orgs/htop-dev/people) took over the development amicably and continues to maintain `htop` collaboratively.
+
+## License
+
+GNU General Public License, version 2 (GPL-2.0) or, at your option, any later version.
diff --git a/README.md b/README.md
new file mode 120000
index 0000000..100b938
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+README
\ No newline at end of file
diff --git a/RichString.c b/RichString.c
new file mode 100644
index 0000000..ed852ad
--- /dev/null
+++ b/RichString.c
@@ -0,0 +1,223 @@
+/*
+htop - RichString.c
+(C) 2004,2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "RichString.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Macros.h"
+#include "XUtils.h"
+
+
+#define charBytes(n) (sizeof(CharType) * (n))
+
+static void RichString_extendLen(RichString* this, int len) {
+   if (this->chlen <= RICHSTRING_MAXLEN) {
+      if (len > RICHSTRING_MAXLEN) {
+         this->chptr = xMalloc(charBytes(len + 1));
+         memcpy(this->chptr, this->chstr, charBytes(this->chlen));
+      }
+   } else {
+      if (len <= RICHSTRING_MAXLEN) {
+         memcpy(this->chstr, this->chptr, charBytes(len));
+         free(this->chptr);
+         this->chptr = this->chstr;
+      } else {
+         this->chptr = xRealloc(this->chptr, charBytes(len + 1));
+      }
+   }
+
+   RichString_setChar(this, len, 0);
+   this->chlen = len;
+}
+
+static void RichString_setLen(RichString* this, int len) {
+   if (len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) {
+      RichString_setChar(this, len, 0);
+      this->chlen = len;
+   } else {
+      RichString_extendLen(this, len);
+   }
+}
+
+void RichString_rewind(RichString* this, int count) {
+   RichString_setLen(this, this->chlen - count);
+}
+
+#ifdef HAVE_LIBNCURSESW
+
+static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, int len) {
+   wchar_t data[len + 1];
+   len = mbstowcs(data, data_c, len);
+   if (len <= 0)
+      return 0;
+
+   int newLen = from + len;
+   RichString_setLen(this, newLen);
+   for (int i = from, j = 0; i < newLen; i++, j++) {
+      this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (iswprint(data[j]) ? data[j] : L'\xFFFD') } };
+   }
+
+   return len;
+}
+
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
+   wchar_t data[len + 1];
+   len = mbstowcs(data, data_c, len);
+   if (len <= 0)
+      return 0;
+
+   int from = this->chlen;
+   int newLen = from + len;
+   RichString_setLen(this, newLen);
+   int columnsWritten = 0;
+   int pos = from;
+   for (int j = 0; j < len; j++) {
+      wchar_t c = iswprint(data[j]) ? data[j] : L'\xFFFD';
+      int cwidth = wcwidth(c);
+      if (cwidth > *columns)
+         break;
+
+      *columns -= cwidth;
+      columnsWritten += cwidth;
+
+      this->chptr[pos] = (CharType) { .attr = attrs & 0xffffff, .chars = { c, '\0' } };
+      pos++;
+   }
+
+   RichString_setLen(this, pos);
+   *columns = columnsWritten;
+
+   return pos - from;
+}
+
+static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data, int from, int len) {
+   int newLen = from + len;
+   RichString_setLen(this, newLen);
+   for (int i = from, j = 0; i < newLen; i++, j++) {
+      this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (isprint(data[j]) ? data[j] : L'\xFFFD') } };
+   }
+
+   return len;
+}
+
+inline void RichString_setAttrn(RichString* this, int attrs, int start, int charcount) {
+   int end = CLAMP(start + charcount, 0, this->chlen);
+   for (int i = start; i < end; i++) {
+      this->chptr[i].attr = attrs;
+   }
+}
+
+void RichString_appendChr(RichString* this, int attrs, char c, int count) {
+   int from = this->chlen;
+   int newLen = from + count;
+   RichString_setLen(this, newLen);
+   for (int i = from; i < newLen; i++) {
+      this->chptr[i] = (CharType) { .attr = attrs, .chars = { c, 0 } };
+   }
+}
+
+int RichString_findChar(const RichString* this, char c, int start) {
+   const wchar_t wc = btowc(c);
+   const cchar_t* ch = this->chptr + start;
+   for (int i = start; i < this->chlen; i++) {
+      if (ch->chars[0] == wc)
+         return i;
+      ch++;
+   }
+   return -1;
+}
+
+#else /* HAVE_LIBNCURSESW */
+
+static inline int RichString_writeFromWide(RichString* this, int attrs, const char* data_c, int from, int len) {
+   int newLen = from + len;
+   RichString_setLen(this, newLen);
+   for (int i = from, j = 0; i < newLen; i++, j++) {
+      this->chptr[i] = (((unsigned char)data_c[j]) >= 32 ? ((unsigned char)data_c[j]) : '?') | attrs;
+   }
+   this->chptr[newLen] = 0;
+
+   return len;
+}
+
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data_c, int len, int* columns) {
+   int written = RichString_writeFromWide(this, attrs, data_c, this->chlen, MINIMUM(len, *columns));
+   *columns = written;
+   return written;
+}
+
+static inline int RichString_writeFromAscii(RichString* this, int attrs, const char* data_c, int from, int len) {
+   return RichString_writeFromWide(this, attrs, data_c, from, len);
+}
+
+void RichString_setAttrn(RichString* this, int attrs, int start, int charcount) {
+   int end = CLAMP(start + charcount, 0, this->chlen);
+   for (int i = start; i < end; i++) {
+      this->chptr[i] = (this->chptr[i] & 0xff) | attrs;
+   }
+}
+
+void RichString_appendChr(RichString* this, int attrs, char c, int count) {
+   int from = this->chlen;
+   int newLen = from + count;
+   RichString_setLen(this, newLen);
+   for (int i = from; i < newLen; i++) {
+      this->chptr[i] = c | attrs;
+   }
+}
+
+int RichString_findChar(const RichString* this, char c, int start) {
+   const chtype* ch = this->chptr + start;
+   for (int i = start; i < this->chlen; i++) {
+      if ((*ch & 0xff) == (chtype) c)
+         return i;
+      ch++;
+   }
+   return -1;
+}
+
+#endif /* HAVE_LIBNCURSESW */
+
+void RichString_delete(RichString* this) {
+   if (this->chlen > RICHSTRING_MAXLEN) {
+      free(this->chptr);
+      this->chptr = this->chstr;
+   }
+}
+
+void RichString_setAttr(RichString* this, int attrs) {
+   RichString_setAttrn(this, attrs, 0, this->chlen);
+}
+
+int RichString_appendWide(RichString* this, int attrs, const char* data) {
+   return RichString_writeFromWide(this, attrs, data, this->chlen, strlen(data));
+}
+
+int RichString_appendnWide(RichString* this, int attrs, const char* data, int len) {
+   return RichString_writeFromWide(this, attrs, data, this->chlen, len);
+}
+
+int RichString_writeWide(RichString* this, int attrs, const char* data) {
+   return RichString_writeFromWide(this, attrs, data, 0, strlen(data));
+}
+
+int RichString_appendAscii(RichString* this, int attrs, const char* data) {
+   return RichString_writeFromAscii(this, attrs, data, this->chlen, strlen(data));
+}
+
+int RichString_appendnAscii(RichString* this, int attrs, const char* data, int len) {
+   return RichString_writeFromAscii(this, attrs, data, this->chlen, len);
+}
+
+int RichString_writeAscii(RichString* this, int attrs, const char* data) {
+   return RichString_writeFromAscii(this, attrs, data, 0, strlen(data));
+}
diff --git a/RichString.h b/RichString.h
new file mode 100644
index 0000000..70ca274
--- /dev/null
+++ b/RichString.h
@@ -0,0 +1,77 @@
+#ifndef HEADER_RichString
+#define HEADER_RichString
+/*
+htop - RichString.h
+(C) 2004,2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProvideCurses.h"
+
+
+#define RichString_size(this) ((this)->chlen)
+#define RichString_sizeVal(this) ((this).chlen)
+
+#define RichString_begin(this) RichString this; RichString_beginAllocated(this)
+#define RichString_beginAllocated(this)   \
+   do {                                   \
+      (this).chlen = 0;                   \
+      (this).chptr = (this).chstr;        \
+      RichString_setChar(&(this), 0, 0);  \
+      (this).highlightAttr = 0;           \
+   } while(0)
+
+#ifdef HAVE_LIBNCURSESW
+#define RichString_printVal(this, y, x) mvadd_wchstr(y, x, (this).chptr)
+#define RichString_printoffnVal(this, y, x, off, n) mvadd_wchnstr(y, x, (this).chptr + (off), n)
+#define RichString_getCharVal(this, i) ((this).chptr[i].chars[0])
+#define RichString_setChar(this, at, ch) do { (this)->chptr[(at)] = (CharType) { .chars = { ch, 0 } }; } while (0)
+#define CharType cchar_t
+#else
+#define RichString_printVal(this, y, x) mvaddchstr(y, x, (this).chptr)
+#define RichString_printoffnVal(this, y, x, off, n) mvaddchnstr(y, x, (this).chptr + (off), n)
+#define RichString_getCharVal(this, i) ((this).chptr[i] & 0xff)
+#define RichString_setChar(this, at, ch) do { (this)->chptr[(at)] = ch; } while (0)
+#define CharType chtype
+#endif
+
+#define RICHSTRING_MAXLEN 350
+
+typedef struct RichString_ {
+   int chlen;
+   CharType* chptr;
+   CharType chstr[RICHSTRING_MAXLEN + 1];
+   int highlightAttr;
+} RichString;
+
+void RichString_delete(RichString* this);
+
+void RichString_rewind(RichString* this, int count);
+
+void RichString_setAttrn(RichString* this, int attrs, int start, int charcount);
+
+int RichString_findChar(const RichString* this, char c, int start);
+
+void RichString_setAttr(RichString* this, int attrs);
+
+void RichString_appendChr(RichString* this, int attrs, char c, int count);
+
+/* All appending and writing functions return the number of written characters (not columns). */
+
+int RichString_appendWide(RichString* this, int attrs, const char* data);
+
+int RichString_appendnWide(RichString* this, int attrs, const char* data, int len);
+
+/* columns takes the maximum number of columns to write and contains on return the number of columns written. */
+int RichString_appendnWideColumns(RichString* this, int attrs, const char* data, int len, int* columns);
+
+int RichString_writeWide(RichString* this, int attrs, const char* data);
+
+int RichString_appendAscii(RichString* this, int attrs, const char* data);
+
+int RichString_appendnAscii(RichString* this, int attrs, const char* data, int len);
+
+int RichString_writeAscii(RichString* this, int attrs, const char* data);
+
+#endif
diff --git a/Row.c b/Row.c
new file mode 100644
index 0000000..9ea3f07
--- /dev/null
+++ b/Row.c
@@ -0,0 +1,497 @@
+/*
+htop - Row.c
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2020-2023 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Row.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Process.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+int Row_pidDigits = ROW_MIN_PID_DIGITS;
+int Row_uidDigits = ROW_MIN_UID_DIGITS;
+
+void Row_init(Row* this, const Machine* host) {
+   this->host = host;
+   this->tag = false;
+   this->showChildren = true;
+   this->show = true;
+   this->wasShown = false;
+   this->updated = false;
+}
+
+void Row_done(Row* this) {
+   assert(this != NULL);
+   (void) this;
+}
+
+static inline bool Row_isNew(const Row* this) {
+   const Machine* host = this->host;
+   if (host->monotonicMs < this->seenStampMs)
+      return false;
+
+   const Settings* settings = host->settings;
+   return host->monotonicMs - this->seenStampMs <= 1000 * (uint64_t)settings->highlightDelaySecs;
+}
+
+static inline bool Row_isTomb(const Row* this) {
+   return this->tombStampMs > 0;
+}
+
+void Row_display(const Object* cast, RichString* out) {
+   const Row* this = (const Row*) cast;
+   const Settings* settings = this->host->settings;
+   const RowField* fields = settings->ss->fields;
+
+   for (int i = 0; fields[i]; i++)
+      As_Row(this)->writeField(this, out, fields[i]);
+
+   if (Row_isHighlighted(this))
+      RichString_setAttr(out, CRT_colors[PROCESS_SHADOW]);
+
+   if (this->tag == true)
+      RichString_setAttr(out, CRT_colors[PROCESS_TAG]);
+
+   if (settings->highlightChanges) {
+      if (Row_isTomb(this))
+         out->highlightAttr = CRT_colors[PROCESS_TOMB];
+      else if (Row_isNew(this))
+         out->highlightAttr = CRT_colors[PROCESS_NEW];
+   }
+
+   assert(RichString_size(out) > 0);
+}
+
+void Row_setPidColumnWidth(pid_t maxPid) {
+   if (maxPid < (int)pow(10, ROW_MIN_PID_DIGITS)) {
+      Row_pidDigits = ROW_MIN_PID_DIGITS;
+      return;
+   }
+
+   Row_pidDigits = (int)log10(maxPid) + 1;
+   assert(Row_pidDigits <= ROW_MAX_PID_DIGITS);
+}
+
+void Row_setUidColumnWidth(uid_t maxUid) {
+   if (maxUid < (uid_t)pow(10, ROW_MIN_UID_DIGITS)) {
+      Row_uidDigits = ROW_MIN_UID_DIGITS;
+      return;
+   }
+
+   Row_uidDigits = (int)log10(maxUid) + 1;
+   assert(Row_uidDigits <= ROW_MAX_UID_DIGITS);
+}
+
+uint8_t Row_fieldWidths[LAST_PROCESSFIELD] = { 0 };
+
+void Row_resetFieldWidths(void) {
+   for (size_t i = 0; i < LAST_PROCESSFIELD; i++) {
+      if (!Process_fields[i].autoWidth)
+         continue;
+
+      size_t len = strlen(Process_fields[i].title);
+      assert(len <= UINT8_MAX);
+      Row_fieldWidths[i] = (uint8_t)len;
+   }
+}
+
+void Row_updateFieldWidth(RowField key, size_t width) {
+   if (width > UINT8_MAX)
+      Row_fieldWidths[key] = UINT8_MAX;
+   else if (width > Row_fieldWidths[key])
+      Row_fieldWidths[key] = (uint8_t)width;
+}
+
+// helper function to fill an aligned title string for a dynamic column
+static const char* alignedTitleDynamicColumn(const Settings* settings, int key, char* titleBuffer, size_t titleBufferSize) {
+   const DynamicColumn* column = Hashtable_get(settings->dynamicColumns, key);
+   if (column == NULL)
+      return "- ";
+
+   int width = column->width;
+   if (!width || abs(width) > DYNAMIC_MAX_COLUMN_WIDTH)
+      width = DYNAMIC_DEFAULT_COLUMN_WIDTH;
+
+   xSnprintf(titleBuffer, titleBufferSize, "%*s ", width, column->heading);
+   return titleBuffer;
+}
+
+// helper function to fill an aligned title string for a process field
+static const char* alignedTitleProcessField(ProcessField field, char* titleBuffer, size_t titleBufferSize) {
+   const char* title = Process_fields[field].title;
+   if (!title)
+      return "- ";
+
+   if (Process_fields[field].pidColumn) {
+      xSnprintf(titleBuffer, titleBufferSize, "%*s ", Row_pidDigits, title);
+      return titleBuffer;
+   }
+
+   if (field == ST_UID) {
+      xSnprintf(titleBuffer, titleBufferSize, "%*s ", Row_uidDigits, title);
+      return titleBuffer;
+   }
+
+   if (Process_fields[field].autoWidth) {
+      if (field == PERCENT_CPU)
+         xSnprintf(titleBuffer, titleBufferSize, "%*s ", Row_fieldWidths[field], title);
+      else
+         xSnprintf(titleBuffer, titleBufferSize, "%-*.*s ", Row_fieldWidths[field], Row_fieldWidths[field], title);
+      return titleBuffer;
+   }
+
+   return title;
+}
+
+// helper function to create an aligned title string for a given field
+const char* RowField_alignedTitle(const Settings* settings, RowField field) {
+   static char titleBuffer[UINT8_MAX + sizeof(" ")];
+   assert(sizeof(titleBuffer) >= DYNAMIC_MAX_COLUMN_WIDTH + sizeof(" "));
+   assert(sizeof(titleBuffer) >= ROW_MAX_PID_DIGITS + sizeof(" "));
+   assert(sizeof(titleBuffer) >= ROW_MAX_UID_DIGITS + sizeof(" "));
+
+   if (field < LAST_PROCESSFIELD)
+      return alignedTitleProcessField((ProcessField)field, titleBuffer, sizeof(titleBuffer));
+   return alignedTitleDynamicColumn(settings, field, titleBuffer, sizeof(titleBuffer));
+}
+
+RowField RowField_keyAt(const Settings* settings, int at) {
+   const RowField* fields = (const RowField*) settings->ss->fields;
+   RowField field;
+   int x = 0;
+   for (int i = 0; (field = fields[i]); i++) {
+      int len = strlen(RowField_alignedTitle(settings, field));
+      if (at >= x && at <= x + len) {
+         return field;
+      }
+      x += len;
+   }
+   return COMM;
+}
+
+void Row_printKBytes(RichString* str, unsigned long long number, bool coloring) {
+   char buffer[16];
+   int len;
+
+   int color = CRT_colors[PROCESS];
+   int nextUnitColor = CRT_colors[PROCESS];
+
+   const int colors[4] = {
+      [0] = CRT_colors[PROCESS],
+      [1] = CRT_colors[PROCESS_MEGABYTES],
+      [2] = CRT_colors[PROCESS_GIGABYTES],
+      [3] = CRT_colors[LARGE_NUMBER]
+   };
+
+   if (number == ULLONG_MAX)
+      goto invalidNumber;
+
+   if (coloring) {
+      color = colors[0];
+      nextUnitColor = colors[1];
+   }
+
+   if (number < 1000) {
+      // Plain number, no markings
+      len = xSnprintf(buffer, sizeof(buffer), "%5u ", (unsigned int)number);
+      RichString_appendnAscii(str, color, buffer, len);
+      return;
+   }
+
+   if (number < 100000) {
+      // 2 digits for M, 3 digits for K
+      len = xSnprintf(buffer, sizeof(buffer), "%2u", (unsigned int)(number / 1000));
+      RichString_appendnAscii(str, nextUnitColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%03u ", (unsigned int)(number % 1000));
+      RichString_appendnAscii(str, color, buffer, len);
+      return;
+   }
+
+   // 100000 KiB (97.6 MiB) or greater. A unit prefix would be added.
+   const size_t maxUnitIndex = (sizeof(number) * CHAR_BIT - 1) / 10 + 1;
+   const bool canOverflow = maxUnitIndex >= ARRAYSIZE(unitPrefixes);
+
+   size_t i = 1;
+   int prevUnitColor;
+   // Convert KiB to (1/100) of MiB
+   unsigned long long hundredths = (number / 256) * 25 + (number % 256) * 25 / 256;
+   while (true) {
+      if (canOverflow && i >= ARRAYSIZE(unitPrefixes))
+         goto invalidNumber;
+
+      prevUnitColor = color;
+      color = nextUnitColor;
+
+      if (coloring && i + 1 < ARRAYSIZE(colors))
+         nextUnitColor = colors[i + 1];
+
+      if (hundredths < 1000000)
+         break;
+
+      hundredths /= ONE_K;
+      i++;
+   }
+
+   number = hundredths / 100;
+   hundredths %= 100;
+   if (number < 100) {
+      if (number < 10) {
+         // 1 digit + decimal point + 2 digits
+         // "9.76G", "9.99G", "9.76T", "9.99T", etc.
+         len = xSnprintf(buffer, sizeof(buffer), "%1u", (unsigned int)number);
+         RichString_appendnAscii(str, color, buffer, len);
+         len = xSnprintf(buffer, sizeof(buffer), ".%02u", (unsigned int)hundredths);
+      } else {
+         // 2 digits + decimal point + 1 digit
+         // "97.6M", "99.9M", "10.0G", "99.9G", etc.
+         len = xSnprintf(buffer, sizeof(buffer), "%2u", (unsigned int)number);
+         RichString_appendnAscii(str, color, buffer, len);
+         len = xSnprintf(buffer, sizeof(buffer), ".%1u", (unsigned int)hundredths / 10);
+      }
+      RichString_appendnAscii(str, prevUnitColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%c ", unitPrefixes[i]);
+   } else if (number < 1000) {
+      // 3 digits
+      // "100M", "999M", "100G", "999G", etc.
+      len = xSnprintf(buffer, sizeof(buffer), "%4u%c ", (unsigned int)number, unitPrefixes[i]);
+   } else {
+      // 1 digit + 3 digits
+      // "1000M", "9999M", "1000G", "9999G", etc.
+      assert(number < 10000);
+
+      len = xSnprintf(buffer, sizeof(buffer), "%1u", (unsigned int)number / 1000);
+      RichString_appendnAscii(str, nextUnitColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%03u%c ", (unsigned int)number % 1000, unitPrefixes[i]);
+   }
+   RichString_appendnAscii(str, color, buffer, len);
+   return;
+
+invalidNumber:
+   if (coloring)
+      color = CRT_colors[PROCESS_SHADOW];
+
+   RichString_appendAscii(str, color, "  N/A ");
+   return;
+}
+
+void Row_printBytes(RichString* str, unsigned long long number, bool coloring) {
+   if (number == ULLONG_MAX)
+      Row_printKBytes(str, ULLONG_MAX, coloring);
+   else
+      Row_printKBytes(str, number / ONE_K, coloring);
+}
+
+void Row_printCount(RichString* str, unsigned long long number, bool coloring) {
+   char buffer[13];
+
+   int largeNumberColor = coloring ? CRT_colors[LARGE_NUMBER] : CRT_colors[PROCESS];
+   int megabytesColor = coloring ? CRT_colors[PROCESS_MEGABYTES] : CRT_colors[PROCESS];
+   int shadowColor = coloring ? CRT_colors[PROCESS_SHADOW] : CRT_colors[PROCESS];
+   int baseColor = CRT_colors[PROCESS];
+
+   if (number == ULLONG_MAX) {
+      RichString_appendAscii(str, CRT_colors[PROCESS_SHADOW], "        N/A ");
+   } else if (number >= 100000LL * ONE_DECIMAL_T) {
+      xSnprintf(buffer, sizeof(buffer), "%11llu ", number / ONE_DECIMAL_G);
+      RichString_appendnAscii(str, largeNumberColor, buffer, 12);
+   } else if (number >= 100LL * ONE_DECIMAL_T) {
+      xSnprintf(buffer, sizeof(buffer), "%11llu ", number / ONE_DECIMAL_M);
+      RichString_appendnAscii(str, largeNumberColor, buffer, 8);
+      RichString_appendnAscii(str, megabytesColor, buffer + 8, 4);
+   } else if (number >= 10LL * ONE_DECIMAL_G) {
+      xSnprintf(buffer, sizeof(buffer), "%11llu ", number / ONE_DECIMAL_K);
+      RichString_appendnAscii(str, largeNumberColor, buffer, 5);
+      RichString_appendnAscii(str, megabytesColor, buffer + 5, 3);
+      RichString_appendnAscii(str, baseColor, buffer + 8, 4);
+   } else {
+      xSnprintf(buffer, sizeof(buffer), "%11llu ", number);
+      RichString_appendnAscii(str, largeNumberColor, buffer, 2);
+      RichString_appendnAscii(str, megabytesColor, buffer + 2, 3);
+      RichString_appendnAscii(str, baseColor, buffer + 5, 3);
+      RichString_appendnAscii(str, shadowColor, buffer + 8, 4);
+   }
+}
+
+void Row_printTime(RichString* str, unsigned long long totalHundredths, bool coloring) {
+   char buffer[10];
+   int len;
+
+   int yearColor = coloring ? CRT_colors[LARGE_NUMBER]      : CRT_colors[PROCESS];
+   int dayColor  = coloring ? CRT_colors[PROCESS_GIGABYTES] : CRT_colors[PROCESS];
+   int hourColor = coloring ? CRT_colors[PROCESS_MEGABYTES] : CRT_colors[PROCESS];
+   int baseColor = CRT_colors[PROCESS];
+
+   unsigned long long totalSeconds = totalHundredths / 100;
+   unsigned long long totalMinutes = totalSeconds / 60;
+   unsigned long long totalHours = totalMinutes / 60;
+   unsigned int seconds = totalSeconds % 60;
+   unsigned int minutes = totalMinutes % 60;
+
+   if (totalMinutes < 60) {
+      unsigned int hundredths = totalHundredths % 100;
+      len = xSnprintf(buffer, sizeof(buffer), "%2u:%02u.%02u ", (unsigned int)totalMinutes, seconds, hundredths);
+      RichString_appendnAscii(str, baseColor, buffer, len);
+      return;
+   }
+   if (totalHours < 24) {
+      len = xSnprintf(buffer, sizeof(buffer), "%2uh", (unsigned int)totalHours);
+      RichString_appendnAscii(str, hourColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%02u:%02u ", minutes, seconds);
+      RichString_appendnAscii(str, baseColor, buffer, len);
+      return;
+   }
+
+   unsigned long long totalDays = totalHours / 24;
+   unsigned int hours = totalHours % 24;
+   if (totalDays < 10) {
+      len = xSnprintf(buffer, sizeof(buffer), "%1ud", (unsigned int)totalDays);
+      RichString_appendnAscii(str, dayColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%02uh", hours);
+      RichString_appendnAscii(str, hourColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%02um ", minutes);
+      RichString_appendnAscii(str, baseColor, buffer, len);
+      return;
+   }
+   if (totalDays < /* Ignore leap years */365) {
+      len = xSnprintf(buffer, sizeof(buffer), "%4ud", (unsigned int)totalDays);
+      RichString_appendnAscii(str, dayColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%02uh ", hours);
+      RichString_appendnAscii(str, hourColor, buffer, len);
+      return;
+   }
+
+   unsigned long long years = totalDays / 365;
+   unsigned int days = totalDays % 365;
+   if (years < 1000) {
+      len = xSnprintf(buffer, sizeof(buffer), "%3uy", (unsigned int)years);
+      RichString_appendnAscii(str, yearColor, buffer, len);
+      len = xSnprintf(buffer, sizeof(buffer), "%03ud ", days);
+      RichString_appendnAscii(str, dayColor, buffer, len);
+   } else if (years < 10000000) {
+      len = xSnprintf(buffer, sizeof(buffer), "%7luy ", (unsigned long)years);
+      RichString_appendnAscii(str, yearColor, buffer, len);
+   } else {
+      RichString_appendAscii(str, yearColor, "eternity ");
+   }
+}
+
+void Row_printRate(RichString* str, double rate, bool coloring) {
+   char buffer[16];
+
+   int largeNumberColor = CRT_colors[LARGE_NUMBER];
+   int megabytesColor = CRT_colors[PROCESS_MEGABYTES];
+   int shadowColor = CRT_colors[PROCESS_SHADOW];
+   int baseColor = CRT_colors[PROCESS];
+
+   if (!coloring) {
+      largeNumberColor = CRT_colors[PROCESS];
+      megabytesColor = CRT_colors[PROCESS];
+   }
+
+   if (!isNonnegative(rate)) {
+      RichString_appendAscii(str, shadowColor, "        N/A ");
+   } else if (rate < 0.005) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f B/s ", rate);
+      RichString_appendnAscii(str, shadowColor, buffer, len);
+   } else if (rate < ONE_K) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f B/s ", rate);
+      RichString_appendnAscii(str, baseColor, buffer, len);
+   } else if (rate < ONE_M) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f K/s ", rate / ONE_K);
+      RichString_appendnAscii(str, baseColor, buffer, len);
+   } else if (rate < ONE_G) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f M/s ", rate / ONE_M);
+      RichString_appendnAscii(str, megabytesColor, buffer, len);
+   } else if (rate < ONE_T) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f G/s ", rate / ONE_G);
+      RichString_appendnAscii(str, largeNumberColor, buffer, len);
+   } else if (rate < ONE_P) {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f T/s ", rate / ONE_T);
+      RichString_appendnAscii(str, largeNumberColor, buffer, len);
+   } else {
+      int len = snprintf(buffer, sizeof(buffer), "%7.2f P/s ", rate / ONE_P);
+      RichString_appendnAscii(str, largeNumberColor, buffer, len);
+   }
+}
+
+void Row_printLeftAlignedField(RichString* str, int attr, const char* content, unsigned int width) {
+   int columns = width;
+   RichString_appendnWideColumns(str, attr, content, strlen(content), &columns);
+   RichString_appendChr(str, attr, ' ', width + 1 - columns);
+}
+
+int Row_printPercentage(float val, char* buffer, size_t n, uint8_t width, int* attr) {
+   if (isNonnegative(val)) {
+      if (val < 0.05F)
+         *attr = CRT_colors[PROCESS_SHADOW];
+      else if (val >= 99.9F)
+         *attr = CRT_colors[PROCESS_MEGABYTES];
+
+      int precision = 1;
+
+      // Display "val" as "100" for columns like "MEM%".
+      if (width == 4 && val > 99.9F) {
+         precision = 0;
+         val = 100.0F;
+      }
+
+      return xSnprintf(buffer, n, "%*.*f ", width, precision, val);
+   }
+
+   *attr = CRT_colors[PROCESS_SHADOW];
+   return xSnprintf(buffer, n, "%*.*s ", width, width, "N/A");
+}
+
+void Row_toggleTag(Row* this) {
+   this->tag = !this->tag;
+}
+
+int Row_compare(const void* v1, const void* v2) {
+   const Row* r1 = (const Row*)v1;
+   const Row* r2 = (const Row*)v2;
+
+   return SPACESHIP_NUMBER(r1->id, r2->id);
+}
+
+int Row_compareByParent_Base(const void* v1, const void* v2) {
+   const Row* r1 = (const Row*)v1;
+   const Row* r2 = (const Row*)v2;
+
+   int result = SPACESHIP_NUMBER(
+      r1->isRoot ? 0 : Row_getGroupOrParent(r1),
+      r2->isRoot ? 0 : Row_getGroupOrParent(r2)
+   );
+
+   if (result != 0)
+      return result;
+
+   return Row_compare(v1, v2);
+}
+
+const RowClass Row_class = {
+   .super = {
+      .extends = Class(Object),
+      .compare = Row_compare
+   },
+};
diff --git a/Row.h b/Row.h
new file mode 100644
index 0000000..f67c610
--- /dev/null
+++ b/Row.h
@@ -0,0 +1,181 @@
+#ifndef HEADER_Row
+#define HEADER_Row
+/*
+htop - Row.h
+(C) 2004-2015 Hisham H. Muhammad
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "Object.h"
+#include "RichString.h"
+#include "RowField.h"
+
+
+extern uint8_t Row_fieldWidths[LAST_RESERVED_FIELD];
+#define ROW_MIN_PID_DIGITS 5
+#define ROW_MAX_PID_DIGITS 19
+#define ROW_MIN_UID_DIGITS 5
+#define ROW_MAX_UID_DIGITS 20
+extern int Row_pidDigits;
+extern int Row_uidDigits;
+
+struct Machine_;     // IWYU pragma: keep
+struct Settings_;    // IWYU pragma: keep
+struct Table_;       // IWYU pragma: keep
+
+/* Class representing entities (such as processes) that can be
+ * represented in a tabular form in the lower half of the htop
+ * display. */
+
+typedef struct Row_ {
+   /* Super object for emulated OOP */
+   Object super;
+
+   /* Pointer to quasi-global data */
+   const struct Machine_* host;
+
+   int id;
+   int group;
+   int parent;
+
+   /* Has no known parent */
+   bool isRoot;
+
+   /* Whether the row was tagged by the user */
+   bool tag;
+
+   /* Whether to display this row */
+   bool show;
+
+   /* Whether this row was shown last cycle */
+   bool wasShown;
+
+   /* Whether to show children of this row in tree-mode */
+   bool showChildren;
+
+   /* Whether the row was updated during the last scan */
+   bool updated;
+
+   /*
+    * Internal state for tree-mode.
+    */
+   int32_t indent;
+   unsigned int tree_depth;
+
+   /*
+    * Internal time counts for showing new and exited processes.
+    */
+   uint64_t seenStampMs;
+   uint64_t tombStampMs;
+} Row;
+
+typedef Row* (*Row_New)(const struct Machine_*);
+typedef void (*Row_WriteField)(const Row*, RichString*, RowField);
+typedef bool (*Row_IsHighlighted)(const Row*);
+typedef bool (*Row_IsVisible)(const Row*, const struct Table_*);
+typedef bool (*Row_MatchesFilter)(const Row*, const struct Table_*);
+typedef const char* (*Row_SortKeyString)(Row*);
+typedef int (*Row_CompareByParent)(const Row*, const Row*);
+
+int Row_compare(const void* v1, const void* v2);
+
+typedef struct RowClass_ {
+   const ObjectClass super;
+   const Row_IsHighlighted isHighlighted;
+   const Row_IsVisible isVisible;
+   const Row_WriteField writeField;
+   const Row_MatchesFilter matchesFilter;
+   const Row_SortKeyString sortKeyString;
+   const Row_CompareByParent compareByParent;
+} RowClass;
+
+#define As_Row(this_)  ((const RowClass*)((this_)->super.klass))
+
+#define Row_isHighlighted(r_)  (As_Row(r_)->isHighlighted ? (As_Row(r_)->isHighlighted(r_)) : false)
+#define Row_isVisible(r_, t_)  (As_Row(r_)->isVisible ? (As_Row(r_)->isVisible(r_, t_)) : true)
+#define Row_matchesFilter(r_, t_)  (As_Row(r_)->matchesFilter ? (As_Row(r_)->matchesFilter(r_, t_)) : false)
+#define Row_sortKeyString(r_)  (As_Row(r_)->sortKeyString ? (As_Row(r_)->sortKeyString(r_)) : "")
+#define Row_compareByParent(r1_, r2_)  (As_Row(r1_)->compareByParent ? (As_Row(r1_)->compareByParent(r1_, r2_)) : Row_compareByParent_Base(r1_, r2_))
+
+#define ONE_K 1024UL
+#define ONE_M (ONE_K * ONE_K)
+#define ONE_G (ONE_M * ONE_K)
+#define ONE_T (1ULL * ONE_G * ONE_K)
+#define ONE_P (1ULL * ONE_T * ONE_K)
+
+#define ONE_DECIMAL_K 1000UL
+#define ONE_DECIMAL_M (ONE_DECIMAL_K * ONE_DECIMAL_K)
+#define ONE_DECIMAL_G (ONE_DECIMAL_M * ONE_DECIMAL_K)
+#define ONE_DECIMAL_T (1ULL * ONE_DECIMAL_G * ONE_DECIMAL_K)
+#define ONE_DECIMAL_P (1ULL * ONE_DECIMAL_T * ONE_DECIMAL_K)
+
+extern const RowClass Row_class;
+
+void Row_init(Row* this, const struct Machine_* host);
+
+void Row_done(Row* this);
+
+void Row_display(const Object* cast, RichString* out);
+
+void Row_toggleTag(Row* this);
+
+void Row_resetFieldWidths(void);
+
+void Row_updateFieldWidth(RowField key, size_t width);
+
+void Row_printLeftAlignedField(RichString* str, int attr, const char* content, unsigned int width);
+
+const char* RowField_alignedTitle(const struct Settings_* settings, RowField field);
+
+RowField RowField_keyAt(const struct Settings_* settings, int at);
+
+/* Sets the size of the PID column based on the passed PID */
+void Row_setPidColumnWidth(pid_t maxPid);
+
+/* Sets the size of the UID column based on the passed UID */
+void Row_setUidColumnWidth(uid_t maxUid);
+
+/* Takes number in kibibytes (base 1024). Prints 6 columns. */
+void Row_printKBytes(RichString* str, unsigned long long number, bool coloring);
+
+/* Takes number in bytes (base 1024). Prints 6 columns. */
+void Row_printBytes(RichString* str, unsigned long long number, bool coloring);
+
+/* Takes number as count (base 1000). Prints 12 columns. */
+void Row_printCount(RichString* str, unsigned long long number, bool coloring);
+
+/* Takes time in hundredths of a seconds. Prints 9 columns. */
+void Row_printTime(RichString* str, unsigned long long totalHundredths, bool coloring);
+
+/* Takes rate in bare unit (base 1024) per second. Prints 12 columns. */
+void Row_printRate(RichString* str, double rate, bool coloring);
+
+int Row_printPercentage(float val, char* buffer, size_t n, uint8_t width, int* attr);
+
+void Row_display(const Object* cast, RichString* out);
+
+static inline int Row_idEqualCompare(const void* v1, const void* v2) {
+   const int p1 = ((const Row*)v1)->id;
+   const int p2 = ((const Row*)v2)->id;
+   return p1 != p2; /* return zero when equal */
+}
+
+/* Routines used primarily with the tree view */
+static inline int Row_getGroupOrParent(const Row* this) {
+   return this->group == this->id ? this->parent : this->group;
+}
+
+static inline bool Row_isChildOf(const Row* this, int id) {
+   return id == Row_getGroupOrParent(this);
+}
+
+int Row_compareByParent_Base(const void* v1, const void* v2);
+
+#endif
diff --git a/RowField.h b/RowField.h
new file mode 100644
index 0000000..1e01ea3
--- /dev/null
+++ b/RowField.h
@@ -0,0 +1,56 @@
+#ifndef HEADER_RowField
+#define HEADER_RowField
+/*
+htop - RowField.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProcessField.h" // platform-specific fields reserved for processes
+
+
+typedef enum ReservedFields_ {
+   NULL_FIELD = 0,
+   PID = 1,
+   COMM = 2,
+   STATE = 3,
+   PPID = 4,
+   PGRP = 5,
+   SESSION = 6,
+   TTY = 7,
+   TPGID = 8,
+   MINFLT = 10,
+   MAJFLT = 12,
+   PRIORITY = 18,
+   NICE = 19,
+   STARTTIME = 21,
+   PROCESSOR = 38,
+   M_VIRT = 39,
+   M_RESIDENT = 40,
+   ST_UID = 46,
+   PERCENT_CPU = 47,
+   PERCENT_MEM = 48,
+   USER = 49,
+   TIME = 50,
+   NLWP = 51,
+   TGID = 52,
+   PERCENT_NORM_CPU = 53,
+   ELAPSED = 54,
+   SCHEDULERPOLICY = 55,
+   PROC_COMM = 124,
+   PROC_EXE = 125,
+   CWD = 126,
+
+   /* Platform specific fields, defined in ${platform}/ProcessField.h */
+   PLATFORM_PROCESS_FIELDS
+
+   /* Do not add new fields after this entry (dynamic entries follow) */
+   LAST_RESERVED_FIELD
+} ReservedFields;
+
+/* Follow ReservedField entries with dynamic fields defined at runtime */
+#define ROW_DYNAMIC_FIELDS LAST_RESERVED_FIELD
+typedef int32_t RowField;
+
+#endif
diff --git a/Scheduling.c b/Scheduling.c
new file mode 100644
index 0000000..d5c4b8a
--- /dev/null
+++ b/Scheduling.c
@@ -0,0 +1,162 @@
+/*
+htop - Scheduling.c
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Scheduling.h"
+
+#ifdef SCHEDULER_SUPPORT
+
+#include <assert.h>
+#include <stddef.h>
+
+#include "FunctionBar.h"
+#include "ListItem.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Panel.h"
+#include "XUtils.h"
+
+
+static const SchedulingPolicy policies[] = {
+   [SCHED_OTHER] = { "Other",      SCHED_OTHER, false },
+#ifdef SCHED_BATCH
+   [SCHED_BATCH] = { "Batch",      SCHED_BATCH, false },
+#endif
+#ifdef SCHED_IDLE
+   [SCHED_IDLE]  = { "Idle",       SCHED_IDLE,  false },
+#endif
+   [SCHED_FIFO]  = { "FiFo",       SCHED_FIFO,  true },
+   [SCHED_RR]    = { "RoundRobin", SCHED_RR,    true },
+};
+
+#ifdef SCHED_RESET_ON_FORK
+static bool reset_on_fork = false;
+#endif
+
+
+Panel* Scheduling_newPolicyPanel(int preSelectedPolicy) {
+   Panel* this = Panel_new(0, 0, 0, 0, Class(ListItem), true, FunctionBar_newEnterEsc("Select ", "Cancel "));
+   Panel_setHeader(this, "New policy:");
+
+#ifdef SCHED_RESET_ON_FORK
+   Panel_add(this, (Object*) ListItem_new(reset_on_fork ? "Reset on fork: on" : "Reset on fork: off", -1));
+#endif
+
+   for (unsigned i = 0; i < ARRAYSIZE(policies); i++) {
+      if (!policies[i].name)
+         continue;
+
+      Panel_add(this, (Object*) ListItem_new(policies[i].name, policies[i].id));
+      if (policies[i].id == preSelectedPolicy)
+         Panel_setSelected(this, i);
+   }
+
+   return this;
+}
+
+void Scheduling_togglePolicyPanelResetOnFork(Panel* schedPanel) {
+#ifdef SCHED_RESET_ON_FORK
+   reset_on_fork = !reset_on_fork;
+
+   ListItem* item = (ListItem*) Panel_get(schedPanel, 0);
+
+   free_and_xStrdup(&item->value, reset_on_fork ? "Reset on fork: on" : "Reset on fork: off");
+#else
+   (void)schedPanel;
+#endif
+}
+
+Panel* Scheduling_newPriorityPanel(int policy, int preSelectedPriority) {
+   if (policy < 0 || (unsigned)policy >= ARRAYSIZE(policies) || policies[policy].name == NULL)
+      return NULL;
+
+   if (!policies[policy].prioritySupport)
+      return NULL;
+
+   int min = sched_get_priority_min(policy);
+   if (min < 0)
+      return NULL;
+   int max = sched_get_priority_max(policy);
+   if (max < 0 )
+      return NULL;
+
+   Panel* this = Panel_new(0, 0, 0, 0, Class(ListItem), true, FunctionBar_newEnterEsc("Select ", "Cancel "));
+   Panel_setHeader(this, "Priority:");
+
+   for (int i = min; i <= max; i++) {
+      char buf[16];
+      xSnprintf(buf, sizeof(buf), "%d", i);
+      Panel_add(this, (Object*) ListItem_new(buf, i));
+      if (i == preSelectedPriority)
+         Panel_setSelected(this, i);
+   }
+
+   return this;
+}
+
+static bool Scheduling_setPolicy(Process* p, Arg arg) {
+   const SchedulingArg* sarg = arg.v;
+   int policy = sarg->policy;
+
+   assert(policy >= 0);
+   assert((unsigned)policy < ARRAYSIZE(policies));
+   assert(policies[policy].name);
+
+   const struct sched_param param = { .sched_priority = policies[policy].prioritySupport ? sarg->priority : 0 };
+
+   #ifdef SCHED_RESET_ON_FORK
+   if (reset_on_fork)
+      policy &= SCHED_RESET_ON_FORK;
+   #endif
+
+   int r = sched_setscheduler(Process_getPid(p), policy, &param);
+
+   /* POSIX says on success the previous scheduling policy should be returned,
+    * but Linux always returns 0. */
+   return r != -1;
+}
+
+bool Scheduling_rowSetPolicy(Row* row, Arg arg) {
+   Process* p = (Process*) row;
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+   return Scheduling_setPolicy(p, arg);
+}
+
+const char* Scheduling_formatPolicy(int policy) {
+#ifdef SCHED_RESET_ON_FORK
+   policy = policy & ~SCHED_RESET_ON_FORK;
+#endif
+
+   switch (policy) {
+      case SCHED_OTHER:
+         return "OTHER";
+      case SCHED_FIFO:
+         return "FIFO";
+      case SCHED_RR:
+         return "RR";
+#ifdef SCHED_BATCH
+      case SCHED_BATCH:
+         return "BATCH";
+#endif
+#ifdef SCHED_IDLE
+      case SCHED_IDLE:
+         return "IDLE";
+#endif
+#ifdef SCHED_DEADLINE
+      case SCHED_DEADLINE:
+         return "EDF";
+#endif
+      default:
+         return "???";
+   }
+}
+
+void Scheduling_readProcessPolicy(Process* proc) {
+   proc->scheduling_policy = sched_getscheduler(Process_getPid(proc));
+}
+#endif  /* SCHEDULER_SUPPORT */
diff --git a/Scheduling.h b/Scheduling.h
new file mode 100644
index 0000000..610503c
--- /dev/null
+++ b/Scheduling.h
@@ -0,0 +1,50 @@
+#ifndef HEADER_Scheduling
+#define HEADER_Scheduling
+/*
+htop - Scheduling.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <sched.h>
+#include <stdbool.h>
+
+#include "Object.h"
+#include "Panel.h"
+#include "Process.h"
+#include "Row.h"
+
+
+#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GETSCHEDULER)
+#define SCHEDULER_SUPPORT
+
+typedef struct {
+   const char* name;
+   int id;
+   bool prioritySupport;
+} SchedulingPolicy;
+
+#define SCHEDULINGPANEL_INITSELECTEDPOLICY SCHED_OTHER
+#define SCHEDULINGPANEL_INITSELECTEDPRIORITY 50
+
+Panel* Scheduling_newPolicyPanel(int preSelectedPolicy);
+void Scheduling_togglePolicyPanelResetOnFork(Panel* schedPanel);
+
+Panel* Scheduling_newPriorityPanel(int policy, int preSelectedPriority);
+
+
+typedef struct {
+   int policy;
+   int priority;
+} SchedulingArg;
+
+bool Scheduling_rowSetPolicy(Row* proc, Arg arg);
+
+const char* Scheduling_formatPolicy(int policy);
+
+void Scheduling_readProcessPolicy(Process* proc);
+
+#endif
+
+#endif  /* HEADER_Scheduling */
diff --git a/ScreenManager.c b/ScreenManager.c
new file mode 100644
index 0000000..e7e82e1
--- /dev/null
+++ b/ScreenManager.c
@@ -0,0 +1,433 @@
+/*
+htop - ScreenManager.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ScreenManager.h"
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "Process.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "Table.h"
+#include "XUtils.h"
+
+
+ScreenManager* ScreenManager_new(Header* header, Machine* host, State* state, bool owner) {
+   ScreenManager* this;
+   this = xMalloc(sizeof(ScreenManager));
+   this->x1 = 0;
+   this->y1 = 0;
+   this->x2 = 0;
+   this->y2 = -1;
+   this->panels = Vector_new(Class(Panel), owner, DEFAULT_SIZE);
+   this->panelCount = 0;
+   this->header = header;
+   this->host = host;
+   this->state = state;
+   this->allowFocusChange = true;
+   return this;
+}
+
+void ScreenManager_delete(ScreenManager* this) {
+   Vector_delete(this->panels);
+   free(this);
+}
+
+inline int ScreenManager_size(const ScreenManager* this) {
+   return this->panelCount;
+}
+
+void ScreenManager_add(ScreenManager* this, Panel* item, int size) {
+   ScreenManager_insert(this, item, size, Vector_size(this->panels));
+}
+
+static int header_height(const ScreenManager* this) {
+   if (this->state->hideMeters)
+      return 0;
+
+   if (this->header)
+      return this->header->height;
+
+   return 0;
+}
+
+void ScreenManager_insert(ScreenManager* this, Panel* item, int size, int idx) {
+   int lastX = 0;
+   if (idx > 0) {
+      const Panel* last = (const Panel*) Vector_get(this->panels, idx - 1);
+      lastX = last->x + last->w + 1;
+   }
+   int height = LINES - this->y1 - header_height(this) + this->y2;
+   if (size <= 0) {
+      size = COLS - this->x1 + this->x2 - lastX;
+   }
+   Panel_resize(item, size, height);
+   Panel_move(item, lastX, this->y1 + header_height(this));
+   if (idx < this->panelCount) {
+      for (int i =  idx + 1; i <= this->panelCount; i++) {
+         Panel* p = (Panel*) Vector_get(this->panels, i);
+         Panel_move(p, p->x + size, p->y);
+      }
+   }
+   Vector_insert(this->panels, idx, item);
+   item->needsRedraw = true;
+   this->panelCount++;
+}
+
+Panel* ScreenManager_remove(ScreenManager* this, int idx) {
+   assert(this->panelCount > idx);
+   int w = ((Panel*) Vector_get(this->panels, idx))->w;
+   Panel* panel = (Panel*) Vector_remove(this->panels, idx);
+   this->panelCount--;
+   if (idx < this->panelCount) {
+      for (int i = idx; i < this->panelCount; i++) {
+         Panel* p = (Panel*) Vector_get(this->panels, i);
+         Panel_move(p, p->x - w, p->y);
+      }
+   }
+   return panel;
+}
+
+void ScreenManager_resize(ScreenManager* this) {
+   int y1_header = this->y1 + header_height(this);
+   int panels = this->panelCount;
+   int lastX = 0;
+   for (int i = 0; i < panels - 1; i++) {
+      Panel* panel = (Panel*) Vector_get(this->panels, i);
+      Panel_resize(panel, panel->w, LINES - y1_header + this->y2);
+      Panel_move(panel, lastX, y1_header);
+      lastX = panel->x + panel->w + 1;
+   }
+   Panel* panel = (Panel*) Vector_get(this->panels, panels - 1);
+   Panel_resize(panel, COLS - this->x1 + this->x2 - lastX, LINES - y1_header + this->y2);
+   Panel_move(panel, lastX, y1_header);
+}
+
+static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTimeout, bool* redraw, bool* rescan, bool* timedOut, bool* force_redraw) {
+   Machine* host = this->host;
+
+   Platform_gettime_realtime(&host->realtime, &host->realtimeMs);
+   double newTime = ((double)host->realtime.tv_sec * 10) + ((double)host->realtime.tv_usec / 100000);
+
+   *timedOut = (newTime - *oldTime > host->settings->delay);
+   *rescan |= *timedOut;
+
+   if (newTime < *oldTime) {
+      *rescan = true; // clock was adjusted?
+   }
+
+   if (*rescan) {
+      *oldTime = newTime;
+      int oldUidDigits = Process_uidDigits;
+      if (!this->state->pauseUpdate && (*sortTimeout == 0 || host->settings->ss->treeView)) {
+         host->activeTable->needsSort = true;
+         *sortTimeout = 1;
+      }
+      // sample current values for system metrics and processes if not paused
+      Machine_scan(host);
+      if (!this->state->pauseUpdate)
+         Machine_scanTables(host);
+
+      // always update header, especially to avoid gaps in graph meters
+      Header_updateData(this->header);
+      // force redraw if the number of UID digits was changed
+      if (Process_uidDigits != oldUidDigits) {
+         *force_redraw = true;
+      }
+      *redraw = true;
+   }
+   if (*redraw) {
+      Table_rebuildPanel(host->activeTable);
+      if (!this->state->hideMeters)
+         Header_draw(this->header);
+   }
+   *rescan = false;
+}
+
+static inline bool drawTab(const int* y, int* x, int l, const char* name, bool cur) {
+   attrset(CRT_colors[cur ? SCREENS_CUR_BORDER : SCREENS_OTH_BORDER]);
+   mvaddch(*y, *x, '[');
+   (*x)++;
+   if (*x >= l)
+      return false;
+   int nameLen = strlen(name);
+   int n = MINIMUM(l - *x, nameLen);
+   attrset(CRT_colors[cur ? SCREENS_CUR_TEXT : SCREENS_OTH_TEXT]);
+   mvaddnstr(*y, *x, name, n);
+   *x += n;
+   if (*x >= l)
+      return false;
+   attrset(CRT_colors[cur ? SCREENS_CUR_BORDER : SCREENS_OTH_BORDER]);
+   mvaddch(*y, *x, ']');
+   *x += 2;
+   if (*x >= l)
+      return false;
+   return true;
+}
+
+static void ScreenManager_drawScreenTabs(ScreenManager* this) {
+   Settings* settings = this->host->settings;
+   ScreenSettings** screens = settings->screens;
+   int cur = settings->ssIndex;
+   int l = COLS;
+   Panel* panel = (Panel*) Vector_get(this->panels, 0);
+   int y = panel->y - 1;
+   int x = 2;
+
+   if (this->name) {
+      drawTab(&y, &x, l, this->name, true);
+      return;
+   }
+
+   for (int s = 0; screens[s]; s++) {
+      bool ok = drawTab(&y, &x, l, screens[s]->heading, s == cur);
+      if (!ok) {
+         break;
+      }
+   }
+   attrset(CRT_colors[RESET_COLOR]);
+}
+
+static void ScreenManager_drawPanels(ScreenManager* this, int focus, bool force_redraw) {
+   Settings* settings = this->host->settings;
+   if (settings->screenTabs) {
+      ScreenManager_drawScreenTabs(this);
+   }
+   const int nPanels = this->panelCount;
+   for (int i = 0; i < nPanels; i++) {
+      Panel* panel = (Panel*) Vector_get(this->panels, i);
+      Panel_draw(panel,
+                 force_redraw,
+                 i == focus,
+                 panel != (Panel*)this->state->mainPanel || !this->state->hideSelection,
+                 State_hideFunctionBar(this->state));
+      mvvline(panel->y, panel->x + panel->w, ' ', panel->h + (State_hideFunctionBar(this->state) ? 1 : 0));
+   }
+}
+
+void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, const char* name) {
+   bool quit = false;
+   int focus = 0;
+
+   Panel* panelFocus = (Panel*) Vector_get(this->panels, focus);
+   Settings* settings = this->host->settings;
+
+   double oldTime = 0.0;
+
+   int ch = ERR;
+   int closeTimeout = 0;
+
+   bool timedOut = true;
+   bool redraw = true;
+   bool force_redraw = true;
+   bool rescan = false;
+   int sortTimeout = 0;
+   int resetSortTimeout = 5;
+
+   this->name = name;
+
+   while (!quit) {
+      if (this->header) {
+         checkRecalculation(this, &oldTime, &sortTimeout, &redraw, &rescan, &timedOut, &force_redraw);
+      }
+
+      if (redraw || force_redraw) {
+         ScreenManager_drawPanels(this, focus, force_redraw);
+         force_redraw = false;
+         if (this->host->iterationsRemaining != -1) {
+            if (!--this->host->iterationsRemaining) {
+               quit = true;
+               continue;
+            }
+         }
+      }
+
+      int prevCh = ch;
+      ch = Panel_getCh(panelFocus);
+
+      HandlerResult result = IGNORED;
+#ifdef HAVE_GETMOUSE
+      if (ch == KEY_MOUSE && settings->enableMouse) {
+         ch = ERR;
+         MEVENT mevent;
+         int ok = getmouse(&mevent);
+         if (ok == OK) {
+            if (mevent.bstate & BUTTON1_RELEASED) {
+               if (mevent.y == LINES - 1) {
+                  ch = FunctionBar_synthesizeEvent(panelFocus->currentBar, mevent.x);
+               } else {
+                  for (int i = 0; i < this->panelCount; i++) {
+                     Panel* panel = (Panel*) Vector_get(this->panels, i);
+                     if (mevent.x >= panel->x && mevent.x <= panel->x + panel->w) {
+                        if (mevent.y == panel->y) {
+                           ch = EVENT_HEADER_CLICK(mevent.x - panel->x);
+                           break;
+                        } else if (settings->screenTabs && mevent.y == panel->y - 1) {
+                           ch = EVENT_SCREEN_TAB_CLICK(mevent.x);
+                           break;
+                        } else if (mevent.y > panel->y && mevent.y <= panel->y + panel->h) {
+                           ch = KEY_MOUSE;
+                           if (panel == panelFocus || this->allowFocusChange) {
+                              focus = i;
+                              panelFocus = panel;
+                              const Object* oldSelection = Panel_getSelected(panel);
+                              Panel_setSelected(panel, mevent.y - panel->y + panel->scrollV - 1);
+                              if (Panel_getSelected(panel) == oldSelection) {
+                                 ch = KEY_RECLICK;
+                              }
+                           }
+                           break;
+                        }
+                     }
+                  }
+               }
+            #if NCURSES_MOUSE_VERSION > 1
+            } else if (mevent.bstate & BUTTON4_PRESSED) {
+               ch = KEY_WHEELUP;
+            } else if (mevent.bstate & BUTTON5_PRESSED) {
+               ch = KEY_WHEELDOWN;
+            #endif
+            }
+         }
+      }
+#endif
+      if (ch == ERR) {
+         if (sortTimeout > 0)
+            sortTimeout--;
+         if (prevCh == ch && !timedOut) {
+            closeTimeout++;
+            if (closeTimeout == 100) {
+               break;
+            }
+         } else {
+            closeTimeout = 0;
+         }
+         redraw = false;
+         continue;
+      }
+
+      switch (ch) {
+         case KEY_ALT('H'): ch = KEY_LEFT; break;
+         case KEY_ALT('J'): ch = KEY_DOWN; break;
+         case KEY_ALT('K'): ch = KEY_UP; break;
+         case KEY_ALT('L'): ch = KEY_RIGHT; break;
+      }
+
+      redraw = true;
+      if (Panel_eventHandlerFn(panelFocus)) {
+         result = Panel_eventHandler(panelFocus, ch);
+      }
+      if (result & SYNTH_KEY) {
+         ch = result >> 16;
+      }
+      if (result & REFRESH) {
+         sortTimeout = 0;
+      }
+      if (result & REDRAW) {
+         force_redraw = true;
+      }
+      if (result & RESIZE) {
+         ScreenManager_resize(this);
+         force_redraw = true;
+      }
+      if (result & RESCAN) {
+         rescan = true;
+         sortTimeout = 0;
+      }
+      if (result & HANDLED) {
+         continue;
+      } else if (result & BREAK_LOOP) {
+         quit = true;
+         continue;
+      }
+
+      switch (ch) {
+      case KEY_RESIZE:
+      {
+         ScreenManager_resize(this);
+         continue;
+      }
+      case KEY_LEFT:
+      case KEY_CTRL('B'):
+         if (this->panelCount < 2) {
+            goto defaultHandler;
+         }
+
+         if (!this->allowFocusChange) {
+            break;
+         }
+
+tryLeft:
+         if (focus > 0) {
+            focus--;
+         }
+
+         panelFocus = (Panel*) Vector_get(this->panels, focus);
+         if (Panel_size(panelFocus) == 0 && focus > 0) {
+            goto tryLeft;
+         }
+
+         break;
+      case KEY_RIGHT:
+      case KEY_CTRL('F'):
+      case 9:
+         if (this->panelCount < 2) {
+            goto defaultHandler;
+         }
+         if (!this->allowFocusChange) {
+            break;
+         }
+
+tryRight:
+         if (focus < this->panelCount - 1) {
+            focus++;
+         }
+
+         panelFocus = (Panel*) Vector_get(this->panels, focus);
+         if (Panel_size(panelFocus) == 0 && focus < this->panelCount - 1) {
+            goto tryRight;
+         }
+
+         break;
+      case '#':
+         this->state->hideMeters = !this->state->hideMeters;
+         ScreenManager_resize(this);
+         force_redraw = true;
+         break;
+      case 27:
+      case 'q':
+      case KEY_F(10):
+         quit = true;
+         continue;
+      default:
+defaultHandler:
+         sortTimeout = resetSortTimeout;
+         Panel_onKey(panelFocus, ch);
+         break;
+      }
+   }
+
+   if (lastFocus) {
+      *lastFocus = panelFocus;
+   }
+
+   if (lastKey) {
+      *lastKey = ch;
+   }
+}
diff --git a/ScreenManager.h b/ScreenManager.h
new file mode 100644
index 0000000..37821bb
--- /dev/null
+++ b/ScreenManager.h
@@ -0,0 +1,49 @@
+#ifndef HEADER_ScreenManager
+#define HEADER_ScreenManager
+/*
+htop - ScreenManager.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Action.h"
+#include "Header.h"
+#include "Machine.h"
+#include "Panel.h"
+#include "Vector.h"
+
+
+typedef struct ScreenManager_ {
+   int x1;
+   int y1;
+   int x2;
+   int y2;
+   Vector* panels;
+   const char* name;
+   int panelCount;
+   Header* header;
+   Machine* host;
+   State* state;
+   bool allowFocusChange;
+} ScreenManager;
+
+ScreenManager* ScreenManager_new(Header* header, Machine* host, State* state, bool owner);
+
+void ScreenManager_delete(ScreenManager* this);
+
+int ScreenManager_size(const ScreenManager* this);
+
+void ScreenManager_add(ScreenManager* this, Panel* item, int size);
+
+void ScreenManager_insert(ScreenManager* this, Panel* item, int size, int idx);
+
+Panel* ScreenManager_remove(ScreenManager* this, int idx);
+
+void ScreenManager_resize(ScreenManager* this);
+
+void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, const char* name);
+
+#endif
diff --git a/ScreenTabsPanel.c b/ScreenTabsPanel.c
new file mode 100644
index 0000000..e48e5fb
--- /dev/null
+++ b/ScreenTabsPanel.c
@@ -0,0 +1,374 @@
+/*
+htop - ScreenTabsPanel.c
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ScreenTabsPanel.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "Macros.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static HandlerResult ScreenNamesPanel_eventHandlerNormal(Panel* super, int ch);
+
+ObjectClass ScreenTabListItem_class = {
+   .extends = Class(ListItem),
+   .display = ListItem_display,
+   .delete = ListItem_delete,
+   .compare = ListItem_compare
+};
+
+static void ScreenNamesPanel_fill(ScreenNamesPanel* this, DynamicScreen* ds) {
+   const Settings* settings = this->settings;
+   Panel* super = (Panel*) this;
+   Panel_prune(super);
+
+   for (unsigned int i = 0; i < settings->nScreens; i++) {
+      const ScreenSettings* ss = settings->screens[i];
+
+      if (ds == NULL) {
+         if (ss->dynamic != NULL)
+            continue;
+         /* built-in (processes, not dynamic) - e.g. Main or I/O */
+      } else {
+         if (ss->dynamic == NULL)
+            continue;
+         if (!String_eq(ds->name, ss->dynamic))
+            continue;
+         /* matching dynamic screen found, add it into the Panel */
+      }
+      Panel_add(super, (Object*) ListItem_new(ss->heading, i));
+   }
+
+   this->ds = ds;
+}
+
+static void ScreenTabsPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   ScreenTabsPanel* this = (ScreenTabsPanel*) object;
+
+   Panel_done(super);
+   free(this);
+}
+
+static HandlerResult ScreenTabsPanel_eventHandler(Panel* super, int ch) {
+   ScreenTabsPanel* const this = (ScreenTabsPanel* const) super;
+
+   HandlerResult result = IGNORED;
+
+   int selected = Panel_getSelectedIndex(super);
+   switch (ch) {
+      case EVENT_SET_SELECTED:
+         result = HANDLED;
+         break;
+      case KEY_F(5):
+      case KEY_CTRL('N'):
+         /* pass onto the Names panel for creating new screen */
+         return ScreenNamesPanel_eventHandlerNormal(&this->names->super, ch);
+      case KEY_UP:
+      case KEY_DOWN:
+      case KEY_NPAGE:
+      case KEY_PPAGE:
+      case KEY_HOME:
+      case KEY_END: {
+         int previous = selected;
+         Panel_onKey(super, ch);
+         selected = Panel_getSelectedIndex(super);
+         if (previous != selected)
+            result = HANDLED;
+         break;
+      }
+      default:
+         if (ch < 255 && isalpha(ch))
+            result = Panel_selectByTyping(super, ch);
+         if (result == BREAK_LOOP)
+            result = IGNORED;
+         break;
+   }
+
+   if (result == HANDLED) {
+      ScreenTabListItem* focus = (ScreenTabListItem*) Panel_getSelected(super);
+      if (focus) {
+         ScreenNamesPanel_fill(this->names, focus->ds);
+      }
+   }
+
+   return result;
+}
+
+PanelClass ScreenTabsPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = ScreenTabsPanel_delete,
+   },
+   .eventHandler = ScreenTabsPanel_eventHandler
+};
+
+static ScreenTabListItem* ScreenTabListItem_new(const char* value, DynamicScreen* ds) {
+   ScreenTabListItem* this = AllocThis(ScreenTabListItem);
+   ListItem_init((ListItem*)this, value, 0);
+   this->ds = ds;
+   return this;
+}
+
+static void addDynamicScreen(ATTR_UNUSED ht_key_t key, void* value, void* userdata) {
+   DynamicScreen* screen = (DynamicScreen*) value;
+   Panel* super = (Panel*) userdata;
+   const char* name = screen->heading ? screen->heading : screen->name;
+
+   Panel_add(super, (Object*) ScreenTabListItem_new(name, screen));
+}
+
+static const char* const ScreenTabsFunctions[] = {"      ", "      ", "      ", "      ", "New   ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+ScreenTabsPanel* ScreenTabsPanel_new(Settings* settings) {
+   ScreenTabsPanel* this = AllocThis(ScreenTabsPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(ScreenTabsFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->settings = settings;
+   this->names = ScreenNamesPanel_new(settings);
+   super->cursorOn = false;
+   this->cursor = 0;
+   Panel_setHeader(super, "Screen tabs");
+
+   assert(settings->dynamicScreens != NULL);
+   Panel_add(super, (Object*) ScreenTabListItem_new("Processes", NULL));
+   Hashtable_foreach(settings->dynamicScreens, addDynamicScreen, super);
+
+   return this;
+}
+
+// -------------
+
+ObjectClass ScreenNameListItem_class = {
+   .extends = Class(ListItem),
+   .display = ListItem_display,
+   .delete = ListItem_delete,
+   .compare = ListItem_compare
+};
+
+ScreenNameListItem* ScreenNameListItem_new(const char* value, ScreenSettings* ss) {
+   ScreenNameListItem* this = AllocThis(ScreenNameListItem);
+   ListItem_init((ListItem*)this, value, 0);
+   this->ss = ss;
+   return this;
+}
+
+static const char* const ScreenNamesFunctions[] = {"      ", "      ", "      ", "      ", "New   ", "      ", "      ", "      ", "      ", "Done  ", NULL};
+
+static void ScreenNamesPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+   ScreenNamesPanel* this = (ScreenNamesPanel*) object;
+
+   /* do not delete screen settings still in use */
+   int n = Panel_size(super);
+   for (int i = 0; i < n; i++) {
+      ScreenNameListItem* item = (ScreenNameListItem*) Panel_get(super, i);
+      item->ss = NULL;
+   }
+
+   /* during renaming the ListItem's value points to our static buffer */
+   if (this->renamingItem)
+      this->renamingItem->value = this->saved;
+
+   Panel_done(super);
+   free(this);
+}
+
+static void renameScreenSettings(ScreenNamesPanel* this, const ListItem* item) {
+   const ScreenNameListItem* nameItem = (const ScreenNameListItem*) item;
+
+   ScreenSettings* ss = nameItem->ss;
+   free_and_xStrdup(&ss->heading, item->value);
+
+   Settings* settings = this->settings;
+   settings->changed = true;
+   settings->lastUpdate++;
+}
+
+static HandlerResult ScreenNamesPanel_eventHandlerRenaming(Panel* super, int ch) {
+   ScreenNamesPanel* const this = (ScreenNamesPanel*) super;
+
+   if (ch >= 32 && ch < 127 && ch != '=') {
+      if (this->cursor < SCREEN_NAME_LEN - 1) {
+         this->buffer[this->cursor] = (char)ch;
+         this->cursor++;
+         super->selectedLen = strlen(this->buffer);
+         Panel_setCursorToSelection(super);
+      }
+
+      return HANDLED;
+   }
+
+   switch (ch) {
+      case 127:
+      case KEY_BACKSPACE:
+         if (this->cursor > 0) {
+            this->cursor--;
+            this->buffer[this->cursor] = '\0';
+            super->selectedLen = strlen(this->buffer);
+            Panel_setCursorToSelection(super);
+         }
+         break;
+      case '\n':
+      case '\r':
+      case KEY_ENTER: {
+         ListItem* item = (ListItem*) Panel_getSelected(super);
+         if (!item)
+            break;
+         assert(item == this->renamingItem);
+         free(this->saved);
+         item->value = xStrdup(this->buffer);
+         this->renamingItem = NULL;
+         super->cursorOn = false;
+         Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+         renameScreenSettings(this, item);
+         break;
+      }
+      case 27: { // Esc
+         ListItem* item = (ListItem*) Panel_getSelected(super);
+         if (!item)
+            break;
+         assert(item == this->renamingItem);
+         item->value = this->saved;
+         this->renamingItem = NULL;
+         super->cursorOn = false;
+         Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+         break;
+      }
+   }
+
+   return HANDLED;
+}
+
+static void startRenaming(Panel* super) {
+   ScreenNamesPanel* const this = (ScreenNamesPanel*) super;
+
+   ListItem* item = (ListItem*) Panel_getSelected(super);
+   if (item == NULL)
+      return;
+
+   this->renamingItem = item;
+   super->cursorOn = true;
+   char* name = item->value;
+   this->saved = name;
+   strncpy(this->buffer, name, SCREEN_NAME_LEN);
+   this->buffer[SCREEN_NAME_LEN] = '\0';
+   this->cursor = strlen(this->buffer);
+   item->value = this->buffer;
+   Panel_setSelectionColor(super, PANEL_EDIT);
+   super->selectedLen = strlen(this->buffer);
+   Panel_setCursorToSelection(super);
+}
+
+static void addNewScreen(Panel* super, DynamicScreen* ds) {
+   ScreenNamesPanel* const this = (ScreenNamesPanel*) super;
+   const char* name = "New";
+   ScreenSettings* ss = (ds != NULL) ? Settings_newDynamicScreen(this->settings, name, ds, NULL) : Settings_newScreen(this->settings, &(const ScreenDefaults) { .name = name, .columns = "PID Command", .sortKey = "PID" });
+   ScreenNameListItem* item = ScreenNameListItem_new(name, ss);
+   int idx = Panel_getSelectedIndex(super);
+   Panel_insert(super, idx + 1, (Object*) item);
+   Panel_setSelected(super, idx + 1);
+}
+
+static HandlerResult ScreenNamesPanel_eventHandlerNormal(Panel* super, int ch) {
+   ScreenNamesPanel* const this = (ScreenNamesPanel*) super;
+   ScreenNameListItem* oldFocus = (ScreenNameListItem*) Panel_getSelected(super);
+   HandlerResult result = IGNORED;
+
+   switch (ch) {
+      case '\n':
+      case '\r':
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK:
+         Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+         result = HANDLED;
+         break;
+      case EVENT_SET_SELECTED:
+         result = HANDLED;
+         break;
+      case KEY_NPAGE:
+      case KEY_PPAGE:
+      case KEY_HOME:
+      case KEY_END:
+         Panel_onKey(super, ch);
+         break;
+      case KEY_F(5):
+      case KEY_CTRL('N'):
+         addNewScreen(super, this->ds);
+         startRenaming(super);
+         result = HANDLED;
+         break;
+      default:
+         if (ch < 255 && isalpha(ch))
+            result = Panel_selectByTyping(super, ch);
+         if (result == BREAK_LOOP)
+            result = IGNORED;
+         break;
+   }
+
+   ScreenNameListItem* newFocus = (ScreenNameListItem*) Panel_getSelected(super);
+   if (newFocus && oldFocus != newFocus)
+      result = HANDLED;
+
+   return result;
+}
+
+static HandlerResult ScreenNamesPanel_eventHandler(Panel* super, int ch) {
+   ScreenNamesPanel* const this = (ScreenNamesPanel*) super;
+
+   if (!this->renamingItem)
+      return ScreenNamesPanel_eventHandlerNormal(super, ch);
+   return ScreenNamesPanel_eventHandlerRenaming(super, ch);
+}
+
+PanelClass ScreenNamesPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = ScreenNamesPanel_delete
+   },
+   .eventHandler = ScreenNamesPanel_eventHandler
+};
+
+ScreenNamesPanel* ScreenNamesPanel_new(Settings* settings) {
+   ScreenNamesPanel* this = AllocThis(ScreenNamesPanel);
+   Panel* super = (Panel*) this;
+   FunctionBar* fuBar = FunctionBar_new(ScreenNamesFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->settings = settings;
+   this->renamingItem = NULL;
+   memset(this->buffer, 0, sizeof(this->buffer));
+   this->ds = NULL;
+   this->saved = NULL;
+   this->cursor = 0;
+   super->cursorOn = false;
+   Panel_setHeader(super, "Screens");
+
+   for (unsigned int i = 0; i < settings->nScreens; i++) {
+      ScreenSettings* ss = settings->screens[i];
+      /* initially show only for Processes tabs (selected) */
+      if (ss->dynamic)
+         continue;
+      Panel_add(super, (Object*) ScreenNameListItem_new(ss->heading, ss));
+   }
+   return this;
+}
diff --git a/ScreenTabsPanel.h b/ScreenTabsPanel.h
new file mode 100644
index 0000000..fe1a313
--- /dev/null
+++ b/ScreenTabsPanel.h
@@ -0,0 +1,61 @@
+#ifndef HEADER_ScreenTabsPanel
+#define HEADER_ScreenTabsPanel
+/*
+htop - ScreenTabsPanel.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "DynamicScreen.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "Panel.h"
+#include "ScreensPanel.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+
+
+typedef struct ScreenNamesPanel_ {
+   Panel super;
+
+   ScreenManager* scr;
+   Settings* settings;
+   char buffer[SCREEN_NAME_LEN + 1];
+   DynamicScreen* ds;
+   char* saved;
+   int cursor;
+   ListItem* renamingItem;
+} ScreenNamesPanel;
+
+typedef struct ScreenNameListItem_ {
+   ListItem super;
+   ScreenSettings* ss;
+} ScreenNameListItem;
+
+typedef struct ScreenTabsPanel_ {
+   Panel super;
+
+   ScreenManager* scr;
+   Settings* settings;
+   ScreenNamesPanel* names;
+   int cursor;
+} ScreenTabsPanel;
+
+typedef struct ScreenTabListItem_ {
+   ListItem super;
+   DynamicScreen* ds;
+} ScreenTabListItem;
+
+
+ScreenTabsPanel* ScreenTabsPanel_new(Settings* settings);
+
+extern ObjectClass ScreenNameListItem_class;
+
+ScreenNameListItem* ScreenNameListItem_new(const char* value, ScreenSettings* ss);
+
+extern PanelClass ScreenNamesPanel_class;
+
+ScreenNamesPanel* ScreenNamesPanel_new(Settings* settings);
+
+#endif
diff --git a/ScreensPanel.c b/ScreensPanel.c
new file mode 100644
index 0000000..4138066
--- /dev/null
+++ b/ScreensPanel.c
@@ -0,0 +1,328 @@
+/*
+htop - ScreensPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "ScreensPanel.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "AvailableColumnsPanel.h"
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Hashtable.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static void ScreenListItem_delete(Object* cast) {
+   ScreenListItem* this = (ScreenListItem*)cast;
+   if (this->ss) {
+      ScreenSettings_delete(this->ss);
+   }
+   ListItem_delete(cast);
+}
+
+ObjectClass ScreenListItem_class = {
+   .extends = Class(ListItem),
+   .display = ListItem_display,
+   .delete = ScreenListItem_delete,
+   .compare = ListItem_compare
+};
+
+ScreenListItem* ScreenListItem_new(const char* value, ScreenSettings* ss) {
+   ScreenListItem* this = AllocThis(ScreenListItem);
+   ListItem_init((ListItem*)this, value, 0);
+   this->ss = ss;
+   return this;
+}
+
+static const char* const ScreensFunctions[] = {"      ", "Rename", "      ", "      ", "New   ", "      ", "MoveUp", "MoveDn", "Remove", "Done  ", NULL};
+static const char* const DynamicFunctions[] = {"      ", "Rename", "      ", "      ", "      ", "      ", "MoveUp", "MoveDn", "Remove", "Done  ", NULL};
+
+static void ScreensPanel_delete(Object* object) {
+   Panel* super = (Panel*) object;
+
+   /* do not delete screen settings still in use */
+   int n = Panel_size(super);
+   for (int i = 0; i < n; i++) {
+      ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
+      item->ss = NULL;
+   }
+
+   Panel_delete(object);
+}
+
+static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   if (ch >= 32 && ch < 127 && ch != '=') {
+      if (this->cursor < SCREEN_NAME_LEN - 1) {
+         this->buffer[this->cursor] = (char)ch;
+         this->cursor++;
+         super->selectedLen = strlen(this->buffer);
+         Panel_setCursorToSelection(super);
+      }
+
+      return HANDLED;
+   }
+
+   switch (ch) {
+      case 127:
+      case KEY_BACKSPACE:
+         if (this->cursor > 0) {
+            this->cursor--;
+            this->buffer[this->cursor] = '\0';
+            super->selectedLen = strlen(this->buffer);
+            Panel_setCursorToSelection(super);
+         }
+         break;
+      case '\n':
+      case '\r':
+      case KEY_ENTER: {
+         ListItem* item = (ListItem*) Panel_getSelected(super);
+         if (!item)
+            break;
+         assert(item == this->renamingItem);
+         free(this->saved);
+         item->value = xStrdup(this->buffer);
+         this->renamingItem = NULL;
+         super->cursorOn = false;
+         Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+         ScreensPanel_update(super);
+         break;
+      }
+      case 27: { // Esc
+         ListItem* item = (ListItem*) Panel_getSelected(super);
+         if (!item)
+            break;
+         assert(item == this->renamingItem);
+         item->value = this->saved;
+         this->renamingItem = NULL;
+         super->cursorOn = false;
+         Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS);
+         break;
+      }
+   }
+
+   return HANDLED;
+}
+
+static void startRenaming(Panel* super) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   ListItem* item = (ListItem*) Panel_getSelected(super);
+   if (item == NULL)
+      return;
+   this->renamingItem = item;
+   super->cursorOn = true;
+   char* name = item->value;
+   this->saved = name;
+   strncpy(this->buffer, name, SCREEN_NAME_LEN);
+   this->buffer[SCREEN_NAME_LEN] = '\0';
+   this->cursor = strlen(this->buffer);
+   item->value = this->buffer;
+   Panel_setSelectionColor(super, PANEL_EDIT);
+   super->selectedLen = strlen(this->buffer);
+   Panel_setCursorToSelection(super);
+}
+
+static void rebuildSettingsArray(Panel* super, int selected) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   int n = Panel_size(super);
+   free(this->settings->screens);
+   this->settings->screens = xMallocArray(n + 1, sizeof(ScreenSettings*));
+   this->settings->screens[n] = NULL;
+   for (int i = 0; i < n; i++) {
+      ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
+      this->settings->screens[i] = item->ss;
+   }
+   this->settings->nScreens = n;
+   /* ensure selection is in valid range */
+   if (selected > n - 1)
+      selected = n - 1;
+   else if (selected < 0)
+      selected = 0;
+   this->settings->ssIndex = selected;
+   this->settings->ss = this->settings->screens[selected];
+}
+
+static void addNewScreen(Panel* super) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   const char* name = "New";
+   ScreenSettings* ss = Settings_newScreen(this->settings, &(const ScreenDefaults) { .name = name, .columns = "PID Command", .sortKey = "PID" });
+   ScreenListItem* item = ScreenListItem_new(name, ss);
+   int idx = Panel_getSelectedIndex(super);
+   Panel_insert(super, idx + 1, (Object*) item);
+   Panel_setSelected(super, idx + 1);
+}
+
+static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   int selected = Panel_getSelectedIndex(super);
+   ScreenListItem* oldFocus = (ScreenListItem*) Panel_getSelected(super);
+   bool shouldRebuildArray = false;
+   HandlerResult result = IGNORED;
+
+   switch (ch) {
+      case '\n':
+      case '\r':
+      case KEY_ENTER:
+      case KEY_MOUSE:
+      case KEY_RECLICK: {
+         this->moving = !this->moving;
+         Panel_setSelectionColor(super, this->moving ? PANEL_SELECTION_FOLLOW : PANEL_SELECTION_FOCUS);
+         ListItem* item = (ListItem*) Panel_getSelected(super);
+         if (item)
+            item->moving = this->moving;
+         result = HANDLED;
+         break;
+      }
+      case EVENT_SET_SELECTED:
+         result = HANDLED;
+         break;
+      case KEY_NPAGE:
+      case KEY_PPAGE:
+      case KEY_HOME:
+      case KEY_END:
+         Panel_onKey(super, ch);
+         break;
+      case KEY_F(2):
+      case KEY_CTRL('R'):
+         startRenaming(super);
+         result = HANDLED;
+         break;
+      case KEY_F(5):
+      case KEY_CTRL('N'):
+         if (this->settings->dynamicScreens)
+            break;
+         addNewScreen(super);
+         startRenaming(super);
+         shouldRebuildArray = true;
+         result = HANDLED;
+         break;
+      case KEY_UP:
+         if (!this->moving) {
+            Panel_onKey(super, ch);
+            break;
+         }
+         /* FALLTHRU */
+      case KEY_F(7):
+      case '[':
+      case '-':
+         Panel_moveSelectedUp(super);
+         shouldRebuildArray = true;
+         result = HANDLED;
+         break;
+      case KEY_DOWN:
+         if (!this->moving) {
+            Panel_onKey(super, ch);
+            break;
+         }
+         /* FALLTHRU */
+      case KEY_F(8):
+      case ']':
+      case '+':
+         Panel_moveSelectedDown(super);
+         shouldRebuildArray = true;
+         result = HANDLED;
+         break;
+      case KEY_F(9):
+      //case KEY_DC:
+         if (Panel_size(super) > 1)
+            Panel_remove(super, selected);
+         shouldRebuildArray = true;
+         result = HANDLED;
+         break;
+      default:
+         if (ch < 255 && isalpha(ch))
+            result = Panel_selectByTyping(super, ch);
+         if (result == BREAK_LOOP)
+            result = IGNORED;
+         break;
+   }
+
+   ScreenListItem* newFocus = (ScreenListItem*) Panel_getSelected(super);
+   if (newFocus && oldFocus != newFocus) {
+      Hashtable* dynamicColumns = this->settings->dynamicColumns;
+      ColumnsPanel_fill(this->columns, newFocus->ss, dynamicColumns);
+      AvailableColumnsPanel_fill(this->availableColumns, newFocus->ss->dynamic, dynamicColumns);
+      result = HANDLED;
+   }
+
+   if (shouldRebuildArray)
+      rebuildSettingsArray(super, selected);
+   if (result == HANDLED)
+      ScreensPanel_update(super);
+
+   return result;
+}
+
+static HandlerResult ScreensPanel_eventHandler(Panel* super, int ch) {
+   ScreensPanel* const this = (ScreensPanel*) super;
+
+   if (this->renamingItem) {
+      return ScreensPanel_eventHandlerRenaming(super, ch);
+   } else {
+      return ScreensPanel_eventHandlerNormal(super, ch);
+   }
+}
+
+PanelClass ScreensPanel_class = {
+   .super = {
+      .extends = Class(Panel),
+      .delete = ScreensPanel_delete
+   },
+   .eventHandler = ScreensPanel_eventHandler
+};
+
+ScreensPanel* ScreensPanel_new(Settings* settings) {
+   ScreensPanel* this = AllocThis(ScreensPanel);
+   Panel* super = (Panel*) this;
+   Hashtable* columns = settings->dynamicColumns;
+   FunctionBar* fuBar = FunctionBar_new(settings->dynamicScreens ? DynamicFunctions : ScreensFunctions, NULL, NULL);
+   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
+
+   this->settings = settings;
+   this->columns = ColumnsPanel_new(settings->screens[0], columns, &(settings->changed));
+   this->availableColumns = AvailableColumnsPanel_new((Panel*) this->columns, columns);
+   this->moving = false;
+   this->renamingItem = NULL;
+   super->cursorOn = false;
+   this->cursor = 0;
+   Panel_setHeader(super, "Screens");
+
+   for (unsigned int i = 0; i < settings->nScreens; i++) {
+      ScreenSettings* ss = settings->screens[i];
+      char* name = ss->heading;
+      Panel_add(super, (Object*) ScreenListItem_new(name, ss));
+   }
+   return this;
+}
+
+void ScreensPanel_update(Panel* super) {
+   ScreensPanel* this = (ScreensPanel*) super;
+   int size = Panel_size(super);
+   this->settings->changed = true;
+   this->settings->lastUpdate++;
+   this->settings->screens = xReallocArray(this->settings->screens, size + 1, sizeof(ScreenSettings*));
+   for (int i = 0; i < size; i++) {
+      ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
+      ScreenSettings* ss = item->ss;
+      free_and_xStrdup(&ss->heading, ((ListItem*) item)->value);
+      this->settings->screens[i] = ss;
+   }
+   this->settings->screens[size] = NULL;
+}
diff --git a/ScreensPanel.h b/ScreensPanel.h
new file mode 100644
index 0000000..0be0b82
--- /dev/null
+++ b/ScreensPanel.h
@@ -0,0 +1,55 @@
+#ifndef HEADER_ScreensPanel
+#define HEADER_ScreensPanel
+/*
+htop - ScreensPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "AvailableColumnsPanel.h"
+#include "ColumnsPanel.h"
+#include "DynamicScreen.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "Panel.h"
+#include "ScreenManager.h"
+#include "Settings.h"
+
+#ifndef SCREEN_NAME_LEN
+#define SCREEN_NAME_LEN 20
+#endif
+
+typedef struct ScreensPanel_ {
+   Panel super;
+
+   ScreenManager* scr;
+   Settings* settings;
+   ColumnsPanel* columns;
+   AvailableColumnsPanel* availableColumns;
+   char buffer[SCREEN_NAME_LEN + 1];
+   char* saved;
+   int cursor;
+   bool moving;
+   ListItem* renamingItem;
+} ScreensPanel;
+
+typedef struct ScreenListItem_ {
+   ListItem super;
+   DynamicScreen* ds;
+   ScreenSettings* ss;
+} ScreenListItem;
+
+
+extern ObjectClass ScreenListItem_class;
+
+ScreenListItem* ScreenListItem_new(const char* value, ScreenSettings* ss);
+
+ScreensPanel* ScreensPanel_new(Settings* settings);
+
+void ScreensPanel_update(Panel* super);
+
+#endif
diff --git a/Settings.c b/Settings.c
new file mode 100644
index 0000000..a01e249
--- /dev/null
+++ b/Settings.c
@@ -0,0 +1,911 @@
+/*
+htop - Settings.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Settings.h"
+
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "DynamicScreen.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "Platform.h"
+#include "Process.h"
+#include "Table.h"
+#include "XUtils.h"
+
+
+/*
+
+static char** readQuotedList(char* line) {
+   int n = 0;
+   char** list = xCalloc(sizeof(char*), 1);
+   int start = 0;
+   for (;;) {
+      while (line[start] && line[start] == ' ') {
+         start++;
+      }
+      if (line[start] != '"') {
+         break;
+      }
+      start++;
+      int close = start;
+      while (line[close] && line[close] != '"') {
+         close++;
+      }
+      int len = close - start;
+      char* item = xMalloc(len + 1);
+      strncpy(item, line + start, len);
+      item[len] = '\0';
+      list[n] = item;
+      n++;
+      list = xRealloc(list, sizeof(char*) * (n + 1));
+      start = close + 1;
+   }
+   list[n] = NULL;
+   return list;
+}
+
+static void writeQuotedList(FILE* fd, char** list) {
+   const char* sep = "";
+   for (int i = 0; list[i]; i++) {
+      fprintf(fd, "%s\"%s\"", sep, list[i]);
+      sep = " ";
+   }
+   fprintf(fd, "\n");
+}
+
+*/
+
+void Settings_delete(Settings* this) {
+   free(this->filename);
+   for (unsigned int i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
+      String_freeArray(this->hColumns[i].names);
+      free(this->hColumns[i].modes);
+   }
+   free(this->hColumns);
+   if (this->screens) {
+      for (unsigned int i = 0; this->screens[i]; i++) {
+         ScreenSettings_delete(this->screens[i]);
+      }
+      free(this->screens);
+   }
+   free(this);
+}
+
+static void Settings_readMeters(Settings* this, const char* line, unsigned int column) {
+   char* trim = String_trim(line);
+   char** ids = String_split(trim, ' ', NULL);
+   free(trim);
+   column = MINIMUM(column, HeaderLayout_getColumns(this->hLayout) - 1);
+   this->hColumns[column].names = ids;
+}
+
+static void Settings_readMeterModes(Settings* this, const char* line, unsigned int column) {
+   char* trim = String_trim(line);
+   char** ids = String_split(trim, ' ', NULL);
+   free(trim);
+   int len = 0;
+   for (int i = 0; ids[i]; i++) {
+      len++;
+   }
+   column = MINIMUM(column, HeaderLayout_getColumns(this->hLayout) - 1);
+   this->hColumns[column].len = len;
+   int* modes = len ? xCalloc(len, sizeof(int)) : NULL;
+   for (int i = 0; i < len; i++) {
+      modes[i] = atoi(ids[i]);
+   }
+   String_freeArray(ids);
+   this->hColumns[column].modes = modes;
+}
+
+static bool Settings_validateMeters(Settings* this) {
+   const size_t colCount = HeaderLayout_getColumns(this->hLayout);
+
+   bool anyMeter = false;
+
+   for (size_t column = 0; column < colCount; column++) {
+      char** names = this->hColumns[column].names;
+      const int* modes = this->hColumns[column].modes;
+      const size_t len = this->hColumns[column].len;
+
+      if (!len)
+         continue;
+
+      if (!names || !modes)
+         return false;
+
+      anyMeter |= !!len;
+
+      // Check for each mode there is an entry with a non-NULL name
+      for (size_t meterIdx = 0; meterIdx < len; meterIdx++)
+         if (!names[meterIdx])
+            return false;
+
+      if (names[len])
+         return false;
+   }
+
+   return anyMeter;
+}
+
+static void Settings_defaultMeters(Settings* this, unsigned int initialCpuCount) {
+   int sizes[] = { 3, 3 };
+
+   if (initialCpuCount > 4 && initialCpuCount <= 128) {
+      sizes[1]++;
+   }
+
+   // Release any previously allocated memory
+   for (size_t i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
+      String_freeArray(this->hColumns[i].names);
+      free(this->hColumns[i].modes);
+   }
+   free(this->hColumns);
+
+   this->hLayout = HF_TWO_50_50;
+   this->hColumns = xCalloc(HeaderLayout_getColumns(this->hLayout), sizeof(MeterColumnSetting));
+   for (size_t i = 0; i < 2; i++) {
+      this->hColumns[i].names = xCalloc(sizes[i] + 1, sizeof(char*));
+      this->hColumns[i].modes = xCalloc(sizes[i], sizeof(int));
+      this->hColumns[i].len = sizes[i];
+   }
+
+   int r = 0;
+
+   if (initialCpuCount > 128) {
+      // Just show the average, ricers need to config for impressive screenshots
+      this->hColumns[0].names[0] = xStrdup("CPU");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+   } else if (initialCpuCount > 32) {
+      this->hColumns[0].names[0] = xStrdup("LeftCPUs8");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+      this->hColumns[1].names[r] = xStrdup("RightCPUs8");
+      this->hColumns[1].modes[r++] = BAR_METERMODE;
+   } else if (initialCpuCount > 16) {
+      this->hColumns[0].names[0] = xStrdup("LeftCPUs4");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+      this->hColumns[1].names[r] = xStrdup("RightCPUs4");
+      this->hColumns[1].modes[r++] = BAR_METERMODE;
+   } else if (initialCpuCount > 8) {
+      this->hColumns[0].names[0] = xStrdup("LeftCPUs2");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+      this->hColumns[1].names[r] = xStrdup("RightCPUs2");
+      this->hColumns[1].modes[r++] = BAR_METERMODE;
+   } else if (initialCpuCount > 4) {
+      this->hColumns[0].names[0] = xStrdup("LeftCPUs");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+      this->hColumns[1].names[r] = xStrdup("RightCPUs");
+      this->hColumns[1].modes[r++] = BAR_METERMODE;
+   } else {
+      this->hColumns[0].names[0] = xStrdup("AllCPUs");
+      this->hColumns[0].modes[0] = BAR_METERMODE;
+   }
+   this->hColumns[0].names[1] = xStrdup("Memory");
+   this->hColumns[0].modes[1] = BAR_METERMODE;
+   this->hColumns[0].names[2] = xStrdup("Swap");
+   this->hColumns[0].modes[2] = BAR_METERMODE;
+   this->hColumns[1].names[r] = xStrdup("Tasks");
+   this->hColumns[1].modes[r++] = TEXT_METERMODE;
+   this->hColumns[1].names[r] = xStrdup("LoadAverage");
+   this->hColumns[1].modes[r++] = TEXT_METERMODE;
+   this->hColumns[1].names[r] = xStrdup("Uptime");
+   this->hColumns[1].modes[r++] = TEXT_METERMODE;
+}
+
+static const char* toFieldName(Hashtable* columns, int id, bool* enabled) {
+   if (id < 0) {
+      if (enabled)
+         *enabled = false;
+      return NULL;
+   }
+   if (id >= ROW_DYNAMIC_FIELDS) {
+      const DynamicColumn* column = DynamicColumn_lookup(columns, id);
+      if (!column) {
+         if (enabled)
+            *enabled = false;
+         return NULL;
+      }
+      if (enabled)
+         *enabled = column->enabled;
+      return column->name;
+   }
+   if (enabled)
+      *enabled = true;
+   return Process_fields[id].name;
+}
+
+static int toFieldIndex(Hashtable* columns, const char* str) {
+   if (isdigit(str[0])) {
+      // This "+1" is for compatibility with the older enum format.
+      int id = atoi(str) + 1;
+      if (toFieldName(columns, id, NULL)) {
+         return id;
+      }
+   } else {
+      // Dynamically-defined columns are always stored by-name.
+      char dynamic[32] = {0};
+      if (sscanf(str, "Dynamic(%30s)", dynamic)) {
+         char* end;
+         if ((end = strrchr(dynamic, ')')) != NULL) {
+            bool success;
+            unsigned int key;
+            *end = '\0';
+            success = DynamicColumn_search(columns, dynamic, &key) != NULL;
+            *end = ')';
+            if (success)
+               return key;
+         }
+      }
+      // Fallback to iterative scan of table of fields by-name.
+      for (int p = 1; p < LAST_PROCESSFIELD; p++) {
+         const char* pName = toFieldName(columns, p, NULL);
+         if (pName && strcmp(pName, str) == 0)
+            return p;
+      }
+   }
+   return -1;
+}
+
+static void ScreenSettings_readFields(ScreenSettings* ss, Hashtable* columns, const char* line) {
+   char* trim = String_trim(line);
+   char** ids = String_split(trim, ' ', NULL);
+   free(trim);
+
+   /* reset default fields */
+   memset(ss->fields, '\0', LAST_PROCESSFIELD * sizeof(ProcessField));
+
+   for (size_t j = 0, i = 0; ids[i]; i++) {
+      if (j >= UINT_MAX / sizeof(ProcessField))
+         continue;
+      if (j >= LAST_PROCESSFIELD) {
+         ss->fields = xRealloc(ss->fields, (j + 1) * sizeof(ProcessField));
+         memset(&ss->fields[j], 0, sizeof(ProcessField));
+      }
+      int id = toFieldIndex(columns, ids[i]);
+      if (id >= 0)
+         ss->fields[j++] = id;
+      if (id > 0 && id < LAST_PROCESSFIELD)
+         ss->flags |= Process_fields[id].flags;
+   }
+   String_freeArray(ids);
+}
+
+static ScreenSettings* Settings_initScreenSettings(ScreenSettings* ss, Settings* this, const char* columns) {
+   ScreenSettings_readFields(ss, this->dynamicColumns, columns);
+   this->screens[this->nScreens] = ss;
+   this->nScreens++;
+   this->screens = xRealloc(this->screens, sizeof(ScreenSettings*) * (this->nScreens + 1));
+   this->screens[this->nScreens] = NULL;
+   return ss;
+}
+
+ScreenSettings* Settings_newScreen(Settings* this, const ScreenDefaults* defaults) {
+   int sortKey = defaults->sortKey ? toFieldIndex(this->dynamicColumns, defaults->sortKey) : PID;
+   int treeSortKey = defaults->treeSortKey ? toFieldIndex(this->dynamicColumns, defaults->treeSortKey) : PID;
+   int sortDesc = (sortKey >= 0 && sortKey < LAST_PROCESSFIELD) ? Process_fields[sortKey].defaultSortDesc : 1;
+
+   ScreenSettings* ss = xMalloc(sizeof(ScreenSettings));
+   *ss = (ScreenSettings) {
+      .heading = xStrdup(defaults->name),
+      .dynamic = NULL,
+      .table = NULL,
+      .fields = xCalloc(LAST_PROCESSFIELD, sizeof(ProcessField)),
+      .flags = 0,
+      .direction = sortDesc ? -1 : 1,
+      .treeDirection = 1,
+      .sortKey = sortKey,
+      .treeSortKey = treeSortKey,
+      .treeView = false,
+      .treeViewAlwaysByPID = false,
+      .allBranchesCollapsed = false,
+   };
+   return Settings_initScreenSettings(ss, this, defaults->columns);
+}
+
+ScreenSettings* Settings_newDynamicScreen(Settings* this, const char* tab, const DynamicScreen* screen, Table* table) {
+   int sortKey = toFieldIndex(this->dynamicColumns, screen->columnKeys);
+
+   ScreenSettings* ss = xMalloc(sizeof(ScreenSettings));
+   *ss = (ScreenSettings) {
+      .heading = xStrdup(tab),
+      .dynamic = xStrdup(screen->name),
+      .table = table,
+      .fields = xCalloc(LAST_PROCESSFIELD, sizeof(ProcessField)),
+      .direction = screen->direction,
+      .treeDirection = 1,
+      .sortKey = sortKey,
+   };
+   return Settings_initScreenSettings(ss, this, screen->columnKeys);
+}
+
+void ScreenSettings_delete(ScreenSettings* this) {
+   free(this->heading);
+   free(this->dynamic);
+   free(this->fields);
+   free(this);
+}
+
+static ScreenSettings* Settings_defaultScreens(Settings* this) {
+   if (this->nScreens)
+      return this->screens[0];
+   for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) {
+      const ScreenDefaults* defaults = &Platform_defaultScreens[i];
+      Settings_newScreen(this, defaults);
+   }
+   Platform_defaultDynamicScreens(this);
+   return this->screens[0];
+}
+
+static bool Settings_read(Settings* this, const char* fileName, unsigned int initialCpuCount) {
+   FILE* fd = fopen(fileName, "r");
+   if (!fd)
+      return false;
+
+   ScreenSettings* screen = NULL;
+   bool didReadMeters = false;
+   bool didReadAny = false;
+   for (;;) {
+      char* line = String_readLine(fd);
+      if (!line) {
+         break;
+      }
+      didReadAny = true;
+      size_t nOptions;
+      char** option = String_split(line, '=', &nOptions);
+      free (line);
+      if (nOptions < 2) {
+         String_freeArray(option);
+         continue;
+      }
+      if (String_eq(option[0], "config_reader_min_version")) {
+         this->config_version = atoi(option[1]);
+         if (this->config_version > CONFIG_READER_MIN_VERSION) {
+            // the version of the config file on disk is newer than what we can read
+            fprintf(stderr, "WARNING: %s specifies configuration format\n", fileName);
+            fprintf(stderr, "         version v%d, but this %s binary only supports up to version v%d.\n", this->config_version, PACKAGE, CONFIG_READER_MIN_VERSION);
+            fprintf(stderr, "         The configuration file will be downgraded to v%d when %s exits.\n", CONFIG_READER_MIN_VERSION, PACKAGE);
+            String_freeArray(option);
+            fclose(fd);
+            return false;
+         }
+      } else if (String_eq(option[0], "fields") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         ScreenSettings_readFields(screen, this->dynamicColumns, option[1]);
+      } else if (String_eq(option[0], "sort_key") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         // This "+1" is for compatibility with the older enum format.
+         screen = Settings_defaultScreens(this);
+         screen->sortKey = atoi(option[1]) + 1;
+      } else if (String_eq(option[0], "tree_sort_key") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         // This "+1" is for compatibility with the older enum format.
+         screen = Settings_defaultScreens(this);
+         screen->treeSortKey = atoi(option[1]) + 1;
+      } else if (String_eq(option[0], "sort_direction") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         screen->direction = atoi(option[1]);
+      } else if (String_eq(option[0], "tree_sort_direction") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         screen->treeDirection = atoi(option[1]);
+      } else if (String_eq(option[0], "tree_view") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         screen->treeView = atoi(option[1]);
+      } else if (String_eq(option[0], "tree_view_always_by_pid") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         screen->treeViewAlwaysByPID = atoi(option[1]);
+      } else if (String_eq(option[0], "all_branches_collapsed") && this->config_version <= 2) {
+         // old (no screen) naming also supported for backwards compatibility
+         screen = Settings_defaultScreens(this);
+         screen->allBranchesCollapsed = atoi(option[1]);
+      } else if (String_eq(option[0], "hide_kernel_threads")) {
+         this->hideKernelThreads = atoi(option[1]);
+      } else if (String_eq(option[0], "hide_userland_threads")) {
+         this->hideUserlandThreads = atoi(option[1]);
+      } else if (String_eq(option[0], "hide_running_in_container")) {
+         this->hideRunningInContainer = atoi(option[1]);
+      } else if (String_eq(option[0], "shadow_other_users")) {
+         this->shadowOtherUsers = atoi(option[1]);
+      } else if (String_eq(option[0], "show_thread_names")) {
+         this->showThreadNames = atoi(option[1]);
+      } else if (String_eq(option[0], "show_program_path")) {
+         this->showProgramPath = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_base_name")) {
+         this->highlightBaseName = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_deleted_exe")) {
+         this->highlightDeletedExe = atoi(option[1]);
+      } else if (String_eq(option[0], "shadow_distribution_path_prefix")) {
+         this->shadowDistPathPrefix = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_megabytes")) {
+         this->highlightMegabytes = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_threads")) {
+         this->highlightThreads = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_changes")) {
+         this->highlightChanges = atoi(option[1]);
+      } else if (String_eq(option[0], "highlight_changes_delay_secs")) {
+         this->highlightDelaySecs = CLAMP(atoi(option[1]), 1, 24 * 60 * 60);
+      } else if (String_eq(option[0], "find_comm_in_cmdline")) {
+         this->findCommInCmdline = atoi(option[1]);
+      } else if (String_eq(option[0], "strip_exe_from_cmdline")) {
+         this->stripExeFromCmdline = atoi(option[1]);
+      } else if (String_eq(option[0], "show_merged_command")) {
+         this->showMergedCommand = atoi(option[1]);
+      } else if (String_eq(option[0], "header_margin")) {
+         this->headerMargin = atoi(option[1]);
+      } else if (String_eq(option[0], "screen_tabs")) {
+         this->screenTabs = atoi(option[1]);
+      } else if (String_eq(option[0], "expand_system_time")) {
+         // Compatibility option.
+         this->detailedCPUTime = atoi(option[1]);
+      } else if (String_eq(option[0], "detailed_cpu_time")) {
+         this->detailedCPUTime = atoi(option[1]);
+      } else if (String_eq(option[0], "cpu_count_from_one")) {
+         this->countCPUsFromOne = atoi(option[1]);
+      } else if (String_eq(option[0], "cpu_count_from_zero")) {
+         // old (inverted) naming also supported for backwards compatibility
+         this->countCPUsFromOne = !atoi(option[1]);
+      } else if (String_eq(option[0], "show_cpu_usage")) {
+         this->showCPUUsage = atoi(option[1]);
+      } else if (String_eq(option[0], "show_cpu_frequency")) {
+         this->showCPUFrequency = atoi(option[1]);
+      #ifdef BUILD_WITH_CPU_TEMP
+      } else if (String_eq(option[0], "show_cpu_temperature")) {
+         this->showCPUTemperature = atoi(option[1]);
+      } else if (String_eq(option[0], "degree_fahrenheit")) {
+         this->degreeFahrenheit = atoi(option[1]);
+      #endif
+      } else if (String_eq(option[0], "update_process_names")) {
+         this->updateProcessNames = atoi(option[1]);
+      } else if (String_eq(option[0], "account_guest_in_cpu_meter")) {
+         this->accountGuestInCPUMeter = atoi(option[1]);
+      } else if (String_eq(option[0], "delay")) {
+         this->delay = CLAMP(atoi(option[1]), 1, 255);
+      } else if (String_eq(option[0], "color_scheme")) {
+         this->colorScheme = atoi(option[1]);
+         if (this->colorScheme < 0 || this->colorScheme >= LAST_COLORSCHEME) {
+            this->colorScheme = 0;
+         }
+      #ifdef HAVE_GETMOUSE
+      } else if (String_eq(option[0], "enable_mouse")) {
+         this->enableMouse = atoi(option[1]);
+      #endif
+      } else if (String_eq(option[0], "header_layout")) {
+         this->hLayout = isdigit((unsigned char)option[1][0]) ? ((HeaderLayout) atoi(option[1])) : HeaderLayout_fromName(option[1]);
+         if (this->hLayout < 0 || this->hLayout >= LAST_HEADER_LAYOUT)
+            this->hLayout = HF_TWO_50_50;
+         free(this->hColumns);
+         this->hColumns = xCalloc(HeaderLayout_getColumns(this->hLayout), sizeof(MeterColumnSetting));
+      } else if (String_eq(option[0], "left_meters")) {
+         Settings_readMeters(this, option[1], 0);
+         didReadMeters = true;
+      } else if (String_eq(option[0], "right_meters")) {
+         Settings_readMeters(this, option[1], 1);
+         didReadMeters = true;
+      } else if (String_eq(option[0], "left_meter_modes")) {
+         Settings_readMeterModes(this, option[1], 0);
+         didReadMeters = true;
+      } else if (String_eq(option[0], "right_meter_modes")) {
+         Settings_readMeterModes(this, option[1], 1);
+         didReadMeters = true;
+      } else if (String_startsWith(option[0], "column_meters_")) {
+         Settings_readMeters(this, option[1], atoi(option[0] + strlen("column_meters_")));
+         didReadMeters = true;
+      } else if (String_startsWith(option[0], "column_meter_modes_")) {
+         Settings_readMeterModes(this, option[1], atoi(option[0] + strlen("column_meter_modes_")));
+         didReadMeters = true;
+      } else if (String_eq(option[0], "hide_function_bar")) {
+         this->hideFunctionBar = atoi(option[1]);
+      #ifdef HAVE_LIBHWLOC
+      } else if (String_eq(option[0], "topology_affinity")) {
+         this->topologyAffinity = !!atoi(option[1]);
+      #endif
+      } else if (strncmp(option[0], "screen:", 7) == 0) {
+         screen = Settings_newScreen(this, &(const ScreenDefaults) { .name = option[0] + 7, .columns = option[1] });
+      } else if (String_eq(option[0], ".sort_key")) {
+         if (screen) {
+            int key = toFieldIndex(this->dynamicColumns, option[1]);
+            screen->sortKey = key > 0 ? key : PID;
+         }
+      } else if (String_eq(option[0], ".tree_sort_key")) {
+         if (screen) {
+            int key = toFieldIndex(this->dynamicColumns, option[1]);
+            screen->treeSortKey = key > 0 ? key : PID;
+         }
+      } else if (String_eq(option[0], ".sort_direction")) {
+         if (screen)
+            screen->direction = atoi(option[1]);
+      } else if (String_eq(option[0], ".tree_sort_direction")) {
+         if (screen)
+            screen->treeDirection = atoi(option[1]);
+      } else if (String_eq(option[0], ".tree_view")) {
+         if (screen)
+            screen->treeView = atoi(option[1]);
+      } else if (String_eq(option[0], ".tree_view_always_by_pid")) {
+         if (screen)
+            screen->treeViewAlwaysByPID = atoi(option[1]);
+      } else if (String_eq(option[0], ".all_branches_collapsed")) {
+         if (screen)
+            screen->allBranchesCollapsed = atoi(option[1]);
+      } else if (String_eq(option[0], ".dynamic")) {
+         if (screen) {
+            free_and_xStrdup(&screen->dynamic, option[1]);
+            Platform_addDynamicScreen(screen);
+         }
+      }
+      String_freeArray(option);
+   }
+   fclose(fd);
+   if (!didReadMeters || !Settings_validateMeters(this))
+      Settings_defaultMeters(this, initialCpuCount);
+   if (!this->nScreens)
+      Settings_defaultScreens(this);
+   return didReadAny;
+}
+
+static void writeFields(FILE* fd, const ProcessField* fields, Hashtable* columns, bool byName, char separator) {
+   const char* sep = "";
+   for (unsigned int i = 0; fields[i]; i++) {
+      if (fields[i] < LAST_PROCESSFIELD && byName) {
+         const char* pName = toFieldName(columns, fields[i], NULL);
+         fprintf(fd, "%s%s", sep, pName);
+      } else if (fields[i] >= LAST_PROCESSFIELD && byName) {
+         bool enabled;
+         const char* pName = toFieldName(columns, fields[i], &enabled);
+         if (enabled)
+            fprintf(fd, "%sDynamic(%s)", sep, pName);
+      } else {
+         // This "-1" is for compatibility with the older enum format.
+         fprintf(fd, "%s%d", sep, (int) fields[i] - 1);
+      }
+      sep = " ";
+   }
+   fputc(separator, fd);
+}
+
+static void writeList(FILE* fd, char** list, int len, char separator) {
+   const char* sep = "";
+   for (int i = 0; i < len; i++) {
+      fprintf(fd, "%s%s", sep, list[i]);
+      sep = " ";
+   }
+   fputc(separator, fd);
+}
+
+static void writeMeters(const Settings* this, FILE* fd, char separator, unsigned int column) {
+   if (this->hColumns[column].len) {
+      writeList(fd, this->hColumns[column].names, this->hColumns[column].len, separator);
+   } else {
+      fputc('!', fd);
+      fputc(separator, fd);
+   }
+}
+
+static void writeMeterModes(const Settings* this, FILE* fd, char separator, unsigned int column) {
+   if (this->hColumns[column].len) {
+      const char* sep = "";
+      for (size_t i = 0; i < this->hColumns[column].len; i++) {
+         fprintf(fd, "%s%d", sep, this->hColumns[column].modes[i]);
+         sep = " ";
+      }
+   } else {
+      fputc('!', fd);
+   }
+
+   fputc(separator, fd);
+}
+
+int Settings_write(const Settings* this, bool onCrash) {
+   FILE* fd;
+   char separator;
+   char* tmpFilename = NULL;
+   if (onCrash) {
+      fd = stderr;
+      separator = ';';
+   } else {
+      xAsprintf(&tmpFilename, "%s.tmp.XXXXXX", this->filename);
+      int fdtmp = mkstemp(tmpFilename);
+      if (fdtmp == -1)
+         return -errno;
+      fd = fdopen(fdtmp, "w");
+      if (fd == NULL)
+         return -errno;
+      separator = '\n';
+   }
+
+   #define printSettingInteger(setting_, value_) \
+      fprintf(fd, setting_ "=%d%c", (int) (value_), separator)
+   #define printSettingString(setting_, value_) \
+      fprintf(fd, setting_ "=%s%c", value_, separator)
+
+   if (!onCrash) {
+      fprintf(fd, "# Beware! This file is rewritten by htop when settings are changed in the interface.\n");
+      fprintf(fd, "# The parser is also very primitive, and not human-friendly.\n");
+   }
+   printSettingString("htop_version", VERSION);
+   printSettingInteger("config_reader_min_version", CONFIG_READER_MIN_VERSION);
+   fprintf(fd, "fields="); writeFields(fd, this->screens[0]->fields, this->dynamicColumns, false, separator);
+   printSettingInteger("hide_kernel_threads", this->hideKernelThreads);
+   printSettingInteger("hide_userland_threads", this->hideUserlandThreads);
+   printSettingInteger("hide_running_in_container", this->hideRunningInContainer);
+   printSettingInteger("shadow_other_users", this->shadowOtherUsers);
+   printSettingInteger("show_thread_names", this->showThreadNames);
+   printSettingInteger("show_program_path", this->showProgramPath);
+   printSettingInteger("highlight_base_name", this->highlightBaseName);
+   printSettingInteger("highlight_deleted_exe", this->highlightDeletedExe);
+   printSettingInteger("shadow_distribution_path_prefix", this->shadowDistPathPrefix);
+   printSettingInteger("highlight_megabytes", this->highlightMegabytes);
+   printSettingInteger("highlight_threads", this->highlightThreads);
+   printSettingInteger("highlight_changes", this->highlightChanges);
+   printSettingInteger("highlight_changes_delay_secs", this->highlightDelaySecs);
+   printSettingInteger("find_comm_in_cmdline", this->findCommInCmdline);
+   printSettingInteger("strip_exe_from_cmdline", this->stripExeFromCmdline);
+   printSettingInteger("show_merged_command", this->showMergedCommand);
+   printSettingInteger("header_margin", this->headerMargin);
+   printSettingInteger("screen_tabs", this->screenTabs);
+   printSettingInteger("detailed_cpu_time", this->detailedCPUTime);
+   printSettingInteger("cpu_count_from_one", this->countCPUsFromOne);
+   printSettingInteger("show_cpu_usage", this->showCPUUsage);
+   printSettingInteger("show_cpu_frequency", this->showCPUFrequency);
+   #ifdef BUILD_WITH_CPU_TEMP
+   printSettingInteger("show_cpu_temperature", this->showCPUTemperature);
+   printSettingInteger("degree_fahrenheit", this->degreeFahrenheit);
+   #endif
+   printSettingInteger("update_process_names", this->updateProcessNames);
+   printSettingInteger("account_guest_in_cpu_meter", this->accountGuestInCPUMeter);
+   printSettingInteger("color_scheme", this->colorScheme);
+   #ifdef HAVE_GETMOUSE
+   printSettingInteger("enable_mouse", this->enableMouse);
+   #endif
+   printSettingInteger("delay", (int) this->delay);
+   printSettingInteger("hide_function_bar", (int) this->hideFunctionBar);
+   #ifdef HAVE_LIBHWLOC
+   printSettingInteger("topology_affinity", this->topologyAffinity);
+   #endif
+
+   printSettingString("header_layout", HeaderLayout_getName(this->hLayout));
+   for (unsigned int i = 0; i < HeaderLayout_getColumns(this->hLayout); i++) {
+      fprintf(fd, "column_meters_%u=", i);
+      writeMeters(this, fd, separator, i);
+      fprintf(fd, "column_meter_modes_%u=", i);
+      writeMeterModes(this, fd, separator, i);
+   }
+
+   // Legacy compatibility with older versions of htop
+   printSettingInteger("tree_view", this->screens[0]->treeView);
+   // This "-1" is for compatibility with the older enum format.
+   printSettingInteger("sort_key", this->screens[0]->sortKey - 1);
+   printSettingInteger("tree_sort_key", this->screens[0]->treeSortKey - 1);
+   printSettingInteger("sort_direction", this->screens[0]->direction);
+   printSettingInteger("tree_sort_direction", this->screens[0]->treeDirection);
+   printSettingInteger("tree_view_always_by_pid", this->screens[0]->treeViewAlwaysByPID);
+   printSettingInteger("all_branches_collapsed", this->screens[0]->allBranchesCollapsed);
+
+   for (unsigned int i = 0; i < this->nScreens; i++) {
+      ScreenSettings* ss = this->screens[i];
+      const char* sortKey = toFieldName(this->dynamicColumns, ss->sortKey, NULL);
+      const char* treeSortKey = toFieldName(this->dynamicColumns, ss->treeSortKey, NULL);
+
+      fprintf(fd, "screen:%s=", ss->heading);
+      writeFields(fd, ss->fields, this->dynamicColumns, true, separator);
+      if (ss->dynamic) {
+         printSettingString(".dynamic", ss->dynamic);
+         if (ss->sortKey && ss->sortKey != PID)
+            fprintf(fd, "%s=Dynamic(%s)%c", ".sort_key", sortKey, separator);
+         if (ss->treeSortKey && ss->treeSortKey != PID)
+            fprintf(fd, "%s=Dynamic(%s)%c", ".tree_sort_key", treeSortKey, separator);
+      } else {
+         printSettingString(".sort_key", sortKey);
+         printSettingString(".tree_sort_key", treeSortKey);
+         printSettingInteger(".tree_view_always_by_pid", ss->treeViewAlwaysByPID);
+      }
+      printSettingInteger(".tree_view", ss->treeView);
+      printSettingInteger(".sort_direction", ss->direction);
+      printSettingInteger(".tree_sort_direction", ss->treeDirection);
+      printSettingInteger(".all_branches_collapsed", ss->allBranchesCollapsed);
+   }
+
+   #undef printSettingString
+   #undef printSettingInteger
+
+   if (onCrash)
+      return 0;
+
+   int r = 0;
+
+   if (ferror(fd) != 0)
+      r = (errno != 0) ? -errno : -EBADF;
+
+   if (fclose(fd) != 0)
+      r = r ? r : -errno;
+
+   if (r == 0)
+      r = (rename(tmpFilename, this->filename) == -1) ? -errno : 0;
+
+   free(tmpFilename);
+
+   return r;
+}
+
+Settings* Settings_new(unsigned int initialCpuCount, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* dynamicScreens) {
+   Settings* this = xCalloc(1, sizeof(Settings));
+
+   this->dynamicScreens = dynamicScreens;
+   this->dynamicColumns = dynamicColumns;
+   this->dynamicMeters = dynamicMeters;
+   this->hLayout = HF_TWO_50_50;
+   this->hColumns = xCalloc(HeaderLayout_getColumns(this->hLayout), sizeof(MeterColumnSetting));
+
+   this->shadowOtherUsers = false;
+   this->showThreadNames = false;
+   this->hideKernelThreads = true;
+   this->hideUserlandThreads = false;
+   this->hideRunningInContainer = false;
+   this->highlightBaseName = false;
+   this->highlightDeletedExe = true;
+   this->shadowDistPathPrefix = false;
+   this->highlightMegabytes = true;
+   this->detailedCPUTime = false;
+   this->countCPUsFromOne = false;
+   this->showCPUUsage = true;
+   this->showCPUFrequency = false;
+   #ifdef BUILD_WITH_CPU_TEMP
+   this->showCPUTemperature = false;
+   this->degreeFahrenheit = false;
+   #endif
+   this->updateProcessNames = false;
+   this->showProgramPath = true;
+   this->highlightThreads = true;
+   this->highlightChanges = false;
+   this->highlightDelaySecs = DEFAULT_HIGHLIGHT_SECS;
+   this->findCommInCmdline = true;
+   this->stripExeFromCmdline = true;
+   this->showMergedCommand = false;
+   this->hideFunctionBar = 0;
+   this->headerMargin = true;
+   #ifdef HAVE_LIBHWLOC
+   this->topologyAffinity = false;
+   #endif
+
+   this->screens = xCalloc(Platform_numberOfDefaultScreens * sizeof(ScreenSettings*), 1);
+   this->nScreens = 0;
+
+   char* legacyDotfile = NULL;
+   const char* rcfile = getenv("HTOPRC");
+   if (rcfile) {
+      this->filename = xStrdup(rcfile);
+   } else {
+      const char* home = getenv("HOME");
+      if (!home) {
+         const struct passwd* pw = getpwuid(getuid());
+         home = pw ? pw->pw_dir : "";
+      }
+      const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
+      char* configDir = NULL;
+      char* htopDir = NULL;
+      if (xdgConfigHome) {
+         this->filename = String_cat(xdgConfigHome, "/htop/htoprc");
+         configDir = xStrdup(xdgConfigHome);
+         htopDir = String_cat(xdgConfigHome, "/htop");
+      } else {
+         this->filename = String_cat(home, "/.config/htop/htoprc");
+         configDir = String_cat(home, "/.config");
+         htopDir = String_cat(home, "/.config/htop");
+      }
+      legacyDotfile = String_cat(home, "/.htoprc");
+      (void) mkdir(configDir, 0700);
+      (void) mkdir(htopDir, 0700);
+      free(htopDir);
+      free(configDir);
+      struct stat st;
+      int err = lstat(legacyDotfile, &st);
+      if (err || S_ISLNK(st.st_mode)) {
+         free(legacyDotfile);
+         legacyDotfile = NULL;
+      }
+   }
+   this->colorScheme = 0;
+#ifdef HAVE_GETMOUSE
+   this->enableMouse = true;
+#endif
+   this->changed = false;
+   this->delay = DEFAULT_DELAY;
+   bool ok = false;
+   if (legacyDotfile) {
+      ok = Settings_read(this, legacyDotfile, initialCpuCount);
+      if (ok) {
+         // Transition to new location and delete old configuration file
+         if (Settings_write(this, false) == 0) {
+            unlink(legacyDotfile);
+         }
+      }
+      free(legacyDotfile);
+   }
+   if (!ok) {
+      ok = Settings_read(this, this->filename, initialCpuCount);
+   }
+   if (!ok) {
+      this->screenTabs = true;
+      this->changed = true;
+      ok = Settings_read(this, SYSCONFDIR "/htoprc", initialCpuCount);
+   }
+   if (!ok) {
+      Settings_defaultMeters(this, initialCpuCount);
+      Settings_defaultScreens(this);
+   }
+
+   this->ssIndex = 0;
+   this->ss = this->screens[this->ssIndex];
+
+   this->lastUpdate = 1;
+
+   return this;
+}
+
+void ScreenSettings_invertSortOrder(ScreenSettings* this) {
+   int* attr = (this->treeView) ? &(this->treeDirection) : &(this->direction);
+   *attr = (*attr == 1) ? -1 : 1;
+}
+
+void ScreenSettings_setSortKey(ScreenSettings* this, ProcessField sortKey) {
+   if (this->treeViewAlwaysByPID || !this->treeView) {
+      this->sortKey = sortKey;
+      this->direction = (Process_fields[sortKey].defaultSortDesc) ? -1 : 1;
+      this->treeView = false;
+   } else {
+      this->treeSortKey = sortKey;
+      this->treeDirection = (Process_fields[sortKey].defaultSortDesc) ? -1 : 1;
+   }
+}
+
+static bool readonly = false;
+
+void Settings_enableReadonly(void) {
+   readonly = true;
+}
+
+bool Settings_isReadonly(void) {
+   return readonly;
+}
+
+void Settings_setHeaderLayout(Settings* this, HeaderLayout hLayout) {
+   unsigned int oldColumns = HeaderLayout_getColumns(this->hLayout);
+   unsigned int newColumns = HeaderLayout_getColumns(hLayout);
+
+   if (newColumns > oldColumns) {
+      this->hColumns = xReallocArray(this->hColumns, newColumns, sizeof(MeterColumnSetting));
+      memset(this->hColumns + oldColumns, 0, (newColumns - oldColumns) * sizeof(MeterColumnSetting));
+   } else if (newColumns < oldColumns) {
+      for (unsigned int i = newColumns; i < oldColumns; i++) {
+         if (this->hColumns[i].names) {
+            for (size_t j = 0; j < this->hColumns[i].len; j++)
+               free(this->hColumns[i].names[j]);
+            free(this->hColumns[i].names);
+         }
+         free(this->hColumns[i].modes);
+      }
+      this->hColumns = xReallocArray(this->hColumns, newColumns, sizeof(MeterColumnSetting));
+   }
+
+   this->hLayout = hLayout;
+   this->changed = true;
+}
diff --git a/Settings.h b/Settings.h
new file mode 100644
index 0000000..a7740ff
--- /dev/null
+++ b/Settings.h
@@ -0,0 +1,146 @@
+#ifndef HEADER_Settings
+#define HEADER_Settings
+/*
+htop - Settings.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include "Hashtable.h"
+#include "HeaderLayout.h"
+#include "Row.h"
+#include "RowField.h"
+
+
+#define DEFAULT_DELAY 15
+
+#define CONFIG_READER_MIN_VERSION 3
+
+struct DynamicScreen_;  // IWYU pragma: keep
+struct Table_;          // IWYU pragma: keep
+
+typedef struct {
+   const char* name;
+   const char* columns;
+   const char* sortKey;
+   const char* treeSortKey;
+} ScreenDefaults;
+
+typedef struct {
+   size_t len;
+   char** names;
+   int* modes;
+} MeterColumnSetting;
+
+typedef struct ScreenSettings_ {
+   char* heading;  /* user-editable screen name (pretty) */
+   char* dynamic;  /* from DynamicScreen config (fixed) */
+   struct Table_* table;
+   RowField* fields;
+   uint32_t flags;
+   int direction;
+   int treeDirection;
+   RowField sortKey;
+   RowField treeSortKey;
+   bool treeView;
+   bool treeViewAlwaysByPID;
+   bool allBranchesCollapsed;
+} ScreenSettings;
+
+typedef struct Settings_ {
+   char* filename;
+   int config_version;
+   HeaderLayout hLayout;
+   MeterColumnSetting* hColumns;
+   Hashtable* dynamicColumns; /* runtime-discovered columns */
+   Hashtable* dynamicMeters;  /* runtime-discovered meters */
+   Hashtable* dynamicScreens; /* runtime-discovered screens */
+
+   ScreenSettings** screens;
+   unsigned int nScreens;
+   unsigned int ssIndex;
+   ScreenSettings* ss;
+
+   int colorScheme;
+   int delay;
+
+   bool countCPUsFromOne;
+   bool detailedCPUTime;
+   bool showCPUUsage;
+   bool showCPUFrequency;
+   #ifdef BUILD_WITH_CPU_TEMP
+   bool showCPUTemperature;
+   bool degreeFahrenheit;
+   #endif
+   bool showProgramPath;
+   bool shadowOtherUsers;
+   bool showThreadNames;
+   bool hideKernelThreads;
+   bool hideRunningInContainer;
+   bool hideUserlandThreads;
+   bool highlightBaseName;
+   bool highlightDeletedExe;
+   bool shadowDistPathPrefix;
+   bool highlightMegabytes;
+   bool highlightThreads;
+   bool highlightChanges;
+   int highlightDelaySecs;
+   bool findCommInCmdline;
+   bool stripExeFromCmdline;
+   bool showMergedCommand;
+   bool updateProcessNames;
+   bool accountGuestInCPUMeter;
+   bool headerMargin;
+   bool screenTabs;
+   #ifdef HAVE_GETMOUSE
+   bool enableMouse;
+   #endif
+   int hideFunctionBar;  // 0 - off, 1 - on ESC until next input, 2 - permanently
+   #ifdef HAVE_LIBHWLOC
+   bool topologyAffinity;
+   #endif
+
+   bool changed;
+   uint64_t lastUpdate;
+} Settings;
+
+#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromOne ? (cpu)+1 : (cpu))
+
+static inline RowField ScreenSettings_getActiveSortKey(const ScreenSettings* this) {
+   return (this->treeView)
+          ? (this->treeViewAlwaysByPID ? 1 : this->treeSortKey)
+          : this->sortKey;
+}
+
+static inline int ScreenSettings_getActiveDirection(const ScreenSettings* this) {
+   return this->treeView ? this->treeDirection : this->direction;
+}
+
+void Settings_delete(Settings* this);
+
+int Settings_write(const Settings* this, bool onCrash);
+
+Settings* Settings_new(unsigned int initialCpuCount, Hashtable* dynamicMeters, Hashtable* dynamicColumns, Hashtable* dynamicScreens);
+
+ScreenSettings* Settings_newScreen(Settings* this, const ScreenDefaults* defaults);
+
+ScreenSettings* Settings_newDynamicScreen(Settings* this, const char* tab, const struct DynamicScreen_* screen, struct Table_* table);
+
+void ScreenSettings_delete(ScreenSettings* this);
+
+void ScreenSettings_invertSortOrder(ScreenSettings* this);
+
+void ScreenSettings_setSortKey(ScreenSettings* this, RowField sortKey);
+
+void Settings_enableReadonly(void);
+
+bool Settings_isReadonly(void);
+
+void Settings_setHeaderLayout(Settings* this, HeaderLayout hLayout);
+
+#endif
diff --git a/SignalsPanel.c b/SignalsPanel.c
new file mode 100644
index 0000000..28d307e
--- /dev/null
+++ b/SignalsPanel.c
@@ -0,0 +1,50 @@
+/*
+htop - SignalsPanel.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "SignalsPanel.h"
+// the above contains #include <signal.h> so do not add that here again (breaks Solaris build)
+
+#include <stdbool.h>
+
+#include "FunctionBar.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "Panel.h"
+#include "Platform.h"
+#include "XUtils.h"
+
+
+Panel* SignalsPanel_new(int preSelectedSignal) {
+   Panel* this = Panel_new(1, 1, 1, 1, Class(ListItem), true, FunctionBar_newEnterEsc("Send   ", "Cancel "));
+   int defaultPosition = 15;
+   unsigned int i;
+   for (i = 0; i < Platform_numberOfSignals; i++) {
+      Panel_set(this, i, (Object*) ListItem_new(Platform_signals[i].name, Platform_signals[i].number));
+      // signal 15 is not always the 15th signal in the table
+      if (Platform_signals[i].number == preSelectedSignal) {
+         defaultPosition = i;
+      }
+   }
+   #if (defined(SIGRTMIN) && defined(SIGRTMAX))
+   if (SIGRTMAX - SIGRTMIN <= 100) {
+      static char buf[16];
+      for (int sig = SIGRTMIN; sig <= SIGRTMAX; i++, sig++) {
+         int n = sig - SIGRTMIN;
+         xSnprintf(buf, sizeof(buf), "%2d SIGRTMIN%-+3d", sig, n);
+         if (n == 0) {
+            buf[11] = '\0';
+         }
+         Panel_set(this, i, (Object*) ListItem_new(buf, sig));
+      }
+   }
+   #endif
+   Panel_setHeader(this, "Send signal:");
+   Panel_setSelected(this, defaultPosition);
+   return this;
+}
diff --git a/SignalsPanel.h b/SignalsPanel.h
new file mode 100644
index 0000000..20fb4a6
--- /dev/null
+++ b/SignalsPanel.h
@@ -0,0 +1,26 @@
+#ifndef HEADER_SignalsPanel
+#define HEADER_SignalsPanel
+/*
+htop - SignalsPanel.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Panel.h"
+
+#ifndef HTOP_SOLARIS
+#include <signal.h>
+#endif
+
+
+typedef struct SignalItem_ {
+   const char* name;
+   int number;
+} SignalItem;
+
+#define SIGNALSPANEL_INITSELECTEDSIGNAL SIGTERM
+
+Panel* SignalsPanel_new(int preSelectedSignal);
+
+#endif
diff --git a/SwapMeter.c b/SwapMeter.c
new file mode 100644
index 0000000..1055a6e
--- /dev/null
+++ b/SwapMeter.c
@@ -0,0 +1,82 @@
+/*
+htop - SwapMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "SwapMeter.h"
+
+#include <math.h>
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+
+
+static const int SwapMeter_attributes[] = {
+   SWAP,
+   SWAP_CACHE,
+   SWAP_FRONTSWAP,
+};
+
+static void SwapMeter_updateValues(Meter* this) {
+   char* buffer = this->txtBuffer;
+   size_t size = sizeof(this->txtBuffer);
+   int written;
+
+   this->values[SWAP_METER_CACHE] = NAN;   /* 'cached' not present on all platforms */
+   this->values[SWAP_METER_FRONTSWAP] = NAN;   /* 'frontswap' not present on all platforms */
+   Platform_setSwapValues(this);
+
+   written = Meter_humanUnit(buffer, this->values[SWAP_METER_USED], size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '/');
+
+   Meter_humanUnit(buffer, this->total, size);
+}
+
+static void SwapMeter_display(const Object* cast, RichString* out) {
+   char buffer[50];
+   const Meter* this = (const Meter*)cast;
+   RichString_writeAscii(out, CRT_colors[METER_TEXT], ":");
+   Meter_humanUnit(buffer, this->total, sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+   Meter_humanUnit(buffer, this->values[SWAP_METER_USED], sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+
+   if (isNonnegative(this->values[SWAP_METER_CACHE])) {
+      Meter_humanUnit(buffer, this->values[SWAP_METER_CACHE], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " cache:");
+      RichString_appendAscii(out, CRT_colors[SWAP_CACHE], buffer);
+   }
+
+   if (isNonnegative(this->values[SWAP_METER_FRONTSWAP])) {
+      Meter_humanUnit(buffer, this->values[SWAP_METER_FRONTSWAP], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " frontswap:");
+      RichString_appendAscii(out, CRT_colors[SWAP_FRONTSWAP], buffer);
+   }
+}
+
+const MeterClass SwapMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = SwapMeter_display,
+   },
+   .updateValues = SwapMeter_updateValues,
+   .defaultMode = BAR_METERMODE,
+   .maxItems = SWAP_METER_ITEMCOUNT,
+   .total = 100.0,
+   .attributes = SwapMeter_attributes,
+   .name = "Swap",
+   .uiName = "Swap",
+   .caption = "Swp"
+};
diff --git a/SwapMeter.h b/SwapMeter.h
new file mode 100644
index 0000000..94b8dc8
--- /dev/null
+++ b/SwapMeter.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_SwapMeter
+#define HEADER_SwapMeter
+/*
+htop - SwapMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+typedef enum {
+   SWAP_METER_USED = 0,
+   SWAP_METER_CACHE = 1,
+   SWAP_METER_FRONTSWAP = 2,
+   SWAP_METER_ITEMCOUNT = 3, // number of entries in this enum
+} SwapMeterValues;
+
+extern const MeterClass SwapMeter_class;
+
+#endif
diff --git a/SysArchMeter.c b/SysArchMeter.c
new file mode 100644
index 0000000..1985caa
--- /dev/null
+++ b/SysArchMeter.c
@@ -0,0 +1,44 @@
+/*
+htop - SysArchMeter.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "SysArchMeter.h"
+
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Object.h"
+#include "Platform.h"
+#include "XUtils.h"
+
+
+static const int SysArchMeter_attributes[] = {HOSTNAME};
+
+static void SysArchMeter_updateValues(Meter* this) {
+   static char* string;
+
+   if (string == NULL)
+      Platform_getRelease(&string);
+
+   String_safeStrncpy(this->txtBuffer, string, sizeof(this->txtBuffer));
+}
+
+const MeterClass SysArchMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = SysArchMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = SysArchMeter_attributes,
+   .name = "System",
+   .uiName = "System",
+   .caption = "System: ",
+};
diff --git a/SysArchMeter.h b/SysArchMeter.h
new file mode 100644
index 0000000..50b3869
--- /dev/null
+++ b/SysArchMeter.h
@@ -0,0 +1,14 @@
+#ifndef HEADER_SysArchMeter
+#define HEADER_SysArchMeter
+/*
+htop - SysArchMeter.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+#include "Meter.h"
+
+
+extern const MeterClass SysArchMeter_class;
+
+#endif
diff --git a/TESTPLAN b/TESTPLAN
new file mode 100644
index 0000000..b6ddfa6
--- /dev/null
+++ b/TESTPLAN
@@ -0,0 +1,156 @@
+
+Main screen:
+
+   For all views, all modes:
+
+      Mouse click header - nothing happens.
+
+      Mouse click on ProcessTable title bar - exit Tree view, update FunctionBar, title bar updates, sort by clicked field.
+*** FAILING: wrong FB update depending on mode; does not change sort in wip branch
+         click on same entry - invert sort.
+            click on another entry - sort another field.
+
+      Mouse click on a process - select that process.
+
+      for each entry in FunctionBar:
+         Mouse click entry - perform action of associated key.
+
+   In Normal mode, Sorted view:
+
+      <+> or <-> - do nothing.
+
+      <F6> - enter SortBy screen.
+
+   In Normal mode, Tree view:
+
+      select process - update F6 in FunctionBar if subtree is collapsed or expanded.
+
+      <F6>, <+> or <-> - expand/collapse subtree.
+
+   In Normal mode, either Sorted or Tree view:
+
+      <F3>, </> - activate Search mode.
+
+      <F4>, <\> - activate Filter mode.
+
+      <F7>, <]> - as root only, decrease process NICE value.
+
+      <F8>, <[> - increase process NICE value.
+
+      <a> - enter Affinity screen.
+
+      <b> - do nothing.
+
+      <c> - select process and all its children.
+
+      <d>, <e>, <f>, <g> - do nothing.
+
+      <F1>, <h>, <?> - enter Help screen.
+
+      <i> - on Linux, enter IOPriority screen.
+
+      <j> - do nothing.
+
+      <F9>, <k> - enter Kill screen.
+
+      <l> - enter LSOF screen.
+
+      <m>, <n>, <o> - do nothing.
+
+      <p> - hide/show program path.
+
+      <F10>, <q> - quit program.
+
+      <r> - do nothing.
+
+      <s> - enter STrace screen.
+
+      <F5>, <t> - toggle between Tree and Sorted view, update F5 in FunctionBar, follow process
+
+      <u> - enter User screen.
+
+      <v>, <w>, <x>, <y>, <z> - do nothing.
+
+      <A>, <B> - do nothing.
+
+      <F2>, <C>, <S> - enter Setup screen.
+
+      <D>, <E> - do nothing.
+
+      <F> - follow process.
+
+      <G> - do nothing.
+
+      <H> - toggle show/hide userland threads.
+
+      <I> - invert sort order.
+
+      <J> - do nothing.
+
+      <K> - toggle show/hide kernel threads.
+
+      <L> - do nothing.
+
+      <M> - enter Sorted view, update function bar, sort by MEM%.
+
+      <N>, <O> - do nothing.
+
+      <P> - enter Sorted view, update function bar, sort by CPU%.
+
+      <Q>, <R> - do nothing.
+
+      <T> - enter Sorted view, update function bar, sort by TIME.
+
+      <U> - untag all processes.
+
+      <V>, <W>, <X>, <Y>, <Z> - do nothing.
+
+      <<>, <>>, <,>, <.> - enter SortBy screen.
+
+      space - tag current process, move down cursor.
+
+      numbers - incremental PID search.
+
+   In Search mode:
+
+      TODO
+
+   In Filter mode:
+
+      TODO
+
+Setup screen:
+
+   TODO
+
+SortBy screen:
+
+   TODO
+
+User screen:
+
+   TODO
+
+Kill screen:
+
+   TODO
+
+Affinity screen:
+
+   TODO
+
+Help screen:
+
+   any key - back to Main screen.
+
+IOPriority screen:
+
+   TODO
+
+STrace screen:
+
+   TODO
+
+LSOF screen:
+
+   TODO
diff --git a/Table.c b/Table.c
new file mode 100644
index 0000000..d807ce5
--- /dev/null
+++ b/Table.c
@@ -0,0 +1,372 @@
+/*
+htop - Table.c
+(C) 2004,2005 Hisham H. Muhammad
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Table.h"
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Panel.h"
+#include "RowField.h"
+#include "Vector.h"
+
+
+Table* Table_init(Table* this, const ObjectClass* klass, Machine* host) {
+   this->rows = Vector_new(klass, true, DEFAULT_SIZE);
+   this->displayList = Vector_new(klass, false, DEFAULT_SIZE);
+   this->table = Hashtable_new(200, false);
+   this->needsSort = true;
+   this->following = -1;
+   this->host = host;
+   return this;
+}
+
+void Table_done(Table* this) {
+   Hashtable_delete(this->table);
+   Vector_delete(this->displayList);
+   Vector_delete(this->rows);
+}
+
+static void Table_delete(Object* cast) {
+   Table* this = (Table*) cast;
+   Table_done(this);
+   free(this);
+}
+
+void Table_setPanel(Table* this, Panel* panel) {
+   this->panel = panel;
+}
+
+void Table_add(Table* this, Row* row) {
+   assert(Vector_indexOf(this->rows, row, Row_idEqualCompare) == -1);
+   assert(Hashtable_get(this->table, row->id) == NULL);
+
+   // highlighting row found in first scan by first scan marked "far in the past"
+   row->seenStampMs = this->host->monotonicMs;
+
+   Vector_add(this->rows, row);
+   Hashtable_put(this->table, row->id, row);
+
+   assert(Vector_indexOf(this->rows, row, Row_idEqualCompare) != -1);
+   assert(Hashtable_get(this->table, row->id) != NULL);
+   assert(Vector_countEquals(this->rows, Hashtable_count(this->table)));
+}
+
+// Table_removeIndex removes a given row from the lists map and soft deletes
+// it from its vector. Vector_compact *must* be called once the caller is done
+// removing items.
+// Note: for processes should only be called from ProcessTable_iterate to avoid
+// breaking dying process highlighting.
+void Table_removeIndex(Table* this, const Row* row, int idx) {
+   int rowid = row->id;
+
+   assert(row == (Row*)Vector_get(this->rows, idx));
+   assert(Hashtable_get(this->table, rowid) != NULL);
+
+   Hashtable_remove(this->table, rowid);
+   Vector_softRemove(this->rows, idx);
+
+   if (this->following != -1 && this->following == rowid) {
+      this->following = -1;
+      Panel_setSelectionColor(this->panel, PANEL_SELECTION_FOCUS);
+   }
+
+   assert(Hashtable_get(this->table, rowid) == NULL);
+   assert(Vector_countEquals(this->rows, Hashtable_count(this->table)));
+}
+
+static void Table_buildTreeBranch(Table* this, int rowid, unsigned int level, int32_t indent, bool show) {
+   // Do not treat zero as root of any tree.
+   // (e.g. on OpenBSD the kernel thread 'swapper' has pid 0.)
+   if (rowid == 0)
+      return;
+
+   // The vector is sorted by parent, find the start of the range by bisection
+   int vsize = Vector_size(this->rows);
+   int l = 0;
+   int r = vsize;
+   while (l < r) {
+      int c = (l + r) / 2;
+      Row* row = (Row*)Vector_get(this->rows, c);
+      int parent = row->isRoot ? 0 : Row_getGroupOrParent(row);
+      if (parent < rowid) {
+         l = c + 1;
+      } else {
+         r = c;
+      }
+   }
+   // Find the end to know the last line for indent handling purposes
+   int lastShown = r;
+   while (r < vsize) {
+      Row* row = (Row*)Vector_get(this->rows, r);
+      if (!Row_isChildOf(row, rowid))
+         break;
+      if (row->show)
+         lastShown = r;
+      r++;
+   }
+
+   for (int i = l; i < r; i++) {
+      Row* row = (Row*)Vector_get(this->rows, i);
+
+      if (!show)
+         row->show = false;
+
+      Vector_add(this->displayList, row);
+
+      int32_t nextIndent = indent | ((int32_t)1 << MINIMUM(level, sizeof(row->indent) * 8 - 2));
+      Table_buildTreeBranch(this, row->id, level + 1, (i < lastShown) ? nextIndent : indent, row->show && row->showChildren);
+      if (i == lastShown)
+         row->indent = -nextIndent;
+      else
+         row->indent = nextIndent;
+
+      row->tree_depth = level + 1;
+   }
+}
+
+static int compareRowByKnownParentThenNatural(const void* v1, const void* v2) {
+   return Row_compareByParent((const Row*) v1, (const Row*) v2);
+}
+
+// Builds a sorted tree from scratch, without relying on previously gathered information
+static void Table_buildTree(Table* this) {
+   Vector_prune(this->displayList);
+
+   // Mark root processes
+   int vsize = Vector_size(this->rows);
+   for (int i = 0; i < vsize; i++) {
+      Row* row = (Row*) Vector_get(this->rows, i);
+      int parent = Row_getGroupOrParent(row);
+      row->isRoot = false;
+
+      if (row->id == parent) {
+         row->isRoot = true;
+         continue;
+      }
+
+      if (!parent) {
+         row->isRoot = true;
+         continue;
+      }
+
+      // We don't know about its parent for whatever reason
+      if (Table_findRow(this, parent) == NULL)
+         row->isRoot = true;
+   }
+
+   // Sort by known parent (roots first), then row ID
+   Vector_quickSortCustomCompare(this->rows, compareRowByKnownParentThenNatural);
+
+   // Find all processes whose parent is not visible
+   for (int i = 0; i < vsize; i++) {
+      Row* row = (Row*)Vector_get(this->rows, i);
+
+      // If parent not found, then construct the tree with this node as root
+      if (row->isRoot) {
+         row = (Row*)Vector_get(this->rows, i);
+         row->indent = 0;
+         row->tree_depth = 0;
+         Vector_add(this->displayList, row);
+         Table_buildTreeBranch(this, row->id, 0, 0, row->showChildren);
+         continue;
+      }
+   }
+
+   this->needsSort = false;
+
+   // Check consistency of the built structures
+   assert(Vector_size(this->displayList) == vsize); (void)vsize;
+}
+
+void Table_updateDisplayList(Table* this) {
+   const Settings* settings = this->host->settings;
+
+   if (settings->ss->treeView) {
+      if (this->needsSort)
+         Table_buildTree(this);
+   } else {
+      if (this->needsSort)
+         Vector_insertionSort(this->rows);
+      Vector_prune(this->displayList);
+      int size = Vector_size(this->rows);
+      for (int i = 0; i < size; i++)
+         Vector_add(this->displayList, Vector_get(this->rows, i));
+   }
+   this->needsSort = false;
+}
+
+void Table_expandTree(Table* this) {
+   int size = Vector_size(this->rows);
+   for (int i = 0; i < size; i++) {
+      Row* row = (Row*) Vector_get(this->rows, i);
+      row->showChildren = true;
+   }
+}
+
+// Called on collapse-all toggle and on startup, possibly in non-tree mode
+void Table_collapseAllBranches(Table* this) {
+   Table_buildTree(this); // Update `tree_depth` fields of the rows
+   this->needsSort = true; // Table is sorted by parent now, force new sort
+   int size = Vector_size(this->rows);
+   for (int i = 0; i < size; i++) {
+      Row* row = (Row*) Vector_get(this->rows, i);
+      // FreeBSD has pid 0 = kernel and pid 1 = init, so init has tree_depth = 1
+      if (row->tree_depth > 0 && row->id > 1)
+         row->showChildren = false;
+   }
+}
+
+void Table_rebuildPanel(Table* this) {
+   Table_updateDisplayList(this);
+
+   const int currPos = Panel_getSelectedIndex(this->panel);
+   const int currScrollV = this->panel->scrollV;
+   const int currSize = Panel_size(this->panel);
+
+   Panel_prune(this->panel);
+
+   /* Follow main group row instead if following a row that is occluded (hidden) */
+   if (this->following != -1) {
+      const Row* followed = (const Row*) Hashtable_get(this->table, this->following);
+      if (followed != NULL
+         && Hashtable_get(this->table, followed->group)
+         && Row_isVisible(followed, this) == false ) {
+         this->following = followed->group;
+      }
+   }
+
+   const int rowCount = Vector_size(this->displayList);
+   bool foundFollowed = false;
+   int idx = 0;
+
+   for (int i = 0; i < rowCount; i++) {
+      Row* row = (Row*) Vector_get(this->displayList, i);
+
+      if ( !row->show || (Row_matchesFilter(row, this) == true) )
+         continue;
+
+      Panel_set(this->panel, idx, (Object*)row);
+
+      if (this->following != -1 && row->id == this->following) {
+         foundFollowed = true;
+         Panel_setSelected(this->panel, idx);
+         /* Keep scroll position relative to followed row */
+         this->panel->scrollV = idx - (currPos - currScrollV);
+      }
+      idx++;
+   }
+
+   if (this->following != -1 && !foundFollowed) {
+      /* Reset if current followed row not found */
+      this->following = -1;
+      Panel_setSelectionColor(this->panel, PANEL_SELECTION_FOCUS);
+   }
+
+   if (this->following == -1) {
+      /* If the last item was selected, keep the new last item selected */
+      if (currPos > 0 && currPos == currSize - 1)
+         Panel_setSelected(this->panel, Panel_size(this->panel) - 1);
+      else
+         Panel_setSelected(this->panel, currPos);
+
+      this->panel->scrollV = currScrollV;
+   }
+}
+
+void Table_printHeader(const Settings* settings, RichString* header) {
+   RichString_rewind(header, RichString_size(header));
+
+   const ScreenSettings* ss = settings->ss;
+   const RowField* fields = ss->fields;
+
+   RowField key = ScreenSettings_getActiveSortKey(ss);
+
+   for (int i = 0; fields[i]; i++) {
+      int color;
+      if (ss->treeView && ss->treeViewAlwaysByPID) {
+         color = CRT_colors[PANEL_HEADER_FOCUS];
+      } else if (key == fields[i]) {
+         color = CRT_colors[PANEL_SELECTION_FOCUS];
+      } else {
+         color = CRT_colors[PANEL_HEADER_FOCUS];
+      }
+
+      RichString_appendWide(header, color, RowField_alignedTitle(settings, fields[i]));
+      if (key == fields[i] && RichString_getCharVal(*header, RichString_size(header) - 1) == ' ') {
+         bool ascending = ScreenSettings_getActiveDirection(ss) == 1;
+         RichString_rewind(header, 1);  // rewind to override space
+         RichString_appendnWide(header,
+                                CRT_colors[PANEL_SELECTION_FOCUS],
+                                CRT_treeStr[ascending ? TREE_STR_ASC : TREE_STR_DESC],
+                                1);
+      }
+      if (COMM == fields[i] && settings->showMergedCommand) {
+         RichString_appendAscii(header, color, "(merged)");
+      }
+   }
+}
+
+// set flags on an existing rows before refreshing table
+void Table_prepareEntries(Table* this) {
+   for (int i = 0; i < Vector_size(this->rows); i++) {
+      Row* row = (struct Row_*) Vector_get(this->rows, i);
+      row->updated = false;
+      row->wasShown = row->show;
+      row->show = true;
+   }
+}
+
+// tidy up Row state after refreshing the table
+void Table_cleanupRow(Table* table, Row* row, int idx) {
+   Machine* host = table->host;
+   const Settings* settings = host->settings;
+
+   if (row->tombStampMs > 0) {
+      // remove tombed process
+      if (host->monotonicMs >= row->tombStampMs) {
+         Table_removeIndex(table, row, idx);
+      }
+   } else if (row->updated == false) {
+      // process no longer exists
+      if (settings->highlightChanges && row->wasShown) {
+         // mark tombed
+         row->tombStampMs = host->monotonicMs + 1000 * settings->highlightDelaySecs;
+      } else {
+         // immediately remove
+         Table_removeIndex(table, row, idx);
+      }
+   }
+}
+
+void Table_cleanupEntries(Table* this) {
+   // Finish process table update, culling any removed rows
+   for (int i = Vector_size(this->rows) - 1; i >= 0; i--) {
+      Row* row = (Row*) Vector_get(this->rows, i);
+      Table_cleanupRow(this, row, i);
+   }
+
+   // compact the table in case of any earlier row removals
+   Table_compact(this);
+}
+
+const TableClass Table_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = Table_delete,
+   },
+   .prepare = Table_prepareEntries,
+   .cleanup = Table_cleanupEntries,
+};
diff --git a/Table.h b/Table.h
new file mode 100644
index 0000000..fa85fd6
--- /dev/null
+++ b/Table.h
@@ -0,0 +1,95 @@
+#ifndef HEADER_Table
+#define HEADER_Table
+/*
+htop - Table.h
+(C) 2004,2005 Hisham H. Muhammad
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Hashtable.h"
+#include "Object.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "Vector.h"
+
+
+struct Machine_;  // IWYU pragma: keep
+struct Panel_;    // IWYU pragma: keep
+struct Row_;      // IWYU pragma: keep
+
+typedef struct Table_ {
+   /* Super object for emulated OOP */
+   Object super;
+
+   Vector* rows;          /* all known; sort order can vary and differ from display order */
+   Vector* displayList;   /* row tree flattened in display order (borrowed);
+                             updated in Table_updateDisplayList when rebuilding panel */
+   Hashtable* table;      /* fast known row lookup by identifier */
+
+   struct Machine_* host;
+   const char* incFilter;
+   bool needsSort;
+   int following;         /* -1 or row being visually tracked in the user interface */
+
+   struct Panel_* panel;
+} Table;
+
+typedef Table* (*Table_New)(const struct Machine_*);
+typedef void (*Table_ScanPrepare)(Table* this);
+typedef void (*Table_ScanIterate)(Table* this);
+typedef void (*Table_ScanCleanup)(Table* this);
+
+typedef struct TableClass_ {
+   const ObjectClass super;
+   const Table_ScanPrepare prepare;
+   const Table_ScanIterate iterate;
+   const Table_ScanCleanup cleanup;
+} TableClass;
+
+#define As_Table(this_)  ((const TableClass*)((this_)->super.klass))
+
+#define Table_scanPrepare(t_)  (As_Table(t_)->prepare ? (As_Table(t_)->prepare(t_)) : Table_prepareEntries(t_))
+#define Table_scanIterate(t_)  (As_Table(t_)->iterate(t_))  /* mandatory; must have a custom iterate method */
+#define Table_scanCleanup(t_)  (As_Table(t_)->cleanup ? (As_Table(t_)->cleanup(t_)) : Table_cleanupEntries(t_))
+
+Table* Table_init(Table* this, const ObjectClass* klass, struct Machine_* host);
+
+void Table_done(Table* this);
+
+extern const TableClass Table_class;
+
+void Table_setPanel(Table* this, struct Panel_* panel);
+
+void Table_printHeader(const Settings* settings, RichString* header);
+
+void Table_add(Table* this, struct Row_* row);
+
+void Table_removeIndex(Table* this, const struct Row_* row, int idx);
+
+void Table_updateDisplayList(Table* this);
+
+void Table_expandTree(Table* this);
+
+void Table_collapseAllBranches(Table* this);
+
+void Table_rebuildPanel(Table* this);
+
+static inline struct Row_* Table_findRow(Table* this, int id) {
+   return (struct Row_*) Hashtable_get(this->table, id);
+}
+
+void Table_prepareEntries(Table* this);
+
+void Table_cleanupEntries(Table* this);
+
+void Table_cleanupRow(Table* this, Row* row, int idx);
+
+static inline void Table_compact(Table* this) {
+   Vector_compact(this->rows);
+}
+
+#endif
diff --git a/TasksMeter.c b/TasksMeter.c
new file mode 100644
index 0000000..aa41e63
--- /dev/null
+++ b/TasksMeter.c
@@ -0,0 +1,81 @@
+/*
+htop - TasksMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "TasksMeter.h"
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "ProcessTable.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static const int TasksMeter_attributes[] = {
+   CPU_SYSTEM,
+   PROCESS_THREAD,
+   PROCESS,
+   TASKS_RUNNING
+};
+
+static void TasksMeter_updateValues(Meter* this) {
+   const Machine* host = this->host;
+   const ProcessTable* pt = (const ProcessTable*) host->processTable;
+
+   this->values[0] = pt->kernelThreads;
+   this->values[1] = pt->userlandThreads;
+   this->values[2] = pt->totalTasks - pt->kernelThreads - pt->userlandThreads;
+   this->values[3] = MINIMUM(pt->runningTasks, host->activeCPUs);
+   this->total     = pt->totalTasks;
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%u/%u", MINIMUM(pt->runningTasks, host->activeCPUs), pt->totalTasks);
+}
+
+static void TasksMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+   const Settings* settings = this->host->settings;
+   char buffer[20];
+   int len;
+
+   len = xSnprintf(buffer, sizeof(buffer), "%d", (int)this->values[2]);
+   RichString_appendnAscii(out, CRT_colors[METER_VALUE], buffer, len);
+
+   RichString_appendAscii(out, settings->hideUserlandThreads ? CRT_colors[METER_SHADOW] : CRT_colors[METER_TEXT], ", ");
+   len = xSnprintf(buffer, sizeof(buffer), "%d", (int)this->values[1]);
+   RichString_appendnAscii(out, settings->hideUserlandThreads ? CRT_colors[METER_SHADOW] : CRT_colors[TASKS_RUNNING], buffer, len);
+   RichString_appendAscii(out, settings->hideUserlandThreads ? CRT_colors[METER_SHADOW] : CRT_colors[METER_TEXT], " thr");
+
+   RichString_appendAscii(out, settings->hideKernelThreads ? CRT_colors[METER_SHADOW] : CRT_colors[METER_TEXT], ", ");
+   len = xSnprintf(buffer, sizeof(buffer), "%d", (int)this->values[0]);
+   RichString_appendnAscii(out, settings->hideKernelThreads ? CRT_colors[METER_SHADOW] : CRT_colors[TASKS_RUNNING], buffer, len);
+   RichString_appendAscii(out, settings->hideKernelThreads ? CRT_colors[METER_SHADOW] : CRT_colors[METER_TEXT], " kthr");
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], "; ");
+   len = xSnprintf(buffer, sizeof(buffer), "%d", (int)this->values[3]);
+   RichString_appendnAscii(out, CRT_colors[TASKS_RUNNING], buffer, len);
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " running");
+}
+
+const MeterClass TasksMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = TasksMeter_display,
+   },
+   .updateValues = TasksMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 4,
+   .total = 100.0,
+   .attributes = TasksMeter_attributes,
+   .name = "Tasks",
+   .uiName = "Task counter",
+   .caption = "Tasks: "
+};
diff --git a/TasksMeter.h b/TasksMeter.h
new file mode 100644
index 0000000..9f9ba63
--- /dev/null
+++ b/TasksMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_TasksMeter
+#define HEADER_TasksMeter
+/*
+htop - TasksMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass TasksMeter_class;
+
+#endif
diff --git a/TraceScreen.c b/TraceScreen.c
new file mode 100644
index 0000000..8a69b67
--- /dev/null
+++ b/TraceScreen.c
@@ -0,0 +1,207 @@
+/*
+htop - TraceScreen.c
+(C) 2005-2006 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "TraceScreen.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+
+#include "CRT.h"
+#include "FunctionBar.h"
+#include "Panel.h"
+#include "ProvideCurses.h"
+#include "XUtils.h"
+
+
+static const char* const TraceScreenFunctions[] = {"Search ", "Filter ", "AutoScroll ", "Stop Tracing   ", "Done   ", NULL};
+
+static const char* const TraceScreenKeys[] = {"F3", "F4", "F8", "F9", "Esc"};
+
+static const int TraceScreenEvents[] = {KEY_F(3), KEY_F(4), KEY_F(8), KEY_F(9), 27};
+
+TraceScreen* TraceScreen_new(const Process* process) {
+   // This initializes all TraceScreen variables to "false" so only default = true ones need to be set below
+   TraceScreen* this = xCalloc(1, sizeof(TraceScreen));
+   Object_setClass(this, Class(TraceScreen));
+   this->tracing = true;
+   FunctionBar* fuBar = FunctionBar_new(TraceScreenFunctions, TraceScreenKeys, TraceScreenEvents);
+   CRT_disableDelay();
+   return (TraceScreen*) InfoScreen_init(&this->super, process, fuBar, LINES - 2, " ");
+}
+
+void TraceScreen_delete(Object* cast) {
+   TraceScreen* this = (TraceScreen*) cast;
+   if (this->child > 0) {
+      kill(this->child, SIGTERM);
+      while (waitpid(this->child, NULL, 0) == -1)
+         if (errno != EINTR)
+            break;
+   }
+
+   if (this->strace) {
+      fclose(this->strace);
+   }
+
+   CRT_enableDelay();
+   free(InfoScreen_done((InfoScreen*)this));
+}
+
+static void TraceScreen_draw(InfoScreen* this) {
+   InfoScreen_drawTitled(this, "Trace of process %d - %s", Process_getPid(this->process), Process_getCommand(this->process));
+}
+
+bool TraceScreen_forkTracer(TraceScreen* this) {
+   int fdpair[2] = {0, 0};
+
+   if (pipe(fdpair) == -1)
+      return false;
+
+   if (fcntl(fdpair[0], F_SETFL, O_NONBLOCK) < 0)
+      goto err;
+
+   if (fcntl(fdpair[1], F_SETFL, O_NONBLOCK) < 0)
+      goto err;
+
+   pid_t child = fork();
+   if (child == -1)
+      goto err;
+
+   if (child == 0) {
+      close(fdpair[0]);
+
+      dup2(fdpair[1], STDOUT_FILENO);
+      dup2(fdpair[1], STDERR_FILENO);
+      close(fdpair[1]);
+
+      char buffer[32] = {0};
+      xSnprintf(buffer, sizeof(buffer), "%d", Process_getPid(this->super.process));
+
+      #if defined(HTOP_FREEBSD) || defined(HTOP_OPENBSD) || defined(HTOP_NETBSD) || defined(HTOP_DRAGONFLYBSD) || defined(HTOP_SOLARIS)
+         // Use of NULL in variadic functions must have a pointer cast.
+         // The NULL constant is not required by standard to have a pointer type.
+         execlp("truss", "truss", "-s", "512", "-p", buffer, (void*)NULL);
+
+         // Should never reach here, unless execlp fails ...
+         const char* message = "Could not execute 'truss'. Please make sure it is available in your $PATH.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #elif defined(HTOP_LINUX)
+         execlp("strace", "strace", "-T", "-tt", "-s", "512", "-p", buffer, (void*)NULL);
+
+         // Should never reach here, unless execlp fails ...
+         const char* message = "Could not execute 'strace'. Please make sure it is available in your $PATH.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #else // HTOP_DARWIN, HTOP_PCP == HTOP_UNSUPPORTED
+         const char* message = "Tracing unavailable on not supported system.";
+         (void)! write(STDERR_FILENO, message, strlen(message));
+      #endif
+
+      exit(127);
+   }
+
+   FILE* fd = fdopen(fdpair[0], "r");
+   if (!fd)
+      goto err;
+
+   close(fdpair[1]);
+
+   this->child = child;
+   this->strace = fd;
+   return true;
+
+err:
+   close(fdpair[1]);
+   close(fdpair[0]);
+   return false;
+}
+
+static void TraceScreen_updateTrace(InfoScreen* super) {
+   TraceScreen* this = (TraceScreen*) super;
+   char buffer[1025];
+
+   int fd_strace = fileno(this->strace);
+   assert(fd_strace != -1);
+
+   fd_set fds;
+   FD_ZERO(&fds);
+// FD_SET(STDIN_FILENO, &fds);
+   FD_SET(fd_strace, &fds);
+
+   struct timeval tv = { .tv_sec = 0, .tv_usec = 500 };
+   int ready = select(fd_strace + 1, &fds, NULL, NULL, &tv);
+
+   size_t nread = 0;
+   if (ready > 0 && FD_ISSET(fd_strace, &fds))
+      nread = fread(buffer, 1, sizeof(buffer) - 1, this->strace);
+
+   if (nread && this->tracing) {
+      const char* line = buffer;
+      buffer[nread] = '\0';
+      for (size_t i = 0; i < nread; i++) {
+         if (buffer[i] == '\n') {
+            buffer[i] = '\0';
+            if (this->contLine) {
+               InfoScreen_appendLine(&this->super, line);
+               this->contLine = false;
+            } else {
+               InfoScreen_addLine(&this->super, line);
+            }
+            line = buffer + i + 1;
+         }
+      }
+      if (line < buffer + nread) {
+         InfoScreen_addLine(&this->super, line);
+         buffer[nread] = '\0';
+         this->contLine = true;
+      }
+      if (this->follow) {
+         Panel_setSelected(this->super.display, Panel_size(this->super.display) - 1);
+      }
+   }
+}
+
+static bool TraceScreen_onKey(InfoScreen* super, int ch) {
+   TraceScreen* this = (TraceScreen*) super;
+
+   switch (ch) {
+      case 'f':
+      case KEY_F(8):
+         this->follow = !(this->follow);
+         if (this->follow)
+            Panel_setSelected(super->display, Panel_size(super->display) - 1);
+         return true;
+      case 't':
+      case KEY_F(9):
+         this->tracing = !this->tracing;
+         FunctionBar_setLabel(super->display->defaultBar, KEY_F(9), this->tracing ? "Stop Tracing   " : "Resume Tracing ");
+         InfoScreen_draw(this);
+         return true;
+   }
+
+   this->follow = false;
+   return false;
+}
+
+const InfoScreenClass TraceScreen_class = {
+   .super = {
+      .extends = Class(Object),
+      .delete = TraceScreen_delete
+   },
+   .draw = TraceScreen_draw,
+   .onErr = TraceScreen_updateTrace,
+   .onKey = TraceScreen_onKey,
+};
diff --git a/TraceScreen.h b/TraceScreen.h
new file mode 100644
index 0000000..7b2101e
--- /dev/null
+++ b/TraceScreen.h
@@ -0,0 +1,37 @@
+#ifndef HEADER_TraceScreen
+#define HEADER_TraceScreen
+/*
+htop - TraceScreen.h
+(C) 2005-2006 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "InfoScreen.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct TraceScreen_ {
+   InfoScreen super;
+   bool tracing;
+   pid_t child;
+   FILE* strace;
+   bool contLine;
+   bool follow;
+} TraceScreen;
+
+
+extern const InfoScreenClass TraceScreen_class;
+
+TraceScreen* TraceScreen_new(const Process* process);
+
+void TraceScreen_delete(Object* cast);
+
+bool TraceScreen_forkTracer(TraceScreen* this);
+
+#endif
diff --git a/UptimeMeter.c b/UptimeMeter.c
new file mode 100644
index 0000000..622deda
--- /dev/null
+++ b/UptimeMeter.c
@@ -0,0 +1,62 @@
+/*
+htop - UptimeMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "UptimeMeter.h"
+
+#include "CRT.h"
+#include "Object.h"
+#include "Platform.h"
+#include "XUtils.h"
+
+
+static const int UptimeMeter_attributes[] = {
+   UPTIME
+};
+
+static void UptimeMeter_updateValues(Meter* this) {
+   int totalseconds = Platform_getUptime();
+   if (totalseconds <= 0) {
+      xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "(unknown)");
+      return;
+   }
+   int seconds = totalseconds % 60;
+   int minutes = (totalseconds / 60) % 60;
+   int hours = (totalseconds / 3600) % 24;
+   int days = (totalseconds / 86400);
+   this->values[0] = days;
+   if (days > this->total) {
+      this->total = days;
+   }
+   char daysbuf[32];
+   if (days > 100) {
+      xSnprintf(daysbuf, sizeof(daysbuf), "%d days(!), ", days);
+   } else if (days > 1) {
+      xSnprintf(daysbuf, sizeof(daysbuf), "%d days, ", days);
+   } else if (days == 1) {
+      xSnprintf(daysbuf, sizeof(daysbuf), "1 day, ");
+   } else {
+      daysbuf[0] = '\0';
+   }
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s%02d:%02d:%02d", daysbuf, hours, minutes, seconds);
+}
+
+const MeterClass UptimeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = UptimeMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100.0,
+   .attributes = UptimeMeter_attributes,
+   .name = "Uptime",
+   .uiName = "Uptime",
+   .caption = "Uptime: "
+};
diff --git a/UptimeMeter.h b/UptimeMeter.h
new file mode 100644
index 0000000..5a852ad
--- /dev/null
+++ b/UptimeMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_UptimeMeter
+#define HEADER_UptimeMeter
+/*
+htop - UptimeMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass UptimeMeter_class;
+
+#endif
diff --git a/UsersTable.c b/UsersTable.c
new file mode 100644
index 0000000..6586a4b
--- /dev/null
+++ b/UsersTable.c
@@ -0,0 +1,46 @@
+/*
+htop - UsersTable.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "UsersTable.h"
+
+#include <pwd.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "XUtils.h"
+
+
+UsersTable* UsersTable_new(void) {
+   UsersTable* this;
+   this = xMalloc(sizeof(UsersTable));
+   this->users = Hashtable_new(10, true);
+   return this;
+}
+
+void UsersTable_delete(UsersTable* this) {
+   Hashtable_delete(this->users);
+   free(this);
+}
+
+char* UsersTable_getRef(UsersTable* this, unsigned int uid) {
+   char* name = Hashtable_get(this->users, uid);
+   if (name == NULL) {
+      const struct passwd* userData = getpwuid(uid);
+      if (userData != NULL) {
+         name = xStrdup(userData->pw_name);
+         Hashtable_put(this->users, uid, name);
+      }
+   }
+   return name;
+}
+
+inline void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData) {
+   Hashtable_foreach(this->users, f, userData);
+}
diff --git a/UsersTable.h b/UsersTable.h
new file mode 100644
index 0000000..ecfd214
--- /dev/null
+++ b/UsersTable.h
@@ -0,0 +1,25 @@
+#ifndef HEADER_UsersTable
+#define HEADER_UsersTable
+/*
+htop - UsersTable.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Hashtable.h"
+
+
+typedef struct UsersTable_ {
+   Hashtable* users;
+} UsersTable;
+
+UsersTable* UsersTable_new(void);
+
+void UsersTable_delete(UsersTable* this);
+
+char* UsersTable_getRef(UsersTable* this, unsigned int uid);
+
+void UsersTable_foreach(UsersTable* this, Hashtable_PairFunction f, void* userData);
+
+#endif
diff --git a/Vector.c b/Vector.c
new file mode 100644
index 0000000..0e08c65
--- /dev/null
+++ b/Vector.c
@@ -0,0 +1,403 @@
+/*
+htop - Vector.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "Vector.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "XUtils.h"
+
+
+Vector* Vector_new(const ObjectClass* type, bool owner, int size) {
+   Vector* this;
+
+   if (size == DEFAULT_SIZE) {
+      size = 10;
+   }
+
+   assert(size > 0);
+   this = xMalloc(sizeof(Vector));
+   this->growthRate = size;
+   this->array = (Object**) xCalloc(size, sizeof(Object*));
+   this->arraySize = size;
+   this->items = 0;
+   this->type = type;
+   this->owner = owner;
+   this->dirty_index = -1;
+   this->dirty_count = 0;
+   return this;
+}
+
+void Vector_delete(Vector* this) {
+   if (this->owner) {
+      for (int i = 0; i < this->items; i++) {
+         if (this->array[i]) {
+            Object_delete(this->array[i]);
+         }
+      }
+   }
+   free(this->array);
+   free(this);
+}
+
+static inline bool Vector_isDirty(const Vector* this) {
+   if (this->dirty_count > 0) {
+      assert(0 <= this->dirty_index && this->dirty_index < this->items);
+      assert(this->dirty_count <= this->items);
+      return true;
+   }
+   assert(this->dirty_index == -1);
+   return false;
+}
+
+#ifndef NDEBUG
+
+static bool Vector_isConsistent(const Vector* this) {
+   assert(this->items <= this->arraySize);
+   assert(!Vector_isDirty(this));
+
+   return true;
+}
+
+bool Vector_countEquals(const Vector* this, unsigned int expectedCount) {
+   unsigned int n = 0;
+   for (int i = 0; i < this->items; i++) {
+      if (this->array[i]) {
+         n++;
+      }
+   }
+   return n == expectedCount;
+}
+
+Object* Vector_get(const Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
+   assert(this->array[idx]);
+   assert(Object_isA(this->array[idx], this->type));
+   return this->array[idx];
+}
+
+int Vector_size(const Vector* this) {
+   assert(Vector_isConsistent(this));
+   return this->items;
+}
+
+#endif /* NDEBUG */
+
+void Vector_prune(Vector* this) {
+   assert(Vector_isConsistent(this));
+   if (this->owner) {
+      for (int i = 0; i < this->items; i++) {
+         if (this->array[i]) {
+            Object_delete(this->array[i]);
+         }
+      }
+   }
+   this->items = 0;
+   this->dirty_index = -1;
+   this->dirty_count = 0;
+   memset(this->array, '\0', this->arraySize * sizeof(Object*));
+}
+
+//static int comparisons = 0;
+
+static void swap(Object** array, int indexA, int indexB) {
+   assert(indexA >= 0);
+   assert(indexB >= 0);
+   Object* tmp = array[indexA];
+   array[indexA] = array[indexB];
+   array[indexB] = tmp;
+}
+
+static int partition(Object** array, int left, int right, int pivotIndex, Object_Compare compare) {
+   const Object* pivotValue = array[pivotIndex];
+   swap(array, pivotIndex, right);
+   int storeIndex = left;
+   for (int i = left; i < right; i++) {
+      //comparisons++;
+      if (compare(array[i], pivotValue) <= 0) {
+         swap(array, i, storeIndex);
+         storeIndex++;
+      }
+   }
+   swap(array, storeIndex, right);
+   return storeIndex;
+}
+
+static void quickSort(Object** array, int left, int right, Object_Compare compare) {
+   if (left >= right)
+      return;
+
+   int pivotIndex = (left + right) / 2;
+   int pivotNewIndex = partition(array, left, right, pivotIndex, compare);
+   quickSort(array, left, pivotNewIndex - 1, compare);
+   quickSort(array, pivotNewIndex + 1, right, compare);
+}
+
+// If I were to use only one sorting algorithm for both cases, it would probably be this one:
+/*
+
+static void combSort(Object** array, int left, int right, Object_Compare compare) {
+   int gap = right - left;
+   bool swapped = true;
+   while ((gap > 1) || swapped) {
+      if (gap > 1) {
+         gap = (int)((double)gap / 1.247330950103979);
+      }
+      swapped = false;
+      for (int i = left; gap + i <= right; i++) {
+         comparisons++;
+         if (compare(array[i], array[i+gap]) > 0) {
+            swap(array, i, i+gap);
+            swapped = true;
+         }
+      }
+   }
+}
+
+*/
+
+static void insertionSort(Object** array, int left, int right, Object_Compare compare) {
+   for (int i = left + 1; i <= right; i++) {
+      Object* t = array[i];
+      int j = i - 1;
+      while (j >= left) {
+         //comparisons++;
+         if (compare(array[j], t) <= 0)
+            break;
+
+         array[j + 1] = array[j];
+         j--;
+      }
+      array[j + 1] = t;
+   }
+}
+
+void Vector_quickSortCustomCompare(Vector* this, Object_Compare compare) {
+   assert(compare);
+   assert(Vector_isConsistent(this));
+   quickSort(this->array, 0, this->items - 1, compare);
+   assert(Vector_isConsistent(this));
+}
+
+void Vector_insertionSort(Vector* this) {
+   assert(this->type->compare);
+   assert(Vector_isConsistent(this));
+   insertionSort(this->array, 0, this->items - 1, this->type->compare);
+   assert(Vector_isConsistent(this));
+}
+
+static void Vector_resizeIfNecessary(Vector* this, int newSize) {
+   assert(newSize >= 0);
+   if (newSize > this->arraySize) {
+      assert(Vector_isConsistent(this));
+      int oldSize = this->arraySize;
+      this->arraySize = newSize + this->growthRate;
+      this->array = (Object**)xReallocArrayZero(this->array, oldSize, this->arraySize, sizeof(Object*));
+   }
+   assert(Vector_isConsistent(this));
+}
+
+void Vector_insert(Vector* this, int idx, void* data_) {
+   Object* data = data_;
+   assert(idx >= 0);
+   assert(Object_isA(data, this->type));
+   assert(Vector_isConsistent(this));
+
+   if (idx > this->items) {
+      idx = this->items;
+   }
+
+   Vector_resizeIfNecessary(this, this->items + 1);
+   //assert(this->array[this->items] == NULL);
+   if (idx < this->items) {
+      memmove(&this->array[idx + 1], &this->array[idx], (this->items - idx) * sizeof(this->array[0]));
+   }
+   this->array[idx] = data;
+   this->items++;
+   assert(Vector_isConsistent(this));
+}
+
+Object* Vector_take(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
+   assert(Vector_isConsistent(this));
+   Object* removed = this->array[idx];
+   assert(removed);
+   this->items--;
+   if (idx < this->items) {
+      memmove(&this->array[idx], &this->array[idx + 1], (this->items - idx) * sizeof(this->array[0]));
+   }
+   this->array[this->items] = NULL;
+   assert(Vector_isConsistent(this));
+   return removed;
+}
+
+Object* Vector_remove(Vector* this, int idx) {
+   Object* removed = Vector_take(this, idx);
+   if (this->owner) {
+      Object_delete(removed);
+      return NULL;
+   } else {
+      return removed;
+   }
+}
+
+Object* Vector_softRemove(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
+
+   Object* removed = this->array[idx];
+   assert(removed);
+   if (removed) {
+      this->array[idx] = NULL;
+
+      this->dirty_count++;
+      if (this->dirty_index < 0 || idx < this->dirty_index) {
+         this->dirty_index = idx;
+      }
+
+      if (this->owner) {
+         Object_delete(removed);
+         return NULL;
+      }
+   }
+
+   return removed;
+}
+
+void Vector_compact(Vector* this) {
+   if (!Vector_isDirty(this)) {
+      return;
+   }
+
+   const int size = this->items;
+   assert(0 <= this->dirty_index && this->dirty_index < size);
+   assert(this->array[this->dirty_index] == NULL);
+
+   int idx = this->dirty_index;
+
+   // one deletion: use memmove, which should be faster
+   if (this->dirty_count == 1) {
+      memmove(&this->array[idx], &this->array[idx + 1], (this->items - idx - 1) * sizeof(this->array[0]));
+      this->array[this->items - 1] = NULL;
+   } else {
+      // multiple deletions
+      for (int i = idx + 1; i < size; i++) {
+         if (this->array[i]) {
+            this->array[idx++] = this->array[i];
+         }
+      }
+      // idx is now at the end of the vector and on the first index which should be set to NULL
+      memset(&this->array[idx], '\0', (size - idx) * sizeof(this->array[0]));
+   }
+
+   this->items -= this->dirty_count;
+   this->dirty_index = -1;
+   this->dirty_count = 0;
+
+   assert(Vector_isConsistent(this));
+}
+
+void Vector_moveUp(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
+   assert(Vector_isConsistent(this));
+
+   if (idx == 0)
+      return;
+
+   Object* temp = this->array[idx];
+   this->array[idx] = this->array[idx - 1];
+   this->array[idx - 1] = temp;
+}
+
+void Vector_moveDown(Vector* this, int idx) {
+   assert(idx >= 0 && idx < this->items);
+   assert(Vector_isConsistent(this));
+
+   if (idx == this->items - 1)
+      return;
+
+   Object* temp = this->array[idx];
+   this->array[idx] = this->array[idx + 1];
+   this->array[idx + 1] = temp;
+}
+
+void Vector_set(Vector* this, int idx, void* data_) {
+   Object* data = data_;
+   assert(idx >= 0);
+   assert(Object_isA(data, this->type));
+   assert(Vector_isConsistent(this));
+
+   Vector_resizeIfNecessary(this, idx + 1);
+   if (idx >= this->items) {
+      this->items = idx + 1;
+   } else {
+      if (this->owner) {
+         Object* removed = this->array[idx];
+         if (removed != NULL) {
+            Object_delete(removed);
+         }
+      }
+   }
+   this->array[idx] = data;
+   assert(Vector_isConsistent(this));
+}
+
+/*
+
+static void Vector_merge(Vector* this, Vector* v2) {
+   int i;
+   assert(Vector_isConsistent(this));
+
+   for (i = 0; i < v2->items; i++)
+      Vector_add(this, v2->array[i]);
+   v2->items = 0;
+   Vector_delete(v2);
+   assert(Vector_isConsistent(this));
+}
+
+*/
+
+void Vector_add(Vector* this, void* data_) {
+   Object* data = data_;
+   assert(Object_isA(data, this->type));
+   assert(Vector_isConsistent(this));
+   int i = this->items;
+   Vector_set(this, this->items, data);
+   assert(this->items == i + 1); (void)(i);
+   assert(Vector_isConsistent(this));
+}
+
+int Vector_indexOf(const Vector* this, const void* search_, Object_Compare compare) {
+   const Object* search = search_;
+   assert(Object_isA(search, this->type));
+   assert(compare);
+   assert(Vector_isConsistent(this));
+   for (int i = 0; i < this->items; i++) {
+      const Object* o = this->array[i];
+      assert(o);
+      if (compare(search, o) == 0) {
+         return i;
+      }
+   }
+   return -1;
+}
+
+void Vector_splice(Vector* this, Vector* from) {
+   assert(Vector_isConsistent(this));
+   assert(Vector_isConsistent(from));
+   assert(!this->owner);
+
+   int olditems = this->items;
+   Vector_resizeIfNecessary(this, this->items + from->items);
+   this->items += from->items;
+   for (int j = 0; j < from->items; j++) {
+      this->array[olditems + j] = from->array[j];
+   }
+}
diff --git a/Vector.h b/Vector.h
new file mode 100644
index 0000000..b7b3903
--- /dev/null
+++ b/Vector.h
@@ -0,0 +1,99 @@
+#ifndef HEADER_Vector
+#define HEADER_Vector
+/*
+htop - Vector.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Object.h"
+
+#include <stdbool.h>
+
+
+#ifndef DEFAULT_SIZE
+#define DEFAULT_SIZE (-1)
+#endif
+
+typedef struct Vector_ {
+   Object** array;
+   const ObjectClass* type;
+   int arraySize;
+   int growthRate;
+   int items;
+   /* lowest index of a pending soft remove/delete operation,
+      used to speed up compaction */
+   int dirty_index;
+   /* count of soft deletes, required for Vector_count to work in debug mode */
+   int dirty_count;
+   bool owner;
+} Vector;
+
+Vector* Vector_new(const ObjectClass* type, bool owner, int size);
+
+void Vector_delete(Vector* this);
+
+void Vector_prune(Vector* this);
+
+void Vector_quickSortCustomCompare(Vector* this, Object_Compare compare);
+static inline void Vector_quickSort(Vector* this) {
+   Vector_quickSortCustomCompare(this, this->type->compare);
+}
+
+void Vector_insertionSort(Vector* this);
+
+void Vector_insert(Vector* this, int idx, void* data_);
+
+Object* Vector_take(Vector* this, int idx);
+
+Object* Vector_remove(Vector* this, int idx);
+
+/* Vector_softRemove marks the item at index idx for deletion without
+   reclaiming any space. If owned, the item is immediately freed.
+
+   Vector_compact must be called to reclaim space.*/
+Object* Vector_softRemove(Vector* this, int idx);
+
+/* Vector_compact reclaims space free'd up by Vector_softRemove, if any. */
+void Vector_compact(Vector* this);
+
+void Vector_moveUp(Vector* this, int idx);
+
+void Vector_moveDown(Vector* this, int idx);
+
+void Vector_set(Vector* this, int idx, void* data_);
+
+#ifndef NDEBUG
+
+Object* Vector_get(const Vector* this, int idx);
+int Vector_size(const Vector* this);
+
+/* Vector_countEquals returns true if the number of non-NULL items
+   in the Vector is equal to expectedCount. This is only for debugging
+   and consistency checks. */
+bool Vector_countEquals(const Vector* this, unsigned int expectedCount);
+
+#else /* NDEBUG */
+
+static inline Object* Vector_get(const Vector* this, int idx) {
+   return this->array[idx];
+}
+
+static inline int Vector_size(const Vector* this) {
+   return this->items;
+}
+
+#endif /* NDEBUG */
+
+static inline const ObjectClass* Vector_type(const Vector* this) {
+   return this->type;
+}
+
+void Vector_add(Vector* this, void* data_);
+
+int Vector_indexOf(const Vector* this, const void* search_, Object_Compare compare);
+
+void Vector_splice(Vector* this, Vector* from);
+
+#endif
diff --git a/XUtils.c b/XUtils.c
new file mode 100644
index 0000000..160386c
--- /dev/null
+++ b/XUtils.c
@@ -0,0 +1,366 @@
+/*
+htop - StringUtils.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "XUtils.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "CRT.h"
+#include "Macros.h"
+
+
+void fail(void) {
+   CRT_done();
+   abort();
+
+   _exit(1); // Should never reach here
+}
+
+void* xMalloc(size_t size) {
+   assert(size > 0);
+   void* data = malloc(size);
+   if (!data) {
+      fail();
+   }
+   return data;
+}
+
+void* xMallocArray(size_t nmemb, size_t size) {
+   assert(nmemb > 0);
+   assert(size > 0);
+   if (SIZE_MAX / nmemb < size) {
+      fail();
+   }
+   return xMalloc(nmemb * size);
+}
+
+void* xCalloc(size_t nmemb, size_t size) {
+   assert(nmemb > 0);
+   assert(size > 0);
+   if (SIZE_MAX / nmemb < size) {
+      fail();
+   }
+   void* data = calloc(nmemb, size);
+   if (!data) {
+      fail();
+   }
+   return data;
+}
+
+void* xRealloc(void* ptr, size_t size) {
+   assert(size > 0);
+   void* data = realloc(ptr, size); // deepcode ignore MemoryLeakOnRealloc: this goes to fail()
+   if (!data) {
+      free(ptr);
+      fail();
+   }
+   return data;
+}
+
+void* xReallocArray(void* ptr, size_t nmemb, size_t size) {
+   assert(nmemb > 0);
+   assert(size > 0);
+   if (SIZE_MAX / nmemb < size) {
+      fail();
+   }
+   return xRealloc(ptr, nmemb * size);
+}
+
+void* xReallocArrayZero(void* ptr, size_t prevmemb, size_t newmemb, size_t size) {
+   assert((ptr == NULL) == (prevmemb == 0));
+
+   if (prevmemb == newmemb) {
+      return ptr;
+   }
+
+   void* ret = xReallocArray(ptr, newmemb, size);
+
+   if (newmemb > prevmemb) {
+      memset((unsigned char*)ret + prevmemb * size, '\0', (newmemb - prevmemb) * size);
+   }
+
+   return ret;
+}
+
+inline bool String_contains_i(const char* s1, const char* s2, bool multi) {
+   // we have a multi-string search term, handle as special case for performance reasons
+   if (multi && strstr(s2, "|")) {
+      size_t nNeedles;
+      char** needles = String_split(s2, '|', &nNeedles);
+      for (size_t i = 0; i < nNeedles; i++) {
+         if (strcasestr(s1, needles[i]) != NULL) {
+            String_freeArray(needles);
+            return true;
+         }
+      }
+      String_freeArray(needles);
+      return false;
+   } else {
+      return strcasestr(s1, s2) != NULL;
+   }
+}
+
+char* String_cat(const char* s1, const char* s2) {
+   const size_t l1 = strlen(s1);
+   const size_t l2 = strlen(s2);
+   if (SIZE_MAX - l1 <= l2) {
+      fail();
+   }
+   char* out = xMalloc(l1 + l2 + 1);
+   memcpy(out, s1, l1);
+   memcpy(out + l1, s2, l2);
+   out[l1 + l2] = '\0';
+   return out;
+}
+
+char* String_trim(const char* in) {
+   while (in[0] == ' ' || in[0] == '\t' || in[0] == '\n') {
+      in++;
+   }
+
+   size_t len = strlen(in);
+   while (len > 0 && (in[len - 1] == ' ' || in[len - 1] == '\t' || in[len - 1] == '\n')) {
+      len--;
+   }
+
+   return xStrndup(in, len);
+}
+
+char** String_split(const char* s, char sep, size_t* n) {
+   const size_t rate = 10;
+   char** out = xCalloc(rate, sizeof(char*));
+   size_t ctr = 0;
+   size_t blocks = rate;
+   const char* where;
+   while ((where = strchr(s, sep)) != NULL) {
+      size_t size = (size_t)(where - s);
+      out[ctr] = xStrndup(s, size);
+      ctr++;
+      if (ctr == blocks) {
+         blocks += rate;
+         out = (char**) xRealloc(out, sizeof(char*) * blocks);
+      }
+      s += size + 1;
+   }
+   if (s[0] != '\0') {
+      out[ctr] = xStrdup(s);
+      ctr++;
+   }
+   out = xRealloc(out, sizeof(char*) * (ctr + 1));
+   out[ctr] = NULL;
+
+   if (n)
+      *n = ctr;
+
+   return out;
+}
+
+void String_freeArray(char** s) {
+   if (!s) {
+      return;
+   }
+   for (size_t i = 0; s[i] != NULL; i++) {
+      free(s[i]);
+   }
+   free(s);
+}
+
+char* String_readLine(FILE* fd) {
+   const size_t step = 1024;
+   size_t bufSize = step;
+   char* buffer = xMalloc(step + 1);
+   char* at = buffer;
+   for (;;) {
+      const char* ok = fgets(at, step + 1, fd);
+      if (!ok) {
+         free(buffer);
+         return NULL;
+      }
+      char* newLine = strrchr(at, '\n');
+      if (newLine) {
+         *newLine = '\0';
+         return buffer;
+      } else {
+         if (feof(fd)) {
+            return buffer;
+         }
+      }
+      bufSize += step;
+      buffer = xRealloc(buffer, bufSize + 1);
+      at = buffer + bufSize - step;
+   }
+}
+
+size_t String_safeStrncpy(char* restrict dest, const char* restrict src, size_t size) {
+   assert(size > 0);
+
+   size_t i = 0;
+   for (; i < size - 1 && src[i]; i++)
+      dest[i] = src[i];
+
+   dest[i] = '\0';
+
+   return i;
+}
+
+int xAsprintf(char** strp, const char* fmt, ...) {
+   va_list vl;
+   va_start(vl, fmt);
+   int r = vasprintf(strp, fmt, vl);
+   va_end(vl);
+
+   if (r < 0 || !*strp) {
+      fail();
+   }
+
+   return r;
+}
+
+int xSnprintf(char* buf, size_t len, const char* fmt, ...) {
+   va_list vl;
+   va_start(vl, fmt);
+   int n = vsnprintf(buf, len, fmt, vl);
+   va_end(vl);
+
+   if (n < 0 || (size_t)n >= len) {
+      fail();
+   }
+
+   return n;
+}
+
+char* xStrdup(const char* str) {
+   char* data = strdup(str);
+   if (!data) {
+      fail();
+   }
+   return data;
+}
+
+void free_and_xStrdup(char** ptr, const char* str) {
+   if (*ptr && String_eq(*ptr, str))
+      return;
+
+   free(*ptr);
+   *ptr = xStrdup(str);
+}
+
+char* xStrndup(const char* str, size_t len) {
+   char* data = strndup(str, len);
+   if (!data) {
+      fail();
+   }
+   return data;
+}
+
+ATTR_ACCESS3_W(2, 3)
+static ssize_t readfd_internal(int fd, void* buffer, size_t count) {
+   if (!count) {
+      close(fd);
+      return -EINVAL;
+   }
+
+   ssize_t alreadyRead = 0;
+   count--; // reserve one for null-terminator
+
+   for (;;) {
+      ssize_t res = read(fd, buffer, count);
+      if (res == -1) {
+         if (errno == EINTR)
+            continue;
+
+         close(fd);
+         *((char*)buffer) = '\0';
+         return -errno;
+      }
+
+      if (res > 0) {
+         assert((size_t)res <= count);
+
+         buffer = ((char*)buffer) + res;
+         count -= (size_t)res;
+         alreadyRead += res;
+      }
+
+      if (count == 0 || res == 0) {
+         close(fd);
+         *((char*)buffer) = '\0';
+         return alreadyRead;
+      }
+   }
+}
+
+ssize_t xReadfile(const char* pathname, void* buffer, size_t count) {
+   int fd = open(pathname, O_RDONLY);
+   if (fd < 0)
+      return -errno;
+
+   return readfd_internal(fd, buffer, count);
+}
+
+ssize_t xReadfileat(openat_arg_t dirfd, const char* pathname, void* buffer, size_t count) {
+   int fd = Compat_openat(dirfd, pathname, O_RDONLY);
+   if (fd < 0)
+      return -errno;
+
+   return readfd_internal(fd, buffer, count);
+}
+
+ssize_t full_write(int fd, const void* buf, size_t count) {
+   ssize_t written = 0;
+
+   while (count > 0) {
+      ssize_t r = write(fd, buf, count);
+      if (r < 0) {
+         if (errno == EINTR)
+            continue;
+
+         return r;
+      }
+
+      if (r == 0)
+         break;
+
+      written += r;
+      buf = (const unsigned char*)buf + r;
+      count -= (size_t)r;
+   }
+
+   return written;
+}
+
+/* Compares floating point values for ordering data entries. In this function,
+   NaN is considered "less than" any other floating point value (regardless of
+   sign), and two NaNs are considered "equal" regardless of payload. */
+int compareRealNumbers(double a, double b) {
+   int result = isgreater(a, b) - isgreater(b, a);
+   if (result)
+      return result;
+   return !isNaN(a) - !isNaN(b);
+}
+
+/* Computes the sum of all positive floating point values in an array.
+   NaN values in the array are skipped. The returned sum will always be
+   nonnegative. */
+double sumPositiveValues(const double* array, size_t count) {
+   double sum = 0.0;
+   for (size_t i = 0; i < count; i++) {
+      if (isPositive(array[i]))
+         sum += array[i];
+   }
+   return sum;
+}
diff --git a/XUtils.h b/XUtils.h
new file mode 100644
index 0000000..68b9483
--- /dev/null
+++ b/XUtils.h
@@ -0,0 +1,123 @@
+#ifndef HEADER_XUtils
+#define HEADER_XUtils
+/*
+htop - StringUtils.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+// IWYU pragma: no_include "config.h"
+#ifndef PACKAGE
+// strchrnul() needs _GNU_SOURCE defined, see PR #1337 for details
+#error "Must have #include \"config.h\" line at the top of the file that includes these XUtils helper functions"
+#endif
+
+#include <stdbool.h>
+#include <stddef.h> // IWYU pragma: keep
+#include <stdio.h>
+#include <stdlib.h> // IWYU pragma: keep
+#include <string.h> // IWYU pragma: keep
+
+#include "Compat.h"
+#include "Macros.h"
+
+
+void fail(void) ATTR_NORETURN;
+
+void* xMalloc(size_t size) ATTR_ALLOC_SIZE1(1) ATTR_MALLOC;
+
+void* xMallocArray(size_t nmemb, size_t size) ATTR_ALLOC_SIZE2(1, 2) ATTR_MALLOC;
+
+void* xCalloc(size_t nmemb, size_t size) ATTR_ALLOC_SIZE2(1, 2) ATTR_MALLOC;
+
+void* xRealloc(void* ptr, size_t size) ATTR_ALLOC_SIZE1(2);
+
+void* xReallocArray(void* ptr, size_t nmemb, size_t size) ATTR_ALLOC_SIZE2(2, 3);
+
+void* xReallocArrayZero(void* ptr, size_t prevmemb, size_t newmemb, size_t size) ATTR_ALLOC_SIZE2(3, 4);
+
+/*
+ * String_startsWith gives better performance if strlen(match) can be computed
+ * at compile time (e.g. when they are immutable string literals). :)
+ */
+ATTR_NONNULL
+static inline bool String_startsWith(const char* s, const char* match) {
+   return strncmp(s, match, strlen(match)) == 0;
+}
+
+bool String_contains_i(const char* s1, const char* s2, bool multi);
+
+ATTR_NONNULL
+static inline bool String_eq(const char* s1, const char* s2) {
+   return strcmp(s1, s2) == 0;
+}
+
+ATTR_NONNULL
+char* String_cat(const char* s1, const char* s2) ATTR_MALLOC;
+
+ATTR_NONNULL
+char* String_trim(const char* in) ATTR_MALLOC;
+
+ATTR_NONNULL_N(1)
+char** String_split(const char* s, char sep, size_t* n);
+
+void String_freeArray(char** s);
+
+ATTR_NONNULL
+char* String_readLine(FILE* fd) ATTR_MALLOC;
+
+ATTR_NONNULL
+static inline char* String_strchrnul(const char* s, int c) {
+#ifdef HAVE_STRCHRNUL
+   return strchrnul(s, c);
+#else
+   char* result = strchr(s, c);
+   if (result)
+      return result;
+   return strchr(s, '\0');
+#endif
+}
+
+/* Always null-terminates dest. Caller must pass a strictly positive size. */
+ATTR_ACCESS3_W(1, 3)
+ATTR_ACCESS3_R(2, 3)
+size_t String_safeStrncpy(char* restrict dest, const char* restrict src, size_t size);
+
+ATTR_FORMAT(printf, 2, 3)
+ATTR_NONNULL_N(1, 2)
+int xAsprintf(char** strp, const char* fmt, ...);
+
+ATTR_FORMAT(printf, 3, 4)
+ATTR_ACCESS3_W(1, 2)
+int xSnprintf(char* buf, size_t len, const char* fmt, ...);
+
+char* xStrdup(const char* str) ATTR_NONNULL ATTR_MALLOC;
+void free_and_xStrdup(char** ptr, const char* str);
+
+ATTR_ACCESS3_R(1, 2)
+char* xStrndup(const char* str, size_t len) ATTR_NONNULL ATTR_MALLOC;
+
+ATTR_ACCESS3_W(2, 3)
+ssize_t xReadfile(const char* pathname, void* buffer, size_t count);
+ATTR_ACCESS3_W(3, 4)
+ssize_t xReadfileat(openat_arg_t dirfd, const char* pathname, void* buffer, size_t count);
+
+ATTR_ACCESS3_R(2, 3)
+ssize_t full_write(int fd, const void* buf, size_t count);
+
+/* Compares floating point values for ordering data entries. In this function,
+   NaN is considered "less than" any other floating point value (regardless of
+   sign), and two NaNs are considered "equal" regardless of payload. */
+int compareRealNumbers(double a, double b);
+
+/* Computes the sum of all positive floating point values in an array.
+   NaN values in the array are skipped. The returned sum will always be
+   nonnegative. */
+double sumPositiveValues(const double* array, size_t count);
+
+/* IEC unit prefixes */
+static const char unitPrefixes[] = { 'K', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 'R', 'Q' };
+
+#endif
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..fb38e5e
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf --force --install --verbose -Wall
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..e4df238
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,865 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# ----------------------------------------------------------------------
+# Autoconf initialization.
+# ----------------------------------------------------------------------
+
+AC_PREREQ([2.69])
+AC_INIT([htop], [3.3.0], [htop@groups.io], [], [https://htop.dev/])
+
+AC_CONFIG_SRCDIR([htop.c])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_HEADERS([config.h])
+
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE([-Wall std-options subdir-objects])
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for platform.
+# ----------------------------------------------------------------------
+
+case "$host_os" in
+linux*|gnu*)
+   my_htop_platform=linux
+   AC_DEFINE([HTOP_LINUX], [], [Building for Linux.])
+   ;;
+freebsd*|kfreebsd*)
+   my_htop_platform=freebsd
+   AC_DEFINE([HTOP_FREEBSD], [], [Building for FreeBSD.])
+   ;;
+netbsd*)
+   my_htop_platform=netbsd
+   AC_DEFINE([HTOP_NETBSD], [], [Building for NetBSD.])
+   ;;
+openbsd*)
+   my_htop_platform=openbsd
+   AC_DEFINE([HTOP_OPENBSD], [], [Building for OpenBSD.])
+   ;;
+dragonfly*)
+   my_htop_platform=dragonflybsd
+   AC_DEFINE([HTOP_DRAGONFLYBSD], [], [Building for DragonFlyBSD.])
+   ;;
+darwin*)
+   my_htop_platform=darwin
+   AC_DEFINE([HTOP_DARWIN], [], [Building for Darwin.])
+   ;;
+solaris*)
+   my_htop_platform=solaris
+   AC_DEFINE([HTOP_SOLARIS], [], [Building for Solaris.])
+   ;;
+*)
+   my_htop_platform=unsupported
+   AC_DEFINE([HTOP_UNSUPPORTED], [], [Building for an unsupported platform.])
+   ;;
+esac
+
+# Enable extensions, required by hwloc scripts
+AC_USE_SYSTEM_EXTENSIONS
+
+# Activate some more of the missing global defines
+AC_SYS_LARGEFILE
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for compiler.
+# ----------------------------------------------------------------------
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+m4_version_prereq([2.70], [], [AC_PROG_CC_C99])
+AS_IF([test "x$ac_cv_prog_cc_c99" = xno], [AC_MSG_ERROR([htop is written in C99. A newer compiler is required.])])
+AM_CFLAGS="-std=c99 -pedantic"
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for static build.
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([static],
+              [AS_HELP_STRING([--enable-static],
+                              [build a static htop binary @<:@default=no@:>@])],
+              [],
+              [enable_static=no])
+case "$enable_static" in
+   no)
+      ;;
+   yes)
+      AC_DEFINE([BUILD_STATIC], [1], [Define if building static binary.])
+      CFLAGS="$CFLAGS -static"
+      LDFLAGS="$LDFLAGS -static"
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_static' for --enable-static option])
+      ;;
+esac
+
+# ----------------------------------------------------------------------
+
+# ----------------------------------------------------------------------
+# Checks for a PCP-based htop build.  (https://pcp.io)
+# ----------------------------------------------------------------------
+
+AC_ARG_ENABLE([pcp],
+              [AS_HELP_STRING([--enable-pcp],
+                              [build a pcp-htop binary @<:@default=no@:>@])],
+              [],
+              [enable_pcp=no])
+case "$enable_pcp" in
+   no)
+      ;;
+   yes)
+      AC_CHECK_HEADERS([pcp/pmapi.h], [my_htop_platform=pcp],
+                       [AC_MSG_ERROR([can not find PCP header file])])
+      AC_SEARCH_LIBS([pmNewContext], [pcp], [], [AC_MSG_ERROR([can not find PCP library])])
+      AC_DEFINE([HTOP_PCP], [1], [Define if building pcp-htop binary.])
+      AC_CONFIG_FILES([pcp-htop.5])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_pcp' for --enable-pcp option])
+      ;;
+esac
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for generic header files.
+# ----------------------------------------------------------------------
+
+AC_HEADER_DIRENT
+m4_version_prereq([2.70], [AC_CHECK_INCLUDES_DEFAULT], [AC_HEADER_STDC])
+AC_CHECK_HEADERS([ \
+    stdlib.h \
+    string.h \
+    strings.h \
+    sys/param.h \
+    sys/time.h \
+    sys/utsname.h \
+    unistd.h
+   ], [], [AC_MSG_ERROR([can not find required generic header files])])
+
+AC_HEADER_MAJOR
+dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to
+dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet
+dnl been updated in Autoconf 2.69, so use a workaround:
+m4_version_prereq([2.70], [],
+[if test "x$ac_cv_header_sys_mkdev_h" != xyes; then
+   AC_CHECK_HEADER([sys/sysmacros.h], [AC_DEFINE([MAJOR_IN_SYSMACROS], [1],
+      [Define to 1 if 'major', 'minor', and 'makedev' are declared in <sys/sysmacros.h>.])])
+fi])
+
+# Optional Section
+
+AC_CHECK_HEADERS([execinfo.h])
+
+if test "$my_htop_platform" = darwin; then
+   AC_CHECK_HEADERS([mach/mach_time.h])
+fi
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for typedefs, structures, and compiler characteristics.
+# ----------------------------------------------------------------------
+
+AC_TYPE_MBSTATE_T
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UID_T
+AC_TYPE_UINT8_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT64_T
+
+AC_MSG_CHECKING(for alloc_size)
+old_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-error -Werror=attributes"
+AC_COMPILE_IFELSE([
+   AC_LANG_SOURCE(
+      [
+         __attribute__((alloc_size(1))) char* my_alloc(int size) { return 0; }
+      ],[]
+   )],
+   AC_DEFINE([HAVE_ATTR_ALLOC_SIZE], 1, [The alloc_size attribute is supported.])
+   AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+CFLAGS="$old_CFLAGS"
+
+AC_MSG_CHECKING(for access)
+old_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-error -Werror=attributes"
+AC_COMPILE_IFELSE([
+   AC_LANG_SOURCE(
+      [
+         __attribute__((access(read_only, 1, 2))) extern int foo(const char* str, unsigned len);
+      ],[]
+   )],
+   AC_DEFINE([HAVE_ATTR_ACCESS], 1, [The access attribute is supported.])
+   AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+CFLAGS="$old_CFLAGS"
+
+AC_MSG_CHECKING(for nonnull)
+old_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-error -Werror=attributes"
+AC_COMPILE_IFELSE([
+   AC_LANG_SOURCE(
+      [[
+         /* Attribute supported in GCC 3.3 or later */
+         __attribute__((nonnull)) int my_strcmp(const char* a, const char* b);
+         __attribute__((nonnull(1))) long my_strtol(const char* str, char** endptr, int base);
+      ]]
+   )],
+   AC_DEFINE([HAVE_ATTR_NONNULL], 1, [The nonnull attribute is supported.])
+   AC_MSG_RESULT(yes),
+   AC_MSG_RESULT(no))
+CFLAGS="$old_CFLAGS"
+
+AC_MSG_CHECKING(for NaN support)
+dnl Note: AC_RUN_IFELSE does not try compiling the program at all when
+dnl $cross_compiling is 'yes'.
+AC_LINK_IFELSE([
+   AC_LANG_PROGRAM(
+      [[
+#include <math.h>
+      ]],
+      [[
+         double x = NAN;
+         /* Both should evaluate to false -> 0 (exit success) */
+         return isgreater(x, x) || isgreaterequal(x, x);
+      ]]
+   )],
+   [flag_finite_math_only=unknown
+   if test "$cross_compiling" = yes; then
+      AC_COMPILE_IFELSE([
+         AC_LANG_SOURCE([[
+/* __FINITE_MATH_ONLY__ is documented in Clang. */
+#ifdef __FINITE_MATH_ONLY__
+#error "should not enable -ffinite-math-only"
+#endif
+         ]])],
+         AC_MSG_RESULT([assume yes (cross compiling)]),
+         flag_finite_math_only=yes)
+   elif ./conftest$EXEEXT >&AS_MESSAGE_LOG_FD; then
+      flag_finite_math_only=no
+      AC_MSG_RESULT(yes)
+   else
+      flag_finite_math_only=yes
+   fi
+   if test "$flag_finite_math_only" = yes; then
+      AC_MSG_RESULT(no)
+      AC_MSG_WARN([runtime behavior with NaN is not compliant - some functionality might break; consider using '-fno-finite-math-only'])
+   fi],
+   [AC_MSG_RESULT(no)
+   AC_MSG_ERROR([can not find required macros: NAN, isgreater() and isgreaterequal()])])
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for generic library functions.
+# ----------------------------------------------------------------------
+
+AC_SEARCH_LIBS([ceil], [m], [], [AC_MSG_ERROR([can not find required function ceil()])])
+
+if test "$my_htop_platform" = dragonflybsd; then
+   AC_SEARCH_LIBS([kvm_open], [kvm], [], [AC_MSG_ERROR([can not find required function kvm_open()])])
+fi
+
+if test "$my_htop_platform" = freebsd; then
+   if test "$enable_static" = yes; then
+      AC_SEARCH_LIBS([elf_version], [elf], [], [AC_MSG_ERROR([can not find required function elf_version()])])
+   fi
+   AC_SEARCH_LIBS([kvm_open], [kvm], [], [AC_MSG_ERROR([can not find required function kvm_open()])])
+   AC_SEARCH_LIBS([devstat_checkversion], [devstat], [], [AC_MSG_ERROR([can not find required function devstat_checkversion()])])
+fi
+
+if test "$my_htop_platform" = linux; then
+   if test "$enable_static" != yes; then
+      AC_SEARCH_LIBS([dlopen], [dl dld], [], [AC_MSG_ERROR([can not find required function dlopen()])])
+   fi
+fi
+
+if test "$my_htop_platform" = netbsd; then
+   AC_SEARCH_LIBS([kvm_open], [kvm], [], [AC_MSG_ERROR([can not find required function kvm_open()])])
+   AC_SEARCH_LIBS([prop_dictionary_get], [prop], [], [AC_MSG_ERROR([can not find required function prop_dictionary_get()])])
+fi
+
+if test "$my_htop_platform" = openbsd; then
+   AC_SEARCH_LIBS([kvm_open], [kvm], [], [AC_MSG_ERROR([can not find required function kvm_open()])])
+fi
+
+if test "$my_htop_platform" = solaris; then
+   AC_SEARCH_LIBS([kstat_open], [kstat], [], [AC_MSG_ERROR([can not find required function kstat_open()])])
+   AC_SEARCH_LIBS([Pgrab_error], [proc], [], [AC_MSG_ERROR([can not find required function Pgrab_error()])])
+   AC_SEARCH_LIBS([free], [malloc], [], [AC_MSG_ERROR([can not find required function free()])])
+fi
+
+# Optional Section
+
+AC_SEARCH_LIBS([clock_gettime], [rt])
+
+AC_CHECK_FUNCS([ \
+    clock_gettime \
+    dladdr \
+    faccessat \
+    fstatat \
+    host_get_clock_service \
+    memfd_create\
+    openat \
+    readlinkat \
+    sched_getscheduler \
+    sched_setscheduler \
+    strchrnul \
+   ])
+
+if test "$my_htop_platform" = darwin; then
+   AC_CHECK_FUNCS([mach_timebase_info])
+   AC_CHECK_DECLS([IOMainPort], [], [], [[#include <IOKit/IOKitLib.h>]])
+   AC_CHECK_DECLS([IOMasterPort], [], [], [[#include <IOKit/IOKitLib.h>]])
+fi
+
+if test "$my_htop_platform" = pcp; then
+   AC_CHECK_FUNCS([pmLookupDescs])
+fi
+
+if test "$my_htop_platform" = linux && test "x$enable_static" = xyes; then
+   AC_CHECK_LIB([systemd], [sd_bus_open_system])
+fi
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for cross-platform features and flags.
+# ----------------------------------------------------------------------
+
+# HTOP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART)
+m4_define([HTOP_CHECK_SCRIPT],
+[
+   if test ! -z "m4_toupper($HTOP_[$1]_CONFIG_SCRIPT)"; then
+      # to be used to set the path to ncurses*-config when cross-compiling
+      htop_config_script_libs=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --libs 2> /dev/null)
+      htop_config_script_cflags=$(m4_toupper($HTOP_[$1]_CONFIG_SCRIPT) --cflags 2> /dev/null)
+   else
+      htop_config_script_libs=$([$4] --libs 2> /dev/null)
+      htop_config_script_cflags=$([$4] --cflags 2> /dev/null)
+   fi
+   htop_script_success=no
+   htop_save_CFLAGS="$AM_CFLAGS"
+   if test ! "x$htop_config_script_libs" = x; then
+      AM_CFLAGS="$AM_CFLAGS $htop_config_script_cflags"
+      AC_CHECK_LIB([$1], [$2], [
+         AC_DEFINE([$3], 1, [The library is present.])
+         LIBS="$htop_config_script_libs $LIBS "
+         htop_script_success=yes
+      ], [
+         AM_CFLAGS="$htop_save_CFLAGS"
+      ], [
+         $htop_config_script_libs
+      ])
+   fi
+   if test "x$htop_script_success" = xno; then
+      [$5]
+   fi
+])
+
+# HTOP_CHECK_LIB(LIBNAME, FUNCTION, DEFINE, ELSE_PART)
+m4_define([HTOP_CHECK_LIB],
+[
+   AC_CHECK_LIB([$1], [$2], [
+      AC_DEFINE([$3], [1], [The library is present.])
+      LIBS="-l[$1] $LIBS "
+   ], [$4])
+])
+
+AC_ARG_ENABLE([unicode],
+              [AS_HELP_STRING([--enable-unicode],
+                              [enable Unicode support @<:@default=yes@:>@])],
+              [],
+              [enable_unicode=yes])
+if test "x$enable_unicode" = xyes; then
+   HTOP_CHECK_SCRIPT([ncursesw6], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+    HTOP_CHECK_SCRIPT([ncursesw], [waddwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
+     HTOP_CHECK_SCRIPT([ncursesw], [wadd_wch], [HAVE_LIBNCURSESW], "ncursesw5-config",
+      HTOP_CHECK_SCRIPT([ncurses], [wadd_wch], [HAVE_LIBNCURSESW], "ncurses5-config",
+       HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
+        HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
+         HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
+          AC_MSG_ERROR([can not find required library libncursesw; you may want to use --disable-unicode])
+   )))))))
+
+   AC_CHECK_HEADERS([ncursesw/curses.h], [],
+      [AC_CHECK_HEADERS([ncurses/ncurses.h], [],
+         [AC_CHECK_HEADERS([ncurses/curses.h], [],
+            [AC_CHECK_HEADERS([ncurses.h], [],
+               [AC_MSG_ERROR([can not find required ncurses header file])])])])])
+
+   AC_CHECK_HEADERS([ncursesw/term.h], [],
+      [AC_CHECK_HEADERS([ncurses/term.h], [],
+         [AC_CHECK_HEADERS([term.h], [],
+            [AC_MSG_ERROR([can not find required term header file])])])])
+
+   # check if additional linker flags are needed for keypad(3)
+   # (at this point we already link against a working ncurses library with wide character support)
+   AC_SEARCH_LIBS([keypad], [tinfow tinfo])
+else
+   HTOP_CHECK_SCRIPT([ncurses6], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses6-config],
+    HTOP_CHECK_SCRIPT([ncurses], [wnoutrefresh], [HAVE_LIBNCURSES], [ncurses5-config],
+     HTOP_CHECK_LIB([ncurses6],  [doupdate], [HAVE_LIBNCURSES],
+      HTOP_CHECK_LIB([ncurses],  [doupdate], [HAVE_LIBNCURSES],
+       HTOP_CHECK_LIB([curses],  [doupdate], [HAVE_LIBNCURSES],
+        AC_MSG_ERROR([can not find required curses/ncurses library])
+   )))))
+
+   AC_CHECK_HEADERS([curses.h], [],
+      [AC_CHECK_HEADERS([ncurses/curses.h], [],
+         [AC_CHECK_HEADERS([ncurses/ncurses.h], [],
+            [AC_CHECK_HEADERS([ncurses.h], [],
+               [AC_MSG_ERROR([can not find required ncurses header file])])])])])
+
+   AC_CHECK_HEADERS([ncurses/term.h], [],
+      [AC_CHECK_HEADERS([term.h], [],
+         [AC_MSG_ERROR([can not find required term header file])])])
+
+   # check if additional linker flags are needed for keypad(3)
+   # (at this point we already link against a working ncurses library)
+   AC_SEARCH_LIBS([keypad], [tinfo])
+fi
+
+if test "$enable_static" = yes; then
+   AC_SEARCH_LIBS([Gpm_GetEvent], [gpm])
+fi
+if test "$my_htop_platform" = "solaris"; then
+   # On OmniOS /usr/include/sys/regset.h redefines ERR to 13 - \r, breaking the Enter key.
+   # Since ncurses macros use the ERR macro, we can not use another name.
+   AC_DEFINE([ERR], [(-1)], [Predefine ncurses macro.])
+fi
+AC_CHECK_FUNCS( [set_escdelay] )
+AC_CHECK_FUNCS( [getmouse] )
+
+
+AC_ARG_ENABLE([affinity],
+              [AS_HELP_STRING([--enable-affinity],
+                              [enable sched_setaffinity and sched_getaffinity for affinity support, conflicts with hwloc @<:@default=check@:>@])],
+              [],
+              [enable_affinity=check])
+if test "x$enable_affinity" = xcheck; then
+   if test "x$enable_hwloc" = xyes; then
+      enable_affinity=no
+   else
+      AC_MSG_CHECKING([for usable sched_setaffinity])
+      AC_RUN_IFELSE([
+         AC_LANG_PROGRAM([[
+            #include <sched.h>
+            #include <errno.h>
+            static cpu_set_t cpuset;
+         ]], [[
+            CPU_ZERO(&cpuset);
+            sched_setaffinity(0, sizeof(cpu_set_t), &cpuset);
+            if (errno == ENOSYS) return 1;
+         ]])],
+      [enable_affinity=yes
+         AC_MSG_RESULT([yes])],
+      [enable_affinity=no
+         AC_MSG_RESULT([no])],
+      [AC_MSG_RESULT([assume yes (cross compiling)])])
+   fi
+fi
+if test "x$enable_affinity" = xyes; then
+   if test "x$enable_hwloc" = xyes; then
+      AC_MSG_ERROR([--enable-hwloc and --enable-affinity are mutual exclusive. Specify at most one of them.])
+   fi
+   AC_DEFINE([HAVE_AFFINITY], [1], [Define if sched_setaffinity and sched_getaffinity are to be used.])
+fi
+
+
+AC_ARG_ENABLE([unwind],
+              [AS_HELP_STRING([--enable-unwind],
+              [enable unwind support for printing backtraces; requires libunwind @<:@default=check@:>@])],
+              [],
+              [enable_unwind=check])
+case "$enable_unwind" in
+   check)
+      enable_unwind=yes
+      if test "$enable_static" = yes; then
+         AC_CHECK_LIB([lzma], [lzma_index_buffer_decode])
+      fi
+      AC_CHECK_LIB([unwind], [backtrace], [], [enable_unwind=no])
+      AC_CHECK_HEADERS([libunwind.h], [], [
+         old_CFLAGS="$CFLAGS"
+         CFLAGS="$CFLAGS -I/usr/include/libunwind"
+         AC_CHECK_HEADERS([libunwind/libunwind.h], [], [
+            enable_unwind=no
+            CFLAGS="$old_CFLAGS"
+         ])
+      ])
+      ;;
+   no)
+      ;;
+   yes)
+      AC_CHECK_LIB([unwind], [backtrace], [], [AC_MSG_ERROR([can not find required library libunwind])])
+      AC_CHECK_HEADERS([libunwind.h], [], [
+         AM_CFLAGS="$AM_CFLAGS -I/usr/include/libunwind"
+         AC_CHECK_HEADERS([libunwind/libunwind.h], [], [AC_MSG_ERROR([can not find required header file libunwind.h])])
+      ])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_unwind' for --enable-unwind])
+      ;;
+esac
+if test "x$enable_unwind" = xno; then
+   # Fall back to backtrace(3) and add -lexecinfo if needed
+   AC_SEARCH_LIBS([backtrace], [execinfo])
+fi
+
+
+AC_ARG_ENABLE([hwloc],
+              [AS_HELP_STRING([--enable-hwloc],
+              [enable hwloc support for CPU affinity; disables affinity support; requires libhwloc @<:@default=no@:>@])],
+              [],
+              [enable_hwloc=no])
+case "$enable_hwloc" in
+   no)
+      ;;
+   yes)
+      m4_ifdef([PKG_PROG_PKG_CONFIG], [
+         PKG_PROG_PKG_CONFIG()
+         PKG_CHECK_MODULES(HWLOC, hwloc, [
+               AM_CFLAGS="$AM_CFLAGS $HWLOC_CFLAGS"
+               LIBS="$LIBS $HWLOC_LIBS"
+               AC_DEFINE([HAVE_LIBHWLOC], [1], [Define to 1 if you have the 'hwloc' library (-lhwloc).])
+            ], [
+               AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])])
+               AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])])
+            ])
+         ], [
+            AC_CHECK_LIB([hwloc], [hwloc_get_proc_cpubind], [], [AC_MSG_ERROR([can not find required library libhwloc])])
+            AC_CHECK_HEADERS([hwloc.h], [], [AC_MSG_ERROR([can not find require header file hwloc.h])])
+         ])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_hwloc' for --enable-hwloc])
+      ;;
+esac
+
+
+AC_ARG_WITH([os-release],
+            [AS_HELP_STRING([--with-os-release=FILE],
+                            [location of an os-release file @<:@default=/etc/os-release@:>@])],
+            [],
+            [with_os_release=/etc/os-release])
+if test -n "$with_os_release" && test ! -f "$with_os_release"; then
+   if test -f "/usr/lib/os-release"; then
+      with_os_release="/usr/lib/os-release"
+   fi
+fi
+AC_DEFINE_UNQUOTED([OSRELEASEFILE], ["$with_os_release"], [File with OS release details.])
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for Linux features and flags.
+# ----------------------------------------------------------------------
+
+AC_ARG_WITH([proc],
+            [AS_HELP_STRING([--with-proc=DIR],
+                            [location of a Linux-compatible proc filesystem @<:@default=/proc@:>@])],
+            [],
+            [with_proc=/proc])
+if test -z "$with_proc"; then
+   AC_MSG_ERROR([bad empty value for --with-proc option])
+fi
+AC_DEFINE_UNQUOTED([PROCDIR], ["$with_proc"], [Path of proc filesystem.])
+
+
+AC_ARG_ENABLE([openvz],
+              [AS_HELP_STRING([--enable-openvz],
+                              [enable OpenVZ support @<:@default=no@:>@])],
+              [],
+              [enable_openvz=no])
+if test "x$enable_openvz" = xyes; then
+   AC_DEFINE([HAVE_OPENVZ], [1], [Define if openvz support enabled.])
+fi
+
+
+AC_ARG_ENABLE([vserver],
+              [AS_HELP_STRING([--enable-vserver],
+                              [enable VServer support @<:@default=no@:>@])],
+              [],
+              [enable_vserver=no])
+if test "x$enable_vserver" = xyes; then
+   AC_DEFINE([HAVE_VSERVER], [1], [Define if VServer support enabled.])
+fi
+
+
+AC_ARG_ENABLE([ancient_vserver],
+              [AS_HELP_STRING([--enable-ancient-vserver],
+                              [enable ancient VServer support (implies --enable-vserver) @<:@default=no@:>@])],
+              [],
+              [enable_ancient_vserver=no])
+if test "x$enable_ancient_vserver" = xyes; then
+   if test "x$enable_vserver" != xyes; then
+      enable_vserver=implied
+   fi
+   AC_DEFINE([HAVE_VSERVER], [1], [Define if VServer support enabled.])
+   AC_DEFINE([HAVE_ANCIENT_VSERVER], [1], [Define if ancient vserver support enabled.])
+fi
+
+
+AC_ARG_ENABLE([capabilities],
+              [AS_HELP_STRING([--enable-capabilities],
+                              [enable Linux capabilities support; requires libcap @<:@default=check@:>@])],
+              [],
+              [enable_capabilities=check])
+case "$enable_capabilities" in
+   no)
+      ;;
+   check)
+      enable_capabilities=yes
+      AC_CHECK_LIB([cap], [cap_init], [], [enable_capabilities=no])
+      AC_CHECK_HEADERS([sys/capability.h], [], [enable_capabilities=no])
+      ;;
+   yes)
+      AC_CHECK_LIB([cap], [cap_init], [], [AC_MSG_ERROR([can not find required library libcap])])
+      AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([can not find required header file sys/capability.h])])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_capabilities' for --enable-capabilities])
+      ;;
+esac
+
+
+AC_ARG_ENABLE([delayacct],
+              [AS_HELP_STRING([--enable-delayacct],
+                              [enable Linux delay accounting support; requires pkg-config, libnl-3 and libnl-genl-3 @<:@default=check@:>@])],
+              [],
+              [enable_delayacct=check])
+case "$enable_delayacct" in
+   no)
+      ;;
+   check)
+      if test "$my_htop_platform" != linux; then
+         enable_delayacct=no
+      elif test "$enable_static" = yes; then
+         enable_delayacct=no
+      else
+         m4_ifdef([PKG_PROG_PKG_CONFIG], [
+            enable_delayacct=yes
+            PKG_PROG_PKG_CONFIG()
+            PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [enable_delayacct=no])
+            PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [enable_delayacct=no])
+            if test "$enable_delayacct" = yes; then
+               AM_CFLAGS="$AM_CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
+               LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
+               AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.])
+            fi
+         ], [
+            enable_delayacct=no
+            AC_MSG_NOTICE([Linux delay accounting support can not be enabled, cause pkg-config is required for checking its availability])
+         ])
+      fi
+      ;;
+   yes)
+      m4_ifdef([PKG_PROG_PKG_CONFIG], [
+         PKG_PROG_PKG_CONFIG()
+         PKG_CHECK_MODULES(LIBNL3, libnl-3.0, [], [AC_MSG_ERROR([can not find required library libnl3])])
+         PKG_CHECK_MODULES(LIBNL3GENL, libnl-genl-3.0, [], [AC_MSG_ERROR([can not find required library libnl3genl])])
+         AM_CFLAGS="$AM_CFLAGS $LIBNL3_CFLAGS $LIBNL3GENL_CFLAGS"
+         LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
+         AC_DEFINE([HAVE_DELAYACCT], [1], [Define if delay accounting support should be enabled.])
+      ], [
+         pkg_m4_absent=1
+         m4_warning([configure is generated without pkg.m4. 'make dist' target will be disabled.])
+         AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.])
+      ])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_delayacct' for --enable-delayacct])
+      ;;
+esac
+
+
+AC_ARG_ENABLE([sensors],
+              [AS_HELP_STRING([--enable-sensors],
+                              [enable libsensors support for reading temperature data; requires only libsensors headers at compile time, at runtime libsensors is loaded via dlopen @<:@default=check@:>@])],
+              [],
+              [enable_sensors=check])
+case "$enable_sensors" in
+   no)
+      ;;
+   check)
+      enable_sensors=yes
+      if test "$enable_static" = yes; then
+         AC_CHECK_LIB([sensors], [sensors_init], [], [enable_sensors=no])
+      fi
+      AC_CHECK_HEADERS([sensors/sensors.h], [], [enable_sensors=no])
+      ;;
+   yes)
+      if test "$enable_static" = yes; then
+         AC_CHECK_LIB([sensors], [sensors_init], [], [AC_MSG_ERROR([can not find required library libsensors])])
+      fi
+      AC_CHECK_HEADERS([sensors/sensors.h], [], [AC_MSG_ERROR([can not find required header file sensors/sensors.h])])
+      ;;
+   *)
+      AC_MSG_ERROR([bad value '$enable_sensors' for --enable-sensors])
+      ;;
+esac
+if test "$enable_sensors" = yes || test "$my_htop_platform" = freebsd; then
+   AC_DEFINE([BUILD_WITH_CPU_TEMP], [1], [Define if CPU temperature option should be enabled.])
+fi
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# Checks for compiler warnings.
+# ----------------------------------------------------------------------
+
+AM_CFLAGS="$AM_CFLAGS\
+ -Wall\
+ -Wcast-align\
+ -Wcast-qual\
+ -Wextra\
+ -Wfloat-equal\
+ -Wformat=2\
+ -Winit-self\
+ -Wmissing-format-attribute\
+ -Wmissing-noreturn\
+ -Wmissing-prototypes\
+ -Wpointer-arith\
+ -Wshadow\
+ -Wstrict-prototypes\
+ -Wundef\
+ -Wunused\
+ -Wwrite-strings"
+
+dnl https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+   ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+   _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+   AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+      [AS_VAR_SET(CACHEVAR,[yes])],
+      [AS_VAR_SET(CACHEVAR,[no])])
+   _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+   [m4_default([$2], :)],
+   [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
+
+AX_CHECK_COMPILE_FLAG([-Wextra-semi-stmt],         [AM_CFLAGS="$AM_CFLAGS -Wextra-semi-stmt"],         , [-Werror=unknown-warning-option]) dnl the autoconf check itself generates -Wextra-semi-stmt
+AX_CHECK_COMPILE_FLAG([-Wimplicit-int-conversion], [AM_CFLAGS="$AM_CFLAGS -Wimplicit-int-conversion"], , [-Werror])
+AX_CHECK_COMPILE_FLAG([-Wnull-dereference],        [AM_CFLAGS="$AM_CFLAGS -Wnull-dereference"],        , [-Werror])
+
+AC_ARG_ENABLE([werror],
+              [AS_HELP_STRING([--enable-werror],
+                              [Treat warnings as errors @<:@default=no@:>@])],
+              [],
+              [enable_werror=no])
+if test "x$enable_werror" = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
+fi
+
+AC_ARG_ENABLE([debug],
+              [AS_HELP_STRING([--enable-debug],
+                              [Enable compiling with maximum debug info, asserts and internal sanity checks @<:@default=no@:>@])],
+              [],
+              [enable_debug=no])
+if test "x$enable_debug" != xyes; then
+   AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG"
+
+   AC_COMPILE_IFELSE([
+      AC_LANG_SOURCE([[
+#ifdef __SUPPORT_SNAN__
+#error "signaling NaN support not recommended"
+#endif
+      ]])],
+      :,
+      [warning_msg="signaling NaN support is enabled; not recommended for htop"
+      case "$CC" in
+      *gcc*)
+         warning_msg="$warning_msg (use '-fno-signaling-nans' compiler flag to disable)"
+         ;;
+      esac
+      AC_MSG_WARN([$warning_msg])
+      ])
+else
+   AM_CPPFLAGS="$AM_CPPFLAGS -ggdb3"
+fi
+
+
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CPPFLAGS])
+
+# ----------------------------------------------------------------------
+
+
+# ----------------------------------------------------------------------
+# We're done, let's go!
+# ----------------------------------------------------------------------
+
+AC_DEFINE_UNQUOTED([COPYRIGHT], ["(C) 2004-2019 Hisham Muhammad. (C) 2020-2024 htop dev team."], [Copyright message.])
+
+AM_CONDITIONAL([HTOP_LINUX], [test "$my_htop_platform" = linux])
+AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])
+AM_CONDITIONAL([HTOP_DRAGONFLYBSD], [test "$my_htop_platform" = dragonflybsd])
+AM_CONDITIONAL([HTOP_NETBSD], [test "$my_htop_platform" = netbsd])
+AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd])
+AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin])
+AM_CONDITIONAL([HTOP_SOLARIS], [test "$my_htop_platform" = solaris])
+AM_CONDITIONAL([HTOP_PCP], [test "$my_htop_platform" = pcp])
+AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
+
+AC_SUBST(my_htop_platform)
+AC_CONFIG_FILES([Makefile htop.1])
+AC_OUTPUT
+
+if test "$my_htop_platform" = unsupported; then
+   echo ""
+   echo "****************************************************************"
+   echo "WARNING! This platform is not currently supported by htop."
+   echo ""
+   echo "The code will build, but it will produce a dummy version of htop"
+   echo "which shows no processes, using the files from the unsupported/"
+   echo "directory. This is meant to be a skeleton, to be used as a"
+   echo "starting point if you are porting htop to a new platform."
+   echo "****************************************************************"
+   echo ""
+fi
+
+AC_MSG_RESULT([
+  ${PACKAGE_NAME} ${VERSION}
+
+  platform:                  $my_htop_platform
+  os-release file:           $with_os_release
+  (Linux) proc directory:    $with_proc
+  (Linux) openvz:            $enable_openvz
+  (Linux) vserver:           $enable_vserver
+  (Linux) ancient vserver:   $enable_ancient_vserver
+  (Linux) delay accounting:  $enable_delayacct
+  (Linux) sensors:           $enable_sensors
+  (Linux) capabilities:      $enable_capabilities
+  unicode:                   $enable_unicode
+  affinity:                  $enable_affinity
+  unwind:                    $enable_unwind
+  hwloc:                     $enable_hwloc
+  debug:                     $enable_debug
+  static:                    $enable_static
+])
diff --git a/darwin/DarwinMachine.c b/darwin/DarwinMachine.c
new file mode 100644
index 0000000..582d496
--- /dev/null
+++ b/darwin/DarwinMachine.c
@@ -0,0 +1,119 @@
+/*
+htop - DarwinMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "darwin/DarwinMachine.h"
+
+#include <errno.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <sys/sysctl.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "darwin/Platform.h"
+#include "darwin/PlatformHelpers.h"
+#include "generic/openzfs_sysctl.h"
+#include "zfs/ZfsArcStats.h"
+
+
+static void DarwinMachine_getHostInfo(host_basic_info_data_t* p) {
+   mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT;
+
+   if (0 != host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)p, &info_size)) {
+      CRT_fatalError("Unable to retrieve host info");
+   }
+}
+
+static void DarwinMachine_freeCPULoadInfo(processor_cpu_load_info_t* p) {
+   if (!p)
+      return;
+
+   if (!*p)
+      return;
+
+   if (0 != munmap(*p, vm_page_size)) {
+      CRT_fatalError("Unable to free old CPU load information");
+   }
+
+   *p = NULL;
+}
+
+static unsigned DarwinMachine_allocateCPULoadInfo(processor_cpu_load_info_t* p) {
+   mach_msg_type_number_t info_size = sizeof(processor_cpu_load_info_t);
+   unsigned cpu_count;
+
+   // TODO Improving the accuracy of the load counts would help a lot.
+   if (0 != host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &cpu_count, (processor_info_array_t*)p, &info_size)) {
+      CRT_fatalError("Unable to retrieve CPU info");
+   }
+
+   return cpu_count;
+}
+
+static void DarwinMachine_getVMStats(vm_statistics_t p) {
+   mach_msg_type_number_t info_size = HOST_VM_INFO_COUNT;
+
+   if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)p, &info_size) != 0) {
+      CRT_fatalError("Unable to retrieve VM statistics");
+   }
+}
+
+void Machine_scan(Machine* super) {
+   DarwinMachine* host = (DarwinMachine*) super;
+
+   /* Update the global data (CPU times and VM stats) */
+   DarwinMachine_freeCPULoadInfo(&host->prev_load);
+   host->prev_load = host->curr_load;
+   DarwinMachine_allocateCPULoadInfo(&host->curr_load);
+   DarwinMachine_getVMStats(&host->vm_stats);
+   openzfs_sysctl_updateArcStats(&host->zfs);
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   DarwinMachine* this = xCalloc(1, sizeof(DarwinMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   /* Initialize the CPU information */
+   super->activeCPUs = DarwinMachine_allocateCPULoadInfo(&this->prev_load);
+   super->existingCPUs = super->activeCPUs;
+   DarwinMachine_getHostInfo(&this->host_info);
+   DarwinMachine_allocateCPULoadInfo(&this->curr_load);
+
+   /* Initialize the VM statistics */
+   DarwinMachine_getVMStats(&this->vm_stats);
+
+   /* Initialize the ZFS kstats, if zfs.kext loaded */
+   openzfs_sysctl_init(&this->zfs);
+   openzfs_sysctl_updateArcStats(&this->zfs);
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   DarwinMachine* this = (DarwinMachine*) super;
+
+   DarwinMachine_freeCPULoadInfo(&this->prev_load);
+
+   Machine_done(super);
+   free(this);
+}
+
+bool Machine_isCPUonline(const Machine* host, unsigned int id) {
+   assert(id < host->existingCPUs);
+
+   // TODO: support offline CPUs and hot swapping
+   (void) host; (void) id;
+
+   return true;
+}
diff --git a/darwin/DarwinMachine.h b/darwin/DarwinMachine.h
new file mode 100644
index 0000000..3135b58
--- /dev/null
+++ b/darwin/DarwinMachine.h
@@ -0,0 +1,28 @@
+#ifndef HEADER_DarwinMachine
+#define HEADER_DarwinMachine
+/*
+htop - DarwinMachine.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <mach/mach_host.h>
+#include <sys/sysctl.h>
+
+#include "Machine.h"
+#include "zfs/ZfsArcStats.h"
+
+
+typedef struct DarwinMachine_ {
+   Machine super;
+
+   host_basic_info_data_t host_info;
+   vm_statistics_data_t vm_stats;
+   processor_cpu_load_info_t prev_load;
+   processor_cpu_load_info_t curr_load;
+
+   ZfsArcStats zfs;
+} DarwinMachine;
+
+#endif
diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
new file mode 100644
index 0000000..1e315eb
--- /dev/null
+++ b/darwin/DarwinProcess.c
@@ -0,0 +1,492 @@
+/*
+htop - DarwinProcess.c
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "darwin/DarwinProcess.h"
+
+#include <libproc.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <mach/mach.h>
+#include <sys/dirent.h>
+
+#include "CRT.h"
+#include "Process.h"
+#include "darwin/DarwinMachine.h"
+#include "darwin/Platform.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = PROCESS_FLAG_TTY, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   [MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process from /proc/[pid]/exe", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+   [TRANSLATED] = { .name = "TRANSLATED", .title = "T ", .description = "Translation info (T translated, N native)", .flags = 0, },
+};
+
+Process* DarwinProcess_new(const Machine* host) {
+   DarwinProcess* this = xCalloc(1, sizeof(DarwinProcess));
+   Object_setClass(this, Class(DarwinProcess));
+   Process_init(&this->super, host);
+
+   this->utime = 0;
+   this->stime = 0;
+   this->taskAccess = true;
+   this->translated = false;
+
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   DarwinProcess* this = (DarwinProcess*) cast;
+   Process_done(&this->super);
+   // free platform-specific fields here
+   free(this);
+}
+
+static void DarwinProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const DarwinProcess* dp = (const DarwinProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add Platform-specific fields here
+   case TRANSLATED: xSnprintf(buffer, n, "%c ", dp->translated ? 'T' : 'N'); break;
+   default:
+      Process_writeField(&dp->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int DarwinProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const DarwinProcess* p1 = (const DarwinProcess*)v1;
+   const DarwinProcess* p2 = (const DarwinProcess*)v2;
+
+   switch (key) {
+   // add Platform-specific fields here
+   case TRANSLATED:
+      return SPACESHIP_NUMBER(p1->translated, p2->translated);
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+static void DarwinProcess_updateExe(pid_t pid, Process* proc) {
+   char path[PROC_PIDPATHINFO_MAXSIZE];
+
+   int r = proc_pidpath(pid, path, sizeof(path));
+   if (r <= 0)
+      return;
+
+   Process_updateExe(proc, path);
+}
+
+static void DarwinProcess_updateCwd(pid_t pid, Process* proc) {
+   struct proc_vnodepathinfo vpi;
+
+   int r = proc_pidinfo(pid, PROC_PIDVNODEPATHINFO, 0, &vpi, sizeof(vpi));
+   if (r <= 0) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   if (!vpi.pvi_cdir.vip_path[0]) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   free_and_xStrdup(&proc->procCwd, vpi.pvi_cdir.vip_path);
+}
+
+static void DarwinProcess_updateCmdLine(const struct kinfo_proc* k, Process* proc) {
+   Process_updateComm(proc, k->kp_proc.p_comm);
+
+   /* This function is from the old Mac version of htop. Originally from ps? */
+   int mib[3], argmax, nargs, c = 0;
+   size_t size;
+   char *procargs, *sp, *np, *cp;
+
+   /* Get the maximum process arguments size. */
+   mib[0] = CTL_KERN;
+   mib[1] = KERN_ARGMAX;
+
+   size = sizeof( argmax );
+   if ( sysctl( mib, 2, &argmax, &size, NULL, 0 ) == -1 ) {
+      goto ERROR_A;
+   }
+
+   /* Allocate space for the arguments. */
+   procargs = (char*)malloc(argmax);
+   if ( procargs == NULL ) {
+      goto ERROR_A;
+   }
+
+   /*
+    * Make a sysctl() call to get the raw argument space of the process.
+    * The layout is documented in start.s, which is part of the Csu
+    * project.  In summary, it looks like:
+    *
+    * /---------------\ 0x00000000
+    * :               :
+    * :               :
+    * |---------------|
+    * | argc          |
+    * |---------------|
+    * | arg[0]        |
+    * |---------------|
+    * :               :
+    * :               :
+    * |---------------|
+    * | arg[argc - 1] |
+    * |---------------|
+    * | 0             |
+    * |---------------|
+    * | env[0]        |
+    * |---------------|
+    * :               :
+    * :               :
+    * |---------------|
+    * | env[n]        |
+    * |---------------|
+    * | 0             |
+    * |---------------| <-- Beginning of data returned by sysctl() is here.
+    * | argc          |
+    * |---------------|
+    * | exec_path     |
+    * |:::::::::::::::|
+    * |               |
+    * | String area.  |
+    * |               |
+    * |---------------| <-- Top of stack.
+    * :               :
+    * :               :
+    * \---------------/ 0xffffffff
+    */
+   mib[0] = CTL_KERN;
+   mib[1] = KERN_PROCARGS2;
+   mib[2] = k->kp_proc.p_pid;
+
+   size = ( size_t ) argmax;
+   if ( sysctl( mib, 3, procargs, &size, NULL, 0 ) == -1 ) {
+      goto ERROR_B;
+   }
+
+   memcpy( &nargs, procargs, sizeof( nargs ) );
+   cp = procargs + sizeof( nargs );
+
+   /* Skip the saved exec_path. */
+   for ( ; cp < &procargs[size]; cp++ ) {
+      if ( *cp == '\0' ) {
+         /* End of exec_path reached. */
+         break;
+      }
+   }
+   if ( cp == &procargs[size] ) {
+      goto ERROR_B;
+   }
+
+   /* Skip trailing '\0' characters. */
+   for ( ; cp < &procargs[size]; cp++ ) {
+      if ( *cp != '\0' ) {
+         /* Beginning of first argument reached. */
+         break;
+      }
+   }
+   if ( cp == &procargs[size] ) {
+      goto ERROR_B;
+   }
+   /* Save where the argv[0] string starts. */
+   sp = cp;
+
+   int end = 0;
+   for ( np = NULL; c < nargs && cp < &procargs[size]; cp++ ) {
+      if ( *cp == '\0' ) {
+         c++;
+         if ( np != NULL ) {
+            /* Convert previous '\0'. */
+            *np = ' ';
+         }
+         /* Note location of current '\0'. */
+         np = cp;
+         if (end == 0) {
+            end = cp - sp;
+         }
+      }
+   }
+
+   /*
+    * sp points to the beginning of the arguments/environment string, and
+    * np should point to the '\0' terminator for the string.
+    */
+   if ( np == NULL || np == sp ) {
+      /* Empty or unterminated string. */
+      goto ERROR_B;
+   }
+   if (end == 0) {
+      end = np - sp;
+   }
+
+   Process_updateCmdline(proc, sp, 0, end);
+
+   /* Clean up. */
+   free( procargs );
+
+   return;
+
+ERROR_B:
+   free( procargs );
+
+ERROR_A:
+   Process_updateCmdline(proc, k->kp_proc.p_comm, 0, strlen(k->kp_proc.p_comm));
+}
+
+// Converts nanoseconds to hundredths of a second (centiseconds) as needed by the "time" field of the Process struct.
+static long long int nanosecondsToCentiseconds(uint64_t nanoseconds) {
+   const uint64_t centiseconds_per_second = 100;
+   const uint64_t nanoseconds_per_second = 1e9;
+   return nanoseconds / nanoseconds_per_second * centiseconds_per_second;
+}
+
+static char* DarwinProcess_getDevname(dev_t dev) {
+   if (dev == NODEV) {
+      return NULL;
+   }
+   char buf[sizeof("/dev/") + MAXNAMLEN];
+   char* name = devname_r(dev, S_IFCHR, buf, MAXNAMLEN);
+   if (name) {
+      return xStrdup(name);
+   }
+   return NULL;
+}
+
+void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, bool exists) {
+   DarwinProcess* dp = (DarwinProcess*)proc;
+   const Settings* settings = proc->super.host->settings;
+
+   const struct extern_proc* ep = &ps->kp_proc;
+
+   /* UNSET HERE :
+    *
+    * processor
+    * user (set at ProcessTable level)
+    * nlwp
+    * percent_cpu
+    * percent_mem
+    * m_virt
+    * m_resident
+    * minflt
+    * majflt
+    */
+
+   /* First, the "immutable" parts */
+   if (!exists) {
+      /* Set the PID/PGID/etc. */
+      Process_setPid(proc, ep->p_pid);
+      Process_setThreadGroup(proc, ep->p_pid);
+      Process_setParent(proc, ps->kp_eproc.e_ppid);
+      proc->pgrp = ps->kp_eproc.e_pgid;
+      proc->session = 0; /* TODO Get the session id */
+      proc->tpgid = ps->kp_eproc.e_tpgid;
+      proc->isKernelThread = false;
+      proc->isUserlandThread = false;
+      dp->translated = ps->kp_proc.p_flag & P_TRANSLATED;
+      proc->tty_nr = ps->kp_eproc.e_tdev;
+      proc->tty_name = NULL;
+
+      proc->starttime_ctime = ep->p_starttime.tv_sec;
+      Process_fillStarttimeBuffer(proc);
+
+      DarwinProcess_updateExe(ep->p_pid, proc);
+      DarwinProcess_updateCmdLine(ps, proc);
+
+      if (settings->ss->flags & PROCESS_FLAG_CWD) {
+         DarwinProcess_updateCwd(ep->p_pid, proc);
+      }
+   }
+
+   if (proc->tty_name == NULL && (dev_t)proc->tty_nr != NODEV) {
+      /* The call to devname() is extremely expensive (due to lstat)
+       * and represents ~95% of htop's CPU usage when there is high
+       * process turnover.
+       *
+       * To mitigate this we only fetch TTY information if the TTY
+       * field is enabled in the settings.
+       */
+      if (settings->ss->flags & PROCESS_FLAG_TTY) {
+         proc->tty_name = DarwinProcess_getDevname(proc->tty_nr);
+         if (!proc->tty_name) {
+            /* devname failed: prevent us from calling it again */
+            proc->tty_nr = NODEV;
+         }
+      }
+   }
+
+   /* Mutable information */
+   proc->nice = ep->p_nice;
+   proc->priority = ep->p_priority;
+
+   proc->state = (ep->p_stat == SZOMB) ? ZOMBIE : UNKNOWN;
+
+   /* Make sure the updated flag is set */
+   proc->super.updated = true;
+}
+
+void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessTable* dpt, double timeIntervalNS) {
+   struct proc_taskinfo pti;
+
+   if (sizeof(pti) == proc_pidinfo(Process_getPid(&proc->super), PROC_PIDTASKINFO, 0, &pti, sizeof(pti))) {
+      const DarwinMachine* dhost = (const DarwinMachine*) proc->super.super.host;
+
+      uint64_t total_existing_time_ns = proc->stime + proc->utime;
+
+      uint64_t user_time_ns = Platform_machTicksToNanoseconds(pti.pti_total_user);
+      uint64_t system_time_ns = Platform_machTicksToNanoseconds(pti.pti_total_system);
+
+      uint64_t total_current_time_ns = user_time_ns + system_time_ns;
+
+      if (total_existing_time_ns && 1E-6 < timeIntervalNS) {
+         uint64_t total_time_diff_ns = total_current_time_ns - total_existing_time_ns;
+         proc->super.percent_cpu = ((double)total_time_diff_ns / timeIntervalNS) * 100.0;
+      } else {
+         proc->super.percent_cpu = 0.0;
+      }
+      Process_updateCPUFieldWidths(proc->super.percent_cpu);
+
+      proc->super.time = nanosecondsToCentiseconds(total_current_time_ns);
+      proc->super.nlwp = pti.pti_threadnum;
+      proc->super.m_virt = pti.pti_virtual_size / ONE_K;
+      proc->super.m_resident = pti.pti_resident_size / ONE_K;
+      proc->super.majflt = pti.pti_faults;
+      proc->super.percent_mem = (double)pti.pti_resident_size * 100.0
+                              / (double)dhost->host_info.max_mem;
+
+      proc->stime = system_time_ns;
+      proc->utime = user_time_ns;
+
+      dpt->super.kernelThreads += 0; /*pti.pti_threads_system;*/
+      dpt->super.userlandThreads += pti.pti_threadnum; /*pti.pti_threads_user;*/
+      dpt->super.totalTasks += pti.pti_threadnum;
+      dpt->super.runningTasks += pti.pti_numrunning;
+   }
+}
+
+/*
+ * Scan threads for process state information.
+ * Based on: http://stackoverflow.com/questions/6788274/ios-mac-cpu-usage-for-thread
+ * and       https://github.com/max-horvath/htop-osx/blob/e86692e869e30b0bc7264b3675d2a4014866ef46/ProcessList.c
+ */
+void DarwinProcess_scanThreads(DarwinProcess* dp) {
+   Process* proc = (Process*) dp;
+   kern_return_t ret;
+
+   if (!dp->taskAccess) {
+      return;
+   }
+
+   if (proc->state == ZOMBIE) {
+      return;
+   }
+
+   task_t port;
+   ret = task_for_pid(mach_task_self(), Process_getPid(proc), &port);
+   if (ret != KERN_SUCCESS) {
+      dp->taskAccess = false;
+      return;
+   }
+
+   task_info_data_t tinfo;
+   mach_msg_type_number_t task_info_count = TASK_INFO_MAX;
+   ret = task_info(port, TASK_BASIC_INFO, (task_info_t) tinfo, &task_info_count);
+   if (ret != KERN_SUCCESS) {
+      dp->taskAccess = false;
+      return;
+   }
+
+   thread_array_t thread_list;
+   mach_msg_type_number_t thread_count;
+   ret = task_threads(port, &thread_list, &thread_count);
+   if (ret != KERN_SUCCESS) {
+      dp->taskAccess = false;
+      mach_port_deallocate(mach_task_self(), port);
+      return;
+   }
+
+   integer_t run_state = 999;
+   for (unsigned int i = 0; i < thread_count; i++) {
+      thread_info_data_t thinfo;
+      mach_msg_type_number_t thread_info_count = THREAD_BASIC_INFO_COUNT;
+      ret = thread_info(thread_list[i], THREAD_BASIC_INFO, (thread_info_t)thinfo, &thread_info_count);
+      if (ret == KERN_SUCCESS) {
+         thread_basic_info_t basic_info_th = (thread_basic_info_t) thinfo;
+         if (basic_info_th->run_state < run_state) {
+            run_state = basic_info_th->run_state;
+         }
+         mach_port_deallocate(mach_task_self(), thread_list[i]);
+      }
+   }
+   vm_deallocate(mach_task_self(), (vm_address_t) thread_list, sizeof(thread_port_array_t) * thread_count);
+   mach_port_deallocate(mach_task_self(), port);
+
+   /* Taken from: https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/osfmk/mach/thread_info.h#L129 */
+   switch (run_state) {
+      case TH_STATE_RUNNING: proc->state = RUNNING; break;
+      case TH_STATE_STOPPED: proc->state = STOPPED; break;
+      case TH_STATE_WAITING: proc->state = WAITING; break;
+      case TH_STATE_UNINTERRUPTIBLE: proc->state = UNINTERRUPTIBLE_WAIT; break;
+      case TH_STATE_HALTED: proc->state = BLOCKED; break;
+      default: proc->state = UNKNOWN;
+   }
+}
+
+
+const ProcessClass DarwinProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = DarwinProcess_rowWriteField
+   },
+   .compareByKey = DarwinProcess_compareByKey
+};
diff --git a/darwin/DarwinProcess.h b/darwin/DarwinProcess.h
new file mode 100644
index 0000000..496b179
--- /dev/null
+++ b/darwin/DarwinProcess.h
@@ -0,0 +1,46 @@
+#ifndef HEADER_DarwinProcess
+#define HEADER_DarwinProcess
+/*
+htop - DarwinProcess.h
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <sys/sysctl.h>
+
+#include "Machine.h"
+#include "darwin/DarwinProcessTable.h"
+
+
+#define PROCESS_FLAG_TTY 0x00000100
+
+typedef struct DarwinProcess_ {
+   Process super;
+
+   uint64_t utime;
+   uint64_t stime;
+   bool taskAccess;
+   bool translated;
+} DarwinProcess;
+
+extern const ProcessClass DarwinProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* DarwinProcess_new(const Machine* settings);
+
+void Process_delete(Object* cast);
+
+void DarwinProcess_setFromKInfoProc(Process* proc, const struct kinfo_proc* ps, bool exists);
+
+void DarwinProcess_setFromLibprocPidinfo(DarwinProcess* proc, DarwinProcessTable* dpt, double timeIntervalNS);
+
+/*
+ * Scan threads for process state information.
+ * Based on: http://stackoverflow.com/questions/6788274/ios-mac-cpu-usage-for-thread
+ * and       https://github.com/max-horvath/htop-osx/blob/e86692e869e30b0bc7264b3675d2a4014866ef46/ProcessList.c
+ */
+void DarwinProcess_scanThreads(DarwinProcess* dp);
+
+#endif
diff --git a/darwin/DarwinProcessTable.c b/darwin/DarwinProcessTable.c
new file mode 100644
index 0000000..850b503
--- /dev/null
+++ b/darwin/DarwinProcessTable.c
@@ -0,0 +1,126 @@
+/*
+htop - DarwinProcessTable.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "darwin/DarwinProcessTable.h"
+
+#include <errno.h>
+#include <libproc.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <utmpx.h>
+#include <sys/mman.h>
+#include <sys/sysctl.h>
+
+#include "CRT.h"
+#include "ProcessTable.h"
+#include "darwin/DarwinMachine.h"
+#include "darwin/DarwinProcess.h"
+#include "darwin/Platform.h"
+#include "darwin/PlatformHelpers.h"
+#include "generic/openzfs_sysctl.h"
+#include "zfs/ZfsArcStats.h"
+
+
+static struct kinfo_proc* ProcessTable_getKInfoProcs(size_t* count) {
+   int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 };
+   struct kinfo_proc* processes = NULL;
+
+   for (unsigned int retry = 0; retry < 4; retry++) {
+      size_t size = 0;
+      if (sysctl(mib, 4, NULL, &size, NULL, 0) < 0 || size == 0) {
+         CRT_fatalError("Unable to get size of kproc_infos");
+      }
+
+      size += 16 * retry * retry * sizeof(struct kinfo_proc);
+      processes = xRealloc(processes, size);
+
+      if (sysctl(mib, 4, processes, &size, NULL, 0) == 0) {
+         *count = size / sizeof(struct kinfo_proc);
+         return processes;
+      }
+
+      if (errno != ENOMEM)
+         break;
+   }
+
+   CRT_fatalError("Unable to get kinfo_procs");
+}
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   DarwinProcessTable* this = xCalloc(1, sizeof(DarwinProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(DarwinProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   DarwinProcessTable* this = (DarwinProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   const Machine* host = super->super.host;
+   const DarwinMachine* dhost = (const DarwinMachine*) host;
+   DarwinProcessTable* dpt = (DarwinProcessTable*) super;
+   bool preExisting = true;
+   struct kinfo_proc* ps;
+   size_t count;
+   DarwinProcess* proc;
+
+   /* Get the time difference */
+   dpt->global_diff = 0;
+   for (unsigned int i = 0; i < host->existingCPUs; ++i) {
+      for (size_t j = 0; j < CPU_STATE_MAX; ++j) {
+         dpt->global_diff += dhost->curr_load[i].cpu_ticks[j] - dhost->prev_load[i].cpu_ticks[j];
+      }
+   }
+
+   const double time_interval_ns = Platform_schedulerTicksToNanoseconds(dpt->global_diff) / (double) host->activeCPUs;
+
+   /* We use kinfo_procs for initial data since :
+    *
+    * 1) They always succeed.
+    * 2) They contain the basic information.
+    *
+    * We attempt to fill-in additional information with libproc.
+    */
+   ps = ProcessTable_getKInfoProcs(&count);
+
+   for (size_t i = 0; i < count; ++i) {
+      proc = (DarwinProcess*)ProcessTable_getProcess(super, ps[i].kp_proc.p_pid, &preExisting, DarwinProcess_new);
+
+      DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], preExisting);
+      DarwinProcess_setFromLibprocPidinfo(proc, dpt, time_interval_ns);
+
+      if (proc->super.st_uid != ps[i].kp_eproc.e_ucred.cr_uid) {
+         proc->super.st_uid = ps[i].kp_eproc.e_ucred.cr_uid;
+         proc->super.user = UsersTable_getRef(host->usersTable, proc->super.st_uid);
+      }
+
+      // Disabled for High Sierra due to bug in macOS High Sierra
+      bool isScanThreadSupported = !Platform_KernelVersionIsBetween((KernelVersion) {17, 0, 0}, (KernelVersion) {17, 5, 0});
+
+      if (isScanThreadSupported) {
+         DarwinProcess_scanThreads(proc);
+      }
+
+      super->totalTasks += 1;
+
+      if (!preExisting) {
+         ProcessTable_add(super, &proc->super);
+      }
+   }
+
+   free(ps);
+}
diff --git a/darwin/DarwinProcessTable.h b/darwin/DarwinProcessTable.h
new file mode 100644
index 0000000..7467bfd
--- /dev/null
+++ b/darwin/DarwinProcessTable.h
@@ -0,0 +1,22 @@
+#ifndef HEADER_DarwinProcessTable
+#define HEADER_DarwinProcessTable
+/*
+htop - DarwinProcessTable.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <mach/mach_host.h>
+#include <sys/sysctl.h>
+
+#include "ProcessTable.h"
+
+
+typedef struct DarwinProcessTable_ {
+   ProcessTable super;
+
+   uint64_t global_diff;
+} DarwinProcessTable;
+
+#endif
diff --git a/darwin/Platform.c b/darwin/Platform.c
new file mode 100644
index 0000000..387910e
--- /dev/null
+++ b/darwin/Platform.c
@@ -0,0 +1,609 @@
+/*
+htop - darwin/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "darwin/Platform.h"
+
+#include <errno.h>
+#include <math.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/route.h>
+#include <sys/socket.h>
+#include <sys/_types/_mach_port_t.h>
+
+#include <CoreFoundation/CFBase.h>
+#include <CoreFoundation/CFDictionary.h>
+#include <CoreFoundation/CFNumber.h>
+#include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CoreFoundation.h>
+
+#include <IOKit/IOKitLib.h>
+#include <IOKit/IOTypes.h>
+#include <IOKit/ps/IOPowerSources.h>
+#include <IOKit/ps/IOPSKeys.h>
+#include <IOKit/storage/IOBlockStorageDriver.h>
+
+#include "ClockMeter.h"
+#include "CPUMeter.h"
+#include "CRT.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "ProcessLocksScreen.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "darwin/DarwinMachine.h"
+#include "darwin/PlatformHelpers.h"
+#include "generic/fdstat_sysctl.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
+
+#ifdef HAVE_HOST_GET_CLOCK_SERVICE
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
+
+#ifdef HAVE_MACH_MACH_TIME_H
+#include <mach/mach_time.h>
+#endif
+
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number =  0 },
+   { .name = " 1 SIGHUP",    .number =  1 },
+   { .name = " 2 SIGINT",    .number =  2 },
+   { .name = " 3 SIGQUIT",   .number =  3 },
+   { .name = " 4 SIGILL",    .number =  4 },
+   { .name = " 5 SIGTRAP",   .number =  5 },
+   { .name = " 6 SIGABRT",   .number =  6 },
+   { .name = " 6 SIGIOT",    .number =  6 },
+   { .name = " 7 SIGEMT",    .number =  7 },
+   { .name = " 8 SIGFPE",    .number =  8 },
+   { .name = " 9 SIGKILL",   .number =  9 },
+   { .name = "10 SIGBUS",    .number = 10 },
+   { .name = "11 SIGSEGV",   .number = 11 },
+   { .name = "12 SIGSYS",    .number = 12 },
+   { .name = "13 SIGPIPE",   .number = 13 },
+   { .name = "14 SIGALRM",   .number = 14 },
+   { .name = "15 SIGTERM",   .number = 15 },
+   { .name = "16 SIGURG",    .number = 16 },
+   { .name = "17 SIGSTOP",   .number = 17 },
+   { .name = "18 SIGTSTP",   .number = 18 },
+   { .name = "19 SIGCONT",   .number = 19 },
+   { .name = "20 SIGCHLD",   .number = 20 },
+   { .name = "21 SIGTTIN",   .number = 21 },
+   { .name = "22 SIGTTOU",   .number = 22 },
+   { .name = "23 SIGIO",     .number = 23 },
+   { .name = "24 SIGXCPU",   .number = 24 },
+   { .name = "25 SIGXFSZ",   .number = 25 },
+   { .name = "26 SIGVTALRM", .number = 26 },
+   { .name = "27 SIGPROF",   .number = 27 },
+   { .name = "28 SIGWINCH",  .number = 28 },
+   { .name = "29 SIGINFO",   .number = 29 },
+   { .name = "30 SIGUSR1",   .number = 30 },
+   { .name = "31 SIGUSR2",   .number = 31 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &UptimeMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
+   &DiskIOMeter_class,
+   &NetworkIOMeter_class,
+   &FileDescriptorMeter_class,
+   &BlankMeter_class,
+   NULL
+};
+
+static double Platform_nanosecondsPerMachTick = 1.0;
+
+static double Platform_nanosecondsPerSchedulerTick = -1;
+
+static bool iokit_available = false;
+static mach_port_t iokit_port; // the mach port used to initiate communication with IOKit
+
+bool Platform_init(void) {
+   Platform_nanosecondsPerMachTick = Platform_calculateNanosecondsPerMachTick();
+
+   // Determine the number of scheduler clock ticks per second
+   errno = 0;
+   long scheduler_ticks_per_sec = sysconf(_SC_CLK_TCK);
+
+   if (errno || scheduler_ticks_per_sec < 1) {
+      CRT_fatalError("Unable to retrieve clock tick rate");
+   }
+
+   const double nanos_per_sec = 1e9;
+   Platform_nanosecondsPerSchedulerTick = nanos_per_sec / scheduler_ticks_per_sec;
+
+   // Since macOS 12.0, IOMasterPort is deprecated, and one should use IOMainPort instead
+   #if defined(HAVE_DECL_IOMAINPORT) && HAVE_DECL_IOMAINPORT
+   if (!IOMainPort(bootstrap_port, &iokit_port)) {
+      iokit_available = true;
+   }
+   #elif defined(HAVE_DECL_IOMASTERPORT) && HAVE_DECL_IOMASTERPORT
+   if (!IOMasterPort(bootstrap_port, &iokit_port)) {
+      iokit_available = true;
+   }
+   #endif
+
+   return true;
+}
+
+// Converts ticks in the Mach "timebase" to nanoseconds.
+// See `mach_timebase_info`, as used to define the `Platform_nanosecondsPerMachTick` constant.
+uint64_t Platform_machTicksToNanoseconds(uint64_t mach_ticks) {
+   return (uint64_t) ((double) mach_ticks * Platform_nanosecondsPerMachTick);
+}
+
+// Converts "scheduler ticks" to nanoseconds.
+// See `sysconf(_SC_CLK_TCK)`, as used to define the `Platform_nanosecondsPerSchedulerTick` constant.
+double Platform_schedulerTicksToNanoseconds(const double scheduler_ticks) {
+   return scheduler_ticks * Platform_nanosecondsPerSchedulerTick;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   struct timeval bootTime, currTime;
+   int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+   size_t size = sizeof(bootTime);
+
+   int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
+   if (err) {
+      return -1;
+   }
+   gettimeofday(&currTime, NULL);
+
+   return (int) difftime(currTime.tv_sec, bootTime.tv_sec);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   double results[3];
+
+   if (3 == getloadavg(results, 3)) {
+      *one = results[0];
+      *five = results[1];
+      *fifteen = results[2];
+   } else {
+      *one = 0;
+      *five = 0;
+      *fifteen = 0;
+   }
+}
+
+pid_t Platform_getMaxPid(void) {
+   /* http://opensource.apple.com/source/xnu/xnu-2782.1.97/bsd/sys/proc_internal.hh */
+   return 99999;
+}
+
+static double Platform_setCPUAverageValues(Meter* mtr) {
+   const Machine* host = mtr->host;
+   unsigned int activeCPUs = host->activeCPUs;
+   double sumNice = 0.0;
+   double sumNormal = 0.0;
+   double sumKernel = 0.0;
+   double sumPercent = 0.0;
+   for (unsigned int i = 1; i <= host->existingCPUs; i++) {
+      sumPercent += Platform_setCPUValues(mtr, i);
+      sumNice    += mtr->values[CPU_METER_NICE];
+      sumNormal  += mtr->values[CPU_METER_NORMAL];
+      sumKernel  += mtr->values[CPU_METER_KERNEL];
+   }
+   mtr->values[CPU_METER_NICE]   = sumNice   / activeCPUs;
+   mtr->values[CPU_METER_NORMAL] = sumNormal / activeCPUs;
+   mtr->values[CPU_METER_KERNEL] = sumKernel / activeCPUs;
+   return sumPercent / activeCPUs;
+}
+
+double Platform_setCPUValues(Meter* mtr, unsigned int cpu) {
+
+   if (cpu == 0) {
+      return Platform_setCPUAverageValues(mtr);
+   }
+
+   const DarwinMachine* dhost = (const DarwinMachine*) mtr->host;
+   const processor_cpu_load_info_t prev = &dhost->prev_load[cpu - 1];
+   const processor_cpu_load_info_t curr = &dhost->curr_load[cpu - 1];
+   double total = 0;
+
+   /* Take the sums */
+   for (size_t i = 0; i < CPU_STATE_MAX; ++i) {
+      total += (double)curr->cpu_ticks[i] - (double)prev->cpu_ticks[i];
+   }
+
+   mtr->values[CPU_METER_NICE]
+      = ((double)curr->cpu_ticks[CPU_STATE_NICE] - (double)prev->cpu_ticks[CPU_STATE_NICE]) * 100.0 / total;
+   mtr->values[CPU_METER_NORMAL]
+      = ((double)curr->cpu_ticks[CPU_STATE_USER] - (double)prev->cpu_ticks[CPU_STATE_USER]) * 100.0 / total;
+   mtr->values[CPU_METER_KERNEL]
+      = ((double)curr->cpu_ticks[CPU_STATE_SYSTEM] - (double)prev->cpu_ticks[CPU_STATE_SYSTEM]) * 100.0 / total;
+
+   mtr->curItems = 3;
+
+   /* Convert to percent and return */
+   total = mtr->values[CPU_METER_NICE] + mtr->values[CPU_METER_NORMAL] + mtr->values[CPU_METER_KERNEL];
+
+   mtr->values[CPU_METER_FREQUENCY] = NAN;
+   mtr->values[CPU_METER_TEMPERATURE] = NAN;
+
+   return CLAMP(total, 0.0, 100.0);
+}
+
+void Platform_setMemoryValues(Meter* mtr) {
+   const DarwinMachine* dhost = (const DarwinMachine*) mtr->host;
+   const struct vm_statistics* vm = &dhost->vm_stats;
+   double page_K = (double)vm_page_size / (double)1024;
+
+   mtr->total = dhost->host_info.max_mem / 1024;
+   mtr->values[MEMORY_METER_USED] = (double)(vm->active_count + vm->wire_count) * page_K;
+   // mtr->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+   // mtr->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   mtr->values[MEMORY_METER_BUFFERS] = (double)vm->purgeable_count * page_K;
+   mtr->values[MEMORY_METER_CACHE] = (double)vm->inactive_count * page_K;
+   // mtr->values[MEMORY_METER_AVAILABLE] = "available memory"
+}
+
+void Platform_setSwapValues(Meter* mtr) {
+   int mib[2] = {CTL_VM, VM_SWAPUSAGE};
+   struct xsw_usage swapused;
+   size_t swlen = sizeof(swapused);
+   sysctl(mib, 2, &swapused, &swlen, NULL, 0);
+
+   mtr->total = swapused.xsu_total / 1024;
+   mtr->values[SWAP_METER_USED] = swapused.xsu_used / 1024;
+   // mtr->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // mtr->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+void Platform_setZfsArcValues(Meter* this) {
+   const DarwinMachine* dhost = (const DarwinMachine*) this->host;
+
+   ZfsArcMeter_readStats(this, &dhost->zfs);
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   const DarwinMachine* dhost = (const DarwinMachine*) this->host;
+
+   ZfsCompressedArcMeter_readStats(this, &dhost->zfs);
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   char* env = NULL;
+
+   int argmax;
+   size_t bufsz = sizeof(argmax);
+
+   int mib[3];
+   mib[0] = CTL_KERN;
+   mib[1] = KERN_ARGMAX;
+   if (sysctl(mib, 2, &argmax, &bufsz, 0, 0) == 0) {
+      char* buf = xMalloc(argmax);
+      if (buf) {
+         mib[0] = CTL_KERN;
+         mib[1] = KERN_PROCARGS2;
+         mib[2] = pid;
+         bufsz = argmax;
+         if (sysctl(mib, 3, buf, &bufsz, 0, 0) == 0) {
+            if (bufsz > sizeof(int)) {
+               char *p = buf, *endp = buf + bufsz;
+               int argc = *(int*)(void*)p;
+               p += sizeof(int);
+
+               // skip exe
+               p = strchr(p, 0) + 1;
+
+               // skip padding
+               while (!*p && p < endp)
+                  ++p;
+
+               // skip argv
+               for (; argc-- && p < endp; p = strrchr(p, 0) + 1)
+                  ;
+
+               // skip padding
+               while (!*p && p < endp)
+                  ++p;
+
+               size_t size = endp - p;
+               env = xMalloc(size + 2);
+               memcpy(env, p, size);
+               env[size] = 0;
+               env[size + 1] = 0;
+            }
+         }
+         free(buf);
+      }
+   }
+
+   return env;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   Generic_getFileDescriptors_sysctl(used, max);
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   if (!iokit_available)
+      return false;
+
+   io_iterator_t drive_list;
+
+   /* Get the list of all drives */
+   if (IOServiceGetMatchingServices(iokit_port, IOServiceMatching("IOBlockStorageDriver"), &drive_list))
+      return false;
+
+   unsigned long long int read_sum = 0, write_sum = 0, timeSpend_sum = 0;
+
+   io_registry_entry_t drive;
+   while ((drive = IOIteratorNext(drive_list)) != 0) {
+      CFMutableDictionaryRef properties_tmp = NULL;
+
+      /* Get the properties of this drive */
+      if (IORegistryEntryCreateCFProperties(drive, &properties_tmp, kCFAllocatorDefault, 0)) {
+         IOObjectRelease(drive);
+         IOObjectRelease(drive_list);
+         return false;
+      }
+
+      if (!properties_tmp) {
+         IOObjectRelease(drive);
+         continue;
+      }
+
+      CFDictionaryRef properties = properties_tmp;
+
+      /* Get the statistics of this drive */
+      CFDictionaryRef statistics = (CFDictionaryRef) CFDictionaryGetValue(properties, CFSTR(kIOBlockStorageDriverStatisticsKey));
+
+      if (!statistics) {
+         CFRelease(properties);
+         IOObjectRelease(drive);
+         continue;
+      }
+
+      CFNumberRef number;
+      unsigned long long int value;
+
+      /* Get bytes read */
+      number = (CFNumberRef) CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsBytesReadKey));
+      if (number != 0) {
+         CFNumberGetValue(number, kCFNumberSInt64Type, &value);
+         read_sum += value;
+      }
+
+      /* Get bytes written */
+      number = (CFNumberRef) CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsBytesWrittenKey));
+      if (number != 0) {
+         CFNumberGetValue(number, kCFNumberSInt64Type, &value);
+         write_sum += value;
+      }
+
+      /* Get total read time (in ns) */
+      number = (CFNumberRef) CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalReadTimeKey));
+      if (number != 0) {
+         CFNumberGetValue(number, kCFNumberSInt64Type, &value);
+         timeSpend_sum += value;
+      }
+
+      /* Get total write time (in ns) */
+      number = (CFNumberRef) CFDictionaryGetValue(statistics, CFSTR(kIOBlockStorageDriverStatisticsTotalWriteTimeKey));
+      if (number != 0) {
+         CFNumberGetValue(number, kCFNumberSInt64Type, &value);
+         timeSpend_sum += value;
+      }
+
+      CFRelease(properties);
+      IOObjectRelease(drive);
+   }
+
+   data->totalBytesRead = read_sum;
+   data->totalBytesWritten = write_sum;
+   data->totalMsTimeSpend = timeSpend_sum / 1e6; /* Convert from ns to ms */
+
+   if (drive_list)
+      IOObjectRelease(drive_list);
+
+   return true;
+}
+
+/* Caution: Given that interfaces are dynamic, and it is not possible to get statistics on interfaces that no longer exist,
+   if some interface disappears between the time of two samples, the values of the second sample may be lower than those of
+   the first one. */
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   int mib[6] = {CTL_NET,
+      PF_ROUTE, /* routing messages */
+      0, /* protocal number, currently always 0 */
+      0, /* select all address families */
+      NET_RT_IFLIST2, /* interface list with addresses */
+      0};
+
+   for (size_t retry = 0; retry < 4; retry++) {
+      size_t len = 0;
+
+      /* Determine len */
+      if (sysctl(mib, ARRAYSIZE(mib), NULL, &len, NULL, 0) < 0 || len == 0)
+         return false;
+
+      len += 16 * retry * retry * sizeof(struct if_msghdr2);
+      char *buf = xMalloc(len);
+
+      if (sysctl(mib, ARRAYSIZE(mib), buf, &len, NULL, 0) < 0) {
+         free(buf);
+         if (errno == ENOMEM && retry < 3)
+            continue;
+         else
+            return false;
+      }
+
+      uint64_t bytesReceived_sum = 0, packetsReceived_sum = 0, bytesTransmitted_sum = 0, packetsTransmitted_sum = 0;
+
+      for (char *next = buf; next < buf + len;) {
+         void *tmp = (void*) next;
+         struct if_msghdr *ifm = (struct if_msghdr*) tmp;
+
+         next += ifm->ifm_msglen;
+
+         if (ifm->ifm_type != RTM_IFINFO2)
+            continue;
+
+         struct if_msghdr2 *ifm2 = (struct if_msghdr2*) ifm;
+
+         if (ifm2->ifm_data.ifi_type != IFT_LOOP) { /* do not count loopback traffic */
+            bytesReceived_sum += ifm2->ifm_data.ifi_ibytes;
+            packetsReceived_sum += ifm2->ifm_data.ifi_ipackets;
+            bytesTransmitted_sum += ifm2->ifm_data.ifi_obytes;
+            packetsTransmitted_sum += ifm2->ifm_data.ifi_opackets;
+         }
+      }
+
+      data->bytesReceived = bytesReceived_sum;
+      data->packetsReceived = packetsReceived_sum;
+      data->bytesTransmitted = bytesTransmitted_sum;
+      data->packetsTransmitted = packetsTransmitted_sum;
+
+      free(buf);
+   }
+
+   return true;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   *percent = NAN;
+   *isOnAC = AC_ERROR;
+
+   CFArrayRef list = NULL;
+
+   CFTypeRef power_sources = IOPSCopyPowerSourcesInfo();
+   if (!power_sources)
+      goto cleanup;
+
+   list = IOPSCopyPowerSourcesList(power_sources);
+   if (!list)
+      goto cleanup;
+
+   double cap_current = 0.0;
+   double cap_max = 0.0;
+
+   /* Get the battery */
+   for (int i = 0, len = CFArrayGetCount(list); i < len; ++i) {
+      CFDictionaryRef power_source = IOPSGetPowerSourceDescription(power_sources, CFArrayGetValueAtIndex(list, i)); /* GET rule */
+
+      if (!power_source)
+         continue;
+
+      CFStringRef power_type = CFDictionaryGetValue(power_source, CFSTR(kIOPSTransportTypeKey)); /* GET rule */
+
+      if (kCFCompareEqualTo != CFStringCompare(power_type, CFSTR(kIOPSInternalType), 0))
+         continue;
+
+      /* Determine the AC state */
+      CFStringRef power_state = CFDictionaryGetValue(power_source, CFSTR(kIOPSPowerSourceStateKey));
+
+      if (*isOnAC != AC_PRESENT)
+         *isOnAC = (kCFCompareEqualTo == CFStringCompare(power_state, CFSTR(kIOPSACPowerValue), 0)) ? AC_PRESENT : AC_ABSENT;
+
+      /* Get the percentage remaining */
+      double tmp;
+      CFNumberGetValue(CFDictionaryGetValue(power_source, CFSTR(kIOPSCurrentCapacityKey)), kCFNumberDoubleType, &tmp);
+      cap_current += tmp;
+      CFNumberGetValue(CFDictionaryGetValue(power_source, CFSTR(kIOPSMaxCapacityKey)), kCFNumberDoubleType, &tmp);
+      cap_max += tmp;
+   }
+
+   if (cap_max > 0.0)
+      *percent = 100.0 * cap_current / cap_max;
+
+cleanup:
+   if (list)
+      CFRelease(list);
+
+   if (power_sources)
+      CFRelease(power_sources);
+}
+
+void Platform_gettime_monotonic(uint64_t* msec) {
+
+#ifdef HAVE_HOST_GET_CLOCK_SERVICE
+
+   clock_serv_t cclock;
+   mach_timespec_t mts;
+
+   host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock);
+   clock_get_time(cclock, &mts);
+   mach_port_deallocate(mach_task_self(), cclock);
+
+   *msec = ((uint64_t)mts.tv_sec * 1000) + ((uint64_t)mts.tv_nsec / 1000000);
+
+#else
+
+   Generic_gettime_monotonic(msec);
+
+#endif
+
+}
diff --git a/darwin/Platform.h b/darwin/Platform.h
new file mode 100644
index 0000000..f67db8f
--- /dev/null
+++ b/darwin/Platform.h
@@ -0,0 +1,141 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - darwin/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "CPUMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "NetworkIOMeter.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "darwin/DarwinProcess.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+// Converts ticks in the Mach "timebase" to nanoseconds.
+// See `mach_timebase_info`, as used to define the `Platform_nanosecondsPerMachTick` constant.
+uint64_t Platform_machTicksToNanoseconds(uint64_t mach_ticks);
+
+// Converts "scheduler ticks" to nanoseconds.
+// See `sysconf(_SC_CLK_TCK)`, as used to define the `Platform_nanosecondsPerSchedulerTick` constant.
+double Platform_schedulerTicksToNanoseconds(const double scheduler_ticks);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* mtr, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* mtr);
+
+void Platform_setSwapValues(Meter* mtr);
+
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+void Platform_gettime_monotonic(uint64_t* msec);
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/darwin/PlatformHelpers.c b/darwin/PlatformHelpers.c
new file mode 100644
index 0000000..a4ea82b
--- /dev/null
+++ b/darwin/PlatformHelpers.c
@@ -0,0 +1,125 @@
+/*
+htop - darwin/PlatformHelpers.c
+(C) 2018 Pierre Malhaire, 2020-2021 htop dev team, 2021 Alexander Momchilov
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "darwin/PlatformHelpers.h"
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/sysctl.h>
+
+#include "CRT.h"
+
+#ifdef HAVE_MACH_MACH_TIME_H
+#include <mach/mach_time.h>
+#endif
+
+
+void Platform_GetKernelVersion(KernelVersion* k) {
+   static KernelVersion cachedKernelVersion;
+
+   if (!cachedKernelVersion.major) {
+      // just in case it fails someday
+      cachedKernelVersion = (KernelVersion) { -1, -1, -1 };
+      char str[256] = {0};
+      size_t size = sizeof(str);
+      int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
+      if (ret == 0) {
+         sscanf(str, "%hd.%hd.%hd", &cachedKernelVersion.major, &cachedKernelVersion.minor, &cachedKernelVersion.patch);
+      }
+   }
+   memcpy(k, &cachedKernelVersion, sizeof(cachedKernelVersion));
+}
+
+int Platform_CompareKernelVersion(KernelVersion v) {
+   struct KernelVersion actualVersion;
+   Platform_GetKernelVersion(&actualVersion);
+
+   if (actualVersion.major != v.major) {
+      return actualVersion.major - v.major;
+   }
+   if (actualVersion.minor != v.minor) {
+      return actualVersion.minor - v.minor;
+   }
+   if (actualVersion.patch != v.patch) {
+      return actualVersion.patch - v.patch;
+   }
+
+   return 0;
+}
+
+bool Platform_KernelVersionIsBetween(KernelVersion lowerBound, KernelVersion upperBound) {
+   return 0 <= Platform_CompareKernelVersion(lowerBound)
+      && Platform_CompareKernelVersion(upperBound) < 0;
+}
+
+void Platform_getCPUBrandString(char* cpuBrandString, size_t cpuBrandStringSize) {
+   if (sysctlbyname("machdep.cpu.brand_string", cpuBrandString, &cpuBrandStringSize, NULL, 0) == -1) {
+      fprintf(stderr,
+         "WARN: Unable to determine the CPU brand string.\n"
+         "errno: %i, %s\n", errno, strerror(errno));
+
+      String_safeStrncpy(cpuBrandString, "UNKNOWN!", cpuBrandStringSize);
+   }
+}
+
+// Adapted from https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment
+bool Platform_isRunningTranslated(void) {
+   int ret = 0;
+   size_t size = sizeof(ret);
+   errno = 0;
+   if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1) {
+      if (errno == ENOENT)
+         return false;
+
+      fprintf(stderr,
+         "WARN: Could not determine if this process was running in a translation environment like Rosetta 2.\n"
+         "Assuming that we're not.\n"
+         "errno: %i, %s\n", errno, strerror(errno));
+
+      return false;
+   }
+   return ret;
+}
+
+double Platform_calculateNanosecondsPerMachTick(void) {
+   // Check if we can determine the timebase used on this system.
+   // If the API is unavailable assume we get our timebase in nanoseconds.
+#ifndef HAVE_MACH_TIMEBASE_INFO
+   return 1.0;
+#else
+   mach_timebase_info_data_t info;
+
+   /* WORKAROUND for `mach_timebase_info` giving incorrect values on M1 under Rosetta 2.
+    *    rdar://FB9546856 https://openradar.appspot.com/radar?id=5055988478509056
+    *
+    *    We don't know exactly what feature/attribute of the M1 chip causes this mistake under Rosetta 2.
+    *    Until we have more Apple ARM chips to compare against, the best we can do is special-case
+    *    the "Apple M1" chip specifically when running under Rosetta 2.
+    */
+
+   char cpuBrandString[1024] = "";
+   Platform_getCPUBrandString(cpuBrandString, sizeof(cpuBrandString));
+
+   bool isRunningUnderRosetta2 = Platform_isRunningTranslated();
+
+   // Kernel version 20.0.0 is macOS 11.0 (Big Sur)
+   bool isBuggedVersion = Platform_KernelVersionIsBetween((KernelVersion) {20, 0, 0}, (KernelVersion) {999, 999, 999});
+
+   if (isRunningUnderRosetta2 && String_eq(cpuBrandString, "Apple M1") && isBuggedVersion) {
+      // In this case `mach_timebase_info` provides the wrong value, so we hard-code the correct factor,
+      // as determined from `mach_timebase_info` when the process running natively.
+      info = (mach_timebase_info_data_t) { .numer = 125, .denom = 3 };
+   } else {
+      // No workarounds needed, use the OS-provided value.
+      mach_timebase_info(&info);
+   }
+
+   return (double)info.numer / (double)info.denom;
+#endif
+}
diff --git a/darwin/PlatformHelpers.h b/darwin/PlatformHelpers.h
new file mode 100644
index 0000000..45aea1a
--- /dev/null
+++ b/darwin/PlatformHelpers.h
@@ -0,0 +1,40 @@
+#ifndef HEADER_PlatformHelpers
+#define HEADER_PlatformHelpers
+/*
+htop - darwin/PlatformHelpers.h
+(C) 2018 Pierre Malhaire, 2020-2022 htop dev team, 2021 Alexander Momchilov
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+
+typedef struct KernelVersion {
+   short int major;
+   short int minor;
+   short int patch;
+} KernelVersion;
+
+void Platform_GetKernelVersion(KernelVersion* k);
+
+/* compare the given os version with the one installed returns:
+0 if equals the installed version
+positive value if less than the installed version
+negative value if more than the installed version
+*/
+int Platform_CompareKernelVersion(KernelVersion v);
+
+// lowerBound <= currentVersion < upperBound
+bool Platform_KernelVersionIsBetween(KernelVersion lowerBound, KernelVersion upperBound);
+
+double Platform_calculateNanosecondsPerMachTick(void);
+
+void Platform_getCPUBrandString(char* cpuBrandString, size_t cpuBrandStringSize);
+
+bool Platform_isRunningTranslated(void);
+
+double Platform_calculateNanosecondsPerMachTick(void);
+
+#endif
diff --git a/darwin/ProcessField.h b/darwin/ProcessField.h
new file mode 100644
index 0000000..05fbc3b
--- /dev/null
+++ b/darwin/ProcessField.h
@@ -0,0 +1,18 @@
+#ifndef HEADER_DarwinProcessField
+#define HEADER_DarwinProcessField
+/*
+htop - darwin/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   TRANSLATED = 100,             \
+                                 \
+   DUMMY_BUMP_FIELD = CWD,       \
+   // End of list
+
+
+#endif /* HEADER_DarwinProcessField */
diff --git a/docs/images/screenshot.png b/docs/images/screenshot.png
new file mode 100644
index 0000000..85cb9dd
--- /dev/null
+++ b/docs/images/screenshot.png
diff --git a/docs/styleguide.md b/docs/styleguide.md
new file mode 100644
index 0000000..92e69f5
--- /dev/null
+++ b/docs/styleguide.md
@@ -0,0 +1,254 @@
+htop coding style guide
+=======================
+
+Naming conventions
+------------------
+
+Names are important to convey what all those things inside the project are for.
+Filenames for source code traditionally used camel-case naming with the first letter written in uppercase.
+The file extension is always lowercase.
+
+The only exceptions here are `htop.c` and `pcp-htop.c`, which contain the main entrance points into the code.
+
+Folders for e.g. platform-specific code or complex features spawning multiple files are written in lowercase, e.g. `linux`, `freebsd`, `zfs`.
+
+Inside files, the naming somewhat depends on the context.
+Function names should include a camel-case prefix before the actual name, separated by an underscore.
+While this prefix usually coincides with the module name, this is not required, yet strongly advised.
+One important exception to this rule are the memory management and the string utility functions from `XUtils.h`.
+
+Variable names inside functions should be short and precise.
+Using `i` for some loop counter is totally fine, using `someCounterValueForThisSimpleLoop` is not.
+On the other hand, when you need to hold global storage try to keep this local to your module, i.e. declare such variables `static` within the C source file.
+Only if your variable really needs to be visible for the whole project (which is really rare) it deserves a declaration in the header, marked `extern`.
+
+File content structure
+----------------------
+
+The content within each file is usually structured according to the following loose template:
+
+* Copyright declaration
+* Inclusion of used headers
+* Necessary data structures and forward declarations
+* Static module-private function implementations
+* Externally visible function implementations
+* Externally visible constant structures (pseudo-OOP definitions)
+
+For header files header guards based on `#ifdef` should be used.
+These header guards are historically placed **before** the Copyright declaration.
+Stick to that for consistency please.
+
+Example:
+
+```c
+#ifndef HEADER_FILENAME
+#define HEADER_FILENAME
+/*
+htop - Filename.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+```
+
+Import and use of headers
+-------------------------
+
+We use the GPLv2+ as a shorthand indication that we release `htop` under the GNU Public license version 2 but are totally fine with users opting to apply the "any later version" clause.
+
+Every file should import headers for all symbols it's using.
+Thus when using a symbol from a header, even if that symbol is already imported by something else you use, you should declare an import for that header.
+Doing so allows for easier restructuring of the code when things need to be moved around.
+If you are unsure if all necessary headers are included you might use IWYU to tell you.
+
+The list of includes should be the first thing in the file, after the copyright comment and be followed by two blank lines.
+The include list should be in the following order, with each group separated by one blank line:
+
+1. `include "config.h" // IWYU pragma: keep` if the global configuration
+    from `automake`&`autoconfigure` or any of the feature guards for C library headers
+    (like `__GNU_SOURCE`) are required, optional otherwise. Beware of the IWYU comment.
+2. Accompanying module header file (for C source files only, missing inside headers)
+3. List of used system headers (non-conditional includes)
+4. List of used program headers
+5. Conditionally included header files, system headers first
+
+The list of headers should be sorted with includes from subdirectories following after files inside their parent directory.
+Thus `unistd.h` sorts before `sys/time.h`.
+
+When `XUtils.h` is used by the module itself or any of its included headers, the C source file must include `config.h` in the manner noted above.
+Failure to do so will cause a compilation error (sanity check inside `XUtils.h`) or may result in other, hard-to-debug compilation issues.
+The include for `config.h` is only ever placed in the C source file and never in any header file.
+For further details see PR #1337 in our issue tracker.
+
+Symbol Exports
+--------------
+
+Exports of symbols should be used sparingly.
+Thus unless a function you write is intended to become public API of a module you should mark it as `static`.
+If a function should be public API an appropriate declaration for that function has to be placed in the accompanying header file.
+
+Please avoid function-like macros, in particular when exporting them in a header file.
+They have several downsides (re-evaluation of arguments, syntactic escapes, weak typing) for which usually a better alternative like an actual function exists.
+Furthermore when using function-like `define`s you may need to mark certain headers for IWYU so tracking of used symbols works.
+
+Memory Management
+-----------------
+
+When allocating memory make sure to free resources properly.
+For allocation this project uses a set of tiny wrappers around the common functions `malloc`, `calloc` and `realloc` named `xMalloc`, `xCalloc` and `xRealloc`.
+These functions check that memory allocation worked and error out on failure.
+
+Allocation functions assert the amount of memory requested is non-zero.
+Trying to allocate 0 bytes of memory is an error.
+Please use the explicit value `NULL` in this case and handle it in your code accordingly.
+
+If the allocated block of memory is intended to hold an array of values, you should use the alternate functions `xReallocArray` and `xReallocArrayZero` instead.
+
+Working with Strings
+--------------------
+
+It is strongly encouraged to use the functions starting with `String_` from `XUtils.h` for working with zero-terminated strings as these make the API easier to use and are intended to make the intent of your code easier to grasp.
+
+Thus instead of `!strcmp(foo, "foo")` it's preferred to use `String_eq(foo, "foo")` instead.
+While sometimes a bit more to type, this helps a lot with making the code easier to follow.
+
+Styling the code
+----------------
+
+Now for the style details that can mostly be automated: Indentation, spacing and bracing.
+While there is no definitive code style we use, a set of rules loosely enforced has evolved.
+
+Indentation in the code is done by three (3) spaces. No tabs are used. Ever.
+
+Before and after keywords should be a space, e.g. `if (condition)` and `do { … } while (condition);`.
+
+After opening and before closing braces a new line should be started.
+Content of such encoded blocks should be indented one level further than their enclosing block.
+
+If a line of source code becomes too long, or when structuring it into multiple parts for clarity, the continuation line should be indented one more level than the first line it continues:
+
+```c
+if (very_long_condition &&
+   another_very_complex_expression &&
+   something_else_to_check) {
+   // Code follows as normal ...
+} else {
+
+}
+```
+
+Braces around simple single code statements (return, break, continue, goto, trivial assignments) are usually left out.
+
+```c
+if (answer)
+   return 42;
+```
+
+If it helps readability (with several unrelated if statements in a row) or to avoid dangling-else situations braces can be added.
+
+Control flow statements and the instruction making up their body should not be put on a single line,
+i.e. after the condition of an if statement a new line should be inserted and the body indented accordingly.
+
+```c
+if (answer)
+   return 42;
+else if (again)
+   continue;
+else
+   break;
+```
+
+When the statements that form control flow constructs are complex (e.g. more than just a simple assignment or jump) or need explanatory comments you should use braces.
+If any block of such a statement uses braces then all blocks of that statement must have braces too.
+
+```c
+if ((fd = open(filename, O_RDONLY)) >= 0 &&
+   (amtRead = read(buffer, sizeof(buffer))) > 0) {
+   // Parse the information further ...
+   metric = handleBufferContent(buffer, amtRead);
+} else {
+   metric = -1;
+}
+
+if (fd >= 0)
+   close(fd);
+```
+
+While the existing code base isn't fully consistent with this code style yet it is strongly recommended that new code follows these rules.
+Adapting surrounding code near places you need to touch is encouraged.
+Try to split off such changes into a separate, clean-up only commit to reduce noise while reviewing your changes.
+
+When writing your code consistency with the surrounding codebase is favoured.
+
+Don't shy away from leaving (single) blank lines to separate different groups of related statements.
+They can be a great asset to structure the flow of a method.
+
+```c
+   int stuff = 0;
+
+   // If asked for gives only half the answer ...
+   if (param)
+      stuff = 21;
+
+   // Compute the answer
+   stuff %= 2;
+   stuff *= 4;
+   stuff *= 5;
+   stuff += !!stuff;
+   stuff *= 2;
+
+   return stuff;
+```
+
+If you want to automate formatting your code, the following command gives you a good baseline of how it should look:
+
+```bash
+astyle -r -xb -s3 -p -xg -c -k1 -W1 -H \*.c \*.h
+```
+
+Working with System APIs
+------------------------
+
+Please try to be considerate when using modern platform features.
+While they usually provide quite a performance gain or make your life easier, it is beneficial if `htop` runs on rather ancient systems.
+Thus when you want to use such features you should try to have an alternative available that works as a fallback.
+
+An example for this are functions like `fstatat` on Linux that extend the kernel API on modern systems.
+But even though it has been around for over a decade you are asked to provide a POSIX alternative like emulating such calls by `fstat` if this is doable.
+If an alternative can not be provided you should gracefully downgrade. That could make a feature that requires this shiny API unavailable on systems that lack support for that API. Make this case visually clear to the user.
+
+In general, code written for the project should be able to compile on any C99-compliant compiler.
+
+Writing documentation
+---------------------
+
+The primary user documentation should be the man file which you can find in `htop.1.in`.
+
+Additional documentation, like this file, should be written in gh-style markdown.
+Make each sentence one line.
+Markdown will combine these in output formats.
+It does only insert a paragraph if you insert a blank line into the source file.
+This way git can better diff and present the changes when documentation is altered.
+
+Documentation files reside in the `docs/` directory and have a `.md` extension.
+
+Writing pull-requests (PRs)
+---------------------------
+
+When writing your PR or patch, the set of patches should contain the minimal changes required.
+Each patch in itself should ideally be self-contained and runable.
+The commit comment should be descriptive (`Updated Foo.c` is not), explain what the changes are and describe why they were made.
+While in trivial cases a short subject suffices, more complex changes might warrant a longer description and explanation of the rationale behind the changes.
+
+A PR should not contain any merge commits.
+To follow the upstream branch of your PR rebase your work instead.
+
+Avoid small commits that just fix typos that another of your commits introduced.
+Instead squash those changes in the appropriate commit that introduced that mistake.
+Git offers `git commit --fixup=<commit>` and `git rebase -i --autosquash` to help you with this.
+
+Your final PR should contain a minimal set of reasonably sized commits that by themselves are easy to review.
+If you open a PR you need to follow up to resolve any comments/change requests.
+Otherwise it may be closed without merging.
+
+Rebase early. Rebase often.
diff --git a/dragonflybsd/DragonFlyBSDMachine.c b/dragonflybsd/DragonFlyBSDMachine.c
new file mode 100644
index 0000000..fd5b58b
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDMachine.c
@@ -0,0 +1,341 @@
+/*
+htop - DragonFlyBSDMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "dragonflybsd/DragonFlyBSDMachine.h"
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#include <sys/param.h>
+
+#include "CRT.h"
+#include "Macros.h"
+
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+
+
+static int MIB_hw_physmem[2];
+static int MIB_vm_stats_vm_v_page_count[4];
+
+static int MIB_vm_stats_vm_v_wire_count[4];
+static int MIB_vm_stats_vm_v_active_count[4];
+static int MIB_vm_stats_vm_v_cache_count[4];
+static int MIB_vm_stats_vm_v_inactive_count[4];
+static int MIB_vm_stats_vm_v_free_count[4];
+
+static int MIB_vfs_bufspace[2];
+
+static int MIB_kern_cp_time[2];
+static int MIB_kern_cp_times[2];
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   size_t len;
+   char errbuf[_POSIX2_LINE_MAX];
+   DragonFlyBSDMachine* this = xCalloc(1, sizeof(DragonFlyBSDMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   // physical memory in system: hw.physmem
+   // physical page size: hw.pagesize
+   // usable pagesize : vm.stats.vm.v_page_size
+   len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len);
+
+   len = sizeof(this->pageSize);
+   if (sysctlbyname("vm.stats.vm.v_page_size", &this->pageSize, &len, NULL, 0) == -1)
+      CRT_fatalError("Cannot get pagesize by sysctl");
+   this->pageSizeKb = this->pageSize / ONE_K;
+
+   // usable page count vm.stats.vm.v_page_count
+   // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size
+   len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len);
+
+   len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len);
+
+   len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len);
+
+   int cpus = 1;
+   len = sizeof(cpus);
+   if (sysctlbyname("hw.ncpu", &cpus, &len, NULL, 0) != 0) {
+      cpus = 1;
+   }
+
+   size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len);
+   this->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long));
+   this->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long));
+   len = sizeof_cp_time_array;
+
+   // fetch initial single (or average) CPU clicks from kernel
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_o, &len, NULL, 0);
+
+   // on smp box, fetch rest of initial CPU's clicks
+   if (cpus > 1) {
+      len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len);
+      this->cp_times_o = xCalloc(cpus, sizeof_cp_time_array);
+      this->cp_times_n = xCalloc(cpus, sizeof_cp_time_array);
+      len = cpus * sizeof_cp_time_array;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_o, &len, NULL, 0);
+   }
+
+   super->existingCPUs = MAXIMUM(cpus, 1);
+   // TODO: support offline CPUs and hot swapping
+   super->activeCPUs = super->existingCPUs;
+
+   if (cpus == 1 ) {
+      this->cpus = xRealloc(this->cpus, sizeof(CPUData));
+   } else {
+      // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well)
+      this->cpus = xRealloc(this->cpus, (super->existingCPUs + 1) * sizeof(CPUData));
+   }
+
+   len = sizeof(this->kernelFScale);
+   if (sysctlbyname("kern.fscale", &this->kernelFScale, &len, NULL, 0) == -1 || this->kernelFScale <= 0) {
+      //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed
+      this->kernelFScale = 2048;
+   }
+
+   this->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
+   if (this->kd == NULL) {
+      CRT_fatalError("kvm_openfiles() failed");
+   }
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   const DragonFlyBSDMachine* this = (const DragonFlyBSDMachine*) super;
+
+   Machine_done(super);
+
+   if (this->kd) {
+      kvm_close(this->kd);
+   }
+
+   if (this->jails) {
+      Hashtable_delete(this->jails);
+   }
+
+   free(this->cp_time_o);
+   free(this->cp_time_n);
+   free(this->cp_times_o);
+   free(this->cp_times_n);
+   free(this->cpus);
+
+   free(this);
+}
+
+static void DragonFlyBSDMachine_scanCPUTime(Machine* super) {
+   const DragonFlyBSDMachine* this = (DragonFlyBSDMachine*) super;
+
+   unsigned int cpus   = super->existingCPUs;  // actual CPU count
+   unsigned int maxcpu = cpus;              // max iteration (in case we have average + smp)
+   int cp_times_offset;
+
+   assert(cpus > 0);
+
+   size_t sizeof_cp_time_array;
+
+   unsigned long* cp_time_n; // old clicks state
+   unsigned long* cp_time_o; // current clicks state
+
+   unsigned long cp_time_d[CPUSTATES];
+   double        cp_time_p[CPUSTATES];
+
+   // get averages or single CPU clicks
+   sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_n, &sizeof_cp_time_array, NULL, 0);
+
+   // get rest of CPUs
+   if (cpus > 1) {
+      // on smp systems DragonFlyBSD kernel concats all CPU states into one long array in
+      // kern.cp_times sysctl OID
+      // we store averages in dfpl->cpus[0], and actual cores after that
+      maxcpu = cpus + 1;
+      sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_n, &sizeof_cp_time_array, NULL, 0);
+   }
+
+   for (unsigned int i = 0; i < maxcpu; i++) {
+      if (cpus == 1) {
+         // single CPU box
+         cp_time_n = this->cp_time_n;
+         cp_time_o = this->cp_time_o;
+      } else {
+         if (i == 0 ) {
+            // average
+            cp_time_n = this->cp_time_n;
+            cp_time_o = this->cp_time_o;
+         } else {
+            // specific smp cores
+            cp_times_offset = i - 1;
+            cp_time_n = this->cp_times_n + (cp_times_offset * CPUSTATES);
+            cp_time_o = this->cp_times_o + (cp_times_offset * CPUSTATES);
+         }
+      }
+
+      // diff old vs new
+      unsigned long long total_o = 0;
+      unsigned long long total_n = 0;
+      unsigned long long total_d = 0;
+      for (int s = 0; s < CPUSTATES; s++) {
+         cp_time_d[s] = cp_time_n[s] - cp_time_o[s];
+         total_o += cp_time_o[s];
+         total_n += cp_time_n[s];
+      }
+
+      // totals
+      total_d = total_n - total_o;
+      if (total_d < 1 ) {
+         total_d = 1;
+      }
+
+      // save current state as old and calc percentages
+      for (int s = 0; s < CPUSTATES; ++s) {
+         cp_time_o[s] = cp_time_n[s];
+         cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100;
+      }
+
+      CPUData* cpuData = &(this->cpus[i]);
+      cpuData->userPercent      = cp_time_p[CP_USER];
+      cpuData->nicePercent      = cp_time_p[CP_NICE];
+      cpuData->systemPercent    = cp_time_p[CP_SYS];
+      cpuData->irqPercent       = cp_time_p[CP_INTR];
+      cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR];
+      // this one is not really used, but we store it anyway
+      cpuData->idlePercent      = cp_time_p[CP_IDLE];
+   }
+}
+
+static void DragonFlyBSDMachine_scanMemoryInfo(Machine* super) {
+   DragonFlyBSDMachine* this = (DragonFlyBSDProcessTable*) super;
+
+   // @etosan:
+   // memory counter relationships seem to be these:
+   //  total = active + wired + inactive + cache + free
+   //  htop_used (unavail to anybody) = active + wired
+   //  htop_cache (for cache meter)   = buffers + cache
+   //  user_free (avail to procs)     = buffers + inactive + cache + free
+   size_t len = sizeof(super->totalMem);
+
+   //disabled for now, as it is always smaller than phycal amount of memory...
+   //...to avoid "where is my memory?" questions
+   //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(this->totalMem), &len, NULL, 0);
+   //this->totalMem *= pageSizeKb;
+   sysctl(MIB_hw_physmem, 2, &(super->totalMem), &len, NULL, 0);
+   super->totalMem /= 1024;
+
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(this->memActive), &len, NULL, 0);
+   this->memActive *= this->pageSizeKb;
+
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(this->memWire), &len, NULL, 0);
+   this->memWire *= this->pageSizeKb;
+
+   sysctl(MIB_vfs_bufspace, 2, &(super->buffersMem), &len, NULL, 0);
+   super->buffersMem /= 1024;
+
+   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(super->cachedMem), &len, NULL, 0);
+   super->cachedMem *= this->pageSizeKb;
+   super->usedMem = this->memActive + this->memWire;
+
+   struct kvm_swap swap[16];
+   int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);
+   super->totalSwap = 0;
+   super->usedSwap = 0;
+   for (int i = 0; i < nswap; i++) {
+      super->totalSwap += swap[i].ksw_total;
+      super->usedSwap += swap[i].ksw_used;
+   }
+   super->totalSwap *= this->pageSizeKb;
+   super->usedSwap *= this->pageSizeKb;
+}
+
+static void DragonFlyBSDMachine_scanJails(DragonFlyBSDMachine* this) {
+   size_t len;
+   char* jails; /* Jail list */
+   char* curpos;
+   char* nextpos;
+
+   if (sysctlbyname("jail.list", NULL, &len, NULL, 0) == -1) {
+      CRT_fatalError("initial sysctlbyname / jail.list failed");
+   }
+
+retry:
+   if (len == 0)
+      return;
+
+   jails = xMalloc(len);
+
+   if (sysctlbyname("jail.list", jails, &len, NULL, 0) == -1) {
+      if (errno == ENOMEM) {
+         free(jails);
+         goto retry;
+      }
+      CRT_fatalError("sysctlbyname / jail.list failed");
+   }
+
+   if (this->jails) {
+      Hashtable_delete(this->jails);
+   }
+
+   this->jails = Hashtable_new(20, true);
+   curpos = jails;
+   while (curpos) {
+      int jailid;
+      char* str_hostname;
+
+      nextpos = strchr(curpos, '\n');
+      if (nextpos) {
+         *nextpos++ = 0;
+      }
+
+      jailid = atoi(strtok(curpos, " "));
+      str_hostname = strtok(NULL, " ");
+
+      char* jname = (char*) (Hashtable_get(this->jails, jailid));
+      if (jname == NULL) {
+         jname = xStrdup(str_hostname);
+         Hashtable_put(this->jails, jailid, jname);
+      }
+
+      curpos = nextpos;
+   }
+
+   free(jails);
+}
+
+char* DragonFlyBSDMachine_readJailName(DragonFlyBSDMachine* host, int jailid) {
+   char* hostname;
+   char* jname;
+
+   if (jailid != 0 && host->jails && (hostname = (char*)Hashtable_get(host->jails, jailid))) {
+      jname = xStrdup(hostname);
+   } else {
+      jname = xStrdup("-");
+   }
+
+   return jname;
+}
+
+void Machine_scan(Machine* super) {
+   DragonFlyBSDMachine* this = (DragonFlyBSDMachine*) super;
+
+   DragonFlyBSDMachine_scanMemoryInfo(super);
+   DragonFlyBSDMachine_scanCPUTime(super);
+   DragonFlyBSDMachine_scanJails(this);
+}
diff --git a/dragonflybsd/DragonFlyBSDMachine.h b/dragonflybsd/DragonFlyBSDMachine.h
new file mode 100644
index 0000000..0d4d8ef
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDMachine.h
@@ -0,0 +1,61 @@
+#ifndef HEADER_DragonFlyBSDMachine
+#define HEADER_DragonFlyBSDMachine
+/*
+htop - DragonFlyBSDMachine.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <sys/types.h>  // required for kvm.h
+#include <kvm.h>
+#include <osreldate.h>
+#include <stdbool.h>
+#include <sys/jail.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/uio.h>
+
+#include "Hashtable.h"
+#include "Machine.h"
+#include "ProcessTable.h"
+#include "UsersTable.h"
+
+
+typedef struct CPUData_ {
+   double userPercent;
+   double nicePercent;
+   double systemPercent;
+   double irqPercent;
+   double idlePercent;
+   double systemAllPercent;
+} CPUData;
+
+typedef struct DragonFlyBSDMachine_ {
+   Machine super;
+   kvm_t* kd;
+
+   Hashtable* jails;
+
+   int pageSize;
+   int pageSizeKb;
+   int kernelFScale;
+
+   unsigned long long int memWire;
+   unsigned long long int memActive;
+   unsigned long long int memInactive;
+   unsigned long long int memFree;
+
+   CPUData* cpus;
+
+   unsigned long* cp_time_o;
+   unsigned long* cp_time_n;
+
+   unsigned long* cp_times_o;
+   unsigned long* cp_times_n;
+} DragonFlyBSDMachine;
+
+char* DragonFlyBSDMachine_readJailName(DragonFlyBSDMachine* host, int jailid);
+
+#endif
diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c
new file mode 100644
index 0000000..4be2198
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDProcess.c
@@ -0,0 +1,121 @@
+/*
+htop - dragonflybsd/DragonFlyBSDProcess.c
+(C) 2015 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#include "CRT.h"
+
+#include "dragonflybsd/Platform.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping (<20s), I Idle, Q Queued for Run, R running, D disk, Z zombie, T traced, W paging, B Blocked, A AskedPage, C Core, J Jailed)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   [MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+   [PROC_COMM] = { .name = "COMM", .title = "COMM            ", .description = "comm string of the process", .flags = 0, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+   [JID] = { .name = "JID", .title = "JID", .description = "Jail prison ID", .flags = 0, .pidColumn = true, },
+   [JAIL] = { .name = "JAIL", .title = "JAIL        ", .description = "Jail prison name", .flags = 0, },
+};
+
+Process* DragonFlyBSDProcess_new(const Machine* host) {
+   DragonFlyBSDProcess* this = xCalloc(1, sizeof(DragonFlyBSDProcess));
+   Object_setClass(this, Class(DragonFlyBSDProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   DragonFlyBSDProcess* this = (DragonFlyBSDProcess*) cast;
+   Process_done((Process*)cast);
+   free(this->jname);
+   free(this);
+}
+
+static void DragonFlyBSDProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const Process* this = (const Process*) super;
+   const DragonFlyBSDProcess* fp = (const DragonFlyBSDProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add Platform-specific fields here
+   case PID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, Process_isKernelThread(this) ? -1 : Process_getPid(this)); break;
+   case JID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, fp->jid); break;
+   case JAIL: Row_printLeftAlignedField(str, attr, fp->jname, 11); return;
+   default:
+      Process_writeField(&fp->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int DragonFlyBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const DragonFlyBSDProcess* p1 = (const DragonFlyBSDProcess*)v1;
+   const DragonFlyBSDProcess* p2 = (const DragonFlyBSDProcess*)v2;
+
+   switch (key) {
+   // add Platform-specific fields here
+   case JID:
+      return SPACESHIP_NUMBER(p1->jid, p2->jid);
+   case JAIL:
+      return SPACESHIP_NULLSTR(p1->jname, p2->jname);
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass DragonFlyBSDProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = DragonFlyBSDProcess_rowWriteField
+   },
+   .compareByKey = DragonFlyBSDProcess_compareByKey
+};
diff --git a/dragonflybsd/DragonFlyBSDProcess.h b/dragonflybsd/DragonFlyBSDProcess.h
new file mode 100644
index 0000000..92747b1
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDProcess.h
@@ -0,0 +1,32 @@
+#ifndef HEADER_DragonFlyBSDProcess
+#define HEADER_DragonFlyBSDProcess
+/*
+htop - dragonflybsd/DragonFlyBSDProcess.h
+(C) 2015 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Object.h"
+#include "Process.h"
+#include "Machine.h"
+
+
+typedef struct DragonFlyBSDProcess_ {
+   Process super;
+   int   jid;
+   char* jname;
+} DragonFlyBSDProcess;
+
+extern const ProcessClass DragonFlyBSDProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* DragonFlyBSDProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+#endif
diff --git a/dragonflybsd/DragonFlyBSDProcessTable.c b/dragonflybsd/DragonFlyBSDProcessTable.c
new file mode 100644
index 0000000..e36086f
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDProcessTable.c
@@ -0,0 +1,322 @@
+/*
+htop - DragonFlyBSDProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "dragonflybsd/DragonFlyBSDProcessTable.h"
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#include <sys/param.h>
+
+#include "CRT.h"
+#include "Macros.h"
+
+#include "dragonflybsd/DragonFlyBSDMachine.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   DragonFlyBSDProcessTable* this = xCalloc(1, sizeof(DragonFlyBSDProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = (ProcessTable*) this;
+   ProcessTable_init(super, Class(DragonFlyBSDProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   const DragonFlyBSDProcessTable* this = (DragonFlyBSDProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+//static void DragonFlyBSDProcessTable_updateExe(const struct kinfo_proc* kproc, Process* proc) {
+//   const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, kproc->kp_pid };
+//   char buffer[2048];
+//   size_t size = sizeof(buffer);
+//   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+//      Process_updateExe(proc, NULL);
+//      return;
+//   }
+//
+//   /* Kernel threads return an empty buffer */
+//   if (buffer[0] == '\0') {
+//      Process_updateExe(proc, NULL);
+//      return;
+//   }
+//
+//   Process_updateExe(proc, buffer);
+//}
+
+static void DragonFlyBSDProcessTable_updateExe(const struct kinfo_proc* kproc, Process* proc) {
+   if (Process_isKernelThread(proc))
+      return;
+
+   char path[32];
+   xSnprintf(path, sizeof(path), "/proc/%d/file", kproc->kp_pid);
+
+   char target[PATH_MAX];
+   ssize_t ret = readlink(path, target, sizeof(target) - 1);
+   if (ret <= 0)
+      return;
+
+   target[ret] = '\0';
+   Process_updateExe(proc, target);
+}
+
+static void DragonFlyBSDProcessTable_updateCwd(const struct kinfo_proc* kproc, Process* proc) {
+   const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_CWD, kproc->kp_pid };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   /* Kernel threads return an empty buffer */
+   if (buffer[0] == '\0') {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   free_and_xStrdup(&proc->procCwd, buffer);
+}
+
+static void DragonFlyBSDProcessTable_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) {
+   Process_updateComm(proc, kproc->kp_comm);
+
+   char** argv = kvm_getargv(kd, kproc, 0);
+   if (!argv || !argv[0]) {
+      Process_updateCmdline(proc, kproc->kp_comm, 0, strlen(kproc->kp_comm));
+      return;
+   }
+
+   size_t len = 0;
+   for (int i = 0; argv[i]; i++) {
+      len += strlen(argv[i]) + 1;
+   }
+
+   char* cmdline = xMalloc(len);
+
+   char* at = cmdline;
+   int end = 0;
+   for (int i = 0; argv[i]; i++) {
+      at = stpcpy(at, argv[i]);
+      if (end == 0) {
+         end = at - cmdline;
+      }
+      *at++ = ' ';
+   }
+   at--;
+   *at = '\0';
+
+   Process_updateCmdline(proc, cmdline, 0, end);
+
+   free(cmdline);
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   const Machine* host = super->host;
+   const DragonFlyMachine* dhost = (const DragonFlyMachine*) host;
+   const Settings* settings = host->settings;
+
+   bool hideKernelThreads = settings->hideKernelThreads;
+   bool hideUserlandThreads = settings->hideUserlandThreads;
+
+   int count = 0;
+
+   const struct kinfo_proc* kprocs = kvm_getprocs(dhost->kd, KERN_PROC_ALL | (!hideUserlandThreads ? KERN_PROC_FLAG_LWP : 0), 0, &count);
+
+   for (int i = 0; i < count; i++) {
+      const struct kinfo_proc* kproc = &kprocs[i];
+      bool preExisting = false;
+      bool ATTR_UNUSED isIdleProcess = false;
+
+      // note: dragonflybsd kernel processes all have the same pid, so we misuse the kernel thread address to give them a unique identifier
+      Process* proc = ProcessTable_getProcess(super, kproc->kp_ktaddr ? (pid_t)kproc->kp_ktaddr : kproc->kp_pid, &preExisting, DragonFlyBSDProcess_new);
+      DragonFlyBSDProcess* dfp = (DragonFlyBSDProcess*) proc;
+
+      if (!preExisting) {
+         dfp->jid = kproc->kp_jailid;
+         if (kproc->kp_ktaddr && kproc->kp_flags & P_SYSTEM) {
+            // dfb kernel threads all have the same pid, so we misuse the kernel thread address to give them a unique identifier
+            Process_setPid(proc, (pid_t)kproc->kp_ktaddr);
+            proc->isKernelThread = true;
+         } else {
+            Process_setPid(proc, kproc->kp_pid);		// process ID
+            proc->isKernelThread = false;
+         }
+         proc->isUserlandThread = kproc->kp_nthreads > 1;
+         Process_setParent(proc, kproc->kp_ppid); // parent process id
+         proc->tpgid = kproc->kp_tpgid;		// tty process group id
+         //Process_setThreadGroup(proc, kproc->kp_lwp.kl_tid);	// thread group id
+         Process_setThreadGroup(proc, kproc->kp_pid);
+         proc->pgrp = kproc->kp_pgid;		// process group id
+         proc->session = kproc->kp_sid;
+         proc->st_uid = kproc->kp_uid;		// user ID
+         proc->processor = kproc->kp_lwp.kl_origcpu;
+         proc->starttime_ctime = kproc->kp_start.tv_sec;
+         Process_fillStarttimeBuffer(proc);
+         proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+
+         proc->tty_nr = kproc->kp_tdev; // control terminal device number
+         const char* name = (kproc->kp_tdev != NODEV) ? devname(kproc->kp_tdev, S_IFCHR) : NULL;
+         if (!name) {
+            free(proc->tty_name);
+            proc->tty_name = NULL;
+         } else {
+            free_and_xStrdup(&proc->tty_name, name);
+         }
+
+         DragonFlyBSDProcessTable_updateExe(kproc, proc);
+         DragonFlyBSDProcessTable_updateProcessName(dhost->kd, kproc, proc);
+
+         if (settings->ss->flags & PROCESS_FLAG_CWD) {
+            DragonFlyBSDProcessTable_updateCwd(kproc, proc);
+         }
+
+         ProcessTable_add(super, proc);
+
+         dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid);
+      } else {
+         proc->processor = kproc->kp_lwp.kl_cpuid;
+         if (dfp->jid != kproc->kp_jailid) {	// process can enter jail anytime
+            dfp->jid = kproc->kp_jailid;
+            free(dfp->jname);
+            dfp->jname = DragonFlyBSDMachine_readJailName(dhost, kproc->kp_jailid);
+         }
+         // if there are reapers in the system, process can get reparented anytime
+         Process_setParent(proc, kproc->kp_ppid);
+         if (proc->st_uid != kproc->kp_uid) {	// some processes change users (eg. to lower privs)
+            proc->st_uid = kproc->kp_uid;
+            proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+         }
+         if (settings->updateProcessNames) {
+            DragonFlyBSDProcessTable_updateProcessName(dhost->kd, kproc, proc);
+         }
+      }
+
+      proc->m_virt = kproc->kp_vm_map_size / ONE_K;
+      proc->m_resident = kproc->kp_vm_rssize * dhost->pageSizeKb;
+      proc->nlwp = kproc->kp_nthreads;		// number of lwp thread
+      proc->time = (kproc->kp_lwp.kl_uticks + kproc->kp_lwp.kl_sticks + kproc->kp_lwp.kl_iticks) / 10000;
+
+      proc->percent_cpu = 100.0 * ((double)kproc->kp_lwp.kl_pctcpu / (double)dhost->kernelFScale);
+      proc->percent_mem = 100.0 * proc->m_resident / (double)(super->totalMem);
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      if (proc->percent_cpu > 0.1) {
+         // system idle process should own all CPU time left regardless of CPU count
+         if (String_eq("idle", kproc->kp_comm)) {
+            isIdleProcess = true;
+         }
+      }
+
+      if (kproc->kp_lwp.kl_pid != -1)
+         proc->priority = kproc->kp_lwp.kl_prio;
+      else
+         proc->priority = -kproc->kp_lwp.kl_tdprio;
+
+      switch (kproc->kp_lwp.kl_rtprio.type) {
+         case RTP_PRIO_REALTIME:
+            proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX + kproc->kp_lwp.kl_rtprio.prio;
+            break;
+         case RTP_PRIO_IDLE:
+            proc->nice = PRIO_MAX + 1 + kproc->kp_lwp.kl_rtprio.prio;
+            break;
+         case RTP_PRIO_THREAD:
+            proc->nice = PRIO_MIN - 1 - RTP_PRIO_MAX - kproc->kp_lwp.kl_rtprio.prio;
+            break;
+         default:
+            proc->nice = kproc->kp_nice;
+            break;
+      }
+
+      // would be nice if we could store multiple states in proc->state (as enum) and have writeField render them
+      /* Taken from: https://github.com/DragonFlyBSD/DragonFlyBSD/blob/c163a4d7ee9c6857ee4e04a3a2cbb50c3de29da1/sys/sys/proc_common.h */
+      switch (kproc->kp_stat) {
+         case SIDL:
+            proc->state = IDLE;
+            isIdleProcess = true;
+            break;
+         case SACTIVE:
+            switch (kproc->kp_lwp.kl_stat) {
+               case LSSLEEP:
+                  if (kproc->kp_lwp.kl_flags & LWP_SINTR) {          // interruptible wait short/long
+                     if (kproc->kp_lwp.kl_slptime >= MAXSLP) {
+                        proc->state = IDLE;
+                        isIdleProcess = true;
+                     } else {
+                        proc->state = SLEEPING;
+                     }
+                  } else if (kproc->kp_lwp.kl_tdflags & TDF_SINTR) { // interruptible lwkt wait
+                     proc->state = SLEEPING;
+                  } else if (kproc->kp_paddr) {                      // uninterruptible wait
+                     proc->state = UNINTERRUPTIBLE_WAIT;
+                  } else {                                           // uninterruptible lwkt wait
+                     proc->state = UNINTERRUPTIBLE_WAIT;
+                  }
+                  break;
+               case LSRUN:
+                  if (kproc->kp_lwp.kl_stat == LSRUN) {
+                     if (!(kproc->kp_lwp.kl_tdflags & (TDF_RUNNING | TDF_RUNQ))) {
+                        proc->state = QUEUED;
+                     } else {
+                        proc->state = RUNNING;
+                     }
+                  }
+                  break;
+               case LSSTOP:
+                  proc->state = STOPPED;
+                  break;
+               default:
+                  proc->state = PAGING;
+                  break;
+            }
+            break;
+         case SSTOP:
+            proc->state = STOPPED;
+            break;
+         case SZOMB:
+            proc->state = ZOMBIE;
+            break;
+         case SCORE:
+            proc->state = BLOCKED;
+            break;
+         default:
+            proc->state = UNKNOWN;
+      }
+
+      if (kproc->kp_flags & P_SWAPPEDOUT)
+         proc->state = SLEEPING;
+      if (kproc->kp_flags & P_TRACED)
+         proc->state = TRACED;
+      if (kproc->kp_flags & P_JAILED)
+         proc->state = TRACED;
+
+      if (Process_isKernelThread(proc))
+         super->kernelThreads++;
+
+      super->totalTasks++;
+
+      if (proc->state == RUNNING)
+         super->runningTasks++;
+
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
+      proc->super.updated = true;
+   }
+}
diff --git a/dragonflybsd/DragonFlyBSDProcessTable.h b/dragonflybsd/DragonFlyBSDProcessTable.h
new file mode 100644
index 0000000..e8ff1af
--- /dev/null
+++ b/dragonflybsd/DragonFlyBSDProcessTable.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_DragonFlyBSDProcessTable
+#define HEADER_DragonFlyBSDProcessTable
+/*
+htop - DragonFlyBSDProcessTable.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/param.h>
+
+#include "ProcessTable.h"
+
+
+typedef struct DragonFlyBSDProcessTable_ {
+   ProcessTable super;
+} DragonFlyBSDProcessTable;
+
+#endif
diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c
new file mode 100644
index 0000000..25afa8b
--- /dev/null
+++ b/dragonflybsd/Platform.c
@@ -0,0 +1,275 @@
+/*
+htop - dragonflybsd/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "dragonflybsd/Platform.h"
+
+#include <math.h>
+#include <time.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <vm/vm_param.h>
+
+#include "ClockMeter.h"
+#include "CPUMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "ProcessTable.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+#include "dragonflybsd/DragonFlyBSDProcessTable.h"
+#include "generic/fdstat_sysctl.h"
+
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number =  0 },
+   { .name = " 1 SIGHUP",    .number =  1 },
+   { .name = " 2 SIGINT",    .number =  2 },
+   { .name = " 3 SIGQUIT",   .number =  3 },
+   { .name = " 4 SIGILL",    .number =  4 },
+   { .name = " 5 SIGTRAP",   .number =  5 },
+   { .name = " 6 SIGABRT",   .number =  6 },
+   { .name = " 7 SIGEMT",    .number =  7 },
+   { .name = " 8 SIGFPE",    .number =  8 },
+   { .name = " 9 SIGKILL",   .number =  9 },
+   { .name = "10 SIGBUS",    .number = 10 },
+   { .name = "11 SIGSEGV",   .number = 11 },
+   { .name = "12 SIGSYS",    .number = 12 },
+   { .name = "13 SIGPIPE",   .number = 13 },
+   { .name = "14 SIGALRM",   .number = 14 },
+   { .name = "15 SIGTERM",   .number = 15 },
+   { .name = "16 SIGURG",    .number = 16 },
+   { .name = "17 SIGSTOP",   .number = 17 },
+   { .name = "18 SIGTSTP",   .number = 18 },
+   { .name = "19 SIGCONT",   .number = 19 },
+   { .name = "20 SIGCHLD",   .number = 20 },
+   { .name = "21 SIGTTIN",   .number = 21 },
+   { .name = "22 SIGTTOU",   .number = 22 },
+   { .name = "23 SIGIO",     .number = 23 },
+   { .name = "24 SIGXCPU",   .number = 24 },
+   { .name = "25 SIGXFSZ",   .number = 25 },
+   { .name = "26 SIGVTALRM", .number = 26 },
+   { .name = "27 SIGPROF",   .number = 27 },
+   { .name = "28 SIGWINCH",  .number = 28 },
+   { .name = "29 SIGINFO",   .number = 29 },
+   { .name = "30 SIGUSR1",   .number = 30 },
+   { .name = "31 SIGUSR2",   .number = 31 },
+   { .name = "32 SIGTHR",    .number = 32 },
+   { .name = "33 SIGLIBRT",  .number = 33 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &MemorySwapMeter_class,
+   &SwapMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &FileDescriptorMeter_class,
+   &BlankMeter_class,
+   NULL
+};
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   struct timeval bootTime, currTime;
+   int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+   size_t size = sizeof(bootTime);
+
+   int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
+   if (err) {
+      return -1;
+   }
+   gettimeofday(&currTime, NULL);
+
+   return (int) difftime(currTime.tv_sec, bootTime.tv_sec);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   struct loadavg loadAverage;
+   int mib[2] = { CTL_VM, VM_LOADAVG };
+   size_t size = sizeof(loadAverage);
+
+   int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0);
+   if (err) {
+      *one = 0;
+      *five = 0;
+      *fifteen = 0;
+      return;
+   }
+   *one     = (double) loadAverage.ldavg[0] / loadAverage.fscale;
+   *five    = (double) loadAverage.ldavg[1] / loadAverage.fscale;
+   *fifteen = (double) loadAverage.ldavg[2] / loadAverage.fscale;
+}
+
+pid_t Platform_getMaxPid(void) {
+   int maxPid;
+   size_t size = sizeof(maxPid);
+   int err = sysctlbyname("kern.pid_max", &maxPid, &size, NULL, 0);
+   if (err) {
+      return 999999;
+   }
+   return maxPid;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   const Machine* host = this->host;
+   const DragonFlyBSDMachine* dhost = (const DragonFlyBSDMachine*) host;
+   unsigned int cpus = host->activeCPUs;
+   const CPUData* cpuData;
+
+   if (cpus == 1) {
+      // single CPU box has everything in fpl->cpus[0]
+      cpuData = &(dhost->cpus[0]);
+   } else {
+      cpuData = &(dhost->cpus[cpu]);
+   }
+
+   double  percent;
+   double* v = this->values;
+
+   v[CPU_METER_NICE]   = cpuData->nicePercent;
+   v[CPU_METER_NORMAL] = cpuData->userPercent;
+   if (super->settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->systemPercent;
+      v[CPU_METER_IRQ]     = cpuData->irqPercent;
+      this->curItems = 4;
+   } else {
+      v[CPU_METER_KERNEL] = cpuData->systemAllPercent;
+      this->curItems = 3;
+   }
+
+   percent = sumPositiveValues(v, this->curItems);
+   percent = MINIMUM(percent, 100.0);
+
+   v[CPU_METER_FREQUENCY] = NAN;
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   return percent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+   // this->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   // this->values[MEMORY_METER_AVAILABLE] = "available memory"
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   // mtr->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // mtr->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   // TODO
+   (void)pid;  // prevent unused warning
+   return NULL;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   Generic_getFileDescriptors_sysctl(used, max);
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   int life;
+   size_t life_len = sizeof(life);
+   if (sysctlbyname("hw.acpi.battery.life", &life, &life_len, NULL, 0) == -1)
+      *percent = NAN;
+   else
+      *percent = life;
+
+   int acline;
+   size_t acline_len = sizeof(acline);
+   if (sysctlbyname("hw.acpi.acline", &acline, &acline_len, NULL, 0) == -1)
+      *isOnAC = AC_ERROR;
+   else
+      *isOnAC = acline == 0 ? AC_ABSENT : AC_PRESENT;
+}
diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h
new file mode 100644
index 0000000..606b004
--- /dev/null
+++ b/dragonflybsd/Platform.h
@@ -0,0 +1,134 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - dragonflybsd/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017 Diederik de Groot
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/dragonflybsd/ProcessField.h b/dragonflybsd/ProcessField.h
new file mode 100644
index 0000000..1409675
--- /dev/null
+++ b/dragonflybsd/ProcessField.h
@@ -0,0 +1,19 @@
+#ifndef HEADER_DragonFlyBSDProcessField
+#define HEADER_DragonFlyBSDProcessField
+/*
+htop - dragonflybsd/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   JID = 100,                    \
+   JAIL = 101,                   \
+                                 \
+   DUMMY_BUMP_FIELD = CWD,       \
+   // End of list
+
+
+#endif /* HEADER_DragonFlyBSDProcessField */
diff --git a/freebsd/FreeBSDMachine.c b/freebsd/FreeBSDMachine.c
new file mode 100644
index 0000000..d781414
--- /dev/null
+++ b/freebsd/FreeBSDMachine.c
@@ -0,0 +1,393 @@
+/*
+htop - FreeBSDMachine.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "freebsd/FreeBSDMachine.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/_iovec.h>
+#include <sys/errno.h>
+#include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN
+#include <sys/jail.h>
+#include <sys/priority.h>
+#include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
+
+#include "CRT.h"
+#include "Compat.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Scheduling.h"
+#include "Settings.h"
+#include "XUtils.h"
+#include "generic/openzfs_sysctl.h"
+#include "zfs/ZfsArcStats.h"
+
+
+static int MIB_hw_physmem[2];
+static int MIB_vm_stats_vm_v_page_count[4];
+
+static int MIB_vm_stats_vm_v_wire_count[4];
+static int MIB_vm_stats_vm_v_active_count[4];
+static int MIB_vm_stats_vm_v_cache_count[4];
+static int MIB_vm_stats_vm_v_inactive_count[4];
+static int MIB_vm_stats_vm_v_free_count[4];
+static int MIB_vm_vmtotal[2];
+
+static int MIB_vfs_bufspace[2];
+
+static int MIB_kern_cp_time[2];
+static int MIB_kern_cp_times[2];
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   FreeBSDMachine* this = xCalloc(1, sizeof(FreeBSDMachine));
+   Machine* super = &this->super;
+   char errbuf[_POSIX2_LINE_MAX];
+   size_t len;
+
+   Machine_init(super, usersTable, userId);
+
+   // physical memory in system: hw.physmem
+   // physical page size: hw.pagesize
+   // usable pagesize : vm.stats.vm.v_page_size
+   len = 2; sysctlnametomib("hw.physmem", MIB_hw_physmem, &len);
+
+   len = sizeof(this->pageSize);
+   if (sysctlbyname("vm.stats.vm.v_page_size", &this->pageSize, &len, NULL, 0) == -1)
+      CRT_fatalError("Cannot get pagesize by sysctl");
+   this->pageSizeKb = this->pageSize / ONE_K;
+
+   // usable page count vm.stats.vm.v_page_count
+   // actually usable memory : vm.stats.vm.v_page_count * vm.stats.vm.v_page_size
+   len = 4; sysctlnametomib("vm.stats.vm.v_page_count", MIB_vm_stats_vm_v_page_count, &len);
+
+   len = 4; sysctlnametomib("vm.stats.vm.v_wire_count", MIB_vm_stats_vm_v_wire_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_active_count", MIB_vm_stats_vm_v_active_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_cache_count", MIB_vm_stats_vm_v_cache_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_inactive_count", MIB_vm_stats_vm_v_inactive_count, &len);
+   len = 4; sysctlnametomib("vm.stats.vm.v_free_count", MIB_vm_stats_vm_v_free_count, &len);
+   len = 2; sysctlnametomib("vm.vmtotal", MIB_vm_vmtotal, &len);
+
+   len = 2; sysctlnametomib("vfs.bufspace", MIB_vfs_bufspace, &len);
+
+   openzfs_sysctl_init(&this->zfs);
+   openzfs_sysctl_updateArcStats(&this->zfs);
+
+   int smp = 0;
+   len = sizeof(smp);
+
+   if (sysctlbyname("kern.smp.active", &smp, &len, NULL, 0) != 0 || len != sizeof(smp)) {
+      smp = 0;
+   }
+
+   int cpus = 1;
+   len = sizeof(cpus);
+
+   if (smp) {
+      int err = sysctlbyname("kern.smp.cpus", &cpus, &len, NULL, 0);
+      if (err) {
+         cpus = 1;
+      }
+   } else {
+      cpus = 1;
+   }
+
+   size_t sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   len = 2; sysctlnametomib("kern.cp_time", MIB_kern_cp_time, &len);
+   this->cp_time_o = xCalloc(CPUSTATES, sizeof(unsigned long));
+   this->cp_time_n = xCalloc(CPUSTATES, sizeof(unsigned long));
+   len = sizeof_cp_time_array;
+
+   // fetch initial single (or average) CPU clicks from kernel
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_o, &len, NULL, 0);
+
+   // on smp box, fetch rest of initial CPU's clicks
+   if (cpus > 1) {
+      len = 2; sysctlnametomib("kern.cp_times", MIB_kern_cp_times, &len);
+      this->cp_times_o = xCalloc(cpus, sizeof_cp_time_array);
+      this->cp_times_n = xCalloc(cpus, sizeof_cp_time_array);
+      len = cpus * sizeof_cp_time_array;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_o, &len, NULL, 0);
+   }
+
+   super->existingCPUs = MAXIMUM(cpus, 1);
+   // TODO: support offline CPUs and hot swapping
+   super->activeCPUs = super->existingCPUs;
+
+   if (cpus == 1 ) {
+      this->cpus = xRealloc(this->cpus, sizeof(CPUData));
+   } else {
+      // on smp we need CPUs + 1 to store averages too (as kernel kindly provides that as well)
+      this->cpus = xRealloc(this->cpus, (super->existingCPUs + 1) * sizeof(CPUData));
+   }
+
+   len = sizeof(this->kernelFScale);
+   if (sysctlbyname("kern.fscale", &this->kernelFScale, &len, NULL, 0) == -1 || this->kernelFScale <= 0) {
+      //sane default for kernel provided CPU percentage scaling, at least on x86 machines, in case this sysctl call failed
+      this->kernelFScale = 2048;
+   }
+
+   this->kd = kvm_openfiles(NULL, "/dev/null", NULL, 0, errbuf);
+   if (this->kd == NULL) {
+      CRT_fatalError("kvm_openfiles() failed");
+   }
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   FreeBSDMachine* this = (FreeBSDMachine*) super;
+
+   Machine_done(super);
+
+   if (this->kd) {
+      kvm_close(this->kd);
+   }
+
+   free(this->cp_time_o);
+   free(this->cp_time_n);
+   free(this->cp_times_o);
+   free(this->cp_times_n);
+   free(this->cpus);
+
+   free(this);
+}
+
+static inline void FreeBSDMachine_scanCPU(Machine* super) {
+   const FreeBSDMachine* this = (FreeBSDMachine*) super;
+
+   unsigned int cpus   = super->existingCPUs; // actual CPU count
+   unsigned int maxcpu = cpus;             // max iteration (in case we have average + smp)
+   int cp_times_offset;
+
+   assert(cpus > 0);
+
+   size_t sizeof_cp_time_array;
+
+   unsigned long* cp_time_n; // old clicks state
+   unsigned long* cp_time_o; // current clicks state
+
+   unsigned long cp_time_d[CPUSTATES];
+   double        cp_time_p[CPUSTATES];
+
+   // get averages or single CPU clicks
+   sizeof_cp_time_array = sizeof(unsigned long) * CPUSTATES;
+   sysctl(MIB_kern_cp_time, 2, this->cp_time_n, &sizeof_cp_time_array, NULL, 0);
+
+   // get rest of CPUs
+   if (cpus > 1) {
+      // on smp systems FreeBSD kernel concats all CPU states into one long array in
+      // kern.cp_times sysctl OID
+      // we store averages in this->cpus[0], and actual cores after that
+      maxcpu = cpus + 1;
+      sizeof_cp_time_array = cpus * sizeof(unsigned long) * CPUSTATES;
+      sysctl(MIB_kern_cp_times, 2, this->cp_times_n, &sizeof_cp_time_array, NULL, 0);
+   }
+
+   for (unsigned int i = 0; i < maxcpu; i++) {
+      if (cpus == 1) {
+         // single CPU box
+         cp_time_n = this->cp_time_n;
+         cp_time_o = this->cp_time_o;
+      } else {
+         if (i == 0 ) {
+            // average
+            cp_time_n = this->cp_time_n;
+            cp_time_o = this->cp_time_o;
+         } else {
+            // specific smp cores
+            cp_times_offset = i - 1;
+            cp_time_n = this->cp_times_n + (cp_times_offset * CPUSTATES);
+            cp_time_o = this->cp_times_o + (cp_times_offset * CPUSTATES);
+         }
+      }
+
+      // diff old vs new
+      unsigned long long total_o = 0;
+      unsigned long long total_n = 0;
+      unsigned long long total_d = 0;
+      for (int s = 0; s < CPUSTATES; s++) {
+         cp_time_d[s] = cp_time_n[s] - cp_time_o[s];
+         total_o += cp_time_o[s];
+         total_n += cp_time_n[s];
+      }
+
+      // totals
+      total_d = total_n - total_o;
+      if (total_d < 1 ) {
+         total_d = 1;
+      }
+
+      // save current state as old and calc percentages
+      for (int s = 0; s < CPUSTATES; ++s) {
+         cp_time_o[s] = cp_time_n[s];
+         cp_time_p[s] = ((double)cp_time_d[s]) / ((double)total_d) * 100;
+      }
+
+      CPUData* cpuData = &(this->cpus[i]);
+      cpuData->userPercent      = cp_time_p[CP_USER];
+      cpuData->nicePercent      = cp_time_p[CP_NICE];
+      cpuData->systemPercent    = cp_time_p[CP_SYS];
+      cpuData->irqPercent       = cp_time_p[CP_INTR];
+      cpuData->systemAllPercent = cp_time_p[CP_SYS] + cp_time_p[CP_INTR];
+      // this one is not really used
+      //cpuData->idlePercent      = cp_time_p[CP_IDLE];
+
+      cpuData->temperature = NAN;
+      cpuData->frequency = NAN;
+
+      const int coreId = (cpus == 1) ? 0 : ((int)i - 1);
+      if (coreId < 0)
+         continue;
+
+      // TODO: test with hyperthreading and multi-cpu systems
+      if (super->settings->showCPUTemperature) {
+         int temperature;
+         size_t len = sizeof(temperature);
+         char mibBuffer[32];
+         xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.temperature", coreId);
+         int r = sysctlbyname(mibBuffer, &temperature, &len, NULL, 0);
+         if (r == 0)
+            cpuData->temperature = (double)(temperature - 2732) / 10.0; // convert from deci-Kelvin to Celsius
+      }
+
+      // TODO: test with hyperthreading and multi-cpu systems
+      if (super->settings->showCPUFrequency) {
+         int frequency;
+         size_t len = sizeof(frequency);
+         char mibBuffer[32];
+         xSnprintf(mibBuffer, sizeof(mibBuffer), "dev.cpu.%d.freq", coreId);
+         int r = sysctlbyname(mibBuffer, &frequency, &len, NULL, 0);
+         if (r == 0)
+            cpuData->frequency = frequency; // keep in MHz
+      }
+   }
+
+   // calculate max temperature and avg frequency for average meter and
+   // propagate frequency to all cores if only supplied for CPU 0
+   if (cpus > 1) {
+      if (super->settings->showCPUTemperature) {
+         double maxTemp = -HUGE_VAL;
+         for (unsigned int i = 1; i < maxcpu; i++) {
+            if (isgreater(this->cpus[i].temperature, maxTemp)) {
+               maxTemp = this->cpus[i].temperature;
+               this->cpus[0].temperature = maxTemp;
+            }
+         }
+      }
+
+      if (super->settings->showCPUFrequency) {
+         const double coreZeroFreq = this->cpus[1].frequency;
+         double freqSum = coreZeroFreq;
+         if (isNonnegative(coreZeroFreq)) {
+            for (unsigned int i = 2; i < maxcpu; i++) {
+               if (!isNonnegative(this->cpus[i].frequency))
+                  this->cpus[i].frequency = coreZeroFreq;
+
+               freqSum += this->cpus[i].frequency;
+            }
+
+            this->cpus[0].frequency = freqSum / (maxcpu - 1);
+         }
+      }
+   }
+}
+
+static void FreeBSDMachine_scanMemoryInfo(Machine* super) {
+   FreeBSDMachine* this = (FreeBSDMachine*) super;
+
+   // @etosan:
+   // memory counter relationships seem to be these:
+   //  total = active + wired + inactive + cache + free
+   //  htop_used (unavail to anybody) = active + wired
+   //  htop_cache (for cache meter)   = buffers + cache
+   //  user_free (avail to procs)     = buffers + inactive + cache + free
+   //
+   // with ZFS ARC situation becomes bit muddled, as ARC behaves like "user_free"
+   // and belongs into cache, but is reported as wired by kernel
+   //
+   // htop_used   = active + (wired - arc)
+   // htop_cache  = buffers + cache + arc
+   u_long totalMem;
+   u_int memActive, memWire, cachedMem;
+   long buffersMem;
+   size_t len;
+   struct vmtotal vmtotal;
+
+   //disabled for now, as it is always smaller than phycal amount of memory...
+   //...to avoid "where is my memory?" questions
+   //sysctl(MIB_vm_stats_vm_v_page_count, 4, &(super->totalMem), &len, NULL, 0);
+   //super->totalMem *= this->pageSizeKb;
+   len = sizeof(totalMem);
+   sysctl(MIB_hw_physmem, 2, &(totalMem), &len, NULL, 0);
+   totalMem /= 1024;
+   super->totalMem = totalMem;
+
+   len = sizeof(memActive);
+   sysctl(MIB_vm_stats_vm_v_active_count, 4, &(memActive), &len, NULL, 0);
+   memActive *= this->pageSizeKb;
+   this->memActive = memActive;
+
+   len = sizeof(memWire);
+   sysctl(MIB_vm_stats_vm_v_wire_count, 4, &(memWire), &len, NULL, 0);
+   memWire *= this->pageSizeKb;
+   this->memWire = memWire;
+
+   len = sizeof(buffersMem);
+   sysctl(MIB_vfs_bufspace, 2, &(buffersMem), &len, NULL, 0);
+   buffersMem /= 1024;
+   super->buffersMem = buffersMem;
+
+   len = sizeof(cachedMem);
+   sysctl(MIB_vm_stats_vm_v_cache_count, 4, &(cachedMem), &len, NULL, 0);
+   cachedMem *= this->pageSizeKb;
+   super->cachedMem = cachedMem;
+
+   len = sizeof(vmtotal);
+   sysctl(MIB_vm_vmtotal, 2, &(vmtotal), &len, NULL, 0);
+   super->sharedMem = vmtotal.t_rmshr * this->pageSizeKb;
+
+   super->usedMem = this->memActive + this->memWire;
+
+   struct kvm_swap swap[16];
+   int nswap = kvm_getswapinfo(this->kd, swap, ARRAYSIZE(swap), 0);
+   super->totalSwap = 0;
+   super->usedSwap = 0;
+   for (int i = 0; i < nswap; i++) {
+      super->totalSwap += swap[i].ksw_total;
+      super->usedSwap += swap[i].ksw_used;
+   }
+   super->totalSwap *= this->pageSizeKb;
+   super->usedSwap *= this->pageSizeKb;
+}
+
+void Machine_scan(Machine* super) {
+   FreeBSDMachine* this = (FreeBSDMachine*) super;
+
+   openzfs_sysctl_updateArcStats(&this->zfs);
+   FreeBSDMachine_scanMemoryInfo(super);
+   FreeBSDMachine_scanCPU(super);
+}
+
+bool Machine_isCPUonline(const Machine* host, unsigned int id) {
+   assert(id < host->existingCPUs);
+
+   // TODO: support offline CPUs and hot swapping
+   (void) host; (void) id;
+
+   return true;
+}
diff --git a/freebsd/FreeBSDMachine.h b/freebsd/FreeBSDMachine.h
new file mode 100644
index 0000000..f34b568
--- /dev/null
+++ b/freebsd/FreeBSDMachine.h
@@ -0,0 +1,54 @@
+#ifndef HEADER_FreeBSDMachine
+#define HEADER_FreeBSDMachine
+/*
+htop - FreeBSDMachine.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kvm.h>
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "Machine.h"
+#include "UsersTable.h"
+#include "zfs/ZfsArcStats.h"
+
+
+typedef struct CPUData_ {
+   double userPercent;
+   double nicePercent;
+   double systemPercent;
+   double irqPercent;
+   double systemAllPercent;
+
+   double frequency;
+   double temperature;
+} CPUData;
+
+typedef struct FreeBSDMachine_ {
+   Machine super;
+   kvm_t* kd;
+
+   int pageSize;
+   int pageSizeKb;
+   int kernelFScale;
+
+   unsigned long long int memWire;
+   unsigned long long int memActive;
+
+   ZfsArcStats zfs;
+
+   CPUData* cpus;
+
+   unsigned long* cp_time_o;
+   unsigned long* cp_time_n;
+
+   unsigned long* cp_times_o;
+   unsigned long* cp_times_n;
+
+} FreeBSDMachine;
+
+#endif
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
new file mode 100644
index 0000000..e7582a7
--- /dev/null
+++ b/freebsd/FreeBSDProcess.c
@@ -0,0 +1,133 @@
+/*
+htop - FreeBSDProcess.c
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "freebsd/FreeBSDProcess.h"
+
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Process.h"
+#include "RichString.h"
+#include "Scheduling.h"
+#include "XUtils.h"
+
+
+const char* const nodevStr = "nodev";
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of copy-on-write faults", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, .defaultSortDesc = true, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+   [PROC_COMM] = { .name = "COMM", .title = "COMM            ", .description = "comm string of the process", .flags = 0, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+#ifdef SCHEDULER_SUPPORT
+   [SCHEDULERPOLICY] = { .name = "SCHEDULERPOLICY", .title = "SCHED ", .description = "Current scheduling policy of the process", .flags = PROCESS_FLAG_SCHEDPOL, },
+#endif
+   [JID] = { .name = "JID", .title = "JID", .description = "Jail prison ID", .flags = 0, .pidColumn = true, },
+   [JAIL] = { .name = "JAIL", .title = "JAIL        ", .description = "Jail prison name", .flags = 0, },
+   [EMULATION] = { .name = "EMULATION", .title = "EMULATION        ", .description = "System call emulation environment (ABI)", .flags = 0, },
+};
+
+Process* FreeBSDProcess_new(const Machine* machine) {
+   FreeBSDProcess* this = xCalloc(1, sizeof(FreeBSDProcess));
+   Object_setClass(this, Class(FreeBSDProcess));
+   Process_init(&this->super, machine);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   FreeBSDProcess* this = (FreeBSDProcess*) cast;
+   Process_done((Process*)cast);
+   free(this->emul);
+   free(this->jname);
+   free(this);
+}
+
+static void FreeBSDProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const FreeBSDProcess* fp = (const FreeBSDProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add FreeBSD-specific fields here
+   case JID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, fp->jid); break;
+   case JAIL:
+      Row_printLeftAlignedField(str, attr, fp->jname ? fp->jname : "N/A", 11);
+      return;
+   case EMULATION:
+      Row_printLeftAlignedField(str, attr, fp->emul ? fp->emul : "N/A", 16);
+      return;
+   default:
+      Process_writeField(&fp->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const FreeBSDProcess* p1 = (const FreeBSDProcess*)v1;
+   const FreeBSDProcess* p2 = (const FreeBSDProcess*)v2;
+
+   switch (key) {
+   // add FreeBSD-specific fields here
+   case JID:
+      return SPACESHIP_NUMBER(p1->jid, p2->jid);
+   case JAIL:
+      return SPACESHIP_NULLSTR(p1->jname, p2->jname);
+   case EMULATION:
+      return SPACESHIP_NULLSTR(p1->emul, p2->emul);
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass FreeBSDProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = FreeBSDProcess_rowWriteField
+   },
+   .compareByKey = FreeBSDProcess_compareByKey
+};
diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h
new file mode 100644
index 0000000..012cfa2
--- /dev/null
+++ b/freebsd/FreeBSDProcess.h
@@ -0,0 +1,32 @@
+#ifndef HEADER_FreeBSDProcess
+#define HEADER_FreeBSDProcess
+/*
+htop - FreeBSDProcess.h
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Object.h"
+#include "Process.h"
+#include "Machine.h"
+
+
+typedef struct FreeBSDProcess_ {
+   Process super;
+   int   jid;
+   char* jname;
+   char* emul;
+} FreeBSDProcess;
+
+extern const ProcessClass FreeBSDProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* FreeBSDProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+#endif
diff --git a/freebsd/FreeBSDProcessTable.c b/freebsd/FreeBSDProcessTable.c
new file mode 100644
index 0000000..9e18b8a
--- /dev/null
+++ b/freebsd/FreeBSDProcessTable.c
@@ -0,0 +1,288 @@
+/*
+htop - FreeBSDProcessTable.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "freebsd/FreeBSDProcessTable.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/_iovec.h>
+#include <sys/errno.h>
+#include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN
+#include <sys/jail.h>
+#include <sys/priority.h>
+#include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <sys/vmmeter.h>
+
+#include "CRT.h"
+#include "Compat.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Process.h"
+#include "ProcessTable.h"
+#include "Scheduling.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+#include "freebsd/FreeBSDMachine.h"
+#include "freebsd/FreeBSDProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   FreeBSDProcessTable* this = xCalloc(1, sizeof(FreeBSDProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(FreeBSDProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   FreeBSDProcessTable* this = (FreeBSDProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+static void FreeBSDProcessTable_updateExe(const struct kinfo_proc* kproc, Process* proc) {
+   if (Process_isKernelThread(proc)) {
+      Process_updateExe(proc, NULL);
+      return;
+   }
+
+   const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, kproc->ki_pid };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+      Process_updateExe(proc, NULL);
+      return;
+   }
+
+   Process_updateExe(proc, buffer);
+}
+
+static void FreeBSDProcessTable_updateCwd(const struct kinfo_proc* kproc, Process* proc) {
+#ifdef KERN_PROC_CWD
+   const int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_CWD, kproc->ki_pid };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   /* Kernel threads return an empty buffer */
+   if (buffer[0] == '\0') {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   free_and_xStrdup(&proc->procCwd, buffer);
+#else
+   proc->procCwd = NULL;
+#endif
+}
+
+static void FreeBSDProcessTable_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) {
+   Process_updateComm(proc, kproc->ki_comm);
+
+   char** argv = kvm_getargv(kd, kproc, 0);
+   if (!argv || !argv[0]) {
+      Process_updateCmdline(proc, kproc->ki_comm, 0, strlen(kproc->ki_comm));
+      return;
+   }
+
+   size_t len = 0;
+   for (int i = 0; argv[i]; i++) {
+      len += strlen(argv[i]) + 1;
+   }
+
+   char* cmdline = xMalloc(len);
+   char* at = cmdline;
+   int end = 0;
+   for (int i = 0; argv[i]; i++) {
+      at = stpcpy(at, argv[i]);
+      if (end == 0) {
+         end = at - cmdline;
+      }
+      *at++ = ' ';
+   }
+   at--;
+   *at = '\0';
+
+   Process_updateCmdline(proc, cmdline, 0, end);
+
+   free(cmdline);
+}
+
+static char* FreeBSDProcessTable_readJailName(const struct kinfo_proc* kproc) {
+   if (kproc->ki_jid == 0)
+      return xStrdup("-");
+
+   char jnamebuf[MAXHOSTNAMELEN] = {0};
+   struct iovec jiov[4];
+
+IGNORE_WCASTQUAL_BEGIN
+   *(const void**)&jiov[0].iov_base = "jid";
+   jiov[0].iov_len = sizeof("jid");
+   jiov[1].iov_base = (void*) &kproc->ki_jid;
+   jiov[1].iov_len = sizeof(kproc->ki_jid);
+   *(const void**)&jiov[2].iov_base = "name";
+   jiov[2].iov_len = sizeof("name");
+   jiov[3].iov_base = jnamebuf;
+   jiov[3].iov_len = sizeof(jnamebuf);
+IGNORE_WCASTQUAL_END
+
+   int jid = jail_get(jiov, 4, 0);
+   if (jid == kproc->ki_jid)
+      return xStrdup(jnamebuf);
+
+   return NULL;
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   const Machine* host = super->super.host;
+   const FreeBSDMachine* fhost = (const FreeBSDMachine*) host;
+   const Settings* settings = host->settings;
+   bool hideKernelThreads = settings->hideKernelThreads;
+   bool hideUserlandThreads = settings->hideUserlandThreads;
+
+   int count = 0;
+   const struct kinfo_proc* kprocs = kvm_getprocs(fhost->kd, KERN_PROC_PROC, 0, &count);
+
+   for (int i = 0; i < count; i++) {
+      const struct kinfo_proc* kproc = &kprocs[i];
+      bool preExisting = false;
+      Process* proc = ProcessTable_getProcess(super, kproc->ki_pid, &preExisting, FreeBSDProcess_new);
+      FreeBSDProcess* fp = (FreeBSDProcess*) proc;
+
+      if (!preExisting) {
+         fp->jid = kproc->ki_jid;
+         Process_setPid(proc, kproc->ki_pid);
+         Process_setThreadGroup(proc, kproc->ki_pid);
+         Process_setParent(proc, kproc->ki_ppid);
+         proc->isKernelThread = kproc->ki_pid != 1 && (kproc->ki_flag & P_SYSTEM);
+         proc->isUserlandThread = false;
+         proc->tpgid = kproc->ki_tpgid;
+         proc->session = kproc->ki_sid;
+         proc->pgrp = kproc->ki_pgid;
+         proc->st_uid = kproc->ki_uid;
+         proc->starttime_ctime = kproc->ki_start.tv_sec;
+         if (proc->starttime_ctime < 0) {
+            proc->starttime_ctime = host->realtimeMs / 1000;
+         }
+         Process_fillStarttimeBuffer(proc);
+         proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+         ProcessTable_add(super, proc);
+
+         FreeBSDProcessTable_updateExe(kproc, proc);
+         FreeBSDProcessTable_updateProcessName(fhost->kd, kproc, proc);
+
+         if (settings->ss->flags & PROCESS_FLAG_CWD) {
+            FreeBSDProcessTable_updateCwd(kproc, proc);
+         }
+
+         fp->jname = FreeBSDProcessTable_readJailName(kproc);
+
+         proc->tty_nr = kproc->ki_tdev;
+         const char* name = (kproc->ki_tdev != NODEV) ? devname(kproc->ki_tdev, S_IFCHR) : NULL;
+         if (!name) {
+            free(proc->tty_name);
+            proc->tty_name = NULL;
+         } else {
+            free_and_xStrdup(&proc->tty_name, name);
+         }
+      } else {
+         if (fp->jid != kproc->ki_jid) {
+            // process can enter jail anytime
+            fp->jid = kproc->ki_jid;
+            free(fp->jname);
+            fp->jname = FreeBSDProcessTable_readJailName(kproc);
+         }
+         // if there are reapers in the system, process can get reparented anytime
+         Process_setParent(proc, kproc->ki_ppid);
+         if (proc->st_uid != kproc->ki_uid) {
+            // some processes change users (eg. to lower privs)
+            proc->st_uid = kproc->ki_uid;
+            proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+         }
+         if (settings->updateProcessNames) {
+            FreeBSDProcessTable_updateProcessName(fhost->kd, kproc, proc);
+         }
+      }
+
+      free_and_xStrdup(&fp->emul, kproc->ki_emul);
+
+      // from FreeBSD source /src/usr.bin/top/machine.c
+      proc->m_virt = kproc->ki_size / ONE_K;
+      proc->m_resident = kproc->ki_rssize * fhost->pageSizeKb;
+      proc->nlwp = kproc->ki_numthreads;
+      proc->time = (kproc->ki_runtime + 5000) / 10000;
+
+      proc->percent_cpu = 100.0 * ((double)kproc->ki_pctcpu / (double)fhost->kernelFScale);
+      proc->percent_mem = 100.0 * proc->m_resident / (double)(host->totalMem);
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      if (kproc->ki_stat == SRUN && kproc->ki_oncpu != NOCPU) {
+         proc->processor = kproc->ki_oncpu;
+      } else {
+         proc->processor = kproc->ki_lastcpu;
+      }
+
+      proc->majflt = kproc->ki_cow;
+
+      proc->priority = kproc->ki_pri.pri_level - PZERO;
+
+      if (String_eq("intr", kproc->ki_comm) && (kproc->ki_flag & P_SYSTEM)) {
+         proc->nice = 0; //@etosan: intr kernel process (not thread) has weird nice value
+      } else if (kproc->ki_pri.pri_class == PRI_TIMESHARE) {
+         proc->nice = kproc->ki_nice - NZERO;
+      } else if (PRI_IS_REALTIME(kproc->ki_pri.pri_class)) {
+         proc->nice = PRIO_MIN - 1 - (PRI_MAX_REALTIME - kproc->ki_pri.pri_level);
+      } else {
+         proc->nice = PRIO_MAX + 1 + kproc->ki_pri.pri_level - PRI_MIN_IDLE;
+      }
+
+      /* Taken from: https://github.com/freebsd/freebsd-src/blob/1ad2d87778970582854082bcedd2df0394fd4933/sys/sys/proc.h#L851 */
+      switch (kproc->ki_stat) {
+         case SIDL:   proc->state = IDLE; break;
+         case SRUN:   proc->state = RUNNING; break;
+         case SSLEEP: proc->state = SLEEPING; break;
+         case SSTOP:  proc->state = STOPPED; break;
+         case SZOMB:  proc->state = ZOMBIE; break;
+         case SWAIT:  proc->state = WAITING; break;
+         case SLOCK:  proc->state = BLOCKED; break;
+         default:     proc->state = UNKNOWN;
+      }
+
+      if (Process_isKernelThread(proc))
+         super->kernelThreads++;
+
+#ifdef SCHEDULER_SUPPORT
+      if (settings->ss->flags & PROCESS_FLAG_SCHEDPOL)
+         Scheduling_readProcessPolicy(proc);
+#endif
+
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
+
+      super->totalTasks++;
+      if (proc->state == RUNNING)
+         super->runningTasks++;
+      proc->super.updated = true;
+   }
+}
diff --git a/freebsd/FreeBSDProcessTable.h b/freebsd/FreeBSDProcessTable.h
new file mode 100644
index 0000000..23a6ab2
--- /dev/null
+++ b/freebsd/FreeBSDProcessTable.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_FreeBSDProcessTable
+#define HEADER_FreeBSDProcessTable
+/*
+htop - FreeBSDProcessTable.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "ProcessTable.h"
+#include "UsersTable.h"
+
+typedef struct FreeBSDProcessTable_ {
+   ProcessTable super;
+} FreeBSDProcessTable;
+
+#endif
diff --git a/freebsd/Platform.c b/freebsd/Platform.c
new file mode 100644
index 0000000..9be7195
--- /dev/null
+++ b/freebsd/Platform.c
@@ -0,0 +1,388 @@
+/*
+htop - freebsd/Platform.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "freebsd/Platform.h"
+
+#include <devstat.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <time.h>
+#include <net/if.h>
+#include <net/if_mib.h>
+#include <sys/_types.h>
+#include <sys/devicestat.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <vm/vm_param.h>
+
+#include "CPUMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "DiskIOMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Settings.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+#include "freebsd/FreeBSDMachine.h"
+#include "generic/fdstat_sysctl.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number =  0 },
+   { .name = " 1 SIGHUP",    .number =  1 },
+   { .name = " 2 SIGINT",    .number =  2 },
+   { .name = " 3 SIGQUIT",   .number =  3 },
+   { .name = " 4 SIGILL",    .number =  4 },
+   { .name = " 5 SIGTRAP",   .number =  5 },
+   { .name = " 6 SIGABRT",   .number =  6 },
+   { .name = " 7 SIGEMT",    .number =  7 },
+   { .name = " 8 SIGFPE",    .number =  8 },
+   { .name = " 9 SIGKILL",   .number =  9 },
+   { .name = "10 SIGBUS",    .number = 10 },
+   { .name = "11 SIGSEGV",   .number = 11 },
+   { .name = "12 SIGSYS",    .number = 12 },
+   { .name = "13 SIGPIPE",   .number = 13 },
+   { .name = "14 SIGALRM",   .number = 14 },
+   { .name = "15 SIGTERM",   .number = 15 },
+   { .name = "16 SIGURG",    .number = 16 },
+   { .name = "17 SIGSTOP",   .number = 17 },
+   { .name = "18 SIGTSTP",   .number = 18 },
+   { .name = "19 SIGCONT",   .number = 19 },
+   { .name = "20 SIGCHLD",   .number = 20 },
+   { .name = "21 SIGTTIN",   .number = 21 },
+   { .name = "22 SIGTTOU",   .number = 22 },
+   { .name = "23 SIGIO",     .number = 23 },
+   { .name = "24 SIGXCPU",   .number = 24 },
+   { .name = "25 SIGXFSZ",   .number = 25 },
+   { .name = "26 SIGVTALRM", .number = 26 },
+   { .name = "27 SIGPROF",   .number = 27 },
+   { .name = "28 SIGWINCH",  .number = 28 },
+   { .name = "29 SIGINFO",   .number = 29 },
+   { .name = "30 SIGUSR1",   .number = 30 },
+   { .name = "31 SIGUSR2",   .number = 31 },
+   { .name = "32 SIGTHR",    .number = 32 },
+   { .name = "33 SIGLIBRT",  .number = 33 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &BlankMeter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
+   &DiskIOMeter_class,
+   &FileDescriptorMeter_class,
+   &NetworkIOMeter_class,
+   NULL
+};
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   struct timeval bootTime, currTime;
+   const int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+   size_t size = sizeof(bootTime);
+
+   int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
+   if (err) {
+      return -1;
+   }
+   gettimeofday(&currTime, NULL);
+
+   return (int) difftime(currTime.tv_sec, bootTime.tv_sec);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   struct loadavg loadAverage;
+   const int mib[2] = { CTL_VM, VM_LOADAVG };
+   size_t size = sizeof(loadAverage);
+
+   int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0);
+   if (err) {
+      *one = 0;
+      *five = 0;
+      *fifteen = 0;
+      return;
+   }
+   *one     = (double) loadAverage.ldavg[0] / loadAverage.fscale;
+   *five    = (double) loadAverage.ldavg[1] / loadAverage.fscale;
+   *fifteen = (double) loadAverage.ldavg[2] / loadAverage.fscale;
+}
+
+pid_t Platform_getMaxPid(void) {
+   int maxPid;
+   size_t size = sizeof(maxPid);
+   int err = sysctlbyname("kern.pid_max", &maxPid, &size, NULL, 0);
+   if (err) {
+      return 99999;
+   }
+   return maxPid;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   const Machine* host = this->host;
+   const FreeBSDMachine* fhost = (const FreeBSDMachine*) host;
+   unsigned int cpus = host->activeCPUs;
+
+   // single CPU box has everything in fhost->cpus[0]
+   const CPUData* cpuData = cpus == 1 ? &fhost->cpus[0] : &fhost->cpus[cpu];
+
+   double  percent;
+   double* v = this->values;
+
+   v[CPU_METER_NICE]   = cpuData->nicePercent;
+   v[CPU_METER_NORMAL] = cpuData->userPercent;
+   if (host->settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->systemPercent;
+      v[CPU_METER_IRQ]     = cpuData->irqPercent;
+      this->curItems = 4;
+      percent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL] + v[CPU_METER_IRQ];
+   } else {
+      v[CPU_METER_NORMAL] = cpuData->systemAllPercent;
+      this->curItems = 3;
+      percent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL];
+   }
+
+   percent = CLAMP(percent, 0.0, 100.0);
+
+   v[CPU_METER_FREQUENCY] = cpuData->frequency;
+   v[CPU_METER_TEMPERATURE] = cpuData->temperature;
+
+   return percent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   const FreeBSDMachine* fhost = (const FreeBSDMachine*) host;
+
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   this->values[MEMORY_METER_SHARED] = host->sharedMem;
+   // this->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   // this->values[MEMORY_METER_AVAILABLE] = "available memory"
+
+   if (fhost->zfs.enabled) {
+      // ZFS does not shrink below the value of zfs_arc_min.
+      unsigned long long int shrinkableSize = 0;
+      if (fhost->zfs.size > fhost->zfs.min)
+         shrinkableSize = fhost->zfs.size - fhost->zfs.min;
+      this->values[MEMORY_METER_USED] -= shrinkableSize;
+      this->values[MEMORY_METER_CACHE] += shrinkableSize;
+      // this->values[MEMORY_METER_AVAILABLE] += shrinkableSize;
+   }
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   // this->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // this->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+void Platform_setZfsArcValues(Meter* this) {
+   const FreeBSDMachine* fhost = (const FreeBSDMachine*) this->host;
+
+   ZfsArcMeter_readStats(this, &fhost->zfs);
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   const FreeBSDMachine* fhost = (const FreeBSDMachine*) this->host;
+
+   ZfsCompressedArcMeter_readStats(this, &fhost->zfs);
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   const int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ENV, pid };
+
+   size_t capacity = ARG_MAX;
+   char* env = xMalloc(capacity);
+
+   int err = sysctl(mib, 4, env, &capacity, NULL, 0);
+   if (err || capacity == 0) {
+      free(env);
+      return NULL;
+   }
+
+   if (env[capacity - 1] || env[capacity - 2]) {
+      env = xRealloc(env, capacity + 2);
+      env[capacity] = 0;
+      env[capacity + 1] = 0;
+   }
+
+   return env;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   Generic_getFileDescriptors_sysctl(used, max);
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+
+   if (devstat_checkversion(NULL) < 0)
+      return false;
+
+   // use static to plug memory leak; see #841
+   static struct devinfo info = { 0 };
+   struct statinfo current = { .dinfo = &info };
+
+   // get number of devices
+   if (devstat_getdevs(NULL, &current) < 0)
+      return false;
+
+   int count = current.dinfo->numdevs;
+
+   unsigned long long int bytesReadSum = 0, bytesWriteSum = 0, timeSpendSum = 0;
+
+   // get data
+   for (int i = 0; i < count; i++) {
+      uint64_t bytes_read, bytes_write;
+      long double busy_time;
+
+      devstat_compute_statistics(&current.dinfo->devices[i],
+                                 NULL,
+                                 1.0,
+                                 DSM_TOTAL_BYTES_READ, &bytes_read,
+                                 DSM_TOTAL_BYTES_WRITE, &bytes_write,
+                                 DSM_TOTAL_BUSY_TIME, &busy_time,
+                                 DSM_NONE);
+
+      bytesReadSum += bytes_read;
+      bytesWriteSum += bytes_write;
+      timeSpendSum += 1000 * busy_time;
+   }
+
+   data->totalBytesRead = bytesReadSum;
+   data->totalBytesWritten = bytesWriteSum;
+   data->totalMsTimeSpend = timeSpendSum;
+   return true;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   // get number of interfaces
+   int count;
+   size_t countLen = sizeof(count);
+   const int countMib[] = { CTL_NET, PF_LINK, NETLINK_GENERIC, IFMIB_SYSTEM, IFMIB_IFCOUNT };
+
+   int r = sysctl(countMib, ARRAYSIZE(countMib), &count, &countLen, NULL, 0);
+   if (r < 0)
+      return false;
+
+   memset(data, 0, sizeof(NetworkIOData));
+   for (int i = 1; i <= count; i++) {
+      struct ifmibdata ifmd;
+      size_t ifmdLen = sizeof(ifmd);
+
+      const int dataMib[] = { CTL_NET, PF_LINK, NETLINK_GENERIC, IFMIB_IFDATA, i, IFDATA_GENERAL };
+
+      r = sysctl(dataMib, ARRAYSIZE(dataMib), &ifmd, &ifmdLen, NULL, 0);
+      if (r < 0)
+         continue;
+
+      if (ifmd.ifmd_flags & IFF_LOOPBACK)
+         continue;
+
+      data->bytesReceived += ifmd.ifmd_data.ifi_ibytes;
+      data->packetsReceived += ifmd.ifmd_data.ifi_ipackets;
+      data->bytesTransmitted += ifmd.ifmd_data.ifi_obytes;
+      data->packetsTransmitted += ifmd.ifmd_data.ifi_opackets;
+   }
+
+   return true;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   int life;
+   size_t life_len = sizeof(life);
+   if (sysctlbyname("hw.acpi.battery.life", &life, &life_len, NULL, 0) == -1)
+      *percent = NAN;
+   else
+      *percent = life;
+
+   int acline;
+   size_t acline_len = sizeof(acline);
+   if (sysctlbyname("hw.acpi.acline", &acline, &acline_len, NULL, 0) == -1)
+      *isOnAC = AC_ERROR;
+   else
+      *isOnAC = acline == 0 ? AC_ABSENT : AC_PRESENT;
+}
diff --git a/freebsd/Platform.h b/freebsd/Platform.h
new file mode 100644
index 0000000..c358d85
--- /dev/null
+++ b/freebsd/Platform.h
@@ -0,0 +1,134 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - freebsd/Platform.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/freebsd/ProcessField.h b/freebsd/ProcessField.h
new file mode 100644
index 0000000..d20900d
--- /dev/null
+++ b/freebsd/ProcessField.h
@@ -0,0 +1,20 @@
+#ifndef HEADER_FreeBSDProcessField
+#define HEADER_FreeBSDProcessField
+/*
+htop - freebsd/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   JID = 100,                    \
+   JAIL = 101,                   \
+   EMULATION = 102,              \
+                                 \
+   DUMMY_BUMP_FIELD = CWD,       \
+   // End of list
+
+
+#endif /* HEADER_FreeBSDProcessField */
diff --git a/generic/fdstat_sysctl.c b/generic/fdstat_sysctl.c
new file mode 100644
index 0000000..ea374fb
--- /dev/null
+++ b/generic/fdstat_sysctl.c
@@ -0,0 +1,80 @@
+/*
+htop - generic/fdstat_sysctl.c
+(C) 2022-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "generic/fdstat_sysctl.h"
+
+#include <math.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <sys/types.h> // Shitty FreeBSD upstream headers
+#include <sys/sysctl.h>
+
+
+static void Generic_getFileDescriptors_sysctl_internal(
+   const char* sysctlname_maxfiles,
+   const char* sysctlname_numfiles,
+   size_t size_header,
+   size_t size_entry,
+   double* used,
+   double* max
+) {
+   *used = NAN;
+   *max = 65536;
+
+   int max_fd, open_fd;
+   size_t len;
+
+   len = sizeof(max_fd);
+   if (sysctlname_maxfiles && sysctlbyname(sysctlname_maxfiles, &max_fd, &len, NULL, 0) == 0) {
+      if (max_fd) {
+         *max = max_fd;
+      } else {
+         *max = NAN;
+      }
+   }
+
+   len = sizeof(open_fd);
+   if (sysctlname_numfiles && sysctlbyname(sysctlname_numfiles, &open_fd, &len, NULL, 0) == 0) {
+      *used = open_fd;
+      return;
+   }
+
+   // If no sysctl arc available, try to guess from the file table size at kern.file
+   // The size per entry differs per OS, thus skip if we don't know:
+   if (!size_entry)
+      return;
+
+   len = 0;
+   if (sysctlbyname("kern.file", NULL, &len, NULL, 0) < 0)
+      return;
+
+   if (len < size_header)
+      return;
+
+   *used = (len - size_header) / size_entry;
+}
+
+void Generic_getFileDescriptors_sysctl(double* used, double* max) {
+#if defined(HTOP_DARWIN)
+   Generic_getFileDescriptors_sysctl_internal(
+      "kern.maxfiles", "kern.num_files", 0, 0, used, max);
+#elif defined(HTOP_DRAGONFLY)
+   Generic_getFileDescriptors_sysctl_internal(
+      "kern.maxfiles", NULL, 0, sizeof(struct kinfo_file), used, max);
+#elif defined(HTOP_FREEBSD)
+   Generic_getFileDescriptors_sysctl_internal(
+      "kern.maxfiles", "kern.openfiles", 0, 0, used, max);
+#elif defined(HTOP_NETBSD)
+   Generic_getFileDescriptors_sysctl_internal(
+      "kern.maxfiles", NULL, 0, sizeof(struct kinfo_file), used, max);
+#else
+#error Unknown platform: Please implement proper way to query open/max file information
+#endif
+}
diff --git a/generic/fdstat_sysctl.h b/generic/fdstat_sysctl.h
new file mode 100644
index 0000000..107fcab
--- /dev/null
+++ b/generic/fdstat_sysctl.h
@@ -0,0 +1,13 @@
+#ifndef HEADER_fdstat_sysctl
+#define HEADER_fdstat_sysctl
+/*
+htop - generic/fdstat_sysctl.h
+(C) 2022-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+void Generic_getFileDescriptors_sysctl(double* used, double* max);
+
+#endif
diff --git a/generic/gettime.c b/generic/gettime.c
new file mode 100644
index 0000000..209f523
--- /dev/null
+++ b/generic/gettime.c
@@ -0,0 +1,62 @@
+/*
+htop - generic/gettime.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "generic/gettime.h"
+
+#include <string.h>
+#include <time.h>
+
+
+void Generic_gettime_realtime(struct timeval* tvp, uint64_t* msec) {
+
+#if defined(HAVE_CLOCK_GETTIME)
+
+   struct timespec ts;
+   if (clock_gettime(CLOCK_REALTIME, &ts) == 0) {
+      tvp->tv_sec = ts.tv_sec;
+      tvp->tv_usec = ts.tv_nsec / 1000;
+      *msec = ((uint64_t)ts.tv_sec * 1000) + ((uint64_t)ts.tv_nsec / 1000000);
+   } else {
+      memset(tvp, 0, sizeof(struct timeval));
+      *msec = 0;
+   }
+
+#else /* lower resolution gettimeofday(2) is always available */
+
+   struct timeval tv;
+   if (gettimeofday(&tv, NULL) == 0) {
+      *tvp = tv; /* struct copy */
+      *msec = ((uint64_t)tv.tv_sec * 1000) + ((uint64_t)tv.tv_usec / 1000);
+   } else {
+      memset(tvp, 0, sizeof(struct timeval));
+      *msec = 0;
+   }
+
+#endif
+}
+
+void Generic_gettime_monotonic(uint64_t* msec) {
+#if defined(HAVE_CLOCK_GETTIME)
+
+   struct timespec ts;
+   if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
+      *msec = ((uint64_t)ts.tv_sec * 1000) + ((uint64_t)ts.tv_nsec / 1000000);
+   else
+      *msec = 0;
+
+#else /* lower resolution gettimeofday() should be always available */
+
+   struct timeval tv;
+   if (gettimeofday(&tv, NULL) == 0)
+      *msec = ((uint64_t)tv.tv_sec * 1000) + ((uint64_t)tv.tv_usec / 1000);
+   else
+      *msec = 0;
+
+#endif
+}
diff --git a/generic/gettime.h b/generic/gettime.h
new file mode 100644
index 0000000..91fe43d
--- /dev/null
+++ b/generic/gettime.h
@@ -0,0 +1,18 @@
+#ifndef HEADER_gettime
+#define HEADER_gettime
+/*
+htop - generic/gettime.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdint.h>
+#include <sys/time.h>
+
+
+void Generic_gettime_realtime(struct timeval* tvp, uint64_t* msec);
+
+void Generic_gettime_monotonic(uint64_t* msec);
+
+#endif
diff --git a/generic/hostname.c b/generic/hostname.c
new file mode 100644
index 0000000..e327582
--- /dev/null
+++ b/generic/hostname.c
@@ -0,0 +1,18 @@
+/*
+htop - generic/hostname.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "generic/hostname.h"
+
+#include <unistd.h>
+
+
+void Generic_hostname(char* buffer, size_t size) {
+   gethostname(buffer, size - 1);
+   buffer[size - 1] = '\0';
+}
diff --git a/generic/hostname.h b/generic/hostname.h
new file mode 100644
index 0000000..1e6c52d
--- /dev/null
+++ b/generic/hostname.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_hostname
+#define HEADER_hostname
+/*
+htop - generic/hostname.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+
+
+void Generic_hostname(char* buffer, size_t size);
+
+#endif
diff --git a/generic/openzfs_sysctl.c b/generic/openzfs_sysctl.c
new file mode 100644
index 0000000..bcd37dc
--- /dev/null
+++ b/generic/openzfs_sysctl.c
@@ -0,0 +1,104 @@
+/*
+htop - generic/openzfs_sysctl.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "generic/openzfs_sysctl.h"
+
+#include <stdlib.h>
+#include <sys/types.h> // IWYU pragma: keep
+#include <sys/sysctl.h> // needs <sys/types.h> for u_int with gcc
+
+#include "zfs/ZfsArcStats.h"
+
+
+static int MIB_kstat_zfs_misc_arcstats_size[5];
+static int MIB_kstat_zfs_misc_arcstats_c_min[5];
+static int MIB_kstat_zfs_misc_arcstats_c_max[5];
+static int MIB_kstat_zfs_misc_arcstats_mfu_size[5];
+static int MIB_kstat_zfs_misc_arcstats_mru_size[5];
+static int MIB_kstat_zfs_misc_arcstats_anon_size[5];
+static int MIB_kstat_zfs_misc_arcstats_hdr_size[5];
+static int MIB_kstat_zfs_misc_arcstats_other_size[5];
+static int MIB_kstat_zfs_misc_arcstats_compressed_size[5];
+static int MIB_kstat_zfs_misc_arcstats_uncompressed_size[5];
+
+void openzfs_sysctl_init(ZfsArcStats* stats) {
+   size_t len;
+   unsigned long long int arcSize;
+
+   len = sizeof(arcSize);
+   if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arcSize, &len, NULL, 0) == 0 && arcSize != 0) {
+      stats->enabled = 1;
+
+      len = 5;
+      sysctlnametomib("kstat.zfs.misc.arcstats.size", MIB_kstat_zfs_misc_arcstats_size, &len);
+
+      sysctlnametomib("kstat.zfs.misc.arcstats.c_min", MIB_kstat_zfs_misc_arcstats_c_min, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.c_max", MIB_kstat_zfs_misc_arcstats_c_max, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.mfu_size", MIB_kstat_zfs_misc_arcstats_mfu_size, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.mru_size", MIB_kstat_zfs_misc_arcstats_mru_size, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.anon_size", MIB_kstat_zfs_misc_arcstats_anon_size, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.hdr_size", MIB_kstat_zfs_misc_arcstats_hdr_size, &len);
+      sysctlnametomib("kstat.zfs.misc.arcstats.other_size", MIB_kstat_zfs_misc_arcstats_other_size, &len);
+
+      if (sysctlnametomib("kstat.zfs.misc.arcstats.compressed_size", MIB_kstat_zfs_misc_arcstats_compressed_size, &len) == 0) {
+         stats->isCompressed = 1;
+         sysctlnametomib("kstat.zfs.misc.arcstats.uncompressed_size", MIB_kstat_zfs_misc_arcstats_uncompressed_size, &len);
+      } else {
+         stats->isCompressed = 0;
+      }
+   } else {
+      stats->enabled = 0;
+   }
+}
+
+void openzfs_sysctl_updateArcStats(ZfsArcStats* stats) {
+   size_t len;
+
+   if (stats->enabled) {
+      len = sizeof(stats->size);
+      sysctl(MIB_kstat_zfs_misc_arcstats_size, 5, &(stats->size), &len, NULL, 0);
+      stats->size /= 1024;
+
+      len = sizeof(stats->min);
+      sysctl(MIB_kstat_zfs_misc_arcstats_c_min, 5, &(stats->min), &len, NULL, 0);
+      stats->min /= 1024;
+
+      len = sizeof(stats->max);
+      sysctl(MIB_kstat_zfs_misc_arcstats_c_max, 5, &(stats->max), &len, NULL, 0);
+      stats->max /= 1024;
+
+      len = sizeof(stats->MFU);
+      sysctl(MIB_kstat_zfs_misc_arcstats_mfu_size, 5, &(stats->MFU), &len, NULL, 0);
+      stats->MFU /= 1024;
+
+      len = sizeof(stats->MRU);
+      sysctl(MIB_kstat_zfs_misc_arcstats_mru_size, 5, &(stats->MRU), &len, NULL, 0);
+      stats->MRU /= 1024;
+
+      len = sizeof(stats->anon);
+      sysctl(MIB_kstat_zfs_misc_arcstats_anon_size, 5, &(stats->anon), &len, NULL, 0);
+      stats->anon /= 1024;
+
+      len = sizeof(stats->header);
+      sysctl(MIB_kstat_zfs_misc_arcstats_hdr_size, 5, &(stats->header), &len, NULL, 0);
+      stats->header /= 1024;
+
+      len = sizeof(stats->other);
+      sysctl(MIB_kstat_zfs_misc_arcstats_other_size, 5, &(stats->other), &len, NULL, 0);
+      stats->other /= 1024;
+
+      if (stats->isCompressed) {
+         len = sizeof(stats->compressed);
+         sysctl(MIB_kstat_zfs_misc_arcstats_compressed_size, 5, &(stats->compressed), &len, NULL, 0);
+         stats->compressed /= 1024;
+
+         len = sizeof(stats->uncompressed);
+         sysctl(MIB_kstat_zfs_misc_arcstats_uncompressed_size, 5, &(stats->uncompressed), &len, NULL, 0);
+         stats->uncompressed /= 1024;
+      }
+   }
+}
diff --git a/generic/openzfs_sysctl.h b/generic/openzfs_sysctl.h
new file mode 100644
index 0000000..27fa720
--- /dev/null
+++ b/generic/openzfs_sysctl.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_openzfs_sysctl
+#define HEADER_openzfs_sysctl
+/*
+htop - generic/openzfs_sysctl.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "zfs/ZfsArcStats.h"
+
+
+void openzfs_sysctl_init(ZfsArcStats* stats);
+
+void openzfs_sysctl_updateArcStats(ZfsArcStats* stats);
+
+#endif
diff --git a/generic/uname.c b/generic/uname.c
new file mode 100644
index 0000000..b5bb583
--- /dev/null
+++ b/generic/uname.c
@@ -0,0 +1,99 @@
+/*
+htop - generic/uname.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h"  // IWYU pragma: keep
+
+#include "generic/uname.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "Macros.h"
+#include "XUtils.h"
+
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
+
+#ifndef OSRELEASEFILE
+#define OSRELEASEFILE "/etc/os-release"
+#endif
+
+static void parseOSRelease(char* buffer, size_t bufferLen) {
+   FILE* stream = fopen(OSRELEASEFILE, "r");
+   if (!stream) {
+      xSnprintf(buffer, bufferLen, "No OS Release");
+      return;
+   }
+
+   char name[64] = {'\0'};
+   char version[64] = {'\0'};
+   char lineBuffer[256];
+   while (fgets(lineBuffer, sizeof(lineBuffer), stream)) {
+      if (String_startsWith(lineBuffer, "PRETTY_NAME=\"")) {
+         const char* start = lineBuffer + strlen("PRETTY_NAME=\"");
+         const char* stop = strrchr(lineBuffer, '"');
+         if (!stop || stop <= start)
+            continue;
+         String_safeStrncpy(buffer, start, MINIMUM(bufferLen, (size_t)(stop - start + 1)));
+         fclose(stream);
+         return;
+      }
+      if (String_startsWith(lineBuffer, "NAME=\"")) {
+         const char* start = lineBuffer + strlen("NAME=\"");
+         const char* stop = strrchr(lineBuffer, '"');
+         if (!stop || stop <= start)
+            continue;
+         String_safeStrncpy(name, start, MINIMUM(sizeof(name), (size_t)(stop - start + 1)));
+         continue;
+      }
+      if (String_startsWith(lineBuffer, "VERSION=\"")) {
+         const char* start = lineBuffer + strlen("VERSION=\"");
+         const char* stop = strrchr(lineBuffer, '"');
+         if (!stop || stop <= start)
+            continue;
+         String_safeStrncpy(version, start, MINIMUM(sizeof(version), (size_t)(stop - start + 1)));
+         continue;
+      }
+   }
+   fclose(stream);
+
+   snprintf(buffer, bufferLen, "%s%s%s", name[0] ? name : "", name[0] && version[0] ? " " : "", version);
+}
+
+char* Generic_uname(void) {
+   static char savedString[
+      /* uname structure fields - manpages recommend sizeof */
+      sizeof(((struct utsname*)0)->sysname) +
+      sizeof(((struct utsname*)0)->release) +
+      sizeof(((struct utsname*)0)->machine) +
+      16/*markup*/ +
+      128/*distro*/] = {'\0'};
+   static bool loaded_data = false;
+
+   if (!loaded_data) {
+      struct utsname uname_info;
+      int uname_result = uname(&uname_info);
+
+      char distro[128];
+      parseOSRelease(distro, sizeof(distro));
+
+      if (uname_result == 0) {
+         size_t written = xSnprintf(savedString, sizeof(savedString), "%s %s [%s]", uname_info.sysname, uname_info.release, uname_info.machine);
+         if (!String_contains_i(savedString, distro, false) && sizeof(savedString) > written)
+            snprintf(savedString + written, sizeof(savedString) - written, " @ %s", distro);
+      } else {
+         snprintf(savedString, sizeof(savedString), "%s", distro);
+      }
+
+      loaded_data = true;
+   }
+
+   return savedString;
+}
diff --git a/generic/uname.h b/generic/uname.h
new file mode 100644
index 0000000..940d64c
--- /dev/null
+++ b/generic/uname.h
@@ -0,0 +1,12 @@
+#ifndef HEADER_uname
+#define HEADER_uname
+/*
+htop - generic/uname.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+char* Generic_uname(void);
+
+#endif
diff --git a/htop.1.in b/htop.1.in
new file mode 100644
index 0000000..2376b7a
--- /dev/null
+++ b/htop.1.in
@@ -0,0 +1,695 @@
+.TH "HTOP" "1" "2024" "@PACKAGE_STRING@" "User Commands"
+.SH "NAME"
+htop, pcp-htop \- interactive process viewer
+.SH "SYNOPSIS"
+.B htop
+.RB [ \-dCFhpustvH ]
+.br
+.B pcp\ htop
+.RB [ \-dCFhpustvH ]
+.RB [ \-\-host/-h\ host ]
+.SH "DESCRIPTION"
+.B htop
+is a cross-platform ncurses-based process viewer.
+.LP
+It is similar to
+.BR top ,
+but allows you to scroll vertically and horizontally, and interact using
+a pointing device (mouse).
+You can observe all processes running on the system, along with their
+command line arguments, as well as view them in a tree format, select
+multiple processes and act on them all at once.
+.LP
+Tasks related to processes (killing, renicing) can be done without
+entering their PIDs.
+.LP
+.B pcp-htop
+is a version of
+.B htop
+built using the Performance Co-Pilot (PCP) Metrics API (see \c
+.BR PCPIntro (1),
+.BR PMAPI (3)),
+allowing to extend
+.B htop
+to display values from arbitrary metrics.
+See the section below titled
+.B "CONFIG FILES"
+for further details.
+.br
+.SH "COMMAND-LINE OPTIONS"
+Mandatory arguments to long options are mandatory for short options too.
+.TP
+\fB\-d \-\-delay=DELAY\fR
+Delay between updates, in tenths of a second. If the delay value is
+less than 1, it is increased to 1, i.e. 1/10 second. If the delay value
+is greater than 100, it is decreased to 100, i.e. 10 seconds.
+.TP
+\fB\-C \-\-no-color \-\-no-colour\fR
+Start
+.B htop
+in monochrome mode
+.TP
+\fB\-F \-\-filter=FILTER
+Filter processes by terms matching the commands. The terms are matched
+case-insensitive and as fixed strings (not regexs). You can separate multiple terms with "|".
+.TP
+\fB\-h \-\-help
+Display a help message and exit
+.TP
+\fB\-p \-\-pid=PID,PID...\fR
+Show only the given PIDs
+.TP
+\fB\-s \-\-sort\-key COLUMN\fR
+Sort by this column (use \-\-sort\-key help for a column list).
+This will force a list view unless you specify -t at the same time.
+.TP
+\fB\-u \-\-user=USERNAME|UID\fR
+Show only the processes of a given user
+.TP
+\fB\-U \-\-no-unicode\fR
+Do not use unicode but ASCII characters for graph meters
+.TP
+\fB\-M \-\-no-mouse\fR
+Disable support of mouse control
+.TP
+\fB\-\-readonly\fR
+Disable all system and process changing features
+.TP
+\fB\-V \-\-version
+Output version information and exit
+.TP
+\fB\-t \-\-tree
+Show processes in tree view. This can be used to force a tree view when
+requesting a sort order with -s.
+.TP
+\fB\-H \-\-highlight-changes=DELAY\fR
+Highlight new and old processes
+.TP
+\fB   \-\-drop-capabilities[=off|basic|strict]\fR
+Linux only; requires libcap support.
+.br
+Drop unneeded Linux capabilities.
+In strict mode features like killing, changing process priorities, and reading
+process delay accounting information will not work, due to less capabilities
+held.
+.SH "INTERACTIVE COMMANDS"
+The following commands are supported while in
+.BR htop :
+.TP 5
+.B Tab, Shift-Tab
+Select the next / the previous screen tab to display.
+You can enable showing the screen tab names in the Setup screen (F2).
+.TP
+.B Up, Alt-k
+Select (highlight) the previous process in the process list. Scroll the list
+if necessary.
+.TP
+.B Down, Alt-j
+Select (highlight) the next process in the process list. Scroll the list if
+necessary.
+.TP
+.B Left, Alt-h
+Scroll the process list left.
+.TP
+.B Right, Alt-l
+Scroll the process list right.
+.TP
+.B PgUp, PgDn
+Scroll the process list up or down one window.
+.TP
+.B Home
+Scroll to the top of the process list and select the first process.
+.TP
+.B End
+Scroll to the bottom of the process list and select the last process.
+.TP
+.B Ctrl-A, ^
+Scroll left to the beginning of the process entry (i.e. beginning of line).
+.TP
+.B Ctrl-E, $
+Scroll right to the end of the process entry (i.e. end of line).
+.TP
+.B Space
+Tag or untag a process. Commands that can operate on multiple processes,
+like "kill", will then apply over the list of tagged processes, instead
+of the currently highlighted one.
+.TP
+.B c
+Tag the current process and its children. Commands that can operate on multiple
+processes, like "kill", will then apply over the list of tagged processes,
+instead of the currently highlighted one.
+.TP
+.B U
+Untag all processes (remove all tags added with the Space or c keys).
+.TP
+.B s
+Trace process system calls: if strace(1) is installed, pressing this key
+will attach it to the currently selected process, presenting a live
+update of system calls issued by the process.
+.TP
+.B l
+Display open files for a process: if lsof(1) is installed, pressing this key
+will display the list of file descriptors opened by the process.
+.TP
+.B w
+Display the command line of the selected process in a separate screen, wrapped
+onto multiple lines as needed.
+.TP
+.B x
+Display the active file locks of the selected process in a separate screen.
+.TP
+.B F1, h, ?
+Go to the help screen
+.TP
+.B F2, S
+Go to the setup screen, where you can configure the meters displayed at the top
+of the screen, set various display options, choose among color schemes, and
+select which columns are displayed, in which order.
+.TP
+.B F3, /
+Incrementally search the command lines of all the displayed processes. The
+currently selected (highlighted) command will update as you type. While in
+search mode, pressing F3 will cycle through matching occurrences.
+Pressing Shift-F3 will cycle backwards.
+
+Alternatively the search can be started by simply typing the command
+you are looking for, although for the first character normal key
+bindings take precedence.
+.TP
+.B F4, \\\\
+Incremental process filtering: type in part of a process command line and
+only processes whose names match will be shown. To cancel filtering,
+enter the Filter option again and press Esc.
+The matching is done case-insensitive. Terms are fixed strings (no regex).
+You can separate multiple terms with "|".
+.TP
+.B F5, t
+Tree view: organize processes by parenthood, and layout the relations
+between them as a tree. Toggling the key will switch between tree and
+your previously selected sort view. Selecting a sort view will exit
+tree view.
+.TP
+.B F6, <, >
+Selects a field for sorting, also accessible through < and >.
+The current sort field is indicated by a highlight in the header.
+.TP
+.B F7, ]
+Increase the selected process's priority (subtract from 'nice' value).
+This can only be done by the superuser.
+.TP
+.B F8, [
+Decrease the selected process's priority (add to 'nice' value)
+.TP
+.B Shift-F7, }
+Increase the selected process's autogroup priority (subtract from autogroup 'nice' value).
+This can only be done by the superuser.
+.TP
+.B Shift-F8, {
+Decrease the selected process's autogroup priority (add to autogroup 'nice' value)
+.TP
+.B F9, k
+"Kill" process: sends a signal which is selected in a menu, to one or a group
+of processes. If processes were tagged, sends the signal to all tagged processes.
+If none is tagged, sends to the currently selected process.
+.TP
+.B F10, q
+Quit
+.TP
+.B I
+Invert the sort order: if sort order is increasing, switch to decreasing, and
+vice-versa.
+.TP
+.B +, \-, *
+When in tree view mode, expand or collapse subtree. When a subtree is collapsed
+a "+" sign shows to the left of the process name.
+Pressing "*" will expand or collapse all children of PIDs without parents, so
+typically PID 1 (init) and PID 2 (kthreadd on Linux, if kernel threads are shown).
+.TP
+.B a (on multiprocessor machines)
+Set CPU affinity: mark which CPUs a process is allowed to use.
+.TP
+.B u
+Show only processes owned by a specified user.
+.TP
+.B N
+Sort by PID.
+.TP
+.B M
+Sort by memory usage (top compatibility key).
+.TP
+.B P
+Sort by processor usage (top compatibility key).
+.TP
+.B T
+Sort by time (top compatibility key).
+.TP
+.B F
+"Follow" process: if the sort order causes the currently selected process
+to move in the list, make the selection bar follow it. This is useful for
+monitoring a process: this way, you can keep a process always visible on
+screen. When a movement key is used, "follow" loses effect.
+.TP
+.B K
+Hide kernel threads: prevent the threads belonging the kernel to be
+displayed in the process list. (This is a toggle key.)
+.TP
+.B H
+Hide user threads: on systems that represent them differently than ordinary
+processes (such as recent NPTL-based systems), this can hide threads from
+userspace processes in the process list. (This is a toggle key.)
+.TP
+.B O
+Hide containerized processes: prevent processes running in a container
+from being displayed in the process list. (This is a toggle key.)
+.TP
+.B p
+Show full paths to running programs, where applicable. (This is a toggle key.)
+.TP
+.B Z
+Pause/resume process updates.
+.TP
+.B m
+Merge exe, comm and cmdline, where applicable. (This is a toggle key.)
+.TP
+.B Ctrl-L
+Refresh: redraw screen and recalculate values.
+.TP
+.B Numbers
+PID search: type in process ID and the selection highlight will be moved to it.
+.PD
+.SH "COLUMNS"
+The following columns can display data about each process. A value of '\-' in
+all the rows indicates that a column is unsupported on your system, or
+currently unimplemented in
+.BR htop .
+The names below are the ones used in the
+"Available Columns" section of the setup screen. If a different name is
+shown in
+.BR htop 's
+main screen, it is shown below in parenthesis.
+.TP 5
+.B Command
+The full command line of the process (i.e. program name and arguments).
+
+If the option 'Merge exe, comm and cmdline in Command' (toggled by the 'm' key)
+is active, the executable path (/proc/[pid]/exe) and the command name
+(/proc/[pid]/comm) are also shown merged with the command line, if available.
+
+The program basename is highlighted if set in the configuration. Additional
+highlighting can be configured for stale executables (cf. EXE column below).
+.TP
+.B COMM
+The command name of the process obtained from /proc/[pid]/comm, if readable.
+
+Requires Linux kernel 2.6.33 or newer.
+.TP
+.B EXE
+The abbreviated basename of the executable of the process, obtained from
+/proc/[pid]/exe, if readable. htop is able to read this file on linux for ALL
+the processes only if it has the capability CAP_SYS_PTRACE or root privileges.
+
+The basename is marked in red if the executable used to run the process has
+been replaced or deleted on disk since the process started. The information is
+obtained by processing the contents of /proc/[pid]/exe.
+
+Furthermore the basename is marked in yellow if any library is reported as having
+been replaced or deleted on disk since it was last loaded. The information is
+obtained by processing the contents of /proc/[pid]/maps.
+
+When deciding the color the replacement of the main executable always takes
+precedence over replacement of any other library. If only the memory map indicates
+a replacement of the main executable, this will show as if any other library had
+been replaced or deleted.
+
+This additional color markup can be configured in the "Display Options" section of
+the setup screen.
+
+Displaying EXE requires CAP_SYS_PTRACE and PTRACE_MODE_READ_FSCRED.
+.TP
+.B PID
+The process ID.
+.TP
+.B STATE (S)
+The state of the process:
+   \fBS\fR for sleeping
+   \fBI\fR for idle (longer inactivity than sleeping on platforms that distinguish)
+   \fBR\fR for running
+   \fBD\fR for disk sleep (uninterruptible)
+   \fBZ\fR for zombie (waiting for parent to read its exit status)
+   \fBT\fR for traced or suspended (e.g by SIGTSTP)
+   \fBW\fR for paging
+.TP
+.B PPID
+The parent process ID.
+.TP
+.B PGRP
+The process's group ID.
+.TP
+.B SESSION (SID)
+The process's session ID.
+.TP
+.B TTY
+The controlling terminal of the process.
+.TP
+.B TPGID
+The process ID of the foreground process group of the controlling terminal.
+.TP
+.B MINFLT
+The number of page faults happening in the main memory.
+.TP
+.B CMINFLT
+The number of minor faults for the process's waited-for children (see MINFLT above).
+.TP
+.B MAJFLT
+The number of page faults happening out of the main memory.
+.TP
+.B CMAJFLT
+The number of major faults for the process's waited-for children (see MAJFLT above).
+.TP
+.B UTIME (UTIME+)
+The user CPU time, which is the amount of time the process has spent executing
+on the CPU in user mode (i.e. everything but system calls), measured in clock
+ticks.
+.TP
+.B STIME (STIME+)
+The system CPU time, which is the amount of time the kernel has spent
+executing system calls on behalf of the process, measured in clock ticks.
+.TP
+.B CUTIME (CUTIME+)
+The children's user CPU time, which is the amount of time the process's
+waited-for children have spent executing in user mode (see UTIME above).
+.TP
+.B CSTIME (CSTIME+)
+The children's system CPU time, which is the amount of time the kernel has spent
+executing system calls on behalf of all the process's waited-for children (see
+STIME above).
+.TP
+.B PRIORITY (PRI)
+The kernel's internal priority for the process, usually just its nice value
+plus twenty. Different for real-time processes.
+.TP
+.B NICE (NI)
+The nice value of a process, from 19 (low priority) to -20 (high priority). A
+high value means the process is being nice, letting others have a higher
+relative priority. The usual OS permission restrictions for adjusting priority apply.
+.TP
+.B STARTTIME (START)
+The time the process was started.
+.TP
+.B PROCESSOR (CPU)
+The ID of the CPU the process last executed on.
+.TP
+.B M_VIRT (VIRT)
+The size of the virtual memory of the process.
+.TP
+.B M_RESIDENT (RES)
+The resident set size (text + data + stack) of the process (i.e. the size of the
+process's used physical memory).
+.TP
+.B M_SHARE (SHR)
+The size of the process's shared pages.
+.TP
+.B M_TRS (CODE)
+The text resident set size of the process (i.e. the size of the process's
+executable instructions).
+.TP
+.B M_DRS (DATA)
+The data resident set size (data + stack) of the process (i.e. the size of anything
+except the process's executable instructions).
+.TP
+.B M_LRS (LIB)
+The library size of the process.
+.TP
+.B M_SWAP (SWAP)
+The size of the process's swapped pages.
+.TP
+.B M_PSS (PSS)
+The proportional set size, same as M_RESIDENT but each page is divided by the
+number of processes sharing it.
+.TP
+.B M_M_PSSWP (PSSWP)
+The proportional swap share of this mapping, unlike M_SWAP this does not take
+into account swapped out page of underlying shmem objects.
+.TP
+.B ST_UID (UID)
+The user ID of the process owner.
+.TP
+.B PERCENT_CPU (CPU%)
+The percentage of the CPU time that the process is currently using.
+This is the default way to represent CPU usage in Linux. Each process can
+consume up to 100% which means the full capacity of the core it is running
+on. This is sometimes called "Irix mode" e.g. in
+.BR top (1).
+.TP
+.B PERCENT_NORM_CPU (NCPU%)
+The percentage of the CPU time that the process is currently using normalized
+by CPU count. This is sometimes called "Solaris mode" e.g. in
+.BR top (1).
+.TP
+.B PERCENT_MEM (MEM%)
+The percentage of memory the process is currently using (based on the process's
+resident memory size, see M_RESIDENT above).
+.TP
+.B USER
+The username of the process owner, or the user ID if the name can't be
+determined.
+
+On Linux the username is highlighted if the process has elevated privileges,
+i.e. if it has been started from binaries with file capabilities set or
+retained Linux capabilities, via the ambient set, after switching from the
+root user.
+.TP
+.B TIME (TIME+)
+The time, measured in clock ticks that the process has spent in user and system
+time (see UTIME, STIME above).
+.TP
+.B NLWP
+The number of Light-Weight Processes (=threads) in the process.
+.TP
+.B TGID
+The thread group ID.
+.TP
+.B CTID
+OpenVZ container ID, a.k.a virtual environment ID.
+.TP
+.B VPID
+OpenVZ process ID.
+.TP
+.B VXID
+VServer process ID.
+.TP
+.B RCHAR (RD_CHAR)
+The number of bytes the process has read.
+.TP
+.B WCHAR (WR_CHAR)
+The number of bytes the process has written.
+.TP
+.B SYSCR (RD_SYSC)
+The number of read(2) syscalls for the process.
+.TP
+.B SYSCW (WR_SYSC)
+The number of write(2) syscalls for the process.
+.TP
+.B RBYTES (IO_RBYTES)
+Bytes of read(2) I/O for the process.
+.TP
+.B WBYTES (IO_WBYTES)
+Bytes of write(2) I/O for the process.
+.TP
+.B CNCLWB (IO_CANCEL)
+Bytes of cancelled write(2) I/O.
+.TP
+.B IO_READ_RATE (DISK READ)
+The I/O rate of read(2) in bytes per second, for the process.
+.TP
+.B IO_WRITE_RATE (DISK WRITE)
+The I/O rate of write(2) in bytes per second, for the process.
+.TP
+.B IO_RATE (DISK R/W)
+The I/O rate, IO_READ_RATE + IO_WRITE_RATE (see above).
+.TP
+.B CGROUP
+Which cgroup the process is in. For a shortened view see the CCGROUP column below.
+.TP
+.B CCGROUP
+Shortened view of the cgroup name that the process is in.
+This performs some pattern-based replacements to shorten the displayed string and thus condense the information.
+   \fB/*.slice\fR is shortened to \fB/[*]\fR (exceptions below)
+   \fB/system.slice\fR is shortened to \fB/[S]\fR
+   \fB/user.slice\fR is shortened to \fB/[U]\fR
+   \fB/user-*.slice\fR is shortened to \fB/[U:*]\fR (directly preceding \fB/[U]\fR before dropped)
+   \fB/machine.slice\fR is shortened to \fB/[M]\fR
+   \fB/machine-*.scope\fR is shortened to \fB/[SNC:*]\fR (SNC: systemd nspawn container), uppercase for the monitor
+   \fB/lxc.monitor.*\fR is shortened to \fB/[LXC:*]\fR
+   \fB/lxc.payload.*\fR is shortened to \fB/[lxc:*]\fR
+   \fB/*.scope\fR is shortened to \fB/!*\fR
+   \fB/*.service\fR is shortened to \fB/*\fR (suffix removed)
+
+Encountered escape sequences (e.g. from systemd) inside the cgroup name are not decoded.
+.TP
+.B OOM
+OOM killer score.
+.TP
+.B CTXT
+Incremental sum of voluntary and nonvoluntary context switches.
+.TP
+.B IO_PRIORITY (IO)
+The I/O scheduling class followed by the priority if the class supports it:
+   \fBR\fR for Realtime
+   \fBB\fR for Best-effort
+   \fBid\fR for Idle
+.TP
+.B PERCENT_CPU_DELAY (CPUD%)
+The percentage of time spent waiting for a CPU (while runnable). Requires CAP_NET_ADMIN.
+.TP
+.B PERCENT_IO_DELAY (IOD%)
+The percentage of time spent waiting for the completion of synchronous block I/O. Requires CAP_NET_ADMIN.
+.TP
+.B PERCENT_SWAP_DELAY (SWAPD%)
+The percentage of time spent swapping in pages. Requires CAP_NET_ADMIN.
+.TP
+.B AGRP
+The autogroup identifier for the process. Requires Linux CFS to be enabled.
+.TP
+.B ANI
+The autogroup nice value for the process autogroup. Requires Linux CFS to be enabled.
+.TP
+.B All other flags
+Currently unsupported (always displays '-').
+.SH "EXTERNAL LIBRARIES"
+While
+.B htop
+depends on most of the libraries it uses at build time there are two
+noteworthy exceptions to this rule. These exceptions both relate to
+data displayed in meters displayed in the header of
+.B htop
+and were intentionally created as optional runtime dependencies instead.
+These exceptions are described below:
+.TP
+.B libsystemd
+The bindings for libsystemd are used in the SystemD meter to determine
+the number of active services and the overall system state. Looking for
+the functions to determine these information at runtime allows for
+builds to support these meters without forcing the package manager
+to install these libraries on systems that otherwise don't use systemd.
+
+Summary: no build time dependency, optional runtime dependency on
+.B libsystemd
+via dynamic loading, with
+.B systemctl(1)
+fallback.
+.TP
+.B libsensors
+The bindings for libsensors are used for the CPU temperature readings
+in the CPU usage meters if displaying the temperature is enabled through
+the setup screen. In order for
+.B htop
+to show these temperatures correctly though, a proper configuration
+of libsensors through its usual configuration files is assumed and that
+all CPU cores correspond to temperature sensors from the
+.B coretemp
+driver with core 0 corresponding to a sensor labelled "Core 0". The
+package temperature may be given as "Package id 0". If missing it is
+inferred as the maximum value from the available per-core readings.
+
+Summary: build time dependency on
+.B libsensors(3)
+C header files, optional runtime dependency on
+.B libsensors(3)
+via dynamic loading.
+.SH "CONFIG FILES"
+By default
+.B htop
+reads its configuration from the XDG-compliant path
+.IR ~/.config/htop/htoprc .
+The configuration file is overwritten upon clean exit by
+.BR htop 's
+in-program Setup configuration, so it should not be hand-edited.
+If no user configuration exists
+.B htop
+tries to read the system-wide configuration from
+.I @sysconfdir@/htoprc
+and as a last resort, falls back to its hard coded defaults.
+.LP
+You may override the location of the configuration file using the $HTOPRC
+environment variable (so you can have multiple configurations for different
+machines that share the same home directory, for example).
+.LP
+The
+.B pcp-htop
+utility makes use of
+.I htoprc
+in exactly the same way.
+In addition, it supports additional configuration files allowing
+new meters and columns to be added to the display via the usual
+Setup function, which will display additional Available Meters
+and Available Column entries for each runtime configured meter
+or column.
+.LP
+These
+.B pcp-htop
+configuration files are read once at startup.
+The format of these files is described in detail in the
+.BR pcp-htop (5)
+manual page.
+.LP
+This functionality makes available many thousands of Performance
+Co-Pilot metrics for display by
+.BR pcp-htop ,
+as well as the ability to display custom metrics added at individual sites.
+Applications and services instrumented using the OpenMetrics format
+.B https://openmetrics.io
+can also be displayed by
+.B pcp-htop
+if the
+.BR pmdaopenmetrics (1)
+component is configured.
+.LP
+The configuration for both
+.B htop
+and
+.B pcp-htop
+is only saved when a clean exit is performed. Sending any signal will cause
+.I all configuration changes to be lost.
+.SH "MEMORY SIZES"
+Memory sizes in
+.B htop
+are displayed in a human-readable form.
+Sizes are printed in powers of 1024 using binary IEC units.
+If no suffix is shown the units are implicitly K as in KiB (kibibyte, 1 KiB = 1024 bytes).
+.LP
+The decision to use this convention was made in order to conserve screen
+space and make memory size representations consistent throughout
+.B htop
+as allocations are granular to full memory pages (4 KiB for most platforms).
+.SH "SEE ALSO"
+.BR proc (5),
+.BR top (1),
+.BR free (1),
+.BR ps (1),
+.BR uptime (1)
+and
+.BR limits.conf (5).
+.SH "SEE ALSO FOR PCP"
+.BR pmdaopenmetrics (1),
+.BR PCPIntro (1),
+.BR PMAPI (3),
+and
+.BR pcp-htop (5).
+.SH "AUTHORS"
+.B htop
+was originally developed by Hisham Muhammad.
+Nowadays it is maintained by the community at <htop@groups.io>.
+.LP
+.B pcp-htop
+is maintained as a collaboration between the <htop@groups.io> and <pcp@groups.io>
+communities, and forms part of the Performance Co-Pilot suite of tools.
+.SH "COPYRIGHT"
+Copyright \(co 2004-2019 Hisham Muhammad.
+.br
+Copyright \(co 2020-2024 htop dev team.
+.LP
+License GPLv2+: GNU General Public License version 2 or, at your option, any later version.
+.LP
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
diff --git a/htop.c b/htop.c
new file mode 100644
index 0000000..7155793
--- /dev/null
+++ b/htop.c
@@ -0,0 +1,18 @@
+/*
+htop - htop.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "CommandLine.h"
+
+
+const char* program = PACKAGE;
+
+int main(int argc, char** argv) {
+   return CommandLine_run(argc, argv);
+}
diff --git a/htop.desktop b/htop.desktop
new file mode 100644
index 0000000..20bed49
--- /dev/null
+++ b/htop.desktop
@@ -0,0 +1,67 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Htop
+GenericName=Process Viewer
+GenericName[ca]=Visualitzador de processos
+GenericName[da]=Procesfremviser
+GenericName[de]=Prozessanzeige
+GenericName[en_GB]=Process Viewer
+GenericName[es]=Visor de procesos
+GenericName[fi]=Prosessikatselin
+GenericName[fr]=Visualiseur de processus
+GenericName[gl]=Visor de procesos
+GenericName[it]=Visore dei processi
+GenericName[ko]=프로세스 뷰어
+GenericName[nb]=Prosessviser
+GenericName[nl]=Viewer van processen
+GenericName[nn]=Prosessvisar
+GenericName[pl]=Przeglądarka procesów
+GenericName[pt]=Visualizador de Processos
+GenericName[pt_BR]=Visualizador de processos
+GenericName[ru]=Монитор процессов
+GenericName[sk]=Prehliadač procesov
+GenericName[sl]=Pregledovalnik opravil
+GenericName[sr@ijekavian]=Приказивач процеса
+GenericName[sr@ijekavianlatin]=Prikazivač procesa
+GenericName[sr@latin]=Prikazivač procesa
+GenericName[sr]=Приказивач процеса
+GenericName[sv]=Processvisning
+GenericName[tr]=Süreç Görüntüleyici
+GenericName[uk]=Перегляд процесів
+GenericName[zh_CN]=进程查看器
+GenericName[zh_TW]=行程檢視器
+Comment=Show System Processes
+Comment[ca]=Visualitzeu els processos del sistema
+Comment[da]=Vis systemprocesser
+Comment[de]=Systemprozesse anzeigen
+Comment[en_GB]=Show System Processes
+Comment[es]=Mostrar procesos del sistema
+Comment[fi]=Katsele järjestelmän prosesseja
+Comment[fr]=Affiche les processus système
+Comment[gl]=Mostrar os procesos do sistema.
+Comment[it]=Mostra processi di sistema
+Comment[ko]=시스템 프로세스 보기
+Comment[nb]=Vis systemprosesser
+Comment[nl]=Systeemprocessen tonen
+Comment[nn]=Vis systemprosessar
+Comment[pl]=Pokaż procesy systemowe
+Comment[pt]=Mostrar os Processos do Sistema
+Comment[pt_BR]=Mostra os processos do sistema
+Comment[ru]=Просмотр списка процессов в системе
+Comment[sk]=Zobraziť systémové procesy
+Comment[sl]=Prikaz sistemskih opravil
+Comment[sr@ijekavian]=Приказ системских процеса
+Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
+Comment[sr@latin]=Prikaz sistemskih procesa
+Comment[sr]=Приказ системских процеса
+Comment[sv]=Visa systemprocesser
+Comment[tr]=Sistem Süreçlerini Göster
+Comment[uk]=Перегляд системних процесів
+Comment[zh_CN]=显示系统进程
+Comment[zh_TW]=顯示系統行程
+Icon=htop
+Exec=htop
+Terminal=true
+Categories=System;Monitor;ConsoleOnly;
+Keywords=system;process;task
diff --git a/htop.png b/htop.png
new file mode 100644
index 0000000..7809d22
--- /dev/null
+++ b/htop.png
diff --git a/htop.svg b/htop.svg
new file mode 100644
index 0000000..80da71b
--- /dev/null
+++ b/htop.svg
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="30.398mm" height="30.399mm" version="1.1" viewBox="0 0 30.398 30.399" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="aj" x1="42.304" x2="42.245" y1="57.522" y2="50.607" gradientTransform="translate(41.404 221.45)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+  <linearGradient id="c">
+   <stop stop-color="#363d36" offset="0"/>
+   <stop stop-color="#565d56" offset=".2"/>
+   <stop stop-color="#6c766c" offset=".8"/>
+   <stop stop-color="#8c968c" offset="1"/>
+  </linearGradient>
+  <filter id="f" x="-.063963" y="-.025049" width="1.1279" height="1.0501" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.072789412"/>
+  </filter>
+  <linearGradient id="ai" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(41.508 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="a">
+   <stop stop-color="#8bf18b" offset="0"/>
+   <stop stop-color="#5bc15b" offset=".2"/>
+   <stop stop-color="#47a347" offset=".8"/>
+   <stop stop-color="#177317" offset="1"/>
+  </linearGradient>
+  <filter id="l" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="d" x1="42.304" x2="42.245" y1="57.522" y2="50.607" gradientTransform="translate(24.234,-9.2667)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+  <filter id="e" x="-.063963" y="-.025049" width="1.1279" height="1.0501" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.072789412"/>
+  </filter>
+  <linearGradient id="ah" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(44.242 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="k" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="ag" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(46.976 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="j" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="af" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(49.709 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="am" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="ae" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(52.443 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="al" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="ad" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(55.177 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="ak" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="ac" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(57.91 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <filter id="i" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="ab" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(60.644 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <linearGradient id="b">
+   <stop stop-color="#fe7f7f" offset="0"/>
+   <stop stop-color="#ce4f4f" offset=".2"/>
+   <stop stop-color="#b23030" offset=".8"/>
+   <stop stop-color="#920000" offset="1"/>
+  </linearGradient>
+  <filter id="h" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="aa" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(63.376 221.43)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <filter id="g" x="-.08928" y="-.022545" width="1.1786" height="1.0451" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.065909587"/>
+  </filter>
+  <linearGradient id="z" x1="42.304" x2="42.245" y1="57.522" y2="50.607" gradientTransform="translate(41.404 210.02)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+  <linearGradient id="y" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(41.508 210)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="x" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(44.242 210)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="w" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(46.976 210)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="v" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(57.91 210)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="u" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(63.376 210)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <linearGradient id="t" x1="42.304" x2="42.245" y1="57.522" y2="50.607" gradientTransform="translate(41.404 232.87)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+  <linearGradient id="s" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(41.508 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="r" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(44.242 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="q" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(46.976 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+  <linearGradient id="p" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(60.644 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <linearGradient id="o" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(63.376 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <linearGradient id="n" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(57.91 232.85)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+  <linearGradient id="m" x1="44.761" x2="44.761" y1="50.493" y2="57.517" gradientTransform="translate(60.644 210)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+ </defs>
+ <g transform="translate(.08011 -.58599)">
+  <g transform="matrix(.98769 0 0 .99741 -80.905 -258.93)" fill-rule="evenodd">
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m82.188 271.97 0.0251 6.963 2.7061-8e-3v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#aj)" filter="url(#f)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m85.401 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ai)" filter="url(#l)"/>
+   <path transform="matrix(-.99856 0 0 1.2772 177.16 218.32)" d="m65.017 41.255 0.02508 6.963 2.7061-0.0084v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#d)" filter="url(#e)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m88.135 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ah)" filter="url(#k)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m90.868 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ag)" filter="url(#j)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m93.602 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#af)" filter="url(#am)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m96.335 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ae)" filter="url(#al)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m99.069 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ad)" filter="url(#ak)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m101.8 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ac)" filter="url(#i)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m104.54 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#ab)" filter="url(#h)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -76.353)" d="m107.27 271.95v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#aa)" filter="url(#g)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m82.188 260.54 0.0251 6.963 2.7061-8e-3v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#z)" filter="url(#f)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m85.401 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#y)" filter="url(#l)"/>
+   <path transform="matrix(-.99856 0 0 1.2772 177.16 207.94)" d="m65.017 41.255 0.02508 6.963 2.7061-0.0084v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#d)" filter="url(#e)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m88.135 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#x)" filter="url(#k)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m90.868 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#w)" filter="url(#j)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m101.8 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#v)" filter="url(#i)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m107.27 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#u)" filter="url(#g)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m82.188 283.39 0.0251 6.963 2.7061-8e-3v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#t)" filter="url(#f)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m85.401 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#s)" filter="url(#l)"/>
+   <path transform="matrix(-.99856 0 0 1.2772 177.16 228.65)" d="m65.017 41.255 0.02508 6.963 2.7061-0.0084v-1.2194h-1.0357v-4.602h1.019v-1.1442z" fill="url(#d)" filter="url(#e)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m88.135 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#r)" filter="url(#k)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m90.868 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#q)" filter="url(#j)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m104.54 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#p)" filter="url(#h)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m107.27 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#o)" filter="url(#g)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -80.616)" d="m101.8 283.37v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#n)" filter="url(#h)"/>
+   <path transform="matrix(.99856 0 0 1.2772 .14037 -72.134)" d="m104.54 260.52v7.0132h1.7718v-7.0162h-1.7718z" fill="url(#m)" filter="url(#i)"/>
+  </g>
+ </g>
+</svg>
diff --git a/iwyu/htop.imp b/iwyu/htop.imp
new file mode 100644
index 0000000..e2fc72b
--- /dev/null
+++ b/iwyu/htop.imp
@@ -0,0 +1,33 @@
+[
+    { include: ["<curses.h>", "private", "\"ProvideCurses.h\"", "public"] },
+    { include: ["<ncurses.h>", "private", "\"ProvideCurses.h\"", "public"] },
+    { include: ["<ncurses/curses.h>", "private", "\"ProvideCurses.h\"", "public"] },
+    { include: ["<ncurses/ncurses.h>", "private", "\"ProvideCurses.h\"", "public"] },
+
+    { include: ["<term.h>", "private", "\"ProvideTerm.h\"", "public"] },
+    { include: ["<ncurses/term.h>", "private", "\"ProvideTerm.h\"", "public"] },
+    { include: ["<ncursesw/term.h>", "private", "\"ProvideTerm.h\"", "public"] },
+
+    { include: ["<libunwind-x86_64.h>", "private", "<libunwind.h>", "public"] },
+    { include: ["\"ibunwind-x86_64.h\"", "private", "<libunwind.h>", "public"] },
+
+    { include: ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
+
+    { include: ["<bits/getopt_core.h>", "private", "<unistd.h>", "public"] },
+
+    { include: ["<sys/dirent.h>", "private", "<dirent.h>", "public"] },
+
+    { include: ["<sys/signal.h>", "private", "<signal.h>", "public"] },
+
+    { include: ["<sys/_stdarg.h>", "private", "<stdarg.h>", "public"] },
+
+    { include: ["<sys/limits.h>", "private", "<limits.h>", "public"] },
+
+    { include: ["<x86/_inttypes.h>", "private", "<inttypes.h>", "public"] },
+
+    { include: ["<linux/capability.h>", "private", "<sys/capability.h>", "public"] },
+
+    { include: ["<bits/mman-shared.h>", "private", "<sys/mman.h>", "public"] },
+
+    { include: ["<bits/types/struct_sched_param.h>", "private", "<sched.h>", "public"] },
+]
diff --git a/iwyu/run_iwyu.sh b/iwyu/run_iwyu.sh
new file mode 100755
index 0000000..8456240
--- /dev/null
+++ b/iwyu/run_iwyu.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTDIR=$(dirname "$SCRIPT")
+SOURCEDIR="$SCRIPTDIR/.."
+
+PKG_NL3=$(pkg-config --cflags libnl-3.0)
+
+IWYU=${IWYU:-iwyu}
+
+cd "$SOURCEDIR" || exit
+
+./configure CC=clang CXX=clang++ --enable-silent-rules
+make clean
+make -k -s CC="$IWYU" CFLAGS="-Xiwyu --no_comments -Xiwyu --no_fwd_decl -Xiwyu --mapping_file='$SCRIPTDIR/htop.imp' $PKG_NL3"
diff --git a/linux/CGroupUtils.c b/linux/CGroupUtils.c
new file mode 100644
index 0000000..f352b8e
--- /dev/null
+++ b/linux/CGroupUtils.c
@@ -0,0 +1,532 @@
+/*
+htop - CGroupUtils.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/CGroupUtils.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Macros.h"
+#include "XUtils.h"
+
+
+static const char* str_slice_suffix = ".slice";
+static const char* str_system_slice = "system.slice";
+static const char* str_user_slice = "user.slice";
+static const char* str_machine_slice = "machine.slice";
+static const char* str_user_slice_prefix = "/user-";
+static const char* str_system_slice_prefix = "/system-";
+
+static const char* str_lxc_monitor_legacy = "lxc.monitor";
+static const char* str_lxc_payload_legacy = "lxc.payload";
+static const char* str_lxc_monitor_prefix = "lxc.monitor.";
+static const char* str_lxc_payload_prefix = "lxc.payload.";
+
+static const char* str_nspawn_scope_prefix = "machine-";
+static const char* str_nspawn_monitor_label = "/supervisor";
+static const char* str_nspawn_payload_label = "/payload";
+
+static const char* str_snap_scope_prefix = "snap.";
+static const char* str_pod_scope_prefix = "libpod-";
+static const char* str_docker_scope_prefix = "docker-";
+
+static const char* str_service_suffix = ".service";
+static const char* str_scope_suffix = ".scope";
+
+typedef struct StrBuf_state {
+   char* buf;
+   size_t size;
+   size_t pos;
+} StrBuf_state;
+
+typedef bool (*StrBuf_putc_t)(StrBuf_state* p, char c);
+
+static bool StrBuf_putc_count(StrBuf_state* p, ATTR_UNUSED char c) {
+   p->pos++;
+   return true;
+}
+
+static bool StrBuf_putc_write(StrBuf_state* p, char c) {
+   if (p->pos >= p->size)
+      return false;
+
+   p->buf[p->pos] = c;
+   p->pos++;
+   return true;
+}
+
+static bool StrBuf_putsn(StrBuf_state* p, StrBuf_putc_t w, const char* s, size_t count) {
+   for (; count; count--)
+      if (!w(p, *s++))
+         return false;
+
+   return true;
+}
+
+static bool StrBuf_putsz(StrBuf_state* p, StrBuf_putc_t w, const char* s) {
+   while (*s)
+      if (!w(p, *s++))
+         return false;
+
+   return true;
+}
+
+static bool Label_checkEqual(const char* labelStart, size_t labelLen, const char* expected) {
+   return labelLen == strlen(expected) && String_startsWith(labelStart, expected);
+}
+
+static bool Label_checkPrefix(const char* labelStart, size_t labelLen, const char* expected) {
+   return labelLen > strlen(expected) && String_startsWith(labelStart, expected);
+}
+
+static bool Label_checkSuffix(const char* labelStart, size_t labelLen, const char* expected) {
+   return labelLen > strlen(expected) && String_startsWith(labelStart + labelLen - strlen(expected), expected);
+}
+
+static bool CGroup_filterName_internal(const char* cgroup, StrBuf_state* s, StrBuf_putc_t w) {
+   while (*cgroup) {
+      if ('/' == *cgroup) {
+         while ('/' == *cgroup)
+            cgroup++;
+
+         if (!w(s, '/'))
+            return false;
+
+         continue;
+      }
+
+      const char* labelStart = cgroup;
+      const char* nextSlash = String_strchrnul(labelStart, '/');
+      const size_t labelLen = nextSlash - labelStart;
+
+      if (Label_checkEqual(labelStart, labelLen, str_system_slice)) {
+         cgroup = nextSlash;
+
+         if (!StrBuf_putsz(s, w, "[S]"))
+            return false;
+
+         if (String_startsWith(cgroup, str_system_slice_prefix)) {
+            cgroup = String_strchrnul(cgroup + 1, '/');
+            continue;
+         }
+
+         continue;
+      }
+
+      if (Label_checkEqual(labelStart, labelLen, str_machine_slice)) {
+         cgroup = nextSlash;
+
+         if (!StrBuf_putsz(s, w, "[M]"))
+            return false;
+
+         continue;
+      }
+
+      if (Label_checkEqual(labelStart, labelLen, str_user_slice)) {
+         cgroup = nextSlash;
+
+         if (!StrBuf_putsz(s, w, "[U]"))
+            return false;
+
+         if (!String_startsWith(cgroup, str_user_slice_prefix))
+            continue;
+
+         const char* userSliceSlash = String_strchrnul(cgroup + strlen(str_user_slice_prefix), '/');
+         const char* sliceSpec = userSliceSlash - strlen(str_slice_suffix);
+
+         if (!String_startsWith(sliceSpec, str_slice_suffix))
+            continue;
+
+         const size_t sliceNameLen = sliceSpec - (cgroup + strlen(str_user_slice_prefix));
+
+         s->pos--;
+         if (!w(s, ':'))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup + strlen(str_user_slice_prefix), sliceNameLen))
+            return false;
+
+         if (!w(s, ']'))
+            return false;
+
+         cgroup = userSliceSlash;
+
+         continue;
+      }
+
+      if (Label_checkSuffix(labelStart, labelLen, str_slice_suffix)) {
+         const size_t sliceNameLen = labelLen - strlen(str_slice_suffix);
+
+         if (!w(s, '['))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup, sliceNameLen))
+            return false;
+
+         if (!w(s, ']'))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      if (Label_checkPrefix(labelStart, labelLen, str_lxc_payload_prefix)) {
+         const size_t cgroupNameLen = labelLen - strlen(str_lxc_payload_prefix);
+
+         if (!StrBuf_putsz(s, w, "[lxc:"))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup + strlen(str_lxc_payload_prefix), cgroupNameLen))
+            return false;
+
+         if (!w(s, ']'))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      if (Label_checkPrefix(labelStart, labelLen, str_lxc_monitor_prefix)) {
+         const size_t cgroupNameLen = labelLen - strlen(str_lxc_monitor_prefix);
+
+         if (!StrBuf_putsz(s, w, "[LXC:"))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup + strlen(str_lxc_monitor_prefix), cgroupNameLen))
+            return false;
+
+         if (!w(s, ']'))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      // LXC legacy cgroup naming
+      if (Label_checkEqual(labelStart, labelLen, str_lxc_monitor_legacy) ||
+         Label_checkEqual(labelStart, labelLen, str_lxc_payload_legacy)) {
+         bool isMonitor = Label_checkEqual(labelStart, labelLen, str_lxc_monitor_legacy);
+
+         labelStart = nextSlash;
+         while (*labelStart == '/')
+            labelStart++;
+
+         nextSlash = String_strchrnul(labelStart, '/');
+         if (nextSlash - labelStart > 0) {
+            if (!StrBuf_putsz(s, w, isMonitor ? "[LXC:" : "[lxc:"))
+               return false;
+
+            if (!StrBuf_putsn(s, w, labelStart, nextSlash - labelStart))
+               return false;
+
+            if (!w(s, ']'))
+               return false;
+
+            cgroup = nextSlash;
+            continue;
+         }
+
+         labelStart = cgroup;
+         nextSlash = labelStart + labelLen;
+      }
+
+      if (Label_checkSuffix(labelStart, labelLen, str_service_suffix)) {
+         const size_t serviceNameLen = labelLen - strlen(str_service_suffix);
+
+         if (String_startsWith(cgroup, "user@")) {
+            cgroup = nextSlash;
+
+            while (*cgroup == '/')
+               cgroup++;
+
+            continue;
+         }
+
+         if (!StrBuf_putsn(s, w, cgroup, serviceNameLen))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      if (Label_checkSuffix(labelStart, labelLen, str_scope_suffix)) {
+         const size_t scopeNameLen = labelLen - strlen(str_scope_suffix);
+
+         if (Label_checkPrefix(labelStart, scopeNameLen, str_nspawn_scope_prefix)) {
+            const size_t machineScopeNameLen = scopeNameLen - strlen(str_nspawn_scope_prefix);
+
+            const bool is_monitor = String_startsWith(nextSlash, str_nspawn_monitor_label);
+
+            if (!StrBuf_putsz(s, w, is_monitor ? "[SNC:" : "[snc:"))
+               return false;
+
+            if (!StrBuf_putsn(s, w, cgroup + strlen(str_nspawn_scope_prefix), machineScopeNameLen))
+               return false;
+
+            if (!w(s, ']'))
+               return false;
+
+            cgroup = nextSlash;
+            if (String_startsWith(nextSlash, str_nspawn_monitor_label))
+               cgroup += strlen(str_nspawn_monitor_label);
+            else if (String_startsWith(nextSlash, str_nspawn_payload_label))
+               cgroup += strlen(str_nspawn_payload_label);
+
+            continue;
+         } else if (Label_checkPrefix(labelStart, scopeNameLen, str_snap_scope_prefix)) {
+            const char* nextDot = String_strchrnul(labelStart + strlen(str_snap_scope_prefix), '.');
+
+            if (!StrBuf_putsz(s, w, "!snap:"))
+               return false;
+
+            if (nextDot >= labelStart + scopeNameLen) {
+               nextDot = labelStart + scopeNameLen;
+            }
+
+            if (!StrBuf_putsn(s, w, labelStart + strlen(str_snap_scope_prefix), nextDot - (labelStart + strlen(str_snap_scope_prefix))))
+               return false;
+
+            cgroup = nextSlash;
+
+            continue;
+         } else if (Label_checkPrefix(labelStart, scopeNameLen, str_pod_scope_prefix)) {
+            const char* nextDot = String_strchrnul(labelStart + strlen(str_pod_scope_prefix), '.');
+
+            if (!StrBuf_putsz(s, w, "!pod:"))
+               return false;
+
+            if (nextDot >= labelStart + scopeNameLen) {
+               nextDot = labelStart + scopeNameLen;
+            }
+
+            if (!StrBuf_putsn(s, w, labelStart + strlen(str_pod_scope_prefix),
+               MINIMUM( nextDot - (labelStart + strlen(str_pod_scope_prefix)), 12)))
+               return false;
+
+            cgroup = nextSlash;
+
+            continue;
+         } else if (Label_checkPrefix(labelStart, scopeNameLen, str_docker_scope_prefix)) {
+            const char* nextDot = String_strchrnul(labelStart + strlen(str_docker_scope_prefix), '.');
+
+            if (!StrBuf_putsz(s, w, "!docker:"))
+               return false;
+
+            if (nextDot >= labelStart + scopeNameLen) {
+               nextDot = labelStart + scopeNameLen;
+            }
+
+            if (!StrBuf_putsn(s, w, labelStart + strlen(str_docker_scope_prefix),
+               MINIMUM( nextDot - (labelStart + strlen(str_docker_scope_prefix)), 12)))
+               return false;
+
+            cgroup = nextSlash;
+
+            continue;
+         }
+
+         if (!w(s, '!'))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup, scopeNameLen))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      // Default behavior: Copy the full label
+      cgroup = labelStart;
+
+      if (!StrBuf_putsn(s, w, cgroup, labelLen))
+         return false;
+
+      cgroup = nextSlash;
+   }
+
+   return true;
+}
+
+char* CGroup_filterName(const char* cgroup) {
+   StrBuf_state s = {
+      .buf = NULL,
+      .size = 0,
+      .pos = 0,
+   };
+
+   if (!CGroup_filterName_internal(cgroup, &s, StrBuf_putc_count)) {
+      return NULL;
+   }
+
+   s.buf = xCalloc(s.pos + 1, sizeof(char));
+   s.size = s.pos;
+   s.pos = 0;
+
+   if (!CGroup_filterName_internal(cgroup, &s, StrBuf_putc_write)) {
+      free(s.buf);
+      return NULL;
+   }
+
+   s.buf[s.size] = '\0';
+   return s.buf;
+}
+
+static bool CGroup_filterContainer_internal(const char* cgroup, StrBuf_state* s, StrBuf_putc_t w) {
+   while (*cgroup) {
+      if ('/' == *cgroup) {
+         while ('/' == *cgroup)
+            cgroup++;
+
+         continue;
+      }
+
+      const char* labelStart = cgroup;
+      const char* nextSlash = String_strchrnul(labelStart, '/');
+      const size_t labelLen = nextSlash - labelStart;
+
+      if (Label_checkPrefix(labelStart, labelLen, str_lxc_payload_prefix)) {
+         const size_t cgroupNameLen = labelLen - strlen(str_lxc_payload_prefix);
+
+         if (!StrBuf_putsz(s, w, "/lxc:"))
+            return false;
+
+         if (!StrBuf_putsn(s, w, cgroup + strlen(str_lxc_payload_prefix), cgroupNameLen))
+            return false;
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      // LXC legacy cgroup naming
+      if (Label_checkEqual(labelStart, labelLen, str_lxc_payload_legacy)) {
+         labelStart = nextSlash;
+         while (*labelStart == '/')
+            labelStart++;
+
+         nextSlash = String_strchrnul(labelStart, '/');
+         if (nextSlash - labelStart > 0) {
+            if (!StrBuf_putsz(s, w, "/lxc:"))
+               return false;
+
+            if (!StrBuf_putsn(s, w, labelStart, nextSlash - labelStart))
+               return false;
+
+            cgroup = nextSlash;
+            continue;
+         }
+
+         labelStart = cgroup;
+         nextSlash = labelStart + labelLen;
+      }
+
+      if (Label_checkSuffix(labelStart, labelLen, str_scope_suffix)) {
+         const size_t scopeNameLen = labelLen - strlen(str_scope_suffix);
+
+         if (Label_checkPrefix(labelStart, scopeNameLen, str_nspawn_scope_prefix)) {
+            const size_t machineScopeNameLen = scopeNameLen - strlen(str_nspawn_scope_prefix);
+
+            const bool is_monitor = String_startsWith(nextSlash, str_nspawn_monitor_label);
+
+            if (!is_monitor) {
+               if (!StrBuf_putsz(s, w, "/snc:"))
+                  return false;
+
+               if (!StrBuf_putsn(s, w, cgroup + strlen(str_nspawn_scope_prefix), machineScopeNameLen))
+                  return false;
+            }
+
+            cgroup = nextSlash;
+            if (String_startsWith(nextSlash, str_nspawn_monitor_label))
+               cgroup += strlen(str_nspawn_monitor_label);
+            else if (String_startsWith(nextSlash, str_nspawn_payload_label))
+               cgroup += strlen(str_nspawn_payload_label);
+
+            continue;
+         } else if (Label_checkPrefix(labelStart, scopeNameLen, str_pod_scope_prefix)) {
+            const char* nextDot = String_strchrnul(labelStart + strlen(str_pod_scope_prefix), '.');
+
+            if (!StrBuf_putsz(s, w, "/pod:"))
+               return false;
+
+            if (nextDot >= labelStart + scopeNameLen) {
+               nextDot = labelStart + scopeNameLen;
+            }
+
+            if (!StrBuf_putsn(s, w, labelStart + strlen(str_pod_scope_prefix),
+               MINIMUM( nextDot - (labelStart + strlen(str_pod_scope_prefix)), 12)))
+               return false;
+
+            cgroup = nextSlash;
+
+            continue;
+         } else if (Label_checkPrefix(labelStart, scopeNameLen, str_docker_scope_prefix)) {
+            const char* nextDot = String_strchrnul(labelStart + strlen(str_docker_scope_prefix), '.');
+
+            if (!StrBuf_putsz(s, w, "!docker:"))
+               return false;
+
+            if (nextDot >= labelStart + scopeNameLen) {
+               nextDot = labelStart + scopeNameLen;
+            }
+
+            if (!StrBuf_putsn(s, w, labelStart + strlen(str_docker_scope_prefix),
+               MINIMUM( nextDot - (labelStart + strlen(str_docker_scope_prefix)), 12)))
+               return false;
+
+            cgroup = nextSlash;
+
+            continue;
+         }
+
+         cgroup = nextSlash;
+
+         continue;
+      }
+
+      cgroup = nextSlash;
+   }
+
+   return true;
+}
+
+char* CGroup_filterContainer(const char* cgroup) {
+   StrBuf_state s = {
+      .buf = NULL,
+      .size = 0,
+      .pos = 0,
+   };
+
+   if (!CGroup_filterContainer_internal(cgroup, &s, StrBuf_putc_count)) {
+      return NULL;
+   }
+
+   if (!s.pos) {
+      return xStrdup("/");
+   }
+
+   s.buf = xCalloc(s.pos + 1, sizeof(char));
+   s.size = s.pos;
+   s.pos = 0;
+
+   if (!CGroup_filterContainer_internal(cgroup, &s, StrBuf_putc_write)) {
+      free(s.buf);
+      return NULL;
+   }
+
+   s.buf[s.size] = '\0';
+   return s.buf;
+}
diff --git a/linux/CGroupUtils.h b/linux/CGroupUtils.h
new file mode 100644
index 0000000..972a15b
--- /dev/null
+++ b/linux/CGroupUtils.h
@@ -0,0 +1,14 @@
+#ifndef HEADER_CGroupUtils
+#define HEADER_CGroupUtils
+/*
+htop - CGroupUtils.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+char* CGroup_filterName(const char* cgroup);
+char* CGroup_filterContainer(const char* cgroup);
+
+#endif /* HEADER_CGroupUtils */
diff --git a/linux/HugePageMeter.c b/linux/HugePageMeter.c
new file mode 100644
index 0000000..058ab4b
--- /dev/null
+++ b/linux/HugePageMeter.c
@@ -0,0 +1,108 @@
+/*
+htop - HugePageMeter.c
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/HugePageMeter.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "RichString.h"
+#include "linux/LinuxMachine.h"
+
+
+static const char* HugePageMeter_active_labels[4] = { NULL, NULL, NULL, NULL };
+
+static const int HugePageMeter_attributes[] = {
+   HUGEPAGE_1,
+   HUGEPAGE_2,
+   HUGEPAGE_3,
+   HUGEPAGE_4,
+};
+
+static const char* const HugePageMeter_labels[] = {
+   " 64K:", " 128K:", " 256K:", " 512K:",
+   " 1M:", " 2M:", " 4M:", " 8M:", " 16M:", " 32M:", " 64M:", " 128M:", " 256M:", " 512M:",
+   " 1G:", " 2G:", " 4G:", " 8G:", " 16G:", " 32G:", " 64G:", " 128G:", " 256G:", " 512G:",
+};
+
+static void HugePageMeter_updateValues(Meter* this) {
+   assert(ARRAYSIZE(HugePageMeter_labels) == HTOP_HUGEPAGE_COUNT);
+
+   char* buffer = this->txtBuffer;
+   size_t size = sizeof(this->txtBuffer);
+   int written;
+   memory_t usedTotal = 0;
+   unsigned nextUsed = 0;
+
+   const LinuxMachine* host = (const LinuxMachine*) this->host;
+   this->total = host->totalHugePageMem;
+   this->values[0] = 0;
+   HugePageMeter_active_labels[0] = " used:";
+   for (unsigned i = 1; i < ARRAYSIZE(HugePageMeter_active_labels); i++) {
+      this->values[i] = NAN;
+      HugePageMeter_active_labels[i] = NULL;
+   }
+   for (unsigned i = 0; i < HTOP_HUGEPAGE_COUNT; i++) {
+      memory_t value = host->usedHugePageMem[i];
+      if (value != MEMORY_MAX) {
+         this->values[nextUsed] = value;
+         usedTotal += value;
+         HugePageMeter_active_labels[nextUsed] = HugePageMeter_labels[i];
+         if (++nextUsed == ARRAYSIZE(HugePageMeter_active_labels)) {
+            break;
+         }
+      }
+   }
+
+   written = Meter_humanUnit(buffer, usedTotal, size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '/');
+
+   Meter_humanUnit(buffer, this->total, size);
+}
+
+static void HugePageMeter_display(const Object* cast, RichString* out) {
+   char buffer[50];
+   const Meter* this = (const Meter*)cast;
+
+   RichString_writeAscii(out, CRT_colors[METER_TEXT], ":");
+   Meter_humanUnit(buffer, this->total, sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+
+   for (unsigned i = 0; i < ARRAYSIZE(HugePageMeter_active_labels); i++) {
+      if (!HugePageMeter_active_labels[i]) {
+         break;
+      }
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], HugePageMeter_active_labels[i]);
+      Meter_humanUnit(buffer, this->values[i], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[HUGEPAGE_1 + i], buffer);
+   }
+}
+
+const MeterClass HugePageMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = HugePageMeter_display,
+   },
+   .updateValues = HugePageMeter_updateValues,
+   .defaultMode = BAR_METERMODE,
+   .maxItems = ARRAYSIZE(HugePageMeter_active_labels),
+   .total = 100.0,
+   .attributes = HugePageMeter_attributes,
+   .name = "HugePages",
+   .uiName = "HugePages",
+   .caption = "HP"
+};
diff --git a/linux/HugePageMeter.h b/linux/HugePageMeter.h
new file mode 100644
index 0000000..d74a19e
--- /dev/null
+++ b/linux/HugePageMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_HugePageMeter
+#define HEADER_HugePageMeter
+/*
+htop - HugePageMeter.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass HugePageMeter_class;
+
+#endif /* HEADER_HugePageMeter */
diff --git a/linux/IOPriority.h b/linux/IOPriority.h
new file mode 100644
index 0000000..78bc470
--- /dev/null
+++ b/linux/IOPriority.h
@@ -0,0 +1,36 @@
+#ifndef HEADER_IOPriority
+#define HEADER_IOPriority
+/*
+htop - IOPriority.h
+(C) 2004-2012 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+
+Based on ionice,
+Copyright (C) 2005 Jens Axboe <jens@axboe.dk>
+Released under the terms of the GNU General Public License version 2
+*/
+
+enum {
+   IOPRIO_CLASS_NONE,
+   IOPRIO_CLASS_RT,
+   IOPRIO_CLASS_BE,
+   IOPRIO_CLASS_IDLE,
+};
+
+#define IOPRIO_WHO_PROCESS 1
+
+#define IOPRIO_CLASS_SHIFT (13)
+#define IOPRIO_PRIO_MASK ((1UL << IOPRIO_CLASS_SHIFT) - 1)
+
+#define IOPriority_class(ioprio_) ((int) ((ioprio_) >> IOPRIO_CLASS_SHIFT) )
+#define IOPriority_data(ioprio_) ((int) ((ioprio_) & IOPRIO_PRIO_MASK) )
+
+typedef int IOPriority;
+
+#define IOPriority_tuple(class_, data_) (((class_) << IOPRIO_CLASS_SHIFT) | (data_))
+
+#define IOPriority_None IOPriority_tuple(IOPRIO_CLASS_NONE, 0)
+#define IOPriority_Idle IOPriority_tuple(IOPRIO_CLASS_IDLE, 7)
+
+#endif
diff --git a/linux/IOPriorityPanel.c b/linux/IOPriorityPanel.c
new file mode 100644
index 0000000..8d0ef7b
--- /dev/null
+++ b/linux/IOPriorityPanel.c
@@ -0,0 +1,59 @@
+/*
+htop - IOPriorityPanel.c
+(C) 2004-2012 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/IOPriorityPanel.h"
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "FunctionBar.h"
+#include "ListItem.h"
+#include "Object.h"
+#include "XUtils.h"
+#include "IOPriority.h"
+
+
+Panel* IOPriorityPanel_new(IOPriority currPrio) {
+   Panel* this = Panel_new(1, 1, 1, 1, Class(ListItem), true, FunctionBar_newEnterEsc("Set    ", "Cancel "));
+
+   Panel_setHeader(this, "IO Priority:");
+   Panel_add(this, (Object*) ListItem_new("None (based on nice)", IOPriority_None));
+   if (currPrio == IOPriority_None) {
+      Panel_setSelected(this, 0);
+   }
+   static const struct {
+      int klass;
+      const char* name;
+   } classes[] = {
+      { .klass = IOPRIO_CLASS_RT, .name = "Realtime" },
+      { .klass = IOPRIO_CLASS_BE, .name = "Best-effort" },
+      { .klass = 0, .name = NULL }
+   };
+   for (int c = 0; classes[c].name; c++) {
+      for (int i = 0; i < 8; i++) {
+         char name[50];
+         xSnprintf(name, sizeof(name), "%s %d %s", classes[c].name, i, i == 0 ? "(High)" : (i == 7 ? "(Low)" : ""));
+         IOPriority ioprio = IOPriority_tuple(classes[c].klass, i);
+         Panel_add(this, (Object*) ListItem_new(name, ioprio));
+         if (currPrio == ioprio) {
+            Panel_setSelected(this, Panel_size(this) - 1);
+         }
+      }
+   }
+   Panel_add(this, (Object*) ListItem_new("Idle", IOPriority_Idle));
+   if (currPrio == IOPriority_Idle) {
+      Panel_setSelected(this, Panel_size(this) - 1);
+   }
+   return this;
+}
+
+IOPriority IOPriorityPanel_getIOPriority(Panel* this) {
+   const ListItem* selected = (ListItem*) Panel_getSelected(this);
+   return selected ? selected->key : IOPriority_None;
+}
diff --git a/linux/IOPriorityPanel.h b/linux/IOPriorityPanel.h
new file mode 100644
index 0000000..cb5b338
--- /dev/null
+++ b/linux/IOPriorityPanel.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_IOPriorityPanel
+#define HEADER_IOPriorityPanel
+/*
+htop - IOPriorityPanel.h
+(C) 2004-2012 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Panel.h"
+#include "linux/IOPriority.h"
+
+Panel* IOPriorityPanel_new(IOPriority currPrio);
+
+IOPriority IOPriorityPanel_getIOPriority(Panel* this);
+
+#endif
diff --git a/linux/LibSensors.c b/linux/LibSensors.c
new file mode 100644
index 0000000..5373416
--- /dev/null
+++ b/linux/LibSensors.c
@@ -0,0 +1,278 @@
+/*
+htop - linux/LibSensors.c
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/LibSensors.h"
+
+#ifdef HAVE_SENSORS_SENSORS_H
+
+#include <assert.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sensors/sensors.h>
+
+#include "Macros.h"
+#include "XUtils.h"
+#include "linux/LinuxMachine.h"
+
+
+#ifdef BUILD_STATIC
+
+#define sym_sensors_init sensors_init
+#define sym_sensors_cleanup sensors_cleanup
+#define sym_sensors_get_detected_chips sensors_get_detected_chips
+#define sym_sensors_get_features sensors_get_features
+#define sym_sensors_get_subfeature sensors_get_subfeature
+#define sym_sensors_get_value sensors_get_value
+
+#else
+
+static int (*sym_sensors_init)(FILE*);
+static void (*sym_sensors_cleanup)(void);
+static const sensors_chip_name* (*sym_sensors_get_detected_chips)(const sensors_chip_name*, int*);
+static const sensors_feature* (*sym_sensors_get_features)(const sensors_chip_name*, int*);
+static const sensors_subfeature* (*sym_sensors_get_subfeature)(const sensors_chip_name*, const sensors_feature*, sensors_subfeature_type);
+static int (*sym_sensors_get_value)(const sensors_chip_name*, int, double*);
+
+static void* dlopenHandle = NULL;
+
+#endif /* BUILD_STATIC */
+
+int LibSensors_init(void) {
+#ifdef BUILD_STATIC
+
+   return sym_sensors_init(NULL);
+
+#else
+
+   if (!dlopenHandle) {
+      /* Find the unversioned libsensors.so (symlink) and prefer that, but Debian has .so.5 and Fedora .so.4 without
+         matching symlinks (unless people install the -dev packages) */
+      dlopenHandle = dlopen("libsensors.so", RTLD_LAZY);
+      if (!dlopenHandle)
+         dlopenHandle = dlopen("libsensors.so.5", RTLD_LAZY);
+      if (!dlopenHandle)
+         dlopenHandle = dlopen("libsensors.so.4", RTLD_LAZY);
+      if (!dlopenHandle)
+         goto dlfailure;
+
+      /* Clear any errors */
+      dlerror();
+
+      #define resolve(symbolname) do {                                      \
+         *(void **)(&sym_##symbolname) = dlsym(dlopenHandle, #symbolname);  \
+         if (!sym_##symbolname || dlerror() != NULL)                        \
+            goto dlfailure;                                                 \
+      } while(0)
+
+      resolve(sensors_init);
+      resolve(sensors_cleanup);
+      resolve(sensors_get_detected_chips);
+      resolve(sensors_get_features);
+      resolve(sensors_get_subfeature);
+      resolve(sensors_get_value);
+
+      #undef resolve
+   }
+
+   return sym_sensors_init(NULL);
+
+
+dlfailure:
+   if (dlopenHandle) {
+      dlclose(dlopenHandle);
+      dlopenHandle = NULL;
+   }
+   return -1;
+
+#endif /* BUILD_STATIC */
+}
+
+void LibSensors_cleanup(void) {
+#ifdef BUILD_STATIC
+
+   sym_sensors_cleanup();
+
+#else
+
+   if (dlopenHandle) {
+      sym_sensors_cleanup();
+
+      dlclose(dlopenHandle);
+      dlopenHandle = NULL;
+   }
+
+#endif /* BUILD_STATIC */
+}
+
+int LibSensors_reload(void) {
+#ifndef BUILD_STATIC
+   if (!dlopenHandle) {
+      errno = ENOTSUP;
+      return -1;
+   }
+#endif /* !BUILD_STATIC */
+
+   sym_sensors_cleanup();
+   return sym_sensors_init(NULL);
+}
+
+static int tempDriverPriority(const sensors_chip_name* chip) {
+   static const struct TempDriverDefs {
+      const char* prefix;
+      int priority;
+   } tempDrivers[] =  {
+      { "coretemp",    0 },
+      { "via_cputemp", 0 },
+      { "cpu_thermal", 0 },
+      { "k10temp",     0 },
+      { "zenpower",    0 },
+      /* Low priority drivers */
+      { "acpitz",      1 },
+   };
+
+   for (size_t i = 0; i < ARRAYSIZE(tempDrivers); i++)
+      if (String_eq(chip->prefix, tempDrivers[i].prefix))
+         return tempDrivers[i].priority;
+
+   return -1;
+}
+
+void LibSensors_getCPUTemperatures(CPUData* cpus, unsigned int existingCPUs, unsigned int activeCPUs) {
+   assert(existingCPUs > 0 && existingCPUs < 16384);
+
+   double* data = xMallocArray(existingCPUs + 1, sizeof(double));
+   for (size_t i = 0; i < existingCPUs + 1; i++)
+      data[i] = NAN;
+
+#ifndef BUILD_STATIC
+   if (!dlopenHandle)
+      goto out;
+#endif /* !BUILD_STATIC */
+
+   unsigned int coreTempCount = 0;
+   int topPriority = 99;
+
+   int n = 0;
+   for (const sensors_chip_name* chip = sym_sensors_get_detected_chips(NULL, &n); chip; chip = sym_sensors_get_detected_chips(NULL, &n)) {
+      const int priority = tempDriverPriority(chip);
+      if (priority < 0)
+         continue;
+
+      if (priority > topPriority)
+         continue;
+
+      if (priority < topPriority) {
+         /* Clear data from lower priority sensor */
+         for (size_t i = 0; i < existingCPUs + 1; i++)
+            data[i] = NAN;
+      }
+
+      topPriority = priority;
+
+      int m = 0;
+      for (const sensors_feature* feature = sym_sensors_get_features(chip, &m); feature; feature = sym_sensors_get_features(chip, &m)) {
+         if (feature->type != SENSORS_FEATURE_TEMP)
+            continue;
+
+         if (!feature->name || !String_startsWith(feature->name, "temp"))
+            continue;
+
+         unsigned long int tempID = strtoul(feature->name + strlen("temp"), NULL, 10);
+         if (tempID == 0 || tempID == ULONG_MAX)
+            continue;
+
+         /* Feature name IDs start at 1, adjust to start at 0 to match data indices */
+         tempID--;
+
+         if (tempID > existingCPUs)
+            continue;
+
+         const sensors_subfeature* subFeature = sym_sensors_get_subfeature(chip, feature, SENSORS_SUBFEATURE_TEMP_INPUT);
+         if (!subFeature)
+            continue;
+
+         double temp;
+         int r = sym_sensors_get_value(chip, subFeature->number, &temp);
+         if (r != 0)
+            continue;
+
+         /* If already set, e.g. Ryzen reporting platform temperature for each die, use the bigger one */
+         if (isNaN(data[tempID])) {
+            data[tempID] = temp;
+            if (tempID > 0)
+               coreTempCount++;
+         } else {
+            data[tempID] = MAXIMUM(data[tempID], temp);
+         }
+      }
+   }
+
+   /* Adjust data for chips not providing a platform temperature */
+   if (coreTempCount + 1 == activeCPUs || coreTempCount + 1 == activeCPUs / 2) {
+      memmove(&data[1], &data[0], existingCPUs * sizeof(*data));
+      data[0] = NAN;
+      coreTempCount++;
+
+      /* Check for further adjustments */
+   }
+
+   /* Only package temperature - copy to all cores */
+   if (coreTempCount == 0 && !isNaN(data[0])) {
+      for (unsigned int i = 1; i <= existingCPUs; i++)
+         data[i] = data[0];
+
+      /* No further adjustments */
+      goto out;
+   }
+
+   /* No package temperature - set to max core temperature */
+   if (coreTempCount > 0 && isNaN(data[0])) {
+      double maxTemp = -HUGE_VAL;
+      for (unsigned int i = 1; i <= existingCPUs; i++) {
+         if (isgreater(data[i], maxTemp)) {
+            maxTemp = data[i];
+            data[0] = data[i];
+         }
+      }
+
+      /* Check for further adjustments */
+   }
+
+   /* Only temperature for core 0, maybe Ryzen - copy to all other cores */
+   if (coreTempCount == 1 && !isNaN(data[1])) {
+      for (unsigned int i = 2; i <= existingCPUs; i++)
+         data[i] = data[1];
+
+      /* No further adjustments */
+      goto out;
+   }
+
+   /* Half the temperatures, probably HT/SMT - copy to second half */
+   const unsigned int delta = activeCPUs / 2;
+   if (coreTempCount == delta) {
+      memcpy(&data[delta + 1], &data[1], delta * sizeof(*data));
+
+      /* No further adjustments */
+      goto out;
+   }
+
+out:
+   for (unsigned int i = 0; i <= existingCPUs; i++)
+      cpus[i].temperature = data[i];
+
+   free(data);
+}
+
+#endif /* HAVE_SENSORS_SENSORS_H */
diff --git a/linux/LibSensors.h b/linux/LibSensors.h
new file mode 100644
index 0000000..6f05448
--- /dev/null
+++ b/linux/LibSensors.h
@@ -0,0 +1,19 @@
+#ifndef HEADER_LibSensors
+#define HEADER_LibSensors
+/*
+htop - linux/LibSensors.h
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "linux/LinuxMachine.h"
+
+
+int LibSensors_init(void);
+void LibSensors_cleanup(void);
+int LibSensors_reload(void);
+
+void LibSensors_getCPUTemperatures(CPUData* cpus, unsigned int existingCPUs, unsigned int activeCPUs);
+
+#endif /* HEADER_LibSensors */
diff --git a/linux/LinuxMachine.c b/linux/LinuxMachine.c
new file mode 100644
index 0000000..ae2930d
--- /dev/null
+++ b/linux/LinuxMachine.c
@@ -0,0 +1,695 @@
+/*
+htop - LinuxMachine.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/LinuxMachine.h"
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+#include <time.h>
+
+#include "Compat.h"
+#include "CRT.h"
+#include "Macros.h"
+#include "ProcessTable.h"
+#include "Row.h"
+#include "Settings.h"
+#include "UsersTable.h"
+#include "XUtils.h"
+
+#include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX  // IWYU pragma: keep
+
+#ifdef HAVE_SENSORS_SENSORS_H
+#include "LibSensors.h"
+#endif
+
+#ifndef O_PATH
+#define O_PATH         010000000 // declare for ancient glibc versions
+#endif
+
+/* Similar to get_nprocs_conf(3) / _SC_NPROCESSORS_CONF
+ * https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/getsysstats.c;hb=HEAD
+ */
+static void LinuxMachine_updateCPUcount(LinuxMachine* this) {
+   unsigned int existing = 0, active = 0;
+   Machine* super = &this->super;
+
+   // Initialize the cpuData array before anything else.
+   if (!this->cpuData) {
+      this->cpuData = xCalloc(2, sizeof(CPUData));
+      this->cpuData[0].online = true; /* average is always "online" */
+      this->cpuData[1].online = true;
+      super->activeCPUs = 1;
+      super->existingCPUs = 1;
+   }
+
+   DIR* dir = opendir("/sys/devices/system/cpu");
+   if (!dir)
+      return;
+
+   unsigned int currExisting = super->existingCPUs;
+
+   const struct dirent* entry;
+   while ((entry = readdir(dir)) != NULL) {
+      if (entry->d_type != DT_DIR && entry->d_type != DT_UNKNOWN)
+         continue;
+
+      if (!String_startsWith(entry->d_name, "cpu"))
+         continue;
+
+      char* endp;
+      unsigned long int id = strtoul(entry->d_name + 3, &endp, 10);
+      if (id == ULONG_MAX || endp == entry->d_name + 3 || *endp != '\0')
+         continue;
+
+#ifdef HAVE_OPENAT
+      int cpuDirFd = openat(dirfd(dir), entry->d_name, O_DIRECTORY | O_PATH | O_NOFOLLOW);
+      if (cpuDirFd < 0)
+         continue;
+#else
+      char cpuDirFd[4096];
+      xSnprintf(cpuDirFd, sizeof(cpuDirFd), "/sys/devices/system/cpu/%s", entry->d_name);
+#endif
+
+      existing++;
+
+      /* readdir() iterates with no specific order */
+      unsigned int max = MAXIMUM(existing, id + 1);
+      if (max > currExisting) {
+         this->cpuData = xReallocArrayZero(this->cpuData, currExisting ? (currExisting + 1) : 0, max + /* aggregate */ 1, sizeof(CPUData));
+         this->cpuData[0].online = true; /* average is always "online" */
+         currExisting = max;
+      }
+
+      char buffer[8];
+      ssize_t res = xReadfileat(cpuDirFd, "online", buffer, sizeof(buffer));
+      /* If the file "online" does not exist or on failure count as active */
+      if (res < 1 || buffer[0] != '0') {
+         active++;
+         this->cpuData[id + 1].online = true;
+      } else {
+         this->cpuData[id + 1].online = false;
+      }
+
+      Compat_openatArgClose(cpuDirFd);
+   }
+
+   closedir(dir);
+
+   // return if no CPU is found
+   if (existing < 1)
+      return;
+
+#ifdef HAVE_SENSORS_SENSORS_H
+   /* When started with offline CPUs, libsensors does not monitor those,
+    * even when they become online. */
+   if (super->existingCPUs != 0 && (active > super->activeCPUs || currExisting > super->existingCPUs))
+      LibSensors_reload();
+#endif
+
+   super->activeCPUs = active;
+   assert(existing == currExisting);
+   super->existingCPUs = currExisting;
+}
+
+static void LinuxMachine_scanMemoryInfo(LinuxMachine* this) {
+   Machine* host = &this->super;
+   memory_t availableMem = 0;
+   memory_t freeMem = 0;
+   memory_t totalMem = 0;
+   memory_t buffersMem = 0;
+   memory_t cachedMem = 0;
+   memory_t sharedMem = 0;
+   memory_t swapTotalMem = 0;
+   memory_t swapCacheMem = 0;
+   memory_t swapFreeMem = 0;
+   memory_t sreclaimableMem = 0;
+   memory_t zswapCompMem = 0;
+   memory_t zswapOrigMem = 0;
+
+   FILE* file = fopen(PROCMEMINFOFILE, "r");
+   if (!file)
+      CRT_fatalError("Cannot open " PROCMEMINFOFILE);
+
+   char buffer[128];
+   while (fgets(buffer, sizeof(buffer), file)) {
+
+      #define tryRead(label, variable)                                       \
+         if (String_startsWith(buffer, label)) {                             \
+            memory_t parsed_;                                                \
+            if (sscanf(buffer + strlen(label), "%llu kB", &parsed_) == 1) {  \
+               (variable) = parsed_;                                         \
+            }                                                                \
+            break;                                                           \
+         } else (void) 0 /* Require a ";" after the macro use. */
+
+      switch (buffer[0]) {
+         case 'M':
+            tryRead("MemAvailable:", availableMem);
+            tryRead("MemFree:", freeMem);
+            tryRead("MemTotal:", totalMem);
+            break;
+         case 'B':
+            tryRead("Buffers:", buffersMem);
+            break;
+         case 'C':
+            tryRead("Cached:", cachedMem);
+            break;
+         case 'S':
+            switch (buffer[1]) {
+               case 'h':
+                  tryRead("Shmem:", sharedMem);
+                  break;
+               case 'w':
+                  tryRead("SwapTotal:", swapTotalMem);
+                  tryRead("SwapCached:", swapCacheMem);
+                  tryRead("SwapFree:", swapFreeMem);
+                  break;
+               case 'R':
+                  tryRead("SReclaimable:", sreclaimableMem);
+                  break;
+            }
+            break;
+         case 'Z':
+            tryRead("Zswap:", zswapCompMem);
+            tryRead("Zswapped:", zswapOrigMem);
+            break;
+      }
+
+      #undef tryRead
+   }
+
+   fclose(file);
+
+   /*
+    * Compute memory partition like procps(free)
+    *  https://gitlab.com/procps-ng/procps/-/blob/master/proc/sysinfo.c
+    *
+    * Adjustments:
+    *  - Shmem in part of Cached (see https://lore.kernel.org/patchwork/patch/648763/),
+    *    do not show twice by subtracting from Cached and do not subtract twice from used.
+    */
+   host->totalMem = totalMem;
+   host->cachedMem = cachedMem + sreclaimableMem - sharedMem;
+   host->sharedMem = sharedMem;
+   const memory_t usedDiff = freeMem + cachedMem + sreclaimableMem + buffersMem;
+   host->usedMem = (totalMem >= usedDiff) ? totalMem - usedDiff : totalMem - freeMem;
+   host->buffersMem = buffersMem;
+   host->availableMem = availableMem != 0 ? MINIMUM(availableMem, totalMem) : freeMem;
+   host->totalSwap = swapTotalMem;
+   host->usedSwap = swapTotalMem - swapFreeMem - swapCacheMem;
+   host->cachedSwap = swapCacheMem;
+   this->zswap.usedZswapComp = zswapCompMem;
+   this->zswap.usedZswapOrig = zswapOrigMem;
+}
+
+static void LinuxMachine_scanHugePages(LinuxMachine* this) {
+   this->totalHugePageMem = 0;
+   for (unsigned i = 0; i < HTOP_HUGEPAGE_COUNT; i++) {
+      this->usedHugePageMem[i] = MEMORY_MAX;
+   }
+
+   DIR* dir = opendir("/sys/kernel/mm/hugepages");
+   if (!dir)
+      return;
+
+   const struct dirent* entry;
+   while ((entry = readdir(dir)) != NULL) {
+      const char* name = entry->d_name;
+
+      /* Ignore all non-directories */
+      if (entry->d_type != DT_DIR && entry->d_type != DT_UNKNOWN)
+         continue;
+
+      if (!String_startsWith(name, "hugepages-"))
+         continue;
+
+      char* endptr;
+      unsigned long int hugePageSize = strtoul(name + strlen("hugepages-"), &endptr, 10);
+      if (!endptr || *endptr != 'k')
+         continue;
+
+      char content[64];
+      char hugePagePath[128];
+      ssize_t r;
+
+      xSnprintf(hugePagePath, sizeof(hugePagePath), "/sys/kernel/mm/hugepages/%s/nr_hugepages", name);
+      r = xReadfile(hugePagePath, content, sizeof(content));
+      if (r <= 0)
+         continue;
+
+      memory_t total = strtoull(content, NULL, 10);
+      if (total == 0)
+         continue;
+
+      xSnprintf(hugePagePath, sizeof(hugePagePath), "/sys/kernel/mm/hugepages/%s/free_hugepages", name);
+      r = xReadfile(hugePagePath, content, sizeof(content));
+      if (r <= 0)
+         continue;
+
+      memory_t free = strtoull(content, NULL, 10);
+
+      int shift = ffsl(hugePageSize) - 1 - (HTOP_HUGEPAGE_BASE_SHIFT - 10);
+      assert(shift >= 0 && shift < HTOP_HUGEPAGE_COUNT);
+
+      this->totalHugePageMem += total * hugePageSize;
+      this->usedHugePageMem[shift] = (total - free) * hugePageSize;
+   }
+
+   closedir(dir);
+}
+
+static void LinuxMachine_scanZramInfo(LinuxMachine* this) {
+   memory_t totalZram = 0;
+   memory_t usedZramComp = 0;
+   memory_t usedZramOrig = 0;
+
+   char mm_stat[34];
+   char disksize[34];
+
+   unsigned int i = 0;
+   for (;;) {
+      xSnprintf(mm_stat, sizeof(mm_stat), "/sys/block/zram%u/mm_stat", i);
+      xSnprintf(disksize, sizeof(disksize), "/sys/block/zram%u/disksize", i);
+      i++;
+      FILE* disksize_file = fopen(disksize, "r");
+      FILE* mm_stat_file = fopen(mm_stat, "r");
+      if (disksize_file == NULL || mm_stat_file == NULL) {
+         if (disksize_file) {
+            fclose(disksize_file);
+         }
+         if (mm_stat_file) {
+            fclose(mm_stat_file);
+         }
+         break;
+      }
+      memory_t size = 0;
+      memory_t orig_data_size = 0;
+      memory_t compr_data_size = 0;
+
+      if (!fscanf(disksize_file, "%llu\n", &size) ||
+          !fscanf(mm_stat_file, "    %llu       %llu", &orig_data_size, &compr_data_size)) {
+         fclose(disksize_file);
+         fclose(mm_stat_file);
+         break;
+      }
+
+      totalZram += size;
+      usedZramComp += compr_data_size;
+      usedZramOrig += orig_data_size;
+
+      fclose(disksize_file);
+      fclose(mm_stat_file);
+   }
+
+   this->zram.totalZram = totalZram / 1024;
+   this->zram.usedZramComp = usedZramComp / 1024;
+   this->zram.usedZramOrig = usedZramOrig / 1024;
+   if (this->zram.usedZramComp > this->zram.usedZramOrig) {
+      this->zram.usedZramComp = this->zram.usedZramOrig;
+   }
+}
+
+static void LinuxMachine_scanZfsArcstats(LinuxMachine* this) {
+   memory_t dbufSize = 0;
+   memory_t dnodeSize = 0;
+   memory_t bonusSize = 0;
+
+   FILE* file = fopen(PROCARCSTATSFILE, "r");
+   if (file == NULL) {
+      this->zfs.enabled = 0;
+      return;
+   }
+   char buffer[128];
+   while (fgets(buffer, 128, file)) {
+      #define tryRead(label, variable)                                         \
+         if (String_startsWith(buffer, label)) {                               \
+            sscanf(buffer + strlen(label), " %*2u %32llu", variable);          \
+            break;                                                             \
+         } else (void) 0 /* Require a ";" after the macro use. */
+      #define tryReadFlag(label, variable, flag)                               \
+         if (String_startsWith(buffer, label)) {                               \
+            (flag) = sscanf(buffer + strlen(label), " %*2u %32llu", variable); \
+            break;                                                             \
+         } else (void) 0 /* Require a ";" after the macro use. */
+
+      switch (buffer[0]) {
+         case 'c':
+            tryRead("c_min", &this->zfs.min);
+            tryRead("c_max", &this->zfs.max);
+            tryReadFlag("compressed_size", &this->zfs.compressed, this->zfs.isCompressed);
+            break;
+         case 'u':
+            tryRead("uncompressed_size", &this->zfs.uncompressed);
+            break;
+         case 's':
+            tryRead("size", &this->zfs.size);
+            break;
+         case 'h':
+            tryRead("hdr_size", &this->zfs.header);
+            break;
+         case 'd':
+            tryRead("dbuf_size", &dbufSize);
+            tryRead("dnode_size", &dnodeSize);
+            break;
+         case 'b':
+            tryRead("bonus_size", &bonusSize);
+            break;
+         case 'a':
+            tryRead("anon_size", &this->zfs.anon);
+            break;
+         case 'm':
+            tryRead("mfu_size", &this->zfs.MFU);
+            tryRead("mru_size", &this->zfs.MRU);
+            break;
+      }
+
+      #undef tryRead
+      #undef tryReadFlag
+   }
+   fclose(file);
+
+   this->zfs.enabled = (this->zfs.size > 0 ? 1 : 0);
+   this->zfs.size   /= 1024;
+   this->zfs.min    /= 1024;
+   this->zfs.max    /= 1024;
+   this->zfs.MFU    /= 1024;
+   this->zfs.MRU    /= 1024;
+   this->zfs.anon   /= 1024;
+   this->zfs.header /= 1024;
+   this->zfs.other   = (dbufSize + dnodeSize + bonusSize) / 1024;
+   if ( this->zfs.isCompressed ) {
+      this->zfs.compressed /= 1024;
+      this->zfs.uncompressed /= 1024;
+   }
+}
+
+static void LinuxMachine_scanCPUTime(LinuxMachine* this) {
+   const Machine* super = &this->super;
+
+   LinuxMachine_updateCPUcount(this);
+
+   FILE* file = fopen(PROCSTATFILE, "r");
+   if (!file)
+      CRT_fatalError("Cannot open " PROCSTATFILE);
+
+   unsigned int lastAdjCpuId = 0;
+
+   for (unsigned int i = 0; i <= super->existingCPUs; i++) {
+      char buffer[PROC_LINE_LENGTH + 1];
+      unsigned long long int usertime, nicetime, systemtime, idletime;
+      unsigned long long int ioWait = 0, irq = 0, softIrq = 0, steal = 0, guest = 0, guestnice = 0;
+
+      const char* ok = fgets(buffer, sizeof(buffer), file);
+      if (!ok)
+         break;
+
+      // cpu fields are sorted first
+      if (!String_startsWith(buffer, "cpu"))
+         break;
+
+      // Depending on your kernel version,
+      // 5, 7, 8 or 9 of these fields will be set.
+      // The rest will remain at zero.
+      unsigned int adjCpuId;
+      if (i == 0) {
+         (void) sscanf(buffer, "cpu  %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
+         adjCpuId = 0;
+      } else {
+         unsigned int cpuid;
+         (void) sscanf(buffer, "cpu%4u %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu %16llu", &cpuid, &usertime, &nicetime, &systemtime, &idletime, &ioWait, &irq, &softIrq, &steal, &guest, &guestnice);
+         adjCpuId = cpuid + 1;
+      }
+
+      if (adjCpuId > super->existingCPUs)
+         break;
+
+      for (unsigned int j = lastAdjCpuId + 1; j < adjCpuId; j++) {
+         // Skipped an ID, but /proc/stat is ordered => got offline CPU
+         memset(&(this->cpuData[j]), '\0', sizeof(CPUData));
+      }
+      lastAdjCpuId = adjCpuId;
+
+      // Guest time is already accounted in usertime
+      usertime -= guest;
+      nicetime -= guestnice;
+      // Fields existing on kernels >= 2.6
+      // (and RHEL's patched kernel 2.4...)
+      unsigned long long int idlealltime = idletime + ioWait;
+      unsigned long long int systemalltime = systemtime + irq + softIrq;
+      unsigned long long int virtalltime = guest + guestnice;
+      unsigned long long int totaltime = usertime + nicetime + systemalltime + idlealltime + steal + virtalltime;
+      CPUData* cpuData = &(this->cpuData[adjCpuId]);
+      // Since we do a subtraction (usertime - guest) and cputime64_to_clock_t()
+      // used in /proc/stat rounds down numbers, it can lead to a case where the
+      // integer overflow.
+      cpuData->userPeriod = saturatingSub(usertime, cpuData->userTime);
+      cpuData->nicePeriod = saturatingSub(nicetime, cpuData->niceTime);
+      cpuData->systemPeriod = saturatingSub(systemtime, cpuData->systemTime);
+      cpuData->systemAllPeriod = saturatingSub(systemalltime, cpuData->systemAllTime);
+      cpuData->idleAllPeriod = saturatingSub(idlealltime, cpuData->idleAllTime);
+      cpuData->idlePeriod = saturatingSub(idletime, cpuData->idleTime);
+      cpuData->ioWaitPeriod = saturatingSub(ioWait, cpuData->ioWaitTime);
+      cpuData->irqPeriod = saturatingSub(irq, cpuData->irqTime);
+      cpuData->softIrqPeriod = saturatingSub(softIrq, cpuData->softIrqTime);
+      cpuData->stealPeriod = saturatingSub(steal, cpuData->stealTime);
+      cpuData->guestPeriod = saturatingSub(virtalltime, cpuData->guestTime);
+      cpuData->totalPeriod = saturatingSub(totaltime, cpuData->totalTime);
+      cpuData->userTime = usertime;
+      cpuData->niceTime = nicetime;
+      cpuData->systemTime = systemtime;
+      cpuData->systemAllTime = systemalltime;
+      cpuData->idleAllTime = idlealltime;
+      cpuData->idleTime = idletime;
+      cpuData->ioWaitTime = ioWait;
+      cpuData->irqTime = irq;
+      cpuData->softIrqTime = softIrq;
+      cpuData->stealTime = steal;
+      cpuData->guestTime = virtalltime;
+      cpuData->totalTime = totaltime;
+   }
+
+   this->period = (double)this->cpuData[0].totalPeriod / super->activeCPUs;
+
+   char buffer[PROC_LINE_LENGTH + 1];
+   while (fgets(buffer, sizeof(buffer), file)) {
+      if (String_startsWith(buffer, "procs_running")) {
+         ProcessTable* pt = (ProcessTable*) super->processTable;
+         pt->runningTasks = strtoul(buffer + strlen("procs_running"), NULL, 10);
+         break;
+      }
+   }
+
+   fclose(file);
+}
+
+static int scanCPUFrequencyFromSysCPUFreq(LinuxMachine* this) {
+   const Machine* super = &this->super;
+   int numCPUsWithFrequency = 0;
+   unsigned long totalFrequency = 0;
+
+   /*
+    * On some AMD and Intel CPUs read()ing scaling_cur_freq is quite slow (> 1ms). This delay
+    * accumulates for every core. For details see issue#471.
+    * If the read on CPU 0 takes longer than 500us bail out and fall back to reading the
+    * frequencies from /proc/cpuinfo.
+    * Once the condition has been met, bail out early for the next couple of scans.
+    */
+   static int timeout = 0;
+
+   if (timeout > 0) {
+      timeout--;
+      return -1;
+   }
+
+   for (unsigned int i = 0; i < super->existingCPUs; ++i) {
+      if (!Machine_isCPUonline(super, i))
+         continue;
+
+      char pathBuffer[64];
+      xSnprintf(pathBuffer, sizeof(pathBuffer), "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq", i);
+
+      struct timespec start;
+      if (i == 0)
+         clock_gettime(CLOCK_MONOTONIC, &start);
+
+      FILE* file = fopen(pathBuffer, "r");
+      if (!file)
+         return -errno;
+
+      unsigned long frequency;
+      if (fscanf(file, "%lu", &frequency) == 1) {
+         /* convert kHz to MHz */
+         frequency = frequency / 1000;
+         this->cpuData[i + 1].frequency = frequency;
+         numCPUsWithFrequency++;
+         totalFrequency += frequency;
+      }
+
+      fclose(file);
+
+      if (i == 0) {
+         struct timespec end;
+         clock_gettime(CLOCK_MONOTONIC, &end);
+         const time_t timeTakenUs = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_nsec - start.tv_nsec) / 1000;
+         if (timeTakenUs > 500) {
+            timeout = 30;
+            return -1;
+         }
+      }
+   }
+
+   if (numCPUsWithFrequency > 0)
+      this->cpuData[0].frequency = (double)totalFrequency / numCPUsWithFrequency;
+
+   return 0;
+}
+
+static void scanCPUFrequencyFromCPUinfo(LinuxMachine* this) {
+   const Machine* super = &this->super;
+
+   FILE* file = fopen(PROCCPUINFOFILE, "r");
+   if (file == NULL)
+      return;
+
+   int numCPUsWithFrequency = 0;
+   double totalFrequency = 0;
+   int cpuid = -1;
+
+   while (!feof(file)) {
+      double frequency;
+      char buffer[PROC_LINE_LENGTH];
+
+      if (fgets(buffer, PROC_LINE_LENGTH, file) == NULL)
+         break;
+
+      if (sscanf(buffer, "processor : %d", &cpuid) == 1) {
+         continue;
+      } else if (
+         (sscanf(buffer, "cpu MHz : %lf", &frequency) == 1) ||
+         (sscanf(buffer, "clock : %lfMHz", &frequency) == 1)
+      ) {
+         if (cpuid < 0 || (unsigned int)cpuid > (super->existingCPUs - 1)) {
+            continue;
+         }
+
+         CPUData* cpuData = &(this->cpuData[cpuid + 1]);
+         /* do not override sysfs data */
+         if (!isNonnegative(cpuData->frequency)) {
+            cpuData->frequency = frequency;
+         }
+         numCPUsWithFrequency++;
+         totalFrequency += frequency;
+      } else if (buffer[0] == '\n') {
+         cpuid = -1;
+      }
+   }
+   fclose(file);
+
+   if (numCPUsWithFrequency > 0) {
+      this->cpuData[0].frequency = totalFrequency / numCPUsWithFrequency;
+   }
+}
+
+static void LinuxMachine_scanCPUFrequency(LinuxMachine* this) {
+   const Machine* super = &this->super;
+
+   for (unsigned int i = 0; i <= super->existingCPUs; i++)
+      this->cpuData[i].frequency = NAN;
+
+   if (scanCPUFrequencyFromSysCPUFreq(this) == 0)
+      return;
+
+   scanCPUFrequencyFromCPUinfo(this);
+}
+
+void Machine_scan(Machine* super) {
+   LinuxMachine* this = (LinuxMachine*) super;
+
+   LinuxMachine_scanMemoryInfo(this);
+   LinuxMachine_scanHugePages(this);
+   LinuxMachine_scanZfsArcstats(this);
+   LinuxMachine_scanZramInfo(this);
+   LinuxMachine_scanCPUTime(this);
+
+   const Settings* settings = super->settings;
+   if (settings->showCPUFrequency)
+      LinuxMachine_scanCPUFrequency(this);
+
+   #ifdef HAVE_SENSORS_SENSORS_H
+   if (settings->showCPUTemperature)
+      LibSensors_getCPUTemperatures(this->cpuData, super->existingCPUs, super->activeCPUs);
+   #endif
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   LinuxMachine* this = xCalloc(1, sizeof(LinuxMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   // Initialize page size
+   if ((this->pageSize = sysconf(_SC_PAGESIZE)) == -1)
+      CRT_fatalError("Cannot get pagesize by sysconf(_SC_PAGESIZE)");
+   this->pageSizeKB = this->pageSize / ONE_K;
+
+   // Initialize clock ticks
+   if ((this->jiffies = sysconf(_SC_CLK_TCK)) == -1)
+      CRT_fatalError("Cannot get clock ticks by sysconf(_SC_CLK_TCK)");
+
+   // Read btime (the kernel boot time, as number of seconds since the epoch)
+   FILE* statfile = fopen(PROCSTATFILE, "r");
+   if (statfile == NULL)
+      CRT_fatalError("Cannot open " PROCSTATFILE);
+
+   this->boottime = -1;
+
+   while (true) {
+      char buffer[PROC_LINE_LENGTH + 1];
+      if (fgets(buffer, sizeof(buffer), statfile) == NULL)
+         break;
+      if (String_startsWith(buffer, "btime ") == false)
+         continue;
+      if (sscanf(buffer, "btime %lld\n", &this->boottime) == 1)
+         break;
+      CRT_fatalError("Failed to parse btime from " PROCSTATFILE);
+   }
+   fclose(statfile);
+
+   if (this->boottime == -1)
+      CRT_fatalError("No btime in " PROCSTATFILE);
+
+   // Initialize CPU count
+   LinuxMachine_updateCPUcount(this);
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   LinuxMachine* this = (LinuxMachine*) super;
+   Machine_done(super);
+   free(this->cpuData);
+   free(this);
+}
+
+bool Machine_isCPUonline(const Machine* super, unsigned int id) {
+   const LinuxMachine* this = (const LinuxMachine*) super;
+
+   assert(id < super->existingCPUs);
+   return this->cpuData[id + 1].online;
+}
diff --git a/linux/LinuxMachine.h b/linux/LinuxMachine.h
new file mode 100644
index 0000000..309b485
--- /dev/null
+++ b/linux/LinuxMachine.h
@@ -0,0 +1,109 @@
+#ifndef HEADER_LinuxMachine
+#define HEADER_LinuxMachine
+/*
+htop - LinuxMachine.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Machine.h"
+#include "linux/ZramStats.h"
+#include "linux/ZswapStats.h"
+#include "zfs/ZfsArcStats.h"
+
+#define HTOP_HUGEPAGE_BASE_SHIFT 16
+#define HTOP_HUGEPAGE_COUNT 24
+
+typedef struct CPUData_ {
+   unsigned long long int totalTime;
+   unsigned long long int userTime;
+   unsigned long long int systemTime;
+   unsigned long long int systemAllTime;
+   unsigned long long int idleAllTime;
+   unsigned long long int idleTime;
+   unsigned long long int niceTime;
+   unsigned long long int ioWaitTime;
+   unsigned long long int irqTime;
+   unsigned long long int softIrqTime;
+   unsigned long long int stealTime;
+   unsigned long long int guestTime;
+
+   unsigned long long int totalPeriod;
+   unsigned long long int userPeriod;
+   unsigned long long int systemPeriod;
+   unsigned long long int systemAllPeriod;
+   unsigned long long int idleAllPeriod;
+   unsigned long long int idlePeriod;
+   unsigned long long int nicePeriod;
+   unsigned long long int ioWaitPeriod;
+   unsigned long long int irqPeriod;
+   unsigned long long int softIrqPeriod;
+   unsigned long long int stealPeriod;
+   unsigned long long int guestPeriod;
+
+   double frequency;
+
+   #ifdef HAVE_SENSORS_SENSORS_H
+   double temperature;
+   #endif
+
+   bool online;
+} CPUData;
+
+typedef struct LinuxMachine_ {
+   Machine super;
+
+   long jiffies;
+   int pageSize;
+   int pageSizeKB;
+
+   /* see Linux kernel source for further detail, fs/proc/stat.c */
+   unsigned int runningTasks;   /* procs_running from /proc/stat */
+   long long boottime;   /* btime field from /proc/stat */
+
+   double period;
+
+   CPUData* cpuData;
+
+   memory_t totalHugePageMem;
+   memory_t usedHugePageMem[HTOP_HUGEPAGE_COUNT];
+
+   memory_t availableMem;
+
+   ZfsArcStats zfs;
+   ZramStats zram;
+   ZswapStats zswap;
+} LinuxMachine;
+
+#ifndef PROCDIR
+#define PROCDIR "/proc"
+#endif
+
+#ifndef PROCCPUINFOFILE
+#define PROCCPUINFOFILE PROCDIR "/cpuinfo"
+#endif
+
+#ifndef PROCSTATFILE
+#define PROCSTATFILE PROCDIR "/stat"
+#endif
+
+#ifndef PROCMEMINFOFILE
+#define PROCMEMINFOFILE PROCDIR "/meminfo"
+#endif
+
+#ifndef PROCARCSTATSFILE
+#define PROCARCSTATSFILE PROCDIR "/spl/kstat/zfs/arcstats"
+#endif
+
+#ifndef PROCTTYDRIVERSFILE
+#define PROCTTYDRIVERSFILE PROCDIR "/tty/drivers"
+#endif
+
+#ifndef PROC_LINE_LENGTH
+#define PROC_LINE_LENGTH 4096
+#endif
+
+#endif
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
new file mode 100644
index 0000000..dc4f259
--- /dev/null
+++ b/linux/LinuxProcess.c
@@ -0,0 +1,446 @@
+/*
+htop - LinuxProcess.c
+(C) 2014 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/LinuxProcess.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <syscall.h>
+#include <unistd.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Process.h"
+#include "ProvideCurses.h"
+#include "RichString.h"
+#include "RowField.h"
+#include "Scheduling.h"
+#include "Settings.h"
+#include "XUtils.h"
+#include "linux/IOPriority.h"
+#include "linux/LinuxMachine.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging, I idle)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   [MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [CMINFLT] = { .name = "CMINFLT", .title = "    CMINFLT ", .description = "Children processes' minor faults", .flags = 0, .defaultSortDesc = true, },
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [CMAJFLT] = { .name = "CMAJFLT", .title = "    CMAJFLT ", .description = "Children processes' major faults", .flags = 0, .defaultSortDesc = true, },
+   [UTIME] = { .name = "UTIME", .title = " UTIME+  ", .description = "User CPU time - time the process spent executing in user mode", .flags = 0, .defaultSortDesc = true, },
+   [STIME] = { .name = "STIME", .title = " STIME+  ", .description = "System CPU time - time the kernel spent running system calls for this process", .flags = 0, .defaultSortDesc = true, },
+   [CUTIME] = { .name = "CUTIME", .title = " CUTIME+ ", .description = "Children processes' user CPU time", .flags = 0, .defaultSortDesc = true, },
+   [CSTIME] = { .name = "CSTIME", .title = " CSTIME+ ", .description = "Children processes' system CPU time", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [M_SHARE] = { .name = "M_SHARE", .title = "  SHR ", .description = "Size of the process's shared pages", .flags = 0, .defaultSortDesc = true, },
+   [M_PRIV] = { .name = "M_PRIV", .title = " PRIV ", .description = "The private memory size of the process - resident set size minus shared memory", .flags = 0, .defaultSortDesc = true, },
+   [M_TRS] = { .name = "M_TRS", .title = " CODE ", .description = "Size of the .text segment of the process (CODE)", .flags = 0, .defaultSortDesc = true, },
+   [M_DRS] = { .name = "M_DRS", .title = " DATA ", .description = "Size of the .data segment plus stack usage of the process (DATA)", .flags = 0, .defaultSortDesc = true, },
+   [M_LRS] = { .name = "M_LRS", .title = "  LIB ", .description = "The library size of the process (calculated from memory maps)", .flags = PROCESS_FLAG_LINUX_LRS_FIX, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, .defaultSortDesc = true, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+#ifdef HAVE_OPENVZ
+   [CTID] = { .name = "CTID", .title = " CTID    ", .description = "OpenVZ container ID (a.k.a. virtual environment ID)", .flags = PROCESS_FLAG_LINUX_OPENVZ, },
+   [VPID] = { .name = "VPID", .title = "VPID", .description = "OpenVZ process ID", .flags = PROCESS_FLAG_LINUX_OPENVZ, .pidColumn = true, },
+#endif
+#ifdef HAVE_VSERVER
+   [VXID] = { .name = "VXID", .title = " VXID ", .description = "VServer process ID", .flags = PROCESS_FLAG_LINUX_VSERVER, },
+#endif
+   [RCHAR] = { .name = "RCHAR", .title = "RCHAR ", .description = "Number of bytes the process has read", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [WCHAR] = { .name = "WCHAR", .title = "WCHAR ", .description = "Number of bytes the process has written", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [SYSCR] = { .name = "SYSCR", .title = "  READ_SYSC ", .description = "Number of read(2) syscalls for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [SYSCW] = { .name = "SYSCW", .title = " WRITE_SYSC ", .description = "Number of write(2) syscalls for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [RBYTES] = { .name = "RBYTES", .title = " IO_R ", .description = "Bytes of read(2) I/O for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [WBYTES] = { .name = "WBYTES", .title = " IO_W ", .description = "Bytes of write(2) I/O for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [CNCLWB] = { .name = "CNCLWB", .title = " IO_C ", .description = "Bytes of cancelled write(2) I/O", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_READ_RATE] = { .name = "IO_READ_RATE", .title = "  DISK READ ", .description = "The I/O rate of read(2) in bytes per second for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_WRITE_RATE] = { .name = "IO_WRITE_RATE", .title = " DISK WRITE ", .description = "The I/O rate of write(2) in bytes per second for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_RATE] = { .name = "IO_RATE", .title = "   DISK R/W ", .description = "Total I/O rate in bytes per second", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [CGROUP] = { .name = "CGROUP", .title = "CGROUP (raw)", .description = "Which cgroup the process is in", .flags = PROCESS_FLAG_LINUX_CGROUP, .autoWidth = true, },
+   [CCGROUP] = { .name = "CCGROUP", .title = "CGROUP (compressed)", .description = "Which cgroup the process is in (condensed to essentials)", .flags = PROCESS_FLAG_LINUX_CGROUP, .autoWidth = true, },
+   [CONTAINER] = { .name = "CONTAINER", .title = "CONTAINER", .description = "Name of the container the process is in (guessed by heuristics)", .flags = PROCESS_FLAG_LINUX_CGROUP, .autoWidth = true, },
+   [OOM] = { .name = "OOM", .title = " OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, .defaultSortDesc = true, },
+   [IO_PRIORITY] = { .name = "IO_PRIORITY", .title = "IO ", .description = "I/O priority", .flags = PROCESS_FLAG_LINUX_IOPRIO, },
+#ifdef HAVE_DELAYACCT
+   [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPUD% ", .description = "CPU delay %", .flags = PROCESS_FLAG_LINUX_DELAYACCT, .defaultSortDesc = true, },
+   [PERCENT_IO_DELAY] = { .name = "PERCENT_IO_DELAY", .title = " IOD% ", .description = "Block I/O delay %", .flags = PROCESS_FLAG_LINUX_DELAYACCT, .defaultSortDesc = true, },
+   [PERCENT_SWAP_DELAY] = { .name = "PERCENT_SWAP_DELAY", .title = "SWPD% ", .description = "Swapin delay %", .flags = PROCESS_FLAG_LINUX_DELAYACCT, .defaultSortDesc = true, },
+#endif
+   [M_PSS] = { .name = "M_PSS", .title = "  PSS ", .description = "proportional set size, same as M_RESIDENT but each page is divided by the number of processes sharing it", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [M_SWAP] = { .name = "M_SWAP", .title = " SWAP ", .description = "Size of the process's swapped pages", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [M_PSSWP] = { .name = "M_PSSWP", .title = " PSSWP ", .description = "shows proportional swap share of this mapping, unlike \"Swap\", this does not take into account swapped out page of underlying shmem objects", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [CTXT] = { .name = "CTXT", .title = " CTXT ", .description = "Context switches (incremental sum of voluntary_ctxt_switches and nonvoluntary_ctxt_switches)", .flags = PROCESS_FLAG_LINUX_CTXT, .defaultSortDesc = true, },
+   [SECATTR] = { .name = "SECATTR", .title = "Security Attribute", .description = "Security attribute of the process (e.g. SELinux or AppArmor)", .flags = PROCESS_FLAG_LINUX_SECATTR, .autoWidth = true, },
+   [PROC_COMM] = { .name = "COMM", .title = "COMM            ", .description = "comm string of the process from /proc/[pid]/comm", .flags = 0, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process from /proc/[pid]/exe", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+   [AUTOGROUP_ID] = { .name = "AUTOGROUP_ID", .title = "AGRP", .description = "The autogroup identifier of the process", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
+   [AUTOGROUP_NICE] = { .name = "AUTOGROUP_NICE", .title = " ANI", .description = "Nice value (the higher the value, the more other processes take priority) associated with the process autogroup", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
+#ifdef SCHEDULER_SUPPORT
+   [SCHEDULERPOLICY] = { .name = "SCHEDULERPOLICY", .title = "SCHED ", .description = "Current scheduling policy of the process", .flags = PROCESS_FLAG_SCHEDPOL, },
+#endif
+};
+
+Process* LinuxProcess_new(const Machine* host) {
+   LinuxProcess* this = xCalloc(1, sizeof(LinuxProcess));
+   Object_setClass(this, Class(LinuxProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   LinuxProcess* this = (LinuxProcess*) cast;
+   Process_done((Process*)cast);
+   free(this->container_short);
+   free(this->cgroup_short);
+   free(this->cgroup);
+#ifdef HAVE_OPENVZ
+   free(this->ctid);
+#endif
+   free(this->secattr);
+   free(this);
+}
+
+/*
+[1] Note that before kernel 2.6.26 a process that has not asked for
+an io priority formally uses "none" as scheduling class, but the
+io scheduler will treat such processes as if it were in the best
+effort class. The priority within the best effort class will  be
+dynamically  derived  from  the  cpu  nice level of the process:
+io_priority = (cpu_nice + 20) / 5. -- From ionice(1) man page
+*/
+static int LinuxProcess_effectiveIOPriority(const LinuxProcess* this) {
+   if (IOPriority_class(this->ioPriority) == IOPRIO_CLASS_NONE) {
+      return IOPriority_tuple(IOPRIO_CLASS_BE, (this->super.nice + 20) / 5);
+   }
+
+   return this->ioPriority;
+}
+
+#ifdef __ANDROID__
+#define SYS_ioprio_get __NR_ioprio_get
+#define SYS_ioprio_set __NR_ioprio_set
+#endif
+
+IOPriority LinuxProcess_updateIOPriority(Process* p) {
+   IOPriority ioprio = 0;
+// Other OSes masquerading as Linux (NetBSD?) don't have this syscall
+#ifdef SYS_ioprio_get
+   ioprio = syscall(SYS_ioprio_get, IOPRIO_WHO_PROCESS, Process_getPid(p));
+#endif
+   LinuxProcess* this = (LinuxProcess*) p;
+   this->ioPriority = ioprio;
+   return ioprio;
+}
+
+static bool LinuxProcess_setIOPriority(Process* p, Arg ioprio) {
+// Other OSes masquerading as Linux (NetBSD?) don't have this syscall
+#ifdef SYS_ioprio_set
+   syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, Process_getPid(p), ioprio.i);
+#endif
+   return LinuxProcess_updateIOPriority(p) == ioprio.i;
+}
+
+bool LinuxProcess_rowSetIOPriority(Row* super, Arg ioprio) {
+   Process* p = (Process*) super;
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+   return LinuxProcess_setIOPriority(p, ioprio);
+}
+
+bool LinuxProcess_isAutogroupEnabled(void) {
+   char buf[16];
+   if (xReadfile(PROCDIR "/sys/kernel/sched_autogroup_enabled", buf, sizeof(buf)) < 0)
+      return false;
+   return buf[0] == '1';
+}
+
+static bool LinuxProcess_changeAutogroupPriorityBy(Process* p, Arg delta) {
+   char buffer[256];
+   pid_t pid = Process_getPid(p);
+   xSnprintf(buffer, sizeof(buffer), PROCDIR "/%d/autogroup", pid);
+
+   FILE* file = fopen(buffer, "r+");
+   if (!file)
+      return false;
+
+   long int identity;
+   int nice;
+   int ok = fscanf(file, "/autogroup-%ld nice %d", &identity, &nice);
+   bool success = false;
+   if (ok == 2 && fseek(file, 0L, SEEK_SET) == 0) {
+      xSnprintf(buffer, sizeof(buffer), "%d", nice + delta.i);
+      success = fputs(buffer, file) > 0;
+   }
+
+   fclose(file);
+   return success;
+}
+
+bool LinuxProcess_rowChangeAutogroupPriorityBy(Row* super, Arg delta) {
+   Process* p = (Process*) super;
+   assert(Object_isA((const Object*) p, (const ObjectClass*) &Process_class));
+   return LinuxProcess_changeAutogroupPriorityBy(p, delta);
+}
+
+static double LinuxProcess_totalIORate(const LinuxProcess* lp) {
+   double totalRate = NAN;
+   if (isNonnegative(lp->io_rate_read_bps)) {
+      totalRate = lp->io_rate_read_bps;
+      if (isNonnegative(lp->io_rate_write_bps)) {
+         totalRate += lp->io_rate_write_bps;
+      }
+   } else if (isNonnegative(lp->io_rate_write_bps)) {
+      totalRate = lp->io_rate_write_bps;
+   }
+   return totalRate;
+}
+
+static void LinuxProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const Process* this = (const Process*) super;
+   const LinuxProcess* lp = (const LinuxProcess*) super;
+   const Machine* host = (const Machine*) super->host;
+   const LinuxMachine* lhost = (const LinuxMachine*) super->host;
+
+   bool coloring = host->settings->highlightMegabytes;
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   case CMINFLT: Row_printCount(str, lp->cminflt, coloring); return;
+   case CMAJFLT: Row_printCount(str, lp->cmajflt, coloring); return;
+   case M_DRS: Row_printBytes(str, lp->m_drs * lhost->pageSize, coloring); return;
+   case M_LRS:
+      if (lp->m_lrs) {
+         Row_printBytes(str, lp->m_lrs * lhost->pageSize, coloring);
+         return;
+      }
+
+      attr = CRT_colors[PROCESS_SHADOW];
+      xSnprintf(buffer, n, "  N/A ");
+      break;
+   case M_TRS: Row_printBytes(str, lp->m_trs * lhost->pageSize, coloring); return;
+   case M_SHARE: Row_printBytes(str, lp->m_share * lhost->pageSize, coloring); return;
+   case M_PRIV: Row_printKBytes(str, lp->m_priv, coloring); return;
+   case M_PSS: Row_printKBytes(str, lp->m_pss, coloring); return;
+   case M_SWAP: Row_printKBytes(str, lp->m_swap, coloring); return;
+   case M_PSSWP: Row_printKBytes(str, lp->m_psswp, coloring); return;
+   case UTIME: Row_printTime(str, lp->utime, coloring); return;
+   case STIME: Row_printTime(str, lp->stime, coloring); return;
+   case CUTIME: Row_printTime(str, lp->cutime, coloring); return;
+   case CSTIME: Row_printTime(str, lp->cstime, coloring); return;
+   case RCHAR:  Row_printBytes(str, lp->io_rchar, coloring); return;
+   case WCHAR:  Row_printBytes(str, lp->io_wchar, coloring); return;
+   case SYSCR:  Row_printCount(str, lp->io_syscr, coloring); return;
+   case SYSCW:  Row_printCount(str, lp->io_syscw, coloring); return;
+   case RBYTES: Row_printBytes(str, lp->io_read_bytes, coloring); return;
+   case WBYTES: Row_printBytes(str, lp->io_write_bytes, coloring); return;
+   case CNCLWB: Row_printBytes(str, lp->io_cancelled_write_bytes, coloring); return;
+   case IO_READ_RATE:  Row_printRate(str, lp->io_rate_read_bps, coloring); return;
+   case IO_WRITE_RATE: Row_printRate(str, lp->io_rate_write_bps, coloring); return;
+   case IO_RATE: Row_printRate(str, LinuxProcess_totalIORate(lp), coloring); return;
+   #ifdef HAVE_OPENVZ
+   case CTID: xSnprintf(buffer, n, "%-8s ", lp->ctid ? lp->ctid : ""); break;
+   case VPID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, lp->vpid); break;
+   #endif
+   #ifdef HAVE_VSERVER
+   case VXID: xSnprintf(buffer, n, "%5u ", lp->vxid); break;
+   #endif
+   case CGROUP: xSnprintf(buffer, n, "%-*.*s ", Row_fieldWidths[CGROUP], Row_fieldWidths[CGROUP], lp->cgroup ? lp->cgroup : "N/A"); break;
+   case CCGROUP: xSnprintf(buffer, n, "%-*.*s ", Row_fieldWidths[CCGROUP], Row_fieldWidths[CCGROUP], lp->cgroup_short ? lp->cgroup_short : (lp->cgroup ? lp->cgroup : "N/A")); break;
+   case CONTAINER: xSnprintf(buffer, n, "%-*.*s ", Row_fieldWidths[CONTAINER], Row_fieldWidths[CONTAINER], lp->container_short ? lp->container_short : "N/A"); break;
+   case OOM: xSnprintf(buffer, n, "%4u ", lp->oom); break;
+   case IO_PRIORITY: {
+      int klass = IOPriority_class(lp->ioPriority);
+      if (klass == IOPRIO_CLASS_NONE) {
+         // see note [1] above
+         xSnprintf(buffer, n, "B%1d ", (int) (this->nice + 20) / 5);
+      } else if (klass == IOPRIO_CLASS_BE) {
+         xSnprintf(buffer, n, "B%1d ", IOPriority_data(lp->ioPriority));
+      } else if (klass == IOPRIO_CLASS_RT) {
+         attr = CRT_colors[PROCESS_HIGH_PRIORITY];
+         xSnprintf(buffer, n, "R%1d ", IOPriority_data(lp->ioPriority));
+      } else if (klass == IOPRIO_CLASS_IDLE) {
+         attr = CRT_colors[PROCESS_LOW_PRIORITY];
+         xSnprintf(buffer, n, "id ");
+      } else {
+         xSnprintf(buffer, n, "?? ");
+      }
+      break;
+   }
+   #ifdef HAVE_DELAYACCT
+   case PERCENT_CPU_DELAY: Row_printPercentage(lp->cpu_delay_percent, buffer, n, 5, &attr); break;
+   case PERCENT_IO_DELAY: Row_printPercentage(lp->blkio_delay_percent, buffer, n, 5, &attr); break;
+   case PERCENT_SWAP_DELAY: Row_printPercentage(lp->swapin_delay_percent, buffer, n, 5, &attr); break;
+   #endif
+   case CTXT:
+      if (lp->ctxt_diff > 1000) {
+         attr |= A_BOLD;
+      }
+      xSnprintf(buffer, n, "%5lu ", lp->ctxt_diff);
+      break;
+   case SECATTR: snprintf(buffer, n, "%-*.*s ", Row_fieldWidths[SECATTR], Row_fieldWidths[SECATTR], lp->secattr ? lp->secattr : "N/A"); break;
+   case AUTOGROUP_ID:
+      if (lp->autogroup_id != -1) {
+         xSnprintf(buffer, n, "%4ld ", lp->autogroup_id);
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, " N/A ");
+      }
+      break;
+   case AUTOGROUP_NICE:
+      if (lp->autogroup_id != -1) {
+         xSnprintf(buffer, n, "%3d ", lp->autogroup_nice);
+         attr = lp->autogroup_nice < 0 ? CRT_colors[PROCESS_HIGH_PRIORITY]
+            : lp->autogroup_nice > 0 ? CRT_colors[PROCESS_LOW_PRIORITY]
+            : CRT_colors[PROCESS_SHADOW];
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, "N/A ");
+      }
+      break;
+   default:
+      Process_writeField(this, str, field);
+      return;
+   }
+
+   RichString_appendAscii(str, attr, buffer);
+}
+
+static int LinuxProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const LinuxProcess* p1 = (const LinuxProcess*)v1;
+   const LinuxProcess* p2 = (const LinuxProcess*)v2;
+
+   switch (key) {
+   case M_DRS:
+      return SPACESHIP_NUMBER(p1->m_drs, p2->m_drs);
+   case M_LRS:
+      return SPACESHIP_NUMBER(p1->m_lrs, p2->m_lrs);
+   case M_TRS:
+      return SPACESHIP_NUMBER(p1->m_trs, p2->m_trs);
+   case M_SHARE:
+      return SPACESHIP_NUMBER(p1->m_share, p2->m_share);
+   case M_PRIV:
+      return SPACESHIP_NUMBER(p1->m_priv, p2->m_priv);
+   case M_PSS:
+      return SPACESHIP_NUMBER(p1->m_pss, p2->m_pss);
+   case M_SWAP:
+      return SPACESHIP_NUMBER(p1->m_swap, p2->m_swap);
+   case M_PSSWP:
+      return SPACESHIP_NUMBER(p1->m_psswp, p2->m_psswp);
+   case UTIME:
+      return SPACESHIP_NUMBER(p1->utime, p2->utime);
+   case CUTIME:
+      return SPACESHIP_NUMBER(p1->cutime, p2->cutime);
+   case STIME:
+      return SPACESHIP_NUMBER(p1->stime, p2->stime);
+   case CSTIME:
+      return SPACESHIP_NUMBER(p1->cstime, p2->cstime);
+   case RCHAR:
+      return SPACESHIP_NUMBER(p1->io_rchar, p2->io_rchar);
+   case WCHAR:
+      return SPACESHIP_NUMBER(p1->io_wchar, p2->io_wchar);
+   case SYSCR:
+      return SPACESHIP_NUMBER(p1->io_syscr, p2->io_syscr);
+   case SYSCW:
+      return SPACESHIP_NUMBER(p1->io_syscw, p2->io_syscw);
+   case RBYTES:
+      return SPACESHIP_NUMBER(p1->io_read_bytes, p2->io_read_bytes);
+   case WBYTES:
+      return SPACESHIP_NUMBER(p1->io_write_bytes, p2->io_write_bytes);
+   case CNCLWB:
+      return SPACESHIP_NUMBER(p1->io_cancelled_write_bytes, p2->io_cancelled_write_bytes);
+   case IO_READ_RATE:
+      return compareRealNumbers(p1->io_rate_read_bps, p2->io_rate_read_bps);
+   case IO_WRITE_RATE:
+      return compareRealNumbers(p1->io_rate_write_bps, p2->io_rate_write_bps);
+   case IO_RATE:
+      return compareRealNumbers(LinuxProcess_totalIORate(p1), LinuxProcess_totalIORate(p2));
+   #ifdef HAVE_OPENVZ
+   case CTID:
+      return SPACESHIP_NULLSTR(p1->ctid, p2->ctid);
+   case VPID:
+      return SPACESHIP_NUMBER(p1->vpid, p2->vpid);
+   #endif
+   #ifdef HAVE_VSERVER
+   case VXID:
+      return SPACESHIP_NUMBER(p1->vxid, p2->vxid);
+   #endif
+   case CGROUP:
+      return SPACESHIP_NULLSTR(p1->cgroup, p2->cgroup);
+   case CCGROUP:
+      return SPACESHIP_NULLSTR(p1->cgroup_short, p2->cgroup_short);
+   case CONTAINER:
+      return SPACESHIP_NULLSTR(p1->container_short, p2->container_short);
+   case OOM:
+      return SPACESHIP_NUMBER(p1->oom, p2->oom);
+   #ifdef HAVE_DELAYACCT
+   case PERCENT_CPU_DELAY:
+      return compareRealNumbers(p1->cpu_delay_percent, p2->cpu_delay_percent);
+   case PERCENT_IO_DELAY:
+      return compareRealNumbers(p1->blkio_delay_percent, p2->blkio_delay_percent);
+   case PERCENT_SWAP_DELAY:
+      return compareRealNumbers(p1->swapin_delay_percent, p2->swapin_delay_percent);
+   #endif
+   case IO_PRIORITY:
+      return SPACESHIP_NUMBER(LinuxProcess_effectiveIOPriority(p1), LinuxProcess_effectiveIOPriority(p2));
+   case CTXT:
+      return SPACESHIP_NUMBER(p1->ctxt_diff, p2->ctxt_diff);
+   case SECATTR:
+      return SPACESHIP_NULLSTR(p1->secattr, p2->secattr);
+   case AUTOGROUP_ID:
+      return SPACESHIP_NUMBER(p1->autogroup_id, p2->autogroup_id);
+   case AUTOGROUP_NICE:
+      return SPACESHIP_NUMBER(p1->autogroup_nice, p2->autogroup_nice);
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass LinuxProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = LinuxProcess_rowWriteField
+   },
+   .compareByKey = LinuxProcess_compareByKey
+};
diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h
new file mode 100644
index 0000000..388e50d
--- /dev/null
+++ b/linux/LinuxProcess.h
@@ -0,0 +1,136 @@
+#ifndef HEADER_LinuxProcess
+#define HEADER_LinuxProcess
+/*
+htop - LinuxProcess.h
+(C) 2014 Hisham H. Muhammad
+(C) 2020 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Machine.h"
+#include "Object.h"
+#include "Process.h"
+#include "Row.h"
+
+#include "linux/IOPriority.h"
+
+
+#define PROCESS_FLAG_LINUX_IOPRIO    0x00000100
+#define PROCESS_FLAG_LINUX_OPENVZ    0x00000200
+#define PROCESS_FLAG_LINUX_VSERVER   0x00000400
+#define PROCESS_FLAG_LINUX_CGROUP    0x00000800
+#define PROCESS_FLAG_LINUX_OOM       0x00001000
+#define PROCESS_FLAG_LINUX_SMAPS     0x00002000
+#define PROCESS_FLAG_LINUX_CTXT      0x00004000
+#define PROCESS_FLAG_LINUX_SECATTR   0x00008000
+#define PROCESS_FLAG_LINUX_LRS_FIX   0x00010000
+#define PROCESS_FLAG_LINUX_DELAYACCT 0x00040000
+#define PROCESS_FLAG_LINUX_AUTOGROUP 0x00080000
+
+typedef struct LinuxProcess_ {
+   Process super;
+   IOPriority ioPriority;
+   unsigned long int cminflt;
+   unsigned long int cmajflt;
+   unsigned long long int utime;
+   unsigned long long int stime;
+   unsigned long long int cutime;
+   unsigned long long int cstime;
+   long m_share;
+   long m_priv;
+   long m_pss;
+   long m_swap;
+   long m_psswp;
+   long m_trs;
+   long m_drs;
+   long m_lrs;
+
+   /* Process flags */
+   unsigned long int flags;
+
+   /* Data read (in bytes) */
+   unsigned long long io_rchar;
+
+   /* Data written (in bytes) */
+   unsigned long long io_wchar;
+
+   /* Number of read(2) syscalls */
+   unsigned long long io_syscr;
+
+   /* Number of write(2) syscalls */
+   unsigned long long io_syscw;
+
+   /* Storage data read (in bytes) */
+   unsigned long long io_read_bytes;
+
+   /* Storage data written (in bytes) */
+   unsigned long long io_write_bytes;
+
+   /* Storage data cancelled (in bytes) */
+   unsigned long long io_cancelled_write_bytes;
+
+   /* Point in time of last io scan (in milliseconds elapsed since the Epoch) */
+   unsigned long long io_last_scan_time_ms;
+
+   /* Storage data read (in bytes per second) */
+   double io_rate_read_bps;
+
+   /* Storage data written (in bytes per second) */
+   double io_rate_write_bps;
+
+   #ifdef HAVE_OPENVZ
+   char* ctid;
+   pid_t vpid;
+   #endif
+   #ifdef HAVE_VSERVER
+   unsigned int vxid;
+   #endif
+   char* cgroup;
+   char* cgroup_short;
+   char* container_short;
+   unsigned int oom;
+   #ifdef HAVE_DELAYACCT
+   unsigned long long int delay_read_time;
+   unsigned long long cpu_delay_total;
+   unsigned long long blkio_delay_total;
+   unsigned long long swapin_delay_total;
+   float cpu_delay_percent;
+   float blkio_delay_percent;
+   float swapin_delay_percent;
+   #endif
+   unsigned long ctxt_total;
+   unsigned long ctxt_diff;
+   char* secattr;
+   unsigned long long int last_mlrs_calctime;
+
+   /* Autogroup scheduling (CFS) information */
+   long int autogroup_id;
+   int autogroup_nice;
+} LinuxProcess;
+
+extern int pageSize;
+
+extern int pageSizeKB;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+extern const ProcessClass LinuxProcess_class;
+
+Process* LinuxProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+IOPriority LinuxProcess_updateIOPriority(Process* proc);
+
+bool LinuxProcess_rowSetIOPriority(Row* super, Arg ioprio);
+
+bool LinuxProcess_isAutogroupEnabled(void);
+
+bool LinuxProcess_rowChangeAutogroupPriorityBy(Row* super, Arg delta);
+
+bool Process_isThread(const Process* this);
+
+#endif
diff --git a/linux/LinuxProcessTable.c b/linux/LinuxProcessTable.c
new file mode 100644
index 0000000..039a64e
--- /dev/null
+++ b/linux/LinuxProcessTable.c
@@ -0,0 +1,1668 @@
+/*
+htop - LinuxProcessTable.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/LinuxProcessTable.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+#ifdef HAVE_DELAYACCT
+#include <linux/netlink.h>
+#include <linux/taskstats.h>
+#include <netlink/attr.h>
+#include <netlink/handlers.h>
+#include <netlink/msg.h>
+#include <netlink/netlink.h>
+#include <netlink/socket.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/ctrl.h>
+#endif
+
+#include "Compat.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Process.h"
+#include "Row.h"
+#include "RowField.h"
+#include "Scheduling.h"
+#include "Settings.h"
+#include "Table.h"
+#include "UsersTable.h"
+#include "XUtils.h"
+#include "linux/CGroupUtils.h"
+#include "linux/LinuxMachine.h"
+#include "linux/LinuxProcess.h"
+#include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX  // IWYU pragma: keep
+
+#if defined(MAJOR_IN_MKDEV)
+#include <sys/mkdev.h>
+#elif defined(MAJOR_IN_SYSMACROS)
+#include <sys/sysmacros.h>
+#endif
+
+/* Not exposed yet. Defined at include/linux/sched.h */
+#ifndef PF_KTHREAD
+#define PF_KTHREAD 0x00200000
+#endif
+
+static FILE* fopenat(openat_arg_t openatArg, const char* pathname, const char* mode) {
+   assert(String_eq(mode, "r")); /* only currently supported mode */
+
+   int fd = Compat_openat(openatArg, pathname, O_RDONLY);
+   if (fd < 0)
+      return NULL;
+
+   FILE* stream = fdopen(fd, mode);
+   if (!stream)
+      close(fd);
+
+   return stream;
+}
+
+static inline uint64_t fast_strtoull_dec(char** str, int maxlen) {
+   register uint64_t result = 0;
+
+   if (!maxlen)
+      --maxlen;
+
+   while (maxlen-- && **str >= '0' && **str <= '9') {
+      result *= 10;
+      result += **str - '0';
+      (*str)++;
+   }
+
+   return result;
+}
+
+static inline uint64_t fast_strtoull_hex(char** str, int maxlen) {
+   register uint64_t result = 0;
+   register int nibble, letter;
+   const long valid_mask = 0x03FF007E;
+
+   if (!maxlen)
+      --maxlen;
+
+   while (maxlen--) {
+      nibble = (unsigned char)**str;
+      if (!(valid_mask & (1 << (nibble & 0x1F))))
+         break;
+      if ((nibble < '0') || (nibble & ~0x20) > 'F')
+         break;
+      letter = (nibble & 0x40) ? 'A' - '9' - 1 : 0;
+      nibble &=~0x20; // to upper
+      nibble ^= 0x10; // switch letters and digits
+      nibble -= letter;
+      nibble &= 0x0f;
+      result <<= 4;
+      result += (uint64_t)nibble;
+      (*str)++;
+   }
+
+   return result;
+}
+
+static int sortTtyDrivers(const void* va, const void* vb) {
+   const TtyDriver* a = (const TtyDriver*) va;
+   const TtyDriver* b = (const TtyDriver*) vb;
+
+   int r = SPACESHIP_NUMBER(a->major, b->major);
+   if (r)
+      return r;
+
+   return SPACESHIP_NUMBER(a->minorFrom, b->minorFrom);
+}
+
+static void LinuxProcessTable_initTtyDrivers(LinuxProcessTable* this) {
+   TtyDriver* ttyDrivers;
+
+   char buf[16384];
+   ssize_t r = xReadfile(PROCTTYDRIVERSFILE, buf, sizeof(buf));
+   if (r < 0)
+      return;
+
+   int numDrivers = 0;
+   int allocd = 10;
+   ttyDrivers = xMallocArray(allocd, sizeof(TtyDriver));
+   char* at = buf;
+   while (*at != '\0') {
+      at = strchr(at, ' ');    // skip first token
+      while (*at == ' ') at++; // skip spaces
+      const char* token = at;  // mark beginning of path
+      at = strchr(at, ' ');    // find end of path
+      *at = '\0'; at++;        // clear and skip
+      ttyDrivers[numDrivers].path = xStrdup(token); // save
+      while (*at == ' ') at++; // skip spaces
+      token = at;              // mark beginning of major
+      at = strchr(at, ' ');    // find end of major
+      *at = '\0'; at++;        // clear and skip
+      ttyDrivers[numDrivers].major = atoi(token); // save
+      while (*at == ' ') at++; // skip spaces
+      token = at;              // mark beginning of minorFrom
+      while (*at >= '0' && *at <= '9') at++; //find end of minorFrom
+      if (*at == '-') {        // if has range
+         *at = '\0'; at++;        // clear and skip
+         ttyDrivers[numDrivers].minorFrom = atoi(token); // save
+         token = at;              // mark beginning of minorTo
+         at = strchr(at, ' ');    // find end of minorTo
+         *at = '\0'; at++;        // clear and skip
+         ttyDrivers[numDrivers].minorTo = atoi(token); // save
+      } else {                 // no range
+         *at = '\0'; at++;        // clear and skip
+         ttyDrivers[numDrivers].minorFrom = atoi(token); // save
+         ttyDrivers[numDrivers].minorTo = atoi(token); // save
+      }
+      at = strchr(at, '\n');   // go to end of line
+      at++;                    // skip
+      numDrivers++;
+      if (numDrivers == allocd) {
+         allocd += 10;
+         ttyDrivers = xReallocArray(ttyDrivers, allocd, sizeof(TtyDriver));
+      }
+   }
+   numDrivers++;
+   ttyDrivers = xRealloc(ttyDrivers, sizeof(TtyDriver) * numDrivers);
+   ttyDrivers[numDrivers - 1].path = NULL;
+   qsort(ttyDrivers, numDrivers - 1, sizeof(TtyDriver), sortTtyDrivers);
+   this->ttyDrivers = ttyDrivers;
+}
+
+#ifdef HAVE_DELAYACCT
+
+static void LinuxProcessTable_initNetlinkSocket(LinuxProcessTable* this) {
+   this->netlink_socket = nl_socket_alloc();
+   if (this->netlink_socket == NULL) {
+      return;
+   }
+   if (nl_connect(this->netlink_socket, NETLINK_GENERIC) < 0) {
+      return;
+   }
+   this->netlink_family = genl_ctrl_resolve(this->netlink_socket, TASKSTATS_GENL_NAME);
+}
+
+#endif
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   LinuxProcessTable* this = xCalloc(1, sizeof(LinuxProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(LinuxProcess), host, pidMatchList);
+
+   LinuxProcessTable_initTtyDrivers(this);
+
+   // Test /proc/PID/smaps_rollup availability (faster to parse, Linux 4.14+)
+   this->haveSmapsRollup = (access(PROCDIR "/self/smaps_rollup", R_OK) == 0);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   LinuxProcessTable* this = (LinuxProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   if (this->ttyDrivers) {
+      for (int i = 0; this->ttyDrivers[i].path; i++) {
+         free(this->ttyDrivers[i].path);
+      }
+      free(this->ttyDrivers);
+   }
+   #ifdef HAVE_DELAYACCT
+   if (this->netlink_socket) {
+      nl_close(this->netlink_socket);
+      nl_socket_free(this->netlink_socket);
+   }
+   #endif
+   free(this);
+}
+
+static inline unsigned long long LinuxProcessTable_adjustTime(const LinuxMachine* lhost, unsigned long long t) {
+   return t * 100 / lhost->jiffies;
+}
+
+/* Taken from: https://github.com/torvalds/linux/blob/64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc/fs/proc/array.c#L120 */
+static inline ProcessState LinuxProcessTable_getProcessState(char state) {
+   switch (state) {
+      case 'S': return SLEEPING;
+      case 'X': return DEFUNCT;
+      case 'Z': return ZOMBIE;
+      case 't': return TRACED;
+      case 'T': return STOPPED;
+      case 'D': return UNINTERRUPTIBLE_WAIT;
+      case 'R': return RUNNING;
+      case 'P': return BLOCKED;
+      case 'I': return IDLE;
+      default: return UNKNOWN;
+   }
+}
+
+static bool LinuxProcessTable_readStatFile(LinuxProcess* lp, openat_arg_t procFd, const LinuxMachine* lhost, bool scanMainThread, char* command, size_t commLen) {
+   Process* process = &lp->super;
+
+   char buf[MAX_READ + 1];
+   char path[22] = "stat";
+   if (scanMainThread) {
+      xSnprintf(path, sizeof(path), "task/%"PRIi32"/stat", (int32_t)Process_getPid(process));
+   }
+   ssize_t r = xReadfileat(procFd, path, buf, sizeof(buf));
+   if (r < 0)
+      return false;
+
+   /* (1) pid   -  %d */
+   assert(Process_getPid(process) == atoi(buf));
+   char* location = strchr(buf, ' ');
+   if (!location)
+      return false;
+
+   /* (2) comm  -  (%s) */
+   location += 2;
+   char* end = strrchr(location, ')');
+   if (!end)
+      return false;
+
+   String_safeStrncpy(command, location, MINIMUM((size_t)(end - location + 1), commLen));
+
+   location = end + 2;
+
+   /* (3) state  -  %c */
+   process->state = LinuxProcessTable_getProcessState(location[0]);
+   location += 2;
+
+   /* (4) ppid  -  %d */
+   Process_setParent(process, strtol(location, &location, 10));
+   location += 1;
+
+   /* (5) pgrp  -  %d */
+   process->pgrp = strtol(location, &location, 10);
+   location += 1;
+
+   /* (6) session  -  %d */
+   process->session = strtol(location, &location, 10);
+   location += 1;
+
+   /* (7) tty_nr  -  %d */
+   process->tty_nr = strtoul(location, &location, 10);
+   location += 1;
+
+   /* (8) tpgid  -  %d */
+   process->tpgid = strtol(location, &location, 10);
+   location += 1;
+
+   /* (9) flags  -  %u */
+   lp->flags = strtoul(location, &location, 10);
+   location += 1;
+
+   /* (10) minflt  -  %lu */
+   process->minflt = strtoull(location, &location, 10);
+   location += 1;
+
+   /* (11) cminflt  -  %lu */
+   lp->cminflt = strtoull(location, &location, 10);
+   location += 1;
+
+   /* (12) majflt  -  %lu */
+   process->majflt = strtoull(location, &location, 10);
+   location += 1;
+
+   /* (13) cmajflt  -  %lu */
+   lp->cmajflt = strtoull(location, &location, 10);
+   location += 1;
+
+   /* (14) utime  -  %lu */
+   lp->utime = LinuxProcessTable_adjustTime(lhost, strtoull(location, &location, 10));
+   location += 1;
+
+   /* (15) stime  -  %lu */
+   lp->stime = LinuxProcessTable_adjustTime(lhost, strtoull(location, &location, 10));
+   location += 1;
+
+   /* (16) cutime  -  %ld */
+   lp->cutime = LinuxProcessTable_adjustTime(lhost, strtoull(location, &location, 10));
+   location += 1;
+
+   /* (17) cstime  -  %ld */
+   lp->cstime = LinuxProcessTable_adjustTime(lhost, strtoull(location, &location, 10));
+   location += 1;
+
+   /* (18) priority  -  %ld */
+   process->priority = strtol(location, &location, 10);
+   location += 1;
+
+   /* (19) nice  -  %ld */
+   process->nice = strtol(location, &location, 10);
+   location += 1;
+
+   /* (20) num_threads  -  %ld */
+   process->nlwp = strtol(location, &location, 10);
+   location += 1;
+
+   /* Skip (21) itrealvalue  -  %ld */
+   location = strchr(location, ' ') + 1;
+
+   /* (22) starttime  -  %llu */
+   if (process->starttime_ctime == 0) {
+      process->starttime_ctime = lhost->boottime + LinuxProcessTable_adjustTime(lhost, strtoll(location, &location, 10)) / 100;
+   } else {
+      location = strchr(location, ' ');
+   }
+   location += 1;
+
+   /* Skip (23) - (38) */
+   for (int i = 0; i < 16; i++) {
+      location = strchr(location, ' ') + 1;
+   }
+
+   assert(location != NULL);
+
+   /* (39) processor  -  %d */
+   process->processor = strtol(location, &location, 10);
+
+   /* Ignore further fields */
+
+   process->time = lp->utime + lp->stime;
+
+   return true;
+}
+
+static bool LinuxProcessTable_readStatusFile(Process* process, openat_arg_t procFd) {
+   LinuxProcess* lp = (LinuxProcess*) process;
+
+   unsigned long ctxt = 0;
+#ifdef HAVE_VSERVER
+   lp->vxid = 0;
+#endif
+
+   FILE* statusfile = fopenat(procFd, "status", "r");
+   if (!statusfile)
+      return false;
+
+   char buffer[PROC_LINE_LENGTH + 1];
+
+   while (fgets(buffer, sizeof(buffer), statusfile)) {
+
+      if (String_startsWith(buffer, "NSpid:")) {
+         const char* ptr = buffer;
+         int pid_ns_count = 0;
+         while (*ptr && *ptr != '\n' && !isdigit((unsigned char)*ptr))
+            ++ptr;
+
+         while (*ptr && *ptr != '\n') {
+            if (isdigit(*ptr))
+               pid_ns_count++;
+            while (isdigit((unsigned char)*ptr))
+               ++ptr;
+            while (*ptr && *ptr != '\n' && !isdigit((unsigned char)*ptr))
+               ++ptr;
+         }
+
+         if (pid_ns_count > 1)
+            process->isRunningInContainer = true;
+
+      } else if (String_startsWith(buffer, "CapPrm:")) {
+         char* ptr = buffer + strlen("CapPrm:");
+         while (*ptr == ' ' || *ptr == '\t')
+            ptr++;
+
+         uint64_t cap_permitted = fast_strtoull_hex(&ptr, 16);
+         process->elevated_priv = cap_permitted != 0 && process->st_uid != 0;
+
+      } else if (String_startsWith(buffer, "voluntary_ctxt_switches:")) {
+         unsigned long vctxt;
+         int ok = sscanf(buffer, "voluntary_ctxt_switches:\t%lu", &vctxt);
+         if (ok >= 1) {
+            ctxt += vctxt;
+         }
+
+      } else if (String_startsWith(buffer, "nonvoluntary_ctxt_switches:")) {
+         unsigned long nvctxt;
+         int ok = sscanf(buffer, "nonvoluntary_ctxt_switches:\t%lu", &nvctxt);
+         if (ok >= 1) {
+            ctxt += nvctxt;
+         }
+
+#ifdef HAVE_VSERVER
+      } else if (String_startsWith(buffer, "VxID:")) {
+         int vxid;
+         int ok = sscanf(buffer, "VxID:\t%32d", &vxid);
+         if (ok >= 1) {
+            lp->vxid = vxid;
+         }
+#ifdef HAVE_ANCIENT_VSERVER
+      } else if (String_startsWith(buffer, "s_context:")) {
+         int vxid;
+         int ok = sscanf(buffer, "s_context:\t%32d", &vxid);
+         if (ok >= 1) {
+            lp->vxid = vxid;
+         }
+#endif /* HAVE_ANCIENT_VSERVER */
+#endif /* HAVE_VSERVER */
+      }
+   }
+
+   fclose(statusfile);
+
+   lp->ctxt_diff = (ctxt > lp->ctxt_total) ? (ctxt - lp->ctxt_total) : 0;
+   lp->ctxt_total = ctxt;
+
+   return true;
+}
+
+static bool LinuxProcessTable_updateUser(const Machine* host, Process* process, openat_arg_t procFd) {
+   struct stat sstat;
+#ifdef HAVE_OPENAT
+   int statok = fstat(procFd, &sstat);
+#else
+   int statok = stat(procFd, &sstat);
+#endif
+   if (statok == -1)
+      return false;
+
+   if (process->st_uid != sstat.st_uid) {
+      process->st_uid = sstat.st_uid;
+      process->user = UsersTable_getRef(host->usersTable, sstat.st_uid);
+   }
+
+   return true;
+}
+
+static void LinuxProcessTable_readIoFile(LinuxProcess* lp, openat_arg_t procFd, bool scanMainThread) {
+   Process* process = &lp->super;
+   const Machine* host = process->super.host;
+   char path[20] = "io";
+   char buffer[1024];
+   if (scanMainThread) {
+      xSnprintf(path, sizeof(path), "task/%"PRIi32"/io", (int32_t)Process_getPid(process));
+   }
+   ssize_t r = xReadfileat(procFd, path, buffer, sizeof(buffer));
+   if (r < 0) {
+      lp->io_rate_read_bps = NAN;
+      lp->io_rate_write_bps = NAN;
+      lp->io_rchar = ULLONG_MAX;
+      lp->io_wchar = ULLONG_MAX;
+      lp->io_syscr = ULLONG_MAX;
+      lp->io_syscw = ULLONG_MAX;
+      lp->io_read_bytes = ULLONG_MAX;
+      lp->io_write_bytes = ULLONG_MAX;
+      lp->io_cancelled_write_bytes = ULLONG_MAX;
+      lp->io_last_scan_time_ms = host->realtimeMs;
+      return;
+   }
+
+   unsigned long long last_read = lp->io_read_bytes;
+   unsigned long long last_write = lp->io_write_bytes;
+   unsigned long long time_delta = saturatingSub(host->realtimeMs, lp->io_last_scan_time_ms);
+
+   // Note: Linux Kernel documentation states that /proc/<pid>/io may be racy
+   // on 32-bit machines. (Documentation/filesystems/proc.rst)
+
+   char* buf = buffer;
+   const char* line;
+   while ((line = strsep(&buf, "\n")) != NULL) {
+      switch (line[0]) {
+         case 'r':
+            if (line[1] == 'c' && String_startsWith(line + 2, "har: ")) {
+               lp->io_rchar = strtoull(line + 7, NULL, 10);
+            } else if (String_startsWith(line + 1, "ead_bytes: ")) {
+               lp->io_read_bytes = strtoull(line + 12, NULL, 10);
+               lp->io_rate_read_bps = time_delta ? saturatingSub(lp->io_read_bytes, last_read) * /*ms to s*/1000. / time_delta : NAN;
+            }
+            break;
+         case 'w':
+            if (line[1] == 'c' && String_startsWith(line + 2, "har: ")) {
+               lp->io_wchar = strtoull(line + 7, NULL, 10);
+            } else if (String_startsWith(line + 1, "rite_bytes: ")) {
+               lp->io_write_bytes = strtoull(line + 13, NULL, 10);
+               lp->io_rate_write_bps = time_delta ? saturatingSub(lp->io_write_bytes, last_write) * /*ms to s*/1000. / time_delta : NAN;
+            }
+            break;
+         case 's':
+            if (line[4] == 'r' && String_startsWith(line + 1, "yscr: ")) {
+               lp->io_syscr = strtoull(line + 7, NULL, 10);
+            } else if (String_startsWith(line + 1, "yscw: ")) {
+               lp->io_syscw = strtoull(line + 7, NULL, 10);
+            }
+            break;
+         case 'c':
+            if (String_startsWith(line + 1, "ancelled_write_bytes: ")) {
+               lp->io_cancelled_write_bytes = strtoull(line + 23, NULL, 10);
+            }
+      }
+   }
+
+   lp->io_last_scan_time_ms = host->realtimeMs;
+}
+
+typedef struct LibraryData_ {
+   uint64_t size;
+   bool exec;
+} LibraryData;
+
+static void LinuxProcessTable_calcLibSize_helper(ATTR_UNUSED ht_key_t key, void* value, void* data) {
+   if (!data)
+      return;
+
+   if (!value)
+      return;
+
+   const LibraryData* v = (const LibraryData*)value;
+   uint64_t* d = (uint64_t*)data;
+   if (!v->exec)
+      return;
+
+   *d += v->size;
+}
+
+static void LinuxProcessTable_readMaps(LinuxProcess* process, openat_arg_t procFd, const LinuxMachine* host, bool calcSize, bool checkDeletedLib) {
+   Process* proc = (Process*)process;
+
+   proc->usesDeletedLib = false;
+
+   FILE* mapsfile = fopenat(procFd, "maps", "r");
+   if (!mapsfile)
+      return;
+
+   Hashtable* ht = NULL;
+   if (calcSize)
+      ht = Hashtable_new(64, true);
+
+   char buffer[1024];
+   while (fgets(buffer, sizeof(buffer), mapsfile)) {
+      uint64_t map_start;
+      uint64_t map_end;
+      bool map_execute;
+      unsigned int map_devmaj;
+      unsigned int map_devmin;
+      uint64_t map_inode;
+
+      // Short circuit test: Look for a slash
+      if (!strchr(buffer, '/'))
+         continue;
+
+      // Parse format: "%Lx-%Lx %4s %x %2x:%2x %Ld"
+      char* readptr = buffer;
+
+      map_start = fast_strtoull_hex(&readptr, 16);
+      if ('-' != *readptr++)
+         continue;
+
+      map_end = fast_strtoull_hex(&readptr, 16);
+      if (' ' != *readptr++)
+         continue;
+
+      if (!readptr[0] || !readptr[1] || !readptr[2] || !readptr[3])
+         continue;
+
+      map_execute = (readptr[2] == 'x');
+      readptr += 4;
+      if (' ' != *readptr++)
+         continue;
+
+      while (*readptr > ' ')
+         readptr++; // Skip parsing this hex value
+      if (' ' != *readptr++)
+         continue;
+
+      map_devmaj = fast_strtoull_hex(&readptr, 4);
+      if (':' != *readptr++)
+         continue;
+
+      map_devmin = fast_strtoull_hex(&readptr, 4);
+      if (' ' != *readptr++)
+         continue;
+
+      //Minor shortcut: Once we know there's no file for this region, we skip
+      if (!map_devmaj && !map_devmin)
+         continue;
+
+      map_inode = fast_strtoull_dec(&readptr, 20);
+      if (!map_inode)
+         continue;
+
+      if (calcSize) {
+         LibraryData* libdata = Hashtable_get(ht, map_inode);
+         if (!libdata) {
+            libdata = xCalloc(1, sizeof(LibraryData));
+            Hashtable_put(ht, map_inode, libdata);
+         }
+
+         libdata->size += map_end - map_start;
+         libdata->exec |= map_execute;
+      }
+
+      if (checkDeletedLib && map_execute && !proc->usesDeletedLib) {
+         while (*readptr == ' ')
+            readptr++;
+
+         if (*readptr != '/')
+            continue;
+
+         if (String_startsWith(readptr, "/memfd:"))
+            continue;
+
+         /* Virtualbox maps /dev/zero for memory allocation. That results in
+          * false positive, so ignore. */
+         if (String_eq(readptr, "/dev/zero (deleted)\n"))
+            continue;
+
+         if (strstr(readptr, " (deleted)\n")) {
+            proc->usesDeletedLib = true;
+            if (!calcSize)
+               break;
+         }
+      }
+   }
+
+   fclose(mapsfile);
+
+   if (calcSize) {
+      uint64_t total_size = 0;
+      Hashtable_foreach(ht, LinuxProcessTable_calcLibSize_helper, &total_size);
+
+      Hashtable_delete(ht);
+
+      process->m_lrs = total_size / host->pageSize;
+   }
+}
+
+static bool LinuxProcessTable_readStatmFile(LinuxProcess* process, openat_arg_t procFd, const LinuxMachine* host) {
+   FILE* statmfile = fopenat(procFd, "statm", "r");
+   if (!statmfile)
+      return false;
+
+   long int dummy, dummy2;
+
+   int r = fscanf(statmfile, "%ld %ld %ld %ld %ld %ld %ld",
+                  &process->super.m_virt,
+                  &process->super.m_resident,
+                  &process->m_share,
+                  &process->m_trs,
+                  &dummy, /* unused since Linux 2.6; always 0 */
+                  &process->m_drs,
+                  &dummy2); /* unused since Linux 2.6; always 0 */
+   fclose(statmfile);
+
+   if (r == 7) {
+      process->super.m_virt *= host->pageSizeKB;
+      process->super.m_resident *= host->pageSizeKB;
+
+      process->m_priv = process->super.m_resident - (process->m_share * host->pageSizeKB);
+   }
+
+   return r == 7;
+}
+
+static bool LinuxProcessTable_readSmapsFile(LinuxProcess* process, openat_arg_t procFd, bool haveSmapsRollup) {
+   //http://elixir.free-electrons.com/linux/v4.10/source/fs/proc/task_mmu.c#L719
+   //kernel will return data in chunks of size PAGE_SIZE or less.
+   FILE* f = fopenat(procFd, haveSmapsRollup ? "smaps_rollup" : "smaps", "r");
+   if (!f)
+      return false;
+
+   process->m_pss   = 0;
+   process->m_swap  = 0;
+   process->m_psswp = 0;
+
+   char buffer[256];
+   while (fgets(buffer, sizeof(buffer), f)) {
+      if (!strchr(buffer, '\n')) {
+         // Partial line, skip to end of this line
+         while (fgets(buffer, sizeof(buffer), f)) {
+            if (strchr(buffer, '\n')) {
+               break;
+            }
+         }
+         continue;
+      }
+
+      if (String_startsWith(buffer, "Pss:")) {
+         process->m_pss += strtol(buffer + 4, NULL, 10);
+      } else if (String_startsWith(buffer, "Swap:")) {
+         process->m_swap += strtol(buffer + 5, NULL, 10);
+      } else if (String_startsWith(buffer, "SwapPss:")) {
+         process->m_psswp += strtol(buffer + 8, NULL, 10);
+      }
+   }
+
+   fclose(f);
+   return true;
+}
+
+#ifdef HAVE_OPENVZ
+
+static void LinuxProcessTable_readOpenVZData(LinuxProcess* process, openat_arg_t procFd) {
+   if (access(PROCDIR "/vz", R_OK) != 0) {
+      free(process->ctid);
+      process->ctid = NULL;
+      process->vpid = Process_getPid(&process->super);
+      return;
+   }
+
+   FILE* file = fopenat(procFd, "status", "r");
+   if (!file) {
+      free(process->ctid);
+      process->ctid = NULL;
+      process->vpid = Process_getPid(&process->super);
+      return;
+   }
+
+   bool foundEnvID = false;
+   bool foundVPid = false;
+   char linebuf[256];
+   while (fgets(linebuf, sizeof(linebuf), file) != NULL) {
+      if (strchr(linebuf, '\n') == NULL) {
+         // Partial line, skip to end of this line
+         while (fgets(linebuf, sizeof(linebuf), file) != NULL) {
+            if (strchr(linebuf, '\n') != NULL) {
+               break;
+            }
+         }
+         continue;
+      }
+
+      char* name_value_sep = strchr(linebuf, ':');
+      if (name_value_sep == NULL) {
+         continue;
+      }
+
+      int field;
+      if (0 == strncasecmp(linebuf, "envID", name_value_sep - linebuf)) {
+         field = 1;
+      } else if (0 == strncasecmp(linebuf, "VPid", name_value_sep - linebuf)) {
+         field = 2;
+      } else {
+         continue;
+      }
+
+      do {
+         name_value_sep++;
+      } while (*name_value_sep != '\0' && *name_value_sep <= 32);
+
+      char* value_end = name_value_sep;
+
+      while (*value_end > 32) {
+         value_end++;
+      }
+
+      if (name_value_sep == value_end) {
+         continue;
+      }
+
+      *value_end = '\0';
+
+      switch (field) {
+         case 1:
+            foundEnvID = true;
+            if (!String_eq(name_value_sep, process->ctid ? process->ctid : ""))
+               free_and_xStrdup(&process->ctid, name_value_sep);
+            break;
+         case 2:
+            foundVPid = true;
+            process->vpid = strtoul(name_value_sep, NULL, 0);
+            break;
+         default:
+            //Sanity Check: Should never reach here, or the implementation is missing something!
+            assert(false && "OpenVZ handling: Unimplemented case for field handling reached.");
+      }
+   }
+
+   fclose(file);
+
+   if (!foundEnvID) {
+      free(process->ctid);
+      process->ctid = NULL;
+   }
+
+   if (!foundVPid) {
+      process->vpid = Process_getPid(&process->super);
+   }
+}
+
+#endif
+
+static void LinuxProcessTable_readCGroupFile(LinuxProcess* process, openat_arg_t procFd) {
+   FILE* file = fopenat(procFd, "cgroup", "r");
+   if (!file) {
+      if (process->cgroup) {
+         free(process->cgroup);
+         process->cgroup = NULL;
+      }
+      if (process->cgroup_short) {
+         free(process->cgroup_short);
+         process->cgroup_short = NULL;
+      }
+      if (process->container_short) {
+         free(process->container_short);
+         process->container_short = NULL;
+      }
+      return;
+   }
+   char output[PROC_LINE_LENGTH + 1];
+   output[0] = '\0';
+   char* at = output;
+   int left = PROC_LINE_LENGTH;
+   while (!feof(file) && left > 0) {
+      char buffer[PROC_LINE_LENGTH + 1];
+      const char* ok = fgets(buffer, PROC_LINE_LENGTH, file);
+      if (!ok)
+         break;
+
+      char* group = buffer;
+      for (size_t i = 0; i < 2; i++) {
+         group = String_strchrnul(group, ':');
+         if (!*group)
+            break;
+         group++;
+      }
+
+      char* eol = String_strchrnul(group, '\n');
+      *eol = '\0';
+
+      if (at != output) {
+         *at = ';';
+         at++;
+         left--;
+      }
+      int wrote = snprintf(at, left, "%s", group);
+      left -= wrote;
+   }
+   fclose(file);
+
+   bool changed = !process->cgroup || !String_eq(process->cgroup, output);
+
+   Row_updateFieldWidth(CGROUP, strlen(output));
+   free_and_xStrdup(&process->cgroup, output);
+
+   if (!changed) {
+      if (process->cgroup_short) {
+         Row_updateFieldWidth(CCGROUP, strlen(process->cgroup_short));
+      } else {
+         //CCGROUP is alias to normal CGROUP if shortening fails
+         Row_updateFieldWidth(CCGROUP, strlen(process->cgroup));
+      }
+      if (process->container_short) {
+         Row_updateFieldWidth(CONTAINER, strlen(process->container_short));
+      } else {
+         Row_updateFieldWidth(CONTAINER, strlen("N/A"));
+      }
+      return;
+   }
+
+   char* cgroup_short = CGroup_filterName(process->cgroup);
+   if (cgroup_short) {
+      Row_updateFieldWidth(CCGROUP, strlen(cgroup_short));
+      free_and_xStrdup(&process->cgroup_short, cgroup_short);
+      free(cgroup_short);
+   } else {
+      //CCGROUP is alias to normal CGROUP if shortening fails
+      Row_updateFieldWidth(CCGROUP, strlen(process->cgroup));
+      free(process->cgroup_short);
+      process->cgroup_short = NULL;
+   }
+
+   char* container_short = CGroup_filterContainer(process->cgroup);
+   if (container_short) {
+      Row_updateFieldWidth(CONTAINER, strlen(container_short));
+      free_and_xStrdup(&process->container_short, container_short);
+      free(container_short);
+   } else {
+      //CONTAINER is just "N/A" if shortening fails
+      Row_updateFieldWidth(CONTAINER, strlen("N/A"));
+      free(process->container_short);
+      process->container_short = NULL;
+   }
+}
+
+static void LinuxProcessTable_readOomData(LinuxProcess* process, openat_arg_t procFd) {
+   FILE* file = fopenat(procFd, "oom_score", "r");
+   if (!file)
+      return;
+
+   char buffer[PROC_LINE_LENGTH + 1];
+   if (fgets(buffer, PROC_LINE_LENGTH, file)) {
+      unsigned int oom;
+      int ok = sscanf(buffer, "%u", &oom);
+      if (ok >= 1) {
+         process->oom = oom;
+      }
+   }
+   fclose(file);
+}
+
+static void LinuxProcessTable_readAutogroup(LinuxProcess* process, openat_arg_t procFd) {
+   process->autogroup_id = -1;
+
+   char autogroup[64]; // space for two numeric values and fixed length strings
+   ssize_t amtRead = xReadfileat(procFd, "autogroup", autogroup, sizeof(autogroup));
+   if (amtRead < 0)
+      return;
+
+   long int identity;
+   int nice;
+   int ok = sscanf(autogroup, "/autogroup-%ld nice %d", &identity, &nice);
+   if (ok == 2) {
+      process->autogroup_id = identity;
+      process->autogroup_nice = nice;
+   }
+}
+
+static void LinuxProcessTable_readSecattrData(LinuxProcess* process, openat_arg_t procFd) {
+   FILE* file = fopenat(procFd, "attr/current", "r");
+   if (!file) {
+      free(process->secattr);
+      process->secattr = NULL;
+      return;
+   }
+
+   char buffer[PROC_LINE_LENGTH + 1];
+   const char* res = fgets(buffer, sizeof(buffer), file);
+   fclose(file);
+   if (!res) {
+      free(process->secattr);
+      process->secattr = NULL;
+      return;
+   }
+   char* newline = strchr(buffer, '\n');
+   if (newline) {
+      *newline = '\0';
+   }
+
+   Row_updateFieldWidth(SECATTR, strlen(buffer));
+
+   if (process->secattr && String_eq(process->secattr, buffer)) {
+      return;
+   }
+   free_and_xStrdup(&process->secattr, buffer);
+}
+
+static void LinuxProcessTable_readCwd(LinuxProcess* process, openat_arg_t procFd) {
+   char pathBuffer[PATH_MAX + 1] = {0};
+
+#if defined(HAVE_READLINKAT) && defined(HAVE_OPENAT)
+   ssize_t r = readlinkat(procFd, "cwd", pathBuffer, sizeof(pathBuffer) - 1);
+#else
+   ssize_t r = Compat_readlink(procFd, "cwd", pathBuffer, sizeof(pathBuffer) - 1);
+#endif
+
+   if (r < 0) {
+      free(process->super.procCwd);
+      process->super.procCwd = NULL;
+      return;
+   }
+
+   pathBuffer[r] = '\0';
+
+   if (process->super.procCwd && String_eq(process->super.procCwd, pathBuffer))
+      return;
+
+   free_and_xStrdup(&process->super.procCwd, pathBuffer);
+}
+
+#ifdef HAVE_DELAYACCT
+
+static int handleNetlinkMsg(struct nl_msg* nlmsg, void* linuxProcess) {
+   struct nlmsghdr* nlhdr;
+   struct nlattr* nlattrs[TASKSTATS_TYPE_MAX + 1];
+   const struct nlattr* nlattr;
+   struct taskstats stats;
+   int rem;
+   LinuxProcess* lp = (LinuxProcess*) linuxProcess;
+
+   nlhdr = nlmsg_hdr(nlmsg);
+
+   if (genlmsg_parse(nlhdr, 0, nlattrs, TASKSTATS_TYPE_MAX, NULL) < 0) {
+      return NL_SKIP;
+   }
+
+   if ((nlattr = nlattrs[TASKSTATS_TYPE_AGGR_PID]) || (nlattr = nlattrs[TASKSTATS_TYPE_NULL])) {
+      memcpy(&stats, nla_data(nla_next(nla_data(nlattr), &rem)), sizeof(stats));
+      assert(Process_getPid(&lp->super) == (pid_t)stats.ac_pid);
+
+      // The xxx_delay_total values wrap around on overflow.
+      // (Linux Kernel "Documentation/accounting/taskstats-struct.rst")
+      unsigned long long int timeDelta = stats.ac_etime * 1000 - lp->delay_read_time;
+      #define DELTAPERC(x, y) (timeDelta ? MINIMUM((float)((x) - (y)) / timeDelta * 100.0f, 100.0f) : NAN)
+      lp->cpu_delay_percent = DELTAPERC(stats.cpu_delay_total, lp->cpu_delay_total);
+      lp->blkio_delay_percent = DELTAPERC(stats.blkio_delay_total, lp->blkio_delay_total);
+      lp->swapin_delay_percent = DELTAPERC(stats.swapin_delay_total, lp->swapin_delay_total);
+      #undef DELTAPERC
+
+      lp->swapin_delay_total = stats.swapin_delay_total;
+      lp->blkio_delay_total = stats.blkio_delay_total;
+      lp->cpu_delay_total = stats.cpu_delay_total;
+      lp->delay_read_time = stats.ac_etime * 1000;
+   }
+   return NL_OK;
+}
+
+static void LinuxProcessTable_readDelayAcctData(LinuxProcessTable* this, LinuxProcess* process) {
+   struct nl_msg* msg;
+
+   if (!this->netlink_socket) {
+      LinuxProcessTable_initNetlinkSocket(this);
+      if (!this->netlink_socket) {
+         goto delayacct_failure;
+      }
+   }
+
+   if (nl_socket_modify_cb(this->netlink_socket, NL_CB_VALID, NL_CB_CUSTOM, handleNetlinkMsg, process) < 0) {
+      goto delayacct_failure;
+   }
+
+   if (! (msg = nlmsg_alloc())) {
+      goto delayacct_failure;
+   }
+
+   if (! genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, this->netlink_family, 0, NLM_F_REQUEST, TASKSTATS_CMD_GET, TASKSTATS_VERSION)) {
+      nlmsg_free(msg);
+   }
+
+   if (nla_put_u32(msg, TASKSTATS_CMD_ATTR_PID, Process_getPid(&process->super)) < 0) {
+      nlmsg_free(msg);
+   }
+
+   if (nl_send_sync(this->netlink_socket, msg) < 0) {
+      goto delayacct_failure;
+   }
+
+   if (nl_recvmsgs_default(this->netlink_socket) < 0) {
+      goto delayacct_failure;
+   }
+
+   return;
+
+delayacct_failure:
+   process->swapin_delay_percent = NAN;
+   process->blkio_delay_percent = NAN;
+   process->cpu_delay_percent = NAN;
+}
+
+#endif
+
+static bool LinuxProcessTable_readCmdlineFile(Process* process, openat_arg_t procFd) {
+   char command[4096 + 1]; // max cmdline length on Linux
+   ssize_t amtRead = xReadfileat(procFd, "cmdline", command, sizeof(command));
+   if (amtRead <= 0)
+      return false;
+
+   int tokenEnd = 0;
+   int tokenStart = 0;
+   int lastChar = 0;
+   bool argSepNUL = false;
+   bool argSepSpace = false;
+
+   for (int i = 0; i < amtRead; i++) {
+      /* newline used as delimiter - when forming the mergedCommand, newline is
+       * converted to space by Process_makeCommandStr */
+      if (command[i] == '\0') {
+         command[i] = '\n';
+      } else {
+         /* Record some information for the argument parsing heuristic below. */
+         if (tokenEnd)
+            argSepNUL = true;
+         if (command[i] <= ' ')
+            argSepSpace = true;
+      }
+
+      if (command[i] == '\n') {
+         if (tokenEnd == 0) {
+            tokenEnd = i;
+         }
+      } else {
+         /* htop considers the next character after the last / that is before
+          * basenameOffset, as the start of the basename in cmdline - see
+          * Process_writeCommand */
+         if (!tokenEnd && command[i] == '/') {
+            tokenStart = i + 1;
+         }
+         lastChar = i;
+      }
+   }
+
+   command[lastChar + 1] = '\0';
+
+   if (!argSepNUL && argSepSpace) {
+      /* Argument parsing heuristic.
+       *
+       * This heuristic is used for processes that rewrite their command line.
+       * Normally the command line is split by using NUL bytes between each argument.
+       * But some programs like chrome flatten this using spaces.
+       *
+       * This heuristic tries its best to undo this loss of information.
+       * To achieve this, we treat every character <= 32 as argument separators
+       * (i.e. all of ASCII control sequences and space).
+       * We then search for the basename of the cmdline in the first argument we found that way.
+       * As path names may contain we try to cross-validate if the path we got that way exists.
+       */
+
+      tokenStart = tokenEnd = 0;
+
+      // From initial scan we know there's at least one space.
+      // Check if that's part of a filename for an existing file.
+      if (Compat_faccessat(AT_FDCWD, command, F_OK, AT_SYMLINK_NOFOLLOW) != 0) {
+         // If we reach here the path does not exist.
+         // Thus begin searching for the part of it that actually is.
+
+         int tokenArg0Start = 0;
+
+         for (int i = 0; i <= lastChar; i++) {
+            /* Any ASCII control or space used as delimiter */
+            char tmpCommandChar = command[i];
+
+            if (command[i] <= ' ') {
+               if (!tokenEnd) {
+                  command[i] = '\0';
+
+                  bool found = Compat_faccessat(AT_FDCWD, command, F_OK, AT_SYMLINK_NOFOLLOW) == 0;
+
+                  // Restore if this wasn't it
+                  command[i] = found ? '\n' : tmpCommandChar;
+
+                  if (found)
+                     tokenEnd = i;
+                  if (!tokenArg0Start)
+                     tokenArg0Start = tokenStart;
+               } else {
+                  // Split on every further separator, regardless of path correctness
+                  command[i] = '\n';
+               }
+            } else if (!tokenEnd) {
+               if (command[i] == '/' || (command[i] == '\\' && (!tokenStart || command[tokenStart - 1] == '\\'))) {
+                  tokenStart = i + 1;
+               } else if (command[i] == ':' && (command[i + 1] != '/' && command[i + 1] != '\\')) {
+                  tokenEnd = i;
+               }
+            }
+         }
+
+         if (!tokenEnd) {
+            tokenStart = tokenArg0Start;
+
+            // No token delimiter found, forcibly split
+            for (int i = 0; i <= lastChar; i++) {
+               if (command[i] <= ' ') {
+                  command[i] = '\n';
+                  if (!tokenEnd) {
+                     tokenEnd = i;
+                  }
+               }
+            }
+         }
+      }
+
+      /* Some command lines are hard to parse, like
+       *   file.so [kdeinit5] file local:/run/user/1000/klauncherdqbouY.1.slave-socket local:/run/user/1000/kded5TwsDAx.1.slave-socket
+       * Reset if start is behind end.
+       */
+      if (tokenStart >= tokenEnd)
+         tokenStart = tokenEnd = 0;
+   }
+
+   if (tokenEnd == 0) {
+      tokenEnd = lastChar + 1;
+   }
+
+   Process_updateCmdline(process, command, tokenStart, tokenEnd);
+
+   /* /proc/[pid]/comm could change, so should be updated */
+   if ((amtRead = xReadfileat(procFd, "comm", command, sizeof(command))) > 0) {
+      command[amtRead - 1] = '\0';
+      Process_updateComm(process, command);
+   } else {
+      Process_updateComm(process, NULL);
+   }
+
+   char filename[MAX_NAME + 1];
+
+   /* execve could change /proc/[pid]/exe, so procExe should be updated */
+#if defined(HAVE_READLINKAT) && defined(HAVE_OPENAT)
+   amtRead = readlinkat(procFd, "exe", filename, sizeof(filename) - 1);
+#else
+   amtRead = Compat_readlink(procFd, "exe", filename, sizeof(filename) - 1);
+#endif
+   if (amtRead > 0) {
+      filename[amtRead] = 0;
+      if (!process->procExe ||
+          (!process->procExeDeleted && !String_eq(filename, process->procExe)) ||
+          process->procExeDeleted) {
+
+         const char* deletedMarker = " (deleted)";
+         const size_t markerLen = strlen(deletedMarker);
+         const size_t filenameLen = strlen(filename);
+
+         if (filenameLen > markerLen) {
+            bool oldExeDeleted = process->procExeDeleted;
+
+            process->procExeDeleted = String_eq(filename + filenameLen - markerLen, deletedMarker);
+
+            if (process->procExeDeleted)
+               filename[filenameLen - markerLen] = '\0';
+
+            if (oldExeDeleted != process->procExeDeleted)
+               process->mergedCommand.lastUpdate = 0;
+         }
+
+         Process_updateExe(process, filename);
+      }
+   } else if (process->procExe) {
+      Process_updateExe(process, NULL);
+      process->procExeDeleted = false;
+   }
+
+   return true;
+}
+
+static char* LinuxProcessTable_updateTtyDevice(TtyDriver* ttyDrivers, unsigned long int tty_nr) {
+   unsigned int maj = major(tty_nr);
+   unsigned int min = minor(tty_nr);
+
+   int i = -1;
+   for (;;) {
+      i++;
+      if ((!ttyDrivers[i].path) || maj < ttyDrivers[i].major) {
+         break;
+      }
+      if (maj > ttyDrivers[i].major) {
+         continue;
+      }
+      if (min < ttyDrivers[i].minorFrom) {
+         break;
+      }
+      if (min > ttyDrivers[i].minorTo) {
+         continue;
+      }
+      unsigned int idx = min - ttyDrivers[i].minorFrom;
+      struct stat sstat;
+      char* fullPath;
+      for (;;) {
+         xAsprintf(&fullPath, "%s/%d", ttyDrivers[i].path, idx);
+         int err = stat(fullPath, &sstat);
+         if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) {
+            return fullPath;
+         }
+         free(fullPath);
+
+         xAsprintf(&fullPath, "%s%d", ttyDrivers[i].path, idx);
+         err = stat(fullPath, &sstat);
+         if (err == 0 && major(sstat.st_rdev) == maj && minor(sstat.st_rdev) == min) {
+            return fullPath;
+         }
+         free(fullPath);
+
+         if (idx == min) {
+            break;
+         }
+
+         idx = min;
+      }
+      int err = stat(ttyDrivers[i].path, &sstat);
+      if (err == 0 && tty_nr == sstat.st_rdev) {
+         return xStrdup(ttyDrivers[i].path);
+      }
+   }
+   char* out;
+   xAsprintf(&out, "/dev/%u:%u", maj, min);
+   return out;
+}
+
+static bool isOlderThan(const Process* proc, unsigned int seconds) {
+   const Machine* host = proc->super.host;
+
+   assert(host->realtimeMs > 0);
+
+   /* Starttime might not yet be parsed */
+   if (proc->starttime_ctime <= 0)
+      return false;
+
+   uint64_t realtime = host->realtimeMs / 1000;
+
+   if (realtime < (uint64_t)proc->starttime_ctime)
+      return false;
+
+   return realtime - proc->starttime_ctime > seconds;
+}
+
+static bool LinuxProcessTable_recurseProcTree(LinuxProcessTable* this, openat_arg_t parentFd, const LinuxMachine* lhost, const char* dirname, const Process* parent) {
+   ProcessTable* pt = (ProcessTable*) this;
+   const Machine* host = &lhost->super;
+   const Settings* settings = host->settings;
+   const ScreenSettings* ss = settings->ss;
+   const struct dirent* entry;
+
+   /* set runningTasks from /proc/stat (from Machine_scanCPUTime) */
+   pt->runningTasks = lhost->runningTasks;
+
+#ifdef HAVE_OPENAT
+   int dirFd = openat(parentFd, dirname, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+   if (dirFd < 0)
+      return false;
+   DIR* dir = fdopendir(dirFd);
+#else
+   char dirFd[4096];
+   xSnprintf(dirFd, sizeof(dirFd), "%s/%s", parentFd, dirname);
+   DIR* dir = opendir(dirFd);
+#endif
+   if (!dir) {
+      Compat_openatArgClose(dirFd);
+      return false;
+   }
+
+   const bool hideKernelThreads = settings->hideKernelThreads;
+   const bool hideUserlandThreads = settings->hideUserlandThreads;
+   const bool hideRunningInContainer = settings->hideRunningInContainer;
+   while ((entry = readdir(dir)) != NULL) {
+      const char* name = entry->d_name;
+
+      // Ignore all non-directories
+      if (entry->d_type != DT_DIR && entry->d_type != DT_UNKNOWN) {
+         continue;
+      }
+
+      // The RedHat kernel hides threads with a dot.
+      // I believe this is non-standard.
+      if (name[0] == '.') {
+         name++;
+      }
+
+      // Just skip all non-number directories.
+      if (name[0] < '0' || name[0] > '9') {
+         continue;
+      }
+
+      // filename is a number: process directory
+      int pid;
+      {
+         char* endptr;
+         unsigned long parsedPid = strtoul(name, &endptr, 10);
+         if (parsedPid == 0 || parsedPid == ULONG_MAX || *endptr != '\0')
+            continue;
+         pid = parsedPid;
+      }
+
+      // Skip task directory of main thread
+      if (parent && pid == Process_getPid(parent))
+         continue;
+
+#ifdef HAVE_OPENAT
+      int procFd = openat(dirFd, entry->d_name, O_RDONLY | O_DIRECTORY | O_NOFOLLOW);
+      if (procFd < 0)
+         continue;
+#else
+      char procFd[4096];
+      xSnprintf(procFd, sizeof(procFd), "%s/%s", dirFd, entry->d_name);
+#endif
+
+      bool preExisting;
+      Process* proc = ProcessTable_getProcess(pt, pid, &preExisting, LinuxProcess_new);
+      LinuxProcess* lp = (LinuxProcess*) proc;
+
+      Process_setThreadGroup(proc, parent ? Process_getPid(parent) : pid);
+      proc->isUserlandThread = Process_getPid(proc) != Process_getThreadGroup(proc);
+
+      LinuxProcessTable_recurseProcTree(this, procFd, lhost, "task", proc);
+
+      /*
+       * These conditions will not trigger on first occurrence, cause we need to
+       * add the process to the ProcessTable and do all one time scans
+       * (e.g. parsing the cmdline to detect a kernel thread)
+       * But it will short-circuit subsequent scans.
+       */
+      if (preExisting && hideKernelThreads && Process_isKernelThread(proc)) {
+         proc->super.updated = true;
+         proc->super.show = false;
+         pt->kernelThreads++;
+         pt->totalTasks++;
+         Compat_openatArgClose(procFd);
+         continue;
+      }
+      if (preExisting && hideUserlandThreads && Process_isUserlandThread(proc)) {
+         proc->super.updated = true;
+         proc->super.show = false;
+         pt->userlandThreads++;
+         pt->totalTasks++;
+         Compat_openatArgClose(procFd);
+         continue;
+      }
+      if (preExisting && hideRunningInContainer && proc->isRunningInContainer) {
+         proc->super.updated = true;
+         proc->super.show = false;
+         Compat_openatArgClose(procFd);
+         continue;
+      }
+
+      bool scanMainThread = !hideUserlandThreads && !Process_isKernelThread(proc) && !parent;
+      if (ss->flags & PROCESS_FLAG_IO)
+         LinuxProcessTable_readIoFile(lp, procFd, scanMainThread);
+
+      if (!LinuxProcessTable_readStatmFile(lp, procFd, lhost))
+         goto errorReadingProcess;
+
+      {
+         bool prev = proc->usesDeletedLib;
+
+         if (!proc->isKernelThread && !proc->isUserlandThread &&
+             ((ss->flags & PROCESS_FLAG_LINUX_LRS_FIX) || (settings->highlightDeletedExe && !proc->procExeDeleted && isOlderThan(proc, 10)))) {
+
+            // Check if we really should recalculate the M_LRS value for this process
+            uint64_t passedTimeInMs = host->realtimeMs - lp->last_mlrs_calctime;
+
+            uint64_t recheck = ((uint64_t)rand()) % 2048;
+
+            if (passedTimeInMs > recheck) {
+               lp->last_mlrs_calctime = host->realtimeMs;
+               LinuxProcessTable_readMaps(lp, procFd, lhost, ss->flags & PROCESS_FLAG_LINUX_LRS_FIX, settings->highlightDeletedExe);
+            }
+         } else {
+            /* Copy from process structure in threads and reset if setting got disabled */
+            proc->usesDeletedLib = (proc->isUserlandThread && parent) ? parent->usesDeletedLib : false;
+            lp->m_lrs = (proc->isUserlandThread && parent) ? ((const LinuxProcess*)parent)->m_lrs : 0;
+         }
+
+         if (prev != proc->usesDeletedLib)
+            proc->mergedCommand.lastUpdate = 0;
+      }
+
+      if ((ss->flags & PROCESS_FLAG_LINUX_SMAPS) && !Process_isKernelThread(proc)) {
+         if (!parent) {
+            // Read smaps file of each process only every second pass to improve performance
+            static int smaps_flag = 0;
+            if ((pid & 1) == smaps_flag) {
+               LinuxProcessTable_readSmapsFile(lp, procFd, this->haveSmapsRollup);
+            }
+            if (pid == 1) {
+               smaps_flag = !smaps_flag;
+            }
+         } else {
+            lp->m_pss = ((const LinuxProcess*)parent)->m_pss;
+         }
+      }
+
+      char statCommand[MAX_NAME + 1];
+      unsigned long long int lasttimes = (lp->utime + lp->stime);
+      unsigned long int tty_nr = proc->tty_nr;
+      if (!LinuxProcessTable_readStatFile(lp, procFd, lhost, scanMainThread, statCommand, sizeof(statCommand)))
+         goto errorReadingProcess;
+
+      if (lp->flags & PF_KTHREAD) {
+         proc->isKernelThread = true;
+      }
+
+      if (tty_nr != proc->tty_nr && this->ttyDrivers) {
+         free(proc->tty_name);
+         proc->tty_name = LinuxProcessTable_updateTtyDevice(this->ttyDrivers, proc->tty_nr);
+      }
+
+      if (ss->flags & PROCESS_FLAG_LINUX_IOPRIO) {
+         LinuxProcess_updateIOPriority(proc);
+      }
+
+      proc->percent_cpu = NAN;
+      /* lhost->period might be 0 after system sleep */
+      if (lhost->period > 0.0) {
+         float percent_cpu = saturatingSub(lp->utime + lp->stime, lasttimes) / lhost->period * 100.0;
+         proc->percent_cpu = MINIMUM(percent_cpu, host->activeCPUs * 100.0F);
+      }
+      proc->percent_mem = proc->m_resident / (double)(host->totalMem) * 100.0;
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      if (!LinuxProcessTable_updateUser(host, proc, procFd))
+         goto errorReadingProcess;
+
+      if (!LinuxProcessTable_readStatusFile(proc, procFd))
+         goto errorReadingProcess;
+
+      if (!preExisting) {
+
+         #ifdef HAVE_OPENVZ
+         if (ss->flags & PROCESS_FLAG_LINUX_OPENVZ) {
+            LinuxProcessTable_readOpenVZData(lp, procFd);
+         }
+         #endif
+
+         if (proc->isKernelThread) {
+            Process_updateCmdline(proc, NULL, 0, 0);
+         } else if (!LinuxProcessTable_readCmdlineFile(proc, procFd)) {
+            Process_updateCmdline(proc, statCommand, 0, strlen(statCommand));
+         }
+
+         Process_fillStarttimeBuffer(proc);
+
+         ProcessTable_add(pt, proc);
+      } else {
+         if (settings->updateProcessNames && proc->state != ZOMBIE) {
+            if (proc->isKernelThread) {
+               Process_updateCmdline(proc, NULL, 0, 0);
+            } else if (!LinuxProcessTable_readCmdlineFile(proc, procFd)) {
+               Process_updateCmdline(proc, statCommand, 0, strlen(statCommand));
+            }
+         }
+      }
+
+      if (ss->flags & PROCESS_FLAG_LINUX_CGROUP)
+         LinuxProcessTable_readCGroupFile(lp, procFd);
+
+      #ifdef HAVE_DELAYACCT
+      if (ss->flags & PROCESS_FLAG_LINUX_DELAYACCT) {
+         LinuxProcessTable_readDelayAcctData(this, lp);
+      }
+      #endif
+
+      if (ss->flags & PROCESS_FLAG_LINUX_OOM) {
+         LinuxProcessTable_readOomData(lp, procFd);
+      }
+
+      if (ss->flags & PROCESS_FLAG_LINUX_SECATTR) {
+         LinuxProcessTable_readSecattrData(lp, procFd);
+      }
+
+      if (ss->flags & PROCESS_FLAG_CWD) {
+         LinuxProcessTable_readCwd(lp, procFd);
+      }
+
+      if ((ss->flags & PROCESS_FLAG_LINUX_AUTOGROUP) && this->haveAutogroup) {
+         LinuxProcessTable_readAutogroup(lp, procFd);
+      }
+
+      #ifdef SCHEDULER_SUPPORT
+      if (ss->flags & PROCESS_FLAG_SCHEDPOL) {
+         Scheduling_readProcessPolicy(proc);
+      }
+      #endif
+
+      if (!proc->cmdline && statCommand[0] &&
+          (proc->state == ZOMBIE || Process_isKernelThread(proc) || settings->showThreadNames)) {
+         Process_updateCmdline(proc, statCommand, 0, strlen(statCommand));
+      }
+
+      /*
+       * Final section after all data has been gathered
+       */
+
+      proc->super.updated = true;
+      Compat_openatArgClose(procFd);
+
+      if (hideRunningInContainer && proc->isRunningInContainer) {
+         proc->super.show = false;
+         continue;
+      }
+
+      if (Process_isKernelThread(proc)) {
+         pt->kernelThreads++;
+      } else if (Process_isUserlandThread(proc)) {
+         pt->userlandThreads++;
+      }
+
+      /* Set at the end when we know if a new entry is a thread */
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
+
+      pt->totalTasks++;
+      /* runningTasks is set in Machine_scanCPUTime() from /proc/stat */
+      continue;
+
+      // Exception handler.
+
+errorReadingProcess:
+      {
+#ifdef HAVE_OPENAT
+         if (procFd >= 0)
+            close(procFd);
+#endif
+
+         if (preExisting) {
+            /*
+             * The only real reason for coming here (apart from Linux violating the /proc API)
+             * would be the process going away with its /proc files disappearing (!HAVE_OPENAT).
+             * However, we want to keep in the process list for now for the "highlight dying" mode.
+             */
+         } else {
+            /* A really short-lived process that we don't have full info about */
+            Process_delete((Object*)proc);
+         }
+      }
+   }
+   closedir(dir);
+   return true;
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   LinuxProcessTable* this = (LinuxProcessTable*) super;
+   const Machine* host = super->super.host;
+   const Settings* settings = host->settings;
+   const LinuxMachine* lhost = (const LinuxMachine*) host;
+
+   if (settings->ss->flags & PROCESS_FLAG_LINUX_AUTOGROUP) {
+      // Refer to sched(7) 'autogroup feature' section
+      // The kernel feature can be enabled/disabled through procfs at
+      // any time, so check for it at the start of each sample - only
+      // read from per-process procfs files if it's globally enabled.
+      this->haveAutogroup = LinuxProcess_isAutogroupEnabled();
+   } else {
+      this->haveAutogroup = false;
+   }
+
+   /* PROCDIR is an absolute path */
+   assert(PROCDIR[0] == '/');
+#ifdef HAVE_OPENAT
+   openat_arg_t rootFd = AT_FDCWD;
+#else
+   openat_arg_t rootFd = "";
+#endif
+
+   LinuxProcessTable_recurseProcTree(this, rootFd, lhost, PROCDIR, NULL);
+}
diff --git a/linux/LinuxProcessTable.h b/linux/LinuxProcessTable.h
new file mode 100644
index 0000000..b87f9b0
--- /dev/null
+++ b/linux/LinuxProcessTable.h
@@ -0,0 +1,35 @@
+#ifndef HEADER_LinuxProcessTable
+#define HEADER_LinuxProcessTable
+/*
+htop - LinuxProcessTable.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "ProcessTable.h"
+
+
+typedef struct TtyDriver_ {
+   char* path;
+   unsigned int major;
+   unsigned int minorFrom;
+   unsigned int minorTo;
+} TtyDriver;
+
+typedef struct LinuxProcessTable_ {
+   ProcessTable super;
+
+   TtyDriver* ttyDrivers;
+   bool haveSmapsRollup;
+   bool haveAutogroup;
+
+   #ifdef HAVE_DELAYACCT
+   struct nl_sock* netlink_socket;
+   int netlink_family;
+   #endif
+} LinuxProcessTable;
+
+#endif
diff --git a/linux/Platform.c b/linux/Platform.c
new file mode 100644
index 0000000..8dc8bb5
--- /dev/null
+++ b/linux/Platform.c
@@ -0,0 +1,1087 @@
+/*
+htop - linux/Platform.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/Platform.h"
+
+#include <assert.h>
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <sys/sysmacros.h>
+
+#include "BatteryMeter.h"
+#include "ClockMeter.h"
+#include "Compat.h"
+#include "CPUMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "DiskIOMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "HugePageMeter.h"
+#include "LoadAverageMeter.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "MainPanel.h"
+#include "Meter.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "NetworkIOMeter.h"
+#include "Object.h"
+#include "Panel.h"
+#include "PressureStallMeter.h"
+#include "ProvideCurses.h"
+#include "Settings.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+#include "linux/IOPriority.h"
+#include "linux/IOPriorityPanel.h"
+#include "linux/LinuxMachine.h"
+#include "linux/LinuxProcess.h"
+#include "linux/SELinuxMeter.h"
+#include "linux/SystemdMeter.h"
+#include "linux/ZramMeter.h"
+#include "linux/ZramStats.h"
+#include "linux/ZswapStats.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsArcStats.h"
+#include "zfs/ZfsCompressedArcMeter.h"
+
+#ifdef HAVE_LIBCAP
+#include <sys/capability.h>
+#endif
+
+#ifdef HAVE_SENSORS_SENSORS_H
+#include "LibSensors.h"
+#endif
+
+#ifndef O_PATH
+#define O_PATH         010000000 // declare for ancient glibc versions
+#endif
+
+
+#ifdef HAVE_LIBCAP
+enum CapMode {
+   CAP_MODE_OFF,
+   CAP_MODE_BASIC,
+   CAP_MODE_STRICT
+};
+#endif
+
+bool Running_containerized = false;
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+   {
+      .name = "I/O",
+      .columns = "PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command",
+      .sortKey = "IO_RATE",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number = 0 },
+   { .name = " 1 SIGHUP",    .number = 1 },
+   { .name = " 2 SIGINT",    .number = 2 },
+   { .name = " 3 SIGQUIT",   .number = 3 },
+   { .name = " 4 SIGILL",    .number = 4 },
+   { .name = " 5 SIGTRAP",   .number = 5 },
+   { .name = " 6 SIGABRT",   .number = 6 },
+   { .name = " 6 SIGIOT",    .number = 6 },
+   { .name = " 7 SIGBUS",    .number = 7 },
+   { .name = " 8 SIGFPE",    .number = 8 },
+   { .name = " 9 SIGKILL",   .number = 9 },
+   { .name = "10 SIGUSR1",   .number = 10 },
+   { .name = "11 SIGSEGV",   .number = 11 },
+   { .name = "12 SIGUSR2",   .number = 12 },
+   { .name = "13 SIGPIPE",   .number = 13 },
+   { .name = "14 SIGALRM",   .number = 14 },
+   { .name = "15 SIGTERM",   .number = 15 },
+   { .name = "16 SIGSTKFLT", .number = 16 },
+   { .name = "17 SIGCHLD",   .number = 17 },
+   { .name = "18 SIGCONT",   .number = 18 },
+   { .name = "19 SIGSTOP",   .number = 19 },
+   { .name = "20 SIGTSTP",   .number = 20 },
+   { .name = "21 SIGTTIN",   .number = 21 },
+   { .name = "22 SIGTTOU",   .number = 22 },
+   { .name = "23 SIGURG",    .number = 23 },
+   { .name = "24 SIGXCPU",   .number = 24 },
+   { .name = "25 SIGXFSZ",   .number = 25 },
+   { .name = "26 SIGVTALRM", .number = 26 },
+   { .name = "27 SIGPROF",   .number = 27 },
+   { .name = "28 SIGWINCH",  .number = 28 },
+   { .name = "29 SIGIO",     .number = 29 },
+   { .name = "29 SIGPOLL",   .number = 29 },
+   { .name = "30 SIGPWR",    .number = 30 },
+   { .name = "31 SIGSYS",    .number = 31 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+static enum { BAT_PROC, BAT_SYS, BAT_ERR } Platform_Battery_method = BAT_PROC;
+static time_t Platform_Battery_cacheTime;
+static double Platform_Battery_cachePercent = NAN;
+static ACPresence Platform_Battery_cacheIsOnAC;
+
+#ifdef HAVE_LIBCAP
+static enum CapMode Platform_capabilitiesMode = CAP_MODE_BASIC;
+#endif
+
+static Htop_Reaction Platform_actionSetIOPriority(State* st) {
+   if (Settings_isReadonly())
+      return HTOP_OK;
+
+   const LinuxProcess* p = (const LinuxProcess*) Panel_getSelected((Panel*)st->mainPanel);
+   if (!p)
+      return HTOP_OK;
+
+   IOPriority ioprio1 = p->ioPriority;
+   Panel* ioprioPanel = IOPriorityPanel_new(ioprio1);
+   const void* set = Action_pickFromVector(st, ioprioPanel, 20, true);
+   if (set) {
+      IOPriority ioprio2 = IOPriorityPanel_getIOPriority(ioprioPanel);
+      bool ok = MainPanel_foreachRow(st->mainPanel, LinuxProcess_rowSetIOPriority, (Arg) { .i = ioprio2 }, NULL);
+      if (!ok) {
+         beep();
+      }
+   }
+   Panel_delete((Object*)ioprioPanel);
+   return HTOP_REFRESH | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
+}
+
+static bool Platform_changeAutogroupPriority(MainPanel* panel, int delta) {
+   if (LinuxProcess_isAutogroupEnabled() == false) {
+      beep();
+      return false;
+   }
+   bool anyTagged;
+   bool ok = MainPanel_foreachRow(panel, LinuxProcess_rowChangeAutogroupPriorityBy, (Arg) { .i = delta }, &anyTagged);
+   if (!ok)
+      beep();
+   return anyTagged;
+}
+
+static Htop_Reaction Platform_actionHigherAutogroupPriority(State* st) {
+   if (Settings_isReadonly())
+      return HTOP_OK;
+
+   bool changed = Platform_changeAutogroupPriority(st->mainPanel, -1);
+   return changed ? HTOP_REFRESH : HTOP_OK;
+}
+
+static Htop_Reaction Platform_actionLowerAutogroupPriority(State* st) {
+   if (Settings_isReadonly())
+      return HTOP_OK;
+
+   bool changed = Platform_changeAutogroupPriority(st->mainPanel, 1);
+   return changed ? HTOP_REFRESH : HTOP_OK;
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   keys['i'] = Platform_actionSetIOPriority;
+   keys['{'] = Platform_actionLowerAutogroupPriority;
+   keys['}'] = Platform_actionHigherAutogroupPriority;
+   keys[KEY_F(19)] = Platform_actionLowerAutogroupPriority;  // Shift-F7
+   keys[KEY_F(20)] = Platform_actionHigherAutogroupPriority; // Shift-F8
+}
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &SysArchMeter_class,
+   &HugePageMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &BlankMeter_class,
+   &PressureStallCPUSomeMeter_class,
+   &PressureStallIOSomeMeter_class,
+   &PressureStallIOFullMeter_class,
+   &PressureStallIRQFullMeter_class,
+   &PressureStallMemorySomeMeter_class,
+   &PressureStallMemoryFullMeter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
+   &ZramMeter_class,
+   &DiskIOMeter_class,
+   &NetworkIOMeter_class,
+   &SELinuxMeter_class,
+   &SystemdMeter_class,
+   &SystemdUserMeter_class,
+   &FileDescriptorMeter_class,
+   NULL
+};
+
+int Platform_getUptime(void) {
+   double uptime = 0;
+   FILE* fd = fopen(PROCDIR "/uptime", "r");
+   if (fd) {
+      int n = fscanf(fd, "%64lf", &uptime);
+      fclose(fd);
+      if (n <= 0) {
+         return 0;
+      }
+   }
+   return floor(uptime);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   FILE* fd = fopen(PROCDIR "/loadavg", "r");
+   if (!fd)
+      goto err;
+
+   double scanOne, scanFive, scanFifteen;
+   int r = fscanf(fd, "%lf %lf %lf", &scanOne, &scanFive, &scanFifteen);
+   fclose(fd);
+   if (r != 3)
+      goto err;
+
+   *one = scanOne;
+   *five = scanFive;
+   *fifteen = scanFifteen;
+   return;
+
+err:
+   *one = NAN;
+   *five = NAN;
+   *fifteen = NAN;
+}
+
+pid_t Platform_getMaxPid(void) {
+   pid_t maxPid = 4194303;
+   FILE* file = fopen(PROCDIR "/sys/kernel/pid_max", "r");
+   if (!file)
+      return maxPid;
+
+   int match = fscanf(file, "%32d", &maxPid);
+   (void) match;
+   fclose(file);
+   return maxPid;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   const LinuxMachine* lhost = (const LinuxMachine*) this->host;
+   const Settings* settings = this->host->settings;
+   const CPUData* cpuData = &(lhost->cpuData[cpu]);
+   double total = (double) ( cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod);
+   double percent;
+   double* v = this->values;
+
+   if (!cpuData->online) {
+      this->curItems = 0;
+      return NAN;
+   }
+
+   v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0;
+   v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0;
+   if (settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->systemPeriod / total * 100.0;
+      v[CPU_METER_IRQ]     = cpuData->irqPeriod / total * 100.0;
+      v[CPU_METER_SOFTIRQ] = cpuData->softIrqPeriod / total * 100.0;
+      this->curItems = 5;
+
+      v[CPU_METER_STEAL]   = cpuData->stealPeriod / total * 100.0;
+      v[CPU_METER_GUEST]   = cpuData->guestPeriod / total * 100.0;
+      if (settings->accountGuestInCPUMeter) {
+         this->curItems = 7;
+      }
+
+      v[CPU_METER_IOWAIT]  = cpuData->ioWaitPeriod / total * 100.0;
+   } else {
+      v[CPU_METER_KERNEL] = cpuData->systemAllPeriod / total * 100.0;
+      v[CPU_METER_IRQ] = (cpuData->stealPeriod + cpuData->guestPeriod) / total * 100.0;
+      this->curItems = 4;
+   }
+
+   percent = sumPositiveValues(v, this->curItems);
+   percent = MINIMUM(percent, 100.0);
+
+   if (settings->detailedCPUTime) {
+      this->curItems = 8;
+   }
+
+   v[CPU_METER_FREQUENCY] = cpuData->frequency;
+
+#ifdef HAVE_SENSORS_SENSORS_H
+   v[CPU_METER_TEMPERATURE] = cpuData->temperature;
+#else
+   v[CPU_METER_TEMPERATURE] = NAN;
+#endif
+
+   return percent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   const LinuxMachine* lhost = (const LinuxMachine*) host;
+
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   this->values[MEMORY_METER_SHARED] = host->sharedMem;
+   this->values[MEMORY_METER_COMPRESSED] = 0; /* compressed */
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   this->values[MEMORY_METER_AVAILABLE] = host->availableMem;
+
+   if (lhost->zfs.enabled != 0 && !Running_containerized) {
+      // ZFS does not shrink below the value of zfs_arc_min.
+      unsigned long long int shrinkableSize = 0;
+      if (lhost->zfs.size > lhost->zfs.min)
+         shrinkableSize = lhost->zfs.size - lhost->zfs.min;
+      this->values[MEMORY_METER_USED] -= shrinkableSize;
+      this->values[MEMORY_METER_CACHE] += shrinkableSize;
+      this->values[MEMORY_METER_AVAILABLE] += shrinkableSize;
+   }
+
+   if (lhost->zswap.usedZswapOrig > 0 || lhost->zswap.usedZswapComp > 0) {
+      this->values[MEMORY_METER_USED] -= lhost->zswap.usedZswapComp;
+      this->values[MEMORY_METER_COMPRESSED] += lhost->zswap.usedZswapComp;
+   }
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   const LinuxMachine* lhost = (const LinuxMachine*) host;
+
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   this->values[SWAP_METER_CACHE] = host->cachedSwap;
+   this->values[SWAP_METER_FRONTSWAP] = 0; /* frontswap -- memory that is accounted to swap but resides elsewhere */
+
+   if (lhost->zswap.usedZswapOrig > 0 || lhost->zswap.usedZswapComp > 0) {
+      /*
+       * FIXME: Zswapped pages can be both SwapUsed and SwapCached, and we do not know which.
+       *
+       * Apparently, it is possible that Zswapped > SwapUsed. This means that some of Zswapped pages
+       * were actually SwapCached, nor SwapUsed. Unfortunately, we cannot tell what exactly portion
+       * of Zswapped pages were SwapCached.
+       *
+       * For now, subtract Zswapped from SwapUsed and only if Zswapped > SwapUsed, subtract the
+       * overflow from SwapCached.
+       */
+      this->values[SWAP_METER_USED] -= lhost->zswap.usedZswapOrig;
+      if (this->values[SWAP_METER_USED] < 0) {
+         /* subtract the overflow from SwapCached */
+         this->values[SWAP_METER_CACHE] += this->values[SWAP_METER_USED];
+         this->values[SWAP_METER_USED] = 0;
+      }
+      this->values[SWAP_METER_FRONTSWAP] += lhost->zswap.usedZswapOrig;
+   }
+}
+
+void Platform_setZramValues(Meter* this) {
+   const LinuxMachine* lhost = (const LinuxMachine*) this->host;
+
+   this->total = lhost->zram.totalZram;
+   this->values[ZRAM_METER_COMPRESSED] = lhost->zram.usedZramComp;
+   this->values[ZRAM_METER_UNCOMPRESSED] = lhost->zram.usedZramOrig - lhost->zram.usedZramComp;
+}
+
+void Platform_setZfsArcValues(Meter* this) {
+   const LinuxMachine* lhost = (const LinuxMachine*) this->host;
+
+   ZfsArcMeter_readStats(this, &(lhost->zfs));
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   const LinuxMachine* lhost = (const LinuxMachine*) this->host;
+
+   ZfsCompressedArcMeter_readStats(this, &(lhost->zfs));
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   char procname[128];
+   xSnprintf(procname, sizeof(procname), PROCDIR "/%d/environ", pid);
+   FILE* fd = fopen(procname, "r");
+   if (!fd)
+      return NULL;
+
+   char* env = NULL;
+
+   size_t capacity = 0;
+   size_t size = 0;
+   ssize_t bytes = 0;
+
+   do {
+      size += bytes;
+      capacity += 4096;
+      env = xRealloc(env, capacity);
+   } while ((bytes = fread(env + size, 1, capacity - size, fd)) > 0);
+
+   fclose(fd);
+
+   if (bytes < 0) {
+      free(env);
+      return NULL;
+   }
+
+   size += bytes;
+
+   env = xRealloc(env, size + 2);
+
+   env[size] = '\0';
+   env[size + 1] = '\0';
+
+   return env;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   FileLocks_ProcessData* pdata = xCalloc(1, sizeof(FileLocks_ProcessData));
+   DIR* dirp;
+   int dfd;
+
+   char path[PATH_MAX];
+   xSnprintf(path, sizeof(path), PROCDIR "/%d/fdinfo/", pid);
+   if (strlen(path) >= (sizeof(path) - 2))
+      goto err;
+
+   if (!(dirp = opendir(path)))
+      goto err;
+
+   if ((dfd = dirfd(dirp)) == -1) {
+      closedir(dirp);
+      goto err;
+   }
+
+   FileLocks_LockData** data_ref = &pdata->locks;
+   for (struct dirent* de; (de = readdir(dirp)); ) {
+      if (String_eq(de->d_name, ".") || String_eq(de->d_name, ".."))
+         continue;
+
+      errno = 0;
+      char* end = de->d_name;
+      int file = strtoull(de->d_name, &end, 10);
+      if (errno || *end)
+         continue;
+
+      int fd = openat(dfd, de->d_name, O_RDONLY | O_CLOEXEC);
+      if (fd == -1)
+         continue;
+      FILE* f = fdopen(fd, "r");
+      if (!f) {
+         close(fd);
+         continue;
+      }
+
+      for (char buffer[1024]; fgets(buffer, sizeof(buffer), f); ) {
+         if (!strchr(buffer, '\n'))
+            continue;
+
+         if (!String_startsWith(buffer, "lock:\t"))
+            continue;
+
+         FileLocks_Data data = {.fd = file};
+         int _;
+         unsigned int maj, min;
+         char lock_end[25], locktype[32], exclusive[32], readwrite[32];
+         if (10 != sscanf(buffer + strlen("lock:\t"), "%d: %31s %31s %31s %d %x:%x:%"PRIu64" %"PRIu64" %24s",
+            &_, locktype, exclusive, readwrite, &_,
+            &maj, &min, &data.inode,
+            &data.start, lock_end))
+            continue;
+
+         data.locktype = xStrdup(locktype);
+         data.exclusive = xStrdup(exclusive);
+         data.readwrite = xStrdup(readwrite);
+         data.dev = makedev(maj, min);
+
+         if (String_eq(lock_end, "EOF"))
+            data.end = ULLONG_MAX;
+         else
+            data.end = strtoull(lock_end, NULL, 10);
+
+         xSnprintf(path, sizeof(path), PROCDIR "/%d/fd/%s", pid, de->d_name);
+         char link[PATH_MAX];
+         ssize_t link_len;
+         if (strlen(path) < (sizeof(path) - 2) && (link_len = readlink(path, link, sizeof(link))) != -1)
+            data.filename = xStrndup(link, link_len);
+
+         *data_ref = xCalloc(1, sizeof(FileLocks_LockData));
+         (*data_ref)->data = data;
+         data_ref = &(*data_ref)->next;
+      }
+
+      fclose(f);
+   }
+
+   closedir(dirp);
+   return pdata;
+
+err:
+   pdata->error = true;
+   return pdata;
+}
+
+void Platform_getPressureStall(const char* file, bool some, double* ten, double* sixty, double* threehundred) {
+   *ten = *sixty = *threehundred = 0;
+   char procname[128];
+   xSnprintf(procname, sizeof(procname), PROCDIR "/pressure/%s", file);
+   FILE* fd = fopen(procname, "r");
+   if (!fd) {
+      *ten = *sixty = *threehundred = NAN;
+      return;
+   }
+   int total = fscanf(fd, "some avg10=%32lf avg60=%32lf avg300=%32lf total=%*f ", ten, sixty, threehundred);
+   if (!some) {
+      total = fscanf(fd, "full avg10=%32lf avg60=%32lf avg300=%32lf total=%*f ", ten, sixty, threehundred);
+   }
+   (void) total;
+   assert(total == 3);
+   fclose(fd);
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   *used = NAN;
+   *max = 65536;
+
+   FILE* fd = fopen(PROCDIR "/sys/fs/file-nr", "r");
+   if (!fd)
+      return;
+
+   unsigned long long v1, v2, v3;
+   int total = fscanf(fd, "%llu %llu %llu", &v1, &v2, &v3);
+   if (total == 3) {
+      *used = v1;
+      *max = v3;
+   }
+
+   fclose(fd);
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   FILE* fd = fopen(PROCDIR "/diskstats", "r");
+   if (!fd)
+      return false;
+
+   char lastTopDisk[32] = { '\0' };
+
+   unsigned long long int read_sum = 0, write_sum = 0, timeSpend_sum = 0;
+   char lineBuffer[256];
+   while (fgets(lineBuffer, sizeof(lineBuffer), fd)) {
+      char diskname[32];
+      unsigned long long int read_tmp, write_tmp, timeSpend_tmp;
+      if (sscanf(lineBuffer, "%*d %*d %31s %*u %*u %llu %*u %*u %*u %llu %*u %*u %llu", diskname, &read_tmp, &write_tmp, &timeSpend_tmp) == 4) {
+         if (String_startsWith(diskname, "dm-"))
+            continue;
+
+         if (String_startsWith(diskname, "zram"))
+            continue;
+
+         /* only count root disks, e.g. do not count IO from sda and sda1 twice */
+         if (lastTopDisk[0] && String_startsWith(diskname, lastTopDisk))
+            continue;
+
+         /* This assumes disks are listed directly before any of their partitions */
+         String_safeStrncpy(lastTopDisk, diskname, sizeof(lastTopDisk));
+
+         read_sum += read_tmp;
+         write_sum += write_tmp;
+         timeSpend_sum += timeSpend_tmp;
+      }
+   }
+   fclose(fd);
+   /* multiply with sector size */
+   data->totalBytesRead = 512 * read_sum;
+   data->totalBytesWritten = 512 * write_sum;
+   data->totalMsTimeSpend = timeSpend_sum;
+   return true;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   FILE* fd = fopen(PROCDIR "/net/dev", "r");
+   if (!fd)
+      return false;
+
+   memset(data, 0, sizeof(NetworkIOData));
+   char lineBuffer[512];
+   while (fgets(lineBuffer, sizeof(lineBuffer), fd)) {
+      char interfaceName[32];
+      unsigned long long int bytesReceived, packetsReceived, bytesTransmitted, packetsTransmitted;
+      if (sscanf(lineBuffer, "%31s %llu %llu %*u %*u %*u %*u %*u %*u %llu %llu",
+                             interfaceName,
+                             &bytesReceived,
+                             &packetsReceived,
+                             &bytesTransmitted,
+                             &packetsTransmitted) != 5)
+         continue;
+
+      if (String_eq(interfaceName, "lo:"))
+         continue;
+
+      data->bytesReceived += bytesReceived;
+      data->packetsReceived += packetsReceived;
+      data->bytesTransmitted += bytesTransmitted;
+      data->packetsTransmitted += packetsTransmitted;
+   }
+
+   fclose(fd);
+
+   return true;
+}
+
+// Linux battery reading by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
+
+#define PROC_BATTERY_DIR PROCDIR "/acpi/battery"
+#define PROC_POWERSUPPLY_DIR PROCDIR "/acpi/ac_adapter"
+#define PROC_POWERSUPPLY_ACSTATE_FILE PROC_POWERSUPPLY_DIR "/AC/state"
+#define SYS_POWERSUPPLY_DIR "/sys/class/power_supply"
+
+// ----------------------------------------
+// READ FROM /proc
+// ----------------------------------------
+
+static double Platform_Battery_getProcBatInfo(void) {
+   DIR* batteryDir = opendir(PROC_BATTERY_DIR);
+   if (!batteryDir)
+      return NAN;
+
+   uint64_t totalFull = 0;
+   uint64_t totalRemain = 0;
+
+   struct dirent* dirEntry = NULL;
+   while ((dirEntry = readdir(batteryDir))) {
+      const char* entryName = dirEntry->d_name;
+      if (!String_startsWith(entryName, "BAT"))
+         continue;
+
+      char filePath[256];
+      char bufInfo[1024] = {0};
+      xSnprintf(filePath, sizeof(filePath), "%s/%s/info", PROC_BATTERY_DIR, entryName);
+      ssize_t r = xReadfile(filePath, bufInfo, sizeof(bufInfo));
+      if (r < 0)
+         continue;
+
+      char bufState[1024] = {0};
+      xSnprintf(filePath, sizeof(filePath), "%s/%s/state", PROC_BATTERY_DIR, entryName);
+      r = xReadfile(filePath, bufState, sizeof(bufState));
+      if (r < 0)
+         continue;
+
+      const char* line;
+
+      //Getting total charge for all batteries
+      char* buf = bufInfo;
+      while ((line = strsep(&buf, "\n")) != NULL) {
+         char field[100] = {0};
+         int val = 0;
+         if (2 != sscanf(line, "%99[^:]:%d", field, &val))
+            continue;
+
+         if (String_eq(field, "last full capacity")) {
+            totalFull += val;
+            break;
+         }
+      }
+
+      //Getting remaining charge for all batteries
+      buf = bufState;
+      while ((line = strsep(&buf, "\n")) != NULL) {
+         char field[100] = {0};
+         int val = 0;
+         if (2 != sscanf(line, "%99[^:]:%d", field, &val))
+            continue;
+
+         if (String_eq(field, "remaining capacity")) {
+            totalRemain += val;
+            break;
+         }
+      }
+   }
+
+   closedir(batteryDir);
+
+   return totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN;
+}
+
+static ACPresence procAcpiCheck(void) {
+   char buffer[1024] = {0};
+   ssize_t r = xReadfile(PROC_POWERSUPPLY_ACSTATE_FILE, buffer, sizeof(buffer));
+   if (r < 1)
+      return AC_ERROR;
+
+   return String_eq(buffer, "on-line") ? AC_PRESENT : AC_ABSENT;
+}
+
+static void Platform_Battery_getProcData(double* percent, ACPresence* isOnAC) {
+   *isOnAC = procAcpiCheck();
+   *percent = AC_ERROR != *isOnAC ? Platform_Battery_getProcBatInfo() : NAN;
+}
+
+// ----------------------------------------
+// READ FROM /sys
+// ----------------------------------------
+
+static void Platform_Battery_getSysData(double* percent, ACPresence* isOnAC) {
+   *percent = NAN;
+   *isOnAC = AC_ERROR;
+
+   DIR* dir = opendir(SYS_POWERSUPPLY_DIR);
+   if (!dir)
+      return;
+
+   uint64_t totalFull = 0;
+   uint64_t totalRemain = 0;
+
+   const struct dirent* dirEntry;
+   while ((dirEntry = readdir(dir))) {
+      const char* entryName = dirEntry->d_name;
+
+#ifdef HAVE_OPENAT
+      int entryFd = openat(dirfd(dir), entryName, O_DIRECTORY | O_PATH);
+      if (entryFd < 0)
+         continue;
+#else
+      char entryFd[4096];
+      xSnprintf(entryFd, sizeof(entryFd), SYS_POWERSUPPLY_DIR "/%s", entryName);
+#endif
+
+      enum { AC, BAT } type;
+      if (String_startsWith(entryName, "BAT")) {
+         type = BAT;
+      } else if (String_startsWith(entryName, "AC")) {
+         type = AC;
+      } else {
+         char buffer[32];
+         ssize_t ret = xReadfileat(entryFd, "type", buffer, sizeof(buffer));
+         if (ret <= 0)
+            goto next;
+
+         /* drop optional trailing newlines */
+         for (char* buf = &buffer[(size_t)ret - 1]; *buf == '\n'; buf--)
+            *buf = '\0';
+
+         if (String_eq(buffer, "Battery"))
+            type = BAT;
+         else if (String_eq(buffer, "Mains"))
+            type = AC;
+         else
+            goto next;
+      }
+
+      if (type == BAT) {
+         char buffer[1024];
+         ssize_t r = xReadfileat(entryFd, "uevent", buffer, sizeof(buffer));
+         if (r < 0)
+            goto next;
+
+         bool full = false;
+         bool now = false;
+
+         double fullCharge = 0;
+         double capacityLevel = NAN;
+         const char* line;
+
+         char* buf = buffer;
+         while ((line = strsep(&buf, "\n")) != NULL) {
+            char field[100] = {0};
+            int val = 0;
+            if (2 != sscanf(line, "POWER_SUPPLY_%99[^=]=%d", field, &val))
+               continue;
+
+            if (String_eq(field, "CAPACITY")) {
+               capacityLevel = val / 100.0;
+               continue;
+            }
+
+            if (String_eq(field, "ENERGY_FULL") || String_eq(field, "CHARGE_FULL")) {
+               fullCharge = val;
+               totalFull += fullCharge;
+               full = true;
+               if (now)
+                  break;
+               continue;
+            }
+
+            if (String_eq(field, "ENERGY_NOW") || String_eq(field, "CHARGE_NOW")) {
+               totalRemain += val;
+               now = true;
+               if (full)
+                  break;
+               continue;
+            }
+         }
+
+         if (!now && full && isNonnegative(capacityLevel))
+            totalRemain += capacityLevel * fullCharge;
+
+      } else if (type == AC) {
+         if (*isOnAC != AC_ERROR)
+            goto next;
+
+         char buffer[2];
+         ssize_t r = xReadfileat(entryFd, "online", buffer, sizeof(buffer));
+         if (r < 1) {
+            *isOnAC = AC_ERROR;
+            goto next;
+         }
+
+         if (buffer[0] == '0')
+            *isOnAC = AC_ABSENT;
+         else if (buffer[0] == '1')
+            *isOnAC = AC_PRESENT;
+      }
+
+next:
+      Compat_openatArgClose(entryFd);
+   }
+
+   closedir(dir);
+
+   *percent = totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   time_t now = time(NULL);
+   // update battery reading is slow. Update it each 10 seconds only.
+   if (now < Platform_Battery_cacheTime + 10) {
+      *percent = Platform_Battery_cachePercent;
+      *isOnAC = Platform_Battery_cacheIsOnAC;
+      return;
+   }
+
+   if (Platform_Battery_method == BAT_PROC) {
+      Platform_Battery_getProcData(percent, isOnAC);
+      if (!isNonnegative(*percent))
+         Platform_Battery_method = BAT_SYS;
+   }
+   if (Platform_Battery_method == BAT_SYS) {
+      Platform_Battery_getSysData(percent, isOnAC);
+      if (!isNonnegative(*percent))
+         Platform_Battery_method = BAT_ERR;
+   }
+   if (Platform_Battery_method == BAT_ERR) {
+      *percent = NAN;
+      *isOnAC = AC_ERROR;
+   } else {
+      *percent = CLAMP(*percent, 0.0, 100.0);
+   }
+   Platform_Battery_cachePercent = *percent;
+   Platform_Battery_cacheIsOnAC = *isOnAC;
+   Platform_Battery_cacheTime = now;
+}
+
+void Platform_longOptionsUsage(const char* name)
+{
+#ifdef HAVE_LIBCAP
+   printf(
+"   --drop-capabilities[=off|basic|strict] Drop Linux capabilities when running as root\n"
+"                                off - do not drop any capabilities\n"
+"                                basic (default) - drop all capabilities not needed by %s\n"
+"                                strict - drop all capabilities except those needed for\n"
+"                                         core functionality\n", name);
+#else
+   (void) name;
+#endif
+}
+
+CommandLineStatus Platform_getLongOption(int opt, int argc, char** argv) {
+#ifndef HAVE_LIBCAP
+   (void) argc;
+   (void) argv;
+#endif
+
+   switch (opt) {
+#ifdef HAVE_LIBCAP
+      case 160: {
+         const char* mode = optarg;
+         if (!mode && optind < argc && argv[optind] != NULL &&
+             (argv[optind][0] != '\0' && argv[optind][0] != '-')) {
+            mode = argv[optind++];
+         }
+
+         if (!mode || String_eq(mode, "basic")) {
+            Platform_capabilitiesMode = CAP_MODE_BASIC;
+         } else if (String_eq(mode, "off")) {
+            Platform_capabilitiesMode = CAP_MODE_OFF;
+         } else if (String_eq(mode, "strict")) {
+            Platform_capabilitiesMode = CAP_MODE_STRICT;
+         } else {
+            fprintf(stderr, "Error: invalid capabilities mode \"%s\".\n", mode);
+            return STATUS_ERROR_EXIT;
+         }
+         return STATUS_OK;
+      }
+#endif
+
+      default:
+         break;
+   }
+   return STATUS_ERROR_EXIT;
+}
+
+#ifdef HAVE_LIBCAP
+static int dropCapabilities(enum CapMode mode) {
+
+   if (mode == CAP_MODE_OFF)
+      return 0;
+
+   /* capabilities we keep to operate */
+   const cap_value_t keepcapsStrict[] = {
+      CAP_DAC_READ_SEARCH,
+      CAP_SYS_PTRACE,
+   };
+   const cap_value_t keepcapsBasic[] = {
+      CAP_DAC_READ_SEARCH,   /* read non world-readable process files of other users, like /proc/[pid]/io */
+      CAP_KILL,              /* send signals to processes of other users */
+      CAP_SYS_NICE,          /* lower process nice value / change nice value for arbitrary processes */
+      CAP_SYS_PTRACE,        /* read /proc/[pid]/exe */
+#ifdef HAVE_DELAYACCT
+      CAP_NET_ADMIN,         /* communicate over netlink socket for delay accounting */
+#endif
+   };
+   const cap_value_t* const keepcaps = (mode == CAP_MODE_BASIC) ? keepcapsBasic : keepcapsStrict;
+   const size_t ncap = (mode == CAP_MODE_BASIC) ? ARRAYSIZE(keepcapsBasic) : ARRAYSIZE(keepcapsStrict);
+
+   cap_t caps = cap_init();
+   if (caps == NULL) {
+      fprintf(stderr, "Error: can not initialize capabilities: %s\n", strerror(errno));
+      return -1;
+   }
+
+   if (cap_clear(caps) < 0) {
+      fprintf(stderr, "Error: can not clear capabilities: %s\n", strerror(errno));
+      cap_free(caps);
+      return -1;
+   }
+
+   cap_t currCaps = cap_get_proc();
+   if (currCaps == NULL) {
+      fprintf(stderr, "Error: can not get current process capabilities: %s\n", strerror(errno));
+      cap_free(caps);
+      return -1;
+   }
+
+   for (size_t i = 0; i < ncap; i++) {
+      if (!CAP_IS_SUPPORTED(keepcaps[i]))
+         continue;
+
+      cap_flag_value_t current;
+      if (cap_get_flag(currCaps, keepcaps[i], CAP_PERMITTED, &current) < 0) {
+         fprintf(stderr, "Error: can not get current value of capability %d: %s\n", keepcaps[i], strerror(errno));
+         cap_free(currCaps);
+         cap_free(caps);
+         return -1;
+      }
+
+      if (current != CAP_SET)
+         continue;
+
+      if (cap_set_flag(caps, CAP_PERMITTED, 1, &keepcaps[i], CAP_SET) < 0) {
+         fprintf(stderr, "Error: can not set permitted capability %d: %s\n", keepcaps[i], strerror(errno));
+         cap_free(currCaps);
+         cap_free(caps);
+         return -1;
+      }
+
+      if (cap_set_flag(caps, CAP_EFFECTIVE, 1, &keepcaps[i], CAP_SET) < 0) {
+         fprintf(stderr, "Error: can not set effective capability %d: %s\n", keepcaps[i], strerror(errno));
+         cap_free(currCaps);
+         cap_free(caps);
+         return -1;
+      }
+   }
+
+   if (cap_set_proc(caps) < 0) {
+      fprintf(stderr, "Error: can not set process capabilities: %s\n", strerror(errno));
+      cap_free(currCaps);
+      cap_free(caps);
+      return -1;
+   }
+
+   cap_free(currCaps);
+   cap_free(caps);
+
+   return 0;
+}
+#endif
+
+bool Platform_init(void) {
+#ifdef HAVE_LIBCAP
+   if (dropCapabilities(Platform_capabilitiesMode) < 0)
+      return false;
+#endif
+
+   if (access(PROCDIR, R_OK) != 0) {
+      fprintf(stderr, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR);
+      return false;
+   }
+
+#ifdef HAVE_SENSORS_SENSORS_H
+   LibSensors_init();
+#endif
+
+   char target[PATH_MAX];
+   ssize_t ret = readlink(PROCDIR "/self/ns/pid", target, sizeof(target) - 1);
+   if (ret > 0) {
+      target[ret] = '\0';
+
+      if (!String_eq("pid:[4026531836]", target)) { // magic constant PROC_PID_INIT_INO from include/linux/proc_ns.h#L46
+         Running_containerized = true;
+         return true; // early return
+      }
+   }
+
+   FILE* fd = fopen(PROCDIR "/1/mounts", "r");
+   if (fd) {
+      char lineBuffer[256];
+      while (fgets(lineBuffer, sizeof(lineBuffer), fd)) {
+         // detect lxc or overlayfs and guess that this means we are running containerized
+         if (String_startsWith(lineBuffer, "lxcfs /proc") || String_startsWith(lineBuffer, "overlay / overlay")) {
+            Running_containerized = true;
+            break;
+         }
+      }
+      fclose(fd);
+   } // if (fd)
+
+   return true;
+}
+
+void Platform_done(void) {
+#ifdef HAVE_SENSORS_SENSORS_H
+   LibSensors_cleanup();
+#endif
+}
diff --git a/linux/Platform.h b/linux/Platform.h
new file mode 100644
index 0000000..e99d1a2
--- /dev/null
+++ b/linux/Platform.h
@@ -0,0 +1,156 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - linux/Platform.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "Macros.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Panel.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+/* GNU/Hurd does not have PATH_MAX in limits.h */
+#ifndef PATH_MAX
+   #define PATH_MAX 4096
+#endif
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+void Platform_done(void);
+
+extern bool Running_containerized;
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+void Platform_setZramValues(Meter* this);
+
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getPressureStall(const char* file, bool some, double* ten, double* sixty, double* threehundred);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#ifdef HAVE_LIBCAP
+   #define PLATFORM_LONG_OPTIONS \
+      {"drop-capabilities", optional_argument, 0, 160},
+#else
+   #define PLATFORM_LONG_OPTIONS
+#endif
+
+void Platform_longOptionsUsage(const char* name);
+
+CommandLineStatus Platform_getLongOption(int opt, int argc, char** argv);
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c
new file mode 100644
index 0000000..f796247
--- /dev/null
+++ b/linux/PressureStallMeter.c
@@ -0,0 +1,170 @@
+/*
+htop - PressureStallMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2019 Ran Benita
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/PressureStallMeter.h"
+
+#include <stdbool.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Meter.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+static const int PressureStallMeter_attributes[] = {
+   PRESSURE_STALL_TEN,
+   PRESSURE_STALL_SIXTY,
+   PRESSURE_STALL_THREEHUNDRED
+};
+
+static void PressureStallMeter_updateValues(Meter* this) {
+   const char* file;
+   if (strstr(Meter_name(this), "CPU")) {
+      file = "cpu";
+   } else if (strstr(Meter_name(this), "IO")) {
+      file = "io";
+   } else if (strstr(Meter_name(this), "IRQ")) {
+      file = "irq";
+   } else {
+      file = "memory";
+   }
+
+   bool some;
+   if (strstr(Meter_name(this), "Some")) {
+      some = true;
+   } else {
+      some = false;
+   }
+
+   Platform_getPressureStall(file, some, &this->values[0], &this->values[1], &this->values[2]);
+
+   /* only print bar for ten (not sixty and threehundred), cause the sum is meaningless */
+   this->curItems = 1;
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s %s %5.2lf%% %5.2lf%% %5.2lf%%", some ? "some" : "full", file, this->values[0], this->values[1], this->values[2]);
+}
+
+static void PressureStallMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+   char buffer[20];
+   int len;
+
+   len = xSnprintf(buffer, sizeof(buffer), "%5.2lf%% ", this->values[0]);
+   RichString_appendnAscii(out, CRT_colors[PRESSURE_STALL_TEN], buffer, len);
+   len = xSnprintf(buffer, sizeof(buffer), "%5.2lf%% ", this->values[1]);
+   RichString_appendnAscii(out, CRT_colors[PRESSURE_STALL_SIXTY], buffer, len);
+   len = xSnprintf(buffer, sizeof(buffer), "%5.2lf%% ", this->values[2]);
+   RichString_appendnAscii(out, CRT_colors[PRESSURE_STALL_THREEHUNDRED], buffer, len);
+}
+
+const MeterClass PressureStallCPUSomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallCPUSome",
+   .uiName = "PSI some CPU",
+   .caption = "PSI some CPU:    ",
+   .description = "Pressure Stall Information, some cpu"
+};
+
+const MeterClass PressureStallIOSomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallIOSome",
+   .uiName = "PSI some IO",
+   .caption = "PSI some IO:     ",
+   .description = "Pressure Stall Information, some io"
+};
+
+const MeterClass PressureStallIOFullMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallIOFull",
+   .uiName = "PSI full IO",
+   .caption = "PSI full IO:     ",
+   .description = "Pressure Stall Information, full io"
+};
+
+const MeterClass PressureStallIRQFullMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallIRQFull",
+   .uiName = "PSI full IRQ",
+   .caption = "PSI full IRQ:    ",
+   .description = "Pressure Stall Information, full irq"
+};
+
+const MeterClass PressureStallMemorySomeMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallMemorySome",
+   .uiName = "PSI some memory",
+   .caption = "PSI some memory: ",
+   .description = "Pressure Stall Information, some memory"
+};
+
+const MeterClass PressureStallMemoryFullMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = PressureStallMeter_display,
+   },
+   .updateValues = PressureStallMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 3,
+   .total = 100.0,
+   .attributes = PressureStallMeter_attributes,
+   .name = "PressureStallMemoryFull",
+   .uiName = "PSI full memory",
+   .caption = "PSI full memory: ",
+   .description = "Pressure Stall Information, full memory"
+};
diff --git a/linux/PressureStallMeter.h b/linux/PressureStallMeter.h
new file mode 100644
index 0000000..93ebd27
--- /dev/null
+++ b/linux/PressureStallMeter.h
@@ -0,0 +1,28 @@
+/* Do not edit this file. It was automatically generated. */
+
+#ifndef HEADER_PressureStallMeter
+#define HEADER_PressureStallMeter
+/*
+htop - PressureStallMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2019 Ran Benita
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass PressureStallCPUSomeMeter_class;
+
+extern const MeterClass PressureStallIOSomeMeter_class;
+
+extern const MeterClass PressureStallIOFullMeter_class;
+
+extern const MeterClass PressureStallIRQFullMeter_class;
+
+extern const MeterClass PressureStallMemorySomeMeter_class;
+
+extern const MeterClass PressureStallMemoryFullMeter_class;
+
+#endif
diff --git a/linux/ProcessField.h b/linux/ProcessField.h
new file mode 100644
index 0000000..581a982
--- /dev/null
+++ b/linux/ProcessField.h
@@ -0,0 +1,54 @@
+#ifndef HEADER_LinuxProcessField
+#define HEADER_LinuxProcessField
+/*
+htop - linux/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   CMINFLT = 11,                 \
+   CMAJFLT = 13,                 \
+   UTIME = 14,                   \
+   STIME = 15,                   \
+   CUTIME = 16,                  \
+   CSTIME = 17,                  \
+   M_SHARE = 41,                 \
+   M_TRS = 42,                   \
+   M_DRS = 43,                   \
+   M_LRS = 44,                   \
+   CTID = 100,                   \
+   VPID = 101,                   \
+   VXID = 102,                   \
+   RCHAR = 103,                  \
+   WCHAR = 104,                  \
+   SYSCR = 105,                  \
+   SYSCW = 106,                  \
+   RBYTES = 107,                 \
+   WBYTES = 108,                 \
+   CNCLWB = 109,                 \
+   IO_READ_RATE = 110,           \
+   IO_WRITE_RATE = 111,          \
+   IO_RATE = 112,                \
+   CGROUP = 113,                 \
+   OOM = 114,                    \
+   IO_PRIORITY = 115,            \
+   PERCENT_CPU_DELAY = 116,      \
+   PERCENT_IO_DELAY = 117,       \
+   PERCENT_SWAP_DELAY = 118,     \
+   M_PSS = 119,                  \
+   M_SWAP = 120,                 \
+   M_PSSWP = 121,                \
+   CTXT = 122,                   \
+   SECATTR = 123,                \
+   AUTOGROUP_ID = 127,           \
+   AUTOGROUP_NICE = 128,         \
+   CCGROUP = 129,                \
+   CONTAINER = 130,              \
+   M_PRIV = 131,                 \
+   // End of list
+
+
+#endif /* HEADER_LinuxProcessField */
diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c
new file mode 100644
index 0000000..323c2a1
--- /dev/null
+++ b/linux/SELinuxMeter.c
@@ -0,0 +1,95 @@
+/*
+htop - SELinuxMeter.c
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/SELinuxMeter.h"
+
+#include "CRT.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/statfs.h>
+#include <sys/statvfs.h>
+
+#include "Object.h"
+#include "XUtils.h"
+
+
+static const int SELinuxMeter_attributes[] = {
+   METER_TEXT,
+};
+
+static bool enabled = false;
+static bool enforcing = false;
+
+static bool hasSELinuxMount(void) {
+   struct statfs sfbuf;
+   int r = statfs("/sys/fs/selinux", &sfbuf);
+   if (r != 0) {
+      return false;
+   }
+
+   if ((uint32_t)sfbuf.f_type != /* SELINUX_MAGIC */ 0xf97cff8cU) {
+      return false;
+   }
+
+   struct statvfs vfsbuf;
+   r = statvfs("/sys/fs/selinux", &vfsbuf);
+   if (r != 0 || (vfsbuf.f_flag & ST_RDONLY)) {
+      return false;
+   }
+
+   return true;
+}
+
+static bool isSelinuxEnabled(void) {
+   return hasSELinuxMount() && (0 == access("/etc/selinux/config", F_OK));
+}
+
+static bool isSelinuxEnforcing(void) {
+   if (!enabled) {
+      return false;
+   }
+
+   char buf[20];
+   ssize_t r = xReadfile("/sys/fs/selinux/enforce", buf, sizeof(buf));
+   if (r < 0)
+      return false;
+
+   int enforce = 0;
+   if (sscanf(buf, "%d", &enforce) != 1) {
+      return false;
+   }
+
+   return !!enforce;
+}
+
+static void SELinuxMeter_updateValues(Meter* this) {
+   enabled = isSelinuxEnabled();
+   enforcing = isSelinuxEnforcing();
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s%s", enabled ? "enabled" : "disabled", enabled ? (enforcing ? "; mode: enforcing" : "; mode: permissive") : "");
+}
+
+const MeterClass SELinuxMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+   },
+   .updateValues = SELinuxMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = SELinuxMeter_attributes,
+   .name = "SELinux",
+   .uiName = "SELinux",
+   .description = "SELinux state overview",
+   .caption = "SELinux: "
+};
diff --git a/linux/SELinuxMeter.h b/linux/SELinuxMeter.h
new file mode 100644
index 0000000..d8a04db
--- /dev/null
+++ b/linux/SELinuxMeter.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_SELinuxMeter
+#define HEADER_SELinuxMeter
+/*
+htop - SELinuxMeter.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass SELinuxMeter_class;
+
+#endif /* HEADER_SELinuxMeter */
diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c
new file mode 100644
index 0000000..e13c646
--- /dev/null
+++ b/linux/SystemdMeter.c
@@ -0,0 +1,435 @@
+/*
+htop - SystemdMeter.c
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/SystemdMeter.h"
+
+#include <dlfcn.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "RichString.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+#if defined(BUILD_STATIC) && defined(HAVE_LIBSYSTEMD)
+#include <systemd/sd-bus.h>
+#endif
+
+
+#ifdef BUILD_STATIC
+
+#define sym_sd_bus_open_system sd_bus_open_system
+#define sym_sd_bus_get_property_string sd_bus_get_property_string
+#define sym_sd_bus_get_property_trivial sd_bus_get_property_trivial
+#define sym_sd_bus_unref sd_bus_unref
+
+#else
+
+typedef void sd_bus;
+typedef void sd_bus_error;
+static int (*sym_sd_bus_open_system)(sd_bus**);
+static int (*sym_sd_bus_open_user)(sd_bus**);
+static int (*sym_sd_bus_get_property_string)(sd_bus*, const char*, const char*, const char*, const char*, sd_bus_error*, char**);
+static int (*sym_sd_bus_get_property_trivial)(sd_bus*, const char*, const char*, const char*, const char*, sd_bus_error*, char, void*);
+static sd_bus* (*sym_sd_bus_unref)(sd_bus*);
+static void* dlopenHandle = NULL;
+
+#endif /* BUILD_STATIC */
+
+
+#define INVALID_VALUE ((unsigned int)-1)
+
+typedef struct SystemdMeterContext {
+#if !defined(BUILD_STATIC) || defined(HAVE_LIBSYSTEMD)
+   sd_bus* bus;
+#endif /* !BUILD_STATIC || HAVE_LIBSYSTEMD */
+   char* systemState;
+   unsigned int nFailedUnits;
+   unsigned int nInstalledJobs;
+   unsigned int nNames;
+   unsigned int nJobs;
+} SystemdMeterContext_t;
+
+static SystemdMeterContext_t ctx_system;
+static SystemdMeterContext_t ctx_user;
+
+static void SystemdMeter_done(ATTR_UNUSED Meter* this) {
+   SystemdMeterContext_t* ctx = String_eq(Meter_name(this), "SystemdUser") ? &ctx_user : &ctx_system;
+
+   free(ctx->systemState);
+   ctx->systemState = NULL;
+
+#ifdef BUILD_STATIC
+# ifdef HAVE_LIBSYSTEMD
+   if (ctx->bus) {
+      sym_sd_bus_unref(ctx->bus);
+   }
+   ctx->bus = NULL;
+# endif /* HAVE_LIBSYSTEMD */
+#else /* BUILD_STATIC */
+   if (ctx->bus && dlopenHandle) {
+      sym_sd_bus_unref(ctx->bus);
+   }
+   ctx->bus = NULL;
+
+   if (!ctx_system.systemState && !ctx_user.systemState && dlopenHandle) {
+      dlclose(dlopenHandle);
+      dlopenHandle = NULL;
+   }
+#endif /* BUILD_STATIC */
+}
+
+#if !defined(BUILD_STATIC) || defined(HAVE_LIBSYSTEMD)
+static int updateViaLib(bool user) {
+   SystemdMeterContext_t* ctx = user ? &ctx_user : &ctx_system;
+#ifndef BUILD_STATIC
+   if (!dlopenHandle) {
+      dlopenHandle = dlopen("libsystemd.so.0", RTLD_LAZY);
+      if (!dlopenHandle)
+         goto dlfailure;
+
+      /* Clear any errors */
+      dlerror();
+
+      #define resolve(symbolname) do {                                      \
+         *(void **)(&sym_##symbolname) = dlsym(dlopenHandle, #symbolname);  \
+         if (!sym_##symbolname || dlerror() != NULL)                        \
+            goto dlfailure;                                                 \
+      } while(0)
+
+      resolve(sd_bus_open_system);
+      resolve(sd_bus_open_user);
+      resolve(sd_bus_get_property_string);
+      resolve(sd_bus_get_property_trivial);
+      resolve(sd_bus_unref);
+
+      #undef resolve
+   }
+#endif /* !BUILD_STATIC */
+
+   int r;
+   /* Connect to the system bus */
+   if (!ctx->bus) {
+      if (user) {
+         r = sym_sd_bus_open_user(&ctx->bus);
+      } else {
+         r = sym_sd_bus_open_system(&ctx->bus);
+      }
+      if (r < 0)
+         goto busfailure;
+   }
+
+   static const char* const busServiceName = "org.freedesktop.systemd1";
+   static const char* const busObjectPath = "/org/freedesktop/systemd1";
+   static const char* const busInterfaceName = "org.freedesktop.systemd1.Manager";
+
+   r = sym_sd_bus_get_property_string(ctx->bus,
+                                      busServiceName,        /* service to contact */
+                                      busObjectPath,         /* object path */
+                                      busInterfaceName,      /* interface name */
+                                      "SystemState",         /* property name */
+                                      NULL,                  /* object to return error in */
+                                      &ctx->systemState);
+   if (r < 0)
+      goto busfailure;
+
+   r = sym_sd_bus_get_property_trivial(ctx->bus,
+                                       busServiceName,       /* service to contact */
+                                       busObjectPath,        /* object path */
+                                       busInterfaceName,     /* interface name */
+                                       "NFailedUnits",       /* property name */
+                                       NULL,                 /* object to return error in */
+                                       'u',                  /* property type */
+                                       &ctx->nFailedUnits);
+   if (r < 0)
+      goto busfailure;
+
+   r = sym_sd_bus_get_property_trivial(ctx->bus,
+                                       busServiceName,       /* service to contact */
+                                       busObjectPath,        /* object path */
+                                       busInterfaceName,     /* interface name */
+                                       "NInstalledJobs",     /* property name */
+                                       NULL,                 /* object to return error in */
+                                       'u',                  /* property type */
+                                       &ctx->nInstalledJobs);
+   if (r < 0)
+      goto busfailure;
+
+   r = sym_sd_bus_get_property_trivial(ctx->bus,
+                                       busServiceName,       /* service to contact */
+                                       busObjectPath,        /* object path */
+                                       busInterfaceName,     /* interface name */
+                                       "NNames",             /* property name */
+                                       NULL,                 /* object to return error in */
+                                       'u',                  /* property type */
+                                       &ctx->nNames);
+   if (r < 0)
+      goto busfailure;
+
+   r = sym_sd_bus_get_property_trivial(ctx->bus,
+                                       busServiceName,       /* service to contact */
+                                       busObjectPath,        /* object path */
+                                       busInterfaceName,     /* interface name */
+                                       "NJobs",              /* property name */
+                                       NULL,                 /* object to return error in */
+                                       'u',                  /* property type */
+                                       &ctx->nJobs);
+   if (r < 0)
+      goto busfailure;
+
+   /* success */
+   return 0;
+
+busfailure:
+   sym_sd_bus_unref(ctx->bus);
+   ctx->bus = NULL;
+   return -2;
+
+#ifndef BUILD_STATIC
+dlfailure:
+   if (dlopenHandle) {
+      dlclose(dlopenHandle);
+      dlopenHandle = NULL;
+   }
+   return -1;
+#endif /* !BUILD_STATIC */
+}
+#endif /* !BUILD_STATIC || HAVE_LIBSYSTEMD */
+
+static void updateViaExec(bool user) {
+   SystemdMeterContext_t* ctx = user ? &ctx_user : &ctx_system;
+
+   if (Settings_isReadonly())
+      return;
+
+   int fdpair[2];
+   if (pipe(fdpair) < 0)
+      return;
+
+   pid_t child = fork();
+   if (child < 0) {
+      close(fdpair[1]);
+      close(fdpair[0]);
+      return;
+   }
+
+   if (child == 0) {
+      close(fdpair[0]);
+      dup2(fdpair[1], STDOUT_FILENO);
+      close(fdpair[1]);
+      int fdnull = open("/dev/null", O_WRONLY);
+      if (fdnull < 0)
+         exit(1);
+      dup2(fdnull, STDERR_FILENO);
+      close(fdnull);
+      // Use of NULL in variadic functions must have a pointer cast.
+      // The NULL constant is not required by standard to have a pointer type.
+      execlp(
+         "systemctl",
+         "systemctl",
+         "show",
+         user ? "--user" : "--system",
+         "--property=SystemState",
+         "--property=NFailedUnits",
+         "--property=NNames",
+         "--property=NJobs",
+         "--property=NInstalledJobs",
+         (char*)NULL);
+      exit(127);
+   }
+   close(fdpair[1]);
+
+   int wstatus;
+   if (waitpid(child, &wstatus, 0) < 0 || !WIFEXITED(wstatus) || WEXITSTATUS(wstatus) != 0) {
+      close(fdpair[0]);
+      return;
+   }
+
+   FILE* commandOutput = fdopen(fdpair[0], "r");
+   if (!commandOutput) {
+      close(fdpair[0]);
+      return;
+   }
+
+   char lineBuffer[128];
+   while (fgets(lineBuffer, sizeof(lineBuffer), commandOutput)) {
+      if (String_startsWith(lineBuffer, "SystemState=")) {
+         char* newline = strchr(lineBuffer + strlen("SystemState="), '\n');
+         if (newline) {
+            *newline = '\0';
+         }
+         free_and_xStrdup(&ctx->systemState, lineBuffer + strlen("SystemState="));
+      } else if (String_startsWith(lineBuffer, "NFailedUnits=")) {
+         ctx->nFailedUnits = strtoul(lineBuffer + strlen("NFailedUnits="), NULL, 10);
+      } else if (String_startsWith(lineBuffer, "NNames=")) {
+         ctx->nNames = strtoul(lineBuffer + strlen("NNames="), NULL, 10);
+      } else if (String_startsWith(lineBuffer, "NJobs=")) {
+         ctx->nJobs = strtoul(lineBuffer + strlen("NJobs="), NULL, 10);
+      } else if (String_startsWith(lineBuffer, "NInstalledJobs=")) {
+         ctx->nInstalledJobs = strtoul(lineBuffer + strlen("NInstalledJobs="), NULL, 10);
+      }
+   }
+
+   fclose(commandOutput);
+}
+
+static void SystemdMeter_updateValues(Meter* this) {
+   bool user = String_eq(Meter_name(this), "SystemdUser");
+   SystemdMeterContext_t* ctx = user ? &ctx_user : &ctx_system;
+
+   free(ctx->systemState);
+   ctx->systemState = NULL;
+   ctx->nFailedUnits = ctx->nInstalledJobs = ctx->nNames = ctx->nJobs = INVALID_VALUE;
+
+#if !defined(BUILD_STATIC) || defined(HAVE_LIBSYSTEMD)
+   if (updateViaLib(user) < 0)
+      updateViaExec(user);
+#else
+   updateViaExec(user);
+#endif /* !BUILD_STATIC || HAVE_LIBSYSTEMD */
+
+   xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s", ctx->systemState ? ctx->systemState : "???");
+}
+
+static int zeroDigitColor(unsigned int value) {
+   switch (value) {
+      case 0:
+         return CRT_colors[METER_VALUE];
+      case INVALID_VALUE:
+         return CRT_colors[METER_VALUE_ERROR];
+      default:
+         return CRT_colors[METER_VALUE_NOTICE];
+   }
+}
+
+static int valueDigitColor(unsigned int value) {
+   switch (value) {
+      case 0:
+         return CRT_colors[METER_VALUE_NOTICE];
+      case INVALID_VALUE:
+         return CRT_colors[METER_VALUE_ERROR];
+      default:
+         return CRT_colors[METER_VALUE];
+   }
+}
+
+
+static void _SystemdMeter_display(ATTR_UNUSED const Object* cast, RichString* out, SystemdMeterContext_t* ctx) {
+   char buffer[16];
+   int len;
+   int color = METER_VALUE_ERROR;
+
+   if (ctx->systemState) {
+      color = String_eq(ctx->systemState, "running") ? METER_VALUE_OK :
+              String_eq(ctx->systemState, "degraded") ? METER_VALUE_ERROR : METER_VALUE_WARN;
+   }
+   RichString_writeAscii(out, CRT_colors[color], ctx->systemState ? ctx->systemState : "N/A");
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " (");
+
+   if (ctx->nFailedUnits == INVALID_VALUE) {
+      buffer[0] = '?';
+      buffer[1] = '\0';
+      len = 1;
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%u", ctx->nFailedUnits);
+   }
+   RichString_appendnAscii(out, zeroDigitColor(ctx->nFailedUnits), buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], "/");
+
+   if (ctx->nNames == INVALID_VALUE) {
+      buffer[0] = '?';
+      buffer[1] = '\0';
+      len = 1;
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%u", ctx->nNames);
+   }
+   RichString_appendnAscii(out, valueDigitColor(ctx->nNames), buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " failed) (");
+
+   if (ctx->nJobs == INVALID_VALUE) {
+      buffer[0] = '?';
+      buffer[1] = '\0';
+      len = 1;
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%u", ctx->nJobs);
+   }
+   RichString_appendnAscii(out, zeroDigitColor(ctx->nJobs), buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], "/");
+
+   if (ctx->nInstalledJobs == INVALID_VALUE) {
+      buffer[0] = '?';
+      buffer[1] = '\0';
+      len = 1;
+   } else {
+      len = xSnprintf(buffer, sizeof(buffer), "%u", ctx->nInstalledJobs);
+   }
+   RichString_appendnAscii(out, valueDigitColor(ctx->nInstalledJobs), buffer, len);
+
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " jobs)");
+}
+
+static void SystemdMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   _SystemdMeter_display(cast, out, &ctx_system);
+}
+
+static void SystemdUserMeter_display(ATTR_UNUSED const Object* cast, RichString* out) {
+   _SystemdMeter_display(cast, out, &ctx_user);
+}
+
+static const int SystemdMeter_attributes[] = {
+   METER_VALUE
+};
+
+const MeterClass SystemdMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = SystemdMeter_display
+   },
+   .updateValues = SystemdMeter_updateValues,
+   .done = SystemdMeter_done,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = SystemdMeter_attributes,
+   .name = "Systemd",
+   .uiName = "Systemd state",
+   .description = "Systemd system state and unit overview",
+   .caption = "Systemd: ",
+};
+
+const MeterClass SystemdUserMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = SystemdUserMeter_display
+   },
+   .updateValues = SystemdMeter_updateValues,
+   .done = SystemdMeter_done,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 0,
+   .total = 100.0,
+   .attributes = SystemdMeter_attributes,
+   .name = "SystemdUser",
+   .uiName = "Systemd user state",
+   .description = "Systemd user state and unit overview",
+   .caption = "Systemd User: ",
+};
diff --git a/linux/SystemdMeter.h b/linux/SystemdMeter.h
new file mode 100644
index 0000000..50a793b
--- /dev/null
+++ b/linux/SystemdMeter.h
@@ -0,0 +1,18 @@
+#ifndef HEADER_SystemdMeter
+#define HEADER_SystemdMeter
+
+/*
+htop - SystemdMeter.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+
+extern const MeterClass SystemdMeter_class;
+
+extern const MeterClass SystemdUserMeter_class;
+
+#endif /* HEADER_SystemdMeter */
diff --git a/linux/ZramMeter.c b/linux/ZramMeter.c
new file mode 100644
index 0000000..8329f01
--- /dev/null
+++ b/linux/ZramMeter.c
@@ -0,0 +1,84 @@
+/*
+htop - linux/ZramMeter.c
+(C) 2020 Murloc Knight
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "linux/ZramMeter.h"
+
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Meter.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "ZramMeter.h"
+
+
+static const int ZramMeter_attributes[ZRAM_METER_ITEMCOUNT] = {
+   [ZRAM_METER_COMPRESSED] = ZRAM_COMPRESSED,
+   [ZRAM_METER_UNCOMPRESSED] = ZRAM_UNCOMPRESSED,
+};
+
+static void ZramMeter_updateValues(Meter* this) {
+   char* buffer = this->txtBuffer;
+   size_t size = sizeof(this->txtBuffer);
+   int written;
+
+   Platform_setZramValues(this);
+
+   written = Meter_humanUnit(buffer, this->values[ZRAM_METER_COMPRESSED], size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '(');
+
+   double uncompressed = this->values[ZRAM_METER_COMPRESSED] + this->values[ZRAM_METER_UNCOMPRESSED];
+   written = Meter_humanUnit(buffer, uncompressed, size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, ')');
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '/');
+
+   Meter_humanUnit(buffer, this->total, size);
+}
+
+static void ZramMeter_display(const Object* cast, RichString* out) {
+   char buffer[50];
+   const Meter* this = (const Meter*)cast;
+
+   RichString_writeAscii(out, CRT_colors[METER_TEXT], ":");
+
+   Meter_humanUnit(buffer, this->total, sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+
+   Meter_humanUnit(buffer, this->values[ZRAM_METER_COMPRESSED], sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " used:");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+
+   double uncompressed = this->values[ZRAM_METER_COMPRESSED] + this->values[ZRAM_METER_UNCOMPRESSED];
+   Meter_humanUnit(buffer, uncompressed, sizeof(buffer));
+   RichString_appendAscii(out, CRT_colors[METER_TEXT], " uncompressed:");
+   RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+}
+
+const MeterClass ZramMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = ZramMeter_display,
+   },
+   .updateValues = ZramMeter_updateValues,
+   .defaultMode = BAR_METERMODE,
+   .maxItems = ZRAM_METER_ITEMCOUNT,
+   .total = 100.0,
+   .attributes = ZramMeter_attributes,
+   .name = "Zram",
+   .uiName = "Zram",
+   .caption = "zrm"
+};
diff --git a/linux/ZramMeter.h b/linux/ZramMeter.h
new file mode 100644
index 0000000..14a5215
--- /dev/null
+++ b/linux/ZramMeter.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_ZramMeter
+#define HEADER_ZramMeter
+/*
+htop - linux/ZramMeter.h
+(C) 2020 Murloc Knight
+(C) 2020-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Meter.h"
+
+typedef enum {
+   ZRAM_METER_COMPRESSED = 0,
+   ZRAM_METER_UNCOMPRESSED = 1,
+   ZRAM_METER_ITEMCOUNT = 2, // number of entries in this enum
+} ZramMeterValues;
+
+extern const MeterClass ZramMeter_class;
+
+#endif
diff --git a/linux/ZramStats.h b/linux/ZramStats.h
new file mode 100644
index 0000000..f71a6c2
--- /dev/null
+++ b/linux/ZramStats.h
@@ -0,0 +1,18 @@
+#ifndef HEADER_ZramStats
+#define HEADER_ZramStats
+/*
+htop - ZramStats.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProcessTable.h"
+
+typedef struct ZramStats_ {
+   memory_t totalZram;
+   memory_t usedZramComp;
+   memory_t usedZramOrig;
+} ZramStats;
+
+#endif
diff --git a/linux/ZswapStats.h b/linux/ZswapStats.h
new file mode 100644
index 0000000..29e516f
--- /dev/null
+++ b/linux/ZswapStats.h
@@ -0,0 +1,19 @@
+#ifndef HEADER_ZswapStats
+#define HEADER_ZswapStats
+/*
+htop - ZswapStats.h
+(C) 2022 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProcessTable.h"
+
+typedef struct ZswapStats_ {
+   /* amount of RAM used by the zswap pool */
+   memory_t usedZswapComp;
+   /* amount of data stored inside the zswap pool */
+   memory_t usedZswapOrig;
+} ZswapStats;
+
+#endif
diff --git a/netbsd/NetBSDMachine.c b/netbsd/NetBSDMachine.c
new file mode 100644
index 0000000..79c50c1
--- /dev/null
+++ b/netbsd/NetBSDMachine.c
@@ -0,0 +1,285 @@
+/*
+htop - NetBSDMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "netbsd/NetBSDMachine.h"
+
+#include <kvm.h>
+#include <math.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/swap.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <uvm/uvm_extern.h>
+
+#include "CRT.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static const struct {
+   const char* name;
+   long int scale;
+} freqSysctls[] = {
+   { "machdep.est.frequency.current",            1 },
+   { "machdep.powernow.frequency.current",       1 },
+   { "machdep.intrepid.frequency.current",       1 },
+   { "machdep.loongson.frequency.current",       1 },
+   { "machdep.cpu.frequency.current",            1 },
+   { "machdep.frequency.current",                1 },
+   { "machdep.tsc_freq",                   1000000 },
+};
+
+static void NetBSDMachine_updateCPUcount(NetBSDMachine* this) {
+   Machine* super = &this->super;
+
+   // Definitions for sysctl(3), cf. https://nxr.netbsd.org/xref/src/sys/sys/sysctl.h#813
+   const int mib_ncpu_existing[] = { CTL_HW, HW_NCPU }; // Number of existing CPUs
+   const int mib_ncpu_online[] = { CTL_HW, HW_NCPUONLINE }; // Number of online/active CPUs
+
+   int r;
+   unsigned int value;
+   size_t size;
+
+   bool change = false;
+
+   // Query the number of active/online CPUs.
+   size = sizeof(value);
+   r = sysctl(mib_ncpu_online, 2, &value, &size, NULL, 0);
+   if (r < 0 || value < 1) {
+      value = 1;
+   }
+
+   if (value != super->activeCPUs) {
+      super->activeCPUs = value;
+      change = true;
+   }
+
+   // Query the total number of CPUs.
+   size = sizeof(value);
+   r = sysctl(mib_ncpu_existing, 2, &value, &size, NULL, 0);
+   if (r < 0 || value < 1) {
+      value = super->activeCPUs;
+   }
+
+   if (value != super->existingCPUs) {
+      this->cpuData = xReallocArray(this->cpuData, value + 1, sizeof(CPUData));
+      super->existingCPUs = value;
+      change = true;
+   }
+
+   // Reset CPU stats when number of online/existing CPU cores changed
+   if (change) {
+      CPUData* dAvg = &this->cpuData[0];
+      memset(dAvg, '\0', sizeof(CPUData));
+      dAvg->totalTime = 1;
+      dAvg->totalPeriod = 1;
+
+      for (unsigned int i = 0; i < super->existingCPUs; i++) {
+         CPUData* d = &this->cpuData[i + 1];
+         memset(d, '\0', sizeof(CPUData));
+         d->totalTime = 1;
+         d->totalPeriod = 1;
+      }
+   }
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   const int fmib[] = { CTL_KERN, KERN_FSCALE };
+   size_t size;
+   char errbuf[_POSIX2_LINE_MAX];
+
+   NetBSDMachine* this = xCalloc(1, sizeof(NetBSDMachine));
+   Machine* super = &this->super;
+   Machine_init(super, usersTable, userId);
+
+   NetBSDMachine_updateCPUcount(this);
+
+   size = sizeof(this->fscale);
+   if (sysctl(fmib, 2, &this->fscale, &size, NULL, 0) < 0 || this->fscale <= 0) {
+      CRT_fatalError("fscale sysctl call failed");
+   }
+
+   if ((this->pageSize = sysconf(_SC_PAGESIZE)) == -1)
+      CRT_fatalError("pagesize sysconf call failed");
+   this->pageSizeKB = this->pageSize / ONE_K;
+
+   this->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
+   if (this->kd == NULL) {
+      CRT_fatalError("kvm_openfiles() failed");
+   }
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   NetBSDMachine* this = (NetBSDMachine*) super;
+
+   Machine_done(super);
+
+   if (this->kd) {
+      kvm_close(this->kd);
+   }
+   free(this->cpuData);
+   free(this);
+}
+
+static void NetBSDMachine_scanMemoryInfo(NetBSDMachine* this) {
+   Machine* super = &this->super;
+
+   static int uvmexp_mib[] = {CTL_VM, VM_UVMEXP2};
+   struct uvmexp_sysctl uvmexp;
+   size_t size_uvmexp = sizeof(uvmexp);
+
+   if (sysctl(uvmexp_mib, 2, &uvmexp, &size_uvmexp, NULL, 0) < 0) {
+      CRT_fatalError("uvmexp sysctl call failed");
+   }
+
+   super->totalMem = uvmexp.npages * this->pageSizeKB;
+   super->buffersMem = 0;
+   super->cachedMem = (uvmexp.filepages + uvmexp.execpages) * this->pageSizeKB;
+   super->usedMem = (uvmexp.active + uvmexp.wired) * this->pageSizeKB;
+   super->totalSwap = uvmexp.swpages * this->pageSizeKB;
+   super->usedSwap = uvmexp.swpginuse * this->pageSizeKB;
+}
+
+static void getKernelCPUTimes(int cpuId, u_int64_t* times) {
+   const int mib[] = { CTL_KERN, KERN_CP_TIME, cpuId };
+   size_t length = sizeof(*times) * CPUSTATES;
+   if (sysctl(mib, 3, times, &length, NULL, 0) == -1 || length != sizeof(*times) * CPUSTATES) {
+      CRT_fatalError("sysctl kern.cp_time2 failed");
+   }
+}
+
+static void kernelCPUTimesToHtop(const u_int64_t* times, CPUData* cpu) {
+   unsigned long long totalTime = 0;
+   for (int i = 0; i < CPUSTATES; i++) {
+      totalTime += times[i];
+   }
+
+   unsigned long long sysAllTime = times[CP_INTR] + times[CP_SYS];
+
+   cpu->totalPeriod = saturatingSub(totalTime, cpu->totalTime);
+   cpu->userPeriod = saturatingSub(times[CP_USER], cpu->userTime);
+   cpu->nicePeriod = saturatingSub(times[CP_NICE], cpu->niceTime);
+   cpu->sysPeriod = saturatingSub(times[CP_SYS], cpu->sysTime);
+   cpu->sysAllPeriod = saturatingSub(sysAllTime, cpu->sysAllTime);
+   cpu->intrPeriod = saturatingSub(times[CP_INTR], cpu->intrTime);
+   cpu->idlePeriod = saturatingSub(times[CP_IDLE], cpu->idleTime);
+
+   cpu->totalTime = totalTime;
+   cpu->userTime = times[CP_USER];
+   cpu->niceTime = times[CP_NICE];
+   cpu->sysTime = times[CP_SYS];
+   cpu->sysAllTime = sysAllTime;
+   cpu->intrTime = times[CP_INTR];
+   cpu->idleTime = times[CP_IDLE];
+}
+
+static void NetBSDMachine_scanCPUTime(NetBSDMachine* this) {
+   const Machine* super = &this->super;
+
+   u_int64_t kernelTimes[CPUSTATES] = {0};
+   u_int64_t avg[CPUSTATES] = {0};
+
+   for (unsigned int i = 0; i < super->existingCPUs; i++) {
+      getKernelCPUTimes(i, kernelTimes);
+      CPUData* cpu = &this->cpuData[i + 1];
+      kernelCPUTimesToHtop(kernelTimes, cpu);
+
+      avg[CP_USER] += cpu->userTime;
+      avg[CP_NICE] += cpu->niceTime;
+      avg[CP_SYS] += cpu->sysTime;
+      avg[CP_INTR] += cpu->intrTime;
+      avg[CP_IDLE] += cpu->idleTime;
+   }
+
+   for (int i = 0; i < CPUSTATES; i++) {
+      avg[i] /= super->activeCPUs;
+   }
+
+   kernelCPUTimesToHtop(avg, &this->cpuData[0]);
+}
+
+static void NetBSDMachine_scanCPUFrequency(NetBSDMachine* this) {
+   const Machine* super = &this->super;
+   unsigned int cpus = super->existingCPUs;
+   bool match = false;
+   char name[64];
+   long int freq = 0;
+   size_t freqSize;
+
+   for (unsigned int i = 0; i < cpus; i++) {
+      this->cpuData[i + 1].frequency = NAN;
+   }
+
+   /* newer hardware supports per-core frequency, for e.g. ARM big.LITTLE */
+   for (unsigned int i = 0; i < cpus; i++) {
+      xSnprintf(name, sizeof(name), "machdep.cpufreq.cpu%u.current", i);
+      freqSize = sizeof(freq);
+      if (sysctlbyname(name, &freq, &freqSize, NULL, 0) != -1) {
+         this->cpuData[i + 1].frequency = freq; /* already in MHz */
+         match = true;
+      }
+   }
+
+   if (match) {
+      return;
+   }
+
+   /*
+    * Iterate through legacy sysctl nodes for single-core frequency until
+    * we find a match...
+    */
+   for (size_t i = 0; i < ARRAYSIZE(freqSysctls); i++) {
+      freqSize = sizeof(freq);
+      if (sysctlbyname(freqSysctls[i].name, &freq, &freqSize, NULL, 0) != -1) {
+         freq /= freqSysctls[i].scale; /* scale to MHz */
+         match = true;
+         break;
+      }
+   }
+
+   if (match) {
+      for (unsigned int i = 0; i < cpus; i++) {
+         this->cpuData[i + 1].frequency = freq;
+      }
+   }
+}
+
+void Machine_scan(Machine* super) {
+   NetBSDMachine* this = (NetBSDMachine*) super;
+
+   NetBSDMachine_scanMemoryInfo(this);
+   NetBSDMachine_scanCPUTime(this);
+
+   if (super->settings->showCPUFrequency) {
+      NetBSDMachine_scanCPUFrequency(this);
+   }
+}
+
+bool Machine_isCPUonline(const Machine* host, unsigned int id) {
+   assert(id < host->existingCPUs);
+   (void)host; (void)id;
+
+   // TODO: Support detecting online / offline CPUs.
+   return true;
+}
diff --git a/netbsd/NetBSDMachine.h b/netbsd/NetBSDMachine.h
new file mode 100644
index 0000000..9d3aa0b
--- /dev/null
+++ b/netbsd/NetBSDMachine.h
@@ -0,0 +1,54 @@
+#ifndef HEADER_NetBSDMachine
+#define HEADER_NetBSDMachine
+/*
+htop - NetBSDMachine.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kvm.h>
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Machine.h"
+#include "ProcessTable.h"
+
+
+typedef struct CPUData_ {
+   unsigned long long int totalTime;
+   unsigned long long int userTime;
+   unsigned long long int niceTime;
+   unsigned long long int sysTime;
+   unsigned long long int sysAllTime;
+   unsigned long long int spinTime;
+   unsigned long long int intrTime;
+   unsigned long long int idleTime;
+
+   unsigned long long int totalPeriod;
+   unsigned long long int userPeriod;
+   unsigned long long int nicePeriod;
+   unsigned long long int sysPeriod;
+   unsigned long long int sysAllPeriod;
+   unsigned long long int spinPeriod;
+   unsigned long long int intrPeriod;
+   unsigned long long int idlePeriod;
+
+   double frequency;
+} CPUData;
+
+typedef struct NetBSDMachine_ {
+   Machine super;
+   kvm_t* kd;
+
+   long fscale;
+   int pageSize;
+   int pageSizeKB;
+
+   CPUData* cpuData;
+} NetBSDMachine;
+
+#endif
diff --git a/netbsd/NetBSDProcess.c b/netbsd/NetBSDProcess.c
new file mode 100644
index 0000000..f58cdf2
--- /dev/null
+++ b/netbsd/NetBSDProcess.c
@@ -0,0 +1,277 @@
+/*
+htop - NetBSDProcess.c
+(C) 2015 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "netbsd/NetBSDProcess.h"
+
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Process.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = {
+      .name = "",
+      .title = NULL,
+      .description = NULL,
+      .flags = 0,
+   },
+   [PID] = {
+      .name = "PID",
+      .title = "PID",
+      .description = "Process/thread ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [COMM] = {
+      .name = "Command",
+      .title = "Command ",
+      .description = "Command line",
+      .flags = 0,
+   },
+   [STATE] = {
+      .name = "STATE",
+      .title = "S ",
+      .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)",
+      .flags = 0,
+   },
+   [PPID] = {
+      .name = "PPID",
+      .title = "PPID",
+      .description = "Parent process ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [PGRP] = {
+      .name = "PGRP",
+      .title = "PGRP",
+      .description = "Process group ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [SESSION] = {
+      .name = "SESSION",
+      .title = "SESN",
+      .description = "Process's session ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [TTY] = {
+      .name = "TTY",
+      .title = "TTY      ",
+      .description = "Controlling terminal",
+      .flags = 0,
+   },
+   [TPGID] = {
+      .name = "TPGID",
+      .title = "TPGID",
+      .description = "Process ID of the fg process group of the controlling terminal",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [MINFLT] = {
+      .name = "MINFLT",
+      .title = "     MINFLT ",
+      .description = "Number of minor faults which have not required loading a memory page from disk",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [MAJFLT] = {
+      .name = "MAJFLT",
+      .title = "     MAJFLT ",
+      .description = "Number of major faults which have required loading a memory page from disk",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [PRIORITY] = {
+      .name = "PRIORITY",
+      .title = "PRI ",
+      .description = "Kernel's internal priority for the process",
+      .flags = 0,
+   },
+   [NICE] = {
+      .name = "NICE",
+      .title = " NI ",
+      .description = "Nice value (the higher the value, the more it lets other processes take priority)",
+      .flags = 0,
+   },
+   [STARTTIME] = {
+      .name = "STARTTIME",
+      .title = "START ",
+      .description = "Time the process was started",
+      .flags = 0,
+   },
+   [ELAPSED] = {
+      .name = "ELAPSED",
+      .title = "ELAPSED  ",
+      .description = "Time since the process was started",
+      .flags = 0,
+   },
+   [PROCESSOR] = {
+      .name = "PROCESSOR",
+      .title = "CPU ",
+      .description = "Id of the CPU the process last executed on",
+      .flags = 0,
+   },
+   [M_VIRT] = {
+      .name = "M_VIRT",
+      .title = " VIRT ",
+      .description = "Total program size in virtual memory",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [M_RESIDENT] = {
+      .name = "M_RESIDENT",
+      .title = "  RES ",
+      .description = "Resident set size, size of the text and data sections, plus stack usage",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [ST_UID] = {
+      .name = "ST_UID",
+      .title = "UID",
+      .description = "User ID of the process owner",
+      .flags = 0,
+   },
+   [PERCENT_CPU] = {
+      .name = "PERCENT_CPU",
+      .title = " CPU%",
+      .description = "Percentage of the CPU time the process used in the last sampling",
+      .flags = 0,
+      .defaultSortDesc = true,
+      .autoWidth = true,
+   },
+   [PERCENT_NORM_CPU] = {
+      .name = "PERCENT_NORM_CPU",
+      .title = "NCPU%",
+      .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)",
+      .flags = 0,
+      .defaultSortDesc = true,
+      .autoWidth = true,
+   },
+   [PERCENT_MEM] = {
+      .name = "PERCENT_MEM",
+      .title = "MEM% ",
+      .description = "Percentage of the memory the process is using, based on resident memory size",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [USER] = {
+      .name = "USER",
+      .title = "USER       ",
+      .description = "Username of the process owner (or user ID if name cannot be determined)",
+      .flags = 0,
+   },
+   [TIME] = {
+      .name = "TIME",
+      .title = "  TIME+  ",
+      .description = "Total time the process has spent in user and system time",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [NLWP] = {
+      .name = "NLWP",
+      .title = "NLWP ",
+      .description = "Number of threads in the process",
+      .flags = 0,
+   },
+   [TGID] = {
+      .name = "TGID",
+      .title = "TGID",
+      .description = "Thread group ID (i.e. process ID)",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [PROC_COMM] = {
+      .name = "COMM",
+      .title = "COMM            ",
+      .description = "comm string of the process",
+      .flags = 0,
+   },
+   [PROC_EXE] = {
+      .name = "EXE",
+      .title = "EXE             ",
+      .description = "Basename of exe of the process",
+      .flags = 0,
+   },
+   [CWD] = {
+      .name = "CWD",
+      .title = "CWD                       ",
+      .description = "The current working directory of the process",
+      .flags = PROCESS_FLAG_CWD,
+   },
+
+};
+
+Process* NetBSDProcess_new(const Machine* host) {
+   NetBSDProcess* this = xCalloc(1, sizeof(NetBSDProcess));
+   Object_setClass(this, Class(NetBSDProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   NetBSDProcess* this = (NetBSDProcess*) cast;
+   Process_done((Process*)cast);
+   free(this);
+}
+
+static void NetBSDProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const NetBSDProcess* np = (const NetBSDProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   //size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add NetBSD-specific fields here
+   default:
+      Process_writeField(&np->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int NetBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const NetBSDProcess* p1 = (const NetBSDProcess*)v1;
+   const NetBSDProcess* p2 = (const NetBSDProcess*)v2;
+
+   // remove if actually used
+   (void)p1; (void)p2;
+
+   switch (key) {
+   // add NetBSD-specific fields here
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass NetBSDProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = NetBSDProcess_rowWriteField
+   },
+   .compareByKey = NetBSDProcess_compareByKey
+};
diff --git a/netbsd/NetBSDProcess.h b/netbsd/NetBSDProcess.h
new file mode 100644
index 0000000..1c068a4
--- /dev/null
+++ b/netbsd/NetBSDProcess.h
@@ -0,0 +1,32 @@
+#ifndef HEADER_NetBSDProcess
+#define HEADER_NetBSDProcess
+/*
+htop - NetBSDProcess.h
+(C) 2015 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Machine.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct NetBSDProcess_ {
+   Process super;
+} NetBSDProcess;
+
+extern const ProcessClass NetBSDProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* NetBSDProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+#endif
diff --git a/netbsd/NetBSDProcessTable.c b/netbsd/NetBSDProcessTable.c
new file mode 100644
index 0000000..71ae53e
--- /dev/null
+++ b/netbsd/NetBSDProcessTable.c
@@ -0,0 +1,273 @@
+/*
+htop - NetBSDProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "netbsd/NetBSDProcessTable.h"
+
+#include <kvm.h>
+#include <math.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <uvm/uvm_extern.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Process.h"
+#include "ProcessTable.h"
+#include "Settings.h"
+#include "XUtils.h"
+#include "netbsd/NetBSDMachine.h"
+#include "netbsd/NetBSDProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   NetBSDProcessTable* this = xCalloc(1, sizeof(NetBSDProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = (ProcessTable*) this;
+   ProcessTable_init(super, Class(NetBSDProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   NetBSDProcessTable* this = (NetBSDProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+static void NetBSDProcessTable_updateExe(const struct kinfo_proc2* kproc, Process* proc) {
+   const int mib[] = { CTL_KERN, KERN_PROC_ARGS, kproc->p_pid, KERN_PROC_PATHNAME };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+      Process_updateExe(proc, NULL);
+      return;
+   }
+
+   /* Kernel threads return an empty buffer */
+   if (buffer[0] == '\0') {
+      Process_updateExe(proc, NULL);
+      return;
+   }
+
+   Process_updateExe(proc, buffer);
+}
+
+static void NetBSDProcessTable_updateCwd(const struct kinfo_proc2* kproc, Process* proc) {
+   const int mib[] = { CTL_KERN, KERN_PROC_ARGS, kproc->p_pid, KERN_PROC_CWD };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 4, buffer, &size, NULL, 0) != 0) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   /* Kernel threads return an empty buffer */
+   if (buffer[0] == '\0') {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   free_and_xStrdup(&proc->procCwd, buffer);
+}
+
+static void NetBSDProcessTable_updateProcessName(kvm_t* kd, const struct kinfo_proc2* kproc, Process* proc) {
+   Process_updateComm(proc, kproc->p_comm);
+
+   /*
+    * Like NetBSD's top(1), we try to fall back to the command name
+    * (argv[0]) if we fail to construct the full command.
+    */
+   char** arg = kvm_getargv2(kd, kproc, 500);
+   if (arg == NULL || *arg == NULL) {
+      Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
+      return;
+   }
+
+   size_t len = 0;
+   for (int i = 0; arg[i] != NULL; i++) {
+      len += strlen(arg[i]) + 1;   /* room for arg and trailing space or NUL */
+   }
+
+   /* don't use xMalloc here - we want to handle huge argv's gracefully */
+   char* s;
+   if ((s = malloc(len)) == NULL) {
+      Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
+      return;
+   }
+
+   *s = '\0';
+
+   int start = 0;
+   int end = 0;
+   for (int i = 0; arg[i] != NULL; i++) {
+      size_t n = strlcat(s, arg[i], len);
+      if (i == 0) {
+         end = MINIMUM(n, len - 1);
+         /* check if cmdline ended earlier, e.g 'kdeinit5: Running...' */
+         for (int j = end; j > 0; j--) {
+            if (arg[0][j] == ' ' && arg[0][j - 1] != '\\') {
+               end = (arg[0][j - 1] == ':') ? (j - 1) : j;
+            }
+         }
+      }
+      /* the trailing space should get truncated anyway */
+      strlcat(s, " ", len);
+   }
+
+   Process_updateCmdline(proc, s, start, end);
+
+   free(s);
+}
+
+/*
+ * Borrowed with modifications from NetBSD's top(1).
+ */
+static double getpcpu(const NetBSDMachine* nhost, const struct kinfo_proc2* kp) {
+   if (nhost->fscale == 0)
+      return 0.0;
+
+   return 100.0 * (double)kp->p_pctcpu / nhost->fscale;
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   const Machine* host = super->super.host;
+   const NetBSDMachine* nhost = (const NetBSDMachine*) host;
+   const Settings* settings = host->settings;
+   bool hideKernelThreads = settings->hideKernelThreads;
+   bool hideUserlandThreads = settings->hideUserlandThreads;
+   int count = 0;
+
+   const struct kinfo_proc2* kprocs = kvm_getproc2(nhost->kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2), &count);
+
+   for (int i = 0; i < count; i++) {
+      const struct kinfo_proc2* kproc = &kprocs[i];
+
+      bool preExisting = false;
+      Process* proc = ProcessTable_getProcess(super, kproc->p_pid, &preExisting, NetBSDProcess_new);
+
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
+
+      if (!preExisting) {
+         Process_setPid(proc, kproc->p_pid);
+         Process_setParent(proc, kproc->p_ppid);
+         Process_setThreadGroup(proc, kproc->p_pid);
+         proc->tpgid = kproc->p_tpgid;
+         proc->session = kproc->p_sid;
+         proc->pgrp = kproc->p__pgid;
+         proc->isKernelThread = !!(kproc->p_flag & P_SYSTEM);
+         proc->isUserlandThread = Process_getPid(proc) != Process_getThreadGroup(proc); // eh?
+         proc->starttime_ctime = kproc->p_ustart_sec;
+         Process_fillStarttimeBuffer(proc);
+         ProcessTable_add(super, proc);
+
+         proc->tty_nr = kproc->p_tdev;
+         // KERN_PROC_TTY_NODEV is a negative constant but the type of
+         // kproc->p_tdev may be unsigned.
+         const char* name = ((dev_t)~kproc->p_tdev != (dev_t)~(KERN_PROC_TTY_NODEV)) ? devname(kproc->p_tdev, S_IFCHR) : NULL;
+         if (!name) {
+            free(proc->tty_name);
+            proc->tty_name = NULL;
+         } else {
+            free_and_xStrdup(&proc->tty_name, name);
+         }
+
+         NetBSDProcessTable_updateExe(kproc, proc);
+         NetBSDProcessTable_updateProcessName(nhost->kd, kproc, proc);
+      } else {
+         if (settings->updateProcessNames) {
+            NetBSDProcessTable_updateProcessName(nhost->kd, kproc, proc);
+         }
+      }
+
+      if (settings->ss->flags & PROCESS_FLAG_CWD) {
+         NetBSDProcessTable_updateCwd(kproc, proc);
+      }
+
+      if (proc->st_uid != kproc->p_uid) {
+         proc->st_uid = kproc->p_uid;
+         proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+      }
+
+      proc->m_virt = kproc->p_vm_vsize;
+      proc->m_resident = kproc->p_vm_rssize;
+
+      proc->percent_mem = (proc->m_resident * nhost->pageSizeKB) / (double)(host->totalMem) * 100.0;
+      proc->percent_cpu = CLAMP(getpcpu(nhost, kproc), 0.0, host->activeCPUs * 100.0);
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      proc->nlwp = kproc->p_nlwps;
+      proc->nice = kproc->p_nice - 20;
+      proc->time = 100 * (kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 1000000));
+      proc->priority = kproc->p_priority - PZERO;
+      proc->processor = kproc->p_cpuid;
+      proc->minflt = kproc->p_uru_minflt;
+      proc->majflt = kproc->p_uru_majflt;
+
+      int nlwps = 0;
+      const struct kinfo_lwp* klwps = kvm_getlwps(nhost->kd, kproc->p_pid, kproc->p_paddr, sizeof(struct kinfo_lwp), &nlwps);
+
+      /* TODO: According to the link below, SDYING should be a regarded state */
+      /* Taken from: https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/sys/sys/proc.h */
+      switch (kproc->p_realstat) {
+         case SIDL:     proc->state = IDLE; break;
+         case SACTIVE:
+            // We only consider the first LWP with a one of the below states.
+            for (int j = 0; j < nlwps; j++) {
+               if (klwps) {
+                  switch (klwps[j].l_stat) {
+                     case LSONPROC: proc->state = RUNNING; break;
+                     case LSRUN:    proc->state = RUNNABLE; break;
+                     case LSSLEEP:  proc->state = SLEEPING; break;
+                     case LSSTOP:   proc->state = STOPPED; break;
+                     default:       proc->state = UNKNOWN;
+                  }
+
+                  if (proc->state != UNKNOWN) {
+                     break;
+                  }
+               } else {
+                  proc->state = UNKNOWN;
+                  break;
+               }
+            }
+            break;
+         case SSTOP:    proc->state = STOPPED; break;
+         case SZOMB:    proc->state = ZOMBIE; break;
+         case SDEAD:    proc->state = DEFUNCT; break;
+         default:       proc->state = UNKNOWN;
+      }
+
+      if (Process_isKernelThread(proc)) {
+         super->kernelThreads++;
+      } else if (Process_isUserlandThread(proc)) {
+         super->userlandThreads++;
+      }
+
+      super->totalTasks++;
+      if (proc->state == RUNNING) {
+         super->runningTasks++;
+      }
+      proc->super.updated = true;
+   }
+}
diff --git a/netbsd/NetBSDProcessTable.h b/netbsd/NetBSDProcessTable.h
new file mode 100644
index 0000000..1bcfa98
--- /dev/null
+++ b/netbsd/NetBSDProcessTable.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_NetBSDProcessTable
+#define HEADER_NetBSDProcessTable
+/*
+htop - NetBSDProcessTable.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "ProcessTable.h"
+
+
+typedef struct NetBSDProcessTable_ {
+   ProcessTable super;
+} NetBSDProcessTable;
+
+#endif
diff --git a/netbsd/Platform.c b/netbsd/Platform.c
new file mode 100644
index 0000000..f458c23
--- /dev/null
+++ b/netbsd/Platform.c
@@ -0,0 +1,518 @@
+/*
+htop - netbsd/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 Nia Alarie
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "netbsd/Platform.h"
+
+#include <errno.h>
+#include <fcntl.h>
+#include <ifaddrs.h>
+#include <paths.h>
+#include <unistd.h>
+#include <kvm.h>
+#include <limits.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <net/if.h>
+#include <prop/proplib.h>
+#include <sys/envsys.h>
+#include <sys/iostat.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "CPUMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "Meter.h"
+#include "Settings.h"
+#include "SignalsPanel.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+#include "generic/fdstat_sysctl.h"
+#include "netbsd/NetBSDMachine.h"
+#include "netbsd/NetBSDProcess.h"
+
+/*
+ * The older proplib APIs will be deprecated in NetBSD 10, but we still
+ * want to support the 9.x stable branch.
+ *
+ * Create aliases for the newer functions that are missing from 9.x.
+ */
+#if !__NetBSD_Prereq__(9,99,65)
+#define prop_string_equals_string prop_string_equals_cstring
+#define prop_number_signed_value prop_number_integer_value
+#endif
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+/*
+ * See /usr/include/sys/signal.h
+ */
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",      .number =  0 },
+   { .name = " 1 SIGHUP",      .number =  1 },
+   { .name = " 2 SIGINT",      .number =  2 },
+   { .name = " 3 SIGQUIT",     .number =  3 },
+   { .name = " 4 SIGILL",      .number =  4 },
+   { .name = " 5 SIGTRAP",     .number =  5 },
+   { .name = " 6 SIGABRT",     .number =  6 },
+   { .name = " 6 SIGIOT",      .number =  6 },
+   { .name = " 7 SIGEMT",      .number =  7 },
+   { .name = " 8 SIGFPE",      .number =  8 },
+   { .name = " 9 SIGKILL",     .number =  9 },
+   { .name = "10 SIGBUS",      .number = 10 },
+   { .name = "11 SIGSEGV",     .number = 11 },
+   { .name = "12 SIGSYS",      .number = 12 },
+   { .name = "13 SIGPIPE",     .number = 13 },
+   { .name = "14 SIGALRM",     .number = 14 },
+   { .name = "15 SIGTERM",     .number = 15 },
+   { .name = "16 SIGURG",      .number = 16 },
+   { .name = "17 SIGSTOP",     .number = 17 },
+   { .name = "18 SIGTSTP",     .number = 18 },
+   { .name = "19 SIGCONT",     .number = 19 },
+   { .name = "20 SIGCHLD",     .number = 20 },
+   { .name = "21 SIGTTIN",     .number = 21 },
+   { .name = "22 SIGTTOU",     .number = 22 },
+   { .name = "23 SIGIO",       .number = 23 },
+   { .name = "24 SIGXCPU",     .number = 24 },
+   { .name = "25 SIGXFSZ",     .number = 25 },
+   { .name = "26 SIGVTALRM",   .number = 26 },
+   { .name = "27 SIGPROF",     .number = 27 },
+   { .name = "28 SIGWINCH",    .number = 28 },
+   { .name = "29 SIGINFO",     .number = 29 },
+   { .name = "30 SIGUSR1",     .number = 30 },
+   { .name = "31 SIGUSR2",     .number = 31 },
+   { .name = "32 SIGPWR",      .number = 32 },
+   { .name = "33 SIGRTMIN",    .number = 33 },
+   { .name = "34 SIGRTMIN+1",  .number = 34 },
+   { .name = "35 SIGRTMIN+2",  .number = 35 },
+   { .name = "36 SIGRTMIN+3",  .number = 36 },
+   { .name = "37 SIGRTMIN+4",  .number = 37 },
+   { .name = "38 SIGRTMIN+5",  .number = 38 },
+   { .name = "39 SIGRTMIN+6",  .number = 39 },
+   { .name = "40 SIGRTMIN+7",  .number = 40 },
+   { .name = "41 SIGRTMIN+8",  .number = 41 },
+   { .name = "42 SIGRTMIN+9",  .number = 42 },
+   { .name = "43 SIGRTMIN+10", .number = 43 },
+   { .name = "44 SIGRTMIN+11", .number = 44 },
+   { .name = "45 SIGRTMIN+12", .number = 45 },
+   { .name = "46 SIGRTMIN+13", .number = 46 },
+   { .name = "47 SIGRTMIN+14", .number = 47 },
+   { .name = "48 SIGRTMIN+15", .number = 48 },
+   { .name = "49 SIGRTMIN+16", .number = 49 },
+   { .name = "50 SIGRTMIN+17", .number = 50 },
+   { .name = "51 SIGRTMIN+18", .number = 51 },
+   { .name = "52 SIGRTMIN+19", .number = 52 },
+   { .name = "53 SIGRTMIN+20", .number = 53 },
+   { .name = "54 SIGRTMIN+21", .number = 54 },
+   { .name = "55 SIGRTMIN+22", .number = 55 },
+   { .name = "56 SIGRTMIN+23", .number = 56 },
+   { .name = "57 SIGRTMIN+24", .number = 57 },
+   { .name = "58 SIGRTMIN+25", .number = 58 },
+   { .name = "59 SIGRTMIN+26", .number = 59 },
+   { .name = "60 SIGRTMIN+27", .number = 60 },
+   { .name = "61 SIGRTMIN+28", .number = 61 },
+   { .name = "62 SIGRTMIN+29", .number = 62 },
+   { .name = "63 SIGRTMAX",    .number = 63 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &BlankMeter_class,
+   &DiskIOMeter_class,
+   &NetworkIOMeter_class,
+   &FileDescriptorMeter_class,
+   NULL
+};
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   struct timeval bootTime, currTime;
+   const int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+   size_t size = sizeof(bootTime);
+
+   int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
+   if (err) {
+      return -1;
+   }
+   gettimeofday(&currTime, NULL);
+
+   return (int) difftime(currTime.tv_sec, bootTime.tv_sec);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   struct loadavg loadAverage;
+   const int mib[2] = { CTL_VM, VM_LOADAVG };
+   size_t size = sizeof(loadAverage);
+
+   int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0);
+   if (err) {
+      *one = 0;
+      *five = 0;
+      *fifteen = 0;
+      return;
+   }
+   *one     = (double) loadAverage.ldavg[0] / loadAverage.fscale;
+   *five    = (double) loadAverage.ldavg[1] / loadAverage.fscale;
+   *fifteen = (double) loadAverage.ldavg[2] / loadAverage.fscale;
+}
+
+pid_t Platform_getMaxPid(void) {
+   // https://nxr.netbsd.org/xref/src/sys/sys/ansi.h#__pid_t
+   // pid is assigned as a 32bit Integer.
+   return INT32_MAX;
+}
+
+double Platform_setCPUValues(Meter* this, int cpu) {
+   const Machine* host = this->host;
+   const NetBSDMachine* nhost = (const NetBSDMachine*) host;
+   const CPUData* cpuData = &nhost->cpuData[cpu];
+   double total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod;
+   double totalPercent;
+   double* v = this->values;
+
+   v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0;
+   v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0;
+   if (host->settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->sysPeriod / total * 100.0;
+      v[CPU_METER_IRQ]     = cpuData->intrPeriod / total * 100.0;
+      v[CPU_METER_SOFTIRQ] = 0.0;
+      v[CPU_METER_STEAL]   = 0.0;
+      v[CPU_METER_GUEST]   = 0.0;
+      v[CPU_METER_IOWAIT]  = 0.0;
+      v[CPU_METER_FREQUENCY] = NAN;
+      this->curItems = 8;
+   } else {
+      v[CPU_METER_KERNEL] = cpuData->sysAllPeriod / total * 100.0;
+      v[CPU_METER_IRQ] = 0.0; // No steal nor guest on NetBSD
+      this->curItems = 4;
+   }
+   totalPercent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL] + v[CPU_METER_IRQ];
+   totalPercent = CLAMP(totalPercent, 0.0, 100.0);
+
+   v[CPU_METER_FREQUENCY] = cpuData->frequency;
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   return totalPercent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+   // this->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   // this->values[MEMORY_METER_AVAILABLE] = "available memory"
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   // this->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // this->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   char errbuf[_POSIX2_LINE_MAX];
+   char* env;
+   char** ptr;
+   int count;
+   kvm_t* kt;
+   const struct kinfo_proc2* kproc;
+   size_t capacity = 4096, size = 0;
+
+   if ((kt = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) {
+      return NULL;
+   }
+
+   if ((kproc = kvm_getproc2(kt, KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &count)) == NULL) {
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   if ((ptr = kvm_getenvv2(kt, kproc, 0)) == NULL) {
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   env = xMalloc(capacity);
+   for (char** p = ptr; *p; p++) {
+      size_t len = strlen(*p) + 1;
+
+      while (size + len > capacity) {
+         if (capacity > (SIZE_MAX / 2)) {
+            free(env);
+            env = NULL;
+            goto end;
+         }
+
+         capacity *= 2;
+         env = xRealloc(env, capacity);
+      }
+
+      String_safeStrncpy(env + size, *p, len);
+      size += len;
+   }
+
+   if (size < 2 || env[size - 1] || env[size - 2]) {
+      if (size + 2 < capacity)
+         env = xRealloc(env, capacity + 2);
+      env[size] = 0;
+      env[size + 1] = 0;
+   }
+
+end:
+   (void) kvm_close(kt);
+   return env;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   Generic_getFileDescriptors_sysctl(used, max);
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   const int mib[] = { CTL_HW, HW_IOSTATS, sizeof(struct io_sysctl) };
+   struct io_sysctl* iostats = NULL;
+   size_t size = 0;
+
+   for (int retry = 3; retry > 0; retry--) {
+      /* get the size of the IO statistic array */
+      if (sysctl(mib, __arraycount(mib), iostats, &size, NULL, 0) < 0)
+         CRT_fatalError("Unable to get size of io_sysctl");
+
+      if (size == 0) {
+         free(iostats);
+         return false;
+      }
+
+      iostats = xRealloc(iostats, size);
+
+      errno = 0;
+
+      if (sysctl(mib, __arraycount(mib), iostats, &size, NULL, 0) == 0)
+         break;
+
+      if (errno != ENOMEM)
+         CRT_fatalError("Unable to get disk IO statistics");
+   }
+
+   if (errno == ENOMEM)
+      CRT_fatalError("Unable to get disk IO statistics");
+
+   uint64_t bytesReadSum = 0;
+   uint64_t bytesWriteSum = 0;
+   uint64_t busyTimeSum = 0;
+
+   for (size_t i = 0, count = size / sizeof(struct io_sysctl); i < count; i++) {
+      /* ignore NFS activity */
+      if (iostats[i].type != IOSTAT_DISK)
+         continue;
+
+      bytesReadSum += iostats[i].rbytes;
+      bytesWriteSum += iostats[i].wbytes;
+      busyTimeSum += iostats[i].busysum_usec;
+   }
+
+   data->totalBytesRead = bytesReadSum;
+   data->totalBytesWritten = bytesWriteSum;
+   data->totalMsTimeSpend = busyTimeSum / 1000;
+
+   free(iostats);
+   return true;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   struct ifaddrs* ifaddrs = NULL;
+
+   if (getifaddrs(&ifaddrs) != 0)
+      return false;
+
+   for (const struct ifaddrs* ifa = ifaddrs; ifa; ifa = ifa->ifa_next) {
+      if (!ifa->ifa_addr)
+         continue;
+      if (ifa->ifa_addr->sa_family != AF_LINK)
+         continue;
+      if (ifa->ifa_flags & IFF_LOOPBACK)
+         continue;
+
+      const struct if_data* ifd = (const struct if_data*)ifa->ifa_data;
+
+      data->bytesReceived += ifd->ifi_ibytes;
+      data->packetsReceived += ifd->ifi_ipackets;
+      data->bytesTransmitted += ifd->ifi_obytes;
+      data->packetsTransmitted += ifd->ifi_opackets;
+   }
+
+   freeifaddrs(ifaddrs);
+   return true;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   prop_dictionary_t dict, fields, props;
+   prop_object_t device, class;
+
+   intmax_t totalCharge = 0;
+   intmax_t totalCapacity = 0;
+
+   *percent = NAN;
+   *isOnAC = AC_ERROR;
+
+   int fd = open(_PATH_SYSMON, O_RDONLY);
+   if (fd == -1)
+      goto error;
+
+   if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &dict) != 0)
+      goto error;
+
+   prop_object_iterator_t devIter = prop_dictionary_iterator(dict);
+   if (devIter == NULL)
+      goto error;
+
+   while ((device = prop_object_iterator_next(devIter)) != NULL) {
+      prop_object_t fieldsArray = prop_dictionary_get_keysym(dict, device);
+      if (fieldsArray == NULL)
+         goto error;
+
+      prop_object_iterator_t fieldsIter = prop_array_iterator(fieldsArray);
+      if (fieldsIter == NULL)
+         goto error;
+
+      bool isACAdapter = false;
+      bool isBattery = false;
+
+      /* only assume battery is not present if explicitly stated */
+      intmax_t isPresent = 1;
+      intmax_t isConnected = 0;
+      intmax_t curCharge = 0;
+      intmax_t maxCharge = 0;
+
+      while ((fields = prop_object_iterator_next(fieldsIter)) != NULL) {
+         props = prop_dictionary_get(fields, "device-properties");
+         if (props != NULL) {
+            class = prop_dictionary_get(props, "device-class");
+
+            if (prop_string_equals_string(class, "ac-adapter")) {
+               isACAdapter = true;
+            } else if (prop_string_equals_string(class, "battery")) {
+               isBattery = true;
+            }
+            continue;
+         }
+
+         prop_object_t curValue = prop_dictionary_get(fields, "cur-value");
+         prop_object_t maxValue = prop_dictionary_get(fields, "max-value");
+         prop_object_t descField = prop_dictionary_get(fields, "description");
+
+         if (descField == NULL || curValue == NULL)
+            continue;
+
+         if (prop_string_equals_string(descField, "connected")) {
+            isConnected = prop_number_signed_value(curValue);
+         } else if (prop_string_equals_string(descField, "present")) {
+            isPresent = prop_number_signed_value(curValue);
+         } else if (prop_string_equals_string(descField, "charge")) {
+            if (maxValue == NULL)
+               continue;
+            curCharge = prop_number_signed_value(curValue);
+            maxCharge = prop_number_signed_value(maxValue);
+         }
+      }
+
+      if (isBattery && isPresent) {
+         totalCharge += curCharge;
+         totalCapacity += maxCharge;
+      }
+
+      if (isACAdapter && *isOnAC != AC_PRESENT) {
+         *isOnAC = isConnected ? AC_PRESENT : AC_ABSENT;
+      }
+   }
+
+   *percent = ((double)totalCharge / (double)totalCapacity) * 100.0;
+
+error:
+   if (fd != -1)
+      close(fd);
+}
diff --git a/netbsd/Platform.h b/netbsd/Platform.h
new file mode 100644
index 0000000..a543f52
--- /dev/null
+++ b/netbsd/Platform.h
@@ -0,0 +1,138 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - netbsd/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+(C) 2021 Santhosh Raju
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+/* There are no Long Options for NetBSD as of now. */
+#define PLATFORM_LONG_OPTIONS \
+   // End of list
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+/* see /usr/include/sys/signal.h */
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/netbsd/ProcessField.h b/netbsd/ProcessField.h
new file mode 100644
index 0000000..87d4a69
--- /dev/null
+++ b/netbsd/ProcessField.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_NetBSDProcessField
+#define HEADER_NetBSDProcessField
+/*
+htop - netbsd/ProcessField.h
+(C) 2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   // End of list
+
+
+#endif /* HEADER_NetBSDProcessField */
diff --git a/netbsd/README.md b/netbsd/README.md
new file mode 100644
index 0000000..ed7be0a
--- /dev/null
+++ b/netbsd/README.md
@@ -0,0 +1,32 @@
+NetBSD support in htop(1)
+===
+
+This implementation utilizes kvm_getprocs(3), sysctl(3), etc, eliminating the
+need for mount_procfs(8) with Linux compatibility enabled.
+
+The implementation was initially based on the OpenBSD support in htop(1).
+
+Notes on NetBSD curses
+---
+
+NetBSD is one of the last operating systems to use and maintain its own
+implementation of Curses.
+
+htop(1) can be compiled against either ncurses or NetBSD's curses(3).
+In order for NetBSD's libcurses to be used, htop(1) must be configured with
+`--disable-unicode`. This is necessary because htop(1) with Unicode enabled
+directly accesses ncurses's cchar_t struct, which has different contents
+in NetBSD's curses.
+
+Versions of libcurses in NetBSD 9 and prior have no mouse support
+(this is an ncurses extension). Newer versions contain no-op mouse functions
+for compatibility with ncurses.
+
+What needs improvement
+---
+
+* Kernel and userspace threads are not displayed or counted -
+  maybe look at NetBSD top(1).
+* Support for compiling using libcurses's Unicode support.
+* Support for fstat(1) (view open files, like lsof(8) on Linux).
+* Support for ktrace(1) (like strace(1) on Linux).
diff --git a/openbsd/OpenBSDMachine.c b/openbsd/OpenBSDMachine.c
new file mode 100644
index 0000000..0ff893b
--- /dev/null
+++ b/openbsd/OpenBSDMachine.c
@@ -0,0 +1,290 @@
+/*
+htop - OpenBSDMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "openbsd/OpenBSDMachine.h"
+
+#include <kvm.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/swap.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <uvm/uvmexp.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+
+static void OpenBSDMachine_updateCPUcount(OpenBSDMachine* this) {
+   Machine* super = &this->super;
+   const int nmib[] = { CTL_HW, HW_NCPU };
+   const int mib[] = { CTL_HW, HW_NCPUONLINE };
+   int r;
+   unsigned int value;
+   size_t size;
+   bool change = false;
+
+   size = sizeof(value);
+   r = sysctl(mib, 2, &value, &size, NULL, 0);
+   if (r < 0 || value < 1) {
+      value = 1;
+   }
+
+   if (value != super->activeCPUs) {
+      super->activeCPUs = value;
+      change = true;
+   }
+
+   size = sizeof(value);
+   r = sysctl(nmib, 2, &value, &size, NULL, 0);
+   if (r < 0 || value < 1) {
+      value = super->activeCPUs;
+   }
+
+   if (value != super->existingCPUs) {
+      this->cpuData = xReallocArray(this->cpuData, value + 1, sizeof(CPUData));
+      super->existingCPUs = value;
+      change = true;
+   }
+
+   if (change) {
+      CPUData* dAvg = &this->cpuData[0];
+      memset(dAvg, '\0', sizeof(CPUData));
+      dAvg->totalTime = 1;
+      dAvg->totalPeriod = 1;
+      dAvg->online = true;
+
+      for (unsigned int i = 0; i < super->existingCPUs; i++) {
+         CPUData* d = &this->cpuData[i + 1];
+         memset(d, '\0', sizeof(CPUData));
+         d->totalTime = 1;
+         d->totalPeriod = 1;
+
+         const int ncmib[] = { CTL_KERN, KERN_CPUSTATS, i };
+         struct cpustats cpu_stats;
+
+         size = sizeof(cpu_stats);
+         if (sysctl(ncmib, 3, &cpu_stats, &size, NULL, 0) < 0) {
+            CRT_fatalError("ncmib sysctl call failed");
+         }
+         d->online = (cpu_stats.cs_flags & CPUSTATS_ONLINE);
+      }
+   }
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   const int fmib[] = { CTL_KERN, KERN_FSCALE };
+   size_t size;
+   char errbuf[_POSIX2_LINE_MAX];
+
+   OpenBSDMachine* this = xCalloc(1, sizeof(OpenBSDMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   OpenBSDMachine_updateCPUcount(this);
+
+   size = sizeof(this->fscale);
+   if (sysctl(fmib, 2, &this->fscale, &size, NULL, 0) < 0 || this->fscale <= 0) {
+      CRT_fatalError("fscale sysctl call failed");
+   }
+
+   if ((this->pageSize = sysconf(_SC_PAGESIZE)) == -1)
+      CRT_fatalError("pagesize sysconf call failed");
+   this->pageSizeKB = this->pageSize / ONE_K;
+
+   this->kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
+   if (this->kd == NULL) {
+      CRT_fatalError("kvm_openfiles() failed");
+   }
+
+   this->cpuSpeed = -1;
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   OpenBSDMachine* this = (OpenBSDMachine*) super;
+
+   if (this->kd) {
+      kvm_close(this->kd);
+   }
+   free(this->cpuData);
+   Machine_done(super);
+   free(this);
+}
+
+static void OpenBSDMachine_scanMemoryInfo(OpenBSDMachine* this) {
+   Machine* super = &this->super;
+   const int uvmexp_mib[] = { CTL_VM, VM_UVMEXP };
+   struct uvmexp uvmexp;
+   size_t size_uvmexp = sizeof(uvmexp);
+
+   if (sysctl(uvmexp_mib, 2, &uvmexp, &size_uvmexp, NULL, 0) < 0) {
+      CRT_fatalError("uvmexp sysctl call failed");
+   }
+
+   super->totalMem = uvmexp.npages * this->pageSizeKB;
+   super->usedMem = (uvmexp.npages - uvmexp.free - uvmexp.paging) * this->pageSizeKB;
+
+   // Taken from OpenBSD systat/iostat.c, top/machine.c and uvm_sysctl(9)
+   const int bcache_mib[] = { CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT };
+   struct bcachestats bcstats;
+   size_t size_bcstats = sizeof(bcstats);
+
+   if (sysctl(bcache_mib, 3, &bcstats, &size_bcstats, NULL, 0) < 0) {
+      CRT_fatalError("cannot get vfs.bcachestat");
+   }
+
+   super->cachedMem = bcstats.numbufpages * this->pageSizeKB;
+
+   /*
+    * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
+    * All rights reserved.
+    *
+    * Taken almost directly from OpenBSD's top(1)
+    *
+    * Originally released under a BSD-3 license
+    * Modified through htop developers applying GPL-2
+    */
+   int nswap = swapctl(SWAP_NSWAP, 0, 0);
+   if (nswap > 0) {
+      struct swapent* swdev = xMallocArray(nswap, sizeof(struct swapent));
+      int rnswap = swapctl(SWAP_STATS, swdev, nswap);
+
+      /* Total things up */
+      unsigned long long int total = 0, used = 0;
+      for (int i = 0; i < rnswap; i++) {
+         if (swdev[i].se_flags & SWF_ENABLE) {
+            used += (swdev[i].se_inuse / (1024 / DEV_BSIZE));
+            total += (swdev[i].se_nblks / (1024 / DEV_BSIZE));
+         }
+      }
+
+      super->totalSwap = total;
+      super->usedSwap = used;
+
+      free(swdev);
+   } else {
+      super->totalSwap = super->usedSwap = 0;
+   }
+}
+
+static void getKernelCPUTimes(unsigned int cpuId, u_int64_t* times) {
+   const int mib[] = { CTL_KERN, KERN_CPTIME2, cpuId };
+   size_t length = sizeof(*times) * CPUSTATES;
+   if (sysctl(mib, 3, times, &length, NULL, 0) == -1 || length != sizeof(*times) * CPUSTATES) {
+      CRT_fatalError("sysctl kern.cp_time2 failed");
+   }
+}
+
+static void kernelCPUTimesToHtop(const u_int64_t* times, CPUData* cpu) {
+   unsigned long long totalTime = 0;
+   for (int i = 0; i < CPUSTATES; i++) {
+      totalTime += times[i];
+   }
+
+   unsigned long long sysAllTime = times[CP_INTR] + times[CP_SYS];
+
+   // XXX Not sure if CP_SPIN should be added to sysAllTime.
+   // See https://github.com/openbsd/src/commit/531d8034253fb82282f0f353c086e9ad827e031c
+   #ifdef CP_SPIN
+   sysAllTime += times[CP_SPIN];
+   #endif
+
+   cpu->totalPeriod = saturatingSub(totalTime, cpu->totalTime);
+   cpu->userPeriod = saturatingSub(times[CP_USER], cpu->userTime);
+   cpu->nicePeriod = saturatingSub(times[CP_NICE], cpu->niceTime);
+   cpu->sysPeriod = saturatingSub(times[CP_SYS], cpu->sysTime);
+   cpu->sysAllPeriod = saturatingSub(sysAllTime, cpu->sysAllTime);
+   #ifdef CP_SPIN
+   cpu->spinPeriod = saturatingSub(times[CP_SPIN], cpu->spinTime);
+   #endif
+   cpu->intrPeriod = saturatingSub(times[CP_INTR], cpu->intrTime);
+   cpu->idlePeriod = saturatingSub(times[CP_IDLE], cpu->idleTime);
+
+   cpu->totalTime = totalTime;
+   cpu->userTime = times[CP_USER];
+   cpu->niceTime = times[CP_NICE];
+   cpu->sysTime = times[CP_SYS];
+   cpu->sysAllTime = sysAllTime;
+   #ifdef CP_SPIN
+   cpu->spinTime = times[CP_SPIN];
+   #endif
+   cpu->intrTime = times[CP_INTR];
+   cpu->idleTime = times[CP_IDLE];
+}
+
+static void OpenBSDMachine_scanCPUTime(OpenBSDMachine* this) {
+   Machine* super = &this->super;
+   u_int64_t kernelTimes[CPUSTATES] = {0};
+   u_int64_t avg[CPUSTATES] = {0};
+
+   for (unsigned int i = 0; i < super->existingCPUs; i++) {
+      CPUData* cpu = &this->cpuData[i + 1];
+
+      if (!cpu->online) {
+         continue;
+      }
+
+      getKernelCPUTimes(i, kernelTimes);
+      kernelCPUTimesToHtop(kernelTimes, cpu);
+
+      avg[CP_USER] += cpu->userTime;
+      avg[CP_NICE] += cpu->niceTime;
+      avg[CP_SYS] += cpu->sysTime;
+      #ifdef CP_SPIN
+      avg[CP_SPIN] += cpu->spinTime;
+      #endif
+      avg[CP_INTR] += cpu->intrTime;
+      avg[CP_IDLE] += cpu->idleTime;
+   }
+
+   for (int i = 0; i < CPUSTATES; i++) {
+      avg[i] /= super->activeCPUs;
+   }
+
+   kernelCPUTimesToHtop(avg, &this->cpuData[0]);
+
+   {
+      const int mib[] = { CTL_HW, HW_CPUSPEED };
+      int cpuSpeed;
+      size_t size = sizeof(cpuSpeed);
+      if (sysctl(mib, 2, &cpuSpeed, &size, NULL, 0) == -1) {
+         this->cpuSpeed = -1;
+      } else {
+         this->cpuSpeed = cpuSpeed;
+      }
+   }
+}
+
+void Machine_scan(Machine* super) {
+   OpenBSDMachine* this = (OpenBSDMachine*) super;
+
+   OpenBSDMachine_updateCPUcount(this);
+   OpenBSDMachine_scanMemoryInfo(this);
+   OpenBSDMachine_scanCPUTime(this);
+}
+
+bool Machine_isCPUonline(const Machine* super, unsigned int id) {
+   assert(id < super->existingCPUs);
+
+   const OpenBSDMachine* this = (const OpenBSDMachine*) super;
+   return this->cpuData[id + 1].online;
+}
diff --git a/openbsd/OpenBSDMachine.h b/openbsd/OpenBSDMachine.h
new file mode 100644
index 0000000..51d6a75
--- /dev/null
+++ b/openbsd/OpenBSDMachine.h
@@ -0,0 +1,53 @@
+#ifndef HEADER_OpenBSDMachine
+#define HEADER_OpenBSDMachine
+/*
+htop - OpenBSDMachine.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kvm.h>
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Machine.h"
+
+
+typedef struct CPUData_ {
+   unsigned long long int totalTime;
+   unsigned long long int userTime;
+   unsigned long long int niceTime;
+   unsigned long long int sysTime;
+   unsigned long long int sysAllTime;
+   unsigned long long int spinTime;
+   unsigned long long int intrTime;
+   unsigned long long int idleTime;
+
+   unsigned long long int totalPeriod;
+   unsigned long long int userPeriod;
+   unsigned long long int nicePeriod;
+   unsigned long long int sysPeriod;
+   unsigned long long int sysAllPeriod;
+   unsigned long long int spinPeriod;
+   unsigned long long int intrPeriod;
+   unsigned long long int idlePeriod;
+
+   bool online;
+} CPUData;
+
+typedef struct OpenBSDMachine_ {
+   Machine super;
+   kvm_t* kd;
+
+   CPUData* cpuData;
+
+   long fscale;
+   int cpuSpeed;
+   int pageSize;
+   int pageSizeKB;
+
+} OpenBSDMachine;
+
+#endif
diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
new file mode 100644
index 0000000..681d516
--- /dev/null
+++ b/openbsd/OpenBSDProcess.c
@@ -0,0 +1,269 @@
+/*
+htop - OpenBSDProcess.c
+(C) 2015 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "openbsd/OpenBSDProcess.h"
+
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Process.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = {
+      .name = "",
+      .title = NULL,
+      .description = NULL,
+      .flags = 0,
+   },
+   [PID] = {
+      .name = "PID",
+      .title = "PID",
+      .description = "Process/thread ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [COMM] = {
+      .name = "Command",
+      .title = "Command ",
+      .description = "Command line",
+      .flags = 0,
+   },
+   [STATE] = {
+      .name = "STATE",
+      .title = "S ",
+      .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)",
+      .flags = 0,
+   },
+   [PPID] = {
+      .name = "PPID",
+      .title = "PPID",
+      .description = "Parent process ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [PGRP] = {
+      .name = "PGRP",
+      .title = "PGRP",
+      .description = "Process group ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [SESSION] = {
+      .name = "SESSION",
+      .title = "SESN",
+      .description = "Process's session ID",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [TTY] = {
+      .name = "TTY",
+      .title = "TTY      ",
+      .description = "Controlling terminal",
+      .flags = 0,
+   },
+   [TPGID] = {
+      .name = "TPGID",
+      .title = "TPGID",
+      .description = "Process ID of the fg process group of the controlling terminal",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [MINFLT] = {
+      .name = "MINFLT",
+      .title = "     MINFLT ",
+      .description = "Number of minor faults which have not required loading a memory page from disk",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [MAJFLT] = {
+      .name = "MAJFLT",
+      .title = "     MAJFLT ",
+      .description = "Number of major faults which have required loading a memory page from disk",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [PRIORITY] = {
+      .name = "PRIORITY",
+      .title = "PRI ",
+      .description = "Kernel's internal priority for the process",
+      .flags = 0,
+   },
+   [NICE] = {
+      .name = "NICE",
+      .title = " NI ",
+      .description = "Nice value (the higher the value, the more it lets other processes take priority)",
+      .flags = 0,
+   },
+   [STARTTIME] = {
+      .name = "STARTTIME",
+      .title = "START ",
+      .description = "Time the process was started",
+      .flags = 0,
+   },
+   [ELAPSED] = {
+      .name = "ELAPSED",
+      .title = "ELAPSED  ",
+      .description = "Time since the process was started",
+      .flags = 0,
+   },
+   [PROCESSOR] = {
+      .name = "PROCESSOR",
+      .title = "CPU ",
+      .description = "Id of the CPU the process last executed on",
+      .flags = 0,
+   },
+   [M_VIRT] = {
+      .name = "M_VIRT",
+      .title = " VIRT ",
+      .description = "Total program size in virtual memory",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [M_RESIDENT] = {
+      .name = "M_RESIDENT",
+      .title = "  RES ",
+      .description = "Resident set size, size of the text and data sections, plus stack usage",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [ST_UID] = {
+      .name = "ST_UID",
+      .title = "UID",
+      .description = "User ID of the process owner",
+      .flags = 0,
+   },
+   [PERCENT_CPU] = {
+      .name = "PERCENT_CPU",
+      .title = " CPU%",
+      .description = "Percentage of the CPU time the process used in the last sampling",
+      .flags = 0,
+      .defaultSortDesc = true,
+      .autoWidth = true,
+   },
+   [PERCENT_NORM_CPU] = {
+      .name = "PERCENT_NORM_CPU",
+      .title = "NCPU%",
+      .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)",
+      .flags = 0,
+      .defaultSortDesc = true,
+      .autoWidth = true,
+   },
+   [PERCENT_MEM] = {
+      .name = "PERCENT_MEM",
+      .title = "MEM% ",
+      .description = "Percentage of the memory the process is using, based on resident memory size",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [USER] = {
+      .name = "USER",
+      .title = "USER       ",
+      .description = "Username of the process owner (or user ID if name cannot be determined)",
+      .flags = 0,
+   },
+   [TIME] = {
+      .name = "TIME",
+      .title = "  TIME+  ",
+      .description = "Total time the process has spent in user and system time",
+      .flags = 0,
+      .defaultSortDesc = true,
+   },
+   [NLWP] = {
+      .name = "NLWP",
+      .title = "NLWP ",
+      .description = "Number of threads in the process",
+      .flags = 0,
+   },
+   [TGID] = {
+      .name = "TGID",
+      .title = "TGID",
+      .description = "Thread group ID (i.e. process ID)",
+      .flags = 0,
+      .pidColumn = true,
+   },
+   [PROC_COMM] = {
+      .name = "COMM",
+      .title = "COMM            ",
+      .description = "comm string of the process",
+      .flags = 0,
+   },
+   [CWD] = {
+      .name = "CWD",
+      .title = "CWD                       ",
+      .description = "The current working directory of the process",
+      .flags = PROCESS_FLAG_CWD,
+   },
+
+};
+
+Process* OpenBSDProcess_new(const Machine* host) {
+   OpenBSDProcess* this = xCalloc(1, sizeof(OpenBSDProcess));
+   Object_setClass(this, Class(OpenBSDProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   OpenBSDProcess* this = (OpenBSDProcess*) cast;
+   Process_done((Process*)cast);
+   free(this);
+}
+
+static void OpenBSDProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const OpenBSDProcess* op = (const OpenBSDProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   //size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add OpenBSD-specific fields here
+   default:
+      Process_writeField(&op->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const OpenBSDProcess* p1 = (const OpenBSDProcess*)v1;
+   const OpenBSDProcess* p2 = (const OpenBSDProcess*)v2;
+
+   // remove if actually used
+   (void)p1; (void)p2;
+
+   switch (key) {
+   // add OpenBSD-specific fields here
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass OpenBSDProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = OpenBSDProcess_rowWriteField
+   },
+   .compareByKey = OpenBSDProcess_compareByKey
+};
diff --git a/openbsd/OpenBSDProcess.h b/openbsd/OpenBSDProcess.h
new file mode 100644
index 0000000..aac4b31
--- /dev/null
+++ b/openbsd/OpenBSDProcess.h
@@ -0,0 +1,33 @@
+#ifndef HEADER_OpenBSDProcess
+#define HEADER_OpenBSDProcess
+/*
+htop - OpenBSDProcess.h
+(C) 2015 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Machine.h"
+#include "Object.h"
+#include "Process.h"
+
+
+typedef struct OpenBSDProcess_ {
+   Process super;
+
+   /* 'Kernel virtual addr of u-area' to detect main threads */
+   uint64_t addr;
+} OpenBSDProcess;
+
+extern const ProcessClass OpenBSDProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* OpenBSDProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+#endif
diff --git a/openbsd/OpenBSDProcessTable.c b/openbsd/OpenBSDProcessTable.c
new file mode 100644
index 0000000..f2980a4
--- /dev/null
+++ b/openbsd/OpenBSDProcessTable.c
@@ -0,0 +1,245 @@
+/*
+htop - OpenBSDProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "openbsd/OpenBSDProcessTable.h"
+
+#include <kvm.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mount.h>
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/sched.h>
+#include <sys/sysctl.h>
+#include <sys/types.h>
+#include <uvm/uvmexp.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Process.h"
+#include "ProcessTable.h"
+#include "Settings.h"
+#include "XUtils.h"
+#include "openbsd/OpenBSDMachine.h"
+#include "openbsd/OpenBSDProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   OpenBSDProcessTable* this = xCalloc(1, sizeof(OpenBSDProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(OpenBSDProcess), host, pidMatchList);
+
+   return this;
+}
+
+void ProcessTable_delete(Object* cast) {
+   OpenBSDProcessTable* this = (OpenBSDProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+static void OpenBSDProcessTable_updateCwd(const struct kinfo_proc* kproc, Process* proc) {
+   const int mib[] = { CTL_KERN, KERN_PROC_CWD, kproc->p_pid };
+   char buffer[2048];
+   size_t size = sizeof(buffer);
+   if (sysctl(mib, 3, buffer, &size, NULL, 0) != 0) {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   /* Kernel threads return an empty buffer */
+   if (buffer[0] == '\0') {
+      free(proc->procCwd);
+      proc->procCwd = NULL;
+      return;
+   }
+
+   free_and_xStrdup(&proc->procCwd, buffer);
+}
+
+static void OpenBSDProcessTable_updateProcessName(kvm_t* kd, const struct kinfo_proc* kproc, Process* proc) {
+   Process_updateComm(proc, kproc->p_comm);
+
+   /*
+    * Like OpenBSD's top(1), we try to fall back to the command name
+    * (argv[0]) if we fail to construct the full command.
+    */
+   char** arg = kvm_getargv(kd, kproc, 500);
+   if (arg == NULL || *arg == NULL) {
+      Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
+      return;
+   }
+
+   size_t len = 0;
+   for (int i = 0; arg[i] != NULL; i++) {
+      len += strlen(arg[i]) + 1;   /* room for arg and trailing space or NUL */
+   }
+
+   /* don't use xMalloc here - we want to handle huge argv's gracefully */
+   char* s;
+   if ((s = malloc(len)) == NULL) {
+      Process_updateCmdline(proc, kproc->p_comm, 0, strlen(kproc->p_comm));
+      return;
+   }
+
+   *s = '\0';
+
+   int start = 0;
+   int end = 0;
+   for (int i = 0; arg[i] != NULL; i++) {
+      size_t n = strlcat(s, arg[i], len);
+      if (i == 0) {
+         end = MINIMUM(n, len - 1);
+         /* check if cmdline ended earlier, e.g 'kdeinit5: Running...' */
+         for (int j = end; j > 0; j--) {
+            if (arg[0][j] == ' ' && arg[0][j - 1] != '\\') {
+               end = (arg[0][j - 1] == ':') ? (j - 1) : j;
+            }
+         }
+      }
+      /* the trailing space should get truncated anyway */
+      strlcat(s, " ", len);
+   }
+
+   Process_updateCmdline(proc, s, start, end);
+
+   free(s);
+}
+
+/*
+ * Taken from OpenBSD's ps(1).
+ */
+static double getpcpu(const OpenBSDMachine* ohost, const struct kinfo_proc* kp) {
+   if (ohost->fscale == 0)
+      return 0.0;
+
+   return 100.0 * (double)kp->p_pctcpu / ohost->fscale;
+}
+
+static void OpenBSDProcessTable_scanProcs(OpenBSDProcessTable* this) {
+   Machine* host = this->super.super.host;
+   OpenBSDMachine* ohost = (OpenBSDMachine*) host;
+   const Settings* settings = host->settings;
+   const bool hideKernelThreads = settings->hideKernelThreads;
+   const bool hideUserlandThreads = settings->hideUserlandThreads;
+   int count = 0;
+
+   const struct kinfo_proc* kprocs = kvm_getprocs(ohost->kd, KERN_PROC_KTHREAD | KERN_PROC_SHOW_THREADS, 0, sizeof(struct kinfo_proc), &count);
+
+   for (int i = 0; i < count; i++) {
+      const struct kinfo_proc* kproc = &kprocs[i];
+
+      /* Ignore main threads */
+      if (kproc->p_tid != -1) {
+         Process* containingProcess = ProcessTable_findProcess(&this->super, kproc->p_pid);
+         if (containingProcess) {
+            if (((OpenBSDProcess*)containingProcess)->addr == kproc->p_addr)
+               continue;
+
+            containingProcess->nlwp++;
+         }
+      }
+
+      bool preExisting = false;
+      Process* proc = ProcessTable_getProcess(&this->super, (kproc->p_tid == -1) ? kproc->p_pid : kproc->p_tid, &preExisting, OpenBSDProcess_new);
+      OpenBSDProcess* op = (OpenBSDProcess*) proc;
+
+      if (!preExisting) {
+         Process_setParent(proc, kproc->p_ppid);
+         Process_setThreadGroup(proc, kproc->p_pid);
+         proc->tpgid = kproc->p_tpgid;
+         proc->session = kproc->p_sid;
+         proc->pgrp = kproc->p__pgid;
+         proc->isKernelThread = proc->pgrp == 0;
+         proc->isUserlandThread = kproc->p_tid != -1;
+         proc->starttime_ctime = kproc->p_ustart_sec;
+         Process_fillStarttimeBuffer(proc);
+         ProcessTable_add(&this->super, proc);
+
+         OpenBSDProcessTable_updateProcessName(ohost->kd, kproc, proc);
+
+         if (settings->ss->flags & PROCESS_FLAG_CWD) {
+            OpenBSDProcessTable_updateCwd(kproc, proc);
+         }
+
+         proc->tty_nr = kproc->p_tdev;
+         const char* name = ((dev_t)kproc->p_tdev != NODEV) ? devname(kproc->p_tdev, S_IFCHR) : NULL;
+         if (!name || String_eq(name, "??")) {
+            free(proc->tty_name);
+            proc->tty_name = NULL;
+         } else {
+            free_and_xStrdup(&proc->tty_name, name);
+         }
+      } else {
+         if (settings->updateProcessNames) {
+            OpenBSDProcessTable_updateProcessName(ohost->kd, kproc, proc);
+         }
+      }
+
+      op->addr = kproc->p_addr;
+      proc->m_virt = kproc->p_vm_dsize * ohost->pageSizeKB;
+      proc->m_resident = kproc->p_vm_rssize * ohost->pageSizeKB;
+
+      proc->percent_mem = proc->m_resident / (float)host->totalMem * 100.0F;
+      proc->percent_cpu = CLAMP(getpcpu(ohost, kproc), 0.0F, host->activeCPUs * 100.0F);
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      proc->nice = kproc->p_nice - 20;
+      proc->time = 100 * (kproc->p_rtime_sec + ((kproc->p_rtime_usec + 500000) / 1000000));
+      proc->priority = kproc->p_priority - PZERO;
+      proc->processor = kproc->p_cpuid;
+      proc->minflt = kproc->p_uru_minflt;
+      proc->majflt = kproc->p_uru_majflt;
+      proc->nlwp = 1;
+
+      if (proc->st_uid != kproc->p_uid) {
+         proc->st_uid = kproc->p_uid;
+         proc->user = UsersTable_getRef(host->usersTable, proc->st_uid);
+      }
+
+      /* Taken from: https://github.com/openbsd/src/blob/6a38af0976a6870911f4b2de19d8da28723a5778/sys/sys/proc.h#L420 */
+      switch (kproc->p_stat) {
+         case SIDL:    proc->state = IDLE; break;
+         case SRUN:    proc->state = RUNNABLE; break;
+         case SSLEEP:  proc->state = SLEEPING; break;
+         case SSTOP:   proc->state = STOPPED; break;
+         case SZOMB:   proc->state = ZOMBIE; break;
+         case SDEAD:   proc->state = DEFUNCT; break;
+         case SONPROC: proc->state = RUNNING; break;
+         default:      proc->state = UNKNOWN;
+      }
+
+      if (Process_isKernelThread(proc)) {
+         this->super.kernelThreads++;
+      } else if (Process_isUserlandThread(proc)) {
+         this->super.userlandThreads++;
+      }
+
+      this->super.totalTasks++;
+      if (proc->state == RUNNING) {
+         this->super.runningTasks++;
+      }
+
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) || (hideUserlandThreads && Process_isUserlandThread(proc)));
+      proc->super.updated = true;
+   }
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   OpenBSDProcessTable* this = (OpenBSDProcessTable*) super;
+
+   OpenBSDProcessTable_scanProcs(this);
+}
diff --git a/openbsd/OpenBSDProcessTable.h b/openbsd/OpenBSDProcessTable.h
new file mode 100644
index 0000000..f911a10
--- /dev/null
+++ b/openbsd/OpenBSDProcessTable.h
@@ -0,0 +1,21 @@
+#ifndef HEADER_OpenBSDProcessTable
+#define HEADER_OpenBSDProcessTable
+/*
+htop - OpenBSDProcessTable.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "ProcessTable.h"
+
+
+typedef struct OpenBSDProcessTable_ {
+   ProcessTable super;
+} OpenBSDProcessTable;
+
+#endif
diff --git a/openbsd/Platform.c b/openbsd/Platform.c
new file mode 100644
index 0000000..a8b5d21
--- /dev/null
+++ b/openbsd/Platform.c
@@ -0,0 +1,400 @@
+/*
+htop - openbsd/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "openbsd/Platform.h"
+
+#include <errno.h>
+#include <kvm.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/signal.h>  // needs to be included before <sys/proc.h> for 'struct sigaltstack'
+#include <sys/proc.h>
+#include <sys/resource.h>
+#include <sys/sensors.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <uvm/uvmexp.h>
+
+#include "CPUMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "Meter.h"
+#include "Settings.h"
+#include "SignalsPanel.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+#include "openbsd/OpenBSDMachine.h"
+#include "openbsd/OpenBSDProcess.h"
+
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+/*
+ * See /usr/include/sys/signal.h
+ */
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number =  0 },
+   { .name = " 1 SIGHUP",    .number =  1 },
+   { .name = " 2 SIGINT",    .number =  2 },
+   { .name = " 3 SIGQUIT",   .number =  3 },
+   { .name = " 4 SIGILL",    .number =  4 },
+   { .name = " 5 SIGTRAP",   .number =  5 },
+   { .name = " 6 SIGABRT",   .number =  6 },
+   { .name = " 6 SIGIOT",    .number =  6 },
+   { .name = " 7 SIGEMT",    .number =  7 },
+   { .name = " 8 SIGFPE",    .number =  8 },
+   { .name = " 9 SIGKILL",   .number =  9 },
+   { .name = "10 SIGBUS",    .number = 10 },
+   { .name = "11 SIGSEGV",   .number = 11 },
+   { .name = "12 SIGSYS",    .number = 12 },
+   { .name = "13 SIGPIPE",   .number = 13 },
+   { .name = "14 SIGALRM",   .number = 14 },
+   { .name = "15 SIGTERM",   .number = 15 },
+   { .name = "16 SIGURG",    .number = 16 },
+   { .name = "17 SIGSTOP",   .number = 17 },
+   { .name = "18 SIGTSTP",   .number = 18 },
+   { .name = "19 SIGCONT",   .number = 19 },
+   { .name = "20 SIGCHLD",   .number = 20 },
+   { .name = "21 SIGTTIN",   .number = 21 },
+   { .name = "22 SIGTTOU",   .number = 22 },
+   { .name = "23 SIGIO",     .number = 23 },
+   { .name = "24 SIGXCPU",   .number = 24 },
+   { .name = "25 SIGXFSZ",   .number = 25 },
+   { .name = "26 SIGVTALRM", .number = 26 },
+   { .name = "27 SIGPROF",   .number = 27 },
+   { .name = "28 SIGWINCH",  .number = 28 },
+   { .name = "29 SIGINFO",   .number = 29 },
+   { .name = "30 SIGUSR1",   .number = 30 },
+   { .name = "31 SIGUSR2",   .number = 31 },
+   { .name = "32 SIGTHR",    .number = 32 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &FileDescriptorMeter_class,
+   &BlankMeter_class,
+   NULL
+};
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   struct timeval bootTime, currTime;
+   const int mib[2] = { CTL_KERN, KERN_BOOTTIME };
+   size_t size = sizeof(bootTime);
+
+   int err = sysctl(mib, 2, &bootTime, &size, NULL, 0);
+   if (err) {
+      return -1;
+   }
+   gettimeofday(&currTime, NULL);
+
+   return (int) difftime(currTime.tv_sec, bootTime.tv_sec);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   struct loadavg loadAverage;
+   const int mib[2] = { CTL_VM, VM_LOADAVG };
+   size_t size = sizeof(loadAverage);
+
+   int err = sysctl(mib, 2, &loadAverage, &size, NULL, 0);
+   if (err) {
+      *one = 0;
+      *five = 0;
+      *fifteen = 0;
+      return;
+   }
+   *one     = (double) loadAverage.ldavg[0] / loadAverage.fscale;
+   *five    = (double) loadAverage.ldavg[1] / loadAverage.fscale;
+   *fifteen = (double) loadAverage.ldavg[2] / loadAverage.fscale;
+}
+
+pid_t Platform_getMaxPid(void) {
+   return 2 * THREAD_PID_OFFSET;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   const Machine* host = this->host;
+   const OpenBSDMachine* ohost = (const OpenBSDMachine*) host;
+   const CPUData* cpuData = &ohost->cpuData[cpu];
+   double total;
+   double totalPercent;
+   double* v = this->values;
+
+   if (!cpuData->online) {
+      this->curItems = 0;
+      return NAN;
+   }
+
+   total = cpuData->totalPeriod == 0 ? 1 : cpuData->totalPeriod;
+
+   v[CPU_METER_NICE] = cpuData->nicePeriod / total * 100.0;
+   v[CPU_METER_NORMAL] = cpuData->userPeriod / total * 100.0;
+   if (host->settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->sysPeriod / total * 100.0;
+      v[CPU_METER_IRQ]     = cpuData->intrPeriod / total * 100.0;
+      v[CPU_METER_SOFTIRQ] = 0.0;
+      v[CPU_METER_STEAL]   = 0.0;
+      v[CPU_METER_GUEST]   = 0.0;
+      v[CPU_METER_IOWAIT]  = 0.0;
+      v[CPU_METER_FREQUENCY] = NAN;
+      this->curItems = 8;
+   } else {
+      v[CPU_METER_KERNEL] = cpuData->sysAllPeriod / total * 100.0;
+      v[CPU_METER_IRQ] = 0.0; // No steal nor guest on OpenBSD
+      this->curItems = 4;
+   }
+   totalPercent = v[CPU_METER_NICE] + v[CPU_METER_NORMAL] + v[CPU_METER_KERNEL] + v[CPU_METER_IRQ];
+
+   totalPercent = CLAMP(totalPercent, 0.0, 100.0);
+
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   v[CPU_METER_FREQUENCY] = (ohost->cpuSpeed != -1) ? ohost->cpuSpeed : NAN;
+
+   return totalPercent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   long int usedMem = host->usedMem;
+   long int buffersMem = host->buffersMem;
+   long int cachedMem = host->cachedMem;
+   usedMem -= buffersMem + cachedMem;
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = usedMem;
+   // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+   // this->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   this->values[MEMORY_METER_BUFFERS] = buffersMem;
+   this->values[MEMORY_METER_CACHE] = cachedMem;
+   // this->values[MEMORY_METER_AVAILABLE] = "available memory"
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   // this->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // this->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   char errbuf[_POSIX2_LINE_MAX];
+   char* env;
+   char** ptr;
+   int count;
+   kvm_t* kt;
+   struct kinfo_proc* kproc;
+   size_t capacity = 4096, size = 0;
+
+   if ((kt = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL) {
+      return NULL;
+   }
+
+   if ((kproc = kvm_getprocs(kt, KERN_PROC_PID, pid,
+                             sizeof(struct kinfo_proc), &count)) == NULL) {
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   if ((ptr = kvm_getenvv(kt, kproc, 0)) == NULL) {
+      (void) kvm_close(kt);
+      return NULL;
+   }
+
+   env = xMalloc(capacity);
+   for (char** p = ptr; *p; p++) {
+      size_t len = strlen(*p) + 1;
+
+      while (size + len > capacity) {
+         if (capacity > (SIZE_MAX / 2)) {
+            free(env);
+            env = NULL;
+            goto end;
+         }
+
+         capacity *= 2;
+         env = xRealloc(env, capacity);
+      }
+
+      strlcpy(env + size, *p, len);
+      size += len;
+   }
+
+   if (size < 2 || env[size - 1] || env[size - 2]) {
+      if (size + 2 < capacity)
+         env = xRealloc(env, capacity + 2);
+      env[size] = 0;
+      env[size + 1] = 0;
+   }
+
+end:
+   (void) kvm_close(kt);
+   return env;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   static const int mib_kern_maxfile[] = { CTL_KERN, KERN_MAXFILES };
+   int sysctl_maxfile = 0;
+   size_t size_maxfile = sizeof(int);
+   if (sysctl(mib_kern_maxfile, ARRAYSIZE(mib_kern_maxfile), &sysctl_maxfile, &size_maxfile, NULL, 0) < 0) {
+      *max = NAN;
+   } else if (size_maxfile != sizeof(int) || sysctl_maxfile < 1) {
+      *max = NAN;
+   } else {
+      *max = sysctl_maxfile;
+   }
+
+   static const int mib_kern_nfiles[] = { CTL_KERN, KERN_NFILES };
+   int sysctl_nfiles = 0;
+   size_t size_nfiles = sizeof(int);
+   if (sysctl(mib_kern_nfiles, ARRAYSIZE(mib_kern_nfiles), &sysctl_nfiles, &size_nfiles, NULL, 0) < 0) {
+      *used = NAN;
+   } else if (size_nfiles != sizeof(int) || sysctl_nfiles < 0) {
+      *used = NAN;
+   } else {
+      *used = sysctl_nfiles;
+   }
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+static bool findDevice(const char* name, int* mib, struct sensordev* snsrdev, size_t* sdlen) {
+   for (int devn = 0;; devn++) {
+      mib[2] = devn;
+      if (sysctl(mib, 3, snsrdev, sdlen, NULL, 0) == -1) {
+         if (errno == ENXIO)
+            continue;
+         if (errno == ENOENT)
+            return false;
+      }
+      if (String_eq(name, snsrdev->xname)) {
+         return true;
+      }
+   }
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   int mib[] = {CTL_HW, HW_SENSORS, 0, 0, 0};
+   struct sensor s;
+   size_t slen = sizeof(struct sensor);
+   struct sensordev snsrdev;
+   size_t sdlen = sizeof(struct sensordev);
+
+   bool found = findDevice("acpibat0", mib, &snsrdev, &sdlen);
+
+   *percent = NAN;
+   if (found) {
+      /* last full capacity */
+      mib[3] = 7;
+      mib[4] = 0;
+      double last_full_capacity = 0;
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1)
+         last_full_capacity = s.value;
+      if (last_full_capacity > 0) {
+         /*  remaining capacity */
+         mib[3] = 7;
+         mib[4] = 3;
+         if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
+            double charge = s.value;
+            *percent = 100 * (charge / last_full_capacity);
+            if (charge >= last_full_capacity) {
+               *percent = 100;
+            }
+         }
+      }
+   }
+
+   found = findDevice("acpiac0", mib, &snsrdev, &sdlen);
+
+   *isOnAC = AC_ERROR;
+   if (found) {
+      mib[3] = 9;
+      mib[4] = 0;
+      if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1)
+         *isOnAC = s.value;
+   }
+}
diff --git a/openbsd/Platform.h b/openbsd/Platform.h
new file mode 100644
index 0000000..339616c
--- /dev/null
+++ b/openbsd/Platform.h
@@ -0,0 +1,132 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - openbsd/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 Michael McConville
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+/* see /usr/include/sys/signal.h */
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/openbsd/ProcessField.h b/openbsd/ProcessField.h
new file mode 100644
index 0000000..b8e8d6b
--- /dev/null
+++ b/openbsd/ProcessField.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_OpenBSDProcessField
+#define HEADER_OpenBSDProcessField
+/*
+htop - openbsd/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   // End of list
+
+
+#endif /* HEADER_OpenBSDProcessField */
diff --git a/pcp-htop.5.in b/pcp-htop.5.in
new file mode 100644
index 0000000..ebb4748
--- /dev/null
+++ b/pcp-htop.5.in
@@ -0,0 +1,237 @@
+.TH "PCP-HTOP" "5" "2024" "@PACKAGE_STRING@" "File Formats"
+.SH "NAME"
+\f3pcp-htop\f1 \- pcp-htop configuration file
+.SH "DESCRIPTION"
+.B pcp-htop
+is a customizable performance metrics reporting tool.
+It has a dynamic architecture, where a set of configuration files
+provide additional, optional meters and columns to extend the fixed
+set of display options provided by regular
+.BR htop .
+.LP
+These configuration files can be provided from both system-wide
+locations (first
+.I @sysconfdir@/pcp/htop
+then
+.IR @datarootdir@/pcp/htop )
+and below the user's home directory (usually
+.IR ~/.config/htop ).
+Within these locations the
+.I meters
+and
+.I columns
+are scanned for dynamic Meter and Column specifications.
+.LP
+Meters are displayed in the top part of the
+.B pcp-htop
+window, and columns are displayed in the lower part.
+Meters tend to display system-wide metrics, and Columns
+display metrics about individual processes.
+.LP
+The formats are similar but have slightly different requirements.
+Both formats follow the common ini-style. Blank lines are ignored.
+Lines starting with the "#" character are treated as comments.
+.SH "METERS"
+The following is an example configuration for a new Redis meter:
+.LP
+.ft CW
+.nf
+.in +0.5i
+[redisclient]
+caption = Redis clients
+type = bar
+blocked.metric = redis.blocked_clients
+blocked.color = blue
+blocked.label = blk
+clients.metric = redis.connected_clients
+clients.color = green
+clients.label = conn
+.in
+.fi
+.ft 1
+.LP
+A configuration file can contain multiple meter definitions.
+Each definition begins with a identifying name enclosed by
+square brackets \-
+.I redisclient
+in this example.
+The name is used internally within
+.B pcp-htop
+and must be unique, must begin with an alphabetic character,
+and may subsequently only contain alphanumeric characters or
+the underscore character.
+No whitespace or other characters are allowed.
+.LP
+There are several parameters that define the way the meter
+will be displayed to the user.
+.TP 5
+.B caption
+This value is displayed on the Setup screen once the meter
+has been selected.
+A truncated version of the
+.I caption
+will also be displayed (followed by a colon) on the primary
+display while the meter is updating.
+.TP
+.B description
+This can be used to provide more detail during the meter
+selection process on the Setup screen, and if present it is
+displayed in the "Available Meters" column.
+If not present, the
+.B caption
+will be used for this.
+If neither is present, the internal (mandatory)
+.B name
+will be used.
+.TP
+.B type
+This setting allows a preferred default meter type to be specified.
+The associated value must be one of
+.IR bar ,
+.IR text ,
+.IR graph ,
+or
+.IR led .
+If no value is provided for a dynamic meter, the default value of
+.IR text
+will be used.
+.TP
+.B maximum
+A numeric value can also be set to size the meter, such that
+values (e.g. for a
+.I bar
+type meter display) will be scaled within range zero to
+.IR maximum .
+.LP
+The remaining definition syntax describes the individual
+metric(s) which will be used to animate the meter.
+One or more metrics must be specified for each meter and
+there are several properties associated with each.
+Once again, these metrics must be named (the same rules
+described above for meters apply here) and the following
+properties can be configured:
+.TP 5
+.B name.metric
+This is the only mandatory field and associates a PCP metric
+with the meter.
+Values sampled for each metric at runtime provide the
+animation visible in the
+.B pcp-htop
+display.
+The metric specification can be either a PCP metric name as
+listed by
+.BR pminfo (1)
+or a "derived" metric expression.
+The format for derived metric expressions is described on the
+.BR pmRegisterDerived (3)
+manual page.
+.TP
+.B name.color
+Setting color to be used when rendering metric values.
+Possible values are
+.IR red ,
+.IR green ,
+.IR blue ,
+.IR cyan ,
+.IR magenta ,
+.IR yellow ,
+.IR gray ,
+.I darkgray
+or
+.IR white .
+.TP
+.B name.label
+An optional, short label to display before the metric value.
+The ":" character will be appended to the
+.I label
+before the metric value part of the display.
+.TP
+.B name.suffix
+An optional, short suffix to display after the metric value.
+Commonly used to indicate values as a percentage using a "%"
+.I suffix
+value and to provide the base unit of measurement.
+Note that since PCP maintains units for metrics, for those
+metrics that have dimension in "space" (bytes, kilobytes,
+megabytes, etc), a suffix will be automatically appended.
+.SH "COLUMNS"
+The following is an example configuration for a new column
+showing open file descriptors for each process:
+.LP
+.ft CW
+.nf
+.in +0.5i
+[openfds]
+heading = FDS
+caption = FDCOUNT
+description = Open file descriptors
+metric = proc.fd.count
+width = 3
+.in
+.fi
+.ft 1
+.LP
+A configuration file can contain multiple column definitions.
+Each definition begins with a identifying name enclosed
+by square brackets \-
+.I openfds
+in this example, and the same rules apply as described above
+for meter names.
+.LP
+Each column must specify a metric.
+Optional parameters can also be set.
+.TP 5
+.B metric
+As with meters, the metric value must be either a PCP metric
+name as listed by
+.BR pminfo (1)
+or a derived metric.
+The metric must have an instance domain (set of values) and
+that instance domain must map to the set of processes with
+the instance identifier being PIDs (process identifiers).
+Typically this will be metrics from the
+.I proc
+or
+.I hotproc
+namespace (\c
+.BR pmdaproc (1)),
+but metrics from other domains (\c
+.BR pmdabcc (1),
+.BR pmdabpf (1),
+etc) that have per-process values are equally applicable.
+.TP
+.B width
+Column width to use when displaying values for the metric.
+A negative value can be used to specify left alignment.
+An upper column limit of 28 characters is enforced.
+The default column width is 5 characters.
+.TP
+.B heading
+The short title that will be displayed at the head of the
+column \- usually a short, cryptic, all uppercase string.
+.TP
+.B caption
+A short identifying word presented to users on the Setup
+screen under both the Available and Active Columns lists.
+.TP
+.B description
+Text that assists users to understand the meaning of this
+column when it is being presented via the Setup screen in
+the Available Columns list.
+.SH "SEE ALSO"
+.BR pcp-htop (1),
+.BR pminfo (1),
+.BR pmcd (1),
+.BR pmdaproc (1),
+.BR pmdabcc (1),
+.BR pmdabpf (1)
+and
+.BR pmRegisterDerived (3).
+.SH "AUTHORS"
+.B htop
+was originally developed by Hisham Muhammad.
+Nowadays it is maintained by the community at <htop@groups.io>.
+.LP
+.B pcp-htop
+is maintained as a collaboration between the <htop@groups.io> and <pcp@groups.io>
+communities, and forms part of the Performance Co-Pilot suite of tools.
diff --git a/pcp-htop.c b/pcp-htop.c
new file mode 100644
index 0000000..ed585ec
--- /dev/null
+++ b/pcp-htop.c
@@ -0,0 +1,27 @@
+/*
+htop - pcp-htop.c
+(C) 2004-2011 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include <pcp/pmapi.h>
+
+#include "CommandLine.h"
+#include "Platform.h"
+
+
+const char* program = "pcp-htop";
+
+int main(int argc, char** argv) {
+   pmSetProgname(program);
+
+   /* extract environment variables */
+   opts.flags |= PM_OPTFLAG_ENV_ONLY;
+   (void)pmGetOptions(argc, argv, &opts);
+
+   return CommandLine_run(argc, argv);
+}
diff --git a/pcp/InDomTable.c b/pcp/InDomTable.c
new file mode 100644
index 0000000..2f9a500
--- /dev/null
+++ b/pcp/InDomTable.c
@@ -0,0 +1,99 @@
+/*
+htop - InDomTable.c
+(C) 2023 htop dev team
+(C) 2022-2023 Sohaib Mohammed
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/InDomTable.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "Hashtable.h"
+#include "Macros.h"
+#include "Platform.h"
+#include "Table.h"
+#include "Vector.h"
+#include "XUtils.h"
+
+#include "pcp/Instance.h"
+#include "pcp/Metric.h"
+#include "pcp/PCPDynamicColumn.h"
+
+
+InDomTable* InDomTable_new(Machine* host, pmInDom indom, int metricKey) {
+   InDomTable* this = xCalloc(1, sizeof(InDomTable));
+   Object_setClass(this, Class(InDomTable));
+   this->metricKey = metricKey;
+   this->id = indom;
+
+   Table* super = &this->super;
+   Table_init(super, Class(Row), host);
+
+   return this;
+}
+
+void InDomTable_done(InDomTable* this) {
+   Table_done(&this->super);
+}
+
+static void InDomTable_delete(Object* cast) {
+   InDomTable* this = (InDomTable*) cast;
+   InDomTable_done(this);
+   free(this);
+}
+
+static Instance* InDomTable_getInstance(InDomTable* this, int id, bool* preExisting) {
+   const Table* super = &this->super;
+   Instance* inst = (Instance*) Hashtable_get(super->table, id);
+   *preExisting = inst != NULL;
+   if (inst) {
+      assert(Vector_indexOf(super->rows, inst, Row_idEqualCompare) != -1);
+      assert(Instance_getId(inst) == id);
+   } else {
+      inst = Instance_new(super->host, this);
+      assert(inst->name == NULL);
+      Instance_setId(inst, id);
+   }
+   return inst;
+}
+
+static void InDomTable_goThroughEntries(InDomTable* this) {
+   Table* super = &this->super;
+
+   /* for every instance ... */
+   int instid = -1, offset = -1;
+   while (Metric_iterate(this->metricKey, &instid, &offset)) {
+      bool preExisting;
+      Instance* inst = InDomTable_getInstance(this, instid, &preExisting);
+      inst->offset = offset >= 0 ? offset : 0;
+
+      Row* row = (Row*) inst;
+      if (!preExisting)
+         Table_add(super, row);
+      row->updated = true;
+      row->show = true;
+   }
+}
+
+static void InDomTable_iterateEntries(Table* super) {
+   InDomTable* this = (InDomTable*) super;
+   InDomTable_goThroughEntries(this);
+}
+
+const TableClass InDomTable_class = {
+   .super = {
+      .extends = Class(Table),
+      .delete = InDomTable_delete,
+   },
+   .prepare = Table_prepareEntries,
+   .iterate = InDomTable_iterateEntries,
+   .cleanup = Table_cleanupEntries,
+};
diff --git a/pcp/InDomTable.h b/pcp/InDomTable.h
new file mode 100644
index 0000000..f44a39f
--- /dev/null
+++ b/pcp/InDomTable.h
@@ -0,0 +1,34 @@
+#ifndef HEADER_InDomTable
+#define HEADER_InDomTable
+/*
+htop - InDomTable.h
+(C) 2023 htop dev team
+(C) 2022-2023 Sohaib Mohammed
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Platform.h"
+#include "Table.h"
+
+
+typedef struct InDomTable_ {
+   Table super;
+   pmInDom id;  /* shared by metrics in the table */
+   unsigned int metricKey;  /* representative metric using this indom */
+} InDomTable;
+
+extern const TableClass InDomTable_class;
+
+InDomTable* InDomTable_new(Machine* host, pmInDom indom, int metricKey);
+
+void InDomTable_done(InDomTable* this);
+
+RowField RowField_keyAt(const Settings* settings, int at);
+
+void InDomTable_scan(Table* super);
+
+#endif
diff --git a/pcp/Instance.c b/pcp/Instance.c
new file mode 100644
index 0000000..8ae9051
--- /dev/null
+++ b/pcp/Instance.c
@@ -0,0 +1,163 @@
+/*
+htop - Instance.c
+(C) 2022-2023 Sohaib Mohammed
+(C) 2022-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/Instance.h"
+
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "DynamicColumn.h"
+#include "DynamicScreen.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Macros.h"
+#include "Metric.h"
+#include "Platform.h"
+#include "PCPDynamicColumn.h"
+#include "PCPDynamicScreen.h"
+#include "Row.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+#include "pcp/InDomTable.h"
+#include "pcp/Metric.h"
+
+
+Instance* Instance_new(const Machine* host, const InDomTable* indom) {
+   Instance* this = xCalloc(1, sizeof(Instance));
+   Object_setClass(this, Class(Instance));
+
+   Row* super = &this->super;
+   Row_init(super, host);
+
+   this->indom = indom;
+
+   return this;
+}
+
+void Instance_done(Instance* this) {
+   if (this->name)
+      free(this->name);
+   Row_done(&this->super);
+}
+
+static void Instance_delete(Object* cast) {
+   Instance* this = (Instance*) cast;
+   Instance_done(this);
+   free(this);
+}
+
+static void Instance_writeField(const Row* super, RichString* str, RowField field) {
+   const Instance* this = (const Instance*) super;
+   int instid = Instance_getId(this);
+
+   const Settings* settings = super->host->settings;
+   DynamicColumn* column = Hashtable_get(settings->dynamicColumns, field);
+   PCPDynamicColumn* cp = (PCPDynamicColumn*) column;
+   if (!cp)
+      return;
+
+   pmAtomValue atom;
+   pmAtomValue* ap = &atom;
+   const pmDesc* descp = Metric_desc(cp->id);
+   if (!Metric_instance(cp->id, instid, this->offset, ap, descp->type))
+      ap = NULL;
+
+   PCPDynamicColumn_writeAtomValue(cp, str, settings, cp->id, instid, descp, ap);
+
+   if (ap && descp->type == PM_TYPE_STRING)
+      free(ap->cp);
+}
+
+static const char* Instance_externalName(Row* super) {
+   Instance* this = (Instance*) super;
+
+   if (!this->name)
+      /* ignore any failure here - its safe and we try again next time */
+      (void)pmNameInDom(InDom_getId(this), Instance_getId(this), &this->name);
+   return this->name;
+}
+
+static int Instance_compareByKey(const Row* v1, const Row* v2, int key) {
+   const Instance* i1 = (const Instance*)v1;
+   const Instance* i2 = (const Instance*)v2;
+
+   if (key < 0)
+      return 0;
+
+   Hashtable* dc = Platform_dynamicColumns();
+   const PCPDynamicColumn* column = Hashtable_get(dc, key);
+   if (!column)
+      return -1;
+
+   size_t metric = column->id;
+   unsigned int type = Metric_type(metric);
+
+   pmAtomValue atom1 = {0}, atom2 = {0};
+   if (!Metric_instance(metric, i1->offset, i1->offset, &atom1, type) ||
+       !Metric_instance(metric, i2->offset, i2->offset, &atom2, type)) {
+      if (type == PM_TYPE_STRING) {
+         free(atom1.cp);
+         free(atom2.cp);
+      }
+      return -1;
+   }
+
+   switch (type) {
+      case PM_TYPE_STRING: {
+         int cmp = SPACESHIP_NULLSTR(atom2.cp, atom1.cp);
+         free(atom2.cp);
+         free(atom1.cp);
+         return cmp;
+      }
+      case PM_TYPE_32:
+         return SPACESHIP_NUMBER(atom2.l, atom1.l);
+      case PM_TYPE_U32:
+         return SPACESHIP_NUMBER(atom2.ul, atom1.ul);
+      case PM_TYPE_64:
+         return SPACESHIP_NUMBER(atom2.ll, atom1.ll);
+      case PM_TYPE_U64:
+         return SPACESHIP_NUMBER(atom2.ull, atom1.ull);
+      case PM_TYPE_FLOAT:
+         return SPACESHIP_NUMBER(atom2.f, atom1.f);
+      case PM_TYPE_DOUBLE:
+         return SPACESHIP_NUMBER(atom2.d, atom1.d);
+      default:
+         break;
+   }
+
+   return 0;
+}
+
+static int Instance_compare(const void* v1, const void* v2) {
+   const Instance* i1 = (const Instance*)v1;
+   const Instance* i2 = (const Instance*)v2;
+   const ScreenSettings* ss = i1->super.host->settings->ss;
+   RowField key = ScreenSettings_getActiveSortKey(ss);
+   int result = Instance_compareByKey(v1, v2, key);
+
+   // Implement tie-breaker (needed to make tree mode more stable)
+   if (!result)
+      return SPACESHIP_NUMBER(Instance_getId(i1), Instance_getId(i2));
+
+   return (ScreenSettings_getActiveDirection(ss) == 1) ? result : -result;
+}
+
+const RowClass Instance_class = {
+   .super = {
+      .extends = Class(Row),
+      .display = Row_display,
+      .delete = Instance_delete,
+      .compare = Instance_compare,
+   },
+   .sortKeyString = Instance_externalName,
+   .writeField = Instance_writeField,
+};
diff --git a/pcp/Instance.h b/pcp/Instance.h
new file mode 100644
index 0000000..aefd642
--- /dev/null
+++ b/pcp/Instance.h
@@ -0,0 +1,37 @@
+#ifndef HEADER_Instance
+#define HEADER_Instance
+/*
+htop - Instance.h
+(C) 2022-2023 htop dev team
+(C) 2022-2023 Sohaib Mohammed
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Hashtable.h"
+#include "Object.h"
+#include "Platform.h"
+#include "Row.h"
+
+
+typedef struct Instance_ {
+   Row super;
+
+   char* name; /* external instance name */
+   const struct InDomTable_* indom;  /* instance domain */
+
+   /* default result offset to use for searching metrics with instances */
+   unsigned int offset;
+} Instance;
+
+#define InDom_getId(i_)          ((i_)->indom->id)
+#define Instance_getId(i_)       ((i_)->super.id)
+#define Instance_setId(i_, id_)  ((i_)->super.id = (id_))
+
+extern const RowClass Instance_class;
+
+Instance* Instance_new(const Machine* host, const struct InDomTable_* indom);
+
+void Instance_done(Instance* this);
+
+#endif
diff --git a/pcp/Metric.c b/pcp/Metric.c
new file mode 100644
index 0000000..4a3c858
--- /dev/null
+++ b/pcp/Metric.c
@@ -0,0 +1,200 @@
+/*
+htop - Metric.c
+(C) 2020-2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/Metric.h"
+
+#include <ctype.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "XUtils.h"
+
+#include "pcp/Platform.h"
+
+
+extern Platform* pcp;
+
+const pmDesc* Metric_desc(Metric metric) {
+   return &pcp->descs[metric];
+}
+
+int Metric_type(Metric metric) {
+   return pcp->descs[metric].type;
+}
+
+pmAtomValue* Metric_values(Metric metric, pmAtomValue* atom, int count, int type) {
+   if (pcp->result == NULL)
+      return NULL;
+
+   pmValueSet* vset = pcp->result->vset[metric];
+   if (!vset || vset->numval <= 0)
+      return NULL;
+
+   /* extract requested number of values as requested type */
+   const pmDesc* desc = &pcp->descs[metric];
+   for (int i = 0; i < vset->numval; i++) {
+      if (i == count)
+         break;
+      const pmValue* value = &vset->vlist[i];
+      int sts = pmExtractValue(vset->valfmt, value, desc->type, &atom[i], type);
+      if (sts < 0) {
+         if (pmDebugOptions.appl0)
+            fprintf(stderr, "Error: cannot extract metric value: %s\n",
+                            pmErrStr(sts));
+         memset(&atom[i], 0, sizeof(pmAtomValue));
+      }
+   }
+   return atom;
+}
+
+int Metric_instanceCount(Metric metric) {
+   pmValueSet* vset = pcp->result->vset[metric];
+   if (vset)
+      return vset->numval;
+   return 0;
+}
+
+int Metric_instanceOffset(Metric metric, int inst) {
+   pmValueSet* vset = pcp->result->vset[metric];
+   if (!vset || vset->numval <= 0)
+      return 0;
+
+   /* search for optimal offset for subsequent inst lookups to begin */
+   for (int i = 0; i < vset->numval; i++) {
+      if (inst == vset->vlist[i].inst)
+         return i;
+   }
+   return 0;
+}
+
+static pmAtomValue* Metric_extract(Metric metric, int inst, int offset, pmValueSet* vset, pmAtomValue* atom, int type) {
+
+   /* extract value (using requested type) of given metric instance */
+   const pmDesc* desc = &pcp->descs[metric];
+   const pmValue* value = &vset->vlist[offset];
+   int sts = pmExtractValue(vset->valfmt, value, desc->type, atom, type);
+   if (sts < 0) {
+      if (pmDebugOptions.appl0)
+         fprintf(stderr, "Error: cannot extract %s instance %d value: %s\n",
+                         pcp->names[metric], inst, pmErrStr(sts));
+      memset(atom, 0, sizeof(pmAtomValue));
+   }
+   return atom;
+}
+
+pmAtomValue* Metric_instance(Metric metric, int inst, int offset, pmAtomValue* atom, int type) {
+
+   pmValueSet* vset = pcp->result->vset[metric];
+   if (!vset || vset->numval <= 0)
+      return NULL;
+
+   /* fast-path using heuristic offset based on expected location */
+   if (offset >= 0 && offset < vset->numval && inst == vset->vlist[offset].inst)
+      return Metric_extract(metric, inst, offset, vset, atom, type);
+
+   /* slow-path using a linear search for the requested instance */
+   for (int i = 0; i < vset->numval; i++) {
+      if (inst == vset->vlist[i].inst)
+         return Metric_extract(metric, inst, i, vset, atom, type);
+   }
+   return NULL;
+}
+
+/*
+ * Iterate over a set of instances (incl PM_IN_NULL)
+ * returning the next instance identifier and offset.
+ *
+ * Start it off by passing offset -1 into the routine.
+ */
+bool Metric_iterate(Metric metric, int* instp, int* offsetp) {
+   if (!pcp->result)
+      return false;
+
+   pmValueSet* vset = pcp->result->vset[metric];
+   if (!vset || vset->numval <= 0)
+      return false;
+
+   int offset = *offsetp;
+   offset = (offset < 0) ? 0 : offset + 1;
+   if (offset > vset->numval - 1)
+      return false;
+
+   *offsetp = offset;
+   *instp = vset->vlist[offset].inst;
+   return true;
+}
+
+/* Switch on/off a metric for value fetching (sampling) */
+void Metric_enable(Metric metric, bool enable) {
+   pcp->fetch[metric] = enable ? pcp->pmids[metric] : PM_ID_NULL;
+}
+
+bool Metric_enabled(Metric metric) {
+   return pcp->fetch[metric] != PM_ID_NULL;
+}
+
+void Metric_enableThreads(void) {
+   pmValueSet* vset = xCalloc(1, sizeof(pmValueSet));
+   vset->vlist[0].inst = PM_IN_NULL;
+   vset->vlist[0].value.lval = 1;
+   vset->valfmt = PM_VAL_INSITU;
+   vset->numval = 1;
+   vset->pmid = pcp->pmids[PCP_CONTROL_THREADS];
+
+   pmResult* result = xCalloc(1, sizeof(pmResult));
+   result->vset[0] = vset;
+   result->numpmid = 1;
+
+   int sts = pmStore(result);
+   if (sts < 0 && pmDebugOptions.appl0)
+      fprintf(stderr, "Error: cannot enable threads: %s\n", pmErrStr(sts));
+
+   pmFreeResult(result);
+}
+
+bool Metric_fetch(struct timeval* timestamp) {
+   if (pcp->result) {
+      pmFreeResult(pcp->result);
+      pcp->result = NULL;
+   }
+   int sts, count = 0;
+   do {
+      sts = pmFetch(pcp->totalMetrics, pcp->fetch, &pcp->result);
+   } while (sts == PM_ERR_IPC && ++count < 3);
+   if (sts < 0) {
+      if (pmDebugOptions.appl0)
+         fprintf(stderr, "Error: cannot fetch metric values: %s\n",
+                 pmErrStr(sts));
+      return false;
+   }
+   if (timestamp)
+      *timestamp = pcp->result->timestamp;
+   return true;
+}
+
+void Metric_externalName(Metric metric, int inst, char** externalName) {
+   const pmDesc* desc = &pcp->descs[metric];
+   /* ignore a failure here - its safe to do so */
+   (void)pmNameInDom(desc->indom, inst, externalName);
+}
+
+int Metric_lookupText(const char* metric, char** desc) {
+   pmID pmid;
+   int sts;
+
+   sts = pmLookupName(1, &metric, &pmid);
+   if (sts < 0)
+      return sts;
+
+   if (pmLookupText(pmid, PM_TEXT_ONELINE, desc) >= 0)
+      (*desc)[0] = toupper((*desc)[0]); /* UI consistency */
+   return 0;
+}
diff --git a/pcp/Metric.h b/pcp/Metric.h
new file mode 100644
index 0000000..e72f6e1
--- /dev/null
+++ b/pcp/Metric.h
@@ -0,0 +1,189 @@
+#ifndef HEADER_Metric
+#define HEADER_Metric
+/*
+htop - Metric.h
+(C) 2020-2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <ctype.h>
+#include <stdbool.h>
+#include <pcp/pmapi.h>
+#include <sys/time.h>
+
+/* use htop config.h values for these macros, not pcp values */
+#undef PACKAGE_URL
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+
+
+typedef enum Metric_ {
+   PCP_CONTROL_THREADS,         /* proc.control.perclient.threads */
+
+   PCP_HINV_NCPU,               /* hinv.ncpu */
+   PCP_HINV_CPUCLOCK,           /* hinv.cpu.clock */
+   PCP_UNAME_SYSNAME,           /* kernel.uname.sysname */
+   PCP_UNAME_RELEASE,           /* kernel.uname.release */
+   PCP_UNAME_MACHINE,           /* kernel.uname.machine */
+   PCP_UNAME_DISTRO,            /* kernel.uname.distro */
+   PCP_LOAD_AVERAGE,            /* kernel.all.load */
+   PCP_PID_MAX,                 /* kernel.all.pid_max */
+   PCP_UPTIME,                  /* kernel.all.uptime */
+   PCP_BOOTTIME,                /* kernel.all.boottime */
+   PCP_CPU_USER,                /* kernel.all.cpu.user */
+   PCP_CPU_NICE,                /* kernel.all.cpu.nice */
+   PCP_CPU_SYSTEM,              /* kernel.all.cpu.sys */
+   PCP_CPU_IDLE,                /* kernel.all.cpu.idle */
+   PCP_CPU_IOWAIT,              /* kernel.all.cpu.wait.total */
+   PCP_CPU_IRQ,                 /* kernel.all.cpu.intr */
+   PCP_CPU_SOFTIRQ,             /* kernel.all.cpu.irq.soft */
+   PCP_CPU_STEAL,               /* kernel.all.cpu.steal */
+   PCP_CPU_GUEST,               /* kernel.all.cpu.guest */
+   PCP_CPU_GUESTNICE,           /* kernel.all.cpu.guest_nice */
+   PCP_PERCPU_USER,             /* kernel.percpu.cpu.user */
+   PCP_PERCPU_NICE,             /* kernel.percpu.cpu.nice */
+   PCP_PERCPU_SYSTEM,           /* kernel.percpu.cpu.sys */
+   PCP_PERCPU_IDLE,             /* kernel.percpu.cpu.idle */
+   PCP_PERCPU_IOWAIT,           /* kernel.percpu.cpu.wait.total */
+   PCP_PERCPU_IRQ,              /* kernel.percpu.cpu.intr */
+   PCP_PERCPU_SOFTIRQ,          /* kernel.percpu.cpu.irq.soft */
+   PCP_PERCPU_STEAL,            /* kernel.percpu.cpu.steal */
+   PCP_PERCPU_GUEST,            /* kernel.percpu.cpu.guest */
+   PCP_PERCPU_GUESTNICE,        /* kernel.percpu.cpu.guest_nice */
+   PCP_MEM_TOTAL,               /* mem.physmem */
+   PCP_MEM_FREE,                /* mem.util.free */
+   PCP_MEM_BUFFERS,             /* mem.util.bufmem */
+   PCP_MEM_CACHED,              /* mem.util.cached */
+   PCP_MEM_SHARED,              /* mem.util.shared */
+   PCP_MEM_AVAILABLE,           /* mem.util.available */
+   PCP_MEM_SRECLAIM,            /* mem.util.slabReclaimable */
+   PCP_MEM_SWAPCACHED,          /* mem.util.swapCached */
+   PCP_MEM_SWAPTOTAL,           /* mem.util.swapTotal */
+   PCP_MEM_SWAPFREE,            /* mem.util.swapFree */
+   PCP_DISK_READB,              /* disk.all.read_bytes */
+   PCP_DISK_WRITEB,             /* disk.all.write_bytes */
+   PCP_DISK_ACTIVE,             /* disk.all.avactive */
+   PCP_NET_RECVB,               /* network.all.in.bytes */
+   PCP_NET_SENDB,               /* network.all.out.bytes */
+   PCP_NET_RECVP,               /* network.all.in.packets */
+   PCP_NET_SENDP,               /* network.all.out.packets */
+   PCP_PSI_CPUSOME,             /* kernel.all.pressure.cpu.some.avg */
+   PCP_PSI_IOSOME,              /* kernel.all.pressure.io.some.avg */
+   PCP_PSI_IOFULL,              /* kernel.all.pressure.io.full.avg */
+   PCP_PSI_IRQFULL,             /* kernel.all.pressure.irq.full.avg */
+   PCP_PSI_MEMSOME,             /* kernel.all.pressure.memory.some.avg */
+   PCP_PSI_MEMFULL,             /* kernel.all.pressure.memory.full.avg */
+   PCP_ZFS_ARC_ANON_SIZE,       /* zfs.arc.anon_size */
+   PCP_ZFS_ARC_BONUS_SIZE,      /* zfs.arc.bonus_size */
+   PCP_ZFS_ARC_COMPRESSED_SIZE, /* zfs.arc.compressed_size */
+   PCP_ZFS_ARC_UNCOMPRESSED_SIZE, /* zfs.arc.uncompressed_size */
+   PCP_ZFS_ARC_C_MIN,           /* zfs.arc.c_min */
+   PCP_ZFS_ARC_C_MAX,           /* zfs.arc.c_max */
+   PCP_ZFS_ARC_DBUF_SIZE,       /* zfs.arc.dbuf_size */
+   PCP_ZFS_ARC_DNODE_SIZE,      /* zfs.arc.dnode_size */
+   PCP_ZFS_ARC_HDR_SIZE,        /* zfs.arc.hdr_size */
+   PCP_ZFS_ARC_MFU_SIZE,        /* zfs.arc.mfu_size */
+   PCP_ZFS_ARC_MRU_SIZE,        /* zfs.arc.mru_size */
+   PCP_ZFS_ARC_SIZE,            /* zfs.arc.size */
+   PCP_ZRAM_CAPACITY,           /* zram.capacity */
+   PCP_ZRAM_ORIGINAL,           /* zram.mm_stat.data_size.original */
+   PCP_ZRAM_COMPRESSED,         /* zram.mm_stat.data_size.compressed */
+   PCP_MEM_ZSWAP,               /* mem.util.zswap */
+   PCP_MEM_ZSWAPPED,            /* mem.util.zswapped */
+   PCP_VFS_FILES_COUNT,         /* vfs.files.count */
+   PCP_VFS_FILES_MAX,           /* vfs.files.max */
+
+   PCP_PROC_PID,                /* proc.psinfo.pid */
+   PCP_PROC_PPID,               /* proc.psinfo.ppid */
+   PCP_PROC_TGID,               /* proc.psinfo.tgid */
+   PCP_PROC_PGRP,               /* proc.psinfo.pgrp */
+   PCP_PROC_SESSION,            /* proc.psinfo.session */
+   PCP_PROC_STATE,              /* proc.psinfo.sname */
+   PCP_PROC_TTY,                /* proc.psinfo.tty */
+   PCP_PROC_TTYPGRP,            /* proc.psinfo.tty_pgrp */
+   PCP_PROC_MINFLT,             /* proc.psinfo.minflt */
+   PCP_PROC_MAJFLT,             /* proc.psinfo.maj_flt */
+   PCP_PROC_CMINFLT,            /* proc.psinfo.cmin_flt */
+   PCP_PROC_CMAJFLT,            /* proc.psinfo.cmaj_flt */
+   PCP_PROC_UTIME,              /* proc.psinfo.utime */
+   PCP_PROC_STIME,              /* proc.psinfo.stime */
+   PCP_PROC_CUTIME,             /* proc.psinfo.cutime */
+   PCP_PROC_CSTIME,             /* proc.psinfo.cstime */
+   PCP_PROC_PRIORITY,           /* proc.psinfo.priority */
+   PCP_PROC_NICE,               /* proc.psinfo.nice */
+   PCP_PROC_THREADS,            /* proc.psinfo.threads */
+   PCP_PROC_STARTTIME,          /* proc.psinfo.start_time */
+   PCP_PROC_PROCESSOR,          /* proc.psinfo.processor */
+   PCP_PROC_CMD,                /* proc.psinfo.cmd */
+   PCP_PROC_PSARGS,             /* proc.psinfo.psargs */
+   PCP_PROC_CGROUPS,            /* proc.psinfo.cgroups */
+   PCP_PROC_OOMSCORE,           /* proc.psinfo.oom_score */
+   PCP_PROC_VCTXSW,             /* proc.psinfo.vctxsw */
+   PCP_PROC_NVCTXSW,            /* proc.psinfo.nvctxsw */
+   PCP_PROC_LABELS,             /* proc.psinfo.labels */
+   PCP_PROC_ENVIRON,            /* proc.psinfo.environ */
+   PCP_PROC_TTYNAME,            /* proc.psinfo.ttyname */
+   PCP_PROC_EXE,                /* proc.psinfo.exe */
+   PCP_PROC_CWD,                /* proc.psinfo.cwd */
+
+   PCP_PROC_AUTOGROUP_ID,       /* proc.autogroup.id */
+   PCP_PROC_AUTOGROUP_NICE,     /* proc.autogroup.nice */
+
+   PCP_PROC_ID_UID,             /* proc.id.uid */
+   PCP_PROC_ID_USER,            /* proc.id.uid_nm */
+
+   PCP_PROC_IO_RCHAR,           /* proc.io.rchar */
+   PCP_PROC_IO_WCHAR,           /* proc.io.wchar */
+   PCP_PROC_IO_SYSCR,           /* proc.io.syscr */
+   PCP_PROC_IO_SYSCW,           /* proc.io.syscw */
+   PCP_PROC_IO_READB,           /* proc.io.read_bytes */
+   PCP_PROC_IO_WRITEB,          /* proc.io.write_bytes */
+   PCP_PROC_IO_CANCELLED,       /* proc.io.cancelled_write_bytes */
+
+   PCP_PROC_MEM_SIZE,           /* proc.memory.size */
+   PCP_PROC_MEM_RSS,            /* proc.memory.rss */
+   PCP_PROC_MEM_SHARE,          /* proc.memory.share */
+   PCP_PROC_MEM_TEXTRS,         /* proc.memory.textrss */
+   PCP_PROC_MEM_LIBRS,          /* proc.memory.librss */
+   PCP_PROC_MEM_DATRS,          /* proc.memory.datrss */
+   PCP_PROC_MEM_DIRTY,          /* proc.memory.dirty */
+
+   PCP_PROC_SMAPS_PSS,          /* proc.smaps.pss */
+   PCP_PROC_SMAPS_SWAP,         /* proc.smaps.swap */
+   PCP_PROC_SMAPS_SWAPPSS,      /* proc.smaps.swappss */
+
+   PCP_METRIC_COUNT             /* total metric count */
+} Metric;
+
+void Metric_enable(Metric metric, bool enable);
+
+bool Metric_enabled(Metric metric);
+
+void Metric_enableThreads(void);
+
+bool Metric_fetch(struct timeval* timestamp);
+
+bool Metric_iterate(Metric metric, int* instp, int* offsetp);
+
+pmAtomValue* Metric_values(Metric metric, pmAtomValue* atom, int count, int type);
+
+const pmDesc* Metric_desc(Metric metric);
+
+int Metric_type(Metric metric);
+
+int Metric_instanceCount(Metric metric);
+
+int Metric_instanceOffset(Metric metric, int inst);
+
+pmAtomValue* Metric_instance(Metric metric, int inst, int offset, pmAtomValue* atom, int type);
+
+void Metric_externalName(Metric metric, int inst, char** externalName);
+
+int Metric_lookupText(const char* metric, char** desc);
+
+#endif
diff --git a/pcp/PCPDynamicColumn.c b/pcp/PCPDynamicColumn.c
new file mode 100644
index 0000000..b0bd03e
--- /dev/null
+++ b/pcp/PCPDynamicColumn.c
@@ -0,0 +1,516 @@
+/*
+htop - PCPDynamicColumn.c
+(C) 2021-2023 Sohaib Mohammed
+(C) 2021-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPDynamicColumn.h"
+
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Platform.h"
+#include "Process.h"
+#include "ProcessTable.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+#include "linux/CGroupUtils.h"
+#include "pcp/Metric.h"
+#include "pcp/PCPProcess.h"
+
+
+static bool PCPDynamicColumn_addMetric(PCPDynamicColumns* columns, PCPDynamicColumn* column) {
+   if (!column->super.name[0])
+      return false;
+
+   size_t bytes = 16 + strlen(column->super.name);
+   char* metricName = xMalloc(bytes);
+   xSnprintf(metricName, bytes, "htop.column.%s", column->super.name);
+
+   column->metricName = metricName;
+   column->id = columns->offset + columns->cursor;
+   columns->cursor++;
+
+   Platform_addMetric(column->id, metricName);
+   return true;
+}
+
+static void PCPDynamicColumn_parseMetric(PCPDynamicColumns* columns, PCPDynamicColumn* column, const char* path, unsigned int line, char* value) {
+   /* pmLookupText */
+   if (!column->super.description)
+      Metric_lookupText(value, &column->super.description);
+
+   /* lookup a dynamic metric with this name, else create */
+   if (PCPDynamicColumn_addMetric(columns, column) == false)
+      return;
+
+   /* derived metrics in all dynamic columns for simplicity */
+   char* error;
+   if (pmRegisterDerivedMetric(column->metricName, value, &error) < 0) {
+      char* note;
+      xAsprintf(&note,
+                "%s: failed to parse expression in %s at line %u\n%s\n",
+                pmGetProgname(), path, line, error);
+      free(error);
+      errno = EINVAL;
+      CRT_fatalError(note);
+      free(note);
+   }
+}
+
+// Ensure a valid name for use in a PCP metric name and in htoprc
+static bool PCPDynamicColumn_validateColumnName(char* key, const char* path, unsigned int line) {
+   char* p = key;
+   char* end = strrchr(key, ']');
+
+   if (end) {
+      *end = '\0';
+   } else {
+      fprintf(stderr,
+                "%s: no closing brace on column name at %s line %u\n\"%s\"",
+                pmGetProgname(), path, line, key);
+      return false;
+   }
+
+   while (*p) {
+      if (p == key) {
+         if (!isalpha(*p) && *p != '_')
+            break;
+      } else {
+         if (!isalnum(*p) && *p != '_')
+            break;
+      }
+      p++;
+   }
+   if (*p != '\0') { /* badness */
+      fprintf(stderr,
+                "%s: invalid column name at %s line %u\n\"%s\"",
+                pmGetProgname(), path, line, key);
+      return false;
+   }
+   return true;
+}
+
+// Ensure a column name has not been defined previously
+static bool PCPDynamicColumn_uniqueName(char* key, PCPDynamicColumns* columns) {
+   return DynamicColumn_search(columns->table, key, NULL) == NULL;
+}
+
+static PCPDynamicColumn* PCPDynamicColumn_new(PCPDynamicColumns* columns, const char* name) {
+   PCPDynamicColumn* column = xCalloc(1, sizeof(*column));
+   String_safeStrncpy(column->super.name, name, sizeof(column->super.name));
+   column->super.enabled = false;
+   column->percent = false;
+   column->instances = false;
+   column->defaultEnabled = true;
+
+   size_t id = columns->count + LAST_PROCESSFIELD;
+   Hashtable_put(columns->table, id, column);
+   columns->count++;
+
+   return column;
+}
+
+static void PCPDynamicColumn_parseFile(PCPDynamicColumns* columns, const char* path) {
+   FILE* file = fopen(path, "r");
+   if (!file)
+      return;
+
+   PCPDynamicColumn* column = NULL;
+   unsigned int lineno = 0;
+   bool ok = true;
+   for (;;) {
+      char* line = String_readLine(file);
+      if (!line)
+         break;
+      lineno++;
+
+      /* cleanup whitespace, skip comment lines */
+      char* trimmed = String_trim(line);
+      free(line);
+      if (!trimmed || !trimmed[0] || trimmed[0] == '#') {
+         free(trimmed);
+         continue;
+      }
+
+      size_t n;
+      char** config = String_split(trimmed, '=', &n);
+      free(trimmed);
+      if (config == NULL)
+         continue;
+
+      char* key = String_trim(config[0]);
+      char* value = n > 1 ? String_trim(config[1]) : NULL;
+      if (key[0] == '[') {  /* new section heading - i.e. new column */
+         ok = PCPDynamicColumn_validateColumnName(key + 1, path, lineno);
+         if (ok)
+            ok = PCPDynamicColumn_uniqueName(key + 1, columns);
+         if (ok)
+            column = PCPDynamicColumn_new(columns, key + 1);
+      } else if (value && column && String_eq(key, "caption")) {
+         free_and_xStrdup(&column->super.caption, value);
+      } else if (value && column && String_eq(key, "heading")) {
+         free_and_xStrdup(&column->super.heading, value);
+      } else if (value && column && String_eq(key, "description")) {
+         free_and_xStrdup(&column->super.description, value);
+      } else if (value && column && String_eq(key, "width")) {
+         column->super.width = strtoul(value, NULL, 10);
+      } else if (value && column && String_eq(key, "format")) {
+         free_and_xStrdup(&column->format, value);
+      } else if (value && column && String_eq(key, "instances")) {
+         if (String_eq(value, "True") || String_eq(value, "true"))
+            column->instances = true;
+      } else if (value && column && (String_eq(key, "default") || String_eq(key, "enabled"))) {
+         if (String_eq(value, "False") || String_eq(value, "false"))
+            column->defaultEnabled = false;
+      } else if (value && column && String_eq(key, "metric")) {
+         PCPDynamicColumn_parseMetric(columns, column, path, lineno, value);
+      }
+      String_freeArray(config);
+      free(value);
+      free(key);
+   }
+   fclose(file);
+}
+
+static void PCPDynamicColumn_scanDir(PCPDynamicColumns* columns, char* path) {
+   DIR* dir = opendir(path);
+   if (!dir)
+      return;
+
+   struct dirent* dirent;
+   while ((dirent = readdir(dir)) != NULL) {
+      if (dirent->d_name[0] == '.')
+         continue;
+
+      char* file = String_cat(path, dirent->d_name);
+      PCPDynamicColumn_parseFile(columns, file);
+      free(file);
+   }
+   closedir(dir);
+}
+
+void PCPDynamicColumns_init(PCPDynamicColumns* columns) {
+   const char* share = pmGetConfig("PCP_SHARE_DIR");
+   const char* sysconf = pmGetConfig("PCP_SYSCONF_DIR");
+   const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
+   const char* override = getenv("PCP_HTOP_DIR");
+   const char* home = getenv("HOME");
+   char* path;
+
+   if (!xdgConfigHome && !home) {
+      const struct passwd* pw = getpwuid(getuid());
+      if (pw)
+         home = pw->pw_dir;
+   }
+
+   columns->table = Hashtable_new(0, true);
+
+   /* developer paths - PCP_HTOP_DIR=./pcp ./pcp-htop */
+   if (override) {
+      path = String_cat(override, "/columns/");
+      PCPDynamicColumn_scanDir(columns, path);
+      free(path);
+   }
+
+   /* next, search in home directory alongside htoprc */
+   if (xdgConfigHome)
+      path = String_cat(xdgConfigHome, "/htop/columns/");
+   else if (home)
+      path = String_cat(home, "/.config/htop/columns/");
+   else
+      path = NULL;
+   if (path) {
+      PCPDynamicColumn_scanDir(columns, path);
+      free(path);
+   }
+
+   /* next, search in the system columns directory */
+   path = String_cat(sysconf, "/htop/columns/");
+   PCPDynamicColumn_scanDir(columns, path);
+   free(path);
+
+   /* next, try the readonly system columns directory */
+   path = String_cat(share, "/htop/columns/");
+   PCPDynamicColumn_scanDir(columns, path);
+   free(path);
+}
+
+void PCPDynamicColumn_done(PCPDynamicColumn* this) {
+   DynamicColumn_done(&this->super);
+   free(this->metricName);
+   free(this->format);
+}
+
+static void PCPDynamicColumns_free(ATTR_UNUSED ht_key_t key, void* value, ATTR_UNUSED void* data) {
+   PCPDynamicColumn* column = (PCPDynamicColumn*) value;
+   PCPDynamicColumn_done(column);
+}
+
+void PCPDynamicColumns_done(Hashtable* table) {
+   Hashtable_foreach(table, PCPDynamicColumns_free, NULL);
+}
+
+static void PCPDynamicColumn_setupWidth(ATTR_UNUSED ht_key_t key, void* value, ATTR_UNUSED void* data) {
+   PCPDynamicColumn* column = (PCPDynamicColumn*) value;
+
+   /* calculate column size based on config file and metric units */
+   const pmDesc* desc = Metric_desc(column->id);
+
+   if (column->instances || desc->type == PM_TYPE_STRING) {
+      column->super.width = column->width;
+      if (column->super.width == 0)
+         column->super.width = -16;
+      return;
+   }
+
+   if (column->format) {
+      if (strcmp(column->format, "percent") == 0) {
+         column->super.width = 5;
+         return;
+      }
+      if (strcmp(column->format, "process") == 0) {
+         column->super.width = Process_pidDigits;
+         return;
+      }
+   }
+
+   if (column->width) {
+      column->super.width = column->width;
+      return;
+   }
+
+   pmUnits units = desc->units;
+   if (units.dimSpace && units.dimTime)
+      column->super.width = 11; // Row_printRate
+   else if (units.dimSpace)
+      column->super.width = 5;  // Row_printBytes
+   else if (units.dimCount && units.dimTime)
+      column->super.width = 11;  // Row_printCount
+   else if (units.dimTime)
+      column->super.width = 8;  // Row_printTime
+   else
+      column->super.width = 11; // Row_printCount
+}
+
+void PCPDynamicColumns_setupWidths(PCPDynamicColumns* columns) {
+   Hashtable_foreach(columns->table, PCPDynamicColumn_setupWidth, NULL);
+}
+
+/* normalize output units to bytes and seconds */
+static int PCPDynamicColumn_normalize(const pmDesc* desc, const pmAtomValue* ap, double* value) {
+   /* form normalized units based on the original metric units */
+   pmUnits units = desc->units;
+   if (units.dimTime)
+      units.scaleTime = PM_TIME_SEC;
+   if (units.dimSpace)
+      units.scaleSpace = PM_SPACE_BYTE;
+   if (units.dimCount)
+      units.scaleCount = PM_COUNT_ONE;
+
+   pmAtomValue atom;
+   int sts, type = desc->type;
+   if ((sts = pmConvScale(type, ap, &desc->units, &atom, &units)) < 0)
+      return sts;
+
+   switch (type) {
+      case PM_TYPE_32:
+         *value = (double) atom.l;
+         break;
+      case PM_TYPE_U32:
+         *value = (double) atom.ul;
+         break;
+      case PM_TYPE_64:
+         *value = (double) atom.ll;
+         break;
+      case PM_TYPE_U64:
+         *value = (double) atom.ull;
+         break;
+      case PM_TYPE_FLOAT:
+         *value = (double) atom.f;
+         break;
+      case PM_TYPE_DOUBLE:
+         *value = atom.d;
+         break;
+      default:
+         return PM_ERR_CONV;
+   }
+
+   return 0;
+}
+
+void PCPDynamicColumn_writeAtomValue(PCPDynamicColumn* column, RichString* str, const struct Settings_* settings, int metric, int instance, const pmDesc* desc, const void* atom) {
+   const pmAtomValue* atomvalue = (const pmAtomValue*) atom;
+   char buffer[DYNAMIC_MAX_COLUMN_WIDTH + /*space*/ 1 + /*null*/ 1];
+   int attr = CRT_colors[DEFAULT_COLOR];
+   int width = column->super.width;
+   int n;
+
+   if (!width || abs(width) > DYNAMIC_MAX_COLUMN_WIDTH)
+      width = DYNAMIC_DEFAULT_COLUMN_WIDTH;
+   int abswidth = abs(width);
+   if (abswidth > DYNAMIC_MAX_COLUMN_WIDTH) {
+      abswidth = DYNAMIC_MAX_COLUMN_WIDTH;
+      width = -abswidth;
+   }
+
+   if (atomvalue == NULL) {
+      n = xSnprintf(buffer, sizeof(buffer), "%*.*s ", width, abswidth, "N/A");
+      RichString_appendnAscii(str, CRT_colors[PROCESS_SHADOW], buffer, n);
+      return;
+   }
+
+   /* deal with instance names and metrics with string values first */
+   if (column->instances || desc->type == PM_TYPE_STRING) {
+      char* value = NULL;
+      char* dupd1 = NULL;
+      if (column->instances) {
+         attr = CRT_colors[DYNAMIC_GRAY];
+         Metric_externalName(metric, instance, &dupd1);
+         value = dupd1;
+      } else {
+         attr = CRT_colors[DYNAMIC_GREEN];
+         value = atomvalue->cp;
+      }
+      if (column->format && value) {
+         char* dupd2 = NULL;
+         if (strcmp(column->format, "command") == 0)
+            attr = CRT_colors[PROCESS_COMM];
+         else if (strcmp(column->format, "process") == 0)
+            attr = CRT_colors[PROCESS_SHADOW];
+         else if (strcmp(column->format, "device") == 0 && strncmp(value, "/dev/", 5) == 0)
+            value += 5;
+         else if (strcmp(column->format, "cgroup") == 0 && (dupd2 = CGroup_filterName(value)))
+            value = dupd2;
+         n = xSnprintf(buffer, sizeof(buffer), "%*.*s ", width, abswidth, value);
+         if (dupd2)
+            free(dupd2);
+      } else if (value) {
+         n = xSnprintf(buffer, sizeof(buffer), "%*.*s ", width, abswidth, value);
+      } else {
+         n = xSnprintf(buffer, sizeof(buffer), "%*.*s ", width, abswidth, "N/A");
+      }
+      if (dupd1)
+         free(dupd1);
+      RichString_appendnAscii(str, attr, buffer, n);
+      return;
+   }
+
+   /* deal with any numeric value - first, normalize units to bytes/seconds */
+   double value;
+   if (PCPDynamicColumn_normalize(desc, atomvalue, &value) < 0) {
+      n = xSnprintf(buffer, sizeof(buffer), "%*.*s ", width, abswidth, "no conv");
+      RichString_appendnAscii(str, CRT_colors[METER_VALUE_ERROR], buffer, n);
+      return;
+   }
+
+   if (column->format) {
+      if (strcmp(column->format, "percent") == 0) {
+         n = Row_printPercentage(value, buffer, sizeof(buffer), width, &attr);
+         RichString_appendnAscii(str, attr, buffer, n);
+         return;
+      }
+      if (strcmp(column->format, "process") == 0) {
+         n = xSnprintf(buffer, sizeof(buffer), "%*d ", Row_pidDigits, (int)value);
+         RichString_appendnAscii(str, attr, buffer, n);
+         return;
+      }
+   }
+
+   /* width overrides unit suffix and coloring; too complex for a corner case */
+   if (column->width) {
+      if (value - (unsigned long long)value > 0)  /* display floating point */
+         n = xSnprintf(buffer, sizeof(buffer), "%*.2f ", width, value);
+      else   /* display as integer */
+         n = xSnprintf(buffer, sizeof(buffer), "%*llu ", width, (unsigned long long)value);
+      RichString_appendnAscii(str, CRT_colors[PROCESS], buffer, n);
+      return;
+   }
+
+   bool coloring = settings->highlightMegabytes;
+   pmUnits units = desc->units;
+   if (units.dimSpace && units.dimTime)
+      Row_printRate(str, value, coloring);
+   else if (units.dimSpace)
+      Row_printBytes(str, value, coloring);
+   else if (units.dimCount)
+      Row_printCount(str, value, coloring);
+   else if (units.dimTime)
+      Row_printTime(str, value / 10 /* hundreds of a second */, coloring);
+   else
+      Row_printCount(str, value, 0);  /* e.g. PID */
+}
+
+void PCPDynamicColumn_writeField(PCPDynamicColumn* this, const Process* proc, RichString* str) {
+   const Settings* settings = proc->super.host->settings;
+   const PCPProcess* pp = (const PCPProcess*) proc;
+   const pmDesc* desc = Metric_desc(this->id);
+   pid_t pid = Process_getPid(proc);
+
+   pmAtomValue atom;
+   pmAtomValue* ap = &atom;
+   if (!Metric_instance(this->id, pid, pp->offset, ap, desc->type))
+      ap = NULL;
+
+   PCPDynamicColumn_writeAtomValue(this, str, settings, this->id, pid, desc, ap);
+}
+
+int PCPDynamicColumn_compareByKey(const PCPProcess* p1, const PCPProcess* p2, ProcessField key) {
+   const Process* proc = &p1->super;
+   const Settings* settings = proc->super.host->settings;
+   const PCPDynamicColumn* column = Hashtable_get(settings->dynamicColumns, key);
+
+   if (!column)
+      return -1;
+
+   size_t metric = column->id;
+   unsigned int type = Metric_type(metric);
+
+   pmAtomValue atom1 = {0}, atom2 = {0};
+   if (!Metric_instance(metric, Process_getPid(&p1->super), p1->offset, &atom1, type) ||
+       !Metric_instance(metric, Process_getPid(&p2->super), p2->offset, &atom2, type)) {
+      if (type == PM_TYPE_STRING) {
+         free(atom1.cp);
+         free(atom2.cp);
+      }
+      return -1;
+   }
+
+   switch (type) {
+      case PM_TYPE_STRING: {
+         int cmp = SPACESHIP_NULLSTR(atom2.cp, atom1.cp);
+         free(atom2.cp);
+         free(atom1.cp);
+         return cmp;
+      }
+      case PM_TYPE_32:
+         return SPACESHIP_NUMBER(atom2.l, atom1.l);
+      case PM_TYPE_U32:
+         return SPACESHIP_NUMBER(atom2.ul, atom1.ul);
+      case PM_TYPE_64:
+         return SPACESHIP_NUMBER(atom2.ll, atom1.ll);
+      case PM_TYPE_U64:
+         return SPACESHIP_NUMBER(atom2.ull, atom1.ull);
+      case PM_TYPE_FLOAT:
+         return compareRealNumbers(atom2.f, atom1.f);
+      case PM_TYPE_DOUBLE:
+         return compareRealNumbers(atom2.d, atom1.d);
+      default:
+         break;
+   }
+
+   return -1;
+}
diff --git a/pcp/PCPDynamicColumn.h b/pcp/PCPDynamicColumn.h
new file mode 100644
index 0000000..ade782b
--- /dev/null
+++ b/pcp/PCPDynamicColumn.h
@@ -0,0 +1,54 @@
+#ifndef HEADER_PCPDynamicColumn
+#define HEADER_PCPDynamicColumn
+/*
+htop - PCPDynamicColumn.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+
+#include "DynamicColumn.h"
+#include "Hashtable.h"
+#include "Process.h"
+#include "RichString.h"
+
+#include "pcp/PCPProcess.h"
+
+
+struct pmDesc;
+
+typedef struct PCPDynamicColumn_ {
+   DynamicColumn super;
+   char* metricName;
+   char* format;
+   size_t id;  /* identifier for metric array lookups */
+   int width;  /* optional width from configuration file */
+   bool defaultEnabled;  /* default enabled in dynamic screen */
+   bool percent;
+   bool instances;  /* an instance *names* column, not values */
+} PCPDynamicColumn;
+
+typedef struct PCPDynamicColumns_ {
+   Hashtable* table;
+   size_t count;  /* count of dynamic columns discovered by scan */
+   size_t offset; /* start offset into the Platform metric array */
+   size_t cursor; /* identifier allocator for each new metric used */
+} PCPDynamicColumns;
+
+void PCPDynamicColumns_init(PCPDynamicColumns* columns);
+
+void PCPDynamicColumns_done(Hashtable* table);
+
+void PCPDynamicColumns_setupWidths(PCPDynamicColumns* columns);
+
+void PCPDynamicColumn_writeField(PCPDynamicColumn* this, const Process* proc, RichString* str);
+
+void PCPDynamicColumn_writeAtomValue(PCPDynamicColumn* column, RichString* str, const struct Settings_* settings, int metric, int instance, const struct pmDesc* desc, const void* atomvalue);
+
+int PCPDynamicColumn_compareByKey(const PCPProcess* p1, const PCPProcess* p2, ProcessField key);
+
+void PCPDynamicColumn_done(PCPDynamicColumn* this);
+
+#endif
diff --git a/pcp/PCPDynamicMeter.c b/pcp/PCPDynamicMeter.c
new file mode 100644
index 0000000..11df5f0
--- /dev/null
+++ b/pcp/PCPDynamicMeter.c
@@ -0,0 +1,473 @@
+/*
+htop - PCPDynamicMeter.c
+(C) 2021 htop dev team
+(C) 2021 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPDynamicMeter.h"
+
+#include <ctype.h>
+#include <dirent.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <pcp/pmapi.h>
+
+#include "Macros.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+#include "pcp/Metric.h"
+
+
+static PCPDynamicMetric* PCPDynamicMeter_lookupMetric(PCPDynamicMeters* meters, PCPDynamicMeter* meter, const char* name) {
+   size_t bytes = 16 + strlen(meter->super.name) + strlen(name);
+   char* metricName = xMalloc(bytes);
+   xSnprintf(metricName, bytes, "htop.meter.%s.%s", meter->super.name, name);
+
+   PCPDynamicMetric* metric;
+   for (size_t i = 0; i < meter->totalMetrics; i++) {
+      metric = &meter->metrics[i];
+      if (String_eq(metric->name, metricName)) {
+         free(metricName);
+         return metric;
+      }
+   }
+
+   /* not an existing metric in this meter - add it */
+   size_t n = meter->totalMetrics + 1;
+   meter->metrics = xReallocArray(meter->metrics, n, sizeof(PCPDynamicMetric));
+   meter->totalMetrics = n;
+   metric = &meter->metrics[n - 1];
+   memset(metric, 0, sizeof(PCPDynamicMetric));
+   metric->name = metricName;
+   metric->label = String_cat(name, ": ");
+   metric->id = meters->offset + meters->cursor;
+   meters->cursor++;
+
+   Platform_addMetric(metric->id, metricName);
+
+   return metric;
+}
+
+static void PCPDynamicMeter_parseMetric(PCPDynamicMeters* meters, PCPDynamicMeter* meter, const char* path, unsigned int line, char* key, char* value) {
+   PCPDynamicMetric* metric;
+   char* p;
+
+   if ((p = strchr(key, '.')) == NULL)
+      return;
+   *p++ = '\0'; /* end the name, p is now the attribute, e.g. 'label' */
+
+   if (String_eq(p, "metric")) {
+      /* lookup a dynamic metric with this name, else create */
+      metric = PCPDynamicMeter_lookupMetric(meters, meter, key);
+
+      /* use derived metrics in dynamic meters for simplicity */
+      char* error;
+      if (pmRegisterDerivedMetric(metric->name, value, &error) < 0) {
+         char* note;
+         xAsprintf(&note,
+                   "%s: failed to parse expression in %s at line %u\n%s\n%s",
+                   pmGetProgname(), path, line, error, pmGetProgname());
+         free(error);
+         errno = EINVAL;
+         CRT_fatalError(note);
+         free(note);
+      }
+   } else {
+      /* this is a property of a dynamic metric - the metric expression */
+      /* may not have been observed yet - i.e. we allow for any ordering */
+      metric = PCPDynamicMeter_lookupMetric(meters, meter, key);
+      if (String_eq(p, "color")) {
+         if (String_eq(value, "gray"))
+            metric->color = DYNAMIC_GRAY;
+         else if (String_eq(value, "darkgray"))
+            metric->color = DYNAMIC_DARKGRAY;
+         else if (String_eq(value, "red"))
+            metric->color = DYNAMIC_RED;
+         else if (String_eq(value, "green"))
+            metric->color = DYNAMIC_GREEN;
+         else if (String_eq(value, "blue"))
+            metric->color = DYNAMIC_BLUE;
+         else if (String_eq(value, "cyan"))
+            metric->color = DYNAMIC_CYAN;
+         else if (String_eq(value, "magenta"))
+            metric->color = DYNAMIC_MAGENTA;
+         else if (String_eq(value, "yellow"))
+            metric->color = DYNAMIC_YELLOW;
+         else if (String_eq(value, "white"))
+            metric->color = DYNAMIC_WHITE;
+      } else if (String_eq(p, "label")) {
+         char* label = String_cat(value, ": ");
+         free_and_xStrdup(&metric->label, label);
+         free(label);
+      } else if (String_eq(p, "suffix")) {
+         free_and_xStrdup(&metric->suffix, value);
+      }
+   }
+}
+
+// Ensure a valid name for use in a PCP metric name and in htoprc
+static bool PCPDynamicMeter_validateMeterName(char* key, const char* path, unsigned int line) {
+   char* p = key;
+   char* end = strrchr(key, ']');
+
+   if (end) {
+      *end = '\0';
+   } else {
+      fprintf(stderr,
+              "%s: no closing brace on meter name at %s line %u\n\"%s\"\n",
+              pmGetProgname(), path, line, key);
+      return false;
+   }
+
+   while (*p) {
+      if (p == key) {
+         if (!isalpha(*p) && *p != '_')
+            break;
+      } else {
+         if (!isalnum(*p) && *p != '_')
+            break;
+      }
+      p++;
+   }
+   if (*p != '\0') { /* badness */
+      fprintf(stderr,
+              "%s: invalid meter name at %s line %u\n\"%s\"\n",
+              pmGetProgname(), path, line, key);
+      return false;
+   }
+   return true;
+}
+
+// Ensure a meter name has not been defined previously
+static bool PCPDynamicMeter_uniqueName(char* key, PCPDynamicMeters* meters) {
+   return !DynamicMeter_search(meters->table, key, NULL);
+}
+
+static PCPDynamicMeter* PCPDynamicMeter_new(PCPDynamicMeters* meters, const char* name) {
+   PCPDynamicMeter* meter = xCalloc(1, sizeof(*meter));
+   String_safeStrncpy(meter->super.name, name, sizeof(meter->super.name));
+   Hashtable_put(meters->table, ++meters->count, meter);
+   return meter;
+}
+
+static void PCPDynamicMeter_parseFile(PCPDynamicMeters* meters, const char* path) {
+   FILE* file = fopen(path, "r");
+   if (!file)
+      return;
+
+   PCPDynamicMeter* meter = NULL;
+   unsigned int lineno = 0;
+   bool ok = true;
+   for (;;) {
+      char* line = String_readLine(file);
+      if (!line)
+         break;
+      lineno++;
+
+      /* cleanup whitespace, skip comment lines */
+      char* trimmed = String_trim(line);
+      free(line);
+      if (trimmed[0] == '#' || trimmed[0] == '\0') {
+         free(trimmed);
+         continue;
+      }
+
+      size_t n;
+      char** config = String_split(trimmed, '=', &n);
+      free(trimmed);
+      if (config == NULL)
+         continue;
+
+      char* key = String_trim(config[0]);
+      char* value = n > 1 ? String_trim(config[1]) : NULL;
+      if (key[0] == '[') {  /* new section heading - i.e. new meter */
+         ok = PCPDynamicMeter_validateMeterName(key + 1, path, lineno);
+         if (ok)
+            ok = PCPDynamicMeter_uniqueName(key + 1, meters);
+         if (ok)
+            meter = PCPDynamicMeter_new(meters, key + 1);
+      } else if (!ok) {
+         ;  /* skip this one, we're looking for a new header */
+      } else if (value && meter && String_eq(key, "caption")) {
+         char* caption = String_cat(value, ": ");
+         if (caption) {
+            free_and_xStrdup(&meter->super.caption, caption);
+            free(caption);
+            caption = NULL;
+         }
+      } else if (value && meter && String_eq(key, "description")) {
+         free_and_xStrdup(&meter->super.description, value);
+      } else if (value && meter && String_eq(key, "type")) {
+         if (String_eq(config[1], "bar"))
+            meter->super.type = BAR_METERMODE;
+         else if (String_eq(config[1], "text"))
+            meter->super.type = TEXT_METERMODE;
+         else if (String_eq(config[1], "graph"))
+            meter->super.type = GRAPH_METERMODE;
+         else if (String_eq(config[1], "led"))
+            meter->super.type = LED_METERMODE;
+      } else if (value && meter && String_eq(key, "maximum")) {
+         meter->super.maximum = strtod(value, NULL);
+      } else if (value && meter) {
+         PCPDynamicMeter_parseMetric(meters, meter, path, lineno, key, value);
+      }
+      String_freeArray(config);
+      free(value);
+      free(key);
+   }
+   fclose(file);
+}
+
+static void PCPDynamicMeter_scanDir(PCPDynamicMeters* meters, char* path) {
+   DIR* dir = opendir(path);
+   if (!dir)
+      return;
+
+   struct dirent* dirent;
+   while ((dirent = readdir(dir)) != NULL) {
+      if (dirent->d_name[0] == '.')
+         continue;
+
+      char* file = String_cat(path, dirent->d_name);
+      PCPDynamicMeter_parseFile(meters, file);
+      free(file);
+   }
+   closedir(dir);
+}
+
+void PCPDynamicMeters_init(PCPDynamicMeters* meters) {
+   const char* share = pmGetConfig("PCP_SHARE_DIR");
+   const char* sysconf = pmGetConfig("PCP_SYSCONF_DIR");
+   const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
+   const char* override = getenv("PCP_HTOP_DIR");
+   const char* home = getenv("HOME");
+   char* path;
+
+   if (!xdgConfigHome && !home) {
+      const struct passwd* pw = getpwuid(getuid());
+      if (pw)
+         home = pw->pw_dir;
+   }
+
+   meters->table = Hashtable_new(0, true);
+
+   /* developer paths - PCP_HTOP_DIR=./pcp ./pcp-htop */
+   if (override) {
+      path = String_cat(override, "/meters/");
+      PCPDynamicMeter_scanDir(meters, path);
+      free(path);
+   }
+
+   /* next, search in home directory alongside htoprc */
+   if (xdgConfigHome)
+      path = String_cat(xdgConfigHome, "/htop/meters/");
+   else if (home)
+      path = String_cat(home, "/.config/htop/meters/");
+   else
+      path = NULL;
+   if (path) {
+      PCPDynamicMeter_scanDir(meters, path);
+      free(path);
+   }
+
+   /* next, search in the system meters directory */
+   path = String_cat(sysconf, "/htop/meters/");
+   PCPDynamicMeter_scanDir(meters, path);
+   free(path);
+
+   /* next, try the readonly system meters directory */
+   path = String_cat(share, "/htop/meters/");
+   PCPDynamicMeter_scanDir(meters, path);
+   free(path);
+}
+
+static void PCPDynamicMeter_free(ATTR_UNUSED ht_key_t key, void* value, ATTR_UNUSED void* data) {
+   PCPDynamicMeter* meter = (PCPDynamicMeter*) value;
+   for (size_t i = 0; i < meter->totalMetrics; i++) {
+      free(meter->metrics[i].name);
+      free(meter->metrics[i].label);
+      free(meter->metrics[i].suffix);
+   }
+   free(meter->metrics);
+   free(meter->super.caption);
+   free(meter->super.description);
+}
+
+void PCPDynamicMeters_done(Hashtable* table) {
+   Hashtable_foreach(table, PCPDynamicMeter_free, NULL);
+}
+
+void PCPDynamicMeter_enable(PCPDynamicMeter* this) {
+   for (size_t i = 0; i < this->totalMetrics; i++)
+      Metric_enable(this->metrics[i].id, true);
+}
+
+void PCPDynamicMeter_updateValues(PCPDynamicMeter* this, Meter* meter) {
+   char* buffer = meter->txtBuffer;
+   size_t size = sizeof(meter->txtBuffer);
+   size_t bytes = 0;
+
+   for (size_t i = 0; i < this->totalMetrics; i++) {
+      if (i > 0 && bytes < size - 1)
+         buffer[bytes++] = '/';  /* separator */
+
+      PCPDynamicMetric* metric = &this->metrics[i];
+      const pmDesc* desc = Metric_desc(metric->id);
+      pmAtomValue atom, raw;
+
+      if (!Metric_values(metric->id, &raw, 1, desc->type)) {
+         bytes--; /* clear the separator */
+         continue;
+      }
+
+      pmUnits conv = desc->units;  /* convert to canonical units */
+      if (conv.dimSpace)
+         conv.scaleSpace = PM_SPACE_KBYTE;
+      if (conv.dimTime)
+         conv.scaleTime = PM_TIME_SEC;
+      if (desc->type == PM_TYPE_STRING)
+         atom = raw;
+      else if (pmConvScale(desc->type, &raw, &desc->units, &atom, &conv) < 0) {
+         bytes--; /* clear the separator */
+         continue;
+      }
+
+      size_t saved = bytes;
+      switch (desc->type) {
+         case PM_TYPE_STRING:
+            bytes += xSnprintf(buffer + bytes, size - bytes, "%s", atom.cp);
+            free(atom.cp);
+            break;
+         case PM_TYPE_32:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, (double) atom.l, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%d", atom.l);
+            break;
+         case PM_TYPE_U32:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, (double) atom.ul, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%u", atom.ul);
+            break;
+         case PM_TYPE_64:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, (double) atom.ll, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%lld", (long long) atom.ll);
+            break;
+         case PM_TYPE_U64:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, (double) atom.ull, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%llu", (unsigned long long) atom.ull);
+            break;
+         case PM_TYPE_FLOAT:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, (double) atom.f, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%.2f", (double) atom.f);
+            break;
+         case PM_TYPE_DOUBLE:
+            bytes += conv.dimSpace ?
+               Meter_humanUnit(buffer + bytes, atom.d, size - bytes) :
+               xSnprintf(buffer + bytes, size - bytes, "%.2f", atom.d);
+            break;
+         default:
+            break;
+      }
+
+      if (saved != bytes && metric->suffix)
+         bytes += xSnprintf(buffer + bytes, size - bytes, "%s", metric->suffix);
+   }
+
+   if (!bytes)
+      xSnprintf(buffer, size, "no data");
+}
+
+void PCPDynamicMeter_display(PCPDynamicMeter* this, ATTR_UNUSED const Meter* meter, RichString* out) {
+   int nodata = 1;
+
+   for (size_t i = 0; i < this->totalMetrics; i++) {
+      PCPDynamicMetric* metric = &this->metrics[i];
+      const pmDesc* desc = Metric_desc(metric->id);
+      pmAtomValue atom, raw;
+      char buffer[64];
+
+      if (!Metric_values(metric->id, &raw, 1, desc->type))
+         continue;
+
+      pmUnits conv = desc->units;  /* convert to canonical units */
+      if (conv.dimSpace)
+         conv.scaleSpace = PM_SPACE_KBYTE;
+      if (conv.dimTime)
+         conv.scaleTime = PM_TIME_SEC;
+      if (desc->type == PM_TYPE_STRING)
+         atom = raw;
+      else if (pmConvScale(desc->type, &raw, &desc->units, &atom, &conv) < 0)
+         continue;
+
+      nodata = 0;  /* we will use this metric so *some* data will be added */
+
+      if (i > 0)
+         RichString_appendnAscii(out, CRT_colors[metric->color], " ", 1);
+
+      if (metric->label)
+         RichString_appendAscii(out, CRT_colors[METER_TEXT], metric->label);
+
+      int len = 0;
+      switch (desc->type) {
+         case PM_TYPE_STRING:
+            len = xSnprintf(buffer, sizeof(buffer), "%s", atom.cp);
+            free(atom.cp);
+            break;
+         case PM_TYPE_32:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, (double) atom.l, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%d", atom.l);
+            break;
+         case PM_TYPE_U32:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, (double) atom.ul, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%u", atom.ul);
+            break;
+         case PM_TYPE_64:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, (double) atom.ll, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%lld", (long long) atom.ll);
+            break;
+         case PM_TYPE_U64:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, (double) atom.ull, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%llu", (unsigned long long) atom.ull);
+            break;
+         case PM_TYPE_FLOAT:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, (double) atom.f, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%.2f", (double) atom.f);
+            break;
+         case PM_TYPE_DOUBLE:
+            len = conv.dimSpace ?
+               Meter_humanUnit(buffer, atom.d, sizeof(buffer)) :
+               xSnprintf(buffer, sizeof(buffer), "%.2f", atom.d);
+            break;
+         default:
+            break;
+      }
+
+      if (len) {
+         RichString_appendnAscii(out, CRT_colors[metric->color], buffer, len);
+         if (metric->suffix)
+            RichString_appendAscii(out, CRT_colors[METER_TEXT], metric->suffix);
+      }
+   }
+
+   if (nodata)
+      RichString_writeAscii(out, CRT_colors[METER_VALUE_ERROR], "no data");
+}
diff --git a/pcp/PCPDynamicMeter.h b/pcp/PCPDynamicMeter.h
new file mode 100644
index 0000000..3a72d13
--- /dev/null
+++ b/pcp/PCPDynamicMeter.h
@@ -0,0 +1,50 @@
+#ifndef HEADER_PCPDynamicMeter
+#define HEADER_PCPDynamicMeter
+/*
+htop - PCPDynamicMeter.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+
+#include "CRT.h"
+#include "DynamicMeter.h"
+#include "Hashtable.h"
+#include "Meter.h"
+#include "RichString.h"
+
+
+typedef struct PCPDynamicMetric_ {
+   size_t id; /* index into metric array */
+   ColorElements color;
+   char* name; /* derived metric name */
+   char* label;
+   char* suffix;
+} PCPDynamicMetric;
+
+typedef struct PCPDynamicMeter_ {
+   DynamicMeter super;
+   PCPDynamicMetric* metrics;
+   size_t totalMetrics;
+} PCPDynamicMeter;
+
+typedef struct PCPDynamicMeters_ {
+   Hashtable* table;
+   size_t count;  /* count of dynamic meters discovered by scan */
+   size_t offset; /* start offset into the Platform metric array */
+   size_t cursor; /* identifier allocator for each new metric used */
+} PCPDynamicMeters;
+
+void PCPDynamicMeters_init(PCPDynamicMeters* meters);
+
+void PCPDynamicMeters_done(Hashtable* table);
+
+void PCPDynamicMeter_enable(PCPDynamicMeter* this);
+
+void PCPDynamicMeter_updateValues(PCPDynamicMeter* this, Meter* meter);
+
+void PCPDynamicMeter_display(PCPDynamicMeter* this, const Meter* meter, RichString* out);
+
+#endif
diff --git a/pcp/PCPDynamicScreen.c b/pcp/PCPDynamicScreen.c
new file mode 100644
index 0000000..2222822
--- /dev/null
+++ b/pcp/PCPDynamicScreen.c
@@ -0,0 +1,407 @@
+/*
+htop - PCPDynamicScreen.c
+(C) 2022 Sohaib Mohammed
+(C) 2022-2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPDynamicScreen.h"
+
+#include <ctype.h>
+#include <dirent.h>
+#include <stdbool.h>
+#include <pcp/pmapi.h>
+
+#include "AvailableColumnsPanel.h"
+#include "Macros.h"
+#include "Platform.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+#include "pcp/InDomTable.h"
+#include "pcp/PCPDynamicColumn.h"
+
+
+static char* formatFields(PCPDynamicScreen* screen) {
+   char* columns = strdup("");
+
+   for (size_t j = 0; j < screen->totalColumns; j++) {
+      const PCPDynamicColumn* column = screen->columns[j];
+      if (column->super.enabled == false)
+         continue;
+      char* prefix = columns;
+      xAsprintf(&columns, "%s Dynamic(%s)", prefix, column->super.name);
+      free(prefix);
+   }
+
+   return columns;
+}
+
+static void PCPDynamicScreens_appendDynamicColumns(PCPDynamicScreens* screens, PCPDynamicColumns* columns) {
+   for (size_t i = 0; i < screens->count; i++) {
+      PCPDynamicScreen* screen = Hashtable_get(screens->table, i);
+      if (!screen)
+         return;
+
+      /* setup default fields (columns) based on configuration */
+      for (size_t j = 0; j < screen->totalColumns; j++) {
+         PCPDynamicColumn* column = screen->columns[j];
+
+         column->id = columns->offset + columns->cursor;
+         columns->cursor++;
+         Platform_addMetric(column->id, column->metricName);
+
+         size_t id = columns->count + LAST_PROCESSFIELD;
+         Hashtable_put(columns->table, id, column);
+         columns->count++;
+
+         if (j == 0) {
+            const pmDesc* desc = Metric_desc(column->id);
+            assert(desc->indom != PM_INDOM_NULL);
+            screen->indom = desc->indom;
+            screen->key = column->id;
+         }
+      }
+      screen->super.columnKeys = formatFields(screen);
+   }
+}
+
+static PCPDynamicColumn* PCPDynamicScreen_lookupMetric(PCPDynamicScreen* screen, const char* name) {
+   PCPDynamicColumn* column = NULL;
+   size_t bytes = strlen(name) + strlen(screen->super.name) + 1; /* colon */
+   if (bytes >= sizeof(column->super.name))
+      return NULL;
+
+   bytes += 16; /* prefix, dots and terminator */
+   char* metricName = xMalloc(bytes);
+   xSnprintf(metricName, bytes, "htop.screen.%s.%s", screen->super.name, name);
+
+   for (size_t i = 0; i < screen->totalColumns; i++) {
+      column = screen->columns[i];
+      if (String_eq(column->metricName, metricName)) {
+         free(metricName);
+         return column;
+      }
+   }
+
+   /* not an existing column in this screen - create it and add to the list */
+   column = xCalloc(1, sizeof(PCPDynamicColumn));
+   xSnprintf(column->super.name, sizeof(column->super.name), "%s:%s", screen->super.name, name);
+   column->super.table = &screen->table->super;
+   column->metricName = metricName;
+   column->super.enabled = true;
+
+   size_t n = screen->totalColumns + 1;
+   screen->columns = xReallocArray(screen->columns, n, sizeof(PCPDynamicColumn*));
+   screen->columns[n - 1] = column;
+   screen->totalColumns = n;
+
+   return column;
+}
+
+static void PCPDynamicScreen_parseColumn(PCPDynamicScreen* screen, const char* path, unsigned int line, char* key, char* value) {
+   PCPDynamicColumn* column;
+   char* p;
+
+   if ((p = strchr(key, '.')) == NULL)
+      return;
+   *p++ = '\0'; /* end the name, p is now the attribute, e.g. 'label' */
+
+   /* lookup a dynamic column with this name, else create */
+   column = PCPDynamicScreen_lookupMetric(screen, key);
+
+   if (String_eq(p, "metric")) {
+      char* error;
+      if (pmRegisterDerivedMetric(column->metricName, value, &error) < 0) {
+         char* note;
+         xAsprintf(&note,
+                   "%s: failed to parse expression in %s at line %u\n%s\n",
+                   pmGetProgname(), path, line, error);
+         free(error);
+         errno = EINVAL;
+         CRT_fatalError(note);
+         free(note);
+      }
+
+      /* pmLookupText - add optional metric help text */
+      if (!column->super.description && !column->instances)
+         Metric_lookupText(value, &column->super.description);
+
+   } else {
+      /* this is a property of a dynamic column - the column expression */
+      /* may not have been observed yet; i.e. we allow for any ordering */
+
+      if (String_eq(p, "caption")) {
+         free_and_xStrdup(&column->super.caption, value);
+      } else if (String_eq(p, "heading")) {
+         free_and_xStrdup(&column->super.heading, value);
+      } else if (String_eq(p, "description")) {
+         free_and_xStrdup(&column->super.description, value);
+      } else if (String_eq(p, "width")) {
+         column->width = strtoul(value, NULL, 10);
+      } else if (String_eq(p, "format")) {
+         free_and_xStrdup(&column->format, value);
+      } else if (String_eq(p, "instances")) {
+         if (String_eq(value, "True") || String_eq(value, "true"))
+            column->instances = true;
+         free_and_xStrdup(&column->super.description, screen->super.caption);
+      } else if (String_eq(p, "default")) { /* displayed by default */
+         if (String_eq(value, "False") || String_eq(value, "false"))
+            column->defaultEnabled = column->super.enabled = false;
+      }
+   }
+}
+
+static bool PCPDynamicScreen_validateScreenName(char* key, const char* path, unsigned int line) {
+   char* p = key;
+   char* end = strrchr(key, ']');
+
+   if (end) {
+      *end = '\0';
+   } else {
+      fprintf(stderr,
+            "%s: no closing brace on screen name at %s line %u\n\"%s\"",
+            pmGetProgname(), path, line, key);
+      return false;
+   }
+
+   while (*p) {
+      if (p == key) {
+         if (!isalpha(*p) && *p != '_')
+            break;
+      } else {
+         if (!isalnum(*p) && *p != '_')
+            break;
+      }
+      p++;
+   }
+   if (*p != '\0') { /* badness */
+      fprintf(stderr,
+            "%s: invalid screen name at %s line %u\n\"%s\"",
+            pmGetProgname(), path, line, key);
+      return false;
+   }
+   return true;
+}
+
+/* Ensure a screen name has not been defined previously */
+static bool PCPDynamicScreen_uniqueName(char* key, PCPDynamicScreens* screens) {
+   return !DynamicScreen_search(screens->table, key, NULL);
+}
+
+static PCPDynamicScreen* PCPDynamicScreen_new(PCPDynamicScreens* screens, const char* name) {
+   PCPDynamicScreen* screen = xCalloc(1, sizeof(*screen));
+   String_safeStrncpy(screen->super.name, name, sizeof(screen->super.name));
+   screen->defaultEnabled = true;
+
+   size_t id = screens->count;
+   Hashtable_put(screens->table, id, screen);
+   screens->count++;
+
+   return screen;
+}
+
+static void PCPDynamicScreen_parseFile(PCPDynamicScreens* screens, const char* path) {
+   FILE* file = fopen(path, "r");
+   if (!file)
+      return;
+
+   PCPDynamicScreen* screen = NULL;
+   unsigned int lineno = 0;
+   bool ok = true;
+   for (;;) {
+      char* line = String_readLine(file);
+      if (!line)
+         break;
+      lineno++;
+
+      /* cleanup whitespace, skip comment lines */
+      char* trimmed = String_trim(line);
+      free(line);
+      if (!trimmed || !trimmed[0] || trimmed[0] == '#') {
+         free(trimmed);
+         continue;
+      }
+
+      size_t n;
+      char** config = String_split(trimmed, '=', &n);
+      free(trimmed);
+      if (config == NULL)
+         continue;
+
+      char* key = String_trim(config[0]);
+      char* value = n > 1 ? String_trim(config[1]) : NULL;
+      if (key[0] == '[') {  /* new section name - i.e. new screen */
+         ok = PCPDynamicScreen_validateScreenName(key + 1, path, lineno);
+         if (ok)
+            ok = PCPDynamicScreen_uniqueName(key + 1, screens);
+         if (ok)
+            screen = PCPDynamicScreen_new(screens, key + 1);
+         if (pmDebugOptions.appl0)
+            fprintf(stderr, "[%s] screen: %s\n", path, key + 1);
+      } else if (!ok) {
+         ;  /* skip this one, we're looking for a new header */
+      } else if (!value || !screen) {
+         ;  /* skip this one as we always need value strings */
+      } else if (String_eq(key, "heading")) {
+         free_and_xStrdup(&screen->super.heading, value);
+      } else if (String_eq(key, "caption")) {
+         free_and_xStrdup(&screen->super.caption, value);
+      } else if (String_eq(key, "sortKey")) {
+         free_and_xStrdup(&screen->super.sortKey, value);
+      } else if (String_eq(key, "sortDirection")) {
+         screen->super.direction = strtoul(value, NULL, 10);
+      } else if (String_eq(key, "default") || String_eq(key, "enabled")) {
+         if (String_eq(value, "False") || String_eq(value, "false"))
+            screen->defaultEnabled = false;
+         else if (String_eq(value, "True") || String_eq(value, "true"))
+            screen->defaultEnabled = true; /* also default */
+      } else {
+         PCPDynamicScreen_parseColumn(screen, path, lineno, key, value);
+      }
+      String_freeArray(config);
+      free(value);
+      free(key);
+   }
+   fclose(file);
+}
+
+static void PCPDynamicScreen_scanDir(PCPDynamicScreens* screens, char* path) {
+   DIR* dir = opendir(path);
+   if (!dir)
+      return;
+
+   struct dirent* dirent;
+   while ((dirent = readdir(dir)) != NULL) {
+      if (dirent->d_name[0] == '.')
+         continue;
+
+      char* file = String_cat(path, dirent->d_name);
+      PCPDynamicScreen_parseFile(screens, file);
+      free(file);
+   }
+   closedir(dir);
+}
+
+void PCPDynamicScreens_init(PCPDynamicScreens* screens, PCPDynamicColumns* columns) {
+   const char* share = pmGetConfig("PCP_SHARE_DIR");
+   const char* sysconf = pmGetConfig("PCP_SYSCONF_DIR");
+   const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
+   const char* override = getenv("PCP_HTOP_DIR");
+   const char* home = getenv("HOME");
+   char* path;
+
+   screens->table = Hashtable_new(0, true);
+
+   /* developer paths - PCP_HTOP_DIR=./pcp ./pcp-htop */
+   if (override) {
+      path = String_cat(override, "/screens/");
+      PCPDynamicScreen_scanDir(screens, path);
+      free(path);
+   }
+
+   /* next, search in home directory alongside htoprc */
+   if (xdgConfigHome)
+      path = String_cat(xdgConfigHome, "/htop/screens/");
+   else if (home)
+      path = String_cat(home, "/.config/htop/screens/");
+   else
+      path = NULL;
+   if (path) {
+      PCPDynamicScreen_scanDir(screens, path);
+      free(path);
+   }
+
+   /* next, search in the system screens directory */
+   path = String_cat(sysconf, "/htop/screens/");
+   PCPDynamicScreen_scanDir(screens, path);
+   free(path);
+
+   /* next, try the readonly system screens directory */
+   path = String_cat(share, "/htop/screens/");
+   PCPDynamicScreen_scanDir(screens, path);
+   free(path);
+
+   /* establish internal metric identifier mappings */
+   PCPDynamicScreens_appendDynamicColumns(screens, columns);
+}
+
+static void PCPDynamicScreen_done(PCPDynamicScreen* ds) {
+   DynamicScreen_done(&ds->super);
+   Object_delete(ds->table);
+   free(ds->columns);
+}
+
+static void PCPDynamicScreens_free(ATTR_UNUSED ht_key_t key, void* value, ATTR_UNUSED void* data) {
+   PCPDynamicScreen* ds = (PCPDynamicScreen*) value;
+   PCPDynamicScreen_done(ds);
+}
+
+void PCPDynamicScreens_done(Hashtable* table) {
+   Hashtable_foreach(table, PCPDynamicScreens_free, NULL);
+}
+
+void PCPDynamicScreen_appendTables(PCPDynamicScreens* screens, Machine* host) {
+   PCPDynamicScreen* ds;
+
+   for (size_t i = 0; i < screens->count; i++) {
+      if ((ds = (PCPDynamicScreen*)Hashtable_get(screens->table, i)) == NULL)
+         continue;
+      ds->table = InDomTable_new(host, ds->indom, ds->key);
+   }
+}
+
+void PCPDynamicScreen_appendScreens(PCPDynamicScreens* screens, Settings* settings) {
+   PCPDynamicScreen* ds;
+
+   for (size_t i = 0; i < screens->count; i++) {
+      if ((ds = (PCPDynamicScreen*)Hashtable_get(screens->table, i)) == NULL)
+         continue;
+      if (ds->defaultEnabled == false)
+         continue;
+      const char* tab = ds->super.heading;
+      Settings_newDynamicScreen(settings, tab, &ds->super, &ds->table->super);
+   }
+}
+
+/* called when htoprc .dynamic line is parsed for a dynamic screen */
+void PCPDynamicScreen_addDynamicScreen(PCPDynamicScreens* screens, ScreenSettings* ss) {
+   PCPDynamicScreen* ds;
+
+   for (size_t i = 0; i < screens->count; i++) {
+      if ((ds = (PCPDynamicScreen*)Hashtable_get(screens->table, i)) == NULL)
+         continue;
+      if (String_eq(ss->dynamic, ds->super.name) == false)
+         continue;
+      ss->table = &ds->table->super;
+   }
+}
+
+void PCPDynamicScreens_addAvailableColumns(Panel* availableColumns, Hashtable* screens, const char* screen) {
+   Vector_prune(availableColumns->items);
+
+   bool success;
+   unsigned int key;
+   success = DynamicScreen_search(screens, screen, &key);
+   if (!success)
+      return;
+
+   PCPDynamicScreen* dynamicScreen = Hashtable_get(screens, key);
+   if (!screen)
+      return;
+
+   for (unsigned int j = 0; j < dynamicScreen->totalColumns; j++) {
+      PCPDynamicColumn* column = dynamicScreen->columns[j];
+      const char* title = column->super.heading ? column->super.heading : column->super.name;
+      const char* text = column->super.description ? column->super.description : column->super.caption;
+      char description[256];
+      if (text)
+         xSnprintf(description, sizeof(description), "%s - %s", title, text);
+      else
+         xSnprintf(description, sizeof(description), "%s", title);
+      Panel_add(availableColumns, (Object*) ListItem_new(description, j));
+   }
+}
diff --git a/pcp/PCPDynamicScreen.h b/pcp/PCPDynamicScreen.h
new file mode 100644
index 0000000..6248394
--- /dev/null
+++ b/pcp/PCPDynamicScreen.h
@@ -0,0 +1,56 @@
+#ifndef HEADER_PCPDynamicScreen
+#define HEADER_PCPDynamicScreen
+/*
+htop - PCPDynamicScreen.h
+(C) 2023 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stddef.h>
+#include <stdbool.h>
+
+#include "CRT.h"
+#include "DynamicScreen.h"
+#include "Hashtable.h"
+#include "Machine.h"
+#include "Panel.h"
+#include "Settings.h"
+
+
+struct InDomTable_;
+struct PCPDynamicColumn_;
+struct PCPDynamicColumns_;
+
+typedef struct PCPDynamicScreen_ {
+   DynamicScreen super;
+
+   struct InDomTable_* table;
+   struct PCPDynamicColumn_** columns;
+   size_t totalColumns;
+
+   unsigned int indom;  /* instance domain number */
+   unsigned int key;  /* PCPMetric identifier */
+
+   bool defaultEnabled; /* enabled setting from configuration file */
+   /* at runtime enabled screens have entries in settings->screens */
+} PCPDynamicScreen;
+
+typedef struct PCPDynamicScreens_ {
+   Hashtable* table;
+   size_t count;  /* count of dynamic screens discovered from scan */
+} PCPDynamicScreens;
+
+void PCPDynamicScreens_init(PCPDynamicScreens* screens, struct PCPDynamicColumns_* columns);
+
+void PCPDynamicScreens_done(Hashtable* table);
+
+void PCPDynamicScreen_appendTables(PCPDynamicScreens* screens, Machine* host);
+
+void PCPDynamicScreen_appendScreens(PCPDynamicScreens* screens, Settings* settings);
+
+void PCPDynamicScreen_addDynamicScreen(PCPDynamicScreens* screens, ScreenSettings* ss);
+
+void PCPDynamicScreens_addAvailableColumns(Panel* availableColumns, Hashtable* screens, const char* screen);
+
+#endif
diff --git a/pcp/PCPMachine.c b/pcp/PCPMachine.c
new file mode 100644
index 0000000..2e87253
--- /dev/null
+++ b/pcp/PCPMachine.c
@@ -0,0 +1,345 @@
+/*
+htop - PCPProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2020-2023 htop dev team
+(C) 2020-2023 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPMachine.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+#include "pcp/Metric.h"
+#include "pcp/PCPProcess.h"
+
+
+static void PCPMachine_updateCPUcount(PCPMachine* this) {
+   Machine* super = &this->super;
+   super->activeCPUs = Metric_instanceCount(PCP_PERCPU_SYSTEM);
+   unsigned int cpus = Platform_getMaxCPU();
+   if (cpus == super->existingCPUs)
+      return;
+   if (cpus == 0)
+      cpus = super->activeCPUs;
+   if (cpus <= 1)
+      cpus = super->activeCPUs = 1;
+   super->existingCPUs = cpus;
+
+   free(this->percpu);
+   free(this->values);
+
+   this->percpu = xCalloc(cpus, sizeof(pmAtomValue*));
+   for (unsigned int i = 0; i < cpus; i++)
+      this->percpu[i] = xCalloc(CPU_METRIC_COUNT, sizeof(pmAtomValue));
+   this->values = xCalloc(cpus, sizeof(pmAtomValue));
+}
+
+static void PCPMachine_updateMemoryInfo(Machine* host) {
+   unsigned long long int freeMem = 0;
+   unsigned long long int swapFreeMem = 0;
+   unsigned long long int sreclaimableMem = 0;
+   host->totalMem = host->usedMem = host->cachedMem = 0;
+   host->usedSwap = host->totalSwap = host->sharedMem = 0;
+
+   pmAtomValue value;
+   if (Metric_values(PCP_MEM_TOTAL, &value, 1, PM_TYPE_U64) != NULL)
+      host->totalMem = value.ull;
+   if (Metric_values(PCP_MEM_FREE, &value, 1, PM_TYPE_U64) != NULL)
+      freeMem = value.ull;
+   if (Metric_values(PCP_MEM_BUFFERS, &value, 1, PM_TYPE_U64) != NULL)
+      host->buffersMem = value.ull;
+   if (Metric_values(PCP_MEM_SRECLAIM, &value, 1, PM_TYPE_U64) != NULL)
+      sreclaimableMem = value.ull;
+   if (Metric_values(PCP_MEM_SHARED, &value, 1, PM_TYPE_U64) != NULL)
+      host->sharedMem = value.ull;
+   if (Metric_values(PCP_MEM_CACHED, &value, 1, PM_TYPE_U64) != NULL)
+      host->cachedMem = value.ull + sreclaimableMem - host->sharedMem;
+   const memory_t usedDiff = freeMem + host->cachedMem + sreclaimableMem + host->buffersMem;
+   host->usedMem = (host->totalMem >= usedDiff) ?
+           host->totalMem - usedDiff : host->totalMem - freeMem;
+   if (Metric_values(PCP_MEM_AVAILABLE, &value, 1, PM_TYPE_U64) != NULL)
+      host->availableMem = MINIMUM(value.ull, host->totalMem);
+   else
+      host->availableMem = freeMem;
+   if (Metric_values(PCP_MEM_SWAPFREE, &value, 1, PM_TYPE_U64) != NULL)
+      swapFreeMem = value.ull;
+   if (Metric_values(PCP_MEM_SWAPTOTAL, &value, 1, PM_TYPE_U64) != NULL)
+      host->totalSwap = value.ull;
+   if (Metric_values(PCP_MEM_SWAPCACHED, &value, 1, PM_TYPE_U64) != NULL)
+      host->cachedSwap = value.ull;
+   host->usedSwap = host->totalSwap - swapFreeMem - host->cachedSwap;
+}
+
+/* make copies of previously sampled values to avoid overwrite */
+static inline void PCPMachine_backupCPUTime(pmAtomValue* values) {
+   /* the PERIOD fields (must) mirror the TIME fields */
+   for (int metric = CPU_TOTAL_TIME; metric < CPU_TOTAL_PERIOD; metric++) {
+      values[metric + CPU_TOTAL_PERIOD] = values[metric];
+   }
+}
+
+static inline void PCPMachine_saveCPUTimePeriod(pmAtomValue* values, CPUMetric previous, pmAtomValue* latest) {
+   pmAtomValue* value;
+
+   /* new value for period */
+   value = &values[previous];
+   if (latest->ull > value->ull)
+      value->ull = latest->ull - value->ull;
+   else
+      value->ull = 0;
+
+   /* new value for time */
+   value = &values[previous - CPU_TOTAL_PERIOD];
+   value->ull = latest->ull;
+}
+
+/* using copied sampled values and new values, calculate derivations */
+static void PCPMachine_deriveCPUTime(pmAtomValue* values) {
+
+   pmAtomValue* usertime = &values[CPU_USER_TIME];
+   pmAtomValue* guesttime = &values[CPU_GUEST_TIME];
+   usertime->ull -= guesttime->ull;
+
+   pmAtomValue* nicetime = &values[CPU_NICE_TIME];
+   pmAtomValue* guestnicetime = &values[CPU_GUESTNICE_TIME];
+   nicetime->ull -= guestnicetime->ull;
+
+   pmAtomValue* idletime = &values[CPU_IDLE_TIME];
+   pmAtomValue* iowaittime = &values[CPU_IOWAIT_TIME];
+   pmAtomValue* idlealltime = &values[CPU_IDLE_ALL_TIME];
+   idlealltime->ull = idletime->ull + iowaittime->ull;
+
+   pmAtomValue* systemtime = &values[CPU_SYSTEM_TIME];
+   pmAtomValue* irqtime = &values[CPU_IRQ_TIME];
+   pmAtomValue* softirqtime = &values[CPU_SOFTIRQ_TIME];
+   pmAtomValue* systalltime = &values[CPU_SYSTEM_ALL_TIME];
+   systalltime->ull = systemtime->ull + irqtime->ull + softirqtime->ull;
+
+   pmAtomValue* virtalltime = &values[CPU_GUEST_TIME];
+   virtalltime->ull = guesttime->ull + guestnicetime->ull;
+
+   pmAtomValue* stealtime = &values[CPU_STEAL_TIME];
+   pmAtomValue* totaltime = &values[CPU_TOTAL_TIME];
+   totaltime->ull = usertime->ull + nicetime->ull + systalltime->ull +
+                    idlealltime->ull + stealtime->ull + virtalltime->ull;
+
+   PCPMachine_saveCPUTimePeriod(values, CPU_USER_PERIOD, usertime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_NICE_PERIOD, nicetime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_SYSTEM_PERIOD, systemtime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_SYSTEM_ALL_PERIOD, systalltime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_IDLE_ALL_PERIOD, idlealltime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_IDLE_PERIOD, idletime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_IOWAIT_PERIOD, iowaittime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_IRQ_PERIOD, irqtime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_SOFTIRQ_PERIOD, softirqtime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_STEAL_PERIOD, stealtime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_GUEST_PERIOD, virtalltime);
+   PCPMachine_saveCPUTimePeriod(values, CPU_TOTAL_PERIOD, totaltime);
+}
+
+static void PCPMachine_updateAllCPUTime(PCPMachine* this, Metric metric, CPUMetric cpumetric)
+{
+   pmAtomValue* value = &this->cpu[cpumetric];
+   if (Metric_values(metric, value, 1, PM_TYPE_U64) == NULL)
+      memset(value, 0, sizeof(pmAtomValue));
+}
+
+static void PCPMachine_updatePerCPUTime(PCPMachine* this, Metric metric, CPUMetric cpumetric)
+{
+   int cpus = this->super.existingCPUs;
+   if (Metric_values(metric, this->values, cpus, PM_TYPE_U64) == NULL)
+      memset(this->values, 0, cpus * sizeof(pmAtomValue));
+   for (int i = 0; i < cpus; i++)
+      this->percpu[i][cpumetric].ull = this->values[i].ull;
+}
+
+static void PCPMachine_updatePerCPUReal(PCPMachine* this, Metric metric, CPUMetric cpumetric)
+{
+   int cpus = this->super.existingCPUs;
+   if (Metric_values(metric, this->values, cpus, PM_TYPE_DOUBLE) == NULL)
+      memset(this->values, 0, cpus * sizeof(pmAtomValue));
+   for (int i = 0; i < cpus; i++)
+      this->percpu[i][cpumetric].d = this->values[i].d;
+}
+
+static inline void PCPMachine_scanZswapInfo(PCPMachine* this) {
+   pmAtomValue value;
+
+   memset(&this->zswap, 0, sizeof(ZswapStats));
+   if (Metric_values(PCP_MEM_ZSWAP, &value, 1, PM_TYPE_U64))
+      this->zswap.usedZswapComp = value.ull;
+   if (Metric_values(PCP_MEM_ZSWAPPED, &value, 1, PM_TYPE_U64))
+      this->zswap.usedZswapOrig = value.ull;
+}
+
+static inline void PCPMachine_scanZfsArcstats(PCPMachine* this) {
+   unsigned long long int dbufSize = 0;
+   unsigned long long int dnodeSize = 0;
+   unsigned long long int bonusSize = 0;
+   pmAtomValue value;
+
+   memset(&this->zfs, 0, sizeof(ZfsArcStats));
+   if (Metric_values(PCP_ZFS_ARC_ANON_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.anon = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_C_MIN, &value, 1, PM_TYPE_U64))
+      this->zfs.min = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_C_MAX, &value, 1, PM_TYPE_U64))
+      this->zfs.max = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_BONUS_SIZE, &value, 1, PM_TYPE_U64))
+      bonusSize = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_DBUF_SIZE, &value, 1, PM_TYPE_U64))
+      dbufSize = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_DNODE_SIZE, &value, 1, PM_TYPE_U64))
+      dnodeSize = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_COMPRESSED_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.compressed = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_UNCOMPRESSED_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.uncompressed = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_HDR_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.header = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_MFU_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.MFU = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_MRU_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.MRU = value.ull / ONE_K;
+   if (Metric_values(PCP_ZFS_ARC_SIZE, &value, 1, PM_TYPE_U64))
+      this->zfs.size = value.ull / ONE_K;
+
+   this->zfs.other = (dbufSize + dnodeSize + bonusSize) / ONE_K;
+   this->zfs.enabled = (this->zfs.size > 0);
+   this->zfs.isCompressed = (this->zfs.compressed > 0);
+}
+
+static void PCPMachine_scan(PCPMachine* this) {
+   Machine* super = &this->super;
+
+   PCPMachine_updateMemoryInfo(super);
+   PCPMachine_updateCPUcount(this);
+
+   PCPMachine_backupCPUTime(this->cpu);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_USER, CPU_USER_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_NICE, CPU_NICE_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_SYSTEM, CPU_SYSTEM_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_IDLE, CPU_IDLE_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_IOWAIT, CPU_IOWAIT_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_IRQ, CPU_IRQ_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_SOFTIRQ, CPU_SOFTIRQ_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_STEAL, CPU_STEAL_TIME);
+   PCPMachine_updateAllCPUTime(this, PCP_CPU_GUEST, CPU_GUEST_TIME);
+   PCPMachine_deriveCPUTime(this->cpu);
+
+   for (unsigned int i = 0; i < super->existingCPUs; i++)
+      PCPMachine_backupCPUTime(this->percpu[i]);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_USER, CPU_USER_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_NICE, CPU_NICE_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_SYSTEM, CPU_SYSTEM_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_IDLE, CPU_IDLE_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_IOWAIT, CPU_IOWAIT_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_IRQ, CPU_IRQ_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_SOFTIRQ, CPU_SOFTIRQ_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_STEAL, CPU_STEAL_TIME);
+   PCPMachine_updatePerCPUTime(this, PCP_PERCPU_GUEST, CPU_GUEST_TIME);
+   for (unsigned int i = 0; i < super->existingCPUs; i++)
+      PCPMachine_deriveCPUTime(this->percpu[i]);
+
+   if (super->settings->showCPUFrequency)
+      PCPMachine_updatePerCPUReal(this, PCP_HINV_CPUCLOCK, CPU_FREQUENCY);
+
+   PCPMachine_scanZfsArcstats(this);
+   PCPMachine_scanZswapInfo(this);
+}
+
+void Machine_scan(Machine* super) {
+   PCPMachine* host = (PCPMachine*) super;
+   const Settings* settings = super->settings;
+   uint32_t flags = settings->ss->flags;
+   bool flagged;
+
+   for (int metric = PCP_PROC_PID; metric < PCP_METRIC_COUNT; metric++)
+      Metric_enable(metric, true);
+
+   flagged = settings->showCPUFrequency;
+   Metric_enable(PCP_HINV_CPUCLOCK, flagged);
+   flagged = flags & PROCESS_FLAG_LINUX_CGROUP;
+   Metric_enable(PCP_PROC_CGROUPS, flagged);
+   flagged = flags & PROCESS_FLAG_LINUX_OOM;
+   Metric_enable(PCP_PROC_OOMSCORE, flagged);
+   flagged = flags & PROCESS_FLAG_LINUX_CTXT;
+   Metric_enable(PCP_PROC_VCTXSW, flagged);
+   Metric_enable(PCP_PROC_NVCTXSW, flagged);
+   flagged = flags & PROCESS_FLAG_LINUX_SECATTR;
+   Metric_enable(PCP_PROC_LABELS, flagged);
+   flagged = flags & PROCESS_FLAG_LINUX_AUTOGROUP;
+   Metric_enable(PCP_PROC_AUTOGROUP_ID, flagged);
+   Metric_enable(PCP_PROC_AUTOGROUP_NICE, flagged);
+
+   /* Sample smaps metrics on every second pass to improve performance */
+   host->smaps_flag = !!host->smaps_flag;
+   Metric_enable(PCP_PROC_SMAPS_PSS, host->smaps_flag);
+   Metric_enable(PCP_PROC_SMAPS_SWAP, host->smaps_flag);
+   Metric_enable(PCP_PROC_SMAPS_SWAPPSS, host->smaps_flag);
+
+   struct timeval timestamp;
+   if (Metric_fetch(&timestamp) != true)
+      return;
+
+   double sample = host->timestamp;
+   host->timestamp = pmtimevalToReal(&timestamp);
+   host->period = (host->timestamp - sample) * 100;
+
+   PCPMachine_scan(host);
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   PCPMachine* this = xCalloc(1, sizeof(PCPMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   struct timeval timestamp;
+   gettimeofday(&timestamp, NULL);
+   this->timestamp = pmtimevalToReal(&timestamp);
+
+   this->cpu = xCalloc(CPU_METRIC_COUNT, sizeof(pmAtomValue));
+   PCPMachine_updateCPUcount(this);
+
+   Platform_updateTables(super);
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   PCPMachine* this = (PCPMachine*) super;
+   Machine_done(super);
+   free(this->values);
+   for (unsigned int i = 0; i < super->existingCPUs; i++)
+      free(this->percpu[i]);
+   free(this->percpu);
+   free(this->cpu);
+   free(this);
+}
+
+bool Machine_isCPUonline(const Machine* host, unsigned int id) {
+   assert(id < host->existingCPUs);
+   (void) host;
+
+   pmAtomValue value;
+   if (Metric_instance(PCP_PERCPU_SYSTEM, id, id, &value, PM_TYPE_U32))
+      return true;
+   return false;
+}
diff --git a/pcp/PCPMachine.h b/pcp/PCPMachine.h
new file mode 100644
index 0000000..6518bd4
--- /dev/null
+++ b/pcp/PCPMachine.h
@@ -0,0 +1,71 @@
+#ifndef HEADER_PCPMachine
+#define HEADER_PCPMachine
+/*
+htop - PCPMachine.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "Machine.h"
+#include "UsersTable.h"
+
+#include "pcp/Platform.h"
+#include "linux/ZswapStats.h"
+#include "zfs/ZfsArcStats.h"
+
+
+typedef enum CPUMetric_ {
+   CPU_TOTAL_TIME,
+   CPU_USER_TIME,
+   CPU_SYSTEM_TIME,
+   CPU_SYSTEM_ALL_TIME,
+   CPU_IDLE_ALL_TIME,
+   CPU_IDLE_TIME,
+   CPU_NICE_TIME,
+   CPU_IOWAIT_TIME,
+   CPU_IRQ_TIME,
+   CPU_SOFTIRQ_TIME,
+   CPU_STEAL_TIME,
+   CPU_GUEST_TIME,
+   CPU_GUESTNICE_TIME,
+
+   CPU_TOTAL_PERIOD,
+   CPU_USER_PERIOD,
+   CPU_SYSTEM_PERIOD,
+   CPU_SYSTEM_ALL_PERIOD,
+   CPU_IDLE_ALL_PERIOD,
+   CPU_IDLE_PERIOD,
+   CPU_NICE_PERIOD,
+   CPU_IOWAIT_PERIOD,
+   CPU_IRQ_PERIOD,
+   CPU_SOFTIRQ_PERIOD,
+   CPU_STEAL_PERIOD,
+   CPU_GUEST_PERIOD,
+   CPU_GUESTNICE_PERIOD,
+
+   CPU_FREQUENCY,
+
+   CPU_METRIC_COUNT
+} CPUMetric;
+
+typedef struct PCPMachine_ {
+   Machine super;
+   int smaps_flag;
+   double period;
+   double timestamp;     /* previous sample timestamp */
+
+   pmAtomValue* cpu;     /* aggregate values for each metric */
+   pmAtomValue** percpu; /* per-processor values for each metric */
+   pmAtomValue* values;  /* per-processor buffer for just one metric */
+
+   ZfsArcStats zfs;
+   /*ZramStats zram; -- not needed, calculated in-line in Platform.c */
+   ZswapStats zswap;
+} PCPMachine;
+
+#endif
diff --git a/pcp/PCPProcess.c b/pcp/PCPProcess.c
new file mode 100644
index 0000000..69e2972
--- /dev/null
+++ b/pcp/PCPProcess.c
@@ -0,0 +1,310 @@
+/*
+htop - PCPProcess.c
+(C) 2014 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPProcess.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Macros.h"
+#include "Process.h"
+#include "ProvideCurses.h"
+#include "RichString.h"
+#include "XUtils.h"
+
+#include "pcp/PCPDynamicColumn.h"
+
+
+const ProcessFieldData Process_fields[] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging, I idle)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, },
+   [MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [CMINFLT] = { .name = "CMINFLT", .title = "    CMINFLT ", .description = "Children processes' minor faults", .flags = 0, .defaultSortDesc = true, },
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [CMAJFLT] = { .name = "CMAJFLT", .title = "    CMAJFLT ", .description = "Children processes' major faults", .flags = 0, .defaultSortDesc = true, },
+   [UTIME] = { .name = "UTIME", .title = " UTIME+  ", .description = "User CPU time - time the process spent executing in user mode", .flags = 0, .defaultSortDesc = true, },
+   [STIME] = { .name = "STIME", .title = " STIME+  ", .description = "System CPU time - time the kernel spent running system calls for this process", .flags = 0, .defaultSortDesc = true, },
+   [CUTIME] = { .name = "CUTIME", .title = " CUTIME+ ", .description = "Children processes' user CPU time", .flags = 0, .defaultSortDesc = true, },
+   [CSTIME] = { .name = "CSTIME", .title = " CSTIME+ ", .description = "Children processes' system CPU time", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "If of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [M_SHARE] = { .name = "M_SHARE", .title = "  SHR ", .description = "Size of the process's shared pages", .flags = 0, .defaultSortDesc = true, },
+   [M_PRIV] = { .name = "M_PRIV", .title = " PRIV ", .description = "The private memory size of the process - resident set size minus shared memory", .flags = 0, .defaultSortDesc = true, },
+   [M_TRS] = { .name = "M_TRS", .title = " CODE ", .description = "Size of the text segment of the process", .flags = 0, .defaultSortDesc = true, },
+   [M_DRS] = { .name = "M_DRS", .title = " DATA ", .description = "Size of the data segment plus stack usage of the process", .flags = 0, .defaultSortDesc = true, },
+   [M_LRS] = { .name = "M_LRS", .title = "  LIB ", .description = "The library size of the process (unused since Linux 2.6; always 0)", .flags = 0, .defaultSortDesc = true, },
+   [M_DT] = { .name = "M_DT", .title = " DIRTY ", .description = "Size of the dirty pages of the process (unused since Linux 2.6; always 0)", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, .defaultSortDesc = true, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
+   [RCHAR] = { .name = "RCHAR", .title = "RCHAR ", .description = "Number of bytes the process has read", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [WCHAR] = { .name = "WCHAR", .title = "WCHAR ", .description = "Number of bytes the process has written", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [SYSCR] = { .name = "SYSCR", .title = "  READ_SYSC ", .description = "Number of read(2) syscalls for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [SYSCW] = { .name = "SYSCW", .title = " WRITE_SYSC ", .description = "Number of write(2) syscalls for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [RBYTES] = { .name = "RBYTES", .title = " IO_R ", .description = "Bytes of read(2) I/O for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [WBYTES] = { .name = "WBYTES", .title = " IO_W ", .description = "Bytes of write(2) I/O for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [CNCLWB] = { .name = "CNCLWB", .title = " IO_C ", .description = "Bytes of cancelled write(2) I/O", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_READ_RATE] = { .name = "IO_READ_RATE", .title = " DISK READ ", .description = "The I/O rate of read(2) in bytes per second for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_WRITE_RATE] = { .name = "IO_WRITE_RATE", .title = " DISK WRITE ", .description = "The I/O rate of write(2) in bytes per second for the process", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [IO_RATE] = { .name = "IO_RATE", .title = "   DISK R/W ", .description = "Total I/O rate in bytes per second", .flags = PROCESS_FLAG_IO, .defaultSortDesc = true, },
+   [CGROUP] = { .name = "CGROUP", .title = "CGROUP (raw)                        ", .description = "Which cgroup the process is in", .flags = PROCESS_FLAG_LINUX_CGROUP, },
+   [CCGROUP] = { .name = "CCGROUP", .title = "CGROUP (compressed)                 ", .description = "Which cgroup the process is in (condensed to essentials)", .flags = PROCESS_FLAG_LINUX_CGROUP, },
+   [CONTAINER] = { .name = "CONTAINER", .title = "CONTAINER                           ", .description = "Name of the container the process is in (guessed by heuristics)", .flags = PROCESS_FLAG_LINUX_CGROUP, },
+   [OOM] = { .name = "OOM", .title = " OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, .defaultSortDesc = true, },
+   [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPUD% ", .description = "CPU delay %", .flags = 0, .defaultSortDesc = true, },
+   [PERCENT_IO_DELAY] = { .name = "PERCENT_IO_DELAY", .title = " IOD% ", .description = "Block I/O delay %", .flags = 0, .defaultSortDesc = true, },
+   [PERCENT_SWAP_DELAY] = { .name = "PERCENT_SWAP_DELAY", .title = "SWAPD% ", .description = "Swapin delay %", .flags = 0, .defaultSortDesc = true, },
+   [M_PSS] = { .name = "M_PSS", .title = "  PSS ", .description = "proportional set size, same as M_RESIDENT but each page is divided by the number of processes sharing it.", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [M_SWAP] = { .name = "M_SWAP", .title = " SWAP ", .description = "Size of the process's swapped pages", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [M_PSSWP] = { .name = "M_PSSWP", .title = " PSSWP ", .description = "shows proportional swap share of this mapping, Unlike \"Swap\", this does not take into account swapped out page of underlying shmem objects.", .flags = PROCESS_FLAG_LINUX_SMAPS, .defaultSortDesc = true, },
+   [CTXT] = { .name = "CTXT", .title = " CTXT ", .description = "Context switches (incremental sum of voluntary_ctxt_switches and nonvoluntary_ctxt_switches)", .flags = PROCESS_FLAG_LINUX_CTXT, .defaultSortDesc = true, },
+   [SECATTR] = { .name = "SECATTR", .title = " Security Attribute ", .description = "Security attribute of the process (e.g. SELinux or AppArmor)", .flags = PROCESS_FLAG_LINUX_SECATTR, },
+   [PROC_COMM] = { .name = "COMM", .title = "COMM            ", .description = "comm string of the process", .flags = 0, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+   [AUTOGROUP_ID] = { .name = "AUTOGROUP_ID", .title = "AGRP", .description = "The autogroup identifier of the process", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
+   [AUTOGROUP_NICE] = { .name = "AUTOGROUP_NICE", .title = " ANI", .description = "Nice value (the higher the value, the more other processes take priority) associated with the process autogroup", .flags = PROCESS_FLAG_LINUX_AUTOGROUP, },
+};
+
+Process* PCPProcess_new(const Machine* host) {
+   PCPProcess* this = xCalloc(1, sizeof(PCPProcess));
+   Object_setClass(this, Class(PCPProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   PCPProcess* this = (PCPProcess*) cast;
+   Process_done((Process*)cast);
+   free(this->cgroup_short);
+   free(this->cgroup);
+   free(this->secattr);
+   free(this);
+}
+
+static void PCPProcess_printDelay(float delay_percent, char* buffer, size_t n) {
+   if (isNonnegative(delay_percent)) {
+      xSnprintf(buffer, n, "%4.1f  ", delay_percent);
+   } else {
+      xSnprintf(buffer, n, " N/A  ");
+   }
+}
+
+static double PCPProcess_totalIORate(const PCPProcess* pp) {
+   double totalRate = NAN;
+   if (isNonnegative(pp->io_rate_read_bps)) {
+      totalRate = pp->io_rate_read_bps;
+      if (isNonnegative(pp->io_rate_write_bps)) {
+         totalRate += pp->io_rate_write_bps;
+      }
+   } else if (isNonnegative(pp->io_rate_write_bps)) {
+      totalRate = pp->io_rate_write_bps;
+   }
+   return totalRate;
+}
+
+static void PCPProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const PCPProcess* pp = (const PCPProcess*) super;
+
+   bool coloring = super->host->settings->highlightMegabytes;
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch ((int)field) {
+   case CMINFLT: Row_printCount(str, pp->cminflt, coloring); return;
+   case CMAJFLT: Row_printCount(str, pp->cmajflt, coloring); return;
+   case M_DRS: Row_printBytes(str, pp->m_drs, coloring); return;
+   case M_DT: Row_printBytes(str, pp->m_dt, coloring); return;
+   case M_LRS: Row_printBytes(str, pp->m_lrs, coloring); return;
+   case M_TRS: Row_printBytes(str, pp->m_trs, coloring); return;
+   case M_SHARE: Row_printBytes(str, pp->m_share, coloring); return;
+   case M_PRIV: Row_printBytes(str, pp->m_priv, coloring); return;
+   case M_PSS: Row_printKBytes(str, pp->m_pss, coloring); return;
+   case M_SWAP: Row_printKBytes(str, pp->m_swap, coloring); return;
+   case M_PSSWP: Row_printKBytes(str, pp->m_psswp, coloring); return;
+   case UTIME: Row_printTime(str, pp->utime, coloring); return;
+   case STIME: Row_printTime(str, pp->stime, coloring); return;
+   case CUTIME: Row_printTime(str, pp->cutime, coloring); return;
+   case CSTIME: Row_printTime(str, pp->cstime, coloring); return;
+   case RCHAR:  Row_printBytes(str, pp->io_rchar, coloring); return;
+   case WCHAR:  Row_printBytes(str, pp->io_wchar, coloring); return;
+   case SYSCR:  Row_printCount(str, pp->io_syscr, coloring); return;
+   case SYSCW:  Row_printCount(str, pp->io_syscw, coloring); return;
+   case RBYTES: Row_printBytes(str, pp->io_read_bytes, coloring); return;
+   case WBYTES: Row_printBytes(str, pp->io_write_bytes, coloring); return;
+   case CNCLWB: Row_printBytes(str, pp->io_cancelled_write_bytes, coloring); return;
+   case IO_READ_RATE:  Row_printRate(str, pp->io_rate_read_bps, coloring); return;
+   case IO_WRITE_RATE: Row_printRate(str, pp->io_rate_write_bps, coloring); return;
+   case IO_RATE: Row_printRate(str, PCPProcess_totalIORate(pp), coloring); return;
+   case CGROUP: xSnprintf(buffer, n, "%-35.35s ", pp->cgroup ? pp->cgroup : "N/A"); break;
+   case CCGROUP: xSnprintf(buffer, n, "%-35.35s ", pp->cgroup_short ? pp->cgroup_short : (pp->cgroup ? pp->cgroup : "N/A")); break;
+   case CONTAINER: xSnprintf(buffer, n, "%-35.35s ", pp->container_short ? pp->container_short : "N/A"); break;
+   case OOM: xSnprintf(buffer, n, "%4u ", pp->oom); break;
+   case PERCENT_CPU_DELAY:
+      PCPProcess_printDelay(pp->cpu_delay_percent, buffer, n);
+      break;
+   case PERCENT_IO_DELAY:
+      PCPProcess_printDelay(pp->blkio_delay_percent, buffer, n);
+      break;
+   case PERCENT_SWAP_DELAY:
+      PCPProcess_printDelay(pp->swapin_delay_percent, buffer, n);
+      break;
+   case CTXT:
+      if (pp->ctxt_diff > 1000) {
+         attr |= A_BOLD;
+      }
+      xSnprintf(buffer, n, "%5lu ", pp->ctxt_diff);
+      break;
+   case SECATTR: snprintf(buffer, n, "%-30s   ", pp->secattr ? pp->secattr : "?"); break;
+   case AUTOGROUP_ID:
+      if (pp->autogroup_id != -1) {
+         xSnprintf(buffer, n, "%4ld ", pp->autogroup_id);
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, " N/A ");
+      }
+      break;
+   case AUTOGROUP_NICE:
+      if (pp->autogroup_id != -1) {
+         xSnprintf(buffer, n, "%3d ", pp->autogroup_nice);
+         attr = pp->autogroup_nice < 0 ? CRT_colors[PROCESS_HIGH_PRIORITY]
+              : pp->autogroup_nice > 0 ? CRT_colors[PROCESS_LOW_PRIORITY]
+              : CRT_colors[PROCESS_SHADOW];
+      } else {
+         attr = CRT_colors[PROCESS_SHADOW];
+         xSnprintf(buffer, n, "N/A ");
+      }
+      break;
+   default:
+      Process_writeField(&pp->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int PCPProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const PCPProcess* p1 = (const PCPProcess*)v1;
+   const PCPProcess* p2 = (const PCPProcess*)v2;
+
+   switch (key) {
+   case M_DRS:
+      return SPACESHIP_NUMBER(p1->m_drs, p2->m_drs);
+   case M_DT:
+      return SPACESHIP_NUMBER(p1->m_dt, p2->m_dt);
+   case M_LRS:
+      return SPACESHIP_NUMBER(p1->m_lrs, p2->m_lrs);
+   case M_TRS:
+      return SPACESHIP_NUMBER(p1->m_trs, p2->m_trs);
+   case M_SHARE:
+      return SPACESHIP_NUMBER(p1->m_share, p2->m_share);
+   case M_PRIV:
+      return SPACESHIP_NUMBER(p1->m_priv, p2->m_priv);
+   case M_PSS:
+      return SPACESHIP_NUMBER(p1->m_pss, p2->m_pss);
+   case M_SWAP:
+      return SPACESHIP_NUMBER(p1->m_swap, p2->m_swap);
+   case M_PSSWP:
+      return SPACESHIP_NUMBER(p1->m_psswp, p2->m_psswp);
+   case UTIME:
+      return SPACESHIP_NUMBER(p1->utime, p2->utime);
+   case CUTIME:
+      return SPACESHIP_NUMBER(p1->cutime, p2->cutime);
+   case STIME:
+      return SPACESHIP_NUMBER(p1->stime, p2->stime);
+   case CSTIME:
+      return SPACESHIP_NUMBER(p1->cstime, p2->cstime);
+   case RCHAR:
+      return SPACESHIP_NUMBER(p1->io_rchar, p2->io_rchar);
+   case WCHAR:
+      return SPACESHIP_NUMBER(p1->io_wchar, p2->io_wchar);
+   case SYSCR:
+      return SPACESHIP_NUMBER(p1->io_syscr, p2->io_syscr);
+   case SYSCW:
+      return SPACESHIP_NUMBER(p1->io_syscw, p2->io_syscw);
+   case RBYTES:
+      return SPACESHIP_NUMBER(p1->io_read_bytes, p2->io_read_bytes);
+   case WBYTES:
+      return SPACESHIP_NUMBER(p1->io_write_bytes, p2->io_write_bytes);
+   case CNCLWB:
+      return SPACESHIP_NUMBER(p1->io_cancelled_write_bytes, p2->io_cancelled_write_bytes);
+   case IO_READ_RATE:
+      return compareRealNumbers(p1->io_rate_read_bps, p2->io_rate_read_bps);
+   case IO_WRITE_RATE:
+      return compareRealNumbers(p1->io_rate_write_bps, p2->io_rate_write_bps);
+   case IO_RATE:
+      return compareRealNumbers(PCPProcess_totalIORate(p1), PCPProcess_totalIORate(p2));
+   case CGROUP:
+      return SPACESHIP_NULLSTR(p1->cgroup, p2->cgroup);
+   case CCGROUP:
+      return SPACESHIP_NULLSTR(p1->cgroup_short, p2->cgroup_short);
+   case CONTAINER:
+      return SPACESHIP_NULLSTR(p1->container_short, p2->container_short);
+   case OOM:
+      return SPACESHIP_NUMBER(p1->oom, p2->oom);
+   case PERCENT_CPU_DELAY:
+      return compareRealNumbers(p1->cpu_delay_percent, p2->cpu_delay_percent);
+   case PERCENT_IO_DELAY:
+      return compareRealNumbers(p1->blkio_delay_percent, p2->blkio_delay_percent);
+   case PERCENT_SWAP_DELAY:
+      return compareRealNumbers(p1->swapin_delay_percent, p2->swapin_delay_percent);
+   case CTXT:
+      return SPACESHIP_NUMBER(p1->ctxt_diff, p2->ctxt_diff);
+   case SECATTR:
+      return SPACESHIP_NULLSTR(p1->secattr, p2->secattr);
+   case AUTOGROUP_ID:
+      return SPACESHIP_NUMBER(p1->autogroup_id, p2->autogroup_id);
+   case AUTOGROUP_NICE:
+      return SPACESHIP_NUMBER(p1->autogroup_nice, p2->autogroup_nice);
+   default:
+      if (key < LAST_PROCESSFIELD)
+         return Process_compareByKey_Base(v1, v2, key);
+      return PCPDynamicColumn_compareByKey(p1, p2, key);
+   }
+}
+
+const ProcessClass PCPProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = PCPProcess_rowWriteField,
+   },
+   .compareByKey = PCPProcess_compareByKey,
+};
diff --git a/pcp/PCPProcess.h b/pcp/PCPProcess.h
new file mode 100644
index 0000000..e953757
--- /dev/null
+++ b/pcp/PCPProcess.h
@@ -0,0 +1,103 @@
+#ifndef HEADER_PCPProcess
+#define HEADER_PCPProcess
+/*
+htop - PCPProcess.h
+(C) 2014 Hisham H. Muhammad
+(C) 2020 htop dev team
+(C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+
+#include "Machine.h"
+#include "Object.h"
+#include "Process.h"
+
+
+#define PROCESS_FLAG_LINUX_CGROUP    0x00000800
+#define PROCESS_FLAG_LINUX_OOM       0x00001000
+#define PROCESS_FLAG_LINUX_SMAPS     0x00002000
+#define PROCESS_FLAG_LINUX_CTXT      0x00004000
+#define PROCESS_FLAG_LINUX_SECATTR   0x00008000
+#define PROCESS_FLAG_LINUX_AUTOGROUP 0x00080000
+
+typedef struct PCPProcess_ {
+   Process super;
+
+   /* default result offset to use for searching proc metrics */
+   unsigned int offset;
+
+   unsigned long int cminflt;
+   unsigned long int cmajflt;
+   unsigned long long int utime;
+   unsigned long long int stime;
+   unsigned long long int cutime;
+   unsigned long long int cstime;
+   long m_share;
+   long m_priv;
+   long m_pss;
+   long m_swap;
+   long m_psswp;
+   long m_trs;
+   long m_drs;
+   long m_lrs;
+   long m_dt;
+
+   /* Data read (in kilobytes) */
+   unsigned long long io_rchar;
+
+   /* Data written (in kilobytes) */
+   unsigned long long io_wchar;
+
+   /* Number of read(2) syscalls */
+   unsigned long long io_syscr;
+
+   /* Number of write(2) syscalls */
+   unsigned long long io_syscw;
+
+   /* Storage data read (in kilobytes) */
+   unsigned long long io_read_bytes;
+
+   /* Storage data written (in kilobytes) */
+   unsigned long long io_write_bytes;
+
+   /* Storage data cancelled (in kilobytes) */
+   unsigned long long io_cancelled_write_bytes;
+
+   /* Point in time of last io scan (in seconds elapsed since the Epoch) */
+   unsigned long long io_last_scan_time;
+
+   double io_rate_read_bps;
+   double io_rate_write_bps;
+   char* cgroup;
+   char* cgroup_short;
+   char* container_short;
+   long int autogroup_id;
+   int autogroup_nice;
+   unsigned int oom;
+   unsigned long long int delay_read_time;
+   unsigned long long cpu_delay_total;
+   unsigned long long blkio_delay_total;
+   unsigned long long swapin_delay_total;
+   float cpu_delay_percent;
+   float blkio_delay_percent;
+   float swapin_delay_percent;
+   unsigned long ctxt_total;
+   unsigned long ctxt_diff;
+   char* secattr;
+   unsigned long long int last_mlrs_calctime;
+} PCPProcess;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+extern const ProcessClass PCPProcess_class;
+
+Process* PCPProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+bool Process_isThread(const Process* this);
+
+#endif
diff --git a/pcp/PCPProcessTable.c b/pcp/PCPProcessTable.c
new file mode 100644
index 0000000..4999bdc
--- /dev/null
+++ b/pcp/PCPProcessTable.c
@@ -0,0 +1,486 @@
+/*
+htop - PCPProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/PCPProcessTable.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include "Machine.h"
+#include "Macros.h"
+#include "Object.h"
+#include "Platform.h"
+#include "Process.h"
+#include "Settings.h"
+#include "XUtils.h"
+
+#include "linux/CGroupUtils.h"
+#include "pcp/Metric.h"
+#include "pcp/PCPMachine.h"
+#include "pcp/PCPProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   PCPProcessTable* this = xCalloc(1, sizeof(PCPProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(PCPProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   PCPProcessTable* this = (PCPProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+static inline long Metric_instance_s32(int metric, int pid, int offset, long fallback) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_32))
+      return value.l;
+   return fallback;
+}
+
+static inline long long Metric_instance_s64(int metric, int pid, int offset, long long fallback) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_64))
+      return value.l;
+   return fallback;
+}
+
+static inline unsigned long Metric_instance_u32(int metric, int pid, int offset, unsigned long fallback) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_U32))
+      return value.ul;
+   return fallback;
+}
+
+static inline unsigned long long Metric_instance_u64(int metric, int pid, int offset, unsigned long long fallback) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_U64))
+      return value.ull;
+   return fallback;
+}
+
+static inline unsigned long long Metric_instance_time(int metric, int pid, int offset) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_U64))
+      return value.ull / 10;
+   return 0;
+}
+
+static inline unsigned long long Metric_instance_ONE_K(int metric, int pid, int offset) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_U64))
+      return value.ull / ONE_K;
+   return ULLONG_MAX;
+}
+
+static inline char Metric_instance_char(int metric, int pid, int offset, char fallback) {
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_STRING)) {
+      char uchar = value.cp[0];
+      free(value.cp);
+      return uchar;
+   }
+   return fallback;
+}
+
+static char* setUser(UsersTable* this, unsigned int uid, int pid, int offset) {
+   char* name = Hashtable_get(this->users, uid);
+   if (name)
+      return name;
+
+   pmAtomValue value;
+   if (Metric_instance(PCP_PROC_ID_USER, pid, offset, &value, PM_TYPE_STRING)) {
+      Hashtable_put(this->users, uid, value.cp);
+      name = value.cp;
+   }
+   return name;
+}
+
+static inline ProcessState PCPProcessTable_getProcessState(char state) {
+   switch (state) {
+      case '?': return UNKNOWN;
+      case 'R': return RUNNING;
+      case 'W': return WAITING;
+      case 'D': return UNINTERRUPTIBLE_WAIT;
+      case 'P': return PAGING;
+      case 'T': return STOPPED;
+      case 't': return TRACED;
+      case 'Z': return ZOMBIE;
+      case 'X': return DEFUNCT;
+      case 'I': return IDLE;
+      case 'S': return SLEEPING;
+      default: return UNKNOWN;
+   }
+}
+
+static void PCPProcessTable_updateID(Process* process, int pid, int offset) {
+   Process_setThreadGroup(process, Metric_instance_u32(PCP_PROC_TGID, pid, offset, 1));
+   Process_setParent(process, Metric_instance_u32(PCP_PROC_PPID, pid, offset, 1));
+   process->state = PCPProcessTable_getProcessState(Metric_instance_char(PCP_PROC_STATE, pid, offset, '?'));
+}
+
+static void PCPProcessTable_updateInfo(PCPProcess* pp, int pid, int offset, char* command, size_t commLen) {
+   Process* process = &pp->super;
+   pmAtomValue value;
+
+   if (!Metric_instance(PCP_PROC_CMD, pid, offset, &value, PM_TYPE_STRING))
+      value.cp = xStrdup("<unknown>");
+   String_safeStrncpy(command, value.cp, commLen);
+   free(value.cp);
+
+   process->pgrp = Metric_instance_u32(PCP_PROC_PGRP, pid, offset, 0);
+   process->session = Metric_instance_u32(PCP_PROC_SESSION, pid, offset, 0);
+   process->tty_nr = Metric_instance_u32(PCP_PROC_TTY, pid, offset, 0);
+   process->tpgid = Metric_instance_u32(PCP_PROC_TTYPGRP, pid, offset, 0);
+   process->minflt = Metric_instance_u32(PCP_PROC_MINFLT, pid, offset, 0);
+   pp->cminflt = Metric_instance_u32(PCP_PROC_CMINFLT, pid, offset, 0);
+   process->majflt = Metric_instance_u32(PCP_PROC_MAJFLT, pid, offset, 0);
+   pp->cmajflt = Metric_instance_u32(PCP_PROC_CMAJFLT, pid, offset, 0);
+   pp->utime = Metric_instance_time(PCP_PROC_UTIME, pid, offset);
+   pp->stime = Metric_instance_time(PCP_PROC_STIME, pid, offset);
+   pp->cutime = Metric_instance_time(PCP_PROC_CUTIME, pid, offset);
+   pp->cstime = Metric_instance_time(PCP_PROC_CSTIME, pid, offset);
+   process->priority = Metric_instance_u32(PCP_PROC_PRIORITY, pid, offset, 0);
+   process->nice = Metric_instance_s32(PCP_PROC_NICE, pid, offset, 0);
+   process->nlwp = Metric_instance_u32(PCP_PROC_THREADS, pid, offset, 0);
+   process->starttime_ctime = Metric_instance_time(PCP_PROC_STARTTIME, pid, offset);
+   process->processor = Metric_instance_u32(PCP_PROC_PROCESSOR, pid, offset, 0);
+
+   process->time = pp->utime + pp->stime;
+}
+
+static void PCPProcessTable_updateIO(PCPProcess* pp, int pid, int offset, unsigned long long now) {
+   pmAtomValue value;
+
+   pp->io_rchar = Metric_instance_ONE_K(PCP_PROC_IO_RCHAR, pid, offset);
+   pp->io_wchar = Metric_instance_ONE_K(PCP_PROC_IO_WCHAR, pid, offset);
+   pp->io_syscr = Metric_instance_u64(PCP_PROC_IO_SYSCR, pid, offset, ULLONG_MAX);
+   pp->io_syscw = Metric_instance_u64(PCP_PROC_IO_SYSCW, pid, offset, ULLONG_MAX);
+   pp->io_cancelled_write_bytes = Metric_instance_ONE_K(PCP_PROC_IO_CANCELLED, pid, offset);
+
+   if (Metric_instance(PCP_PROC_IO_READB, pid, offset, &value, PM_TYPE_U64)) {
+      unsigned long long last_read = pp->io_read_bytes;
+      pp->io_read_bytes = value.ull / ONE_K;
+      pp->io_rate_read_bps = ONE_K * (pp->io_read_bytes - last_read) /
+                                     (now - pp->io_last_scan_time);
+   } else {
+      pp->io_read_bytes = ULLONG_MAX;
+      pp->io_rate_read_bps = NAN;
+   }
+
+   if (Metric_instance(PCP_PROC_IO_WRITEB, pid, offset, &value, PM_TYPE_U64)) {
+      unsigned long long last_write = pp->io_write_bytes;
+      pp->io_write_bytes = value.ull;
+      pp->io_rate_write_bps = ONE_K * (pp->io_write_bytes - last_write) /
+                                      (now - pp->io_last_scan_time);
+   } else {
+      pp->io_write_bytes = ULLONG_MAX;
+      pp->io_rate_write_bps = NAN;
+   }
+
+   pp->io_last_scan_time = now;
+}
+
+static void PCPProcessTable_updateMemory(PCPProcess* pp, int pid, int offset) {
+   pp->super.m_virt = Metric_instance_u32(PCP_PROC_MEM_SIZE, pid, offset, 0);
+   pp->super.m_resident = Metric_instance_u32(PCP_PROC_MEM_RSS, pid, offset, 0);
+   pp->m_share = Metric_instance_u32(PCP_PROC_MEM_SHARE, pid, offset, 0);
+   pp->m_priv = pp->super.m_resident - pp->m_share;
+   pp->m_trs = Metric_instance_u32(PCP_PROC_MEM_TEXTRS, pid, offset, 0);
+   pp->m_lrs = Metric_instance_u32(PCP_PROC_MEM_LIBRS, pid, offset, 0);
+   pp->m_drs = Metric_instance_u32(PCP_PROC_MEM_DATRS, pid, offset, 0);
+   pp->m_dt = Metric_instance_u32(PCP_PROC_MEM_DIRTY, pid, offset, 0);
+}
+
+static void PCPProcessTable_updateSmaps(PCPProcess* pp, pid_t pid, int offset) {
+   pp->m_pss = Metric_instance_u64(PCP_PROC_SMAPS_PSS, pid, offset, 0);
+   pp->m_swap = Metric_instance_u64(PCP_PROC_SMAPS_SWAP, pid, offset, 0);
+   pp->m_psswp = Metric_instance_u64(PCP_PROC_SMAPS_SWAPPSS, pid, offset, 0);
+}
+
+static void PCPProcessTable_readOomData(PCPProcess* pp, int pid, int offset) {
+   pp->oom = Metric_instance_u32(PCP_PROC_OOMSCORE, pid, offset, 0);
+}
+
+static void PCPProcessTable_readAutogroup(PCPProcess* pp, int pid, int offset) {
+   pp->autogroup_id = Metric_instance_s64(PCP_PROC_AUTOGROUP_ID, pid, offset, -1);
+   pp->autogroup_nice = Metric_instance_s32(PCP_PROC_AUTOGROUP_NICE, pid, offset, 0);
+}
+
+static void PCPProcessTable_readCtxtData(PCPProcess* pp, int pid, int offset) {
+   pmAtomValue value;
+   unsigned long ctxt = 0;
+
+   if (Metric_instance(PCP_PROC_VCTXSW, pid, offset, &value, PM_TYPE_U32))
+      ctxt += value.ul;
+   if (Metric_instance(PCP_PROC_NVCTXSW, pid, offset, &value, PM_TYPE_U32))
+      ctxt += value.ul;
+
+   pp->ctxt_diff = ctxt > pp->ctxt_total ? ctxt - pp->ctxt_total : 0;
+   pp->ctxt_total = ctxt;
+}
+
+static char* setString(Metric metric, int pid, int offset, char* string) {
+   if (string)
+      free(string);
+   pmAtomValue value;
+   if (Metric_instance(metric, pid, offset, &value, PM_TYPE_STRING))
+      string = value.cp;
+   else
+      string = NULL;
+   return string;
+}
+
+static void PCPProcessTable_updateTTY(Process* process, int pid, int offset) {
+   process->tty_name = setString(PCP_PROC_TTYNAME, pid, offset, process->tty_name);
+}
+
+static void PCPProcessTable_readCGroups(PCPProcess* pp, int pid, int offset) {
+   pp->cgroup = setString(PCP_PROC_CGROUPS, pid, offset, pp->cgroup);
+
+   if (pp->cgroup) {
+      char* cgroup_short = CGroup_filterName(pp->cgroup);
+      if (cgroup_short) {
+         Row_updateFieldWidth(CCGROUP, strlen(cgroup_short));
+         free_and_xStrdup(&pp->cgroup_short, cgroup_short);
+         free(cgroup_short);
+      } else {
+         //CCGROUP is alias to normal CGROUP if shortening fails
+         Row_updateFieldWidth(CCGROUP, strlen(pp->cgroup));
+         free(pp->cgroup_short);
+         pp->cgroup_short = NULL;
+      }
+
+      char* container_short = CGroup_filterName(pp->cgroup);
+      if (container_short) {
+         Row_updateFieldWidth(CONTAINER, strlen(container_short));
+         free_and_xStrdup(&pp->container_short, container_short);
+         free(container_short);
+      } else {
+         Row_updateFieldWidth(CONTAINER, strlen("N/A"));
+         free(pp->container_short);
+         pp->container_short = NULL;
+      }
+   } else {
+      free(pp->cgroup_short);
+      pp->cgroup_short = NULL;
+
+      free(pp->container_short);
+      pp->container_short = NULL;
+   }
+}
+
+static void PCPProcessTable_readSecattrData(PCPProcess* pp, int pid, int offset) {
+   pp->secattr = setString(PCP_PROC_LABELS, pid, offset, pp->secattr);
+}
+
+static void PCPProcessTable_readCwd(PCPProcess* pp, int pid, int offset) {
+   pp->super.procCwd = setString(PCP_PROC_CWD, pid, offset, pp->super.procCwd);
+}
+
+static void PCPProcessTable_updateUsername(Process* process, int pid, int offset, UsersTable* users) {
+   process->st_uid = Metric_instance_u32(PCP_PROC_ID_UID, pid, offset, 0);
+   process->user = setUser(users, process->st_uid, pid, offset);
+}
+
+static void PCPProcessTable_updateCmdline(Process* process, int pid, int offset, const char* comm) {
+   pmAtomValue value;
+   if (!Metric_instance(PCP_PROC_PSARGS, pid, offset, &value, PM_TYPE_STRING)) {
+      if (process->state != ZOMBIE)
+         process->isKernelThread = true;
+      Process_updateCmdline(process, NULL, 0, 0);
+      return;
+   }
+
+   char* command = value.cp;
+   int length = strlen(command);
+   if (command[0] != '(') {
+      process->isKernelThread = false;
+   } else {
+      ++command;
+      --length;
+      if (command[length - 1] == ')')
+         command[--length] = '\0';
+      process->isKernelThread = true;
+   }
+
+   int tokenEnd = 0;
+   int tokenStart = 0;
+   bool argSepSpace = false;
+
+   for (int i = 0; i < length; i++) {
+      /* htop considers the next character after the last / that is before
+       * basenameOffset, as the start of the basename in cmdline - see
+       * Process_writeCommand */
+      if (command[i] == '/')
+         tokenStart = i + 1;
+      /* special-case arguments for problematic situations like "find /" */
+      if (command[i] <= ' ')
+         argSepSpace = true;
+   }
+   tokenEnd = length;
+   if (argSepSpace)
+      tokenStart = 0;
+
+   Process_updateCmdline(process, command, tokenStart, tokenEnd);
+   free(value.cp);
+
+   Process_updateComm(process, comm);
+
+   if (Metric_instance(PCP_PROC_EXE, pid, offset, &value, PM_TYPE_STRING)) {
+      Process_updateExe(process, value.cp[0] ? value.cp : NULL);
+      free(value.cp);
+   }
+}
+
+static bool PCPProcessTable_updateProcesses(PCPProcessTable* this) {
+   ProcessTable* pt = (ProcessTable*) this;
+   Machine* host = pt->super.host;
+   PCPMachine* phost = (PCPMachine*) host;
+
+   const Settings* settings = host->settings;
+   bool hideKernelThreads = settings->hideKernelThreads;
+   bool hideUserlandThreads = settings->hideUserlandThreads;
+   uint32_t flags = settings->ss->flags;
+
+   unsigned long long now = (unsigned long long)(phost->timestamp * 1000);
+   int pid = -1, offset = -1;
+
+   /* for every process ... */
+   while (Metric_iterate(PCP_PROC_PID, &pid, &offset)) {
+
+      bool preExisting;
+      Process* proc = ProcessTable_getProcess(pt, pid, &preExisting, PCPProcess_new);
+      PCPProcess* pp = (PCPProcess*) proc;
+      PCPProcessTable_updateID(proc, pid, offset);
+      proc->isUserlandThread = Process_getPid(proc) != Process_getThreadGroup(proc);
+      pp->offset = offset >= 0 ? offset : 0;
+
+      /*
+       * These conditions will not trigger on first occurrence, cause we need to
+       * add the process to the ProcessTable and do all one time scans
+       * (e.g. parsing the cmdline to detect a kernel thread)
+       * But it will short-circuit subsequent scans.
+       */
+      if (preExisting && hideKernelThreads && Process_isKernelThread(proc)) {
+         proc->super.updated = true;
+         proc->super.show = false;
+         if (proc->state == RUNNING)
+            pt->runningTasks++;
+         pt->kernelThreads++;
+         pt->totalTasks++;
+         continue;
+      }
+      if (preExisting && hideUserlandThreads && Process_isUserlandThread(proc)) {
+         proc->super.updated = true;
+         proc->super.show = false;
+         if (proc->state == RUNNING)
+            pt->runningTasks++;
+         pt->userlandThreads++;
+         pt->totalTasks++;
+         continue;
+      }
+
+      if (flags & PROCESS_FLAG_IO)
+         PCPProcessTable_updateIO(pp, pid, offset, now);
+
+      PCPProcessTable_updateMemory(pp, pid, offset);
+
+      if ((flags & PROCESS_FLAG_LINUX_SMAPS) && !Process_isKernelThread(proc)) {
+         if (Metric_enabled(PCP_PROC_SMAPS_PSS)) {
+            PCPProcessTable_updateSmaps(pp, pid, offset);
+         }
+      }
+
+      char command[MAX_NAME + 1];
+      unsigned int tty_nr = proc->tty_nr;
+      unsigned long long int lasttimes = pp->utime + pp->stime;
+
+      PCPProcessTable_updateInfo(pp, pid, offset, command, sizeof(command));
+      proc->starttime_ctime += Platform_getBootTime();
+      if (tty_nr != proc->tty_nr)
+         PCPProcessTable_updateTTY(proc, pid, offset);
+
+      proc->percent_cpu = NAN;
+      if (phost->period > 0.0) {
+         float percent_cpu = saturatingSub(pp->utime + pp->stime, lasttimes) / phost->period * 100.0;
+         proc->percent_cpu = MINIMUM(percent_cpu, host->activeCPUs * 100.0F);
+      }
+      proc->percent_mem = proc->m_resident / (double) host->totalMem * 100.0;
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      PCPProcessTable_updateUsername(proc, pid, offset, host->usersTable);
+
+      if (!preExisting) {
+         PCPProcessTable_updateCmdline(proc, pid, offset, command);
+         Process_fillStarttimeBuffer(proc);
+         ProcessTable_add(pt, proc);
+      } else if (settings->updateProcessNames && proc->state != ZOMBIE) {
+         PCPProcessTable_updateCmdline(proc, pid, offset, command);
+      }
+
+      if (flags & PROCESS_FLAG_LINUX_CGROUP)
+         PCPProcessTable_readCGroups(pp, pid, offset);
+
+      if (flags & PROCESS_FLAG_LINUX_OOM)
+         PCPProcessTable_readOomData(pp, pid, offset);
+
+      if (flags & PROCESS_FLAG_LINUX_CTXT)
+         PCPProcessTable_readCtxtData(pp, pid, offset);
+
+      if (flags & PROCESS_FLAG_LINUX_SECATTR)
+         PCPProcessTable_readSecattrData(pp, pid, offset);
+
+      if (flags & PROCESS_FLAG_CWD)
+         PCPProcessTable_readCwd(pp, pid, offset);
+
+      if (flags & PROCESS_FLAG_LINUX_AUTOGROUP)
+         PCPProcessTable_readAutogroup(pp, pid, offset);
+
+      if (proc->state == ZOMBIE && !proc->cmdline && command[0]) {
+         Process_updateCmdline(proc, command, 0, strlen(command));
+      } else if (Process_isThread(proc)) {
+         if ((settings->showThreadNames || Process_isKernelThread(proc)) && command[0]) {
+            Process_updateCmdline(proc, command, 0, strlen(command));
+         }
+
+         if (Process_isKernelThread(proc)) {
+            pt->kernelThreads++;
+         } else {
+            pt->userlandThreads++;
+         }
+      }
+
+      /* Set at the end when we know if a new entry is a thread */
+      proc->super.show = ! ((hideKernelThreads && Process_isKernelThread(proc)) ||
+                      (hideUserlandThreads && Process_isUserlandThread(proc)));
+
+      pt->totalTasks++;
+      if (proc->state == RUNNING)
+         pt->runningTasks++;
+      proc->super.updated = true;
+   }
+   return true;
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   PCPProcessTable* this = (PCPProcessTable*) super;
+   PCPProcessTable_updateProcesses(this);
+}
diff --git a/pcp/PCPProcessTable.h b/pcp/PCPProcessTable.h
new file mode 100644
index 0000000..e55c85b
--- /dev/null
+++ b/pcp/PCPProcessTable.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_PCPProcessTable
+#define HEADER_PCPProcessTable
+/*
+htop - PCPProcessTable.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Hashtable.h"
+#include "ProcessTable.h"
+#include "UsersTable.h"
+
+#include "pcp/Platform.h"
+
+
+typedef struct PCPProcessTable_ {
+   ProcessTable super;
+} PCPProcessTable;
+
+#endif
diff --git a/pcp/Platform.c b/pcp/Platform.c
new file mode 100644
index 0000000..0b5f334
--- /dev/null
+++ b/pcp/Platform.c
@@ -0,0 +1,924 @@
+/*
+htop - linux/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2020-2022 htop dev team
+(C) 2020-2022 Red Hat, Inc.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "pcp/Platform.h"
+
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "BatteryMeter.h"
+#include "CPUMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "DiskIOMeter.h"
+#include "DynamicColumn.h"
+#include "DynamicMeter.h"
+#include "DynamicScreen.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "ProcessTable.h"
+#include "Settings.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+
+#include "linux/PressureStallMeter.h"
+#include "linux/ZramMeter.h"
+#include "linux/ZramStats.h"
+#include "pcp/Metric.h"
+#include "pcp/PCPDynamicColumn.h"
+#include "pcp/PCPDynamicMeter.h"
+#include "pcp/PCPDynamicScreen.h"
+#include "pcp/PCPMachine.h"
+#include "pcp/PCPProcessTable.h"
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsArcStats.h"
+#include "zfs/ZfsCompressedArcMeter.h"
+
+
+Platform* pcp;
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+   {
+      .name = "I/O",
+      .columns = "PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command",
+      .sortKey = "IO_RATE",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number = 0 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &DynamicMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &UptimeMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &BlankMeter_class,
+   &PressureStallCPUSomeMeter_class,
+   &PressureStallIOSomeMeter_class,
+   &PressureStallIOFullMeter_class,
+   &PressureStallIRQFullMeter_class,
+   &PressureStallMemorySomeMeter_class,
+   &PressureStallMemoryFullMeter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
+   &ZramMeter_class,
+   &DiskIOMeter_class,
+   &NetworkIOMeter_class,
+   &SysArchMeter_class,
+   &FileDescriptorMeter_class,
+   NULL
+};
+
+static const char* Platform_metricNames[] = {
+   [PCP_CONTROL_THREADS] = "proc.control.perclient.threads",
+
+   [PCP_HINV_NCPU] = "hinv.ncpu",
+   [PCP_HINV_CPUCLOCK] = "hinv.cpu.clock",
+   [PCP_UNAME_SYSNAME] = "kernel.uname.sysname",
+   [PCP_UNAME_RELEASE] = "kernel.uname.release",
+   [PCP_UNAME_MACHINE] = "kernel.uname.machine",
+   [PCP_UNAME_DISTRO] = "kernel.uname.distro",
+   [PCP_LOAD_AVERAGE] = "kernel.all.load",
+   [PCP_PID_MAX] = "kernel.all.pid_max",
+   [PCP_UPTIME] = "kernel.all.uptime",
+   [PCP_BOOTTIME] = "kernel.all.boottime",
+   [PCP_CPU_USER] = "kernel.all.cpu.user",
+   [PCP_CPU_NICE] = "kernel.all.cpu.nice",
+   [PCP_CPU_SYSTEM] = "kernel.all.cpu.sys",
+   [PCP_CPU_IDLE] = "kernel.all.cpu.idle",
+   [PCP_CPU_IOWAIT] = "kernel.all.cpu.wait.total",
+   [PCP_CPU_IRQ] = "kernel.all.cpu.intr",
+   [PCP_CPU_SOFTIRQ] = "kernel.all.cpu.irq.soft",
+   [PCP_CPU_STEAL] = "kernel.all.cpu.steal",
+   [PCP_CPU_GUEST] = "kernel.all.cpu.guest",
+   [PCP_CPU_GUESTNICE] = "kernel.all.cpu.guest_nice",
+   [PCP_PERCPU_USER] = "kernel.percpu.cpu.user",
+   [PCP_PERCPU_NICE] = "kernel.percpu.cpu.nice",
+   [PCP_PERCPU_SYSTEM] = "kernel.percpu.cpu.sys",
+   [PCP_PERCPU_IDLE] = "kernel.percpu.cpu.idle",
+   [PCP_PERCPU_IOWAIT] = "kernel.percpu.cpu.wait.total",
+   [PCP_PERCPU_IRQ] = "kernel.percpu.cpu.intr",
+   [PCP_PERCPU_SOFTIRQ] = "kernel.percpu.cpu.irq.soft",
+   [PCP_PERCPU_STEAL] = "kernel.percpu.cpu.steal",
+   [PCP_PERCPU_GUEST] = "kernel.percpu.cpu.guest",
+   [PCP_PERCPU_GUESTNICE] = "kernel.percpu.cpu.guest_nice",
+   [PCP_MEM_TOTAL] = "mem.physmem",
+   [PCP_MEM_FREE] = "mem.util.free",
+   [PCP_MEM_AVAILABLE] = "mem.util.available",
+   [PCP_MEM_BUFFERS] = "mem.util.bufmem",
+   [PCP_MEM_CACHED] = "mem.util.cached",
+   [PCP_MEM_SHARED] = "mem.util.shmem",
+   [PCP_MEM_SRECLAIM] = "mem.util.slabReclaimable",
+   [PCP_MEM_SWAPCACHED] = "mem.util.swapCached",
+   [PCP_MEM_SWAPTOTAL] = "mem.util.swapTotal",
+   [PCP_MEM_SWAPFREE] = "mem.util.swapFree",
+   [PCP_DISK_READB] = "disk.all.read_bytes",
+   [PCP_DISK_WRITEB] = "disk.all.write_bytes",
+   [PCP_DISK_ACTIVE] = "disk.all.avactive",
+   [PCP_NET_RECVB] = "network.all.in.bytes",
+   [PCP_NET_SENDB] = "network.all.out.bytes",
+   [PCP_NET_RECVP] = "network.all.in.packets",
+   [PCP_NET_SENDP] = "network.all.out.packets",
+
+   [PCP_PSI_CPUSOME] = "kernel.all.pressure.cpu.some.avg",
+   [PCP_PSI_IOSOME] = "kernel.all.pressure.io.some.avg",
+   [PCP_PSI_IOFULL] = "kernel.all.pressure.io.full.avg",
+   [PCP_PSI_IRQFULL] = "kernel.all.pressure.irq.full.avg",
+   [PCP_PSI_MEMSOME] = "kernel.all.pressure.memory.some.avg",
+   [PCP_PSI_MEMFULL] = "kernel.all.pressure.memory.full.avg",
+
+   [PCP_ZFS_ARC_ANON_SIZE] = "zfs.arc.anon_size",
+   [PCP_ZFS_ARC_BONUS_SIZE] = "zfs.arc.bonus_size",
+   [PCP_ZFS_ARC_COMPRESSED_SIZE] = "zfs.arc.compressed_size",
+   [PCP_ZFS_ARC_UNCOMPRESSED_SIZE] = "zfs.arc.uncompressed_size",
+   [PCP_ZFS_ARC_C_MIN] = "zfs.arc.c_min",
+   [PCP_ZFS_ARC_C_MAX] = "zfs.arc.c_max",
+   [PCP_ZFS_ARC_DBUF_SIZE] = "zfs.arc.dbuf_size",
+   [PCP_ZFS_ARC_DNODE_SIZE] = "zfs.arc.dnode_size",
+   [PCP_ZFS_ARC_HDR_SIZE] = "zfs.arc.hdr_size",
+   [PCP_ZFS_ARC_MFU_SIZE] = "zfs.arc.mfu.size",
+   [PCP_ZFS_ARC_MRU_SIZE] = "zfs.arc.mru.size",
+   [PCP_ZFS_ARC_SIZE] = "zfs.arc.size",
+
+   [PCP_ZRAM_CAPACITY] = "zram.capacity",
+   [PCP_ZRAM_ORIGINAL] = "zram.mm_stat.data_size.original",
+   [PCP_ZRAM_COMPRESSED] = "zram.mm_stat.data_size.compressed",
+   [PCP_MEM_ZSWAP] = "mem.util.zswap",
+   [PCP_MEM_ZSWAPPED] = "mem.util.zswapped",
+   [PCP_VFS_FILES_COUNT] = "vfs.files.count",
+   [PCP_VFS_FILES_MAX] = "vfs.files.max",
+
+   [PCP_PROC_PID] = "proc.psinfo.pid",
+   [PCP_PROC_PPID] = "proc.psinfo.ppid",
+   [PCP_PROC_TGID] = "proc.psinfo.tgid",
+   [PCP_PROC_PGRP] = "proc.psinfo.pgrp",
+   [PCP_PROC_SESSION] = "proc.psinfo.session",
+   [PCP_PROC_STATE] = "proc.psinfo.sname",
+   [PCP_PROC_TTY] = "proc.psinfo.tty",
+   [PCP_PROC_TTYPGRP] = "proc.psinfo.tty_pgrp",
+   [PCP_PROC_MINFLT] = "proc.psinfo.minflt",
+   [PCP_PROC_MAJFLT] = "proc.psinfo.maj_flt",
+   [PCP_PROC_CMINFLT] = "proc.psinfo.cmin_flt",
+   [PCP_PROC_CMAJFLT] = "proc.psinfo.cmaj_flt",
+   [PCP_PROC_UTIME] = "proc.psinfo.utime",
+   [PCP_PROC_STIME] = "proc.psinfo.stime",
+   [PCP_PROC_CUTIME] = "proc.psinfo.cutime",
+   [PCP_PROC_CSTIME] = "proc.psinfo.cstime",
+   [PCP_PROC_PRIORITY] = "proc.psinfo.priority",
+   [PCP_PROC_NICE] = "proc.psinfo.nice",
+   [PCP_PROC_THREADS] = "proc.psinfo.threads",
+   [PCP_PROC_STARTTIME] = "proc.psinfo.start_time",
+   [PCP_PROC_PROCESSOR] = "proc.psinfo.processor",
+   [PCP_PROC_CMD] = "proc.psinfo.cmd",
+   [PCP_PROC_PSARGS] = "proc.psinfo.psargs",
+   [PCP_PROC_CGROUPS] = "proc.psinfo.cgroups",
+   [PCP_PROC_OOMSCORE] = "proc.psinfo.oom_score",
+   [PCP_PROC_VCTXSW] = "proc.psinfo.vctxsw",
+   [PCP_PROC_NVCTXSW] = "proc.psinfo.nvctxsw",
+   [PCP_PROC_LABELS] = "proc.psinfo.labels",
+   [PCP_PROC_ENVIRON] = "proc.psinfo.environ",
+   [PCP_PROC_TTYNAME] = "proc.psinfo.ttyname",
+   [PCP_PROC_EXE] = "proc.psinfo.exe",
+   [PCP_PROC_CWD] = "proc.psinfo.cwd",
+   [PCP_PROC_AUTOGROUP_ID] = "proc.autogroup.id",
+   [PCP_PROC_AUTOGROUP_NICE] = "proc.autogroup.nice",
+   [PCP_PROC_ID_UID] = "proc.id.uid",
+   [PCP_PROC_ID_USER] = "proc.id.uid_nm",
+   [PCP_PROC_IO_RCHAR] = "proc.io.rchar",
+   [PCP_PROC_IO_WCHAR] = "proc.io.wchar",
+   [PCP_PROC_IO_SYSCR] = "proc.io.syscr",
+   [PCP_PROC_IO_SYSCW] = "proc.io.syscw",
+   [PCP_PROC_IO_READB] = "proc.io.read_bytes",
+   [PCP_PROC_IO_WRITEB] = "proc.io.write_bytes",
+   [PCP_PROC_IO_CANCELLED] = "proc.io.cancelled_write_bytes",
+   [PCP_PROC_MEM_SIZE] = "proc.memory.size",
+   [PCP_PROC_MEM_RSS] = "proc.memory.rss",
+   [PCP_PROC_MEM_SHARE] = "proc.memory.share",
+   [PCP_PROC_MEM_TEXTRS] = "proc.memory.textrss",
+   [PCP_PROC_MEM_LIBRS] = "proc.memory.librss",
+   [PCP_PROC_MEM_DATRS] = "proc.memory.datrss",
+   [PCP_PROC_MEM_DIRTY] = "proc.memory.dirty",
+   [PCP_PROC_SMAPS_PSS] = "proc.smaps.pss",
+   [PCP_PROC_SMAPS_SWAP] = "proc.smaps.swap",
+   [PCP_PROC_SMAPS_SWAPPSS] = "proc.smaps.swappss",
+
+   [PCP_METRIC_COUNT] = NULL
+};
+
+#ifndef HAVE_PMLOOKUPDESCS
+/*
+ * pmLookupDescs(3) exists in latest versions of libpcp (5.3.6+),
+ * but for older versions we provide an implementation here. This
+ * involves multiple round trips to pmcd though, which the latest
+ * libpcp version avoids by using a protocol extension.  In time,
+ * perhaps in a few years, we could remove this back-compat code.
+ */
+int pmLookupDescs(int numpmid, pmID* pmids, pmDesc* descs) {
+   int count = 0;
+
+   for (int i = 0; i < numpmid; i++) {
+      /* expect some metrics to be missing - e.g. PMDA not available */
+      if (pmids[i] == PM_ID_NULL)
+         continue;
+
+      int sts = pmLookupDesc(pmids[i], &descs[i]);
+      if (sts < 0) {
+         if (pmDebugOptions.appl0)
+            fprintf(stderr, "Error: cannot lookup metric %s(%s): %s\n",
+                    pcp->names[i], pmIDStr(pcp->pmids[i]), pmErrStr(sts));
+         pmids[i] = PM_ID_NULL;
+         continue;
+      }
+
+      count++;
+   }
+   return count;
+}
+#endif
+
+size_t Platform_addMetric(Metric id, const char* name) {
+   unsigned int i = (unsigned int)id;
+
+   if (i >= PCP_METRIC_COUNT && i >= pcp->totalMetrics) {
+      /* added via configuration files */
+      size_t j = pcp->totalMetrics + 1;
+      pcp->fetch = xRealloc(pcp->fetch, j * sizeof(pmID));
+      pcp->pmids = xRealloc(pcp->pmids, j * sizeof(pmID));
+      pcp->names = xRealloc(pcp->names, j * sizeof(char*));
+      pcp->descs = xRealloc(pcp->descs, j * sizeof(pmDesc));
+      memset(&pcp->descs[i], 0, sizeof(pmDesc));
+   }
+
+   pcp->pmids[i] = pcp->fetch[i] = PM_ID_NULL;
+   pcp->names[i] = name;
+   return ++pcp->totalMetrics;
+}
+
+/* global state from the environment and command line arguments */
+pmOptions opts;
+
+bool Platform_init(void) {
+   const char* source;
+   if (opts.context == PM_CONTEXT_ARCHIVE) {
+      source = opts.archives[0];
+   } else if (opts.context == PM_CONTEXT_HOST) {
+      source = opts.nhosts > 0 ? opts.hosts[0] : "local:";
+   } else {
+      opts.context = PM_CONTEXT_HOST;
+      source = "local:";
+   }
+
+   int sts;
+   sts = pmNewContext(opts.context, source);
+   /* with no host requested, fallback to PM_CONTEXT_LOCAL shared libraries */
+   if (sts < 0 && opts.context == PM_CONTEXT_HOST && opts.nhosts == 0) {
+      opts.context = PM_CONTEXT_LOCAL;
+      sts = pmNewContext(opts.context, NULL);
+   }
+   if (sts < 0) {
+      fprintf(stderr, "Cannot setup PCP metric source: %s\n", pmErrStr(sts));
+      return false;
+   }
+   /* setup timezones and other general startup preparation completion */
+   if (pmGetContextOptions(sts, &opts) < 0 || opts.errors) {
+      pmflush();
+      return false;
+   }
+
+   pcp = xCalloc(1, sizeof(Platform));
+   pcp->context = sts;
+   pcp->fetch = xCalloc(PCP_METRIC_COUNT, sizeof(pmID));
+   pcp->pmids = xCalloc(PCP_METRIC_COUNT, sizeof(pmID));
+   pcp->names = xCalloc(PCP_METRIC_COUNT, sizeof(char*));
+   pcp->descs = xCalloc(PCP_METRIC_COUNT, sizeof(pmDesc));
+
+   if (opts.context == PM_CONTEXT_ARCHIVE) {
+      gettimeofday(&pcp->offset, NULL);
+      pmtimevalDec(&pcp->offset, &opts.start);
+   }
+
+   for (unsigned int i = 0; i < PCP_METRIC_COUNT; i++)
+      Platform_addMetric(i, Platform_metricNames[i]);
+   pcp->meters.offset = PCP_METRIC_COUNT;
+
+   PCPDynamicMeters_init(&pcp->meters);
+
+   pcp->columns.offset = PCP_METRIC_COUNT + pcp->meters.cursor;
+   PCPDynamicColumns_init(&pcp->columns);
+   PCPDynamicScreens_init(&pcp->screens, &pcp->columns);
+
+   sts = pmLookupName(pcp->totalMetrics, pcp->names, pcp->pmids);
+   if (sts < 0) {
+      fprintf(stderr, "Error: cannot lookup metric names: %s\n", pmErrStr(sts));
+      Platform_done();
+      return false;
+   }
+
+   sts = pmLookupDescs(pcp->totalMetrics, pcp->pmids, pcp->descs);
+   if (sts < 1) {
+      if (sts < 0)
+         fprintf(stderr, "Error: cannot lookup descriptors: %s\n", pmErrStr(sts));
+      else /* ensure we have at least one valid metric to work with */
+         fprintf(stderr, "Error: cannot find a single valid metric, exiting\n");
+      Platform_done();
+      return false;
+   }
+
+   /* set proc.control.perclient.threads to 1 for live contexts */
+   Metric_enableThreads();
+
+   /* extract values needed for setup - e.g. cpu count, pid_max */
+   Metric_enable(PCP_PID_MAX, true);
+   Metric_enable(PCP_BOOTTIME, true);
+   Metric_enable(PCP_HINV_NCPU, true);
+   Metric_enable(PCP_PERCPU_SYSTEM, true);
+   Metric_enable(PCP_UNAME_SYSNAME, true);
+   Metric_enable(PCP_UNAME_RELEASE, true);
+   Metric_enable(PCP_UNAME_MACHINE, true);
+   Metric_enable(PCP_UNAME_DISTRO, true);
+
+   /* enable metrics for all dynamic columns (including those from dynamic screens) */
+   for (size_t i = pcp->columns.offset; i < pcp->columns.offset + pcp->columns.count; i++)
+      Metric_enable(i, true);
+
+   Metric_fetch(NULL);
+
+   for (Metric metric = 0; metric < PCP_PROC_PID; metric++)
+      Metric_enable(metric, true);
+   Metric_enable(PCP_PID_MAX, false); /* needed one time only */
+   Metric_enable(PCP_BOOTTIME, false);
+   Metric_enable(PCP_UNAME_SYSNAME, false);
+   Metric_enable(PCP_UNAME_RELEASE, false);
+   Metric_enable(PCP_UNAME_MACHINE, false);
+   Metric_enable(PCP_UNAME_DISTRO, false);
+
+   /* first sample (fetch) performed above, save constants */
+   Platform_getBootTime();
+   Platform_getRelease(0);
+   Platform_getMaxCPU();
+   Platform_getMaxPid();
+
+   return true;
+}
+
+void Platform_dynamicColumnsDone(Hashtable* columns) {
+   PCPDynamicColumns_done(columns);
+}
+
+void Platform_dynamicMetersDone(Hashtable* meters) {
+   PCPDynamicMeters_done(meters);
+}
+
+void Platform_dynamicScreensDone(Hashtable* screens) {
+   PCPDynamicScreens_done(screens);
+}
+
+void Platform_done(void) {
+   pmDestroyContext(pcp->context);
+   if (pcp->result)
+      pmFreeResult(pcp->result);
+   free(pcp->release);
+   free(pcp->fetch);
+   free(pcp->pmids);
+   free(pcp->names);
+   free(pcp->descs);
+   free(pcp);
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void)keys;
+}
+
+int Platform_getUptime(void) {
+   pmAtomValue value;
+   if (Metric_values(PCP_UPTIME, &value, 1, PM_TYPE_32) == NULL)
+      return 0;
+   return value.l;
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   *one = *five = *fifteen = 0.0;
+
+   pmAtomValue values[3] = {0};
+   if (Metric_values(PCP_LOAD_AVERAGE, values, 3, PM_TYPE_DOUBLE) != NULL) {
+      *one = values[0].d;
+      *five = values[1].d;
+      *fifteen = values[2].d;
+   }
+}
+
+unsigned int Platform_getMaxCPU(void) {
+   if (pcp->ncpu)
+      return pcp->ncpu;
+
+   pmAtomValue value;
+   if (Metric_values(PCP_HINV_NCPU, &value, 1, PM_TYPE_U32) != NULL)
+      pcp->ncpu = value.ul;
+   else
+      pcp->ncpu = 1;
+   return pcp->ncpu;
+}
+
+pid_t Platform_getMaxPid(void) {
+   if (pcp->pidmax)
+      return pcp->pidmax;
+
+   pmAtomValue value;
+   if (Metric_values(PCP_PID_MAX, &value, 1, PM_TYPE_32) == NULL)
+      return UINT_MAX;
+   pcp->pidmax = value.l;
+   return pcp->pidmax;
+}
+
+long long Platform_getBootTime(void) {
+   if (pcp->btime)
+      return pcp->btime;
+
+   pmAtomValue value;
+   if (Metric_values(PCP_BOOTTIME, &value, 1, PM_TYPE_64) != NULL)
+      pcp->btime = value.ll;
+   return pcp->btime;
+}
+
+static double Platform_setOneCPUValues(Meter* this, const Settings* settings, pmAtomValue* values) {
+   unsigned long long value = values[CPU_TOTAL_PERIOD].ull;
+   double total = (double) (value == 0 ? 1 : value);
+   double percent;
+
+   double* v = this->values;
+   v[CPU_METER_NICE] = values[CPU_NICE_PERIOD].ull / total * 100.0;
+   v[CPU_METER_NORMAL] = values[CPU_USER_PERIOD].ull / total * 100.0;
+   if (settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = values[CPU_SYSTEM_PERIOD].ull / total * 100.0;
+      v[CPU_METER_IRQ]     = values[CPU_IRQ_PERIOD].ull / total * 100.0;
+      v[CPU_METER_SOFTIRQ] = values[CPU_SOFTIRQ_PERIOD].ull / total * 100.0;
+      this->curItems = 5;
+
+      v[CPU_METER_STEAL]   = values[CPU_STEAL_PERIOD].ull / total * 100.0;
+      v[CPU_METER_GUEST]   = values[CPU_GUEST_PERIOD].ull / total * 100.0;
+      if (settings->accountGuestInCPUMeter) {
+         this->curItems = 7;
+      }
+
+      v[CPU_METER_IOWAIT]  = values[CPU_IOWAIT_PERIOD].ull / total * 100.0;
+   } else {
+      v[CPU_METER_KERNEL] = values[CPU_SYSTEM_ALL_PERIOD].ull / total * 100.0;
+      value = values[CPU_STEAL_PERIOD].ull + values[CPU_GUEST_PERIOD].ull;
+      v[CPU_METER_IRQ] = value / total * 100.0;
+      this->curItems = 4;
+   }
+
+   percent = sumPositiveValues(v, this->curItems);
+   percent = MINIMUM(percent, 100.0);
+
+   if (settings->detailedCPUTime) {
+      this->curItems = 8;
+   }
+
+   v[CPU_METER_FREQUENCY] = values[CPU_FREQUENCY].d;
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   return percent;
+}
+
+double Platform_setCPUValues(Meter* this, int cpu) {
+   const PCPMachine* phost = (const PCPMachine*) this->host;
+   const Settings* settings = this->host->settings;
+
+   if (cpu <= 0) /* use aggregate values */
+      return Platform_setOneCPUValues(this, settings, phost->cpu);
+   return Platform_setOneCPUValues(this, settings, phost->percpu[cpu - 1]);
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   const PCPMachine* phost = (const PCPMachine*) host;
+
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   this->values[MEMORY_METER_SHARED] = host->sharedMem;
+   this->values[MEMORY_METER_COMPRESSED] = 0;
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   this->values[MEMORY_METER_AVAILABLE] = host->availableMem;
+
+   if (phost->zfs.enabled != 0) {
+      // ZFS does not shrink below the value of zfs_arc_min.
+      unsigned long long int shrinkableSize = 0;
+      if (phost->zfs.size > phost->zfs.min)
+         shrinkableSize = phost->zfs.size - phost->zfs.min;
+      this->values[MEMORY_METER_USED] -= shrinkableSize;
+      this->values[MEMORY_METER_CACHE] += shrinkableSize;
+      this->values[MEMORY_METER_AVAILABLE] += shrinkableSize;
+   }
+
+   if (phost->zswap.usedZswapOrig > 0 || phost->zswap.usedZswapComp > 0) {
+      this->values[MEMORY_METER_USED] -= phost->zswap.usedZswapComp;
+      this->values[MEMORY_METER_COMPRESSED] += phost->zswap.usedZswapComp;
+   }
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   const PCPMachine* phost = (const PCPMachine*) host;
+
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   this->values[SWAP_METER_CACHE] = host->cachedSwap;
+   this->values[SWAP_METER_FRONTSWAP] = 0; /* frontswap -- memory that is accounted to swap but resides elsewhere */
+
+   if (phost->zswap.usedZswapOrig > 0 || phost->zswap.usedZswapComp > 0) {
+      /* refer to linux/Platform.c::Platform_setSwapValues for details */
+      this->values[SWAP_METER_USED] -= phost->zswap.usedZswapOrig;
+      if (this->values[SWAP_METER_USED] < 0) {
+         /* subtract the overflow from SwapCached */
+         this->values[SWAP_METER_CACHE] += this->values[SWAP_METER_USED];
+         this->values[SWAP_METER_USED] = 0;
+      }
+      this->values[SWAP_METER_FRONTSWAP] += phost->zswap.usedZswapOrig;
+   }
+}
+
+void Platform_setZramValues(Meter* this) {
+   int i, count = Metric_instanceCount(PCP_ZRAM_CAPACITY);
+   if (!count) {
+      this->total = 0;
+      this->values[0] = 0;
+      this->values[1] = 0;
+      return;
+   }
+
+   pmAtomValue* values = xCalloc(count, sizeof(pmAtomValue));
+   ZramStats stats = {0};
+
+   if (Metric_values(PCP_ZRAM_CAPACITY, values, count, PM_TYPE_U64)) {
+      for (i = 0; i < count; i++)
+         stats.totalZram += values[i].ull;
+   }
+   if (Metric_values(PCP_ZRAM_ORIGINAL, values, count, PM_TYPE_U64)) {
+      for (i = 0; i < count; i++)
+         stats.usedZramOrig += values[i].ull;
+   }
+   if (Metric_values(PCP_ZRAM_COMPRESSED, values, count, PM_TYPE_U64)) {
+      for (i = 0; i < count; i++)
+         stats.usedZramComp += values[i].ull;
+   }
+
+   free(values);
+
+   if (stats.usedZramComp > stats.usedZramOrig) {
+      stats.usedZramComp = stats.usedZramOrig;
+   }
+
+   this->total = stats.totalZram;
+   this->values[0] = stats.usedZramComp;
+   this->values[1] = stats.usedZramOrig - stats.usedZramComp;
+}
+
+void Platform_setZfsArcValues(Meter* this) {
+   const PCPMachine* phost = (const PCPMachine*) this->host;
+
+   ZfsArcMeter_readStats(this, &phost->zfs);
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   const PCPMachine* phost = (const PCPMachine*) this->host;
+
+   ZfsCompressedArcMeter_readStats(this, &phost->zfs);
+}
+
+void Platform_getHostname(char* buffer, size_t size) {
+   const char* hostname = pmGetContextHostName(pcp->context);
+   String_safeStrncpy(buffer, hostname, size);
+}
+
+void Platform_getRelease(char** string) {
+   /* fast-path - previously-formatted string */
+   if (string) {
+      *string = pcp->release;
+      return;
+   }
+
+   /* first call, extract just-sampled values */
+   pmAtomValue sysname, release, machine, distro;
+   if (!Metric_values(PCP_UNAME_SYSNAME, &sysname, 1, PM_TYPE_STRING))
+      sysname.cp = NULL;
+   if (!Metric_values(PCP_UNAME_RELEASE, &release, 1, PM_TYPE_STRING))
+      release.cp = NULL;
+   if (!Metric_values(PCP_UNAME_MACHINE, &machine, 1, PM_TYPE_STRING))
+      machine.cp = NULL;
+   if (!Metric_values(PCP_UNAME_DISTRO, &distro, 1, PM_TYPE_STRING))
+      distro.cp = NULL;
+
+   size_t length = 16; /* padded for formatting characters */
+   if (sysname.cp)
+      length += strlen(sysname.cp);
+   if (release.cp)
+      length += strlen(release.cp);
+   if (machine.cp)
+      length += strlen(machine.cp);
+   if (distro.cp)
+      length += strlen(distro.cp);
+   pcp->release = xCalloc(1, length);
+
+   if (sysname.cp) {
+      strcat(pcp->release, sysname.cp);
+      strcat(pcp->release, " ");
+   }
+   if (release.cp) {
+      strcat(pcp->release, release.cp);
+      strcat(pcp->release, " ");
+   }
+   if (machine.cp) {
+      strcat(pcp->release, "[");
+      strcat(pcp->release, machine.cp);
+      strcat(pcp->release, "] ");
+   }
+   if (distro.cp) {
+      if (pcp->release[0] != '\0') {
+         strcat(pcp->release, "@ ");
+         strcat(pcp->release, distro.cp);
+      } else {
+         strcat(pcp->release, distro.cp);
+      }
+      strcat(pcp->release, " ");
+   }
+
+   if (pcp->release) /* cull trailing space */
+      pcp->release[strlen(pcp->release)] = '\0';
+
+   free(distro.cp);
+   free(machine.cp);
+   free(release.cp);
+   free(sysname.cp);
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   pmAtomValue value;
+   if (!Metric_instance(PCP_PROC_ENVIRON, pid, 0, &value, PM_TYPE_STRING))
+      return NULL;
+   return value.cp;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getPressureStall(const char* file, bool some, double* ten, double* sixty, double* threehundred) {
+   *ten = *sixty = *threehundred = 0;
+
+   Metric metric;
+   if (String_eq(file, "cpu"))
+      metric = PCP_PSI_CPUSOME;
+   else if (String_eq(file, "io"))
+      metric = some ? PCP_PSI_IOSOME : PCP_PSI_IOFULL;
+   else if (String_eq(file, "irq"))
+      metric = PCP_PSI_IRQFULL;
+   else if (String_eq(file, "mem"))
+      metric = some ? PCP_PSI_MEMSOME : PCP_PSI_MEMFULL;
+   else
+      return;
+
+   pmAtomValue values[3] = {0};
+   if (Metric_values(metric, values, 3, PM_TYPE_DOUBLE) != NULL) {
+      *ten = values[0].d;
+      *sixty = values[1].d;
+      *threehundred = values[2].d;
+   }
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   memset(data, 0, sizeof(*data));
+
+   pmAtomValue value;
+   if (Metric_values(PCP_DISK_READB, &value, 1, PM_TYPE_U64) != NULL)
+      data->totalBytesRead = value.ull;
+   if (Metric_values(PCP_DISK_WRITEB, &value, 1, PM_TYPE_U64) != NULL)
+      data->totalBytesWritten = value.ull;
+   if (Metric_values(PCP_DISK_ACTIVE, &value, 1, PM_TYPE_U64) != NULL)
+      data->totalMsTimeSpend = value.ull;
+   return true;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   memset(data, 0, sizeof(*data));
+
+   pmAtomValue value;
+   if (Metric_values(PCP_NET_RECVB, &value, 1, PM_TYPE_U64) != NULL)
+      data->bytesReceived = value.ull;
+   if (Metric_values(PCP_NET_SENDB, &value, 1, PM_TYPE_U64) != NULL)
+      data->bytesTransmitted = value.ull;
+   if (Metric_values(PCP_NET_RECVP, &value, 1, PM_TYPE_U64) != NULL)
+      data->packetsReceived = value.ull;
+   if (Metric_values(PCP_NET_SENDP, &value, 1, PM_TYPE_U64) != NULL)
+      data->packetsTransmitted = value.ull;
+   return true;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   *used = NAN;
+   *max = 65536;
+
+   pmAtomValue value;
+   if (Metric_values(PCP_VFS_FILES_COUNT, &value, 1, PM_TYPE_32) != NULL)
+      *used = value.l;
+   if (Metric_values(PCP_VFS_FILES_MAX, &value, 1, PM_TYPE_32) != NULL)
+      *max = value.l;
+}
+
+void Platform_getBattery(double* level, ACPresence* isOnAC) {
+   *level = NAN;
+   *isOnAC = AC_ERROR;
+}
+
+void Platform_longOptionsUsage(ATTR_UNUSED const char* name) {
+   printf(
+"   --host=HOSTSPEC              metrics source is PMCD at HOSTSPEC [see PCPIntro(1)]\n"
+"   --hostzone                   set reporting timezone to local time of metrics source\n"
+"   --timezone=TZ                set reporting timezone\n");
+}
+
+CommandLineStatus Platform_getLongOption(int opt, ATTR_UNUSED int argc, char** argv) {
+   /* libpcp export without a header definition */
+   extern void __pmAddOptHost(pmOptions*, char*);
+
+   switch (opt) {
+      case PLATFORM_LONGOPT_HOST:  /* --host=HOSTSPEC */
+         if (argv[optind][0] == '\0')
+            return STATUS_ERROR_EXIT;
+         __pmAddOptHost(&opts, optarg);
+         return STATUS_OK;
+
+      case PLATFORM_LONGOPT_HOSTZONE:  /* --hostzone */
+         if (opts.timezone) {
+            pmprintf("%s: at most one of -Z and -z allowed\n", pmGetProgname());
+            opts.errors++;
+         } else {
+            opts.tzflag = 1;
+         }
+         return STATUS_OK;
+
+      case PLATFORM_LONGOPT_TIMEZONE:  /* --timezone=TZ */
+         if (argv[optind][0] == '\0')
+            return STATUS_ERROR_EXIT;
+         if (opts.tzflag) {
+            pmprintf("%s: at most one of -Z and -z allowed\n", pmGetProgname());
+            opts.errors++;
+         } else {
+            opts.timezone = optarg;
+         }
+         return STATUS_OK;
+
+      default:
+         break;
+   }
+
+   return STATUS_ERROR_EXIT;
+}
+
+void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   if (gettimeofday(tv, NULL) == 0) {
+      /* shift by start offset to stay in lock-step with realtime (archives) */
+      if (pcp->offset.tv_sec || pcp->offset.tv_usec)
+         pmtimevalDec(tv, &pcp->offset);
+      *msec = ((uint64_t)tv->tv_sec * 1000) + ((uint64_t)tv->tv_usec / 1000);
+   } else {
+      memset(tv, 0, sizeof(struct timeval));
+      *msec = 0;
+   }
+}
+
+void Platform_gettime_monotonic(uint64_t* msec) {
+   if (pcp->result) {
+      struct timeval* tv = &pcp->result->timestamp;
+      *msec = ((uint64_t)tv->tv_sec * 1000) + ((uint64_t)tv->tv_usec / 1000);
+   } else {
+      *msec = 0;
+   }
+}
+
+Hashtable* Platform_dynamicMeters(void) {
+   return pcp->meters.table;
+}
+
+void Platform_dynamicMeterInit(Meter* meter) {
+   PCPDynamicMeter* this = Hashtable_get(pcp->meters.table, meter->param);
+   if (this)
+      PCPDynamicMeter_enable(this);
+}
+
+void Platform_dynamicMeterUpdateValues(Meter* meter) {
+   PCPDynamicMeter* this = Hashtable_get(pcp->meters.table, meter->param);
+   if (this)
+      PCPDynamicMeter_updateValues(this, meter);
+}
+
+void Platform_dynamicMeterDisplay(const Meter* meter, RichString* out) {
+   PCPDynamicMeter* this = Hashtable_get(pcp->meters.table, meter->param);
+   if (this)
+      PCPDynamicMeter_display(this, meter, out);
+}
+
+Hashtable* Platform_dynamicColumns(void) {
+   return pcp->columns.table;
+}
+
+const char* Platform_dynamicColumnName(unsigned int key) {
+   PCPDynamicColumn* this = Hashtable_get(pcp->columns.table, key);
+   if (this) {
+      Metric_enable(this->id, true);
+      if (this->super.caption)
+         return this->super.caption;
+      if (this->super.heading)
+         return this->super.heading;
+      return this->super.name;
+   }
+   return NULL;
+}
+
+bool Platform_dynamicColumnWriteField(const Process* proc, RichString* str, unsigned int key) {
+   PCPDynamicColumn* this = Hashtable_get(pcp->columns.table, key);
+   if (this) {
+      PCPDynamicColumn_writeField(this, proc, str);
+      return true;
+   }
+   return false;
+}
+
+Hashtable* Platform_dynamicScreens(void) {
+   return pcp->screens.table;
+}
+
+void Platform_defaultDynamicScreens(Settings* settings) {
+   PCPDynamicScreen_appendScreens(&pcp->screens, settings);
+}
+
+void Platform_addDynamicScreen(ScreenSettings* ss) {
+   PCPDynamicScreen_addDynamicScreen(&pcp->screens, ss);
+}
+
+void Platform_addDynamicScreenAvailableColumns(Panel* availableColumns, const char* screen) {
+   Hashtable* screens = pcp->screens.table;
+   PCPDynamicScreens_addAvailableColumns(availableColumns, screens, screen);
+}
+
+void Platform_updateTables(Machine* host) {
+   PCPDynamicScreen_appendTables(&pcp->screens, host);
+   PCPDynamicColumns_setupWidths(&pcp->columns);
+}
diff --git a/pcp/Platform.h b/pcp/Platform.h
new file mode 100644
index 0000000..f43ed54
--- /dev/null
+++ b/pcp/Platform.h
@@ -0,0 +1,172 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - pcp/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2020-2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <pcp/pmapi.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+/* use htop config.h values for these macros, not pcp values */
+#undef PACKAGE_URL
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#undef PACKAGE_BUGREPORT
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "Meter.h"
+#include "NetworkIOMeter.h"
+#include "Process.h"
+#include "ProcessLocksScreen.h"
+#include "RichString.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+
+#include "pcp/Metric.h"
+#include "pcp/PCPDynamicColumn.h"
+#include "pcp/PCPDynamicMeter.h"
+#include "pcp/PCPDynamicScreen.h"
+
+
+typedef struct Platform_ {
+   int context;               /* PMAPI(3) context identifier */
+   size_t totalMetrics;       /* total number of all metrics */
+   const char** names;        /* name array indexed by Metric */
+   pmID* pmids;               /* all known metric identifiers */
+   pmID* fetch;               /* enabled identifiers for sampling */
+   pmDesc* descs;             /* metric desc array indexed by Metric */
+   pmResult* result;          /* sample values result indexed by Metric */
+   PCPDynamicMeters meters;   /* dynamic meters via configuration files */
+   PCPDynamicColumns columns; /* dynamic columns via configuration files */
+   PCPDynamicScreens screens; /* dynamic screens via configuration files */
+   struct timeval offset;     /* time offset used in archive mode only */
+   long long btime;           /* boottime in seconds since the epoch */
+   char* release;             /* uname and distro from this context */
+   int pidmax;                /* maximum platform process identifier */
+   unsigned int ncpu;         /* maximum processor count configured */
+} Platform;
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+long long Platform_getBootTime(void);
+
+unsigned int Platform_getMaxCPU(void);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+void Platform_setZramValues(Meter* this);
+
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getPressureStall(const char* file, bool some, double* ten, double* sixty, double* threehundred);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+void Platform_getHostname(char* buffer, size_t size);
+
+void Platform_getRelease(char** string);
+
+enum {
+   PLATFORM_LONGOPT_HOST = 128,
+   PLATFORM_LONGOPT_TIMEZONE,
+   PLATFORM_LONGOPT_HOSTZONE,
+};
+
+#define PLATFORM_LONG_OPTIONS \
+      {PMLONGOPT_HOST, optional_argument, 0, PLATFORM_LONGOPT_HOST}, \
+      {PMLONGOPT_TIMEZONE, optional_argument, 0, PLATFORM_LONGOPT_TIMEZONE}, \
+      {PMLONGOPT_HOSTZONE, optional_argument, 0, PLATFORM_LONGOPT_HOSTZONE}, \
+
+void Platform_longOptionsUsage(const char* name);
+
+CommandLineStatus Platform_getLongOption(int opt, int argc, char** argv);
+
+extern pmOptions opts;
+
+size_t Platform_addMetric(Metric id, const char* name);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec);
+
+void Platform_gettime_monotonic(uint64_t* msec);
+
+Hashtable* Platform_dynamicMeters(void);
+
+void Platform_dynamicMetersDone(Hashtable* meters);
+
+void Platform_dynamicMeterInit(Meter* meter);
+
+void Platform_dynamicMeterUpdateValues(Meter* meter);
+
+void Platform_dynamicMeterDisplay(const Meter* meter, RichString* out);
+
+Hashtable* Platform_dynamicColumns(void);
+
+void Platform_dynamicColumnsDone(Hashtable* columns);
+
+const char* Platform_dynamicColumnName(unsigned int key);
+
+bool Platform_dynamicColumnWriteField(const Process* proc, RichString* str, unsigned int key);
+
+Hashtable* Platform_dynamicScreens(void);
+
+void Platform_defaultDynamicScreens(Settings* settings);
+
+void Platform_addDynamicScreen(ScreenSettings* ss);
+
+void Platform_addDynamicScreenAvailableColumns(Panel* availableColumns, const char* screen);
+
+void Platform_dynamicScreensDone(Hashtable* screens);
+
+void Platform_updateTables(Machine* host);
+
+#endif
diff --git a/pcp/ProcessField.h b/pcp/ProcessField.h
new file mode 100644
index 0000000..6342561
--- /dev/null
+++ b/pcp/ProcessField.h
@@ -0,0 +1,54 @@
+#ifndef HEADER_PCPProcessField
+#define HEADER_PCPProcessField
+/*
+htop - pcp/ProcessField.h
+(C) 2014 Hisham H. Muhammad
+(C) 2021 htop dev team
+(C) 2020-2021 Red Hat, Inc.  All Rights Reserved.
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   CMINFLT = 11,                 \
+   CMAJFLT = 13,                 \
+   UTIME = 14,                   \
+   STIME = 15,                   \
+   CUTIME = 16,                  \
+   CSTIME = 17,                  \
+   M_SHARE = 41,                 \
+   M_TRS = 42,                   \
+   M_DRS = 43,                   \
+   M_LRS = 44,                   \
+   M_DT = 45,                    \
+   CTID = 100,                   \
+   RCHAR = 103,                  \
+   WCHAR = 104,                  \
+   SYSCR = 105,                  \
+   SYSCW = 106,                  \
+   RBYTES = 107,                 \
+   WBYTES = 108,                 \
+   CNCLWB = 109,                 \
+   IO_READ_RATE = 110,           \
+   IO_WRITE_RATE = 111,          \
+   IO_RATE = 112,                \
+   CGROUP = 113,                 \
+   OOM = 114,                    \
+   PERCENT_CPU_DELAY = 116,      \
+   PERCENT_IO_DELAY = 117,       \
+   PERCENT_SWAP_DELAY = 118,     \
+   M_PSS = 119,                  \
+   M_SWAP = 120,                 \
+   M_PSSWP = 121,                \
+   CTXT = 122,                   \
+   SECATTR = 123,                \
+   AUTOGROUP_ID = 127,           \
+   AUTOGROUP_NICE = 128,         \
+   CCGROUP = 129,                \
+   CONTAINER = 130,              \
+   M_PRIV = 131,                 \
+   // End of list
+
+
+#endif /* HEADER_PCPProcessField */
diff --git a/pcp/columns/container b/pcp/columns/container
new file mode 100644
index 0000000..519288f
--- /dev/null
+++ b/pcp/columns/container
@@ -0,0 +1,10 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[container]
+heading = Container
+caption = CONTAINER
+width = -12
+metric = proc.id.container
+description = Name of processes container via cgroup heuristics
diff --git a/pcp/columns/delayacct b/pcp/columns/delayacct
new file mode 100644
index 0000000..016904c
--- /dev/null
+++ b/pcp/columns/delayacct
@@ -0,0 +1,10 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[blkio]
+heading = BLKIOD
+caption = BLKIO_TIME
+width = 6
+metric = proc.psinfo.delayacct_blkio_time
+description = Aggregated block I/O delays
diff --git a/pcp/columns/fdcount b/pcp/columns/fdcount
new file mode 100644
index 0000000..e679480
--- /dev/null
+++ b/pcp/columns/fdcount
@@ -0,0 +1,10 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[fds]
+heading = FDS
+caption = FDCOUNT
+width = 4
+metric = proc.fd.count
+description = Open file descriptors
diff --git a/pcp/columns/guest b/pcp/columns/guest
new file mode 100644
index 0000000..89bb926
--- /dev/null
+++ b/pcp/columns/guest
@@ -0,0 +1,17 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[guest]
+heading = GUEST
+caption = GUEST_TIME
+width = 6
+metric = proc.psinfo.guest_time
+description = Guest time for the process
+
+[cguest]
+heading = CGUEST
+caption = CGUEST_TIME
+width = 6
+metric = proc.psinfo.guest_time + proc.psinfo.cguest_time
+description = Cumulative guest time for the process and its children
diff --git a/pcp/columns/memory b/pcp/columns/memory
new file mode 100644
index 0000000..305a654
--- /dev/null
+++ b/pcp/columns/memory
@@ -0,0 +1,39 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[vmdata]
+heading = VDATA
+width = 6
+metric = proc.memory.vmdata
+description = Virtual memory used for data
+
+[vmstack]
+heading = VSTACK
+width = -6
+metric = proc.memory.vmstack
+description = Virtual memory used for stack
+
+[vmexe]
+heading = VEXEC
+width = 6
+metric = proc.memory.vmexe
+description = Virtual memory used for non-library executable code
+
+[vmlib]
+heading = VLIBS
+width = 6
+metric = proc.memory.vmlib
+description = Virtual memory used for libraries
+
+[vmswap]
+heading = VSWAP
+width = 6
+metric = proc.memory.vmswap
+description = Virtual memory size currently swapped out
+
+[vmlock]
+heading = VLOCK
+width = 6
+metric = proc.memory.vmlock
+description = Locked virtual memory
diff --git a/pcp/columns/sched b/pcp/columns/sched
new file mode 100644
index 0000000..36b8b55
--- /dev/null
+++ b/pcp/columns/sched
@@ -0,0 +1,10 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[rundelay]
+heading = RUNQ
+caption = RUN_DELAY
+width = 4
+metric = proc.schedstat.run_delay
+description = Run queue time
diff --git a/pcp/columns/swap b/pcp/columns/swap
new file mode 100644
index 0000000..234b3db
--- /dev/null
+++ b/pcp/columns/swap
@@ -0,0 +1,15 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[swap]
+heading = SWAP
+width = 5
+metric = proc.psinfo.nswap
+description = Count of swap operations for the process
+
+[cswap]
+heading = CSWAP
+width = 5
+metric = proc.psinfo.nswap + proc.psinfo.cnswap
+description = Cumulative swap operations for the process and its children
diff --git a/pcp/columns/tcp b/pcp/columns/tcp
new file mode 100644
index 0000000..f9a1819
--- /dev/null
+++ b/pcp/columns/tcp
@@ -0,0 +1,31 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[tcp_send_calls]
+heading = TCPS
+caption = TCP_SEND
+width = 6
+metric = bcc.proc.net.tcp.send.calls
+description = Count of TCP send calls
+
+[tcp_send_bytes]
+heading = TCPSB
+caption = TCP_SEND_BYTES
+width = 6
+metric = bcc.proc.net.tcp.send.bytes
+description = Cumulative bytes sent via TCP
+
+[tcp_recv_calls]
+heading = TCPR
+caption = TCP_RECV
+width = 6
+metric = bcc.proc.net.tcp.recv.calls
+description = Count of TCP recv calls
+
+[tcp_recv_bytes]
+heading = TCPRB
+caption = TCP_RECV_BYTES
+width = 6
+metric = bcc.proc.net.tcp.recv.bytes
+description = Cumulative bytes received via TCP
diff --git a/pcp/columns/udp b/pcp/columns/udp
new file mode 100644
index 0000000..060f048
--- /dev/null
+++ b/pcp/columns/udp
@@ -0,0 +1,31 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[udp_send_calls]
+heading = UDPS
+caption = UDP_SEND
+width = 6
+metric = bcc.proc.net.udp.send.calls
+description = Count of UDP send calls
+
+[udp_send_bytes]
+heading = UDPSB
+caption = UDP_SEND_BYTES
+width = 6
+metric = bcc.proc.net.udp.send.bytes
+description = Cumulative bytes sent via UDP
+
+[udp_recv_calls]
+heading = UDPR
+caption = UDP_RECV
+width = 6
+metric = bcc.proc.net.udp.recv.calls
+description = Count of UDP recv calls
+
+[udp_recv_bytes]
+heading = UDPRB
+caption = UDP_RECV_BYTES
+width = 6
+metric = bcc.proc.net.udp.recv.bytes
+description = Cumulative bytes received via UDP
diff --git a/pcp/columns/wchan b/pcp/columns/wchan
new file mode 100644
index 0000000..893de58
--- /dev/null
+++ b/pcp/columns/wchan
@@ -0,0 +1,17 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[wchan]
+heading = WCHAN
+caption = WCHAN_ADDRESS
+width = 8
+metric = proc.psinfo.wchan
+description = Wait channel, kernel address process is blocked or sleeping on
+
+[wchans]
+heading = WCHANS
+caption = WCHAN_SYMBOL
+width = -12
+metric = proc.psinfo.wchan_s
+description = Wait channel, kernel symbol process is blocked or sleeping on
diff --git a/pcp/meters/entropy b/pcp/meters/entropy
new file mode 100644
index 0000000..0bef0cf
--- /dev/null
+++ b/pcp/meters/entropy
@@ -0,0 +1,9 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[entropy]
+caption = Entropy
+avail.metric = kernel.all.entropy.avail / kernel.all.entropy.poolsize * 100
+avail.label = avail
+avail.suffix = %
diff --git a/pcp/meters/freespace b/pcp/meters/freespace
new file mode 100644
index 0000000..074af6d
--- /dev/null
+++ b/pcp/meters/freespace
@@ -0,0 +1,11 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[freespace]
+caption = Freespace
+description = Filesystem space
+used.metric = sum(filesys.used)
+used.color = blue
+free.metric = sum(filesys.free)
+free.color = green
diff --git a/pcp/meters/ipc b/pcp/meters/ipc
new file mode 100644
index 0000000..4162f39
--- /dev/null
+++ b/pcp/meters/ipc
@@ -0,0 +1,13 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[ipc]
+caption = SysV IPC
+description = SysV IPC counts
+msg.metric = ipc.msg.used_queues
+msg.color = blue
+sem.metric = ipc.sem.used_sem
+sem.color = green
+shm.metric = ipc.shm.used_ids
+shm.color = cyan
diff --git a/pcp/meters/locks b/pcp/meters/locks
new file mode 100644
index 0000000..5d09510
--- /dev/null
+++ b/pcp/meters/locks
@@ -0,0 +1,15 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[locks]
+caption = File locks
+description = VFS file locks
+posix.metric = vfs.locks.posix.count
+posix.color = blue
+flock.metric = vfs.locks.flock.count
+flock.color = green
+readlock.metric = vfs.locks.posix.read + vfs.locks.flock.read
+readlock.color = red
+writelock.metric = vfs.locks.posix.write + vfs.locks.flock.write
+writelock.color = yellow
diff --git a/pcp/meters/memcache b/pcp/meters/memcache
new file mode 100644
index 0000000..0f2fac2
--- /dev/null
+++ b/pcp/meters/memcache
@@ -0,0 +1,11 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[memcache]
+caption = Memcache
+description = Memcache Hits
+hit.metric = sum(memcache.hits)
+hit.color = green
+miss.metric = sum(memcache.misses)
+miss.color = blue
diff --git a/pcp/meters/mysql b/pcp/meters/mysql
new file mode 100644
index 0000000..a9e75e4
--- /dev/null
+++ b/pcp/meters/mysql
@@ -0,0 +1,71 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[mysql_io]
+caption = MySQL I/O
+recv.metric = mysql.status.bytes_received
+recv.color = green
+sent.metric = mysql.status.bytes_sent
+sent.color = blue
+
+[mysql_keys]
+caption = MySQL keys
+description = MySQL key status
+key_blocks_used.metric = mysql.status.key_blocks_used
+key_blocks_used.label = color
+key_blocks_used.label = used
+key_reads.metric = mysql.status.key_reads
+key_reads.label = read
+key_reads.color = green
+key_writes.metric = mysql.status.key_writes
+key_writes.label = writ
+key_writes.color = blue
+key_read_requests.metric = mysql.status.key_read_requests
+key_read_requests.label = rreq
+key_read_requests.color = green
+key_write_requests.metric = mysql.status.key_write_requests
+key_write_requests.label = wreq
+key_write_requests.color = blue
+
+[innodb_buffer]
+caption = InnoDB pool
+description = InnoDB buffer pool
+created.metric = mysql.status.innodb_pages_created
+created.label = cr
+created.color = yellow
+read.metric = mysql.status.innodb_pages_read
+read.label = rd
+read.color = greed
+written.metric = mysql.status.innodb_pages_written
+written.label = wr
+written.color = red
+
+[innodb_io]
+caption = InnoDB I/O
+description = InnoDB I/O operations
+read.metric = mysql.status.innodb_data_read
+read.label = rd
+read.color = green
+written.metric = mysql.status.innodb_data.writes
+written.label = wr
+written.color = blue
+sync.metric = mysql.status.innodb_data_fsyncs
+sync.label = sync
+sync.color = cyan
+
+[innodb_ops]
+caption = InnoDB ops
+description = InnoDB operations
+inserted.metric = mysql.status.innodb_rows_inserted
+inserted.label = ins
+inserted.color = blue
+updated.metric = mysql.status.innodb_rows_updated
+updated.label = upd
+updated.color = cyan
+deleted.metric = mysql.status.innodb_rows_deleted
+deleted.label = del
+deleted.color = red
+read.metric = mysql.status.innodb_rows_read
+read.label = rd
+read.color = green
diff --git a/pcp/meters/postfix b/pcp/meters/postfix
new file mode 100644
index 0000000..cda6837
--- /dev/null
+++ b/pcp/meters/postfix
@@ -0,0 +1,20 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[postfix]
+caption = Postfix
+incoming.metric = sum(postfix.queues.incoming)
+incoming.color = green
+incoming.label = in
+active.metric = sum(postfix.queues.active)
+active.color = blue
+active.label = act
+deferred.metric = sum(postfix.queues.deferred)
+deferred.color = cyan
+deferred.label = dfr
+bounce.metric = sum(postfix.queues.maildrop)
+bounce.color = red
+bounce.label = bnc
+hold.metric = sum(postfix.queues.hold)
+hold.color = yellow
diff --git a/pcp/meters/redis b/pcp/meters/redis
new file mode 100644
index 0000000..a72f727
--- /dev/null
+++ b/pcp/meters/redis
@@ -0,0 +1,39 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[redisxact]
+caption = Redis xact
+description = Redis transactions
+tps.metric = redis.instantaneous_ops_per_sec
+tps.color = green
+
+[redismem]
+caption = Redis mem
+description = Redis memory
+lua.metric = redis.used_memory_lua
+lua.color = magenta
+used.metric = redis.used_memory
+used.color = blue
+
+[redisclient]
+caption = Redis clients
+description = Redis clients
+type = bar
+blocked.metric = redis.blocked_clients
+blocked.color = blue
+blocked.label = blk
+clients.metric = redis.connected_clients
+clients.color = green
+clients.label = conn
+
+[redisconn]
+caption = Redis conn
+description = Redis connections
+type = bar
+reject.metric = redis.rejected_connections
+reject.color = magenta
+reject.label = fail/s
+total.metric = redis.total_connections_received
+total.color = blue
+total.label = conn/s
diff --git a/pcp/meters/tcp b/pcp/meters/tcp
new file mode 100644
index 0000000..c95736f
--- /dev/null
+++ b/pcp/meters/tcp
@@ -0,0 +1,21 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[tcp]
+caption = TCP
+description = TCP sockets
+listen.metric = network.tcpconn.listen
+listen.color = green
+listen.label = lis
+active.metric = network.tcpconn.established
+active.color = blue
+active.label = act
+syn.metric = network.tcpconn.syn_sent + network.tcpconn.syn_recv + network.tcpconn.last_ack
+syn.color = cyan
+wait.metric = network.tcpconn.time_wait
+wait.color = red
+wait.label = tim
+close.metric = network.tcpconn.fin_wait1 + network.tcpconn.fin_wait2 + network.tcpconn.close + network.tcpconn.close_wait + network.tcpconn.closing
+close.color = yellow
+close.label = clo
diff --git a/pcp/screens/biosnoop b/pcp/screens/biosnoop
new file mode 100644
index 0000000..e6cdf89
--- /dev/null
+++ b/pcp/screens/biosnoop
@@ -0,0 +1,41 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[biosnoop]
+heading = BioSnoop
+caption = BPF block I/O snoop
+default = false
+
+pid.heading = PID
+pid.caption = Process identifier
+pid.metric = bpf.biosnoop.pid
+pid.format = process
+
+disk.heading = DISK
+disk.caption = Device name
+disk.width = -7
+disk.metric = bpf.biosnoop.disk
+
+rwbs.heading = TYPE
+rwbs.caption = I/O type string
+rwbs.width = -4
+rwbs.metric = bpf.biosnoop.rwbs
+
+bytes.heading = BYTES
+bytes.caption = I/O size in bytes
+bytes.metric = bpf.biosnoop.bytes
+
+lat.heading = LAT
+lat.caption = I/O latency
+lat.metric = bpf.biosnoop.lat
+
+sector.heading = SECTOR
+sector.caption = Device sector
+sector.metric = bpf.biosnoop.sector
+
+comm.heading = Command
+comm.caption = Process command name
+comm.width = -16
+comm.metric = bpf.biosnoop.comm
+comm.format = process
diff --git a/pcp/screens/cgroups b/pcp/screens/cgroups
new file mode 100644
index 0000000..0ddc65c
--- /dev/null
+++ b/pcp/screens/cgroups
@@ -0,0 +1,45 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[cgroups]
+heading = CGroups
+caption = Control Groups
+default = true
+
+user_cpu.heading = UTIME
+user_cpu.caption = User CPU Time
+user_cpu.metric = 1000 * rate(cgroup.cpu.stat.user)
+user_cpu.width = 6
+
+system_cpu.heading = STIME
+system_cpu.caption = Kernel CPU Time
+system_cpu.metric = 1000 * rate(cgroup.cpu.stat.system)
+system_cpu.width = 6
+
+cpu_usage.heading = CPU%
+cpu_usage.caption = CPU Utilization
+cpu_usage.metric = 100 * (rate(cgroup.cpu.stat.usage) / hinv.ncpu)
+cpu_usage.format = percent
+
+cpu_psi.heading = CPU-PSI
+cpu_psi.caption = CPU Pressure Stall Information
+cpu_psi.metric = 1000 * rate(cgroup.pressure.cpu.some.total)
+cpu_psi.width = 7
+
+mem_psi.heading = MEM-PSI
+mem_psi.caption = Memory Pressure Stall Information
+mem_psi.metric = 1000 * rate(cgroup.pressure.memory.some.total)
+mem_psi.width = 7
+
+io_psi.heading = I/O-PSI
+io_psi.caption = I/O Pressure Stall Information
+io_psi.metric = 1000 * rate(cgroup.pressure.io.some.total)
+io_psi.width = 7
+
+name.heading = Control group
+name.caption = Control group name
+name.width = -64
+name.metric = cgroup.cpu.stat.system
+name.instances = true
+name.format = cgroup
diff --git a/pcp/screens/cgroupsio b/pcp/screens/cgroupsio
new file mode 100644
index 0000000..3a431db
--- /dev/null
+++ b/pcp/screens/cgroupsio
@@ -0,0 +1,49 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[cgroupsio]
+heading = CGroupsIO
+caption = Control Groups I/O
+default = false
+
+iops.heading = IOPS
+iops.caption = I/O operations
+iops.metric = rate(cgroup.io.stat.rios) + rate(cgroup.io.stat.wios) + rate(cgroup.io.stat.dios)
+
+readops.heading = RDIO
+readops.caption = Read operations
+readops.metric = rate(cgroup.io.stat.rios)
+readops.default = false
+
+writeops.heading = WRIO
+writeops.caption = Write operations
+writeops.metric = rate(cgroup.io.stat.wios)
+writeops.default = false
+
+directops.heading = DIO
+directops.caption = Direct I/O operations
+directops.metric = rate(cgroup.io.stat.dios)
+directops.default = false
+
+totalbytes.heading = R/W/D
+totalbytes.caption = Disk throughput
+totalbytes.metric = rate(cgroup.io.stat.rbytes) + rate(cgroup.io.stat.wbytes) + rate(cgroup.io.stat.dbytes)
+
+readbytes.heading = RBYTE
+readbytes.caption = Disk read throughput
+readbytes.metric = rate(cgroup.io.stat.rbytes)
+
+writebytes.heading = WBYTE
+writebytes.caption = Disk throughput
+writebytes.metric = rate(cgroup.io.stat.wbytes)
+
+directio.heading = DBYTE
+directio.caption = Direct I/O throughput
+directio.metric = rate(cgroup.io.stat.dbytes)
+
+name.heading = Control group device
+name.caption = Control group device
+name.width = -64
+name.metric = cgroup.io.stat.rbytes
+name.instances = true
diff --git a/pcp/screens/cgroupsmem b/pcp/screens/cgroupsmem
new file mode 100644
index 0000000..17bc1e3
--- /dev/null
+++ b/pcp/screens/cgroupsmem
@@ -0,0 +1,48 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[cgroupsmem]
+heading = CGroupsMem
+caption = Control Groups Memory
+default = false
+
+current.heading = MEM
+current.caption = Current memory
+current.metric = cgroup.memory.current
+
+usage.heading = USAGE
+usage.caption = Memory usage
+usage.metric = cgroup.memory.usage
+
+container.heading = CONTAINER
+container.caption = Container Name
+container.metric = cgroup.memory.id.container
+
+resident.heading = RSS
+resident.metric = cgroup.memory.stat.rss
+
+cresident.heading = CRSS
+cresident.metric = cgroup.memory.stat.total.rss
+
+anonmem.heading = ANON
+anonmem.metric = cgroup.memory.stat.anon
+
+filemem.heading = FILE
+filemem.metric = cgroup.memory.stat.file
+
+shared.heading = SHMEM
+shared.metric = cgroup.memory.stat.shmem
+
+swap.heading = SWAP
+swap.metric = cgroup.memory.stat.swap
+
+pgfault.heading = FAULTS
+pgfault.metric = cgroup.memory.stat.pgfaults
+
+name.heading = Control group
+name.caption = Control group name
+name.width = -64
+name.metric = cgroup.memory.current
+name.instances = true
+name.format = cgroup
diff --git a/pcp/screens/devices b/pcp/screens/devices
new file mode 100644
index 0000000..7399f82
--- /dev/null
+++ b/pcp/screens/devices
@@ -0,0 +1,114 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[disks]
+heading = Disks
+caption = Disk devices
+
+diskdev.heading = Device
+diskdev.metric = disk.dev.read
+diskdev.instances = true
+diskdev.format = device
+diskdev.width = -8
+
+total.heading = TPS
+total.metric = rate(disk.dev.read) + rate(disk.dev.write) + rate(disk.dev.discard)
+total.caption = Rate of read requests
+
+read.heading = RR/S
+read.metric = rate(disk.dev.read)
+read.caption = Rate of read requests
+
+read_bytes.heading = RRB/S
+read_bytes.metric = rate(disk.dev.read_bytes)
+read_bytes.caption = Read throughput from the device
+
+read_merge.heading = RRQM/S
+read_merge.metric = rate(disk.dev.read_merge)
+read_merge.caption = Rate reads merged before queued
+read_merge.default = false
+
+read_merge_pct.heading = RRQM%
+read_merge_pct.metric = 100 * rate(disk.dev.read_merge) / rate(disk.dev.read)
+read_merge_pct.caption = Percentage reads merged before queued
+read_merge_pct.format = percent
+
+read_await.heading = RAWAIT
+read_await.metric = disk.dev.r_await
+read_await.default = false
+
+read_avqsz.heading = RARQSZ
+read_avqsz.metric = disk.dev.r_avg_rqsz
+read_avqsz.default = false
+
+write.heading = WR/S
+write.metric = rate(disk.dev.write)
+write.caption = Rate of write requests
+
+write_bytes.heading = WRB/S
+write_bytes.metric = rate(disk.dev.write_bytes)
+write_bytes.caption = Write throughput to the device
+
+write_merge.heading = WRQM/S
+write_merge.metric = rate(disk.dev.write_merge)
+write_merge.caption = Rate writes merged before queued
+write_merge.default = false
+
+write_merge_pct.heading = WRQM%
+write_merge_pct.metric = 100 * rate(disk.dev.write_merge)  / rate(disk.dev.write)
+write_merge_pct.caption = Percentage writes merged before queued
+write_merge_pct.format = percent
+
+write_await.heading = WAWAIT
+write_await.metric = disk.dev.w_await
+write_await.default = false
+
+write_avqsz.heading = WARQSZ
+write_avqsz.metric = disk.dev.w_avg_rqsz
+write_avqsz.default = false
+
+discard.heading = DR/S
+discard.metric = rate(disk.dev.discard)
+discard.caption = Rate of discard requests
+
+discard_bytes.heading = DRB/S
+discard_bytes.metric = rate(disk.dev.discard_bytes)
+discard_bytes.caption = Discard request throughput
+discard_bytes.default = false
+
+discard_merge.heading = DRQM/S
+discard_merge.metric = rate(disk.dev.discard_merge)
+discard_merge.caption = Rate discards merged before queued
+discard_merge.default = false
+
+discard_merge_pct.heading = DRQM%
+discard_merge_pct.metric = 100 * rate(disk.dev.discard_merge)  / rate(disk.dev.discard)
+discard_merge_pct.caption = Percentage discards merged before queued
+discard_merge_pct.format = percent
+discard_merge_pct.default = false
+
+discard_await.heading = DAWAIT
+discard_await.metric = disk.dev.d_await
+discard_await.default = false
+
+discard_avqsz.heading = DARQSZ
+discard_avqsz.metric = disk.dev.d_avg_rqsz
+discard_avqsz.default = false
+
+flush.heading = F/S
+flush.metric = rate(disk.dev.flush)
+flush.default = false
+flush.caption = Flushes per second
+
+flush_await.heading = FAWAIT
+flush_await.metric = disk.dev.f_await
+flush_await.default = false
+
+qlen.heading = AQU-SZ
+qlen.metric = disk.dev.avg_qlen
+
+util.heading = UTIL%
+util.metric = 100 * disk.dev.util
+util.caption = Perentage device utilization
+util.format = percent
diff --git a/pcp/screens/execsnoop b/pcp/screens/execsnoop
new file mode 100644
index 0000000..d706e76
--- /dev/null
+++ b/pcp/screens/execsnoop
@@ -0,0 +1,37 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[execsnoop]
+heading = ExecSnoop
+caption = BPF exec(2) syscall snoop
+default = false
+
+pid.heading = PID
+pid.caption = Process Identifier
+pid.metric = bpf.execsnoop.pid
+pid.format = process
+
+ppid.heading = PPID
+ppid.caption = Parent Process
+ppid.metric = bpf.execsnoop.ppid
+ppid.format = process
+
+uid.heading = UID
+uid.caption = User Identifier
+uid.metric = bpf.execsnoop.uid
+
+comm.heading = COMM
+comm.caption = Command
+comm.width = -16
+comm.metric = bpf.execsnoop.comm
+comm.format = command
+
+ret.heading = RET
+ret.caption = Return Code
+ret.metric = bpf.execsnoop.ret
+
+path.heading = Arguments
+path.caption = Arguments
+path.width = -12
+path.metric = bpf.execsnoop.args
diff --git a/pcp/screens/exitsnoop b/pcp/screens/exitsnoop
new file mode 100644
index 0000000..6c6b867
--- /dev/null
+++ b/pcp/screens/exitsnoop
@@ -0,0 +1,48 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[exitsnoop]
+heading = ExitSnoop
+caption = BPF process exit(2) snoop
+default = false
+
+pid.heading = PID
+pid.caption = Process Identifier
+pid.metric = bpf.exitsnoop.pid
+pid.format = process
+
+ppid.heading = PPID
+ppid.caption = Parent Process
+ppid.metric = bpf.exitsnoop.ppid
+ppid.format = process
+
+tid.heading = TID
+tid.caption = Task Identifier
+tid.metric = bpf.exitsnoop.tid
+tid.format = process
+tid.default = false
+
+signal.heading = SIG
+signal.caption = Signal number
+signal.metric = bpf.exitsnoop.sig
+
+exit.heading = EXIT
+exit.caption = Exit Code
+exit.metric = bpf.exitsnoop.exit_code
+
+core.heading = CORE
+core.caption = Dumped core
+core.metric = bpf.exitsnoop.coredump
+core.default = false
+
+age.heading = AGE
+age.caption = Process age
+age.metric = bpf.exitsnoop.age
+age.default = false
+
+comm.heading = Command
+comm.caption = COMM
+comm.width = -16
+comm.metric = bpf.exitsnoop.comm
+comm.format = command
diff --git a/pcp/screens/filesystems b/pcp/screens/filesystems
new file mode 100644
index 0000000..06f3bf2
--- /dev/null
+++ b/pcp/screens/filesystems
@@ -0,0 +1,50 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[filesystems]
+heading = Filesystems
+caption = Mounted block device filesystems
+
+blockdev.heading = Device
+blockdev.metric = filesys.mountdir
+blockdev.instances = true
+blockdev.width = -14
+
+blocksize.heading = BSIZE
+blocksize.metric = filesys.blocksize
+blocksize.default = false
+
+capacity.heading = SIZE
+capacity.metric = filesys.capacity
+
+used.heading = USED
+used.metric = filesys.used
+
+free.heading = FREE
+free.metric = filesys.free
+free.default = false
+
+avail.heading = AVAIL
+avail.metric = filesys.avail
+
+full.heading = USE%
+full.metric = filesys.full
+full.format = percent
+
+usedfiles.heading = USEDF
+usedfiles.metric = filesys.usedfiles
+usedfiles.default = false
+
+freefiles.heading = FREEF
+freefiles.metric = filesys.freefiles
+freefiles.default = false
+
+maxfiles.heading = MAXF
+maxfiles.metric = filesys.maxfiles
+maxfiles.default = false
+
+mountdir.heading = Mount point
+mountdir.metric = filesys.mountdir
+mountdir.format = path
+mountdir.width = -33
diff --git a/pcp/screens/opensnoop b/pcp/screens/opensnoop
new file mode 100644
index 0000000..ec209b0
--- /dev/null
+++ b/pcp/screens/opensnoop
@@ -0,0 +1,27 @@
+#
+# pcp-htop(1) configuration file - see pcp-htop(5)
+#
+
+[opensnoop]
+heading = OpenSnoop
+caption = BPF open(2) syscall snoop
+default = false
+
+pid.heading = PID
+pid.metric = bpf.opensnoop.pid
+pid.format = process
+
+comm.heading = COMM
+comm.metric = bpf.opensnoop.comm
+comm.format = command
+
+fd.heading = FD
+fd.metric = bpf.opensnoop.fd
+
+err.heading = ERR
+err.metric = bpf.opensnoop.err
+
+file.heading = File name
+file.width = -32
+file.metric = bpf.opensnoop.fname
+file.format = path
diff --git a/scripts/htop_suppressions.valgrind b/scripts/htop_suppressions.valgrind
new file mode 100644
index 0000000..0ba4539
--- /dev/null
+++ b/scripts/htop_suppressions.valgrind
@@ -0,0 +1,57 @@
+{
+   <ncurses internal memory>
+   Memcheck:Leak
+   match-leak-kinds: possible,reachable
+   ...
+   fun:doupdate_sp
+   fun:wrefresh
+}
+
+{
+   <ncurses internal memory>
+   Memcheck:Leak
+   match-leak-kinds: possible,reachable
+   ...
+   fun:newterm_sp
+   fun:newterm
+   fun:initscr
+   fun:CRT_init
+}
+
+{
+   <ncurses internal memory>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   obj:*/libtinfo*
+   fun:CRT_init
+}
+
+{
+   <ncurses internal memory>
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   obj:*/libncurses*
+   fun:CRT_init
+}
+
+{
+   <ncurses internal memory>
+   Memcheck:Leak
+   match-leak-kinds: possible,reachable
+   ...
+   obj:*/libncurses*
+   fun:CRT_setColors
+   fun:CRT_init
+}
+
+{
+   <devstat internal memory>
+   Memcheck:Leak
+   match-leak-kinds: possible,reachable
+   ...
+   obj:*/libdevstat*
+   ...
+   fun:Platform_getDiskIO
+}
diff --git a/scripts/run_valgrind.sh b/scripts/run_valgrind.sh
new file mode 100755
index 0000000..a03468c
--- /dev/null
+++ b/scripts/run_valgrind.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+SCRIPT=$(readlink -f "$0")
+SCRIPTDIR=$(dirname "$SCRIPT")
+
+valgrind --leak-check=full --show-reachable=yes --show-leak-kinds=all --track-fds=yes --errors-for-leak-kinds=all --track-origins=yes --suppressions="${SCRIPTDIR}/htop_suppressions.valgrind" "${SCRIPTDIR}/../htop"
diff --git a/solaris/Platform.c b/solaris/Platform.c
new file mode 100644
index 0000000..5faa91a
--- /dev/null
+++ b/solaris/Platform.c
@@ -0,0 +1,342 @@
+/*
+htop - solaris/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "solaris/Platform.h"
+
+#include <kstat.h>
+#include <math.h>
+#include <string.h>
+#include <time.h>
+#include <utmpx.h>
+#include <sys/loadavg.h>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/var.h>
+
+#include "Macros.h"
+#include "Meter.h"
+#include "CPUMeter.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "SwapMeter.h"
+#include "TasksMeter.h"
+#include "LoadAverageMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "HostnameMeter.h"
+#include "SysArchMeter.h"
+#include "UptimeMeter.h"
+#include "XUtils.h"
+
+#include "solaris/SolarisMachine.h"
+
+#include "zfs/ZfsArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"
+
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Default",
+      .columns = "PID LWPID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",      .number =  0 },
+   { .name = " 1 SIGHUP",      .number =  1 },
+   { .name = " 2 SIGINT",      .number =  2 },
+   { .name = " 3 SIGQUIT",     .number =  3 },
+   { .name = " 4 SIGILL",      .number =  4 },
+   { .name = " 5 SIGTRAP",     .number =  5 },
+   { .name = " 6 SIGABRT/IOT", .number =  6 },
+   { .name = " 7 SIGEMT",      .number =  7 },
+   { .name = " 8 SIGFPE",      .number =  8 },
+   { .name = " 9 SIGKILL",     .number =  9 },
+   { .name = "10 SIGBUS",      .number = 10 },
+   { .name = "11 SIGSEGV",     .number = 11 },
+   { .name = "12 SIGSYS",      .number = 12 },
+   { .name = "13 SIGPIPE",     .number = 13 },
+   { .name = "14 SIGALRM",     .number = 14 },
+   { .name = "15 SIGTERM",     .number = 15 },
+   { .name = "16 SIGUSR1",     .number = 16 },
+   { .name = "17 SIGUSR2",     .number = 17 },
+   { .name = "18 SIGCHLD/CLD", .number = 18 },
+   { .name = "19 SIGPWR",      .number = 19 },
+   { .name = "20 SIGWINCH",    .number = 20 },
+   { .name = "21 SIGURG",      .number = 21 },
+   { .name = "22 SIGPOLL/IO",  .number = 22 },
+   { .name = "23 SIGSTOP",     .number = 23 },
+   { .name = "24 SIGTSTP",     .number = 24 },
+   { .name = "25 SIGCONT",     .number = 25 },
+   { .name = "26 SIGTTIN",     .number = 26 },
+   { .name = "27 SIGTTOU",     .number = 27 },
+   { .name = "28 SIGVTALRM",   .number = 28 },
+   { .name = "29 SIGPROF",     .number = 29 },
+   { .name = "30 SIGXCPU",     .number = 30 },
+   { .name = "31 SIGXFSZ",     .number = 31 },
+   { .name = "32 SIGWAITING",  .number = 32 },
+   { .name = "33 SIGLWP",      .number = 33 },
+   { .name = "34 SIGFREEZE",   .number = 34 },
+   { .name = "35 SIGTHAW",     .number = 35 },
+   { .name = "36 SIGCANCEL",   .number = 36 },
+   { .name = "37 SIGLOST",     .number = 37 },
+   { .name = "38 SIGXRES",     .number = 38 },
+   { .name = "39 SIGJVM1",     .number = 39 },
+   { .name = "40 SIGJVM2",     .number = 40 },
+   { .name = "41 SIGINFO",     .number = 41 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &UptimeMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &ZfsArcMeter_class,
+   &ZfsCompressedArcMeter_class,
+   &BlankMeter_class,
+   NULL
+};
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   int boot_time = 0;
+   int curr_time = time(NULL);
+   struct utmpx* ent;
+
+   while (( ent = getutxent() )) {
+      if ( String_eq("system boot", ent->ut_line )) {
+         boot_time = ent->ut_tv.tv_sec;
+      }
+   }
+
+   endutxent();
+
+   return (curr_time - boot_time);
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   double plat_loadavg[3];
+   if (getloadavg( plat_loadavg, 3 ) < 0) {
+      *one = NAN;
+      *five = NAN;
+      *fifteen = NAN;
+      return;
+   }
+   *one = plat_loadavg[LOADAVG_1MIN];
+   *five = plat_loadavg[LOADAVG_5MIN];
+   *fifteen = plat_loadavg[LOADAVG_15MIN];
+}
+
+pid_t Platform_getMaxPid(void) {
+   int vproc = 32778; // Reasonable Solaris default
+
+   kstat_ctl_t* kc = kstat_open();
+   if (kc != NULL) {
+      kstat_t* kshandle = kstat_lookup_wrapper(kc, "unix", 0, "var");
+      if (kshandle != NULL) {
+         kstat_read(kc, kshandle, NULL);
+
+         kvar_t* ksvar = kshandle->ks_data;
+         if (ksvar && ksvar->v_proc > 0) {
+            vproc = ksvar->v_proc;
+         }
+      }
+      kstat_close(kc);
+   }
+
+   return vproc;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   const Machine* host = this->host;
+   const SolarisMachine* shost = (const SolarisMachine*) host;
+   unsigned int cpus = host->existingCPUs;
+   const CPUData* cpuData = NULL;
+
+   if (cpus == 1) {
+      // single CPU box has everything in spl->cpus[0]
+      cpuData = &(shost->cpus[0]);
+   } else {
+      cpuData = &(shost->cpus[cpu]);
+   }
+
+   if (!cpuData->online) {
+      this->curItems = 0;
+      return NAN;
+   }
+
+   double percent;
+   double* v = this->values;
+
+   v[CPU_METER_NICE]   = cpuData->nicePercent;
+   v[CPU_METER_NORMAL] = cpuData->userPercent;
+   if (super->settings->detailedCPUTime) {
+      v[CPU_METER_KERNEL]  = cpuData->systemPercent;
+      v[CPU_METER_IRQ]     = cpuData->irqPercent;
+      this->curItems = 4;
+   } else {
+      v[CPU_METER_KERNEL] = cpuData->systemAllPercent;
+      this->curItems = 3;
+   }
+
+   percent = sumPositiveValues(v, this->curItems);
+   percent = MINIMUM(percent, 100.0);
+
+   v[CPU_METER_FREQUENCY] = cpuData->frequency;
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   return percent;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalMem;
+   this->values[MEMORY_METER_USED] = host->usedMem;
+   // this->values[MEMORY_METER_SHARED] = "shared memory, like tmpfs and shm"
+   // this->values[MEMORY_METER_COMPRESSED] = "compressed memory, like zswap on linux"
+   this->values[MEMORY_METER_BUFFERS] = host->buffersMem;
+   this->values[MEMORY_METER_CACHE] = host->cachedMem;
+   // this->values[MEMORY_METER_AVAILABLE] = "available memory"
+}
+
+void Platform_setSwapValues(Meter* this) {
+   const Machine* host = this->host;
+   this->total = host->totalSwap;
+   this->values[SWAP_METER_USED] = host->usedSwap;
+   // this->values[SWAP_METER_CACHE] = "pages that are both in swap and RAM, like SwapCached on linux"
+   // this->values[SWAP_METER_FRONTSWAP] = "pages that are accounted to swap but stored elsewhere, like frontswap on linux"
+}
+
+void Platform_setZfsArcValues(Meter* this) {
+   const SolarisMachine* shost = (SolarisMachine*) this->host;
+
+   ZfsArcMeter_readStats(this, &shost->zfs);
+}
+
+void Platform_setZfsCompressedArcValues(Meter* this) {
+   const SolarisMachine* shost = (SolarisMachine*) this->host;
+
+   ZfsCompressedArcMeter_readStats(this, &shost->zfs);
+}
+
+static int Platform_buildenv(void* accum, struct ps_prochandle* Phandle, uintptr_t addr, const char* str) {
+   envAccum* accump = accum;
+   (void) Phandle;
+   (void) addr;
+
+   size_t thissz = strlen(str);
+
+   while ((thissz + 2) > (accump->capacity - accump->size)) {
+      if (accump->capacity > (SIZE_MAX / 2))
+         return 1;
+
+      accump->capacity *= 2;
+      accump->env = xRealloc(accump->env, accump->capacity);
+   }
+
+   strlcpy( accump->env + accump->size, str, accump->capacity - accump->size);
+   strncpy( accump->env + accump->size + thissz + 1, "\n", 2);
+
+   accump->size += thissz + 1;
+   return 0;
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   envAccum envBuilder;
+   pid_t realpid = pid / 1024;
+   int graberr;
+   struct ps_prochandle* Phandle;
+
+   if ((Phandle = Pgrab(realpid, PGRAB_RDONLY, &graberr)) == NULL) {
+      return NULL;
+   }
+
+   envBuilder.capacity = 4096;
+   envBuilder.size     = 0;
+   envBuilder.env      = xMalloc(envBuilder.capacity);
+
+   (void) Penv_iter(Phandle, Platform_buildenv, &envBuilder);
+
+   Prelease(Phandle, 0);
+
+   strncpy( envBuilder.env + envBuilder.size, "\0", 1);
+
+   return xRealloc(envBuilder.env, envBuilder.size + 1);
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   *used = NAN;
+   *max = NAN;
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   // TODO
+   (void)data;
+   return false;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   *percent = NAN;
+   *isOnAC = AC_ERROR;
+}
diff --git a/solaris/Platform.h b/solaris/Platform.h
new file mode 100644
index 0000000..1a31c2e
--- /dev/null
+++ b/solaris/Platform.h
@@ -0,0 +1,171 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - solaris/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kstat.h>
+
+/* On OmniOS /usr/include/sys/regset.h redefines ERR to 13 - \r, breaking the Enter key.
+ * Since ncruses macros use the ERR macro, we can not use another name.
+ */
+#undef ERR
+#include <libproc.h>
+#undef ERR
+#define ERR (-1)
+
+#include <signal.h>
+#include <stdbool.h>
+
+#include <sys/mkdev.h>
+#include <sys/proc.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "CommandLine.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "NetworkIOMeter.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "generic/gettime.h"
+#include "generic/hostname.h"
+#include "generic/uname.h"
+
+
+#define  kill(pid, signal) kill(pid / 1024, signal)
+
+typedef struct var kvar_t;
+
+typedef struct envAccum_ {
+   size_t capacity;
+   size_t size;
+   size_t bytes;
+   char* env;
+} envAccum;
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+void Platform_setZfsArcValues(Meter* this);
+
+void Platform_setZfsCompressedArcValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+static inline void Platform_getHostname(char* buffer, size_t size) {
+   Generic_hostname(buffer, size);
+}
+
+static inline void Platform_getRelease(char** string) {
+   *string = Generic_uname();
+}
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline void* kstat_data_lookup_wrapper(kstat_t* ksp, const char* name) {
+IGNORE_WCASTQUAL_BEGIN
+   return kstat_data_lookup(ksp, (char*)name);
+IGNORE_WCASTQUAL_END
+}
+
+static inline kstat_t* kstat_lookup_wrapper(kstat_ctl_t* kc, const char* ks_module, int ks_instance, const char* ks_name) {
+IGNORE_WCASTQUAL_BEGIN
+   return kstat_lookup(kc, (char*)ks_module, ks_instance, (char*)ks_name);
+IGNORE_WCASTQUAL_END
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/solaris/ProcessField.h b/solaris/ProcessField.h
new file mode 100644
index 0000000..65dbcdc
--- /dev/null
+++ b/solaris/ProcessField.h
@@ -0,0 +1,24 @@
+#ifndef HEADER_SolarisProcessField
+#define HEADER_SolarisProcessField
+/*
+htop - solaris/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   ZONEID = 100,                 \
+   ZONE  = 101,                  \
+   PROJID = 102,                 \
+   TASKID = 103,                 \
+   POOLID = 104,                 \
+   CONTID = 105,                 \
+   LWPID = 106,                  \
+                                 \
+   DUMMY_BUMP_FIELD = CWD,       \
+   // End of list
+
+
+#endif /* HEADER_SolarisProcessField */
diff --git a/solaris/SolarisMachine.c b/solaris/SolarisMachine.c
new file mode 100644
index 0000000..4f740d3
--- /dev/null
+++ b/solaris/SolarisMachine.c
@@ -0,0 +1,336 @@
+/*
+htop - SolarisMachine.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "solaris/SolarisMachine.h"
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <limits.h>
+#include <string.h>
+#include <procfs.h>
+#include <errno.h>
+#include <pwd.h>
+#include <math.h>
+#include <time.h>
+
+#include "CRT.h"
+#include "solaris/Platform.h"
+
+
+static void SolarisMachine_updateCPUcount(SolarisMachine* this) {
+   Machine* super = &this->super;
+   long int s;
+   bool change = false;
+
+   s = sysconf(_SC_NPROCESSORS_CONF);
+   if (s < 1)
+      CRT_fatalError("Cannot get existing CPU count by sysconf(_SC_NPROCESSORS_CONF)");
+
+   if (s != super->existingCPUs) {
+      if (s == 1) {
+         this->cpus = xRealloc(this->cpus, sizeof(CPUData));
+         this->cpus[0].online = true;
+      } else {
+         this->cpus = xReallocArray(this->cpus, s + 1, sizeof(CPUData));
+         this->cpus[0].online = true; /* average is always "online" */
+         for (int i = 1; i < s + 1; i++) {
+            this->cpus[i].online = false;
+         }
+      }
+
+      change = true;
+      super->existingCPUs = s;
+   }
+
+   s = sysconf(_SC_NPROCESSORS_ONLN);
+   if (s < 1)
+      CRT_fatalError("Cannot get active CPU count by sysconf(_SC_NPROCESSORS_ONLN)");
+
+   if (s != super->activeCPUs) {
+      change = true;
+      hsuper->activeCPUs = s;
+   }
+
+   if (change) {
+      kstat_close(this->kd);
+      this->kd = kstat_open();
+      if (!this->kd)
+         CRT_fatalError("Cannot open kstat handle");
+   }
+}
+
+
+static void SolarisMachine_scanCPUTime(SolarisMachine* this) {
+   Machine* super = &this->super;
+   unsigned int activeCPUs = super->activeCPUs;
+   unsigned int existingCPUs = super->existingCPUs;
+   kstat_t* cpuinfo = NULL;
+   kstat_named_t* idletime = NULL;
+   kstat_named_t* intrtime = NULL;
+   kstat_named_t* krnltime = NULL;
+   kstat_named_t* usertime = NULL;
+   kstat_named_t* cpu_freq = NULL;
+   double idlebuf = 0;
+   double intrbuf = 0;
+   double krnlbuf = 0;
+   double userbuf = 0;
+   int arrskip = 0;
+
+   assert(existingCPUs > 0);
+   assert(this->kd);
+
+   if (existingCPUs > 1) {
+      // Store values for the stats loop one extra element up in the array
+      // to leave room for the average to be calculated afterwards
+      arrskip++;
+   }
+
+   // Calculate per-CPU statistics first
+   for (unsigned int i = 0; i < existingCPUs; i++) {
+      CPUData* cpuData = &(this->cpus[i + arrskip]);
+
+      if ((cpuinfo = kstat_lookup_wrapper(this->kd, "cpu", i, "sys")) != NULL) {
+         cpuData->online = true;
+         if (kstat_read(this->kd, cpuinfo, NULL) != -1) {
+            idletime = kstat_data_lookup_wrapper(cpuinfo, "cpu_nsec_idle");
+            intrtime = kstat_data_lookup_wrapper(cpuinfo, "cpu_nsec_intr");
+            krnltime = kstat_data_lookup_wrapper(cpuinfo, "cpu_nsec_kernel");
+            usertime = kstat_data_lookup_wrapper(cpuinfo, "cpu_nsec_user");
+         }
+      } else {
+         cpuData->online = false;
+         continue;
+      }
+
+      assert( (idletime != NULL) && (intrtime != NULL)
+           && (krnltime != NULL) && (usertime != NULL) );
+
+      if (super->settings->showCPUFrequency) {
+         if ((cpuinfo = kstat_lookup_wrapper(this->kd, "cpu_info", i, NULL)) != NULL) {
+            if (kstat_read(this->kd, cpuinfo, NULL) != -1) {
+               cpu_freq = kstat_data_lookup_wrapper(cpuinfo, "current_clock_Hz");
+            }
+         }
+
+         assert( cpu_freq != NULL );
+      }
+
+      uint64_t totaltime = (idletime->value.ui64 - cpuData->lidle)
+                         + (intrtime->value.ui64 - cpuData->lintr)
+                         + (krnltime->value.ui64 - cpuData->lkrnl)
+                         + (usertime->value.ui64 - cpuData->luser);
+
+      // Calculate percentages of deltas since last reading
+      cpuData->userPercent      = ((usertime->value.ui64 - cpuData->luser) / (double)totaltime) * 100.0;
+      cpuData->nicePercent      = (double)0.0; // Not implemented on Solaris
+      cpuData->systemPercent    = ((krnltime->value.ui64 - cpuData->lkrnl) / (double)totaltime) * 100.0;
+      cpuData->irqPercent       = ((intrtime->value.ui64 - cpuData->lintr) / (double)totaltime) * 100.0;
+      cpuData->systemAllPercent = cpuData->systemPercent + cpuData->irqPercent;
+      cpuData->idlePercent      = ((idletime->value.ui64 - cpuData->lidle) / (double)totaltime) * 100.0;
+      // Store current values to use for the next round of deltas
+      cpuData->luser            = usertime->value.ui64;
+      cpuData->lkrnl            = krnltime->value.ui64;
+      cpuData->lintr            = intrtime->value.ui64;
+      cpuData->lidle            = idletime->value.ui64;
+      // Add frequency in MHz
+      cpuData->frequency        = super->settings->showCPUFrequency ? (double)cpu_freq->value.ui64 / 1E6 : NAN;
+      // Accumulate the current percentages into buffers for later average calculation
+      if (existingCPUs > 1) {
+         userbuf               += cpuData->userPercent;
+         krnlbuf               += cpuData->systemPercent;
+         intrbuf               += cpuData->irqPercent;
+         idlebuf               += cpuData->idlePercent;
+      }
+   }
+
+   if (existingCPUs > 1) {
+      CPUData* cpuData          = &(this->cpus[0]);
+      cpuData->userPercent      = userbuf / activeCPUs;
+      cpuData->nicePercent      = (double)0.0; // Not implemented on Solaris
+      cpuData->systemPercent    = krnlbuf / activeCPUs;
+      cpuData->irqPercent       = intrbuf / activeCPUs;
+      cpuData->systemAllPercent = cpuData->systemPercent + cpuData->irqPercent;
+      cpuData->idlePercent      = idlebuf / activeCPUs;
+   }
+}
+
+static void SolarisMachine_scanMemoryInfo(SolarisMachine* this) {
+   Machine*            super = &this->super;
+   static kstat_t      *meminfo = NULL;
+   int                 ksrphyserr = -1;
+   kstat_named_t       *totalmem_pgs = NULL;
+   kstat_named_t       *freemem_pgs = NULL;
+   kstat_named_t       *pages = NULL;
+   struct swaptable    *sl = NULL;
+   struct swapent      *swapdev = NULL;
+   uint64_t            totalswap = 0;
+   uint64_t            totalfree = 0;
+   int                 nswap = 0;
+   char                *spath = NULL;
+   char                *spathbase = NULL;
+
+   // Part 1 - physical memory
+   if (this->kd != NULL && meminfo == NULL) {
+      // Look up the kstat chain just once, it never changes
+      meminfo = kstat_lookup_wrapper(this->kd, "unix", 0, "system_pages");
+   }
+   if (meminfo != NULL) {
+      ksrphyserr = kstat_read(this->kd, meminfo, NULL);
+   }
+   if (ksrphyserr != -1) {
+      totalmem_pgs   = kstat_data_lookup_wrapper(meminfo, "physmem");
+      freemem_pgs    = kstat_data_lookup_wrapper(meminfo, "freemem");
+      pages          = kstat_data_lookup_wrapper(meminfo, "pagestotal");
+
+      super->totalMem = totalmem_pgs->value.ui64 * this->pageSizeKB;
+      if (super->totalMem > freemem_pgs->value.ui64 * this->pageSizeKB) {
+         super->usedMem = super->totalMem - freemem_pgs->value.ui64 * this->pageSizeKB;
+      } else {
+         super->usedMem = 0;   // This can happen in non-global zone (in theory)
+      }
+      // Not sure how to implement this on Solaris - suggestions welcome!
+      super->cachedMem = 0;
+      // Not really "buffers" but the best Solaris analogue that I can find to
+      // "memory in use but not by programs or the kernel itself"
+      super->buffersMem = (totalmem_pgs->value.ui64 - pages->value.ui64) * this->pageSizeKB;
+   } else {
+      // Fall back to basic sysconf if kstat isn't working
+      super->totalMem = sysconf(_SC_PHYS_PAGES) * this->pageSize;
+      super->buffersMem = 0;
+      super->cachedMem = 0;
+      super->usedMem = super->totalMem - (sysconf(_SC_AVPHYS_PAGES) * this->pageSize);
+   }
+
+   // Part 2 - swap
+   nswap = swapctl(SC_GETNSWP, NULL);
+   if (nswap > 0) {
+      sl = xMalloc((nswap * sizeof(swapent_t)) + sizeof(int));
+   }
+   if (sl != NULL) {
+      spathbase = xMalloc( nswap * MAXPATHLEN );
+   }
+   if (spathbase != NULL) {
+      spath = spathbase;
+      swapdev = sl->swt_ent;
+      for (int i = 0; i < nswap; i++, swapdev++) {
+         swapdev->ste_path = spath;
+         spath += MAXPATHLEN;
+      }
+      sl->swt_n = nswap;
+   }
+   nswap = swapctl(SC_LIST, sl);
+   if (nswap > 0) {
+      swapdev = sl->swt_ent;
+      for (int i = 0; i < nswap; i++, swapdev++) {
+         totalswap += swapdev->ste_pages;
+         totalfree += swapdev->ste_free;
+      }
+   }
+   free(spathbase);
+   free(sl);
+   super->totalSwap = totalswap * this->pageSizeKB;
+   super->usedSwap  = super->totalSwap - (totalfree * this->pageSizeKB);
+}
+
+static void SolarisMachine_scanZfsArcstats(SolarisMachine* this) {
+   kstat_named_t       *cur_kstat;
+   kstat_t             *arcstats;
+   int                 ksrphyserr;
+
+   if (this->kd == NULL)
+      return;
+
+   arcstats = kstat_lookup_wrapper(this->kd, "zfs", 0, "arcstats");
+   if (arcstats == NULL)
+      return;
+
+   ksrphyserr = kstat_read(this->kd, arcstats, NULL);
+   if (ksrphyserr == -1)
+      return;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "size" );
+   this->zfs.size = cur_kstat->value.ui64 / 1024;
+   this->zfs.enabled = this->zfs.size > 0 ? 1 : 0;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "c_max" );
+   this->zfs.max = cur_kstat->value.ui64 / 1024;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "mfu_size" );
+   this->zfs.MFU = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "mru_size" );
+   this->zfs.MRU = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "anon_size" );
+   this->zfs.anon = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "hdr_size" );
+   this->zfs.header = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
+
+   cur_kstat = kstat_data_lookup_wrapper( arcstats, "other_size" );
+   this->zfs.other = cur_kstat != NULL ? cur_kstat->value.ui64 / 1024 : 0;
+
+   if ((cur_kstat = kstat_data_lookup_wrapper( arcstats, "compressed_size" )) != NULL) {
+      this->zfs.compressed = cur_kstat->value.ui64 / 1024;
+      this->zfs.isCompressed = 1;
+
+      cur_kstat = kstat_data_lookup_wrapper( arcstats, "uncompressed_size" );
+      this->zfs.uncompressed = cur_kstat->value.ui64 / 1024;
+   } else {
+      this->zfs.isCompressed = 0;
+   }
+}
+
+void Machine_scan(Machine* super) {
+   SolarisMachine* this = (SolarisMachine*) super;
+
+   SolarisMachine_updateCPUcount(this);
+   SolarisMachine_scanCPUTime(this);
+   SolarisMachine_scanMemoryInfo(this);
+   SolarisMachine_scanZfsArcstats(this);
+}
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   SolarisMachine* this = xCalloc(1, sizeof(SolarisMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   this->pageSize = sysconf(_SC_PAGESIZE);
+   if (this->pageSize == -1)
+      CRT_fatalError("Cannot get pagesize by sysconf(_SC_PAGESIZE)");
+   this->pageSizeKB = this->pageSize / 1024;
+
+   SolarisMachine_updateCPUcount(this);
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   SolarisMachine* this = (SolarisMachine*) super;
+
+   Machine_done(super);
+
+   free(this->cpus);
+   if (this->kd) {
+      kstat_close(this->kd);
+   }
+   free(this);
+}
+
+bool Machine_isCPUonline(const Machine* super, unsigned int id) {
+   assert(id < super->existingCPUs);
+
+   const SolarisMachine* this = (const SolarisMachine*) super;
+
+   return (super->existingCPUs == 1) ? true : this->cpus[id + 1].online;
+}
diff --git a/solaris/SolarisMachine.h b/solaris/SolarisMachine.h
new file mode 100644
index 0000000..2208a88
--- /dev/null
+++ b/solaris/SolarisMachine.h
@@ -0,0 +1,57 @@
+#ifndef HEADER_SolarisMachine
+#define HEADER_SolarisMachine
+/*
+htop - SolarisMachine.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kstat.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/param.h>
+#include <sys/resource.h>
+#include <sys/swap.h>
+#include <sys/sysconf.h>
+#include <sys/sysinfo.h>
+#include <sys/uio.h>
+
+#include "Hashtable.h"
+#include "UsersTable.h"
+
+#include "zfs/ZfsArcStats.h"
+
+
+#define ZONE_ERRMSGLEN 1024
+extern char zone_errmsg[ZONE_ERRMSGLEN];
+
+typedef struct CPUData_ {
+   double userPercent;
+   double nicePercent;
+   double systemPercent;
+   double irqPercent;
+   double idlePercent;
+   double systemAllPercent;
+   double frequency;
+   uint64_t luser;
+   uint64_t lkrnl;
+   uint64_t lintr;
+   uint64_t lidle;
+   bool online;
+} CPUData;
+
+typedef struct SolarisMachine_ {
+   Machine super;
+
+   kstat_ctl_t* kd;
+   CPUData* cpus;
+
+   int pageSize;
+   int pageSizeKB;
+
+   ZfsArcStats zfs;
+} SolarisMachine;
+
+#endif
diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
new file mode 100644
index 0000000..449861b
--- /dev/null
+++ b/solaris/SolarisProcess.c
@@ -0,0 +1,149 @@
+/*
+htop - SolarisProcess.c
+(C) 2015 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "solaris/SolarisProcess.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+#include "Process.h"
+#include "ProcessTable.h"
+#include "CRT.h"
+
+#include "solaris/Platform.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, O onproc, Z zombie, T stopped, W waiting)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   //[TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   //[MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   //[MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+   [PROC_COMM] = { .name = "COMM", .title = "COMM            ", .description = "comm string of the process", .flags = 0, },
+   [PROC_EXE] = { .name = "EXE", .title = "EXE             ", .description = "Basename of exe of the process", .flags = 0, },
+   [CWD] = { .name = "CWD", .title = "CWD                       ", .description = "The current working directory of the process", .flags = PROCESS_FLAG_CWD, },
+   [ZONEID] = { .name = "ZONEID", .title = "ZONEID", .description = "Zone ID", .flags = 0, .pidColumn = true, },
+   [ZONE] = { .name = "ZONE", .title = "ZONE             ", .description = "Zone name", .flags = 0, },
+   [PROJID] = { .name = "PROJID", .title = "PRJID", .description = "Project ID", .flags = 0, .pidColumn = true, },
+   [TASKID] = { .name = "TASKID", .title = "TSKID", .description = "Task ID", .flags = 0, .pidColumn = true, },
+   [POOLID] = { .name = "POOLID", .title = "POLID", .description = "Pool ID", .flags = 0, .pidColumn = true, },
+   [CONTID] = { .name = "CONTID", .title = "CNTID", .description = "Contract ID", .flags = 0, .pidColumn = true, },
+   [LWPID] = { .name = "LWPID", .title = "LWPID", .description = "LWP ID", .flags = 0, .pidColumn = true, },
+};
+
+Process* SolarisProcess_new(const Machine* host) {
+   SolarisProcess* this = xCalloc(1, sizeof(SolarisProcess));
+   Object_setClass(this, Class(SolarisProcess));
+   Process_init(&this->super, host);
+   return &this->super;
+}
+
+void Process_delete(Object* cast) {
+   SolarisProcess* sp = (SolarisProcess*) cast;
+   Process_done((Process*)cast);
+   free(sp->zname);
+   free(sp);
+}
+
+static void SolarisProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const SolarisProcess* sp = (const SolarisProcess*) super;
+
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   switch (field) {
+   // add Solaris-specific fields here
+   case ZONEID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->zoneid); break;
+   case PROJID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->projid); break;
+   case TASKID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->taskid); break;
+   case POOLID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->poolid); break;
+   case CONTID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->contid); break;
+   case ZONE: Row_printLeftAlignedField(str, attr, sp->zname ? sp->zname : "global", ZONENAME_MAX/4); return;
+   case PID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->realpid); break;
+   case PPID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->realppid); break;
+   case TGID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->realtgid); break;
+   case LWPID: xSnprintf(buffer, n, "%*d ", Process_pidDigits, sp->lwpid); break;
+   default:
+      Process_writeField(&sp->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int SolarisProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const SolarisProcess* p1 = (const SolarisProcess*)v1;
+   const SolarisProcess* p2 = (const SolarisProcess*)v2;
+
+   switch (key) {
+   case ZONEID:
+      return SPACESHIP_NUMBER(p1->zoneid, p2->zoneid);
+   case PROJID:
+      return SPACESHIP_NUMBER(p1->projid, p2->projid);
+   case TASKID:
+      return SPACESHIP_NUMBER(p1->taskid, p2->taskid);
+   case POOLID:
+      return SPACESHIP_NUMBER(p1->poolid, p2->poolid);
+   case CONTID:
+      return SPACESHIP_NUMBER(p1->contid, p2->contid);
+   case ZONE:
+      return strcmp(p1->zname ? p1->zname : "global", p2->zname ? p2->zname : "global");
+   case PID:
+      return SPACESHIP_NUMBER(p1->realpid, p2->realpid);
+   case PPID:
+      return SPACESHIP_NUMBER(p1->realppid, p2->realppid);
+   case LWPID:
+      return SPACESHIP_NUMBER(p1->lwpid, p2->lwpid);
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass SolarisProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = SolarisProcess_rowWriteField
+   },
+   .compareByKey = SolarisProcess_compareByKey
+};
diff --git a/solaris/SolarisProcess.h b/solaris/SolarisProcess.h
new file mode 100644
index 0000000..1a8d18c
--- /dev/null
+++ b/solaris/SolarisProcess.h
@@ -0,0 +1,47 @@
+#ifndef HEADER_SolarisProcess
+#define HEADER_SolarisProcess
+/*
+htop - SolarisProcess.h
+(C) 2015 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <zone.h>
+#include <sys/proc.h>
+
+/* On OmniOS /usr/include/sys/regset.h redefines ERR to 13 - \r, breaking the Enter key.
+ * Since ncruses macros use the ERR macro, we can not use another name.
+ */
+#undef ERR
+#include <libproc.h>
+#undef ERR
+#define ERR (-1)
+
+#include "Machine.h"
+
+
+typedef struct SolarisProcess_ {
+   Process    super;
+   zoneid_t   zoneid;
+   char*      zname;
+   taskid_t   taskid;
+   projid_t   projid;
+   poolid_t   poolid;
+   ctid_t     contid;
+   pid_t      realpid;
+   pid_t      realppid;
+   pid_t      realtgid;
+   pid_t      lwpid;
+} SolarisProcess;
+
+extern const ProcessClass SolarisProcess_class;
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* SolarisProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+#endif
diff --git a/solaris/SolarisProcessTable.c b/solaris/SolarisProcessTable.c
new file mode 100644
index 0000000..549c753
--- /dev/null
+++ b/solaris/SolarisProcessTable.c
@@ -0,0 +1,268 @@
+/*
+htop - SolarisProcessTable.c
+(C) 2014 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "solaris/SolarisProcessTable.h"
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/user.h>
+#include <limits.h>
+#include <string.h>
+#include <procfs.h>
+#include <errno.h>
+#include <pwd.h>
+#include <math.h>
+#include <time.h>
+
+#include "CRT.h"
+#include "solaris/Platform.h"
+#include "solaris/SolarisProcess.h"
+
+
+#define GZONE "global    "
+#define UZONE "unknown   "
+
+static char* SolarisProcessTable_readZoneName(kstat_ctl_t* kd, SolarisProcess* sproc) {
+   char* zname;
+
+   if ( sproc->zoneid == 0 ) {
+      zname = xStrdup(GZONE);
+   } else if ( kd == NULL ) {
+      zname = xStrdup(UZONE);
+   } else {
+      kstat_t* ks = kstat_lookup_wrapper( kd, "zones", sproc->zoneid, NULL );
+      zname = xStrdup(ks == NULL ? UZONE : ks->ks_name);
+   }
+
+   return zname;
+}
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   SolarisProcessTable* this = xCalloc(1, sizeof(SolarisProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(SolarisProcess), host, pidMatchList);
+
+   return super;
+}
+
+void ProcessTable_delete(Object* cast) {
+   SolarisProcessTable* this = (SolarisProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+static void SolarisProcessTable_updateExe(pid_t pid, Process* proc) {
+   char path[32];
+   xSnprintf(path, sizeof(path), "/proc/%d/path/a.out", pid);
+
+   char target[PATH_MAX];
+   ssize_t ret = readlink(path, target, sizeof(target) - 1);
+   if (ret <= 0)
+      return;
+
+   target[ret] = '\0';
+   Process_updateExe(proc, target);
+}
+
+static void SolarisProcessTable_updateCwd(pid_t pid, Process* proc) {
+   char path[32];
+   xSnprintf(path, sizeof(path), "/proc/%d/cwd", pid);
+
+   char target[PATH_MAX];
+   ssize_t ret = readlink(path, target, sizeof(target) - 1);
+   if (ret <= 0)
+      return;
+
+   target[ret] = '\0';
+   free_and_xStrdup(&proc->procCwd, target);
+}
+
+/* Taken from: https://docs.oracle.com/cd/E19253-01/817-6223/6mlkidlom/index.html#tbl-sched-state */
+static inline ProcessState SolarisProcessTable_getProcessState(char state) {
+   switch (state) {
+      case 'S': return SLEEPING;
+      case 'R': return RUNNABLE;
+      case 'O': return RUNNING;
+      case 'Z': return ZOMBIE;
+      case 'T': return STOPPED;
+      case 'I': return IDLE;
+      default: return UNKNOWN;
+   }
+}
+
+/* NOTE: the following is a callback function of type proc_walk_f
+ *       and MUST conform to the appropriate definition in order
+ *       to work.  See libproc(3LIB) on a Solaris or Illumos
+ *       system for more info.
+ */
+
+static int SolarisProcessTable_walkproc(psinfo_t* _psinfo, lwpsinfo_t* _lwpsinfo, void* listptr) {
+   bool preExisting;
+   pid_t getpid;
+
+   // Setup process list
+   ProcessTable* pt = (ProcessTable*) listptr;
+   SolarisProcessTable* spt = (SolarisProcessTable*) listptr;
+   Machine* host = pt->host;
+
+   id_t lwpid_real = _lwpsinfo->pr_lwpid;
+   if (lwpid_real > 1023) {
+      return 0;
+   }
+
+   pid_t lwpid   = (_psinfo->pr_pid * 1024) + lwpid_real;
+   bool onMasterLWP = (_lwpsinfo->pr_lwpid == _psinfo->pr_lwp.pr_lwpid);
+   if (onMasterLWP) {
+      getpid = _psinfo->pr_pid * 1024;
+   } else {
+      getpid = lwpid;
+   }
+
+   Process* proc            = ProcessTable_getProcess(pt, getpid, &preExisting, SolarisProcess_new);
+   SolarisProcess* sproc    = (SolarisProcess*) proc;
+   const Settings* settings = host->settings;
+
+   // Common code pass 1
+   proc->show               = false;
+   sproc->taskid            = _psinfo->pr_taskid;
+   sproc->projid            = _psinfo->pr_projid;
+   sproc->poolid            = _psinfo->pr_poolid;
+   sproc->contid            = _psinfo->pr_contract;
+   proc->priority           = _lwpsinfo->pr_pri;
+   proc->nice               = _lwpsinfo->pr_nice - NZERO;
+   proc->processor          = _lwpsinfo->pr_onpro;
+   proc->state              = SolarisProcessTable_getProcessState(_lwpsinfo->pr_sname);
+   // NOTE: This 'percentage' is a 16-bit BINARY FRACTIONS where 1.0 = 0x8000
+   // Source: https://docs.oracle.com/cd/E19253-01/816-5174/proc-4/index.html
+   // (accessed on 18 November 2017)
+   proc->percent_mem        = ((uint16_t)_psinfo->pr_pctmem / (double)32768) * (double)100.0;
+   proc->pgrp               = _psinfo->pr_pgid;
+   proc->nlwp               = _psinfo->pr_nlwp;
+   proc->session            = _psinfo->pr_sid;
+
+   proc->tty_nr             = _psinfo->pr_ttydev;
+   const char* name = (_psinfo->pr_ttydev != PRNODEV) ? ttyname(_psinfo->pr_ttydev) : NULL;
+   if (!name) {
+      free(proc->tty_name);
+      proc->tty_name = NULL;
+   } else {
+      free_and_xStrdup(&proc->tty_name, name);
+   }
+
+   proc->m_resident         = _psinfo->pr_rssize;  // KB
+   proc->m_virt             = _psinfo->pr_size;    // KB
+
+   if (proc->st_uid != _psinfo->pr_euid) {
+      proc->st_uid          = _psinfo->pr_euid;
+      proc->user            = UsersTable_getRef(host->usersTable, proc->st_uid);
+   }
+
+   if (!preExisting) {
+      sproc->realpid        = _psinfo->pr_pid;
+      sproc->lwpid          = lwpid_real;
+      sproc->zoneid         = _psinfo->pr_zoneid;
+      sproc->zname          = SolarisProcessTable_readZoneName(spt->kd, sproc);
+      SolarisProcessTable_updateExe(_psinfo->pr_pid, proc);
+
+      Process_updateComm(proc, _psinfo->pr_fname);
+      Process_updateCmdline(proc, _psinfo->pr_psargs, 0, 0);
+
+      if (settings->ss->flags & PROCESS_FLAG_CWD) {
+         SolarisProcessTable_updateCwd(_psinfo->pr_pid, proc);
+      }
+   }
+
+   // End common code pass 1
+
+   if (onMasterLWP) { // Are we on the representative LWP?
+      Process_setParent(proc, (_psinfo->pr_ppid * 1024));
+      Process_setThreadGroup(proc, (_psinfo->pr_ppid * 1024));
+      sproc->realppid       = _psinfo->pr_ppid;
+      sproc->realtgid       = _psinfo->pr_ppid;
+
+      // See note above (in common section) about this BINARY FRACTION
+      proc->percent_cpu     = ((uint16_t)_psinfo->pr_pctcpu / (double)32768) * (double)100.0;
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      proc->time            = _psinfo->pr_time.tv_sec * 100 + _psinfo->pr_time.tv_nsec / 10000000;
+      if (!preExisting) { // Tasks done only for NEW processes
+         proc->isUserlandThread = false;
+         proc->starttime_ctime = _psinfo->pr_start.tv_sec;
+      }
+
+      // Update proc and thread counts based on settings
+      if (proc->isKernelThread && !settings->hideKernelThreads) {
+         pt->kernelThreads += proc->nlwp;
+         pt->totalTasks += proc->nlwp + 1;
+         if (proc->state == RUNNING) {
+            pt->runningTasks++;
+         }
+      } else if (!proc->isKernelThread) {
+         if (proc->state == RUNNING) {
+            pt->runningTasks++;
+         }
+         if (settings->hideUserlandThreads) {
+            pt->totalTasks++;
+         } else {
+            pt->userlandThreads += proc->nlwp;
+            pt->totalTasks += proc->nlwp + 1;
+         }
+      }
+      proc->show = !(settings->hideKernelThreads && proc->isKernelThread);
+   } else { // We are not in the master LWP, so jump to the LWP handling code
+      proc->percent_cpu        = ((uint16_t)_lwpsinfo->pr_pctcpu / (double)32768) * (double)100.0;
+      Process_updateCPUFieldWidths(proc->percent_cpu);
+
+      proc->time               = _lwpsinfo->pr_time.tv_sec * 100 + _lwpsinfo->pr_time.tv_nsec / 10000000;
+      if (!preExisting) { // Tasks done only for NEW LWPs
+         proc->isUserlandThread    = true;
+         Process_setParent(proc, _psinfo->pr_pid * 1024);
+         Process_setThreadGroup(proc, _psinfo->pr_pid * 1024);
+         sproc->realppid       = _psinfo->pr_pid;
+         sproc->realtgid       = _psinfo->pr_pid;
+         proc->starttime_ctime = _lwpsinfo->pr_start.tv_sec;
+      }
+
+      // Top-level process only gets this for the representative LWP
+      if (proc->isKernelThread && !settings->hideKernelThreads) {
+         proc->super.show = true;
+      }
+      if (!proc->isKernelThread && !settings->hideUserlandThreads) {
+         proc->super.show = true;
+      }
+   } // Top-level LWP or subordinate LWP
+
+   // Common code pass 2
+
+   if (!preExisting) {
+      if ((sproc->realppid <= 0) && !(sproc->realpid <= 1)) {
+         proc->isKernelThread = true;
+      } else {
+         proc->isKernelThread = false;
+      }
+
+      Process_fillStarttimeBuffer(proc);
+      ProcessTable_add(pt, proc);
+   }
+
+   proc->super.updated = true;
+
+   // End common code pass 2
+
+   return 0;
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   super->kernelThreads = 1;
+   proc_walk(&SolarisProcessTable_walkproc, super, PR_WALK_LWP);
+}
diff --git a/solaris/SolarisProcessTable.h b/solaris/SolarisProcessTable.h
new file mode 100644
index 0000000..7c5ae8f
--- /dev/null
+++ b/solaris/SolarisProcessTable.h
@@ -0,0 +1,31 @@
+#ifndef HEADER_SolarisProcessTable
+#define HEADER_SolarisProcessTable
+/*
+htop - SolarisProcessTable.h
+(C) 2014 Hisham H. Muhammad
+(C) 2017,2018 Guy M. Broome
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <kstat.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <sys/param.h>
+#include <sys/uio.h>
+#include <sys/resource.h>
+#include <sys/sysconf.h>
+#include <sys/sysinfo.h>
+
+#include "Hashtable.h"
+#include "ProcessTable.h"
+#include "UsersTable.h"
+
+#include "solaris/SolarisProcess.h"
+
+
+typedef struct SolarisProcessTable_ {
+   ProcessTable super;
+} SolarisProcessTable;
+
+#endif
diff --git a/test_spec.lua b/test_spec.lua
new file mode 100755
index 0000000..2ae8015
--- /dev/null
+++ b/test_spec.lua
@@ -0,0 +1,687 @@
+#!/usr/bin/env lua
+
+local VISUALDELAY = os.getenv("VISUALDELAY")
+
+local visual = VISUALDELAY or false
+local visual_delay = VISUALDELAY and (tonumber(VISUALDELAY)) or 0.1
+local short_delay = 0.3
+local long_delay = 1
+
+local unistd = require("posix.unistd")
+local time = require("posix.time")
+local curses = require("posix.curses")
+local rote = require("rote")
+
+local rt = rote.RoteTerm(24, 80)
+
+--[[
+local function os_execread(cmd)
+   local fd = io.popen(cmd, "r")
+   local out = fd:read("*a")
+   fd:close()
+   return (out:gsub("\n$", ""))
+end
+]]
+--local branch = os_execread("git branch | grep '*'"):sub(3)
+--print("Running in branch "..branch)
+
+os.execute("make coverage")
+os.execute("rm -f *.gcda */*.gcda")
+os.execute("rm -f coverage.info test.htoprc")
+os.execute("rm -rf lcov")
+os.execute("killall htop")
+os.execute("ps aux | grep '[s]leep 12345' | awk '{print $2}' | xargs kill 2> /dev/null")
+
+os.execute("cp ./default.htoprc ./test.htoprc")
+rt:forkPty("LC_ALL=C HTOPRC=./test.htoprc ./htop 2> htop-valgrind.txt")
+
+local stdscr, term_win
+-- Curses initialization needed even when not in visual mode
+-- because luaposix only initializes KEY_* constants after initscr().
+stdscr = curses.initscr()
+if visual then
+   curses.echo(false)
+   curses.start_color()
+   curses.raw(true)
+   curses.halfdelay(1)
+   stdscr:keypad(true)
+   term_win = curses.newwin(24, 80, 0, 0)
+   local function makePair(foreground, background)
+      return background * 8 + 7 - foreground
+   end
+   -- initialize the color pairs the way rt:draw() expects it
+   for foreground = 0, 7 do
+      for background = 0, 7 do
+         if foreground ~= 7 or background ~= 0 then
+            local pair = makePair(foreground, background)
+            curses.init_pair(pair, foreground, background)
+         end
+      end
+   end
+else
+   curses.endwin()
+end
+
+local function show(key)
+   rt:update()
+   if visual then
+      rt:draw(term_win, 0, 0)
+      if key then
+         term_win:mvaddstr(0, 0, tostring(key))
+      end
+      term_win:refresh()
+
+      delay(visual_delay)
+   end
+end
+
+local function send(key, times, quick)
+   if times == 0 then return end
+   for _ = 1, times or 1 do
+      delay(0.003) -- 30ms delay to avoid clobbering Esc sequences
+      if type(key) == "string" then
+         for c in key:gmatch('.') do
+            rt:keyPress(string.byte(c))
+         end
+      else
+         rt:keyPress(key)
+      end
+      if not quick then
+         show(key)
+      end
+   end
+   if quick then
+      show(key)
+   end
+end
+
+local function string_at(x, y, len)
+   rt:update()
+   local out = {}
+   for i = 1, len do
+      out[#out+1] = rt:cellChar(y-1, x+i-2)
+   end
+   return table.concat(out)
+end
+
+local function is_string_at(x, y, str)
+   return string_at(x, y, #str) == str
+end
+
+local function check_string_at(x, y, str)
+   return { str, string_at(x, y, #str) }
+end
+
+local ESC = "\27\27"
+
+function delay(t)
+   time.nanosleep({ tv_sec = math.floor(t), tv_nsec = (t - math.floor(t)) * 1000000000 })
+end
+
+delay(2) -- give some time for htop to initialize.
+rt:update()
+
+local y_panelhdr = (function()
+   for y = 1, 24 do
+      if is_string_at(3, y, "PID") then
+         return y
+      end
+   end
+end)() or 1
+
+assert.not_equal(y_panelhdr, 1)
+
+local x_metercol2 = 41
+
+show()
+
+os.execute("sleep 12345 &")
+
+local function terminated()
+   return not os.execute("ps aux | grep -q '\\./[h]top'")
+end
+
+local function running_it(desc, fn)
+   it(desc, function()
+      assert(not terminated())
+      show()
+      fn()
+      assert(not terminated())
+   end)
+end
+
+local function check(t)
+   return t[1], t[2]
+end
+
+local attrs = {
+   black_on_cyan = 6,
+   red_on_cyan = 22,
+   white_on_black = 176,
+   yellow_on_black = 112,
+}
+
+local function find_selected_y(from)
+   rt:update()
+   for y = from or (y_panelhdr + 1), rt:rows() - 1 do
+      local attr = rt:cellAttr(y-1, 1)
+      if attr == attrs.black_on_cyan then
+         return y
+      end
+   end
+   return y_panelhdr + 1
+end
+
+local function find_command_x()
+   for x = 1, 80 do
+      if is_string_at(x, y_panelhdr, "Command") then
+         return x
+      end
+   end
+   return 64
+end
+
+local function set_display_option(n)
+   send("S")
+   send(curses.KEY_DOWN)
+   send(curses.KEY_RIGHT)
+   send(curses.KEY_DOWN, n, "quick")
+   send("\n")
+   send(curses.KEY_F10)
+end
+
+describe("htop test suite", function()
+
+   running_it("performs incremental filter", function()
+      send("\\")
+      send("x\127bux\127sted") -- test backspace
+      send("\n")
+      delay(short_delay)
+      rt:update()
+      local pid = ("      "..tostring(unistd.getpid())):sub(-5)
+      local ourpid = check_string_at(1, y_panelhdr + 1, pid)
+      send("\\")
+      send(ESC)
+      send(curses.KEY_F5)
+      send(curses.KEY_HOME)
+      delay(short_delay)
+      rt:update()
+      local initpid = check_string_at(1, y_panelhdr + 1, "    1")
+      delay(short_delay)
+      rt:update()
+      send(curses.KEY_F5)
+      assert.equal(check(ourpid))
+      assert.equal(check(initpid))
+   end)
+
+   running_it("performs incremental search", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("busted")
+      local attr = rt:cellAttr(rt:rows() - 1, 30)
+      delay(short_delay)
+      local line = find_selected_y()
+      local pid = ("      "..tostring(unistd.getpid())):sub(-5)
+      assert.equal(attr, attrs.black_on_cyan)
+      local ourpid = check_string_at(1, line, pid)
+      send("\n")
+      send(curses.KEY_HOME)
+      assert.equal(check(ourpid))
+   end)
+
+   running_it("performs pid search", function()
+      send(curses.KEY_F5)
+      send(curses.KEY_END)
+      send("1")
+      delay(short_delay)
+      local line = find_selected_y()
+      local initpid = check_string_at(1, line, "    1")
+      send(curses.KEY_F5)
+      assert.equal(check(initpid))
+   end)
+
+
+   running_it("horizontal scroll", function()
+      local h_scroll = 20
+      send(curses.KEY_F5)
+      delay(short_delay)
+      local str1 = string_at(1+h_scroll, y_panelhdr+1, 5)
+      send(curses.KEY_RIGHT)
+      delay(short_delay)
+      local str2 = string_at(1, y_panelhdr+1, 5)
+      send(curses.KEY_LEFT)
+      delay(short_delay)
+      local str3 = string_at(1+h_scroll, y_panelhdr+1, 5)
+      send(curses.KEY_LEFT)
+      delay(short_delay)
+      local str4 = string_at(1+h_scroll, y_panelhdr+1, 5)
+      send(curses.KEY_F5)
+      assert.equal(str1, str2)
+      assert.equal(str2, str3)
+      assert.equal(str3, str4)
+   end)
+
+   running_it("kills a process", function()
+      send(curses.KEY_HOME)
+      send("\\")
+      send("sleep 12345")
+      local attr = rt:cellAttr(rt:rows() - 1, 30)
+      assert.equal(attr, attrs.black_on_cyan)
+      send("\n")
+      delay(short_delay)
+      rt:update()
+      local col = find_command_x()
+      local procname = check_string_at(col, y_panelhdr + 1, "sleep 12345")
+      send("k")
+      send("\n")
+      send("\\")
+      send(ESC)
+      delay(short_delay)
+      assert.equal(check(procname))
+      assert.not_equal((os.execute("ps aux | grep -q '[s]leep 12345'")), true)
+   end)
+
+   running_it("runs strace", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("busted")
+      send("\n")
+      send("s")
+      delay(long_delay)
+      send(ESC)
+   end)
+
+   running_it("runs lsof", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("busted")
+      send("\n")
+      send("l")
+      delay(long_delay)
+      send(ESC)
+   end)
+
+   running_it("performs filtering in lsof", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("htop")
+      send("\n")
+      send("l")
+      send(curses.KEY_F4)
+      send("pipe")
+      delay(long_delay)
+      local pipefd = check_string_at(1, 3, "    3")
+      send(ESC)
+      assert.equal(check(pipefd))
+   end)
+
+   running_it("performs search in lsof", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("htop")
+      send("\n")
+      send("l")
+      send(curses.KEY_F3)
+      send("pipe")
+      delay(long_delay)
+      local line = find_selected_y(3)
+      local pipefd = check_string_at(1, line, "    3")
+      send(ESC)
+      assert.equal(check(pipefd))
+   end)
+
+
+   running_it("cycles through meter modes in the default meters", function()
+      send("S")
+      for _ = 1, 2 do
+         send(curses.KEY_RIGHT)
+         for _ = 1, 3 do
+            send("\n", 4)
+            send(curses.KEY_DOWN)
+         end
+      end
+      send(ESC)
+   end)
+
+   running_it("show process of a user", function()
+      send(curses.KEY_F5)
+      send("u")
+      send(curses.KEY_DOWN)
+      delay(short_delay)
+      rt:update()
+      local chosen = string_at(1, y_panelhdr + 2, 9)
+      send("\n")
+      send(curses.KEY_HOME)
+      delay(short_delay)
+      rt:update()
+      local shown = string_at(7, y_panelhdr + 1, 9)
+      send("u")
+      send("\n")
+      send(curses.KEY_HOME)
+      delay(short_delay)
+      rt:update()
+      local inituser = string_at(7, y_panelhdr + 1, 9)
+      send(curses.KEY_F5)
+      assert.equal(shown, chosen)
+      assert.equal(inituser, "root     ")
+   end)
+
+   running_it("performs failing search", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("xxxxxxxxxx")
+      delay(short_delay)
+      rt:update()
+      local attr = rt:cellAttr(rt:rows() - 1, 30)
+      assert.equal(attr, attrs.red_on_cyan)
+      send("\n")
+   end)
+
+   running_it("cycles through search", function()
+      send(curses.KEY_HOME)
+      send("/")
+      send("sh")
+      local lastpid
+      local pidpairs = {}
+      for _ = 1, 3 do
+         send(curses.KEY_F3)
+         local line = find_selected_y()
+         local pid = string_at(1, line, 5)
+         if lastpid then
+            pidpairs[#pidpairs + 1] = { lastpid, pid }
+            lastpid = pid
+         end
+      end
+      send(curses.KEY_HOME)
+      for _, pair in pairs(pidpairs) do
+         assert.not_equal(pair[1], pair[2])
+      end
+   end)
+
+   running_it("visits each setup screen", function()
+      send("S")
+      send(curses.KEY_DOWN, 3)
+      send(curses.KEY_F10)
+   end)
+
+   running_it("adds and removes PPID column", function()
+      send("S")
+      send(curses.KEY_DOWN, 3)
+      send(curses.KEY_RIGHT, 2)
+      send(curses.KEY_DOWN, 2)
+      send("\n")
+      send(curses.KEY_F10)
+      delay(short_delay)
+      local ppid = check_string_at(2, y_panelhdr, "PPID")
+      send("S")
+      send(curses.KEY_DOWN, 3)
+      send(curses.KEY_RIGHT, 1)
+      send(curses.KEY_DC)
+      send(curses.KEY_F10)
+      delay(short_delay)
+      local not_ppid = check_string_at(2, y_panelhdr, "PPID")
+      assert.equal(check(ppid))
+      assert.not_equal(check(not_ppid))
+   end)
+
+   running_it("changes CPU affinity for a process", function()
+      send("a")
+      send(" \n")
+      send(ESC)
+   end)
+
+   running_it("renices for a process", function()
+      send("/")
+      send("busted")
+      send("\n")
+      local line = find_selected_y()
+      local before = check_string_at(22, line, " 0")
+      send(curses.KEY_F8)
+      delay(short_delay)
+      local after = check_string_at(22, line, " 1")
+      assert.equal(check(before))
+      assert.equal(check(after))
+   end)
+
+   running_it("tries to lower nice for a process", function()
+      send("/")
+      send("busted")
+      send("\n")
+      local line = find_selected_y()
+      local before = string_at(22, line, 2)
+      send(curses.KEY_F7)
+      delay(short_delay)
+      local after = string_at(22, line, 2)
+      assert.equal(before, after) -- no permissions
+   end)
+
+   running_it("invert sort order", function()
+      local cpu_col = 45
+      send("P")
+      send("I")
+      send(curses.KEY_HOME)
+      delay(short_delay)
+      local zerocpu = check_string_at(cpu_col, y_panelhdr + 1, " 0.0")
+      send("I")
+      delay(short_delay)
+      local nonzerocpu = check_string_at(cpu_col, y_panelhdr + 1, " 0.0")
+      assert.equal(check(zerocpu))
+      assert.not_equal(check(nonzerocpu))
+   end)
+
+   running_it("changes IO priority for a process", function()
+      send("/")
+      send("htop")
+      send("\n")
+      send("i")
+      send(curses.KEY_END)
+      send("\n")
+      send(ESC)
+   end)
+
+   running_it("shows help", function()
+      send(curses.KEY_F1)
+      send("\n")
+      set_display_option(9)
+      send(curses.KEY_F1)
+      send("\n")
+      set_display_option(9)
+   end)
+
+   running_it("moves meters around", function()
+      send("S")
+      send(curses.KEY_RIGHT)
+      send(curses.KEY_UP)
+      send("\n")
+      send(curses.KEY_DOWN)
+      send(curses.KEY_UP)
+      send(curses.KEY_RIGHT)
+      send(curses.KEY_RIGHT)
+      send(curses.KEY_LEFT)
+      send(curses.KEY_LEFT)
+      send("\n")
+      send(curses.KEY_F10)
+   end)
+
+   local meters = {
+      { name = "clock", down = 0, string = "Time" },
+      { name = "load", down = 2, string = "Load" },
+      { name = "battery", down = 7, string = "Battery" },
+      { name = "hostname", down = 8, string = "Hostname" },
+      { name = "memory", down = 3, string = "Mem" },
+      { name = "CPU average", down = 16, string = "Avg" },
+   }
+
+   running_it("checks various CPU meters", function()
+      send("S")
+      send(curses.KEY_RIGHT, 3)
+      send(curses.KEY_DOWN, 9, "quick")
+      for _ = 9, 14 do
+         send("\n")
+         send("\n")
+         send(curses.KEY_DC)
+         send(curses.KEY_RIGHT)
+         send(curses.KEY_DOWN)
+      end
+   end)
+
+   for _, item in ipairs(meters) do
+      running_it("adds and removes a "..item.name.." widget", function()
+         send("S")
+         send(curses.KEY_RIGHT, 3)
+         send(curses.KEY_DOWN, item.down)
+         send("\n")
+         send(curses.KEY_UP, 4)
+         send("\n")
+         send(curses.KEY_F4, 4) -- cycle through meter modes
+         delay(short_delay)
+         rt:update()
+         local with = check_string_at(x_metercol2, 2, item.string)
+         send(curses.KEY_DC)
+         delay(short_delay)
+         local without = check_string_at(x_metercol2, 2, item.string)
+         send(curses.KEY_F10)
+         assert.equal(check(with))
+         assert.not_equal(check(without))
+      end)
+   end
+
+   running_it("goes through themes", function()
+      send(curses.KEY_F2)
+      send(curses.KEY_DOWN, 2)
+      send(curses.KEY_RIGHT)
+      for _ = 1, 6 do
+         send("\n")
+         send(curses.KEY_DOWN)
+      end
+      send(curses.KEY_UP, 6)
+      send("\n")
+      send(curses.KEY_F10)
+   end)
+
+   local display_options = {
+      { name = "tree view", down = 0 },
+      { name = "shadow other user's process", down = 1 },
+      { name = "hide kernel threads", down = 2 },
+      { name = "hide userland threads", down = 3 },
+      { name = "display threads in different color", down = 4 },
+      { name = "show custom thread names", down = 5 },
+      { name = "highlight basename", down = 6 },
+      { name = "highlight large numbers", down = 7 },
+      { name = "leave margin around header", down = 8 },
+      { name = "use detailed CPU time", down = 9 },
+      { name = "count from zero", down = 10 },
+      { name = "update process names", down = 11 },
+      { name = "guest time in CPU%", down = 12 },
+   }
+
+   for _, item in ipairs(display_options) do
+      running_it("checks display option to "..item.name, function()
+         for _ = 1, 2 do
+            set_display_option(item.down)
+            delay(short_delay)
+         end
+      end)
+   end
+
+   running_it("shows detailed CPU with guest time", function()
+      for _ = 1, 2 do
+         send("S")
+         send(curses.KEY_DOWN)
+         send(curses.KEY_RIGHT)
+         send(curses.KEY_DOWN, 9)
+         send("\n")
+         send(curses.KEY_DOWN, 3)
+         send("\n")
+         send(curses.KEY_LEFT)
+         send(curses.KEY_UP)
+         send(curses.KEY_RIGHT)
+         send(curses.KEY_F4, 4) -- cycle through CPU meter modes
+         send(curses.KEY_F10)
+         delay(short_delay)
+      end
+   end)
+
+   running_it("expands and collapses tree", function()
+      send(curses.KEY_F5) -- tree view
+      send(curses.KEY_HOME)
+      send(curses.KEY_DOWN) -- second process in the tree
+      send("-")
+      send("+")
+      send(curses.KEY_F5)
+   end)
+
+   running_it("sets sort key", function()
+      send(".")
+      send("\n")
+   end)
+
+   running_it("tags all children", function()
+      send(curses.KEY_F5) -- tree view
+      send(curses.KEY_HOME) -- ensure we're at init
+      send("c")
+      local taggedattrs = {}
+      rt:update()
+      for y = y_panelhdr + 2, 23 do
+         table.insert(taggedattrs, rt:cellAttr(y-1, 4))
+      end
+      delay(short_delay)
+      send("U")
+      local untaggedattrs = {}
+      rt:update()
+      for y = y_panelhdr + 2, 23 do
+         table.insert(untaggedattrs, rt:cellAttr(y-1, 4))
+      end
+      send(curses.KEY_F5)
+
+      for _, taggedattr in ipairs(taggedattrs) do
+         assert.equal(attrs.yellow_on_black, taggedattr)
+      end
+      for _, untaggedattr in ipairs(untaggedattrs) do
+         assert.equal(attrs.white_on_black, untaggedattr)
+      end
+   end)
+
+   for i = 1, 62 do
+      running_it("show column "..i, function()
+         send("S")
+         send(curses.KEY_END)
+         send(curses.KEY_RIGHT, 1)
+         if i > 1 then
+            send(curses.KEY_DC)
+         end
+         send(curses.KEY_RIGHT, 1)
+         local down = i
+         while down > 13 do
+            send(curses.KEY_NPAGE)
+            down = down - 13
+         end
+         send(curses.KEY_DOWN, down, "quick")
+         send("\n")
+         send(curses.KEY_F10)
+         if i == 62 then
+            send("S")
+            send(curses.KEY_END)
+            send(curses.KEY_RIGHT, 1)
+            if i > 1 then
+               send(curses.KEY_DC)
+            end
+            send(curses.KEY_F10)
+         end
+      end)
+   end
+
+   it("finally quits", function()
+      assert(not terminated())
+      send("q")
+      while not terminated() do
+         unistd.sleep(1)
+         send("q")
+      end
+      assert(terminated())
+      if visual then
+         curses.endwin()
+      end
+      os.execute("make lcov && xdg-open lcov/index.html")
+   end)
+end)
diff --git a/unsupported/Platform.c b/unsupported/Platform.c
new file mode 100644
index 0000000..dbfddd9
--- /dev/null
+++ b/unsupported/Platform.c
@@ -0,0 +1,165 @@
+/*
+htop - unsupported/Platform.c
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "unsupported/Platform.h"
+
+#include <math.h>
+
+#include "CPUMeter.h"
+#include "ClockMeter.h"
+#include "DateMeter.h"
+#include "DateTimeMeter.h"
+#include "FileDescriptorMeter.h"
+#include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "MemorySwapMeter.h"
+#include "SwapMeter.h"
+#include "SysArchMeter.h"
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+
+
+const ScreenDefaults Platform_defaultScreens[] = {
+   {
+      .name = "Main",
+      .columns = "PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
+      .sortKey = "PERCENT_CPU",
+   },
+};
+
+const unsigned int Platform_numberOfDefaultScreens = ARRAYSIZE(Platform_defaultScreens);
+
+const SignalItem Platform_signals[] = {
+   { .name = " 0 Cancel",    .number =  0 },
+};
+
+const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
+
+const MeterClass* const Platform_meterTypes[] = {
+   &CPUMeter_class,
+   &ClockMeter_class,
+   &DateMeter_class,
+   &DateTimeMeter_class,
+   &LoadAverageMeter_class,
+   &LoadMeter_class,
+   &MemoryMeter_class,
+   &SwapMeter_class,
+   &MemorySwapMeter_class,
+   &TasksMeter_class,
+   &BatteryMeter_class,
+   &HostnameMeter_class,
+   &SysArchMeter_class,
+   &UptimeMeter_class,
+   &AllCPUsMeter_class,
+   &AllCPUs2Meter_class,
+   &AllCPUs4Meter_class,
+   &AllCPUs8Meter_class,
+   &LeftCPUsMeter_class,
+   &RightCPUsMeter_class,
+   &LeftCPUs2Meter_class,
+   &RightCPUs2Meter_class,
+   &LeftCPUs4Meter_class,
+   &RightCPUs4Meter_class,
+   &LeftCPUs8Meter_class,
+   &RightCPUs8Meter_class,
+   &FileDescriptorMeter_class,
+   &BlankMeter_class,
+   NULL
+};
+
+static const char Platform_unsupported[] = "unsupported";
+
+bool Platform_init(void) {
+   /* no platform-specific setup needed */
+   return true;
+}
+
+void Platform_done(void) {
+   /* no platform-specific cleanup needed */
+}
+
+void Platform_setBindings(Htop_Action* keys) {
+   /* no platform-specific key bindings */
+   (void) keys;
+}
+
+int Platform_getUptime(void) {
+   return 0;
+}
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen) {
+   *one = 0;
+   *five = 0;
+   *fifteen = 0;
+}
+
+pid_t Platform_getMaxPid(void) {
+   return INT_MAX;
+}
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu) {
+   (void) cpu;
+
+   double* v = this->values;
+   v[CPU_METER_FREQUENCY] = NAN;
+   v[CPU_METER_TEMPERATURE] = NAN;
+
+   this->curItems = 1;
+
+   return 0.0;
+}
+
+void Platform_setMemoryValues(Meter* this) {
+   (void) this;
+}
+
+void Platform_setSwapValues(Meter* this) {
+   (void) this;
+}
+
+char* Platform_getProcessEnv(pid_t pid) {
+   (void) pid;
+   return NULL;
+}
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) {
+   (void)pid;
+   return NULL;
+}
+
+void Platform_getFileDescriptors(double* used, double* max) {
+   *used = 1337;
+   *max = 4711;
+}
+
+bool Platform_getDiskIO(DiskIOData* data) {
+   (void)data;
+   return false;
+}
+
+bool Platform_getNetworkIO(NetworkIOData* data) {
+   (void)data;
+   return false;
+}
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC) {
+   *percent = NAN;
+   *isOnAC = AC_ERROR;
+}
+
+void Platform_getHostname(char* buffer, size_t size) {
+   String_safeStrncpy(buffer, Platform_unsupported, size);
+}
+
+void Platform_getRelease(char** string) {
+   *string = xStrdup(Platform_unsupported);
+}
diff --git a/unsupported/Platform.h b/unsupported/Platform.h
new file mode 100644
index 0000000..c4cd06a
--- /dev/null
+++ b/unsupported/Platform.h
@@ -0,0 +1,124 @@
+#ifndef HEADER_Platform
+#define HEADER_Platform
+/*
+htop - unsupported/Platform.h
+(C) 2014 Hisham H. Muhammad
+(C) 2015 David C. Hunt
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <stdbool.h>
+#include <sys/types.h>
+
+#include "Action.h"
+#include "BatteryMeter.h"
+#include "DiskIOMeter.h"
+#include "Hashtable.h"
+#include "NetworkIOMeter.h"
+#include "ProcessLocksScreen.h"
+#include "SignalsPanel.h"
+#include "CommandLine.h"
+#include "generic/gettime.h"
+#include "unsupported/UnsupportedProcess.h"
+
+
+extern const ScreenDefaults Platform_defaultScreens[];
+
+extern const unsigned int Platform_numberOfDefaultScreens;
+
+extern const SignalItem Platform_signals[];
+
+extern const unsigned int Platform_numberOfSignals;
+
+extern const MeterClass* const Platform_meterTypes[];
+
+bool Platform_init(void);
+
+void Platform_done(void);
+
+void Platform_setBindings(Htop_Action* keys);
+
+int Platform_getUptime(void);
+
+void Platform_getLoadAverage(double* one, double* five, double* fifteen);
+
+pid_t Platform_getMaxPid(void);
+
+double Platform_setCPUValues(Meter* this, unsigned int cpu);
+
+void Platform_setMemoryValues(Meter* this);
+
+void Platform_setSwapValues(Meter* this);
+
+char* Platform_getProcessEnv(pid_t pid);
+
+FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid);
+
+void Platform_getFileDescriptors(double* used, double* max);
+
+bool Platform_getDiskIO(DiskIOData* data);
+
+bool Platform_getNetworkIO(NetworkIOData* data);
+
+void Platform_getBattery(double* percent, ACPresence* isOnAC);
+
+void Platform_getHostname(char* buffer, size_t size);
+
+void Platform_getRelease(char** string);
+
+#define PLATFORM_LONG_OPTIONS
+
+static inline void Platform_longOptionsUsage(ATTR_UNUSED const char* name) { }
+
+static inline CommandLineStatus Platform_getLongOption(ATTR_UNUSED int opt, ATTR_UNUSED int argc, ATTR_UNUSED char** argv) {
+   return STATUS_ERROR_EXIT;
+}
+
+static inline void Platform_gettime_realtime(struct timeval* tv, uint64_t* msec) {
+   Generic_gettime_realtime(tv, msec);
+}
+
+static inline void Platform_gettime_monotonic(uint64_t* msec) {
+   Generic_gettime_monotonic(msec);
+}
+
+static inline Hashtable* Platform_dynamicMeters(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicMetersDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline void Platform_dynamicMeterInit(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterUpdateValues(ATTR_UNUSED Meter* meter) { }
+
+static inline void Platform_dynamicMeterDisplay(ATTR_UNUSED const Meter* meter, ATTR_UNUSED RichString* out) { }
+
+static inline Hashtable* Platform_dynamicColumns(void) {
+   return NULL;
+}
+
+static inline void Platform_dynamicColumnsDone(ATTR_UNUSED Hashtable* table) { }
+
+static inline const char* Platform_dynamicColumnName(ATTR_UNUSED unsigned int key) {
+   return NULL;
+}
+
+static inline bool Platform_dynamicColumnWriteField(ATTR_UNUSED const Process* proc, ATTR_UNUSED RichString* str, ATTR_UNUSED unsigned int key) {
+   return false;
+}
+
+static inline Hashtable* Platform_dynamicScreens(void) {
+   return NULL;
+}
+
+static inline void Platform_defaultDynamicScreens(ATTR_UNUSED Settings* settings) { }
+
+static inline void Platform_addDynamicScreen(ATTR_UNUSED ScreenSettings* ss) { }
+
+static inline void Platform_addDynamicScreenAvailableColumns(ATTR_UNUSED Panel* availableColumns, ATTR_UNUSED const char* screen) { }
+
+static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { }
+
+#endif
diff --git a/unsupported/ProcessField.h b/unsupported/ProcessField.h
new file mode 100644
index 0000000..0c908ea
--- /dev/null
+++ b/unsupported/ProcessField.h
@@ -0,0 +1,15 @@
+#ifndef HEADER_UnsupportedProcessField
+#define HEADER_UnsupportedProcessField
+/*
+htop - unsupported/ProcessField.h
+(C) 2020 htop dev team
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+
+#define PLATFORM_PROCESS_FIELDS  \
+   // End of list
+
+
+#endif /* HEADER_UnsupportedProcessField */
diff --git a/unsupported/UnsupportedMachine.c b/unsupported/UnsupportedMachine.c
new file mode 100644
index 0000000..a6635ac
--- /dev/null
+++ b/unsupported/UnsupportedMachine.c
@@ -0,0 +1,56 @@
+/*
+htop - UnsupportedMachine.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "UnsupportedMachine.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "Machine.h"
+
+
+Machine* Machine_new(UsersTable* usersTable, uid_t userId) {
+   UnsupportedMachine* this = xCalloc(1, sizeof(UnsupportedMachine));
+   Machine* super = &this->super;
+
+   Machine_init(super, usersTable, userId);
+
+   super->existingCPUs = 1;
+   super->activeCPUs = 1;
+
+   return super;
+}
+
+void Machine_delete(Machine* super) {
+   UnsupportedMachine* this = (UnsupportedMachine*) super;
+   Machine_done(super);
+   free(this);
+}
+
+bool Machine_isCPUonline(const Machine* host, unsigned int id) {
+   assert(id < host->existingCPUs);
+
+   (void) host; (void) id;
+
+   return true;
+}
+
+void Machine_scan(Machine* super) {
+   super->existingCPUs = 1;
+   super->activeCPUs = 1;
+
+   super->totalMem = 0;
+   super->usedMem = 0;
+   super->buffersMem = 0;
+   super->cachedMem = 0;
+   super->sharedMem = 0;
+   super->availableMem = 0;
+
+   super->totalSwap = 0;
+   super->usedSwap = 0;
+   super->cachedSwap = 0;
+}
diff --git a/unsupported/UnsupportedMachine.h b/unsupported/UnsupportedMachine.h
new file mode 100644
index 0000000..4ec760f
--- /dev/null
+++ b/unsupported/UnsupportedMachine.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_UnsupportedMachine
+#define HEADER_UnsupportedMachine
+/*
+htop - UnsupportedMachine.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Machine.h"
+
+
+typedef struct UnsupportedMachine_ {
+   Machine super;
+} UnsupportedMachine;
+
+#endif
diff --git a/unsupported/UnsupportedProcess.c b/unsupported/UnsupportedProcess.c
new file mode 100644
index 0000000..3d6d883
--- /dev/null
+++ b/unsupported/UnsupportedProcess.c
@@ -0,0 +1,112 @@
+/*
+htop - UnsupportedProcess.c
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "unsupported/UnsupportedProcess.h"
+
+#include <stdlib.h>
+
+#include "CRT.h"
+#include "Process.h"
+
+
+const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
+   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
+   [PID] = { .name = "PID", .title = "PID", .description = "Process/thread ID", .flags = 0, .pidColumn = true, },
+   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)", .flags = 0, },
+   [PPID] = { .name = "PPID", .title = "PPID", .description = "Parent process ID", .flags = 0, .pidColumn = true, },
+   [PGRP] = { .name = "PGRP", .title = "PGRP", .description = "Process group ID", .flags = 0, .pidColumn = true, },
+   [SESSION] = { .name = "SESSION", .title = "SID", .description = "Process's session ID", .flags = 0, .pidColumn = true, },
+   [TTY] = { .name = "TTY", .title = "TTY      ", .description = "Controlling terminal", .flags = 0, },
+   [TPGID] = { .name = "TPGID", .title = "TPGID", .description = "Process ID of the fg process group of the controlling terminal", .flags = 0, .pidColumn = true, },
+   [MINFLT] = { .name = "MINFLT", .title = "     MINFLT ", .description = "Number of minor faults which have not required loading a memory page from disk", .flags = 0, .defaultSortDesc = true,},
+   [MAJFLT] = { .name = "MAJFLT", .title = "     MAJFLT ", .description = "Number of major faults which have required loading a memory page from disk", .flags = 0, .defaultSortDesc = true, },
+   [PRIORITY] = { .name = "PRIORITY", .title = "PRI ", .description = "Kernel's internal priority for the process", .flags = 0, },
+   [NICE] = { .name = "NICE", .title = " NI ", .description = "Nice value (the higher the value, the more it lets other processes take priority)", .flags = 0, },
+   [STARTTIME] = { .name = "STARTTIME", .title = "START ", .description = "Time the process was started", .flags = 0, },
+   [ELAPSED] = { .name = "ELAPSED", .title = "ELAPSED  ", .description = "Time since the process was started", .flags = 0, },
+   [PROCESSOR] = { .name = "PROCESSOR", .title = "CPU ", .description = "Id of the CPU the process last executed on", .flags = 0, },
+   [M_VIRT] = { .name = "M_VIRT", .title = " VIRT ", .description = "Total program size in virtual memory", .flags = 0, .defaultSortDesc = true, },
+   [M_RESIDENT] = { .name = "M_RESIDENT", .title = "  RES ", .description = "Resident set size, size of the text and data sections, plus stack usage", .flags = 0, .defaultSortDesc = true, },
+   [ST_UID] = { .name = "ST_UID", .title = "UID", .description = "User ID of the process owner", .flags = 0, },
+   [PERCENT_CPU] = { .name = "PERCENT_CPU", .title = " CPU%", .description = "Percentage of the CPU time the process used in the last sampling", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_NORM_CPU] = { .name = "PERCENT_NORM_CPU", .title = "NCPU%", .description = "Normalized percentage of the CPU time the process used in the last sampling (normalized by cpu count)", .flags = 0, .defaultSortDesc = true, .autoWidth = true, },
+   [PERCENT_MEM] = { .name = "PERCENT_MEM", .title = "MEM% ", .description = "Percentage of the memory the process is using, based on resident memory size", .flags = 0, .defaultSortDesc = true, },
+   [USER] = { .name = "USER", .title = "USER       ", .description = "Username of the process owner (or user ID if name cannot be determined)", .flags = 0, },
+   [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, .defaultSortDesc = true, },
+   [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
+   [TGID] = { .name = "TGID", .title = "TGID", .description = "Thread group ID (i.e. process ID)", .flags = 0, .pidColumn = true, },
+};
+
+Process* UnsupportedProcess_new(const Machine* host) {
+   Process* this = xCalloc(1, sizeof(UnsupportedProcess));
+   Object_setClass(this, Class(UnsupportedProcess));
+   Process_init(this, host);
+   return this;
+}
+
+void Process_delete(Object* cast) {
+   Process* super = (Process*) cast;
+   Process_done(super);
+   // free platform-specific fields here
+   free(cast);
+}
+
+static void UnsupportedProcess_rowWriteField(const Row* super, RichString* str, ProcessField field) {
+   const UnsupportedProcess* up = (const UnsupportedProcess*) super;
+
+   bool coloring = super->host->settings->highlightMegabytes;
+   char buffer[256]; buffer[255] = '\0';
+   int attr = CRT_colors[DEFAULT_COLOR];
+   size_t n = sizeof(buffer) - 1;
+
+   (void) coloring;
+   (void) n;
+
+   switch (field) {
+   /* Add platform specific fields */
+   default:
+      Process_writeField(&up->super, str, field);
+      return;
+   }
+
+   RichString_appendWide(str, attr, buffer);
+}
+
+static int UnsupportedProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+   const UnsupportedProcess* p1 = (const UnsupportedProcess*)v1;
+   const UnsupportedProcess* p2 = (const UnsupportedProcess*)v2;
+
+   (void) p1;
+   (void) p2;
+
+   switch (key) {
+   /* Add platform specific fields */
+   default:
+      return Process_compareByKey_Base(v1, v2, key);
+   }
+}
+
+const ProcessClass UnsupportedProcess_class = {
+   .super = {
+      .super = {
+         .extends = Class(Process),
+         .display = Row_display,
+         .delete = Process_delete,
+         .compare = Process_compare
+      },
+      .isHighlighted = Process_rowIsHighlighted,
+      .isVisible = Process_rowIsVisible,
+      .matchesFilter = Process_rowMatchesFilter,
+      .compareByParent = Process_compareByParent,
+      .sortKeyString = Process_rowGetSortKey,
+      .writeField = UnsupportedProcess_rowWriteField
+   },
+   .compareByKey = UnsupportedProcess_compareByKey
+};
diff --git a/unsupported/UnsupportedProcess.h b/unsupported/UnsupportedProcess.h
new file mode 100644
index 0000000..21956dd
--- /dev/null
+++ b/unsupported/UnsupportedProcess.h
@@ -0,0 +1,28 @@
+#ifndef HEADER_UnsupportedProcess
+#define HEADER_UnsupportedProcess
+/*
+htop - UnsupportedProcess.h
+(C) 2015 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "Machine.h"
+
+
+typedef struct UnsupportedProcess_ {
+   Process super;
+
+   /* Add platform specific fields */
+} UnsupportedProcess;
+
+
+extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
+
+Process* UnsupportedProcess_new(const Machine* host);
+
+void Process_delete(Object* cast);
+
+extern const ProcessClass UnsupportedProcess_class;
+
+#endif
diff --git a/unsupported/UnsupportedProcessTable.c b/unsupported/UnsupportedProcessTable.c
new file mode 100644
index 0000000..db43f1e
--- /dev/null
+++ b/unsupported/UnsupportedProcessTable.c
@@ -0,0 +1,90 @@
+/*
+htop - UnsupportedProcessTable.c
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "UnsupportedProcessTable.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "ProcessTable.h"
+#include "UnsupportedProcess.h"
+
+
+ProcessTable* ProcessTable_new(Machine* host, Hashtable* pidMatchList) {
+   UnsupportedProcessTable* this = xCalloc(1, sizeof(UnsupportedProcessTable));
+   Object_setClass(this, Class(ProcessTable));
+
+   ProcessTable* super = &this->super;
+   ProcessTable_init(super, Class(Process), host, pidMatchList);
+
+   return this;
+}
+
+void ProcessTable_delete(Object* cast) {
+   UnsupportedProcessTable* this = (UnsupportedProcessTable*) cast;
+   ProcessTable_done(&this->super);
+   free(this);
+}
+
+void ProcessTable_goThroughEntries(ProcessTable* super) {
+   bool preExisting = true;
+   Process* proc;
+
+   proc = ProcessTable_getProcess(super, 1, &preExisting, UnsupportedProcess_new);
+
+   /* Empty values */
+   proc->time = proc->time + 10;
+   Process_setPid(proc, 1);
+   Process_setParent(proc, 1);
+   Process_setThreadGroup(proc, 0);
+
+   Process_updateComm(proc, "commof16char");
+   Process_updateCmdline(proc, "<unsupported architecture>", 0, 0);
+   Process_updateExe(proc, "/path/to/executable");
+
+   const Settings* settings = proc->host->settings;
+   if (settings->ss->flags & PROCESS_FLAG_CWD) {
+      free_and_xStrdup(&proc->procCwd, "/current/working/directory");
+   }
+
+   proc->super.updated = true;
+
+   proc->state = RUNNING;
+   proc->isKernelThread = false;
+   proc->isUserlandThread = false;
+   proc->super.show = true; /* Reflected in settings-> "hideXXX" really */
+   proc->pgrp = 0;
+   proc->session = 0;
+   proc->tty_nr = 0;
+   proc->tty_name = NULL;
+   proc->tpgid = 0;
+   proc->processor = 0;
+
+   proc->percent_cpu = 2.5;
+   proc->percent_mem = 2.5;
+   Process_updateCPUFieldWidths(proc->percent_cpu);
+
+   proc->st_uid = 0;
+   proc->user = "nobody"; /* Update whenever proc->st_uid is changed */
+
+   proc->priority = 0;
+   proc->nice = 0;
+   proc->nlwp = 1;
+   proc->starttime_ctime = 1433116800; // Jun 01, 2015
+   Process_fillStarttimeBuffer(proc);
+
+   proc->m_virt = 100;
+   proc->m_resident = 100;
+
+   proc->minflt = 20;
+   proc->majflt = 20;
+
+   if (!preExisting)
+      ProcessTable_add(super, proc);
+}
diff --git a/unsupported/UnsupportedProcessTable.h b/unsupported/UnsupportedProcessTable.h
new file mode 100644
index 0000000..1de8087
--- /dev/null
+++ b/unsupported/UnsupportedProcessTable.h
@@ -0,0 +1,17 @@
+#ifndef HEADER_UnsupportedProcessTable
+#define HEADER_UnsupportedProcessTable
+/*
+htop - UnsupportedProcessTable.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "ProcessTable.h"
+
+
+typedef struct UnsupportedProcessTable_ {
+   ProcessTable super;
+} UnsupportedProcessTable;
+
+#endif
diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c
new file mode 100644
index 0000000..32f5bb3
--- /dev/null
+++ b/zfs/ZfsArcMeter.c
@@ -0,0 +1,100 @@
+/*
+htop - ZfsArcMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "zfs/ZfsArcMeter.h"
+
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+
+#include "zfs/ZfsArcStats.h"
+
+
+static const int ZfsArcMeter_attributes[] = {
+   ZFS_MFU, ZFS_MRU, ZFS_ANON, ZFS_HEADER, ZFS_OTHER
+};
+
+void ZfsArcMeter_readStats(Meter* this, const ZfsArcStats* stats) {
+   this->total = stats->max;
+   this->values[0] = stats->MFU;
+   this->values[1] = stats->MRU;
+   this->values[2] = stats->anon;
+   this->values[3] = stats->header;
+   this->values[4] = stats->other;
+
+   // "Hide" the last value so it can
+   // only be accessed by index and is not
+   // displayed by the Bar or Graph style
+   this->curItems = 5;
+   this->values[5] = stats->size;
+}
+
+static void ZfsArcMeter_updateValues(Meter* this) {
+   char* buffer = this->txtBuffer;
+   size_t size = sizeof(this->txtBuffer);
+   int written;
+   Platform_setZfsArcValues(this);
+
+   written = Meter_humanUnit(buffer, this->values[5], size);
+   METER_BUFFER_CHECK(buffer, size, written);
+
+   METER_BUFFER_APPEND_CHR(buffer, size, '/');
+
+   Meter_humanUnit(buffer, this->total, size);
+}
+
+static void ZfsArcMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+
+   if (this->values[5] > 0) {
+      char buffer[50];
+      Meter_humanUnit(buffer, this->total, sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      Meter_humanUnit(buffer, this->values[5], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Used:");
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      Meter_humanUnit(buffer, this->values[0], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " MFU:");
+      RichString_appendAscii(out, CRT_colors[ZFS_MFU], buffer);
+      Meter_humanUnit(buffer, this->values[1], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " MRU:");
+      RichString_appendAscii(out, CRT_colors[ZFS_MRU], buffer);
+      Meter_humanUnit(buffer, this->values[2], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Anon:");
+      RichString_appendAscii(out, CRT_colors[ZFS_ANON], buffer);
+      Meter_humanUnit(buffer, this->values[3], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Hdr:");
+      RichString_appendAscii(out, CRT_colors[ZFS_HEADER], buffer);
+      Meter_humanUnit(buffer, this->values[4], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Oth:");
+      RichString_appendAscii(out, CRT_colors[ZFS_OTHER], buffer);
+   } else {
+      RichString_writeAscii(out, CRT_colors[METER_TEXT], " ");
+      RichString_appendAscii(out, CRT_colors[FAILED_READ], "Unavailable");
+   }
+}
+
+const MeterClass ZfsArcMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = ZfsArcMeter_display,
+   },
+   .updateValues = ZfsArcMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 6,
+   .total = 100.0,
+   .attributes = ZfsArcMeter_attributes,
+   .name = "ZFSARC",
+   .uiName = "ZFS ARC",
+   .caption = "ARC: "
+};
diff --git a/zfs/ZfsArcMeter.h b/zfs/ZfsArcMeter.h
new file mode 100644
index 0000000..3f6ea5a
--- /dev/null
+++ b/zfs/ZfsArcMeter.h
@@ -0,0 +1,19 @@
+#ifndef HEADER_ZfsArcMeter
+#define HEADER_ZfsArcMeter
+/*
+htop - ZfsArcMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "zfs/ZfsArcStats.h"
+
+#include "Meter.h"
+
+
+void ZfsArcMeter_readStats(Meter* this, const ZfsArcStats* stats);
+
+extern const MeterClass ZfsArcMeter_class;
+
+#endif
diff --git a/zfs/ZfsArcStats.h b/zfs/ZfsArcStats.h
new file mode 100644
index 0000000..1fe7236
--- /dev/null
+++ b/zfs/ZfsArcStats.h
@@ -0,0 +1,25 @@
+#ifndef HEADER_ZfsArcStats
+#define HEADER_ZfsArcStats
+/*
+htop - ZfsArcStats.h
+(C) 2014 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+typedef struct ZfsArcStats_ {
+   int enabled;
+   int isCompressed;
+   unsigned long long int min;
+   unsigned long long int max;
+   unsigned long long int size;
+   unsigned long long int MFU;
+   unsigned long long int MRU;
+   unsigned long long int anon;
+   unsigned long long int header;
+   unsigned long long int other;
+   unsigned long long int compressed;
+   unsigned long long int uncompressed;
+} ZfsArcStats;
+
+#endif
diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c
new file mode 100644
index 0000000..4d47040
--- /dev/null
+++ b/zfs/ZfsCompressedArcMeter.c
@@ -0,0 +1,89 @@
+/*
+htop - ZfsCompressedArcMeter.c
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "config.h" // IWYU pragma: keep
+
+#include "zfs/ZfsCompressedArcMeter.h"
+
+#include <stddef.h>
+
+#include "CRT.h"
+#include "Meter.h"
+#include "Object.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
+#include "zfs/ZfsArcStats.h"
+
+
+static const int ZfsCompressedArcMeter_attributes[] = {
+   ZFS_COMPRESSED
+};
+
+void ZfsCompressedArcMeter_readStats(Meter* this, const ZfsArcStats* stats) {
+   if ( stats->isCompressed ) {
+      this->total = stats->uncompressed;
+      this->values[0] = stats->compressed;
+   } else {
+      // For uncompressed ARC, report 1:1 ratio
+      this->total = stats->size;
+      this->values[0] = stats->size;
+   }
+}
+
+static int ZfsCompressedArcMeter_printRatioString(const Meter* this, char* buffer, size_t size) {
+   if (this->values[0] > 0) {
+      return xSnprintf(buffer, size, "%.2f:1", this->total / this->values[0]);
+   }
+
+   return xSnprintf(buffer, size, "N/A");
+}
+
+static void ZfsCompressedArcMeter_updateValues(Meter* this) {
+   Platform_setZfsCompressedArcValues(this);
+
+   ZfsCompressedArcMeter_printRatioString(this, this->txtBuffer, sizeof(this->txtBuffer));
+}
+
+static void ZfsCompressedArcMeter_display(const Object* cast, RichString* out) {
+   const Meter* this = (const Meter*)cast;
+
+   if (this->values[0] > 0) {
+      char buffer[50];
+      int len;
+
+      Meter_humanUnit(buffer, this->total, sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Uncompressed, ");
+      Meter_humanUnit(buffer, this->values[0], sizeof(buffer));
+      RichString_appendAscii(out, CRT_colors[METER_VALUE], buffer);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Compressed, ");
+      len = ZfsCompressedArcMeter_printRatioString(this, buffer, sizeof(buffer));
+      RichString_appendnAscii(out, CRT_colors[ZFS_RATIO], buffer, len);
+      RichString_appendAscii(out, CRT_colors[METER_TEXT], " Ratio");
+   } else {
+      RichString_writeAscii(out, CRT_colors[METER_TEXT], " ");
+      RichString_appendAscii(out, CRT_colors[FAILED_READ], "Compression Unavailable");
+   }
+}
+
+const MeterClass ZfsCompressedArcMeter_class = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete,
+      .display = ZfsCompressedArcMeter_display,
+   },
+   .updateValues = ZfsCompressedArcMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100.0,
+   .attributes = ZfsCompressedArcMeter_attributes,
+   .name = "ZFSCARC",
+   .uiName = "ZFS CARC",
+   .description = "ZFS CARC: Compressed ARC statistics",
+   .caption = "ARC: "
+};
diff --git a/zfs/ZfsCompressedArcMeter.h b/zfs/ZfsCompressedArcMeter.h
new file mode 100644
index 0000000..6e2f45f
--- /dev/null
+++ b/zfs/ZfsCompressedArcMeter.h
@@ -0,0 +1,19 @@
+#ifndef HEADER_ZfsCompressedArcMeter
+#define HEADER_ZfsCompressedArcMeter
+/*
+htop - ZfsCompressedArcMeter.h
+(C) 2004-2011 Hisham H. Muhammad
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include "zfs/ZfsArcStats.h"
+
+#include "Meter.h"
+
+
+void ZfsCompressedArcMeter_readStats(Meter* this, const ZfsArcStats* stats);
+
+extern const MeterClass ZfsCompressedArcMeter_class;
+
+#endif