Fix off-by-one error in PROCESSOR display

AffinityPanel.c

@@ -33,7 +33,7 @@ Panel* AffinityPanel_new(ProcessList* pl, unsigned long mask) {
    Panel_setHeader(this, "Use CPUs:");
    for (int i = 0; i < pl->cpuCount; i++) {
       char number[10];
-      snprintf(number, 9, "%d", ProcessList_cpuId(pl, i) + 1);
+      snprintf(number, 9, "%d", ProcessList_cpuId(pl, i));
       Panel_add(this, (Object*) CheckItem_new(String_copy(number), NULL, mask & (1 << i)));
    }
    return this;

CPUMeter.c

@@ -33,7 +33,7 @@ static void CPUMeter_init(Meter* this) {
    int cpu = this->param;
    if (this->pl->cpuCount > 1) {
       char caption[10];
-      sprintf(caption, "%-3d", ProcessList_cpuId(this->pl, cpu));
+      sprintf(caption, "%-3d", ProcessList_cpuId(this->pl, cpu - 1));
       Meter_setCaption(this, caption);
    }
    if (this->param == 0)

ProcessList.c

@@ -55,7 +55,7 @@ in the source distribution for its full text.
 #endif
 
 #ifndef ProcessList_cpuId
-#define ProcessList_cpuId(pl, cpu) ((pl)->countCPUsFromZero ? (cpu)-1 : (cpu))
+#define ProcessList_cpuId(pl, cpu) ((pl)->countCPUsFromZero ? (cpu) : (cpu)+1)
 #endif
 }*/
 

ProcessList.h

@@ -57,7 +57,7 @@ in the source distribution for its full text.
 #endif
 
 #ifndef ProcessList_cpuId
-#define ProcessList_cpuId(pl, cpu) ((pl)->countCPUsFromZero ? (cpu)-1 : (cpu))
+#define ProcessList_cpuId(pl, cpu) ((pl)->countCPUsFromZero ? (cpu) : (cpu)+1)
 #endif
 
 

htop.c

@@ -778,7 +778,7 @@ int main(int argc, char** argv) {
             if (!ok)
                beep();
          }
-         ((Object*)affinityPanel)->delete((Object*)affinityPanel);
+         Panel_delete((Object*)affinityPanel);
          ProcessList_printHeader(pl, Panel_getHeader(panel));
          refreshTimeout = 0;
          break;