Mercurial > love-experiments

comparison src/modules/window/sdl/Window.cpp @ 1418:357697c2e2a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More internal code cleanup
author Alex Szpakowski <slime73@gmail.com>
date Sun, 31 Mar 2013 19:02:27 -0300
parents 9115e52f5350
children
comparison
equal deleted inserted replaced
1417:c70c9e4d10f3 1418:357697c2e2a8
209 return (bpp >= 16); 209 return (bpp >= 16);
210 } 210 }
211 211
212 typedef Window::WindowSize WindowSize; 212 typedef Window::WindowSize WindowSize;
213 213
214 WindowSize **Window::getFullscreenSizes(int &n) const 214 WindowSize *Window::getFullscreenSizes(int &n) const
215 { 215 {
216 SDL_Rect **modes = SDL_ListModes(0, SDL_OPENGL | SDL_FULLSCREEN); 216 SDL_Rect **modes = SDL_ListModes(0, SDL_OPENGL | SDL_FULLSCREEN);
217 217
218 if (modes == (SDL_Rect **)0 || modes == (SDL_Rect **)-1) 218 if (modes == (SDL_Rect **)0 || modes == (SDL_Rect **)-1)
219 { 219 {
223 223
224 n = 0; 224 n = 0;
225 for (int i = 0; modes[i]; i++) 225 for (int i = 0; modes[i]; i++)
226 n++; 226 n++;
227 227
228 WindowSize **sizes = new WindowSize*[n]; 228 WindowSize *sizes = new WindowSize[n];
229 229
230 for (int i = 0; i < n; i++) 230 for (int i = 0; i < n; i++)
231 { 231 {
232 sizes[i] = new WindowSize; 232 WindowSize w = {modes[i]->w, modes[i]->h};
233 sizes[i]->width = modes[i]->w; 233 sizes[i] = w;
234 sizes[i]->height = modes[i]->h;
235 } 234 }
236 return sizes; 235 return sizes;
237 } 236 }
238 237
239 int Window::getWidth() const 238 int Window::getWidth() const
249 bool Window::isCreated() const 248 bool Window::isCreated() const
250 { 249 {
251 return created; 250 return created;
252 } 251 }
253 252
254 void Window::setWindowTitle(std::string &title) 253 void Window::setWindowTitle(const std::string &title)
255 { 254 {
256 windowTitle = title; 255 windowTitle = title;
257 SDL_WM_SetCaption(windowTitle.c_str(), 0); 256 SDL_WM_SetCaption(windowTitle.c_str(), 0);
258 } 257 }
259 258