Update upstream source from tag 'upstream/3.3.13-1'

Update to upstream version '3.3.13-1'
with Debian dir 4e1685610e3b8199855e4e599ed504e1fe871724

1 files changed, 311 insertions, 210 deletions

diff --git a/inxi.1 b/inxi.1
index e8b0e37..356b2d3 100644
--- a/inxi.1
+++ b/inxi.1
@@ -15,7 +15,7 @@
 .\"  with this program; if not, write to the Free Software Foundation, Inc.,
 .\"  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 .\"  
-.TH INXI 1 "2022\-01\-18" "inxi" "inxi manual"
+.TH INXI 1 "2022\-02\-22" "inxi" "inxi manual"
 
 .SH NAME
 inxi  \- Command line system information script for console and IRC
@@ -266,43 +266,49 @@ in order to avoid spamming. ARM CPUs: show \fBfeatures\fR items.
 .TP
 .B \-F \fR, \fB\-\-full\fR
 Show Full output for inxi. Includes all Upper Case line letters (except 
-\fB\-J\fR and \fB\-W\fR) plus \fB\-\-swap\fR, \fB\-s\fR and \fB\-n\fR. Does 
-not show extra verbose options such as \fB\-d \-f \-i -J \-l \-m \-o \-p \-r 
-\-t \-u \-x\fR unless you use those arguments in the command, e.g.: 
+\fB\-J\fR and \fB\-W\fR) plus \fB\-\-swap\fR, \fB\-s\fR and \fB\-n\fR. Does not 
+show extra verbose options such as \fB\-d \-f \-i -J \-l \-m \-o \-p \-r \-t \-u 
+\-x\fR unless you use those arguments in the command, e.g.: 
 \fBinxi \-Frmxx\fR
 
 .TP
 .B \-G \fR, \fB\-\-graphics\fR
 Show Graphic device(s) information, including details of device and display 
-drivers (\fBloaded:\fR, and, if applicable: \fBunloaded:\fR, \fBfailed:\fR), 
-display protocol (if available), display server (and/or Wayland compositor), 
-vendor and version number, e.g.:
+drivers (\fBX:\fR \fBloaded:\fR, and, if applicable: \fBunloaded:\fR, 
+\fBfailed:\fR, and active \fBgpu:\fR drivers), display protocol (if available), 
+display server (and/or Wayland compositor), vendor and version number, e.g.:
 
-\fBDisplay: x11 server: Xorg 1.15.1\fR
+\fBDisplay: x11 server: Xorg v: 1.15.1\fR
+
+or
+
+\fBDisplay: wayland server: X.org v: 1.20.1 with: Xwayland v: 20.1\fR
 
 If protocol is not detected, shows:
 
 \fBDisplay: server: Xorg 1.15.1\fR
 
-Also shows screen resolution(s) (per monitor/X screen), OpenGL renderer, 
-OpenGL core profile version/OpenGL version.
+Also shows screen resolution(s) (per monitor/X screen). For X.org: OpenGL 
+renderer, OpenGL core profile version/OpenGL version; for VESA: data (for 
+Xvesa); for Wayland:  GBM/EGL data (not implemented).
 
-Compositor information will show if detected using \fB\-xx\fR option
-or always if detected and Wayland.
+Compositor information will show if detected using \fB\-xx\fR option or always 
+if detected and Wayland since the compositor is the server with Wayland.
+
+\fB\-Gxx\fR shows monitor data as well, if detected.
 
 .TP
 .B \-h \fR, \fB\-\-help\fR
-The help menu. Features dynamic sizing to fit into terminal window. Set script
-global \fBCOLS_MAX_CONSOLE\fR if you want a different default value, or
-use \fB\-y <width>\fR to temporarily override the defaults or actual window 
-width.
+The help menu. Features dynamic sizing to fit into terminal window. Set script 
+global \fBCOLS_MAX_CONSOLE\fR if you want a different default value, or use 
+\fB\-y <width>\fR to temporarily override the defaults or actual window width.
 
 .TP
 .B \-i \fR, \fB\-\-ip\fR
-Show WAN IP address and local interfaces (latter requires \fBifconfig\fR or
-\fBip\fR network tool), as well as network output from \fB\-n\fR.
-Not shown with \fB\-F\fR for user security reasons. You shouldn't paste your
-local/WAN IP. Shows both IPv4 and IPv6 link IP addresses.
+Show WAN IP address and local interfaces (latter requires \fBifconfig\fR or 
+\fBip\fR network tool), as well as network output from \fB\-n\fR. Not shown with 
+\fB\-F\fR for user security reasons. You shouldn't paste your local/WAN IP. 
+Shows both IPv4 and IPv6 link IP addresses.
 
 .TP
 .B \-I \fR, \fB\-\-info\fR
@@ -313,9 +319,9 @@ for extra information (init type/version, runlevel, packages).
 Note: if \fB\-m\fR is used or triggered, the memory item will show in the main
 Memory: report of \fB\-m\fR, not in \fB\Info:\fR.
 
-Raspberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount, 
-if user is in video group and \fBvcgencmd\fR is installed. Uses 
-this result to increase the \fBMemory:\fR amount and \fBused:\fR amounts.
+Raspberry Pi only: uses \fBvcgencmd get_mem gpu\fR to get gpu RAM amount, if 
+user is in video group and \fBvcgencmd\fR is installed. Uses this result to 
+increase the \fBMemory:\fR amount and \fBused:\fR amounts.
 
 .TP
 .B \-j\fR, \fB\-\-swap\fR
@@ -327,19 +333,17 @@ To show partition labels or UUIDs (when available and relevant), use with
 
 .TP
 .B \-J \fR, \fB\-\-usb\fR
-Show USB data for attached Hubs and Devices. Hubs also show number of ports. 
-Be aware that a port is not always external, some may be internal, and either
-used or unused (for example, a motherboard USB header connector that is not 
-used).
+Show USB data for attached Hubs and Devices. Hubs also show number of ports. Be 
+aware that a port is not always external, some may be internal, and either used 
+or unused (for example, a motherboard USB header connector that is not used).
 
 Hubs and Devices are listed in order of BusID.
 
 BusID is generally in this format: BusID\-port[.port][.port]:DeviceID
 
-Device ID is a number created by the kernel, and has no necessary ordering
-or sequence connection, but can be used to match this output to lsusb
-values, which generally shows BusID / DeviceID (except for tree view, which
-shows ports).
+Device ID is a number created by the kernel, and has no necessary ordering or 
+sequence connection, but can be used to match this output to lsusb values, which 
+generally shows BusID / DeviceID (except for tree view, which shows ports).
 
 Examples: \fBDevice\-3: 4\-3.2.1:2\fR or \fBHub: 4\-0:1\fR
 
@@ -355,31 +359,29 @@ Sample: \fB\-ojpl\fR.
 
 .TP
 .B \-L\fR, \fB\-\-logical\fR
-Show Logical volume information, for LVM, LUKS, bcache, etc. Shows
-size, free space (for LVM VG). For LVM, shows \fBDevice\-[xx]: VG:\fR 
-(Volume Group) size/free, \fBLV\-[xx]\fR (Logical Volume). LV shows type, 
-size, and components. Note that components are made up of either containers
-(aka, logical devices), or physical devices. The full report requires 
-doas/sudo/root.
-
-Logical block devices can be thought of as devices that are made up out
-of either other logical devices, or physical devices. inxi does its best 
-to show what each logical device is made out of. RAID devices form a subset
-of all possible Logical devices, but have their own section, \fB\-R\fR. 
+Show Logical volume information, for LVM, LUKS, bcache, etc. Shows size, free 
+space (for LVM VG). For LVM, shows \fBDevice\-[xx]: VG:\fR (Volume Group) 
+size/free, \fBLV\-[xx]\fR (Logical Volume). LV shows type, size, and components. 
+Note that components are made up of either containers (aka, logical devices), or 
+physical devices. The full report requires doas/sudo/root.
+
+Logical block devices can be thought of as devices that are made up out of 
+either other logical devices, or physical devices. inxi does its best to show 
+what each logical device is made out of. RAID devices form a subset of all 
+possible Logical devices, but have their own section, \fB\-R\fR. 
 
 If \fB\-R\fR is used with \fB\-Lxx\fR, \fB\-Lxx\fR will not show RAID 
-information for LVM RAID devices since it's redundant. If \fB\-R\fR is
-not used, a simple RAID line will appear for LVM RAID in \fB\-Lxx\fR.
+information for LVM RAID devices since it's redundant. If \fB\-R\fR is not used, 
+a simple RAID line will appear for LVM RAID in \fB\-Lxx\fR.
 
-\fB\-Lxx\fR also shows all components and devices. Note that since
-components can go in many levels, each level per primary component is
-indicated by either another 'c', or ends with a 'p' device, the physical
-device. The number of c's or p's indicates the depth, so you can see which
-component belongs to which.
+\fB\-Lxx\fR also shows all components and devices. Note that since components 
+can go in many levels, each level per primary component is indicated by either 
+another 'c', or ends with a 'p' device, the physical device. The number of c's 
+or p's indicates the depth, so you can see which component belongs to which.
 
-\fB\-L\fR shows only the top level components/devices (like \fB\-R\fR).
-\fB\-La\fR shows component/device size, maj:min ID, mapped name
-(if applicable), and puts each component/device on its own line.
+\fB\-L\fR shows only the top level components/devices (like \fB\-R\fR). 
+\fB\-La\fR shows component/device size, maj:min ID, mapped name (if applicable), 
+and puts each component/device on its own line.
 
 Sample:
 
@@ -945,10 +947,10 @@ configuration item \fBINDENT\fR to make permanent.
 
 .TP
 .B \-\-indents [0\-10]\fR
-Change primary wrap mode, second, and -y1 level indents. First indent level only 
-applied if output width is less than max wrap width (see \fB\-\-max\-wrap\fR). 0 
-disables all wrapped indents and all second level indents. Use configuration 
-item \fBINDENTS\fR to make permanent.
+Change primary wrap mode, second, and \fB\-y1\fR level indents. First indent 
+level only applied if output width is less than max wrap width (see 
+\fB\-\-max\-wrap\fR). 0 disables all wrapped indents and all second level 
+indents. Use configuration item \fBINDENTS\fR to make permanent.
 
 .TP
 .B \-\-limit [\-1 \- x]\fR
