bin/xsession: Add column headings to sessions list

1 files changed, 11 insertions, 6 deletions

diff --git a/bin/xsession b/bin/xsession
index 9b985f6..4166354 100755
--- a/bin/xsession
+++ b/bin/xsession
@@ -3,16 +3,21 @@
 set -eu
 
 actions_icons='/usr/share/icons/gnome/16x16/actions'
-awk_who_script='
+awk_who='
 	BEGIN {
 		display_ere = " [(]" display "[)]$";
 		printed = 0;
 	}
-	{
+	NR == 1 {
+		headings = $0;
+	}
+	NR > 1 {
 		if (!match($0, display_ere)) {
 			if (!printed) {
 				print("\n\nThe following sessions will be " \
 					"hung up:\n");
+				print("<tt><small>    " headings \
+					"</small></tt>");
 				printed = 1;
 			}
 			print("<tt><small>    " $0 "</small></tt>");
@@ -35,8 +40,8 @@ do_shutdown()
 {
 	zenity --question --title='Shut Down' \
 		--window-icon="${actions_icons}/system-shutdown.png" \
-		--text="Are you sure you want to shut down this system?$(who | \
-			awk -v "display=${DISPLAY}" "${awk_who_script}")" \
+		--text="Are you sure you want to shut down this system?$(\
+			who -H | awk -v "display=${DISPLAY}" "${awk_who}")" \
 		--ok-label='Shut Down' --cancel-label='Cancel' && \
 		sudo shutdown -hP now
 
@@ -47,8 +52,8 @@ do_reboot()
 {
 	zenity --question --title='Reboot' \
 		--window-icon="${actions_icons}/system-shutdown.png" \
-		--text="Are you sure you want to reboot this system?$(who | \
-			awk -v "display=${DISPLAY}" "${awk_who_script}")" \
+		--text="Are you sure you want to reboot this system?$(\
+			who -H | awk -v "display=${DISPLAY}" "${awk_who}")" \
 		--ok-label='Reboot' --cancel-label='Cancel' && \
 		sudo reboot