Color Management, Stage 2: Switch color pipeline to use OpenColorIO
[blender.git] / source / blender / windowmanager / intern / wm_playanim.c
index a14fa789d9172cb56cbd9fd9424b1ff0b391f4ef..bff40faf1d1cbc87de73f98858a37107712cc801 100644 (file)
@@ -36,6 +36,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #ifndef WIN32
 #  include <unistd.h>
 
 #include "PIL_time.h"
 
-#include <math.h>
-
-#include "BLI_blenlib.h"
-#include "BLI_math.h"
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_rect.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
 
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
 #include "BKE_blender.h"
 #include "BKE_global.h"
-#include "BKE_utildefines.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
-#ifdef WITH_QUICKTIME
-#  ifdef _WIN32
-#    include <QTML.h>
-#    include <Movies.h>
-#  elif defined(__APPLE__)
-#    include <QuickTime/Movies.h>
-#  endif /* __APPLE__ */
-#endif /* WITH_QUICKTIME */
-
 #include "DNA_scene_types.h"
-#include "BLI_utildefines.h"
 #include "ED_datafiles.h" /* for fonts */
-#include "wm_event_types.h"
 #include "GHOST_C-api.h"
 #include "BLF_api.h"
 
-#define WINCLOSE -1
-#define REDRAW -3
-#define RESHAPE -2
-#define WINQUIT -4
+#include "wm_event_types.h"
+
+#include "WM_api.h"  /* only for WM_main_playanim */
 
-/* use */
 typedef struct PlayState {
+
+       /* playback state */
        short direction;
        short next;
        short once;
@@ -98,6 +89,7 @@ typedef struct PlayState {
        short stopped;
        short go;
 
+       /* current picture */
        struct PlayAnimPict *picture;
 
        /* set once at the start */
@@ -108,89 +100,105 @@ typedef struct PlayState {
        struct ImBuf *curframe_ibuf;
 } PlayState;
 
-/* ***************** gl_util.c ****************** */
-
-static GHOST_SystemHandle g_system = NULL;
-static void *g_window = NULL;
-
-static int qualN = 0;
-
-#define LSHIFT  (1 << 0)
-#define RSHIFT  (1 << 1)
-#define SHIFT   (LSHIFT | RSHIFT)
-#define LALT    (1 << 2)
-#define RALT    (1 << 3)
-#define ALT (LALT | RALT)
-#define LCTRL   (1 << 4)
-#define RCTRL   (1 << 5)
-#define LMOUSE  (1 << 16)
-#define MMOUSE  (1 << 17)
-#define RMOUSE  (1 << 18)
-#define MOUSE   (LMOUSE | MMOUSE | RMOUSE)
-
-unsigned short screen_qread(short *val, char *ascii);
+/* for debugging */
+#if 0
+void print_ps(PlayState *ps)
+{
+       printf("ps:\n");
+       printf("    direction=%d,\n", (int)ps->direction);
+       printf("    next=%d,\n", ps->next);
+       printf("    once=%d,\n", ps->once);
+       printf("    turbo=%d,\n", ps->turbo);
+       printf("    pingpong=%d,\n", ps->pingpong);
+       printf("    noskip=%d,\n", ps->noskip);
+       printf("    sstep=%d,\n", ps->sstep);
+       printf("    pause=%d,\n", ps->pause);
+       printf("    wait2=%d,\n", ps->wait2);
+       printf("    stopped=%d,\n", ps->stopped);
+       printf("    go=%d,\n\n", ps->go);
+       fflush(stdout);
+}
+#endif
 
-void playanim_window_get_size(int *width_r, int *height_r)
+/* global for window and events */
+typedef enum eWS_Qual {
+       WS_QUAL_LSHIFT  = (1 << 0),
+       WS_QUAL_RSHIFT  = (1 << 1),
+       WS_QUAL_SHIFT   = (WS_QUAL_LSHIFT | WS_QUAL_RSHIFT),
+       WS_QUAL_LALT    = (1 << 2),
+       WS_QUAL_RALT    = (1 << 3),
+       WS_QUAL_ALT     = (WS_QUAL_LALT | WS_QUAL_RALT),
+       WS_QUAL_LCTRL   = (1 << 4),
+       WS_QUAL_RCTRL   = (1 << 5),
+       WS_QUAL_LMOUSE  = (1 << 16),
+       WS_QUAL_MMOUSE  = (1 << 17),
+       WS_QUAL_RMOUSE  = (1 << 18),
+       WS_QUAL_MOUSE   = (WS_QUAL_LMOUSE | WS_QUAL_MMOUSE | WS_QUAL_RMOUSE)
+} eWS_Qual;
+
+static struct WindowStateGlobal {
+       GHOST_SystemHandle ghost_system;
+       void *ghost_window;
+
+       /* events */
+       eWS_Qual qual;
+} g_WS = {NULL};
+
+static void playanim_window_get_size(int *width_r, int *height_r)
 {
-       GHOST_RectangleHandle bounds = GHOST_GetClientBounds(g_window);
+       GHOST_RectangleHandle bounds = GHOST_GetClientBounds(g_WS.ghost_window);
        *width_r = GHOST_GetWidthRectangle(bounds);
        *height_r = GHOST_GetHeightRectangle(bounds);
        GHOST_DisposeRectangle(bounds);
 }
 
 /* implementation */
-#if 0
-static int qreadN(short *val)
+static void playanim_event_qual_update(void)
 {
-#if 0 // XXX25
-       char ascii;
-       int event = screen_qread(val, &ascii);
-#else
-       int event = 123456789;
-#endif
-
-       switch (event) {
-               case LEFTMOUSE:
-                       if (*val) qualN |= LMOUSE;
-                       else qualN &= ~LMOUSE;
-                       break;
-               case MIDDLEMOUSE:
-                       if (*val) qualN |= MMOUSE;
-                       else qualN &= ~MMOUSE;
-                       break;
-               case RIGHTMOUSE:
-                       if (*val) qualN |= RMOUSE;
-                       else qualN &= ~RMOUSE;
-                       break;
-               case LEFTSHIFTKEY:
-                       if (*val) qualN |= LSHIFT;
-                       else qualN &= ~LSHIFT;
-                       break;
-               case RIGHTSHIFTKEY:
-                       if (*val) qualN |= RSHIFT;
-                       else qualN &= ~RSHIFT;
-                       break;
-               case LEFTCTRLKEY:
-                       if (*val) qualN |= LCTRL;
-                       else qualN &= ~LCTRL;
-                       break;
-               case RIGHTCTRLKEY:
-                       if (*val) qualN |= RCTRL;
-                       else qualN &= ~RCTRL;
-                       break;
-               case LEFTALTKEY:
-                       if (*val) qualN |= LALT;
-                       else qualN &= ~LALT;
-                       break;
-               case RIGHTALTKEY:
-                       if (*val) qualN |= RALT;
-                       else qualN &= ~RALT;
-                       break;
-       }
-
-       return(event);
+       int val;
+
+       /* Shift */
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftShift, &val);
+       if (val) g_WS.qual |=  WS_QUAL_LSHIFT;
+       else     g_WS.qual &= ~WS_QUAL_LSHIFT;
+
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightShift, &val);
+       if (val) g_WS.qual |=  WS_QUAL_RSHIFT;
+       else     g_WS.qual &= ~WS_QUAL_RSHIFT;
+
+       /* Control */
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftControl, &val);
+       if (val) g_WS.qual |=  WS_QUAL_LCTRL;
+       else     g_WS.qual &= ~WS_QUAL_LCTRL;
+
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightControl, &val);
+       if (val) g_WS.qual |=  WS_QUAL_RCTRL;
+       else     g_WS.qual &= ~WS_QUAL_RCTRL;
+
+       /* Alt */
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyLeftAlt, &val);
+       if (val) g_WS.qual |=  WS_QUAL_LCTRL;
+       else     g_WS.qual &= ~WS_QUAL_LCTRL;
+
+       GHOST_GetModifierKeyState(g_WS.ghost_system, GHOST_kModifierKeyRightAlt, &val);
+       if (val) g_WS.qual |=  WS_QUAL_RCTRL;
+       else     g_WS.qual &= ~WS_QUAL_RCTRL;
+
+       /* LMB */
+       GHOST_GetButtonState(g_WS.ghost_system, GHOST_kButtonMaskLeft, &val);
+       if (val) g_WS.qual |=  WS_QUAL_LMOUSE;
+       else     g_WS.qual &= ~WS_QUAL_LMOUSE;
+
+       /* MMB */
+       GHOST_GetButtonState(g_WS.ghost_system, GHOST_kButtonMaskMiddle, &val);
+       if (val) g_WS.qual |=  WS_QUAL_MMOUSE;
+       else     g_WS.qual &= ~WS_QUAL_MMOUSE;
+
+       /* RMB */
+       GHOST_GetButtonState(g_WS.ghost_system, GHOST_kButtonMaskRight, &val);
+       if (val) g_WS.qual |=  WS_QUAL_RMOUSE;
+       else     g_WS.qual &= ~WS_QUAL_RMOUSE;
 }
