sdl-ios-xcode: src/video/photon/SDL

comparison src/video/photon/SDL_photon.c @ 3375:dd105b317335

Continue working on 2D support for Photon/QNX.

author	Mike Gorchak <lestat@i.com.ua>
date	Sat, 10 Oct 2009 20:15:20 +0000
parents	64e4442676a6
children	90935231e9b6

comparison

equal deleted inserted replaced

-:725b16784e96
+:dd105b317335
 /* Use GF's pixel format functions for OpenGL ES context creation */
 #if defined(SDL_VIDEO_OPENGL_ES)
 #include "../qnxgf/SDL_gf_pixelfmt.h"
 /* If GF driver is not compiled in, include some of usefull functions */
 #if !defined(SDL_VIDEO_DRIVER_QNXGF)
 #include "../qnxgf/SDL_gf_pixelfmt.c"
 #endif /* SDL_VIDEO_DRIVER_QNXGF */
 #endif /* SDL_VIDEO_OPENGL_ES */
 /* Use GF's OpenGL ES 1.1 functions emulation */
 #if defined(SDL_VIDEO_OPENGL_ES)
 #include "../qnxgf/SDL_gf_opengles.h"
 /* If GF driver is not compiled in, include some of usefull functions */
 #if !defined(SDL_VIDEO_DRIVER_QNXGF)
 #include "../qnxgf/SDL_gf_opengles.c"
 #endif /* SDL_VIDEO_DRIVER_QNXGF */
 #endif /* SDL_VIDEO_OPENGL_ES */
 {"tvia", SDL_PHOTON_ACCELERATED | SDL_PHOTON_UNACCELERATED_3D}
 ,
 /* VIA UniChrome graphics driver (devg-unichrome.so)    */
 {"unichrome", SDL_PHOTON_ACCELERATED | SDL_PHOTON_UNACCELERATED_3D}
 ,
