Mercurial > sdl-ios-xcode

comparison src/video/directfb/SDL_DirectFB_video.c @ 4568:25b9cd8bdc30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Couriersud to Sam I have done some quick changes and at least the code compiles again. It also works with a number of the test executables with the DFB X11 backend. I hope to find time to get SDLMAME to work with latest SDL1.3 (i.e. rip out multi-keyboard, multi-mice & cursor support) next week to test it further. Regards, André
author Sam Lantinga <slouken@libsdl.org>
date Fri, 23 Jul 2010 21:33:00 -0700
parents f7b03b6838cb
children b196d2758026
comparison
equal deleted inserted replaced
4567:1d7ea8724f4a 4568:25b9cd8bdc30
127 device->GL_DeleteContext = DirectFB_GL_DeleteContext; 127 device->GL_DeleteContext = DirectFB_GL_DeleteContext;
128 128
129 #endif 129 #endif
130 130
131 device->free = DirectFB_DeleteDevice; 131 device->free = DirectFB_DeleteDevice;
132 132 fprintf(LOG_CHANNEL, "Device setup %p!!\n", device->ShowWindow);
133 return device; 133 return device;
134 error: 134 error:
135 if (device) 135 if (device)
136 free(device); 136 free(device);
137 return (0); 137 return (0);
161 fprintf(LOG_CHANNEL, "\nVideo memoory: %d\n", desc.video_memory); 161 fprintf(LOG_CHANNEL, "\nVideo memoory: %d\n", desc.video_memory);
162 162
163 fprintf(LOG_CHANNEL, "\nBlitting flags:\n"); 163 fprintf(LOG_CHANNEL, "\nBlitting flags:\n");
164 for (n = 0; blitting_flags[n].flag; n++) { 164 for (n = 0; blitting_flags[n].flag; n++) {
165 if (desc.blitting_flags & blitting_flags[n].flag) 165 if (desc.blitting_flags & blitting_flags[n].flag)
166 printf(" %s\n", blitting_flags[n].name); 166 fprintf(LOG_CHANNEL, " %s\n", blitting_flags[n].name);
167 } 167 }
168 168
169 fprintf(LOG_CHANNEL, "\nDrawing flags:\n"); 169 fprintf(LOG_CHANNEL, "\nDrawing flags:\n");
170 for (n = 0; drawing_flags[n].flag; n++) { 170 for (n = 0; drawing_flags[n].flag; n++) {
171 if (desc.drawing_flags & drawing_flags[n].flag) 171 if (desc.drawing_flags & drawing_flags[n].flag)
172 printf(" %s\n", drawing_flags[n].name); 172 fprintf(LOG_CHANNEL, " %s\n", drawing_flags[n].name);
173 } 173 }
174
174 175
175 fprintf(LOG_CHANNEL, "\nAcceleration flags:\n"); 176 fprintf(LOG_CHANNEL, "\nAcceleration flags:\n");
176 for (n = 0; acceleration_mask[n].mask; n++) { 177 for (n = 0; acceleration_mask[n].mask; n++) {
177 if (desc.acceleration_mask & acceleration_mask[n].mask) 178 if (desc.acceleration_mask & acceleration_mask[n].mask)
178 printf(" %s\n", acceleration_mask[n].name); 179 fprintf(LOG_CHANNEL, " %s\n", acceleration_mask[n].name);
179 } 180 }
180 181
181 182
182 } 183 }
183 184
206 DirectFBSetOption("system", "x11"); 207 DirectFBSetOption("system", "x11");
207 else 208 else
208 DirectFBSetOption("disable-module", "x11input"); 209 DirectFBSetOption("disable-module", "x11input");
209 } 210 }
210 211
211 devdata->use_linux_input = 1; /* default: on */ 212 #if USE_MULTI_API
213 devdata->use_linux_input = 1; /* default: on */
212 stemp = SDL_getenv(DFBENV_USE_LINUX_INPUT); 214 stemp = SDL_getenv(DFBENV_USE_LINUX_INPUT);
213 if (stemp) 215 if (stemp)
214 devdata->use_linux_input = atoi(stemp); 216 devdata->use_linux_input = atoi(stemp);
217 #else
218 devdata->use_linux_input = 0; /* no way to support this ... */
219 #endif
215 220
216 if (!devdata->use_linux_input) 221 if (!devdata->use_linux_input)
217 DirectFBSetOption("disable-module", "linux_input"); 222 DirectFBSetOption("disable-module", "linux_input");
218 223
219 SDL_DFB_CHECKERR(DirectFBCreate(&dfb)); 224 SDL_DFB_CHECKERR(DirectFBCreate(&dfb));