Merge pull request #2726 from fr500/master

New driver implementation for the WIMP UI

Makefile.common

@@ -382,12 +382,17 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
       HAVE_MATERIALUI = 1
    endif
 
+   ifeq ($(HAVE_WIMP),)
+      HAVE_WIMP = 1
+   endif
+
    ifeq ($(HAVE_XMB),)
       HAVE_XMB = 1
    endif
 else
    HAVE_ZARCH = 0
    HAVE_MATERIALUI  = 0
+   HAVE_WIMP = 0
    HAVE_XMB   = 0
 endif
 
@@ -399,6 +404,11 @@ ifeq ($(HAVE_MATERIALUI), 1)
    OBJ += menu/drivers/materialui.o
    DEFINES += -DHAVE_MATERIALUI
 endif
+ifeq ($(HAVE_WIMP), 1)
+   OBJ += deps/zahnrad/zahnrad.o
+   OBJ += menu/drivers/wimp.o
+   DEFINES += -DHAVE_WIMP
+endif
 ifeq ($(HAVE_ZARCH), 1)
    OBJ += menu/drivers/zarch.o
    DEFINES += -DHAVE_ZARCH

deps/zahnrad/CONTRIBUTING.md

@@ -0,0 +1,43 @@
+CONTRIBUTING
+============
+## Submitting changes
+Please send a GitHub Pull Request with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)). 
+
+## Features
+If you have an idea for new features just [open an issue](https://github.com/vurtun/zahnrad/issues) with your suggestion.
+  * Find and correct spelling mistakes
+  * Add (insert your favorite platform or render backend here) demo implementation (some possibilities: DirectX 9/DirectX 10/DirectX 11 and win32 with OpenGL)
+  * Add clipboard user callbacks back into all demos
+  * Add additional widgets [some possible widgets](http://doc.qt.io/qt-5/widget-classes.html#the-widget-classes)
+  * Add support for multiple pointers for touch input devices (probably requires to rewrite mouse handling in `struct zr_input`)
+  * Extend xlib demo to support image drawing with arbitrary image width and height
+  * Change cursor in `zr_widget_edit_box` and `zr_widget_edit_field` to thin standard cursor version used in editors
+  * Extend piemenu to support submenus (another ring around the first ring or something like [this:](http://gdj.gdj.netdna-cdn.com/wp-content/uploads/2013/02/ui+concepts+13.gif)) and turn it into a default library widget.
+  * Add label describing the currently active piemenu entry
+  * Maybe write a piemenu text only version for platforms that do not want or can use images 
+  * Rewrite the chart API to support a better range of charts (maybe take notes from Javascript chart frameworks) 
+  * Create an API to allow scaling between groups (maybe extend and convert the demo example)
+  * Add multiple Tab support (maybe use `zr_group` and add a header)  
+  * Come up with a better way to provide and create widget and window styles
+  * Add tables with scaleable column width
+  * Extend context to not only support overlapping windows but tiled windows as well
+
+## Bugs
+  * Seperator widget is currently bugged and does not work as intended
+  * Text handling is still a little bit janky and probably needs to be further tested and polished
+  * `zr_edit_buffer` with multiline flag is bugged for '\n', need to differentiate between visible and non-visible characters
+
+## Coding conventions                         
+  * Only use C89 (ANSI C)
+  * Do not use any compiler specific extensions
+  * For indent use four spaces
+  * Do not typedef structs, unions and enums
+  * Variable, object and function names should always be lowercase and use underscores instead of camel case
+  * Whitespace after for, while, if, do and switch
+  * Always use parentheses if you use the sizeof operator (e.g: sizeof(struct zr_context) and not sizeof struct zr_context)
+  * Beginning braces on the new line for functions and on the same line otherwise.
+  * If function becomes to big either a.) create a subblock inside the function and comment or b.) write a functional function 
+  * Only use fixed size types (zr_uint, zr_size, ...) if you really need to and use basic types otherwise
+  * Do not include any header files in either zahnrad.h or zahnrad.c
+  * Do not add dependencies rather write your own version if possible
+  * Write correct commit messages: (http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) 

deps/zahnrad/LICENSE

@@ -0,0 +1,17 @@
+Copyright (c) 2016 Micha Mettke
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1.  The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+2.  Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+3.  This notice may not be removed or altered from any source distribution.

deps/zahnrad/Readme.md

@@ -0,0 +1,89 @@
+# Zahnrad
+[![Coverity Status](https://scan.coverity.com/projects/5863/badge.svg)](https://scan.coverity.com/projects/5863)
+
+This is a minimal state immediate mode graphical user interface toolkit
+written in ANSI C and licensed under zlib. It was designed as a simple embeddable user interface for
+application and does not have any direct dependencies,
+a default renderbackend or OS window and input handling but instead provides a very modular
+library approach by using simple input state for input and draw
+commands describing primitive shapes as output. So instead of providing a
+layered library that tries to abstract over a number of platform and
+render backends it only focuses on the actual UI.
+
+## Features
+- Immediate mode graphical user interface toolkit
+- Written in C89 (ANSI C)
+- Small codebase (~9kLOC)
+- Focus on portability, efficiency and simplicity
+- No dependencies (not even the standard library)
+- No global or hidden state
+- Configurable style and colors
+- UTF-8 support
+
+## Optional
+- Vertex buffer output 
+- Font handling
+
+## Building
+The library is self-contained within four different files that only have to be
+copied and compiled into your application. Files zahnrad.c and zahnrad.h make up
+the core of the library, while stb_rect_pack.h and stb_truetype.h are
+for a optional font handling implementation and can be removed if not needed.
+- zahnrad.c
+- zahnrad.h
+- stb_rect_pack.h (optional)
+- stb_truetype.h (optional)
+
+There are no dependencies or a particular building process required. You just have
+to compile the .c file and #include zahnrad.h into your project. To actually
+run you have to provide the input state, configuration style and memory
+for draw commands to the library. After the GUI was executed all draw commands
+have to be either executed or optionally converted into a vertex buffer to
+draw the GUI.
+
+## Gallery
+![screenshot](https://cloud.githubusercontent.com/assets/8057201/11761525/ae06f0ca-a0c6-11e5-819d-5610b25f6ef4.gif)
+![demo](https://cloud.githubusercontent.com/assets/8057201/11282359/3325e3c6-8eff-11e5-86cb-cf02b0596087.png)
+![node](https://cloud.githubusercontent.com/assets/8057201/9976995/e81ac04a-5ef7-11e5-872b-acd54fbeee03.gif)
+![transparency](https://cloud.githubusercontent.com/assets/8057201/12779619/2a20d72c-ca69-11e5-95fe-4edecf820d5c.png)
+
+## Example
+```c
+/* init gui state */
+struct zr_context ctx;
+zr_init_fixed(&ctx, calloc(1, MAX_MEMORY), MAX_MEMORY, &font);
+
+enum {EASY, HARD};
+int op = EASY;
+float value = 0.6f;
+int i =  20;
+
+struct zr_layout layout;
+zr_begin(&ctx, &layout, "Show", zr_rect(50, 50, 220, 220),
+    ZR_WINDOW_BORDER|ZR_WINDOW_MOVEABLE|ZR_WINDOW_CLOSEABLE);
+{
+    /* fixed widget pixel width */
+    zr_layout_row_static(&ctx, 30, 80, 1);
+    if (zr_button_text(&ctx, "button", ZR_BUTTON_DEFAULT)) {
+        /* event handling */
+    }
+
+    /* fixed widget window ratio width */
+    zr_layout_row_dynamic(&ctx, 30, 2);
+    if (zr_option(&ctx, "easy", op == EASY)) op = EASY;
+    if (zr_option(&ctx, "hard", op == HARD)) op = HARD;
+
+    /* custom widget pixel width */
+    zr_layout_row_begin(&ctx, ZR_STATIC, 30, 2);
+    {
+        zr_layout_row_push(&ctx, 50);
+        zr_label(&ctx, "Volume:", ZR_TEXT_LEFT);
+        zr_layout_row_push(&ctx, 110);
+        zr_slider_float(&ctx, 0, &value, 1.0f, 0.1f);
+    }
+    zr_layout_row_end(&ctx);
+}
+zr_end(ctx);
+```
+![example](https://cloud.githubusercontent.com/assets/8057201/10187981/584ecd68-675c-11e5-897c-822ef534a876.png)
+

deps/zahnrad/stb_rect_pack.h

@@ -0,0 +1,545 @@
+/* stb_rect_pack.h - v0.05 - public domain - rectangle packing */
+/* Sean Barrett 2014 */
+/* */
+/* Useful for e.g. packing rectangular textures into an atlas. */
+/* Does not do rotation. */
+/* */
+/* Not necessarily the awesomest packing method, but better than */
+/* the totally naive one in stb_truetype (which is primarily what */
+/* this is meant to replace). */
+/* */
+/* Has only had a few tests run, may have issues. */
+/* */
+/* More docs to come. */
+/* */
+/* No memory allocations; uses qsort() and assert() from stdlib. */
+/* */
+/* This library currently uses the Skyline Bottom-Left algorithm. */
+/* */
+/* Please note: better rectangle packers are welcome! Please */
+/* implement them to the same API, but with a different init */
+/* function. */
+/* */
+/* Version history: */
+/* */
+/*     0.05:  added STBRP_ASSERT to allow replacing assert */
+/*     0.04:  fixed minor bug in STBRP_LARGE_RECTS support */
+/*     0.01:  initial release */
+
+/*//////////////////////////////////////////////////////////////////////////// */
+/* */
+/*       INCLUDE SECTION */
+#ifndef STB_INCLUDE_STB_RECT_PACK_H
+#define STB_INCLUDE_STB_RECT_PACK_H
+
+#define STB_RECT_PACK_VERSION  1
+
+#ifdef STBRP_STATIC
+#define STBRP_DEF static
+#else
+#define STBRP_DEF extern
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct stbrp_context stbrp_context;
+typedef struct stbrp_node    stbrp_node;
+typedef struct stbrp_rect    stbrp_rect;
+
+#ifdef STBRP_LARGE_RECTS
+typedef int            stbrp_coord;
+#else
+typedef unsigned short stbrp_coord;
+#endif
+
+STBRP_DEF void stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
+/* Assign packed locations to rectangles. The rectangles are of type */
+/* 'stbrp_rect' defined below, stored in the array 'rects', and there */
+/* are 'num_rects' many of them. */
+/* */
+/* Rectangles which are successfully packed have the 'was_packed' flag */
+/* set to a non-zero value and 'x' and 'y' store the minimum location */
+/* on each axis (i.e. bottom-left in cartesian coordinates, top-left */
+/* if you imagine y increasing downwards). Rectangles which do not fit */
+/* have the 'was_packed' flag set to 0. */
+/* */
+/* You should not try to access the 'rects' array from another thread */
+/* while this function is running, as the function temporarily reorders */
+/* the array while it executes. */
+/* */
+/* To pack into another rectangle, you need to call stbrp_init_target */
+/* again. To continue packing into the same rectangle, you can call */
+/* this function again. Calling this multiple times with multiple rect */
+/* arrays will probably produce worse packing results than calling it */
+/* a single time with the full rectangle array, but the option is */
+/* available. */
+
+struct stbrp_rect
+{
+   /* reserved for your use: */
+   int            id;
+
+   /* input: */
+   stbrp_coord    w, h;
+
+   /* output: */
+   stbrp_coord    x, y;
+   int            was_packed;  /* non-zero if valid packing */
+
+}; /* 16 bytes, nominally */
+
+
+STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
+/* Initialize a rectangle packer to: */
+/*    pack a rectangle that is 'width' by 'height' in dimensions */
+/*    using temporary storage provided by the array 'nodes', which is 'num_nodes' long */
+/* */
+/* You must call this function every time you start packing into a new target. */
+/* */
+/* There is no "shutdown" function. The 'nodes' memory must stay valid for */
+/* the following stbrp_pack_rects() call (or calls), but can be freed after */
+/* the call (or calls) finish. */
+/* */
+/* Note: to guarantee best results, either: */
+/*       1. make sure 'num_nodes' >= 'width' */
+/*   or  2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1' */
+/* */
+/* If you don't do either of the above things, widths will be quantized to multiples */
+/* of small integers to guarantee the algorithm doesn't run out of temporary storage. */
+/* */
+/* If you do #2, then the non-quantized algorithm will be used, but the algorithm */
+/* may run out of temporary storage and be unable to pack some rectangles. */
+
+STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
+/* Optionally call this function after init but before doing any packing to */
+/* change the handling of the out-of-temp-memory scenario, described above. */
+/* If you call init again, this will be reset to the default (false). */
+
+
+STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
+/* Optionally select which packing heuristic the library should use. Different */
+/* heuristics will produce better/worse results for different data sets. */
+/* If you call init again, this will be reset to the default. */
+
+enum
+{
+   STBRP_HEURISTIC_Skyline_default=0,
+   STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
+   STBRP_HEURISTIC_Skyline_BF_sortHeight
+};
+
+
+/*//////////////////////////////////////////////////////////////////////////// */
+/* */
+/* the details of the following structures don't matter to you, but they must */
+/* be visible so you can handle the memory allocations for them */
+
+struct stbrp_node
+{
+   stbrp_coord  x,y;
+   stbrp_node  *next;
+};
+
+struct stbrp_context
+{
+   int width;
+   int height;
+   int align;
+   int init_mode;
+   int heuristic;
+   int num_nodes;
+   stbrp_node *active_head;
+   stbrp_node *free_head;
+   stbrp_node extra[2]; /* we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2' */
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+/*//////////////////////////////////////////////////////////////////////////// */
+/* */
+/*     IMPLEMENTATION SECTION */
+/* */
+
+#ifdef STB_RECT_PACK_IMPLEMENTATION
+#include <stdlib.h>
+
+#ifndef STBRP_ASSERT
+#include <assert.h>
+#define STBRP_ASSERT assert
+#endif
+
+enum
+{
+   STBRP__INIT_skyline = 1
+};
+
+STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
+{
+   switch (context->init_mode) {
+      case STBRP__INIT_skyline:
+         STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
+         context->heuristic = heuristic;
+         break;
+      default:
+         STBRP_ASSERT(0);
+   }
+}
+
+STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
+{
+   if (allow_out_of_mem)
+      /* if it's ok to run out of memory, then don't bother aligning them; */
+      /* this gives better packing, but may fail due to OOM (even though */
+      /* the rectangles easily fit). @TODO a smarter approach would be to only */
+      /* quantize once we've hit OOM, then we could get rid of this parameter. */
+      context->align = 1;
+   else {
+      /* if it's not ok to run out of memory, then quantize the widths */
+      /* so that num_nodes is always enough nodes. */
+      /* */
+      /* I.e. num_nodes * align >= width */
+      /*                  align >= width / num_nodes */
+      /*                  align = ceil(width/num_nodes) */
+
+      context->align = (context->width + context->num_nodes-1) / context->num_nodes;
+   }
+}
+
+STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
+{
+   int i;
+#ifndef STBRP_LARGE_RECTS
+   STBRP_ASSERT(width <= 0xffff && height <= 0xffff);
+#endif
+
+   for (i=0; i < num_nodes-1; ++i)
+      nodes[i].next = &nodes[i+1];
+   nodes[i].next = NULL;
+   context->init_mode = STBRP__INIT_skyline;
+   context->heuristic = STBRP_HEURISTIC_Skyline_default;
+   context->free_head = &nodes[0];
+   context->active_head = &context->extra[0];
+   context->width = width;
+   context->height = height;
+   context->num_nodes = num_nodes;
+   stbrp_setup_allow_out_of_mem(context, 0);
+
+   /* node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly) */
+   context->extra[0].x = 0;
+   context->extra[0].y = 0;
+   context->extra[0].next = &context->extra[1];
+   context->extra[1].x = (stbrp_coord) width;
+#ifdef STBRP_LARGE_RECTS
+   context->extra[1].y = (1<<30);
+#else
+   context->extra[1].y = 65535;
+#endif
+   context->extra[1].next = NULL;
+}
+
+/* find minimum y position if it starts at x1 */
+static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
+{
+   stbrp_node *node = first;
+   int x1 = x0 + width;
+   int min_y, visited_width, waste_area;
+   STBRP_ASSERT(first->x <= x0);
+   (void)c;
+
+   #if 0
+   /* skip in case we're past the node */
+   while (node->next->x <= x0)
+      ++node;
+   #else
+   STBRP_ASSERT(node->next->x > x0); /* we ended up handling this in the caller for efficiency */
+   #endif
+
+   STBRP_ASSERT(node->x <= x0);
+
+   min_y = 0;
+   waste_area = 0;
+   visited_width = 0;
+   while (node->x < x1) {
+      if (node->y > min_y) {
+         /* raise min_y higher. */
+         /* we've accounted for all waste up to min_y, */
+         /* but we'll now add more waste for everything we've visted */
+         waste_area += visited_width * (node->y - min_y);
+         min_y = node->y;
+         /* the first time through, visited_width might be reduced */
+         if (node->x < x0)
+            visited_width += node->next->x - x0;
+         else
+            visited_width += node->next->x - node->x;
+      } else {
+         /* add waste area */
+         int under_width = node->next->x - node->x;
+         if (under_width + visited_width > width)
+            under_width = width - visited_width;
+         waste_area += under_width * (min_y - node->y);
+         visited_width += under_width;
+      }
+      node = node->next;
+   }
+
+   *pwaste = waste_area;
+   return min_y;
+}
+
+typedef struct
+{
+   int x,y;
+   stbrp_node **prev_link;
+} stbrp__findresult;
+
+static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
+{
+   int best_waste = (1<<30), best_x, best_y = (1 << 30);
+   stbrp__findresult fr;
+   stbrp_node **prev, *node, *tail, **best = NULL;
+
+   /* align to multiple of c->align */
+   width = (width + c->align - 1);
+   width -= width % c->align;
+   STBRP_ASSERT(width % c->align == 0);
+
+   node = c->active_head;
+   prev = &c->active_head;
+   while (node->x + width <= c->width) {
+      int y,waste;
+      y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
+      if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { /* actually just want to test BL */
+         /* bottom left */
+         if (y < best_y) {
+            best_y = y;
+            best = prev;
+         }
+      } else {
+         /* best-fit */
+         if (y + height <= c->height) {
+            /* can only use it if it first vertically */
+            if (y < best_y || (y == best_y && waste < best_waste)) {
+               best_y = y;
+               best_waste = waste;
+               best = prev;
+            }
+         }
+      }
+      prev = &node->next;
+      node = node->next;
+   }
+
+   best_x = (best == NULL) ? 0 : (*best)->x;
+
+   /* if doing best-fit (BF), we also have to try aligning right edge to each node position */
+   /* */
+   /* e.g, if fitting */
+   /* */
+   /*     ____________________ */
+   /*    |____________________| */
+   /* */
+   /*            into */
+   /* */
+   /*   |                         | */
+   /*   |             ____________| */
+   /*   |____________| */
+   /* */
+   /* then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned */
+   /* */
+   /* This makes BF take about 2x the time */
+
+   if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
+      tail = c->active_head;
+      node = c->active_head;
+      prev = &c->active_head;
+      /* find first node that's admissible */
+      while (tail->x < width)
+         tail = tail->next;
+      while (tail) {
+         int xpos = tail->x - width;
+         int y,waste;
+         STBRP_ASSERT(xpos >= 0);
+         /* find the left position that matches this */
+         while (node->next->x <= xpos) {
+            prev = &node->next;
+            node = node->next;
+         }
+         STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
+         y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
+         if (y + height < c->height) {
+            if (y <= best_y) {
+               if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
+                  best_x = xpos;
+                  STBRP_ASSERT(y <= best_y);
+                  best_y = y;
+                  best_waste = waste;
+                  best = prev;
+               }
+            }
+         }
+         tail = tail->next;
+      }         
+   }
+
+   fr.prev_link = best;
+   fr.x = best_x;
+   fr.y = best_y;
+   return fr;
+}
+
+static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
+{
+   /* find best position according to heuristic */
+   stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
+   stbrp_node *node, *cur;
+
+   /* bail if: */
+   /*    1. it failed */
+   /*    2. the best node doesn't fit (we don't always check this) */
+   /*    3. we're out of memory */
+   if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
+      res.prev_link = NULL;
+      return res;
+   }
+
+   /* on success, create new node */
+   node = context->free_head;
+   node->x = (stbrp_coord) res.x;
+   node->y = (stbrp_coord) (res.y + height);
+
+   context->free_head = node->next;
+
+   /* insert the new node into the right starting point, and */
+   /* let 'cur' point to the remaining nodes needing to be */
+   /* stiched back in */
+
+   cur = *res.prev_link;
+   if (cur->x < res.x) {
+      /* preserve the existing one, so start testing with the next one */
+      stbrp_node *next = cur->next;
+      cur->next = node;
+      cur = next;
+   } else {
+      *res.prev_link = node;
+   }
+
+   /* from here, traverse cur and free the nodes, until we get to one */
+   /* that shouldn't be freed */
+   while (cur->next && cur->next->x <= res.x + width) {
+      stbrp_node *next = cur->next;
+      /* move the current node to the free list */
+      cur->next = context->free_head;
+      context->free_head = cur;
+      cur = next;
+   }
+
+   /* stitch the list back in */
+   node->next = cur;
+
+   if (cur->x < res.x + width)
+      cur->x = (stbrp_coord) (res.x + width);
+
+#ifdef _DEBUG
+   cur = context->active_head;
+   while (cur->x < context->width) {
+      STBRP_ASSERT(cur->x < cur->next->x);
+      cur = cur->next;
+   }
+   STBRP_ASSERT(cur->next == NULL);
+
+   {
+      stbrp_node *L1 = NULL, *L2 = NULL;
+      int count=0;
+      cur = context->active_head;
+      while (cur) {
+         L1 = cur;
+         cur = cur->next;
+         ++count;
+      }
+      cur = context->free_head;
+      while (cur) {
+         L2 = cur;
+         cur = cur->next;
+         ++count;
+      }
+      STBRP_ASSERT(count == context->num_nodes+2);
+   }
+#endif
+
+   return res;
+}
+
+static int rect_height_compare(const void *a, const void *b)
+{
+   const stbrp_rect *p = (const stbrp_rect *) a;
+   const stbrp_rect *q = (const stbrp_rect *) b;
+   if (p->h > q->h)
+      return -1;
+   if (p->h < q->h)
+      return  1;
+   return (p->w > q->w) ? -1 : (p->w < q->w);
+}
+
+static int rect_width_compare(const void *a, const void *b)
+{
+   const stbrp_rect *p = (const stbrp_rect *) a;
+   const stbrp_rect *q = (const stbrp_rect *) b;
+   if (p->w > q->w)
+      return -1;
+   if (p->w < q->w)
+      return  1;
+   return (p->h > q->h) ? -1 : (p->h < q->h);
+}
+
+static int rect_original_order(const void *a, const void *b)
+{
+   const stbrp_rect *p = (const stbrp_rect *) a;
+   const stbrp_rect *q = (const stbrp_rect *) b;
+   return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
+}
+
+#ifdef STBRP_LARGE_RECTS
+#define STBRP__MAXVAL  0xffffffff
+#else
+#define STBRP__MAXVAL  0xffff
+#endif
+
+STBRP_DEF void stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
+{
+   int i;
+
+   /* we use the 'was_packed' field internally to allow sorting/unsorting */
+   for (i=0; i < num_rects; ++i) {
+      rects[i].was_packed = i;
+      #ifndef STBRP_LARGE_RECTS
+      STBRP_ASSERT(rects[i].w <= 0xffff && rects[i].h <= 0xffff);
+      #endif
+   }
+
+   /* sort according to heuristic */
+   qsort(rects, (size_t)num_rects, sizeof(rects[0]), rect_height_compare);
+
+   for (i=0; i < num_rects; ++i) {
+      stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
+      if (fr.prev_link) {
+         rects[i].x = (stbrp_coord) fr.x;
+         rects[i].y = (stbrp_coord) fr.y;
+      } else {
+         rects[i].x = rects[i].y = STBRP__MAXVAL;
+      }
+   }
+
+   /* unsort */
+   qsort(rects, (size_t)num_rects, sizeof(rects[0]), rect_original_order);
+
+   /* set was_packed flags */
+   for (i=0; i < num_rects; ++i)
+      rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
+}
+#endif

griffin/griffin.c

@@ -869,6 +869,11 @@ MENU
 #include "../menu/drivers/materialui.c"
 #endif
 
+#ifdef HAVE_WIMP
+#include "../deps/zahnrad/zahnrad.c"
+#include "../menu/drivers/wimp.c"
+#endif
+
 #ifdef HAVE_ZARCH
 #include "../menu/drivers/zarch.c"
 #endif

menu/menu_driver.c

@@ -45,6 +45,9 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #if defined(HAVE_MATERIALUI)
    &menu_ctx_mui,
 #endif
+#if defined(HAVE_WIMP)
+   &menu_ctx_wimp,
+#endif
 #if defined(HAVE_XMB)
    &menu_ctx_xmb,
 #endif

menu/menu_driver.h

@@ -448,6 +448,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
 extern menu_ctx_driver_t menu_ctx_xui;
 extern menu_ctx_driver_t menu_ctx_rgui;
 extern menu_ctx_driver_t menu_ctx_mui;
+extern menu_ctx_driver_t menu_ctx_wimp;
 extern menu_ctx_driver_t menu_ctx_xmb;
 extern menu_ctx_driver_t menu_ctx_zarch;
 extern menu_ctx_driver_t menu_ctx_null;