-/* VESA unaccelerated gfx driver (devg-vesa.so)         */
+/* VESA unaccelerated gfx driver (devg-vesabios.so)     */
 {"vesa", SDL_PHOTON_UNACCELERATED | SDL_PHOTON_UNACCELERATED_3D}
 ,
 /* VmWare graphics driver (devg-volari.so)              */
 {"vmware", SDL_PHOTON_ACCELERATED | SDL_PHOTON_UNACCELERATED_3D}
 ,
 static SDL_bool photon_initialized = SDL_FALSE;
 static int
 photon_available(void)
 {
-int status;
+int32_t status;
 /* Check if Photon was initialized before */
 if (photon_initialized == SDL_FALSE) {
 /* Initialize Photon widget library and open channel to Photon */
 status = PtInit(NULL);
 static SDL_VideoDevice *
 photon_create(int devindex)
 {
 SDL_VideoDevice *device;
 SDL_VideoData *phdata;
-int status;
+int32_t status;
 /* Check if photon could be initialized */
 status = photon_available();
 if (status == 0) {
 /* Photon could not be used */
 PtSetArg(&winargs[winargc++], Pt_ARG_WINDOW_STATE, Pt_FALSE,
 Ph_WM_STATE_ISFOCUS);
 PtSetArg(&winargs[winargc++], Pt_ARG_WINDOW_STATE, Pt_TRUE,
 Ph_WM_STATE_ISALTKEY);
+/* Special case, do not handle maximize events, if window can't be resized */
+if ((window->flags & SDL_WINDOW_RESIZABLE) != SDL_WINDOW_RESIZABLE)
+{
+PtSetArg(&winargs[winargc++], Pt_ARG_WINDOW_MANAGED_FLAGS, Pt_FALSE,
+Ph_WM_MAX | Ph_WM_RESTORE | Ph_WM_RESIZE);
+}
 /* Set window dimension */
 winsize.w = window->w;
 winsize.h = window->h;
 PtSetArg(&winargs[winargc++], Pt_ARG_DIM, &winsize, 0);
 SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
 if (phdata->gfinitialized != SDL_TRUE) {
 SDL_SetError
 ("Photon: GF initialization failed, no OpenGL ES support");
-return NULL;
+return -1;
 }
 /* Check if OpenGL ES library is specified for GF driver */
 if (path == NULL) {
 path = SDL_getenv("SDL_OPENGL_LIBRARY");
 SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata;
 SDL_DisplayData *didata =
 (SDL_DisplayData *) SDL_CurrentDisplay.driverdata;
 PhRect_t dst_rect;
 PhRect_t src_rect;
+int32_t status;
 if (phdata->gfinitialized != SDL_TRUE) {
 SDL_SetError
 ("Photon: GF initialization failed, no OpenGL ES support");
 return;
 dst_rect = *PtGetCanvas(wdata->window);
 src_rect.ul.x = 0;
 src_rect.ul.y = 0;
 src_rect.lr.x = window->w - 1;
 src_rect.lr.y = window->h - 1;
+/* Check if current device is not the same as target */
+if (phdata->current_device_id != didata->device_id) {
+/* Set target device as default for Pd and Pg functions */
+status = PdSetTargetDevice(NULL, phdata->rid[didata->device_id]);
+if (status != 0) {
+SDL_SetError("Photon: Can't set default target device\n");
+return;
+}
+phdata->current_device_id = didata->device_id;
+}
 /* Blit OpenGL ES pixmap surface directly to window region */
 PgFFlush(Ph_START_DRAW);
 PgSetRegionCx(PhDCGetCurrent(), PtWidgetRid(wdata->window));
 PgClearTranslationCx(PgGetGCCx(PhDCGetCurrent()));
 /* Check if expose come to one of the our windows */
 if ((wdata != NULL) && (window != NULL)) {
 /* Check if window uses OpenGL ES */
 if (wdata->uses_gles == SDL_TRUE) {
-PhRect_t dst_rect;
-PhRect_t src_rect;
 /* Cycle through each rectangle */
-for (it = 0; it < event->num_rects;
+for (it = 0; it < event->num_rects; it++) {
-it++) {
 /* Blit OpenGL ES pixmap surface directly to window region */
 PgFFlush(Ph_START_DRAW);
 PgSetRegionCx(PhDCGetCurrent(),
 PtWidgetRid(wdata->
 window));
 &rects[it]);
 PgFFlush(Ph_DONE_DRAW);
 PgWaitHWIdle();
 }
 } else {
-/* Normal window */
+/* Cycle through each rectangle */
-/* TODO: update the damaged rectangles */
+for (it = 0; it < event->num_rects;
+it++) {
+/* Blit 2D pixmap surface directly to window region */
+_photon_update_rectangles(window->renderer, &rects[it]);
+}
+PgFlush();
+PgWaitHWIdle();
 }
 }
 /* Flush all blittings */
 PgFlush();
 &src_rect, NULL,
 &dst_rect);
 PgFFlush(Ph_DONE_DRAW);
 PgWaitHWIdle();
 } else {
-/* Normal window */
+PhRect_t rect;
-/* TODO: update the damaged rectangles */
 /* We need to redraw entire window */
+rect.ul.x = 0;
+rect.ul.y = 0;
+rect.lr.x = window->w - 1;
+rect.lr.y = window->h - 1;
+/* Blit 2D pixmap surface directly to window region */
+PgFFlush(Ph_START_DRAW);
+_photon_update_rectangles(window->renderer, &rect);
+PgFFlush(Ph_DONE_DRAW);
+PgWaitHWIdle();
 }
 }
 }
 break;
 case Ph_GRAPHIC_EXPOSE:
 }
 break;
 case Ph_WM_MAX:
 {
 if (window != NULL) {
-SDL_SendWindowEvent(window->id,
+if ((window->flags & SDL_WINDOW_RESIZABLE)==SDL_WINDOW_RESIZABLE)
-SDL_WINDOWEVENT_MAXIMIZED,
+{
-0, 0);
+SDL_SendWindowEvent(window->id,
+SDL_WINDOWEVENT_MAXIMIZED,
+0, 0);
+}
+else
+{
+/* otherwise ignor the resize events */
+}
 }
 }
 break;
 case Ph_WM_RESTORE:
 {

Mercurial > sdl-ios-xcode

comparison src/video/photon/SDL_photon.c @ 3375:dd105b317335