Mercurial > sdl-ios-xcode

annotate src/video/SDL_shape.c @ 4855:6d4d6605a0d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
author Eli Gottlieb <eligottlieb@gmail.com>
date Sun, 15 Aug 2010 23:57:50 -0400
parents c19c729eb201
children 1ff5dfaafdc8
rev   line source
4765
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
1 /*
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
2 SDL - Simple DirectMedia Layer
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
3 Copyright (C) 2010 Eli Gottlieb
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
4
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
5 This library is free software; you can redistribute it and/or
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
6 modify it under the terms of the GNU Lesser General Public
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
7 License as published by the Free Software Foundation; either
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
8 version 2.1 of the License, or (at your option) any later version.
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
9
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
10 This library is distributed in the hope that it will be useful,
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
13 Lesser General Public License for more details.
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
14
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
15 You should have received a copy of the GNU Lesser General Public
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
16 License along with this library; if not, write to the Free Software
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
18
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
19 Eli Gottlieb
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
20 eligottlieb@gmail.com
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
21 */
4769
83f9b95da263 Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4766
diff changeset
22 #include "SDL_config.h"
4776
29dcad9c58b3 Removed and added back SDL_shape.{c,h} wholesale. Will this get them tracked properly?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4775
diff changeset
23
4769
83f9b95da263 Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4766
diff changeset
24 #include "SDL.h"
4841
740e833b2c00 Fixed overwriting of SDL_shape.c in merge.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4839
diff changeset
25 #include "SDL_assert.h"
4769
83f9b95da263 Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4766
diff changeset
26 #include "SDL_video.h"
83f9b95da263 Added the standard headers and footers that make SDL_shape.h and SDL_shape.c integrate properly into the build.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4766
diff changeset
27 #include "SDL_sysvideo.h"
4782
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
28 #include "SDL_pixels.h"
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
29 #include "SDL_surface.h"
4765
5ff305de5834 Added stub files, working on sample program SDLeyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
diff changeset
30 #include "SDL_shape.h"
4841
740e833b2c00 Fixed overwriting of SDL_shape.c in merge.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4839
diff changeset
31 #include "SDL_shape_internals.h"
4766
7b50faf23907 Moved SDL_shape.h, and building out the API as needed by SDL_Eyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4765
diff changeset
32
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
33 SDL_Window*
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
34 SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
4855
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
35 SDL_Window *result = NULL;
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
36 flags |= SDL_WINDOW_BORDERLESS;
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
37 flags &= (~SDL_WINDOW_RESIZABLE);
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
38 flags &= (~SDL_WINDOW_FULLSCREEN);
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
39 //flags &= (~SDL_WINDOW_SHOWN);
6d4d6605a0d3 Set flag bits *exactly* as Andreas showed me in his screenshot. This shouldn't be different, but what do I know about C's order of operations?
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4852
diff changeset
40 result = SDL_CreateWindow(title,x,y,w,h,flags | SDL_WINDOW_BORDERLESS & ~SDL_WINDOW_FULLSCREEN & ~SDL_WINDOW_RESIZABLE);
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
41 if(result != NULL) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
42 result->shaper = result->display->device->shape_driver.CreateShaper(result);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
43 if(result->shaper != NULL) {
4851
5624fb0190b5 Changed flags and positioning (for the fake-hiding) as Andreas recommended.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4850
diff changeset
44 result->shaper->userx = x;
5624fb0190b5 Changed flags and positioning (for the fake-hiding) as Andreas recommended.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4850
diff changeset
45 result->shaper->usery = y;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
46 result->shaper->mode.mode = ShapeModeDefault;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
47 result->shaper->mode.parameters.binarizationCutoff = 1;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
48 result->shaper->hasshape = SDL_FALSE;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
49 return result;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
50 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
51 else {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
52 SDL_DestroyWindow(result);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
53 return NULL;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
54 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
55 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
56 else
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
57 return NULL;
4766
7b50faf23907 Moved SDL_shape.h, and building out the API as needed by SDL_Eyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4765
diff changeset
58 }
7b50faf23907 Moved SDL_shape.h, and building out the API as needed by SDL_Eyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4765
diff changeset
59
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
60 SDL_bool
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
61 SDL_IsShapedWindow(const SDL_Window *window) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
62 if(window == NULL)
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
63 return SDL_FALSE;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
64 else
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
65 return (SDL_bool)(window->shaper != NULL);
4782
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
66 }
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
67
4813
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
68 /* REQUIRES that bitmap point to a w-by-h bitmap with ppb pixels-per-byte. */
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
69 void
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
70 SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
71 int x = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
72 int y = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
73 Uint8 r = 0,g = 0,b = 0,alpha = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
74 Uint8* pixel = NULL;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
75 Uint32 bitmap_pixel,pixel_value = 0,mask_value = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
76 SDL_Color key;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
77 if(SDL_MUSTLOCK(shape))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
78 SDL_LockSurface(shape);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
79 pixel = (Uint8*)shape->pixels;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
80 for(y = 0;y<shape->h;y++) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
81 for(x=0;x<shape->w;x++) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
82 alpha = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
83 pixel_value = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
84 pixel = (Uint8 *)(shape->pixels) + (y*shape->pitch) + (x*shape->format->BytesPerPixel);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
85 switch(shape->format->BytesPerPixel) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
86 case(1):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
87 pixel_value = *(Uint8*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
88 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
89 case(2):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
90 pixel_value = *(Uint16*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
91 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
92 case(3):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
93 pixel_value = *(Uint32*)pixel & (~shape->format->Amask);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
94 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
95 case(4):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
96 pixel_value = *(Uint32*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
97 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
98 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
99 SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
100 bitmap_pixel = y*shape->w + x;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
101 switch(mode.mode) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
102 case(ShapeModeDefault):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
103 mask_value = (alpha >= 1 ? 1 : 0);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
104 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
105 case(ShapeModeBinarizeAlpha):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
106 mask_value = (alpha >= mode.parameters.binarizationCutoff ? 1 : 0);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
107 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
108 case(ShapeModeReverseBinarizeAlpha):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
109 mask_value = (alpha <= mode.parameters.binarizationCutoff ? 1 : 0);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
110 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
111 case(ShapeModeColorKey):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
112 key = mode.parameters.colorKey;
4846
4f1573996a65 Fixed a bug in X11 shaping that refused to use color-key mode.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4843
diff changeset
113 mask_value = ((key.r != r || key.g != g || key.b != b) ? 1 : 0);
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
114 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
115 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
116 bitmap[bitmap_pixel / ppb] |= mask_value << (7 - ((ppb - 1) - (bitmap_pixel % ppb)));
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
117 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
118 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
119 if(SDL_MUSTLOCK(shape))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
120 SDL_UnlockSurface(shape);
4766
7b50faf23907 Moved SDL_shape.h, and building out the API as needed by SDL_Eyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4765
diff changeset
121 }
7b50faf23907 Moved SDL_shape.h, and building out the API as needed by SDL_Eyes.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4765
diff changeset
122
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
123 SDL_ShapeTree*
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
124 RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rect dimensions) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
125 int x = 0,y = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
126 Uint8* pixel = NULL;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
127 Uint32 pixel_value = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
128 Uint8 r = 0,g = 0,b = 0,a = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
129 SDL_bool pixel_opaque = SDL_FALSE;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
130 int last_opaque = -1;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
131 SDL_Color key;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
132 SDL_ShapeTree* result = (SDL_ShapeTree*)SDL_malloc(sizeof(SDL_ShapeTree));
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
133 SDL_Rect next = {0,0,0,0};
4852
c19c729eb201 Added hiding-as-positioning trick and finally fixed flags.
egottlieb
parents: 4851
diff changeset
134 for(y=dimensions.y;y<dimensions.y + dimensions.h;y++) {
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
135 for(x=dimensions.x;x<dimensions.x + dimensions.w;x++) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
136 pixel_value = 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
137 pixel = (Uint8 *)(mask->pixels) + (y*mask->pitch) + (x*mask->format->BytesPerPixel);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
138 switch(mask->format->BytesPerPixel) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
139 case(1):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
140 pixel_value = *(Uint8*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
141 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
142 case(2):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
143 pixel_value = *(Uint16*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
144 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
145 case(3):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
146 pixel_value = *(Uint32*)pixel & (~mask->format->Amask);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
147 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
148 case(4):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
149 pixel_value = *(Uint32*)pixel;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
150 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
151 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
152 SDL_GetRGBA(pixel_value,mask->format,&r,&g,&b,&a);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
153 switch(mode.mode) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
154 case(ShapeModeDefault):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
155 pixel_opaque = (a >= 1 ? SDL_TRUE : SDL_FALSE);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
156 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
157 case(ShapeModeBinarizeAlpha):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
158 pixel_opaque = (a >= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
159 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
160 case(ShapeModeReverseBinarizeAlpha):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
161 pixel_opaque = (a <= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
162 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
163 case(ShapeModeColorKey):
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
164 key = mode.parameters.colorKey;
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
165 pixel_opaque = ((key.r != r || key.g != g || key.b != b) ? SDL_TRUE : SDL_FALSE);
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
166 break;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
167 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
168 if(last_opaque == -1)
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
169 last_opaque = pixel_opaque;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
170 if(last_opaque != pixel_opaque) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
171 result->kind = QuadShape;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
172 //These will stay the same.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
173 next.w = dimensions.w / 2;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
174 next.h = dimensions.h / 2;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
175 //These will change from recursion to recursion.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
176 next.x = dimensions.x;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
177 next.y = dimensions.y;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
178 result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
179 next.x += next.w;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
180 //Unneeded: next.y = dimensions.y;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
181 result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
182 next.x = dimensions.x;
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
183 next.y += next.h;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
184 result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
185 next.x += next.w;
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
186 //Unneeded: next.y = dimensions.y + dimensions.h /2;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
187 result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
188 return result;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
189 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
190 }
4852
c19c729eb201 Added hiding-as-positioning trick and finally fixed flags.
egottlieb
parents: 4851
diff changeset
191 }
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
192 //If we never recursed, all the pixels in this quadrant have the same "value".
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
193 result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
194 result->data.shape = dimensions;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
195 return result;
4813
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
196 }
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
197
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
198 SDL_ShapeTree*
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
199 SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
200 SDL_Rect dimensions = {0,0,shape->w,shape->h};
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
201 SDL_ShapeTree* result = NULL;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
202 if(SDL_MUSTLOCK(shape))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
203 SDL_LockSurface(shape);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
204 result = RecursivelyCalculateShapeTree(mode,shape,dimensions);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
205 if(SDL_MUSTLOCK(shape))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
206 SDL_UnlockSurface(shape);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
207 return result;
4813
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
208 }
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
209
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
210 void
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
211 SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
212 SDL_assert(tree != NULL);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
213 if(tree->kind == QuadShape) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
214 SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upleft,function,closure);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
215 SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upright,function,closure);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
216 SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downleft,function,closure);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
217 SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downright,function,closure);
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
218 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
219 else
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
220 function(tree,closure);
4813
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
221 }
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
222
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
223 void
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
224 SDL_FreeShapeTree(SDL_ShapeTree** shape_tree) {
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
225 if((*shape_tree)->kind == QuadShape) {
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
226 SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.upleft);
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
227 SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.upright);
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
228 SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.downleft);
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
229 SDL_FreeShapeTree((SDL_ShapeTree **)&(*shape_tree)->data.children.downright);
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
230 }
4850
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
231 SDL_free(*shape_tree);
14870d46ee2d Mostly seem to have fixed SDL_CalculateShapeTree. Mostly. There still seem to be some rendering artifacts, stepping effects, and such on Windows -- which indicates subtle logic errors in SDL_CalculateShapeTree().
egottlieb
parents: 4849
diff changeset
232 *shape_tree = NULL;
4813
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
233 }
5b4c7d7d8953 Wrote out the system for breaking shape-masks into quad-trees of rectangles, and added code to conglomerate those quad-trees of rectangles into regions for setting shapes under Win32.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4810
diff changeset
234
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
235 int
4849
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
236 SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
237 int result;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
238 if(window == NULL || !SDL_IsShapedWindow(window))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
239 //The window given was not a shapeable window.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
240 return SDL_NONSHAPEABLE_WINDOW;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
241 if(shape == NULL)
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
242 //Invalid shape argument.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
243 return SDL_INVALID_SHAPE_ARGUMENT;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
244
4849
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
245 if(shape_mode != NULL)
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
246 window->shaper->mode = *shape_mode;
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
247 result = window->display->device->shape_driver.SetWindowShape(window->shaper,shape,shape_mode);
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
248 window->shaper->hasshape = SDL_TRUE;
4852
c19c729eb201 Added hiding-as-positioning trick and finally fixed flags.
egottlieb
parents: 4851
diff changeset
249 if(window->shaper->userx != 0 && window->shaper->usery != 0) {
4851
5624fb0190b5 Changed flags and positioning (for the fake-hiding) as Andreas recommended.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4850
diff changeset
250 SDL_SetWindowPosition(window,window->shaper->userx,window->shaper->usery);
5624fb0190b5 Changed flags and positioning (for the fake-hiding) as Andreas recommended.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4850
diff changeset
251 window->shaper->userx = 0;
5624fb0190b5 Changed flags and positioning (for the fake-hiding) as Andreas recommended.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4850
diff changeset
252 window->shaper->usery = 0;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
253 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
254 return result;
4782
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
255 }
b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4781
diff changeset
256
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
257 SDL_bool
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
258 SDL_WindowHasAShape(SDL_Window *window) {
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
259 if (window == NULL || !SDL_IsShapedWindow(window))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
260 return SDL_FALSE;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
261 return window->shaper->hasshape;
4778
9838d3525a1b Stubbed out the new get/set parameter functions, added the start of the enum, union, and struct for those parameters themselves, and added doxygen comments throughout the SDL_shape.h header.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4776
diff changeset
262 }
9838d3525a1b Stubbed out the new get/set parameter functions, added the start of the enum, union, and struct for those parameters themselves, and added doxygen comments throughout the SDL_shape.h header.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4776
diff changeset
263
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
264 int
4849
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
265 SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode) {
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
266 if(window != NULL && SDL_IsShapedWindow(window)) {
4849
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
267 if(shape_mode == NULL) {
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
268 if(SDL_WindowHasAShape(window))
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
269 //The window given has a shape.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
270 return 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
271 else
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
272 //The window given is shapeable but lacks a shape.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
273 return SDL_WINDOW_LACKS_SHAPE;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
274 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
275 else {
4849
0b918c186938 Finally got the Win32 API code for shaping to work! Just need to fix SDL_CalculateShapeTree() now!
egottlieb
parents: 4848
diff changeset
276 *shape_mode = window->shaper->mode;
4843
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
277 return 0;
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
278 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
279 }
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
280 else
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
281 //The window given is not a valid shapeable window.
0998d1b5dd23 Fixed formatting of SDL_shape.c post-merge again.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4841
diff changeset
282 return SDL_NONSHAPEABLE_WINDOW;
4778
9838d3525a1b Stubbed out the new get/set parameter functions, added the start of the enum, union, and struct for those parameters themselves, and added doxygen comments throughout the SDL_shape.h header.
Eli Gottlieb <eligottlieb@gmail.com>
parents: 4776
diff changeset
283 }