-#endif
 
 typedef struct PlayAnimPict {
        struct PlayAnimPict *next, *prev;
@@ -203,8 +211,7 @@ typedef struct PlayAnimPict {
        int IB_flags;
 } PlayAnimPict;
 
-static struct ListBase _picsbase = {NULL, NULL};
-static struct ListBase *picsbase = &_picsbase;
+static struct ListBase picsbase = {NULL, NULL};
 static int fromdisk = FALSE;
 static int fstep = 1;
 static float zoomx = 1.0, zoomy = 1.0;
@@ -222,7 +229,7 @@ static int pupdate_time(void)
        return (ptottime < 0);
 }
 
-static void toscreen(PlayAnimPict *picture, struct ImBuf *ibuf, int fontid)
+static void playanim_toscreen(PlayAnimPict *picture, struct ImBuf *ibuf, int fontid)
 {
 
        if (ibuf == NULL) {
@@ -236,7 +243,7 @@ static void toscreen(PlayAnimPict *picture, struct ImBuf *ibuf, int fontid)
        if (ibuf->rect == NULL)
                return;
 
-       GHOST_ActivateWindowDrawingContext(g_window);
+       GHOST_ActivateWindowDrawingContext(g_WS.ghost_window);
 
        glRasterPos2f(0.0f, 0.0f);
 
@@ -244,22 +251,24 @@ static void toscreen(PlayAnimPict *picture, struct ImBuf *ibuf, int fontid)
 
        pupdate_time();
 
-       //if (picture && (qualN & (SHIFT | LMOUSE))) {
-       if (picture && fontid != -1) {
+       if (picture && (g_WS.qual & (WS_QUAL_SHIFT | WS_QUAL_LMOUSE)) && (fontid != -1)) {
+               int sizex, sizey;
+               float fsizex_inv, fsizey_inv;
                char str[32 + FILE_MAX];
                cpack(-1);
-//             glRasterPos2f(0.02f, 0.03f);
                BLI_snprintf(str, sizeof(str), "%s | %.2f frames/s", picture->name, fstep / swaptime);
-//             BMF_DrawString(font, str);
+
+               playanim_window_get_size(&sizex, &sizey);
+               fsizex_inv = 1.0f / sizex;
+               fsizey_inv = 1.0f / sizey;
 
                BLF_enable(fontid, BLF_ASPECT);
-               BLF_aspect(fontid, 1.0f / ibuf->x, 1.0f / ibuf->y, 1.0f);
-               BLF_position(fontid, 0.02f, 0.03f, 0.0f);
-               BLF_draw(fontid, str, 256); // XXX
-               printf("Drawing text '%s'\n", str);
+               BLF_aspect(fontid, fsizex_inv, fsizey_inv, 1.0f);
+               BLF_position(fontid, 10.0f * fsizex_inv, 10.0f * fsizey_inv, 0.0f);
+               BLF_draw(fontid, str, sizeof(str));
        }
 
-       GHOST_SwapWindowBuffers(g_window);
+       GHOST_SwapWindowBuffers(g_WS.ghost_window);
 }
 
 static void build_pict_list(char *first, int totframes, int fstep, int fontid)
@@ -272,12 +281,13 @@ static void build_pict_list(char *first, int totframes, int fstep, int fontid)
        struct anim *anim;
 
        if (IMB_isanim(first)) {
-               anim = IMB_open_anim(first, IB_rect, 0);
+               /* OCIO_TODO: support different input color space */
+               anim = IMB_open_anim(first, IB_rect, 0, NULL);
                if (anim) {
                        int pic;
                        ibuf = IMB_anim_absolute(anim, 0, IMB_TC_NONE, IMB_PROXY_NONE);
                        if (ibuf) {
-                               toscreen(NULL, ibuf, fontid);
+                               playanim_toscreen(NULL, ibuf, fontid);
                                IMB_freeImBuf(ibuf);
                        }
 
@@ -286,9 +296,9 @@ static void build_pict_list(char *first, int totframes, int fstep, int fontid)
                                picture->anim = anim;
                                picture->frame = pic;
                                picture->IB_flags = IB_rect;
-                               BLI_snprintf(str, sizeof(str), "%s : %d", first, pic + 1);
+                               BLI_snprintf(str, sizeof(str), "%s : %4.d", first, pic + 1);
                                picture->name = strdup(str);
-                               BLI_addtail(picsbase, picture);
+                               BLI_addtail(&picsbase, picture);
                        }
                }
                else {
@@ -319,10 +329,14 @@ static void build_pict_list(char *first, int totframes, int fstep, int fontid)
                        int file;
 
                        file = open(filepath, O_BINARY | O_RDONLY, 0);
-                       if (file < 0) return;
+                       if (file < 0) {
+                               /* print errno? */
+                               return;
+                       }
+
                        picture = (PlayAnimPict *)MEM_callocN(sizeof(PlayAnimPict), "picture");
                        if (picture == NULL) {
-                               printf("Not enough memory for pict struct \n");
+                               printf("Not enough memory for pict struct '%s'\n", filepath);
                                close(file);
                                return;
                        }
@@ -361,21 +375,22 @@ static void build_pict_list(char *first, int totframes, int fstep, int fontid)
                        picture->mem = mem;
                        picture->name = strdup(filepath);
                        close(file);
-                       BLI_addtail(picsbase, picture);
+                       BLI_addtail(&picsbase, picture);
                        count++;
 
                        pupdate_time();
 
                        if (ptottime > 1.0) {
+                               /* OCIO_TODO: support different input color space */
                                if (picture->mem) {
                                        ibuf = IMB_ibImageFromMemory((unsigned char *)picture->mem, picture->size,
-                                                                    picture->IB_flags, picture->name);
+                                                                    picture->IB_flags, NULL, picture->name);
                                }
                                else {
-                                       ibuf = IMB_loadiffname(picture->name, picture->IB_flags);
+                                       ibuf = IMB_loadiffname(picture->name, picture->IB_flags, NULL);
                                }
                                if (ibuf) {
-                                       toscreen(picture, ibuf, fontid);
+                                       playanim_toscreen(picture, ibuf, fontid);
                                        IMB_freeImBuf(ibuf);
                                }
                                pupdate_time();
@@ -402,290 +417,288 @@ static void build_pict_list(char *first, int totframes, int fstep, int fontid)
 static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr ps_void)
 {
        PlayState *ps = (PlayState *)ps_void;
-       {
-               GHOST_TEventType type = GHOST_GetEventType(evt);
-               int val;
-               int event;
+       GHOST_TEventType type = GHOST_GetEventType(evt);
+       int val;
 
-               /* convert ghost event into value keyboard or mouse */
-               val = ELEM(type, GHOST_kEventKeyDown, GHOST_kEventButtonDown);
+       // print_ps(ps);
 
-               if (ps->wait2 && ps->stopped) {
-                       ps->stopped = FALSE;
-               }
+       playanim_event_qual_update();
 
-               switch (type) {
-                       case GHOST_kEventWindowSize:
-                       case GHOST_kEventWindowMove:
-                       {
-                               int sizex, sizey;
-
-                               playanim_window_get_size(&sizex, &sizey);
-                               GHOST_ActivateWindowDrawingContext(g_window);
-
-                               glViewport(0, 0, sizex, sizey);
-                               glScissor(0, 0, sizex, sizey);
-
-                               zoomx = (float) sizex / ps->ibufx;
-                               zoomy = (float) sizey / ps->ibufy;
-                               zoomx = floor(zoomx + 0.5);
-                               zoomy = floor(zoomy + 0.5);
-                               if (zoomx < 1.0) zoomx = 1.0;
-                               if (zoomy < 1.0) zoomy = 1.0;
-
-                               sizex = zoomx * ps->ibufx;
-                               sizey = zoomy * ps->ibufy;
-
-                               glPixelZoom(zoomx, zoomy);
-                               glEnable(GL_DITHER);
-                               ptottime = 0.0;
-                               toscreen(ps->picture, ps->curframe_ibuf, ps->fontid);
-//XXX25                                while (qtest()) qreadN(&val);
-
-                               break;
-                       }
-                       case GHOST_kEventQuit:
-                       case GHOST_kEventWindowClose:
-                       {
-                               ps->go = FALSE;
-                               break;
-                       }
-                       default:
-                               /* quiet warnings */
-                               break;
-               }
-
-               return 1; // XXX25
-
-               event = -1;
+       /* convert ghost event into value keyboard or mouse */
+       val = ELEM(type, GHOST_kEventKeyDown, GHOST_kEventButtonDown);
 
+       if (ps->wait2 && ps->stopped) {
+               ps->stopped = FALSE;
+       }
 
-//XXX25                int event = qreadN(&val);
-               /* printf("%d %d\n", event, val); */
+       switch (type) {
+               case GHOST_kEventKeyDown:
+               case GHOST_kEventKeyUp:
+               {
+                       GHOST_TEventKeyData *key_data;
 
-               if (ps->wait2) {
-                       pupdate_time();
-                       ptottime = 0;
-               }
-               switch (event) {
-                       case AKEY:
-                               if (val)
-                                       ps->noskip = !ps->noskip;
-                               break;
-                       case PKEY:
-                               if (val)
-                                       ps->pingpong = !ps->pingpong;
-                               break;
-                       case SLASHKEY:
-                               if (val) {
-                                       if (qualN & SHIFT) {
-                                               if (ps->curframe_ibuf)
-                                                       printf(" Name: %s | Speed: %.2f frames/s\n", ps->curframe_ibuf->name, fstep / swaptime);
-                                       }
-                                       else {
-                                               swaptime = fstep / 5.0;
-                                       }
-                               }
-                               break;
-                       case LEFTARROWKEY:
-                               if (val) {
-                                       ps->sstep = TRUE;
-                                       ps->wait2 = FALSE;
-                                       if (qualN & SHIFT) {
-                                               ps->picture = picsbase->first;
-                                               ps->next = 0;
-                                       }
-                                       else {
-                                               ps->next = -1;
-                                       }
-                               }
-                               break;
-                       case DOWNARROWKEY:
-                               if (val) {
-                                       ps->wait2 = FALSE;
-                                       if (qualN & SHIFT) {
-                                               ps->next = ps->direction = -1;
-                                       }
-                                       else {
-                                               ps->next = -10;
+                       key_data = (GHOST_TEventKeyData *)GHOST_GetEventData(evt);
+                       switch (key_data->key) {
+                               case GHOST_kKeyA:
+                                       if (val) ps->noskip = !ps->noskip;
+                                       break;
+                               case GHOST_kKeyP:
+                                       if (val) ps->pingpong = !ps->pingpong;
+                                       break;
+                               case GHOST_kKeyNumpad1:
+                                       if (val) swaptime = fstep / 60.0;
+                                       break;
+                               case GHOST_kKeyNumpad2:
+                                       if (val) swaptime = fstep / 50.0;
+                                       break;
+                               case GHOST_kKeyNumpad3:
+                                       if (val) swaptime = fstep / 30.0;
+                                       break;
+                               case GHOST_kKeyNumpad4:
+                                       if (g_WS.qual & WS_QUAL_SHIFT)
+                                               swaptime = fstep / 24.0;
+                                       else
+                                               swaptime = fstep / 25.0;
+                                       break;
+                               case GHOST_kKeyNumpad5:
+                                       if (val) swaptime = fstep / 20.0;
+                                       break;
+                               case GHOST_kKeyNumpad6:
+                                       if (val) swaptime = fstep / 15.0;
+                                       break;
+                               case GHOST_kKeyNumpad7:
+                                       if (val) swaptime = fstep / 12.0;
+                                       break;
+                               case GHOST_kKeyNumpad8:
+                                       if (val) swaptime = fstep / 10.0;
+                                       break;
+                               case GHOST_kKeyNumpad9:
+                                       if (val) swaptime = fstep / 6.0;
+                                       break;
+                               case GHOST_kKeyLeftArrow:
+                                       if (val) {
                                                ps->sstep = TRUE;
+                                               ps->wait2 = FALSE;
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->picture = picsbase.first;
+                                                       ps->next = 0;
+                                               }
+                                               else {
+                                                       ps->next = -1;
+                                               }
                                        }
-                               }
-                               break;
-                       case RIGHTARROWKEY:
-                               if (val) {
-                                       ps->sstep = TRUE;
-                                       ps->wait2 = FALSE;
-                                       if (qualN & SHIFT) {
-                                               ps->picture = picsbase->last;
-                                               ps->next = 0;
-                                       }
-                                       else {
-                                               ps->next = 1;
-                                       }
-                               }
-                               break;
-                       case UPARROWKEY:
-                               if (val) {
-                                       ps->wait2 = FALSE;
-                                       if (qualN & SHIFT) {
-                                               ps->next = ps->direction = 1;
+                                       break;
+                               case GHOST_kKeyDownArrow:
+                                       if (val) {
+                                               ps->wait2 = FALSE;
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->next = ps->direction = -1;
+                                               }
+                                               else {
+                                                       ps->next = -10;
+                                                       ps->sstep = TRUE;
+                                               }
                                        }
-                                       else {
-                                               ps->next = 10;
+                                       break;
+                               case GHOST_kKeyRightArrow:
+                                       if (val) {
                                                ps->sstep = TRUE;
+                                               ps->wait2 = FALSE;
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->picture = picsbase.last;
+                                                       ps->next = 0;
+                                               }
+                                               else {
+                                                       ps->next = 1;
+                                               }
                                        }
-                               }
-                               break;
-                       case LEFTMOUSE:
-                       case MOUSEX:
-                               if (qualN & LMOUSE) {
-                                       int sizex, sizey;
-                                       int i;
-                                       playanim_window_get_size(&sizex, &sizey);
-                                       ps->picture = picsbase->first;
-                                       i = 0;
-                                       while (ps->picture) {
-                                               i++;
-                                               ps->picture = ps->picture->next;
-                                       }
-                                       i = (i * val) / sizex;
-                                       ps->picture = picsbase->first;
-                                       for (; i > 0; i--) {
-                                               if (ps->picture->next == NULL) break;
-                                               ps->picture = ps->picture->next;
-                                       }
-                                       ps->sstep = TRUE;
-                                       ps->wait2 = FALSE;
-                                       ps->next = 0;
-                               }
-                               break;
-                       case EQUALKEY:
-                               if (val) {
-                                       if (qualN & SHIFT) {
-                                               ps->pause++;
-                                               printf("pause:%d\n", ps->pause);
+                                       break;
+                               case GHOST_kKeyUpArrow:
+                                       if (val) {
+                                               ps->wait2 = FALSE;
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->next = ps->direction = 1;
+                                               }
+                                               else {
+                                                       ps->next = 10;
+                                                       ps->sstep = TRUE;
+                                               }
                                        }
-                                       else {
-                                               swaptime /= 1.1;
+                                       break;
+
+                               case GHOST_kKeySlash:
+                               case GHOST_kKeyNumpadSlash:
+                                       if (val) {
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       if (ps->curframe_ibuf)
+                                                               printf(" Name: %s | Speed: %.2f frames/s\n", ps->curframe_ibuf->name, fstep / swaptime);
+                                               }
+                                               else {
+                                                       swaptime = fstep / 5.0;
+                                               }
                                        }
-                               }
-                               break;
-                       case MINUSKEY:
-                               if (val) {
-                                       if (qualN & SHIFT) {
-                                               ps->pause--;
-                                               printf("pause:%d\n", ps->pause);
+                                       break;
+                               case GHOST_kKeyEqual:
+                                       if (val) {
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->pause++;
+                                                       printf("pause:%d\n", ps->pause);
+                                               }
+                                               else {
+                                                       swaptime /= 1.1;
+                                               }
                                        }
-                                       else {
-                                               swaptime *= 1.1;
+                                       break;
+                               case GHOST_kKeyMinus:
+                                       if (val) {
+                                               if (g_WS.qual & WS_QUAL_SHIFT) {
+                                                       ps->pause--;
+                                                       printf("pause:%d\n", ps->pause);
+                                               }
+                                               else {
+                                                       swaptime *= 1.1;
+                                               }
                                        }
-                               }
-                               break;
-                       case PAD0:
-                               if (val) {
-                                       if (ps->once) {
-                                               ps->once = ps->wait2 = FALSE;
+                                       break;
+                               case GHOST_kKeyNumpad0:
+                                       if (val) {
+                                               if (ps->once) {
+                                                       ps->once = ps->wait2 = FALSE;
+                                               }
+                                               else {
+                                                       ps->picture = NULL;
+                                                       ps->once = TRUE;
+                                                       ps->wait2 = FALSE;
+                                               }
                                        }
-                                       else {
-                                               ps->picture = NULL;
-                                               ps->once = TRUE;
-                                               ps->wait2 = FALSE;
+                                       break;
+                               case GHOST_kKeyEnter:
+                               case GHOST_kKeyNumpadEnter:
+                                       if (val) {
+                                               ps->wait2 = ps->sstep = FALSE;
                                        }
-                               }
-                               break;
-                       case RETKEY:
-                       case PADENTER:
-                               if (val) {
-                                       ps->wait2 = ps->sstep = FALSE;
-                               }
-                               break;
-                       case PADPERIOD:
-                               if (val) {
-                                       if (ps->sstep) ps->wait2 = FALSE;
-                                       else {
-                                               ps->sstep = TRUE;
-                                               ps->wait2 = !ps->wait2;
+                                       break;
+                               case GHOST_kKeyNumpadPeriod:
+                                       if (val) {
+                                               if (ps->sstep) ps->wait2 = FALSE;
+                                               else {
+                                                       ps->sstep = TRUE;
+                                                       ps->wait2 = !ps->wait2;
+                                               }
                                        }
+                                       break;
+                               case GHOST_kKeyNumpadPlus:
+                                       if (val == 0) break;
+                                       zoomx += 2.0;
+                                       zoomy += 2.0;
+                                       /* no break??? - is this intentional? - campbell XXX25 */
+                               case GHOST_kKeyNumpadMinus:
+                               {
+                                       int sizex, sizey;
+                                       /* int ofsx, ofsy; */ /* UNUSED */
+
+                                       if (val == 0) break;
+                                       if (zoomx > 1.0) zoomx -= 1.0;
+                                       if (zoomy > 1.0) zoomy -= 1.0;
+                                       // playanim_window_get_position(&ofsx, &ofsy);
+                                       playanim_window_get_size(&sizex, &sizey);
+                                       /* ofsx += sizex / 2; */ /* UNUSED */
+                                       /* ofsy += sizey / 2; */ /* UNUSED */
+                                       sizex = zoomx * ps->ibufx;
+                                       sizey = zoomy * ps->ibufy;
+                                       /* ofsx -= sizex / 2; */ /* UNUSED */
+                                       /* ofsy -= sizey / 2; */ /* UNUSED */
+                                       // window_set_position(g_WS.ghost_window,sizex,sizey);
+                                       GHOST_SetClientSize(g_WS.ghost_window, sizex, sizey);
+                                       break;
                                }
-                               break;
-                       case PAD1:
-                               swaptime = fstep / 60.0;
-                               break;
-                       case PAD2:
-                               swaptime = fstep / 50.0;
-                               break;
-                       case PAD3:
-                               swaptime = fstep / 30.0;
-                               break;
-                       case PAD4:
-                               if (qualN & SHIFT)
-                                       swaptime = fstep / 24.0;
-                               else
-                                       swaptime = fstep / 25.0;
-                               break;
-                       case PAD5:
-                               swaptime = fstep / 20.0;
-                               break;
-                       case PAD6:
-                               swaptime = fstep / 15.0;
-                               break;
-                       case PAD7:
-                               swaptime = fstep / 12.0;
-                               break;
-                       case PAD8:
-                               swaptime = fstep / 10.0;
-                               break;
-                       case PAD9:
-                               swaptime = fstep / 6.0;
-                               break;
-                       case PADPLUSKEY:
-                               if (val == 0) break;
-                               zoomx += 2.0;
-                               zoomy += 2.0;
-                       case PADMINUS:
-                       {
+                               case GHOST_kKeyEsc:
+                                       ps->go = FALSE;
+                                       break;
+                               default:
+                                       break;
+                       }
+                       break;
+               }
+               case GHOST_kEventCursorMove:
+               {
+                       if (g_WS.qual & WS_QUAL_LMOUSE) {
                                int sizex, sizey;
-                               /* int ofsx, ofsy; */ /* UNUSED */
+                               int i;
+
+                               GHOST_TEventCursorData *cd = GHOST_GetEventData(evt);
+                               int cx, cy;
+
+                               GHOST_ScreenToClient(g_WS.ghost_window, cd->x, cd->y, &cx, &cy);
 
-                               if (val == 0) break;
-                               if (zoomx > 1.0) zoomx -= 1.0;
-                               if (zoomy > 1.0) zoomy -= 1.0;
-                               // playanim_window_get_position(&ofsx, &ofsy);
                                playanim_window_get_size(&sizex, &sizey);
-                               /* ofsx += sizex / 2; */ /* UNUSED */
-                               /* ofsy += sizey / 2; */ /* UNUSED */
-                               sizex = zoomx * ps->ibufx;
-                               sizey = zoomy * ps->ibufy;
-                               /* ofsx -= sizex / 2; */ /* UNUSED */
-                               /* ofsy -= sizey / 2; */ /* UNUSED */
-                               // window_set_position(g_window,sizex,sizey);
-                               GHOST_SetClientSize(g_window, sizex, sizey);
-                               break;
-                       }
-                       case RESHAPE:
-                       case REDRAW:
-                       {
-//XXX25 DONE!
+                               ps->picture = picsbase.first;
+                               /* TODO - store in ps direct? */
+                               i = 0;
+                               while (ps->picture) {
+                                       i++;
+                                       ps->picture = ps->picture->next;
+                               }
+                               i = (i * cx) / sizex;
+                               ps->picture = picsbase.first;
+                               for (; i > 0; i--) {
+                                       if (ps->picture->next == NULL) break;
+                                       ps->picture = ps->picture->next;
+                               }
+                               ps->sstep = TRUE;
+                               ps->wait2 = FALSE;
+                               ps->next = 0;
                        }
-                       case ESCKEY:
-                       case WINCLOSE:
-                       case WINQUIT:
-//XXX25 DONE!
                        break;
                }
-//XXX25                if (go == FALSE) break;
+               case GHOST_kEventWindowSize:
+               case GHOST_kEventWindowMove:
+               {
+                       int sizex, sizey;
+
+                       playanim_window_get_size(&sizex, &sizey);
+                       GHOST_ActivateWindowDrawingContext(g_WS.ghost_window);
+
+                       glViewport(0, 0, sizex, sizey);
+                       glScissor(0, 0, sizex, sizey);
+
+                       zoomx = (float) sizex / ps->ibufx;
+                       zoomy = (float) sizey / ps->ibufy;
+                       zoomx = floor(zoomx + 0.5);
+                       zoomy = floor(zoomy + 0.5);
+                       if (zoomx < 1.0) zoomx = 1.0;
+                       if (zoomy < 1.0) zoomy = 1.0;
+
+                       sizex = zoomx * ps->ibufx;
+                       sizey = zoomy * ps->ibufy;
+
+                       glPixelZoom(zoomx, zoomy);
+                       glEnable(GL_DITHER);
+                       ptottime = 0.0;
+                       playanim_toscreen(ps->picture, ps->curframe_ibuf, ps->fontid);
+
+                       break;
+               }
+               case GHOST_kEventQuit:
+               case GHOST_kEventWindowClose:
+               {
+                       ps->go = FALSE;
+                       break;
+               }
+               default:
+                       /* quiet warnings */
+                       break;
        }
 
        return 1;
 }
 
-void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey, int start_maximized)
+static void playanim_window_open(const char *title, int posx, int posy, int sizex, int sizey, int start_maximized)
 {
        GHOST_TWindowState inital_state;
        GHOST_TUns32 scr_w, scr_h;
 
-       GHOST_GetMainDisplayDimensions(g_system, &scr_w, &scr_h);
+       GHOST_GetMainDisplayDimensions(g_WS.ghost_system, &scr_w, &scr_h);
 
        posy = (scr_h - posy - sizey);
 
@@ -693,31 +706,25 @@ void playanim_window_open(const char *title, int posx, int posy, int sizex, int
                inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal;
        else
                inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal;
-#if defined(__APPLE__) && !defined(GHOST_COCOA)
-       {
-               extern int macPrefState; /* creator.c */
-               initial_state += macPrefState;
-       }
-#endif
 
-       g_window = GHOST_CreateWindow(g_system,
-                                     title,
-                                     posx, posy, sizex, sizey,
-                                     inital_state,
-                                     GHOST_kDrawingContextTypeOpenGL,
-                                     FALSE /* no stereo */, FALSE);
+       g_WS.ghost_window = GHOST_CreateWindow(g_WS.ghost_system,
+                                              title,
+                                              posx, posy, sizex, sizey,
+                                              inital_state,
+                                              GHOST_kDrawingContextTypeOpenGL,
+                                              FALSE /* no stereo */, FALSE);
 
        //if (ghostwin) {
        //if (win) {
        // GHOST_SetWindowUserData(ghostwin, win);
        //} else {
-       //      GHOST_DisposeWindow(g_system, ghostwin);
+       //      GHOST_DisposeWindow(g_WS.ghost_system, ghostwin);
        //}
        //}
 }
 
 
-void playanim(int argc, const char **argv)
+void WM_main_playanim(int argc, const char **argv)
 {
        struct ImBuf *ibuf = NULL;
        char filepath[FILE_MAX];
@@ -812,26 +819,6 @@ void playanim(int argc, const char **argv)
                }
        }
 
-#ifdef WITH_QUICKTIME
-#if defined(_WIN32) || defined(__APPLE__) && !defined(GHOST_COCOA)
-       /* Initialize QuickTime */
-#ifndef noErr
-#define noErr 0
-#endif
-
-#ifdef _WIN32
-       if (InitializeQTML(0) != noErr)
-               G.have_quicktime = FALSE;
-       else
-               G.have_quicktime = TRUE;
-#endif /* _WIN32 */
-       if (EnterMovies() != noErr)
-               G.have_quicktime = FALSE;
-       else
-#endif /* _WIN32 || __APPLE__  && !defined(GHOST_COCOA)*/
-       G.have_quicktime = TRUE;
-#endif /* WITH_QUICKTIME */
-
        if (argc > 1) {
                BLI_strncpy(filepath, argv[1], sizeof(filepath));
        }
@@ -841,7 +828,8 @@ void playanim(int argc, const char **argv)
        }
 
        if (IMB_isanim(filepath)) {
-               anim = IMB_open_anim(filepath, IB_rect, 0);
+               /* OCIO_TODO: support different input color spaces */
+               anim = IMB_open_anim(filepath, IB_rect, 0, NULL);
                if (anim) {
                        ibuf = IMB_anim_absolute(anim, 0, IMB_TC_NONE, IMB_PROXY_NONE);
                        IMB_close_anim(anim);
@@ -853,7 +841,8 @@ void playanim(int argc, const char **argv)
        }
 
        if (ibuf == NULL) {
-               ibuf = IMB_loadiffname(filepath, IB_rect);
+               /* OCIO_TODO: support different input color space */
+               ibuf = IMB_loadiffname(filepath, IB_rect, NULL);
        }
 
        if (ibuf == NULL) {
@@ -873,13 +862,13 @@ void playanim(int argc, const char **argv)
 
                GHOST_EventConsumerHandle consumer = GHOST_CreateEventConsumer(ghost_event_proc, &ps);
 
-               g_system = GHOST_CreateSystem();
-               GHOST_AddEventConsumer(g_system, consumer);
+               g_WS.ghost_system = GHOST_CreateSystem();
+               GHOST_AddEventConsumer(g_WS.ghost_system, consumer);
 
 
 
                playanim_window_open("Blender:Anim", start_x, start_y, ibuf->x, ibuf->y, 0);
-//XXX25                window_set_handler(g_window, add_to_mainqueue, NULL);
+//XXX25                window_set_handler(g_WS.ghost_window, add_to_mainqueue, NULL);
 
                glMatrixMode(GL_PROJECTION);
                glLoadIdentity();
@@ -887,9 +876,9 @@ void playanim(int argc, const char **argv)
                glMatrixMode(GL_MODELVIEW);
        }
 
-       GHOST_GetMainDisplayDimensions(g_system, &maxwinx, &maxwiny);
+       GHOST_GetMainDisplayDimensions(g_WS.ghost_system, &maxwinx, &maxwiny);
 
-       //GHOST_ActivateWindowDrawingContext(g_window);
+       //GHOST_ActivateWindowDrawingContext(g_WS.ghost_window);
 
        /* initialize the font */
        BLF_init(11, 72);
@@ -905,7 +894,7 @@ void playanim(int argc, const char **argv)
        glClearColor(0.0, 0.0, 0.0, 0.0);
        glClear(GL_COLOR_BUFFER_BIT);
 
-       GHOST_SwapWindowBuffers(g_window);
+       GHOST_SwapWindowBuffers(g_WS.ghost_window);
 
        if (sfra == -1 || efra == -1) {
                /* one of the frames was invalid, just use all images */
@@ -926,15 +915,18 @@ void playanim(int argc, const char **argv)
        pupdate_time();
        ptottime = 0;
 
+       /* newly added in 2.6x, without this images never get freed */
+#define USE_IMB_CACHE
+
        while (ps.go) {
                if (ps.pingpong)
                        ps.direction = -ps.direction;
 
                if (ps.direction == 1) {
-                       ps.picture = picsbase->first;
+                       ps.picture = picsbase.first;
                }
                else {
-                       ps.picture = picsbase->last;
+                       ps.picture = picsbase.last;
                }
 
                if (ps.picture == NULL) {
@@ -952,8 +944,9 @@ void playanim(int argc, const char **argv)
                if (ptottime > 0.0) ptottime = 0.0;
 
                while (ps.picture) {
+#ifndef USE_IMB_CACHE
                        if (ibuf != NULL && ibuf->ftype == 0) IMB_freeImBuf(ibuf);
-
+#endif
                        if (ps.picture->ibuf) {
                                ibuf = ps.picture->ibuf;
                        }
@@ -961,23 +954,31 @@ void playanim(int argc, const char **argv)
                                ibuf = IMB_anim_absolute(ps.picture->anim, ps.picture->frame, IMB_TC_NONE, IMB_PROXY_NONE);
                        }
                        else if (ps.picture->mem) {
+                               /* use correct colorspace here */
                                ibuf = IMB_ibImageFromMemory((unsigned char *) ps.picture->mem, ps.picture->size,
-                                                            ps.picture->IB_flags, ps.picture->name);
+                                                            ps.picture->IB_flags, NULL, ps.picture->name);
                        }
                        else {
-                               ibuf = IMB_loadiffname(ps.picture->name, ps.picture->IB_flags);
+                               /* use correct colorspace here */
+                               ibuf = IMB_loadiffname(ps.picture->name, ps.picture->IB_flags, NULL);
                        }
 
                        if (ibuf) {
+
+#ifdef USE_IMB_CACHE
+                               ps.picture->ibuf = ibuf;
+#endif
+
                                BLI_strncpy(ibuf->name, ps.picture->name, sizeof(ibuf->name));
 
+                               /* why only windows? (from 2.4x) - campbell */
 #ifdef _WIN32
-                               GHOST_SetTitle(g_window, picture->name);
+                               GHOST_SetTitle(g_WS.ghost_window, ps.picture->name);
 #endif
 
                                while (pupdate_time()) PIL_sleep_ms(1);
                                ptottime -= swaptime;
-                               toscreen(ps.picture, ibuf, ps.fontid);
+                               playanim_toscreen(ps.picture, ibuf, ps.fontid);
                        } /* else deleten */
                        else {
                                printf("error: can't play this image type\n");
@@ -997,12 +998,20 @@ void playanim(int argc, const char **argv)
 
 
                        {
-                               int hasevent = GHOST_ProcessEvents(g_system, 0);
+                               int hasevent = GHOST_ProcessEvents(g_WS.ghost_system, 0);
                                if (hasevent) {
-                                       GHOST_DispatchEvents(g_system);
+                                       GHOST_DispatchEvents(g_WS.ghost_system);
                                }
                        }
 
+                       /* XXX25 - we should not have to do this, but it makes scrubbing functional! */
+                       if (g_WS.qual & WS_QUAL_LMOUSE) {
+                               ps.next = 0;
+                       }
+                       else {
+                               ps.sstep = 0;
+                       }
+
                        ps.wait2 = ps.sstep;
 
                        if (ps.wait2 == 0 && ps.stopped == 0) {
@@ -1035,10 +1044,10 @@ void playanim(int argc, const char **argv)
                                }
                                if (ps.picture == NULL && ps.sstep) {
                                        if (ps.next < 0) {
-                                               ps.picture = picsbase->last;
+                                               ps.picture = picsbase.last;
                                        }
                                        else if (ps.next > 0) {
-                                               ps.picture = picsbase->first;
+                                               ps.picture = picsbase.first;
                                        }
                                }
                        }
@@ -1047,7 +1056,7 @@ void playanim(int argc, const char **argv)
                        }
                }
        }
-       ps.picture = picsbase->first;
+       ps.picture = picsbase.first;
        anim = NULL;
        while (ps.picture) {
                if (ps.picture && ps.picture->anim && (anim != ps.picture->anim)) {
@@ -1065,26 +1074,29 @@ void playanim(int argc, const char **argv)
 
                ps.picture = ps.picture->next;
        }
-#ifdef WITH_QUICKTIME
-#if defined(_WIN32) || defined(__APPLE__) && !defined(GHOST_COCOA)
-       if (G.have_quicktime) {
-               ExitMovies();
-#ifdef _WIN32
-               TerminateQTML();
-#endif /* _WIN32 */
-       }
-#endif /* _WIN32 || __APPLE__ && !defined(GHOST_COCOA) */
-#endif /* WITH_QUICKTIME */
 
        /* cleanup */
+#ifndef USE_IMB_CACHE
        if (ibuf) IMB_freeImBuf(ibuf);
-       BLI_freelistN(picsbase);
+#endif
+
+       BLI_freelistN(&picsbase);
+#if 0 // XXX25
        free_blender();
-       GHOST_DisposeWindow(g_system, g_window);
+#else
+       /* we still miss freeing a lot!,
+        * but many areas could skip initialization too for anim play */
+       IMB_exit();
+       BLF_exit();
+#endif
+       GHOST_DisposeWindow(g_WS.ghost_system, g_WS.ghost_window);
 
        totblock = MEM_get_memory_blocks_in_use();
        if (totblock != 0) {
+               /* prints many bAKey, bArgument's which are tricky to fix */
+#if 0
                printf("Error Totblock: %d\n", totblock);
                MEM_printmemlist();
+#endif
        }
 }