@@ -1085,8 +1087,8 @@ each extra data level.
 
 .TP
 .B \-x \-A\fR
-\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows 
-specific vendor [product] information.
+\- Adds (if available and/or relevant) \fBvendor:\fR item, which shows specific 
+vendor [product] information.
 
 \- Adds version/port(s)/driver version (if available) for each device.
 
@@ -1101,9 +1103,9 @@ specific vendor [product] information.
 \- Adds attached battery powered peripherals (\fBDevice\-[number]:\fR) if 
 detected (keyboard, mouse, etc.).
 
-\- Adds battery \fBvolts:\fR, \fBmin:\fR voltages. Note that if difference 
-is critical, that is current voltage is too close to minimum voltage, shows 
-without \fB\-x\fR.
+\- Adds battery \fBvolts:\fR, \fBmin:\fR voltages. Note that if difference is 
+critical, that is current voltage is too close to minimum voltage, shows without 
+\fB\-x\fR.
 
 .TP
 .B \-x \-C\fR
@@ -1195,14 +1197,15 @@ for each HCI ID.
 
 .TP
 .B \-x \-G\fR
+\- Adds PCI/USB ID of each device.
+
 \- Adds (if available and/or relevant) \fBvendor:\fR item, which shows 
 specific vendor [product] information.
 
-\- Adds direct rendering status.
+\- \fBX.org:\fR Adds direct rendering status.
 
-\- Adds (for single GPU, nvidia driver) screen number that GPU is running on.
-
-\- Adds PCI/USB ID of each device.
+\- \fBX.org:\fR Adds (for single GPU, nvidia driver) screen number that GPU is 
+running on.
 
 .TP
 .B \-x \-i\fR
@@ -1329,6 +1332,8 @@ found for each distribution system base detection.
 .B \-xx \-A\fR
 \- Adds vendor:product ID for each device.
 
+\- Adds PCIe speed and lanes item (Linux only, if detected).
+
 .TP
 .B \-xx \-B\fR
 \- Adds serial number.
@@ -1363,30 +1368,102 @@ For a PCIe 3 NVMe drive, with speed of \fB8 GT/s\fR and \fB4\fR lanes
 \- Adds (\fBhciconfig \fRonly) LMP subversion (and/or HCI revision 
 if applicable) for each device.
 
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe bluetooth, which is 
+rare).
+
 .TP
 .B \-xx \-G\fR
+Triggers much more complete Screen/Monitor output. 
+
+\fBX.org:\fR requires \fBxdpyinfo\fR or \fBxrandr\fR, and the advanced per 
+monitor feature requires \fBxrandr\fR. 
+
+\fBWayland:\fR requires any tool capable of showing monitor and resolution 
+information. \fBSway\fR has \fBswaymsg\fR, \fBweston\-info\fR or 
+\fBwayland\-info\fR can show Wayland information on any Wayland compositor, and 
+\fBwlr\-randr\fR can show Wayland information for any \fBwlroots\fR based 
+compositor.
+
+Further note that all references to \fBDisplays\fR, \fBScreens\fR, and 
+\fBMonitors\fR are referring to the \fBX\fR or \fBWayland\fR technical terms, 
+not normal consumer usage. 
+
+\fBX.org:\fR 1 \fBDisplay\fR runs 1 or more \fBScreens\fR, and 1 \fBScreen\fR 
+runs 1 or more \fBMonitors\fR.
+
+\fBWayland:\fR The \fBDisplay\fR is the primary container, and it can contain 1 
+or more \fBMonitors\fR.
+
 \- Adds vendor:product ID of each device.
 
-\- Adds Xorg compositor, if found (always shows for Wayland systems).
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe device and detected).
 
-\- For free drivers, adds OpenGL compatibility version number if available.
-For nonfree drivers, the core version and compatibility versions are usually
-the same. Example:
+\- Adds output port IDs, active, off (connected but disabled, like a closed 
+laptop lid) and empty. Example:
 
-\fBv: 3.3 Mesa 11.2.0 compat\-v: 3.0\fR
+\fBports: active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1\fR
+
+\- Adds \fBDisplay\fR ID. X.org: the Display running the Screen that runs the 
+Monitors; Wayland: the Display that runs the monitors.
+
+\- Adds compositor, if found (always shows for Wayland).
+
+\- \fBWayland:\fR Adds to  \fBDisplay\fR \fBd-rect:\fR if > 1 monitors in 
+Display. This is the size of the rectangle Wayland creates to situate the 
+monitors in.
+
+\- \fBX.org:\fR If available, shows \fBalternate:\fR Xorg drivers. This means a 
+driver on the default list of drivers Xorg automatically checks for the device, 
+but which is not installed. For example, if you have \fBnouveau\fR driver, 
+\fBnvidia\fR would show as alternate if it was not installed. Note that 
+\fBalternate:\fR does NOT mean you should have it, it's just one of the drivers 
+Xorg checks to see if is present and loaded when checking the device. This can 
+let you know there are other driver options. Note that if you have explicitly 
+set the driver in \fBxorg.conf\fR, Xorg will not create this automatic check 
+driver list.
+
+\- \fBXorg:\fR Adds total number of \fBScreens\fR listed for the current 
+\fBDisplay\fR.
+
+\- \fBXorg:\fR Adds default \fBScreen\fR ID if Screen (not monitor!) total is 
+greater than 1.
+
+\- \fBX.org:\fR Adds \fBScreen\fR line, which includes the ID (\fBScreen: 0\fR) 
+then \fBs-res\fR (Screen resolution), \fBs\-dpi\fR. Remember, this is an Xorg 
+\fBScreen\fR, NOT a monitor screen, and the information listed is about the Xorg 
+Screen! It may at times be the same as a single monitor system, but usually it's 
+different in some ways. Note that the physical monitor dpi and the Xorg dpi are 
+not necessarily the same thing, and can vary widely.
 
