manipulator: show social activities in job column

plugins/manipulator.cpp

@@ -15,8 +15,9 @@
 #include <set>
 #include <algorithm>
 #include <tuple>
-
 #include <VTableInterpose.h>
+
+#include "df/activity_event.h"
 #include "df/world.h"
 #include "df/ui.h"
 #include "df/graphic.h"
@@ -289,7 +290,8 @@ struct UnitInfo
     int active_index;
     string squad_effective_name;
     string squad_info;
-    string job_info;
+    string job_desc;
+    enum { IDLE, SOCIAL, JOB } job_mode;
     bool selected;
     struct {
         // Used for custom professions, 1-indexed
@@ -363,16 +365,18 @@ bool sortBySquad (const UnitInfo *d1, const UnitInfo *d2)
 
 bool sortByJob (const UnitInfo *d1, const UnitInfo *d2)
 {
-    bool gt = false;
+    if (d1->job_mode != d2->job_mode)
+    {
+        if (descending)
+            return int(d1->job_mode) < int(d2->job_mode);
+        else
+            return int(d1->job_mode) > int(d2->job_mode);
+    }
 
-    if (d1->job_info == "Idle")
+    if (descending)
-        gt = false;
+        return d1->job_desc > d2->job_desc;
-    else if (d2->job_info == "Idle")
-        gt = true;
     else
-        gt = (d1->job_info > d2->job_info);
+        return d1->job_desc < d2->job_desc;
-
-    return descending ? gt : !gt;
 }
 
 bool sortByStress (const UnitInfo *d1, const UnitInfo *d2)
@@ -1234,9 +1238,18 @@ void viewscreen_unitlaborsst::refreshNames()
         cur->profession = Units::getProfessionName(unit);
 
         if (unit->job.current_job == NULL) {
-            cur->job_info = "Idle";
+            df::activity_event *event = Units::getMainSocialEvent(unit);
+            if (event) {
+                event->getName(unit->id, &cur->job_desc);
+                cur->job_mode = UnitInfo::SOCIAL;
+            }
+            else {
+                cur->job_desc = "Idle";
+                cur->job_mode = UnitInfo::IDLE;
+            }
         } else {
-            cur->job_info = DFHack::Job::getName(unit->job.current_job);
+            cur->job_desc = DFHack::Job::getName(unit->job.current_job);
+            cur->job_mode = UnitInfo::JOB;
         }
         if (unit->military.squad_id > -1) {
             cur->squad_effective_name = Units::getSquadName(unit);
@@ -1283,7 +1296,7 @@ void viewscreen_unitlaborsst::calcSize()
         if (detail_mode == DETAIL_MODE_SQUAD) {
             detail_cmp = units[i]->squad_info.size();
         } else if (detail_mode == DETAIL_MODE_JOB) {
-            detail_cmp = units[i]->job_info.size();
+            detail_cmp = units[i]->job_desc.size();
         } else {
             detail_cmp = units[i]->profession.size();
         }
@@ -1954,11 +1967,13 @@ void viewscreen_unitlaborsst::render()
             fg = 11;
             detail_str = cur->squad_info;
         } else if (detail_mode == DETAIL_MODE_JOB) {
-            detail_str = cur->job_info;
+            detail_str = cur->job_desc;
-            if (detail_str == "Idle") {
+            if (cur->job_mode == UnitInfo::IDLE) {
-                fg = 14;
+                fg = COLOR_YELLOW;
+            } else if (cur->job_mode == UnitInfo::SOCIAL) {
+                fg = COLOR_LIGHTGREEN;
             } else {
-                fg = 10;
+                fg = COLOR_LIGHTCYAN;
             }
         } else {
             fg = cur->color;