Put in a couple of fixes that I realized hadn't gotten done when I wrote out the SCRUM stuff in TODO. Added SCRUM listings in TODO.
authorEli Gottlieb <eligottlieb@gmail.com>
Fri, 09 Jul 2010 20:24:44 -0400
changeset 47880bfda420c936
parent 4787 e25ad8d97027
child 4789 a6bc01875d20
Put in a couple of fixes that I realized hadn't gotten done when I wrote out the SCRUM stuff in TODO. Added SCRUM listings in TODO.
TODO
src/video/win32/SDL_win32events.c
src/video/win32/SDL_win32video.c
     1.1 --- a/TODO	Thu Jul 08 22:52:49 2010 -0400
     1.2 +++ b/TODO	Fri Jul 09 20:24:44 2010 -0400
     1.3 @@ -1,3 +1,25 @@
     1.4 +Eli Gottlieb's checklist for the GSOC shaped windows project.  Dated July 9, 2010.
     1.5 +1. Enable proper linking of the X11 implementation and test it.
     1.6 +--> Find the place in the build system for platform-specific linking flags.  STATUS: BLOODY IMPOSSIBLE.
     1.7 +--> Add a linker flag to bring in libXext.a. STATUS: WILL BE SIMPLE ONCE PREVIOUS STEP IS ACCOMPLISHED (kshemashiach yagia).
     1.8 +2. Build the Win32 implementation of shaped-windows functionality.
     1.9 +--> Add driver functions to the SDL_ShapeDriver in the Win32 driver's SDL_DisplayDevice at the proper point in the code.  STATUS: CHECK.
    1.10 +--> Add a hook in the Windows resize-window code to call Win32_ResizeWindowShape().  STATUS: CHECK.
    1.11 +3. Enable building the testeyes program.
    1.12 +--> Reprogram it to use the latest shaped-windows API.  STATUS: CHECK.
    1.13 +--> Get it, along with the rest of the test suite in my branch, building successfully.  STATUS: REQUIRES X11 IMPLEMENTATION TO LINK PROPERLY AND/OR A BUILD-BUDDY BUILDING AND RUNNING THE TEST FOR ME.
    1.14 +--> Debug testeyes and the platform-specific shaped-window implementations in tandem.  STATUS: TO BEGIN, CURRENT SPRINT.
    1.15 +4. Implement the SDL shaped-windows API for Mac OS X using Cocoa.  STATUS: NEXT SPRINT.
    1.16 +--> Locate (once more) the API documentation for shaped windows under Cocoa.
    1.17 +--> Design and encode a version of SDL_ShapeData for Cocoa.
    1.18 +--> Write Cocoa_CreateShaper().
    1.19 +--> Write Cocoa_ResizeWindowShape().
    1.20 +--> Write Cocoa_SetWindowShape().
    1.21 +--> If necessary, implement functionality adjunct to SDL_CalculateShapeBitmap() for Cocoa usage.
    1.22 +5. Use testeyes to debug all implementations. STATUS: SPRINT + 2.
    1.23 +--> Debug Cocoa implementation.
    1.24 +--> Debug Win32 implementation.
    1.25 +--> Debug X11 implementation (again).
    1.26  
    1.27  1.3 release checklist:
    1.28   * http://wiki.libsdl.org/moin.cgi/Roadmap
     2.1 --- a/src/video/win32/SDL_win32events.c	Thu Jul 08 22:52:49 2010 -0400
     2.2 +++ b/src/video/win32/SDL_win32events.c	Fri Jul 09 20:24:44 2010 -0400
     2.3 @@ -492,6 +492,8 @@
     2.4              BOOL menu;
     2.5  
     2.6              /* If we allow resizing, let the resize happen naturally */
     2.7 +            if(SDL_IsShapedWindow(data->window))
     2.8 +                SDL_ResizeWindowShape(data->window);
     2.9              if (SDL_GetWindowFlags(data->window) & SDL_WINDOW_RESIZABLE) {
    2.10                  returnCode = 0;
    2.11                  break;
     3.1 --- a/src/video/win32/SDL_win32video.c	Thu Jul 08 22:52:49 2010 -0400
     3.2 +++ b/src/video/win32/SDL_win32video.c	Fri Jul 09 20:24:44 2010 -0400
     3.3 @@ -28,6 +28,7 @@
     3.4  #include "../SDL_pixels_c.h"
     3.5  
     3.6  #include "SDL_win32video.h"
     3.7 +#include "SDL_win32shape.h"
     3.8  #include "SDL_d3drender.h"
     3.9  #include "SDL_gdirender.h"
    3.10  
    3.11 @@ -183,6 +184,11 @@
    3.12      device->SetWindowGrab = WIN_SetWindowGrab;
    3.13      device->DestroyWindow = WIN_DestroyWindow;
    3.14      device->GetWindowWMInfo = WIN_GetWindowWMInfo;
    3.15 +    
    3.16 +    device->shape_driver.CreateShaper = Win32_CreateShaper;
    3.17 +    device->shape_driver.SetWindowShape = Win32_SetWindowShape;
    3.18 +    device->shape_driver.ResizeWindowShape = Win32_ResizeWindowShape;
    3.19 +    
    3.20  #ifdef SDL_VIDEO_OPENGL_WGL
    3.21      device->GL_LoadLibrary = WIN_GL_LoadLibrary;
    3.22      device->GL_GetProcAddress = WIN_GL_GetProcAddress;