-\- If available, shows \fBalternate:\fR Xorg drivers. This means a driver on 
-the default list of drivers Xorg automatically checks for the device, but which 
-is not installed. For example, if you have \fBnouveau\fR driver, \fBnvidia\fR 
-would show as alternate if it was not installed. Note that \fBalternate:\fR 
-does NOT mean you should have it, it's just one of the drivers Xorg checks to 
-see if is present and loaded when checking the device. This can let you know 
-there are other driver options. Note that if you have explicitly set the driver 
-in \fBxorg.conf\fR, Xorg will not create this automatic check driver list.
+\- Adds \fBMonitor\fR lines. Monitors are a subset of a \fBScreen\fR (X.org) or 
+\fBDisplay\fR (Wayland), each of which can have one or more monitors. Normally a 
+dual monitor setup is 2 monitors run by one Xorg Screen/Wayland Display. 
 
-\- If available, shows Xorg dpi (\fBs-dpi:\fR) for the active Xorg \fBScreen\fR
-(not physical monitor). Note that the physical monitor dpi and the Xorg 
-dpi are not necessarily the same thing, and can vary widely.
+\- \fBpos: [primary,]{position string|row\-col}\fR (X.org: requires 
+\fBxrandr\fR; Wayland: requires \fBswaymsg\fR [sway], \fBwlr\-randr\fR [wlroots 
+based compositors], \fBweston\-info\fR / \fBwayland\-info\fR [all]). Uses either 
+explicit \fBprimary\fR value or +0+0 position if no primary monitor value set. 
+\fBpos:\fR does not show for single monitor setups, or if no position data was 
+found.
+
+Position is text (left, center, center-l, center\-r, right, top, top\-left, 
+top\-center, top\-right, middle, middle\-c, middle\-r, bottom, bottom\-l, 
+bottom\-c, bottom\-r) if monitors fit within the following grids: 1x2, 1x3, 1x4, 
+2x1, 2x2, 2x3, 3x1, 3x2, 3x3. If layout not supported in text, uses 
+[row\-nu]\-[column\-nu] instead to indicate the monitor's position in its grid.
+
+The position is based on the upper left corner of each monitor relative to the 
+grid of monitors that the \fBXorg\fR \fBScreen\fR is composed of.
+
+\- \fBdiag:\fR monitor screen diagonal in mm (inches). Note that this is the 
+real monitor size, not the Xorg full Screen diagonal size, which can be quite 
+different. 
+
+\- For free drivers, adds OpenGL compatibility version number if available. For 
+nonfree drivers, the core version and compatibility versions are usually the 
+same. Example:
+
+\fBv: 3.3 Mesa 11.2.0 compat\-v: 3.0\fR
 
 .TP
 .B \-xx \-I\fR
@@ -1444,6 +1521,8 @@ ROM size if using \fBdmidecode\fR.
 .B \-xx \-N\fR
 \- Adds vendor:product ID for each device.
 
+\- Adds PCIe speed and lanes item (Linux only, and if PCIe device and detected).
+
 .TP
 .B \-xx \-r\fR
 \- Adds Packages info. See \fB\-Ixx\fR
@@ -1536,7 +1615,28 @@ are spinning, no rpm data will show.
 
 .TP
 .B \-xxx \-G\fR
