Mercurial > sdl-ios-xcode
annotate src/video/SDL_drawpoint.c @ 4425:a3e71b957215
Fixed bug #961
Kalle Olavi Niemitalo 2010-02-28 09:15:50 PST
It seems the SDLK_LMETA and SDLK_RMETA constants have been removed from SDL
1.3. I grepped for them in the SDL source tree and these were the only hits:
./include/SDL_compat.h:230:#define SDLK_LSUPER SDLK_LMETA
./include/SDL_compat.h:231:#define SDLK_RSUPER SDLK_RMETA
./src/video/bwindow/SDL_BWin.h:194: keymap[0x66] = SDLK_LMETA;
./src/video/bwindow/SDL_BWin.h:195: keymap[0x67] = SDLK_RMETA;
I don't know how compatible SDL 1.3 is supposed to be with applications
designed for SDL 1.2. However, as you can see, SDL itself is still trying to
use the removed constants, and that is clearly a bug.
Because SDL_compat.h defines KMOD_LMETA as KMOD_LGUI, I suppose it should also
define SDLK_LMETA as SDLK_LGUI, and SDLK_RMETA likewise.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 09 Mar 2010 06:07:48 +0000 |
| parents | f7b03b6838cb |
| children |
| rev | line source |
|---|---|
| 2901 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 3697 | 3 Copyright (C) 1997-2010 Sam Lantinga |
| 2901 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Lesser General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2.1 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Lesser General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Lesser General Public | |
| 16 License along with this library; if not, write to the Free Software | |
| 17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |
| 18 | |
| 19 Sam Lantinga | |
| 20 slouken@libsdl.org | |
| 21 */ | |
| 22 #include "SDL_config.h" | |
| 23 | |
| 24 #include "SDL_draw.h" | |
| 25 | |
| 26 | |
| 27 int | |
| 28 SDL_DrawPoint(SDL_Surface * dst, int x, int y, Uint32 color) | |
| 29 { | |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
30 if (!dst) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
31 SDL_SetError("Passed NULL destination surface"); |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
32 return -1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
33 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
34 |
| 2901 | 35 /* This function doesn't work on surfaces < 8 bpp */ |
| 36 if (dst->format->BitsPerPixel < 8) { | |
| 3160 | 37 SDL_SetError("SDL_DrawPoint(): Unsupported surface format"); |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
38 return -1; |
| 2901 | 39 } |
| 40 | |
| 41 /* Perform clipping */ | |
| 42 if (x < dst->clip_rect.x || y < dst->clip_rect.y || | |
| 43 x >= (dst->clip_rect.x + dst->clip_rect.w) || | |
| 44 y >= (dst->clip_rect.y + dst->clip_rect.h)) { | |
| 45 return 0; | |
| 46 } | |
| 47 | |
| 48 switch (dst->format->BytesPerPixel) { | |
| 49 case 1: | |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
50 DRAW_FASTSETPIXELXY1(x, y); |
| 2901 | 51 break; |
| 52 case 2: | |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
53 DRAW_FASTSETPIXELXY2(x, y); |
| 2901 | 54 break; |
| 55 case 3: | |
| 56 SDL_Unsupported(); | |
| 57 return -1; | |
| 58 case 4: | |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
59 DRAW_FASTSETPIXELXY4(x, y); |
| 2901 | 60 break; |
| 61 } | |
| 62 return 0; | |
| 63 } | |
| 64 | |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
65 int |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
66 SDL_DrawPoints(SDL_Surface * dst, const SDL_Point * points, int count, |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
67 Uint32 color) |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
68 { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
69 int minx, miny; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
70 int maxx, maxy; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
71 int i; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
72 int x, y; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
73 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
74 if (!dst) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
75 SDL_SetError("Passed NULL destination surface"); |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
76 return -1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
77 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
78 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
79 /* This function doesn't work on surfaces < 8 bpp */ |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
80 if (dst->format->BitsPerPixel < 8) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
81 SDL_SetError("SDL_DrawPoints(): Unsupported surface format"); |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
82 return -1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
83 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
84 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
85 minx = dst->clip_rect.x; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
86 maxx = dst->clip_rect.x + dst->clip_rect.w - 1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
87 miny = dst->clip_rect.y; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
88 maxy = dst->clip_rect.y + dst->clip_rect.h - 1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
89 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
90 for (i = 0; i < count; ++i) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
91 x = points[i].x; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
92 y = points[i].y; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
93 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
94 if (x < minx || x > maxx || y < miny || y > maxy) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
95 continue; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
96 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
97 |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
98 switch (dst->format->BytesPerPixel) { |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
99 case 1: |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
100 DRAW_FASTSETPIXELXY1(x, y); |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
101 break; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
102 case 2: |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
103 DRAW_FASTSETPIXELXY2(x, y); |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
104 break; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
105 case 3: |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
106 SDL_Unsupported(); |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
107 return -1; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
108 case 4: |
|
3596
f638ded38b8a
Added SDL_RenderClear() as a fast method of clearing the screen to the drawing color.
Sam Lantinga <slouken@libsdl.org>
parents:
3536
diff
changeset
|
109 DRAW_FASTSETPIXELXY4(x, y); |
|
3536
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
110 break; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
111 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
112 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
113 return 0; |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
114 } |
|
0267b8b1595c
Added interfaces for batch drawing of points, lines and rects:
Sam Lantinga <slouken@libsdl.org>
parents:
3160
diff
changeset
|
115 |
| 2901 | 116 /* vi: set ts=4 sw=4 expandtab: */ |