--- FunctionBar.c.orig	2010-01-26 03:50:57.000000000 +0800

+++ FunctionBar.c	2010-01-26 03:51:50.000000000 +0800

@@ -52,14 +52,12 @@

       this->functions = malloc(sizeof(char*) * 15);

       this->keys = malloc(sizeof(char*) * 15);

       this->events = malloc(sizeof(int) * 15);

-      int i = 0;

-      while (i < 15 && functions[i]) {

+      for (int i = 0; i < 15 && functions[i]; i++) {

          this->functions[i] = String_copy(functions[i]);

          this->keys[i] = String_copy(keys[i]);

          this->events[i] = events[i];

-         i++;

+         this->size = i;

       }

-      this->size = i;

    } else {

       this->staticData = true;

       this->functions = functions ? functions : FunctionBar_FLabels;

--- ./ProcessList.c.orig	2010-11-26 18:50:25.000000000 +0200

+++ ./ProcessList.c	2011-08-11 13:07:08.000000000 +0300

@@ -32,6 +32,19 @@

 #include "debug.h"

 #include <assert.h>

+#ifndef PAGE_SIZE

+#define PAGE_SIZE sysconf(_SC_PAGESIZE)

+#endif

+

+#ifdef __FreeBSD__

+#define KB 1024

+#define SYSCTLBYNAME(name, var, len) sysctlbyname(name, &(var), &(len), NULL, 0)

+#include <kvm.h>

+#include <paths.h>

+#include <fcntl.h>

+#include <sys/sysctl.h>

+#endif

+

 /*{

 #ifndef PROCDIR

@@ -665,15 +678,24 @@

 void ProcessList_scan(ProcessList* this) {

    unsigned long long int usertime, nicetime, systemtime, systemalltime, idlealltime, idletime, totaltime, virtalltime;

+   #ifndef __FreeBSD__

    unsigned long long int swapFree = 0;

+   #endif

+   int cpus = this->cpuCount;

+   FILE* file = NULL;

-   FILE* file = fopen(PROCMEMINFOFILE, "r");

+   #ifdef __FreeBSD__

+   kvm_t *kd = NULL;

+   struct kvm_swap kvmswapinfo[1];

+   size_t len = 0;

+   #endif

+

+   #ifndef __FreeBSD__

+   file = fopen(PROCMEMINFOFILE, "r");

    assert(file != NULL);

-   int cpus = this->cpuCount;

    {

       char buffer[128];

       while (fgets(buffer, 128, file)) {

-   

          switch (buffer[0]) {

          case 'M':

             if (String_startsWith(buffer, "MemTotal:"))

@@ -700,10 +722,35 @@

          }

       }

    }

+   fclose(file);

+   #endif

+   #ifdef __FreeBSD__

+   len = sizeof(this->totalMem);

+   SYSCTLBYNAME("vm.stats.vm.v_page_count", this->totalMem, len);

+   this->totalMem *= PAGE_SIZE / KB;

+   len = sizeof(this->cachedMem);

+   SYSCTLBYNAME("vm.stats.vm.v_cache_count", this->cachedMem, len);

+   this->cachedMem *= PAGE_SIZE / KB;

+   len = sizeof(this->buffersMem);

+   SYSCTLBYNAME("vfs.bufspace", this->buffersMem, len);

+   this->buffersMem /= KB;

+   len = sizeof(this->usedMem);

+   SYSCTLBYNAME("vm.stats.vm.v_active_count", this->usedMem, len);

+   this->usedMem = this->usedMem * PAGE_SIZE / KB + this->cachedMem + this->buffersMem;

+   this->freeMem = this->totalMem - this->usedMem;

+   kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);

+   assert(kd != NULL);

+   kvm_getswapinfo(kd, kvmswapinfo, 1, 0);

+   this->totalSwap = kvmswapinfo[0].ksw_total * PAGE_SIZE / KB;

+   this->usedSwap = kvmswapinfo[0].ksw_used * PAGE_SIZE / KB;

+   kvm_close(kd);

+   #endif

+

+   #ifndef __FreeBSD__

    this->usedMem = this->totalMem - this->freeMem;

    this->usedSwap = this->totalSwap - swapFree;

-   fclose(file);

+   #endif

    file = fopen(PROCSTATFILE, "r");

    assert(file != NULL);

--- RichString.c.orig

+++ RichString.c

@@ -13,7 +13,11 @@

 #include "debug.h"

 #include <assert.h>

 #ifdef HAVE_LIBNCURSESW

+#    ifdef HAVE_NCURSESW_CURSES_H

 #include <ncursesw/curses.h>

+#    else

+#include <curses.h>

+#    endif

 #else

 #include <curses.h>

 #endif

--- RichString.h.orig

+++ RichString.h

@@ -16,7 +16,11 @@

 #include "debug.h"

 #include <assert.h>

 #ifdef HAVE_LIBNCURSESW

+#    ifdef HAVE_NCURSESW_CURSES_H

 #include <ncursesw/curses.h>

+#    else

+#include <curses.h>

+#    endif

 #else

 #include <curses.h>

 #endif

--- ./configure.ac.orig	2010-11-23 17:56:32.000000000 +0200

+++ ./configure.ac	2011-08-11 12:50:44.000000000 +0300

@@ -18,6 +18,7 @@

 # Checks for libraries.

 AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])

+AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])

 # Checks for header files.

 AC_HEADER_DIRENT

@@ -86,7 +87,7 @@

 AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="no")

 if test "x$enable_unicode" = xyes; then

    AC_CHECK_LIB([ncursesw], [refresh], [], [missing_libraries="$missing_libraries libncursesw"])

-   AC_CHECK_HEADERS([ncursesw/curses.h],[:],[missing_headers="$missing_headers $ac_header"])

+   AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"])

 else

    AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"])

    AC_CHECK_HEADERS([curses.h],[:],[missing_headers="$missing_headers $ac_header"])