-\- Adds, if present, PCI/USB class ID.
+\- Adds, if present, Device PCI/USB class ID.
+
+\- Adds to Device \fBserial:\fR number (if found).
+
+\- \fBXorg:\fR Adds to \fBScreen:\fR \fBs\-size:\fR and \fBs\-diag:\fR. (Screen 
+size data requires \fBxdpyinfo\fR). This is the X.org Screen dimensions, NOT the 
+Monitor size!
+
+\- Adds to Monitors (if detected) frequency (\fBhz:\fR).
+
+\- Adds to Monitors (if detected) size (\fBsize: 277x156mm (10.9x6.1")\fR). Note 
+that this is the real physical monitor size, not the Xorg Screen/Wayland Display 
+size, which can be quite different (1 Xorg Screen / Wayland Display can for 
+instance contain two or more monitors). 
+
+\- Adds to Monitors \fBmodes: min: max:\fR (if detected). These are the smallest 
+and largest monitor modes found, using an inexact method, so might not always be 
+right.
+
+\- Adds to Monitors \fBserial:\fR number (if detected).
+
+\- \fBWayland:\fR Adds to Monitors \fBscale:\fR (if detected).
 
 .TP
 .B \-xxx \-I\fR
@@ -1631,6 +1731,10 @@ non\-driver modules found, shows nothing. NOTE: just because it lists a module
 does NOT mean it is available in the system, it's just something the kernel 
 knows could possibly be used instead. 
 
+\- Adds PCIe generation, and, if different than running PCIe generation, speed 
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary 
+shown).
+
 .TP
 .B \-a \-C\fR
 \- Adds CPU family, model\-id, and stepping (replaces \fBrev\fR of \fB\-Cx\fR). 
@@ -1758,7 +1862,7 @@ differences shown, like \fBcores:, \fBmin/max:\fR, etc.
     bogomips: 267823
 .fi
 
-\- Adds CPU Vulnerabilities (bugs) as known by your current kernel. Lists by
+\- Adds CPU Vulnerabilities (bugs) as known by your current kernel. Lists by 
 \fBType: ... (status|mitigation): ....\fR for systems that support this feature 
 (Linux kernel 4.14 or newer, or patched older kernels).
 
@@ -1774,20 +1878,20 @@ Using \fBsmartctl\fR (requires doas/sudo/root privileges).
 
 \- Adds device kernel major:minor number (Linux only).
 
-\- Adds SMART report line: status, enabled/disabled, health, powered on, 
-cycles, and some error cases if out of range values. Note that for Pre\-fail
-items, it will show the VALUE and THRESHOLD numbers. It will also fall back 
-for unknown attributes that are or have been failing and print out the 
-Attribute name, value, threshold, and failing message. This way even for 
-unhandled Attribute names, you should get a solid report for full failure 
-cases. Other cases may show if inxi believes that the item may be approaching 
-failure. This is a guess so make sure to check the drive and smartctl full 
-output to verify before taking any further action.
+\- Adds SMART report line: status, enabled/disabled, health, powered on, cycles, 
+and some error cases if out of range values. Note that for Pre\-fail items, it 
+will show the VALUE and THRESHOLD numbers. It will also fall back for unknown 
+attributes that are or have been failing and print out the Attribute name, 
+value, threshold, and failing message. This way even for unhandled Attribute 
+names, you should get a solid report for full failure cases. Other cases may 
+show if inxi believes that the item may be approaching failure. This is a guess 
+so make sure to check the drive and smartctl full output to verify before taking 
+any further action.
 
-\- Adds, for USB or other external drives, actual model name/serial if
-available, and different from enclosure model/serial, and corrects block 
-sizes if necessary. Adds in drive temperature for some drives as well, 
-and other useful data.
+\- Adds, for USB or other external drives, actual model name/serial if 
+available, and different from enclosure model/serial, and corrects block sizes 
+if necessary. Adds in drive temperature for some drives as well, and other 
+useful data.
 
 .TP
 .B \-a \-E\fR (\fB\-\-bluetooth\fR)
@@ -1795,86 +1899,72 @@ and other useful data.
 Includes, if available, ACL MTU, SCO MTU, Link policy, Link mode, 
 and Service Classes.
 
+\- Adds PCIe generation, and, if different than running PCIe generation, speed 
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary 
+shown. Bluetooth PCIe rare). 
+
 .TP
 .B \-a \-G\fR
-Triggers a much more complete Screen/Monitor output on the 
-\fBDisplay:\fR line of \fB\-G\fR. Note that the 
-basic feature requires \fBxdpyinfo\fR, and the advanced per monitor 
-feature requires \fBxrandr\fR. 
-
-No support currently exists for \fBWayland\fR since we so far can find 
-no documentation or easy methods to extract this information from \fBWayland\fR 
-compositors. This unfortunate situation may change in the future, hopefully. 
-However, most \fBWayland\fR systems also come with \fBxwayland\fR, 
-which should supply the tools necessary for the time being.
-
-Further note that all references to \fBDisplays\fR, \fBScreens\fR, 
-and \fBMonitors\fR are referring to the \fBX\fR technical terms, 
-not normal consumer usage. 1 \fBDisplay\fR runs 1 or more 
-\fBScreens\fR, and a \fBScreen\fR runs 1 or more \fBMonitors\fR.
-
-\- Adds \fBDisplay\fR ID, for the Display running the Screen that runs the 
-Monitors.
-
-\- Adds total number of \fBScreens\fR listed for the current \fBDisplay\fR.
-
-\- Adds default \fBScreen\fR ID if Screen (not monitor!) total is greater than 
-1.
-
-\- Adds \fBScreen\fR line, which includes the ID (\fBScreen: 0\fR) then 
-\fBs-res\fR (Screen resolution), \fBs\-dpi\fR, \fBs\-size\fR and \fBs\-diag\fR. 
-Remember, this is an Xorg \fBScreen\fR, NOT a monitor screen, and the 
-information listed is about the Xorg Screen! It may at times be the same as a 
-single monitor system, but usually it's different in some ways.
-
-\- Adds \fBMonitor\fR ID(s). Monitors are a subset of a Screen, each of which
-can have one or more monitors. Normally a dual monitor setup is 2 monitors 
-run by one Xorg Screen. Each monitor has the following data, if available:
-
-\- \fBres:\fR resolution in pixels. This is the individual monitor's 
-reported pixel dimensions.
-
-\- \fBhz:\fR frequency in Herz, as reported to Xorg. Note that there have been
-and may continue to be bugs with how Xorg treats > 1 monitor frequencies.
-
-\- \fBdpi:\fR dpi (dots per inch), aka, ppi (pixels per inch). This is the 
-physical screen dpi, which is calculated using the screen dimensions and its
-resolution. 
+\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving 
+each \fBDevice\-x\fR (not including the current \fBloaded:\fR). If no 
+non\-driver modules found, shows nothing. NOTE: just because it lists a module 
+does NOT mean it is available in the system, it's just something the kernel 
+knows could possibly be used instead. 
 
-\- \fBsize:\fR size in mm (inches). Note that this is the real monitor size,
-not the Xorg Screen size, which can be quite different (1 Xorg Screen can 
-for instance contain two or more monitors). 
+\- Adds PCIe generation, and, if different than running PCIe generation, speed 
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary 
+shown).
 
-\- \fBdiag:\fR monitor screen diagonal in mm (inches). Note that this is 
-the real monitor size, not the Xorg full Screen diagonal size, which 
-can be quite different. 
+\- Adds to Monitors \fBbuilt:\fR, \fBgamma:\fR, \fBratio:\fR (if found).
 
-Sample (with both \fBxdpyinfo\fR and \fBxrandr\fR data available):
+X.org sample (with both \fBxdpyinfo\fR and \fBxrandr\fR data available):
 .nf
-\fBinxi \-aG
+\fBinxi \-aGz
 Graphics:
-  ....
-  Display: x11 server: X.Org 1.20.6 driver: loaded: modesetting 
-    display ID: :0.0 screens: 1 
-  Screen\-1: 0 s\-res: 2560x1024 s\-dpi: 96 s\-size: 677x271mm (26.7x10.7") 
-    s\-diag: 729mm (28.7") 
-  Monitor\-1: DVI\-I\-0 res: 1280x1024 hz: 60 dpi: 96 
-    size: 338x270mm (13.3x10.6") diag: 433mm (17") 
-  Monitor\-2: VGA\-0 res: 1280x1024 hz: 60 dpi: 86 
-    size: 376x301mm (14.8x11.9") diag: 482mm (19")
+  Device\-1: AMD Cedar [Radeon HD 5000/6000/7350/8350 Series] vendor: XFX Pine
+    driver: radeon v: kernel pcie: gen: 1 speed: 2.5 GT/s lanes: 16 link\-max:
+    gen: 2 speed: 5 GT/s ports: active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1
+    bus-ID: 0a:00.0 chip-ID: 1002:68f9 class\-ID: 0300
+  Display: x11 server: X.Org v: 1.20.13 compositor: xfwm v: 4.16.1 driver: X:
+    loaded: modesetting gpu: radeon display\-ID: :0.0 screens: 1
+  Screen\-1: 0 s\-res: 2560x1024 s\-dpi: 96 s\-size: 677x270mm (26.7x10.6")
+    s\-diag: 729mm (28.7")
+  Monitor\-1: DVI\-I\-1 pos: primary,left model: SyncMaster serial: <filter>
+    built: 2004 res: 1280x1024 hz: 60 dpi: 96 gamma: 1.2
+    size: 338x270mm (13.3x10.6") diag: 433mm (17") ratio: 5:4 modes:
+    max: 1280x1024 min: 720x400
+  Monitor\-2: VGA\-1 pos: right model: DELL 1908FP serial: <filter>
+    built: 2008 res: 1280x1024 hz: 60 dpi: 86 gamma: 1.4
+    size: 376x301mm (14.8x11.9") diag: 482mm (19") ratio: 5:4 modes:
+    max: 1280x1024 min: 720x400
  ....\fR
 .fi
-\- Adds, if present, possible \fBalternate:\fR kernel modules capable of 
-driving each \fBDevice\-x\fR (not including the current \fBloaded:\fR). If no 
-non\-driver modules found, shows nothing. NOTE: just because it lists a module 
-does NOT mean it is available in the system, it's just something the kernel 
-knows could possibly be used instead. 
-
+Wayland sample, with Sway/swaymsg:
+.nf
+\fBinxi \aGz
+Graphics:  
+  Device\-1: Advanced Micro Devices [AMD/ATI] Cedar [Radeon HD 
+    5000/6000/7350/8350 Series] vendor: XFX Pine
+    driver: radeon v: kernel pcie: gen: 2 speed: 5 GT/s lanes: 16 ports: 
+    active: DVI\-I\-1,VGA\-1 empty: HDMI\-A\-1 bus\-ID: 0a:00.0 chip\-ID: 1002:68f9 
+    class\-ID: 0300
+  Display: wayland server: Xwayland v: 21.1.4 compositor: sway v: 1.6.1 
+    driver: gpu: radeon d\-rect: 2560x1024
+  Monitor-1: DVI\-I\-1 pos: right model: SyncMaster serial: <filter> 
+    built: 2004 res: 1280x1024 hz: 60 dpi: 96 gamma: 1.2 
+    size: 340x270mm (13.4x10.6") diag: 434mm (17.1") ratio: 5:4 modes: 
+    max: 1280x1024 min: 720x400
+  Monitor\-2: VGA-1 pos: primary,left model: DELL 1908FP serial: <filter> 
+    res: 1280x1024 hz: 60 gamma: 1.4 dpi: 86 gamma: 1.4 
+    size: 380x300mm (15.0x11.8") diag: 484mm (19.1") ratio: 5:4 modes: 
+    max: 1280x1024 min: 720x400
+  Message: Wayland GBM/EGL data currently not available.
+.fi
 .TP
 .B \-a \-I\fR
-\- Adds Packages, totals, per package manager totals, and number of lib
-packages detected per package manager. Also adds detected package managers
-with 0 packages listed. Moves to \fBRepos\fR if \fB\-ra\fR.
+\- Adds Packages, totals, per package manager totals, and number of lib packages 
+detected per package manager. Also adds detected package managers with 0 
+packages listed. Moves to \fBRepos\fR if \fB\-ra\fR.
 
 .nf
 \fBinxi \-aI
@@ -1891,9 +1981,9 @@ which you need when using an unfamiliar machine.
 
 .TP
 .B \-a \-j\fR, \fB\-a \-P\fR [swap], \fB\-a \-P\fR [swap]
-\- Adds swappiness and vfs cache pressure, and a message to indicate 
-if the value is the default value or not (Linux only, and only if available). 
-If not the default value, shows default value as well, e.g. 
+\- Adds swappiness and vfs cache pressure, and a message to indicate if the 
+value is the default value or not (Linux only, and only if available). If not 
+the default value, shows default value as well, e.g. 
 
 For \fB\-P\fR per swap physical partition:
 
@@ -1907,19 +1997,23 @@ For \fB\-j\fR row 1 output:
 
 .TP
 .B \-a \-L\fR
-\- Expands Component report, shows size / maj-min of components and devices, 
-and mapped name for logical components. Puts each component/device on its own 
-line.
+\- Expands Component report, shows size / maj-min of components and devices, and 
+mapped name for logical components. Puts each component/device on its own line.
 
 \- Adds maj-min to LV and other devices.
 
 .TP
 .B \-a \-n\fR, \fB\-a \-N\fR, \fB\-a \-i\fR
-\- Adds, if present, possible \fBalternate:\fR kernel modules capable of 
-driving each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no 
+\- Adds, if present, possible \fBalternate:\fR kernel modules capable of driving 
+each \fBDevice\-x\fR (not including the current \fBdriver:\fR). If no 
 non\-driver modules found, shows nothing. NOTE: just because it lists a module 
 does NOT mean it is available in the system, it's just something the kernel 
 knows could possibly be used instead. 
+
+\- Adds PCIe generation, and, if different than running PCIe generation, speed 
+or lanes, \fBlink\-max: gen: speed: lanes:\fR (only items different from primary 
+shown).
+
 .TP
 .B \-a \-o\fR
 \- Adds device kernel major:minor number (Linux only).
@@ -1962,35 +2056,35 @@ varies by OS type.
 
 .TP
 .B \-\-alt 40\fR
-Bypass \fBPerl\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBPerl\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl, 
+Wget, Fetch, (OpenBSD only) ftp.
 
 .TP
 .B \-\-alt 41\fR
-Bypass \fBCurl\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBCurl\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl, 
+Wget, Fetch, (OpenBSD only) ftp.
 
 .TP
 .B \-\-alt 42\fR
-Bypass \fBFetch\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, (OpenBSD only) ftp.
+Bypass \fBFetch\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl, 
+Wget, Fetch, (OpenBSD only) ftp.
 
 .TP
 .B \-\-alt 43\fR
-Bypass \fBWget\fR as a downloader option. Priority is: Perl (HTTP::Tiny),
-Curl, Wget, Fetch, OpenBSD only: ftp
+Bypass \fBWget\fR as a downloader option. Priority is: Perl (HTTP::Tiny), Curl, 
+Wget, Fetch, OpenBSD only: ftp
 
 .TP
 .B \-\-alt 44\fR
-Bypass \fBCurl\fR, \fBFetch\fR, and \fBWget\fR as downloader options. This
+Bypass \fBCurl\fR, \fBFetch\fR, and \fBWget\fR as downloader options. This 
 basically forces the downloader selection to use \fBPerl 5.x\fR 
-\fBHTTP::Tiny\fR, which is generally slower than \fBCurl\fR or \fBWget\fR but 
-it may help bypass issues with downloading.
+\fBHTTP::Tiny\fR, which is generally slower than \fBCurl\fR or \fBWget\fR but it 
+may help bypass issues with downloading.
 
 .TP
 .B \-\-bt\-tool [bt\-adapter|hciconfig|rfkill]\fR
-Force the use of the given tool for bluetooth report (\fB\-E\fR). 
-\fBrfkill\fR does not support mac address data.
+Force the use of the given tool for bluetooth report (\fB\-E\fR). \fBrfkill\fR 
+does not support mac address data.
 
 .TP
 .B \-\-dig\fR
@@ -1999,15 +2093,15 @@ dig. Restores default behavior for WAN IP, which is use dig if present.
 
 .TP
 .B \-\-display [:<integer>]\fR
-Will try to get display data out of X (does not usually work as root user).
-Default gets display info from display \fB:0\fR. If you use the format
-\fB\-\-display :1\fR then it would get it from display \fB1\fR instead,
-or any display you specify.
+Will try to get display data out of X (does not usually work as root user). 
+Default gets display info from display \fB:0\fR. If you use the format 
+\fB\-\-display :1\fR then it would get it from display \fB1\fR instead, or any 
+display you specify.
 
 Note that in some cases, \fB\-\-display\fR will cause inxi to hang endlessly 
 when running the option in console with Intel graphics. The situation regarding 
-other free drivers such as nouveau/ATI is currently unknown. It may be that 
-this is a bug with the Intel graphics driver \- more information is required.
+other free drivers such as nouveau/ATI is currently unknown. It may be that this 
+is a bug with the Intel graphics driver \- more information is required.
 
 You can test this easily by running the following command out of X/display 
 server: \fBglxinfo \-display :0\fR
@@ -2016,16 +2110,16 @@ If it hangs, \fB\-\-display\fR will not work.
 
 .TP
 .B \-\-dmidecode\fR
-Shortcut, legacy. See \fB\-\-force dmidecode\fR.
+Shortcut. See \fB\-\-force dmidecode\fR.
 
 .TP
 .B \-\-downloader [curl|fetch|perl|wget]\fR
 Force inxi to use Curl, Fetch, Perl, or Wget for downloads.
 
 .TP
-.B \-\-force [colors|dmidecode|hddtemp|lsusb|pkg|usb-sys|vmstat|wmctrl]\fR 
-Various force options to allow users to override defaults. Values be given
-as a comma separated list:
+.B \-\-force [colors|dmidecode|hddtemp|lsusb|pkg|usb-sys|wayland|vmstat|wmctrl]\fR 
+Various force options to allow users to override defaults. Values be given as a 
+comma separated list:
 
 \fBinxi \-MJ --force dmidecode,lsusb\fR 
 
@@ -2037,8 +2131,8 @@ redirected output.
 
 \- \fBhddtemp\fR \- Force use of hddtemp instead of /sys temp data for disks.
 
-\- \fBlsusb\fR \- Forces the USB data generator to use \fBlsusb\fR as 
-data source (default). Overrides \fBUSB_SYS\fR in user configuration file(s).
+\- \fBlsusb\fR \- Forces the USB data generator to use \fBlsusb\fR as data 
+source (default). Overrides \fBUSB_SYS\fR in user configuration file(s).
 
 \- \fBpkg\fR \- Force override of disabled package counts. Known package 
 managers with non\-resolvable issues: 
@@ -2048,26 +2142,29 @@ rpm: Due to up to 30 seconds delays executing
 \fBrpm \-qa \-\-nodigest \-\-nosignature\fR
 .fi
 on older hardware (and over 1 second on new hardware with some rpm versions) 
-package counts are disabled by default because of the unacceptable slowdowns 
-to execute a simple package list command. 
+package counts are disabled by default because of the unacceptable slowdowns to 
+execute a simple package list command. 
 
-\- \fBusb-sys\fR \- Forces the USB data generator to use \fB/sys\fR as 
-data source instead of \fBlsusb\fR (Linux only).
+\- \fBusb-sys\fR \- Forces the USB data generator to use \fB/sys\fR as data 
+source instead of \fBlsusb\fR (Linux only).
 
 \- \fBvmstat\fR \- Forces use of vmstat for memory data.
 
-\- \fBwmctrl\fR \- Force \fBSystem\fR item \fBwm\fR to use \fBwmctrl\fR 
-as data source, override default \fBps\fR source.
+\- \fBwayland\fR \- Forces use of Wayland, disables x tools glxinfo, xrandr, 
+xdpyinfo.
+
+\- \fBwmctrl\fR \- Force \fBSystem\fR item \fBwm\fR to use \fBwmctrl\fR as data 
+source, override default \fBps\fR source.
 
 .TP
 .B \-\-hddtemp\fR
-Shortcut, legacy. See \fB\-\-force hddtemp\fR.
+Shortcut. See \fB\-\-force hddtemp\fR.
 
 .TP
 .B \-\-html\-wan\fR
 Temporary override of \fBNO_HTML_WAN\fR configuration item. Only use to test 
-w/wo HTML downloaders for WAN IP. Restores default behavior for WAN IP, which 
-is use HTML downloader if present and if dig failed.
+w/wo HTML downloaders for WAN IP. Restores default behavior for WAN IP, which is 
+use HTML downloader if present and if dig failed.
 
 .TP
 .B \-\-man\fR
@@ -2210,11 +2307,11 @@ believes it is running in an IRC client.
 
 .TP
 .B \-\-usb\-sys\fR
-Shortcut, legacy. See \fB\-\-force usb\-sys\fR
+Shortcut. See \fB\-\-force usb\-sys\fR
 
 .TP
 .B \-\-usb\-tool\fR
-Shortcut, legacy. See \fB\-\-force lsusb\fR
+Shortcut. See \fB\-\-force lsusb\fR
 
 .TP
 .B \-\-wan\-ip\-url [URL]\fR
@@ -2229,8 +2326,12 @@ Same as configuration value (example):
 \fBWAN_IP_URL='https://mysite.com/ip.php'\fR
 
 .TP
+.B \-\-wayland\fR, \fB\-\-wl\fR
+Shortcut. See \fB\-\-force wayland\fR.
+
+.TP
 .B \-\-wm\fR
-Shortcut, legacy. See \fB\-\-force wmctl\fR.
+Shortcut. See \fB\-\-force wmctl\fR.
 
 .SH DEBUGGING OPTIONS
 .TP