Commit 38203e11 by kollo

little corrections (of warnings) with WINDOWS/SDL version

parent bdb26ca8
/*
SDL_rotozoom.c: rotozoomer, zoomer and shrinker for 32bit or 8bit surfaces
Copyright (C) 2001-2012 Andreas Schiffler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
Andreas Schiffler -- aschiffler at ferzkopp dot net
*/
#ifndef _SDL_rotozoom_h
#define _SDL_rotozoom_h
#include <math.h>
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
extern "C" {
#endif
#ifndef M_PI
#define M_PI 3.141592654
#endif
#include "SDL.h"
/* ---- Defines */
/*!
\brief Disable anti-aliasing (no smoothing).
*/
#define SMOOTHING_OFF 0
/*!
\brief Enable anti-aliasing (smoothing).
*/
#define SMOOTHING_ON 1
/* ---- Function Prototypes */
#ifdef _MSC_VER
# if defined(DLL_EXPORT) && !defined(LIBSDL_GFX_DLL_IMPORT)
# define SDL_ROTOZOOM_SCOPE __declspec(dllexport)
# else
# ifdef LIBSDL_GFX_DLL_IMPORT
# define SDL_ROTOZOOM_SCOPE __declspec(dllimport)
# endif
# endif
#endif
#ifndef SDL_ROTOZOOM_SCOPE
# define SDL_ROTOZOOM_SCOPE extern
#endif
/*
Rotozoom functions
*/
SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurface(SDL_Surface * src, double angle, double zoom, int smooth);
SDL_ROTOZOOM_SCOPE SDL_Surface *rotozoomSurfaceXY
(SDL_Surface * src, double angle, double zoomx, double zoomy, int smooth);
SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSize(int width, int height, double angle, double zoom, int *dstwidth,
int *dstheight);
SDL_ROTOZOOM_SCOPE void rotozoomSurfaceSizeXY
(int width, int height, double angle, double zoomx, double zoomy,
int *dstwidth, int *dstheight);
/*
Zooming functions
*/
SDL_ROTOZOOM_SCOPE SDL_Surface *zoomSurface(SDL_Surface * src, double zoomx, double zoomy, int smooth);
SDL_ROTOZOOM_SCOPE void zoomSurfaceSize(int width, int height, double zoomx, double zoomy, int *dstwidth, int *dstheight);
/*
Shrinking functions
*/
SDL_ROTOZOOM_SCOPE SDL_Surface *shrinkSurface(SDL_Surface * src, int factorx, int factory);
/*
Specialized rotation functions
*/
SDL_ROTOZOOM_SCOPE SDL_Surface* rotateSurface90Degrees(SDL_Surface* src, int numClockwiseTurns);
/* Ends C function definitions when using C++ */
#ifdef __cplusplus
}
#endif
#endif /* _SDL_rotozoom_h */
......@@ -17,6 +17,9 @@
#ifdef USE_GEM
#include <osbind.h>
#include <gem.h>
#elif defined USE_SDL
#include <SDL/SDL.h>
#include <SDL/SDL_gfxPrimitives.h>
#endif
#include "x11basic.h"
#include "xbasic.h"
......
......@@ -32,6 +32,10 @@
#include "framebuffer.h"
#include "raw_mouse.h"
#include "raw_keyboard.h"
#elif defined USE_SDL
#include <SDL/SDL.h>
#include <SDL/SDL_gfxPrimitives.h>
#include <SDL/SDL_rotozoom.h>
#elif defined USE_GEM
#include <osbind.h>
#include <gem.h>
......@@ -928,7 +932,7 @@ static void do_polygon(int doit,PARAMETER *plist,int e) {
vx[i]=points[i].x;
vy[i]=points[i].y;
}
polygonColor(window[usewindow].display,&vx,&vy,anz,window[usewindow].fcolor);
polygonColor(window[usewindow].display,&vx[0],&vy[0],anz,window[usewindow].fcolor);
} else if(doit==2) {
Sint16 vx[anz],vy[anz];
int i;
......@@ -936,7 +940,7 @@ static void do_polygon(int doit,PARAMETER *plist,int e) {
vx[i]=points[i].x;
vy[i]=points[i].y;
}
filledPolygonColor(window[usewindow].display,&vx,&vy,anz,window[usewindow].fcolor);
filledPolygonColor(window[usewindow].display,&vx[0],&vy[0],anz,window[usewindow].fcolor);
}
#elif defined USE_X11
else if(doit==1) XDrawLines(window[usewindow].display,window[usewindow].pix,window[usewindow].gc,points,anz,mode);
......
......@@ -15,8 +15,11 @@
#include <string.h>
#include "defs.h"
#ifdef USE_GEM
#include <osbind.h>
#include <gem.h>
#include <osbind.h>
#include <gem.h>
#elif defined USE_SDL
#include <SDL/SDL.h>
#include <SDL/SDL_gfxPrimitives.h>
#endif
#include "x11basic.h"
......@@ -85,6 +88,9 @@ void mybox(int x1,int y1,int x2, int y2) {
DrawRectangle(min(x1,x2),min(y1,y2),abs(x2-x1),abs(y2-y1));
#endif
}
#if defined USE_SDL
Uint32 sdl_getpixel(SDL_Surface *surface, int x, int y);
#endif
int get_point(int x, int y) {
#if defined WINDOWS_NATIVE
return(0); /* TODO */
......
......@@ -99,7 +99,7 @@
#define DrawLine(a,b,c,d) lineColor(window[usewindow].display,a,b,c,d,window[usewindow].fcolor)
#define DrawPoint(a,b) pixelColor(window[usewindow].display,a,b,window[usewindow].fcolor)
#define CopyArea(a,b,c,d,e,f) ;
#define XDrawArc(a,b,c,d,e,f,g,h,i) pieColor(a,d,e,0,100,window[usewindow].fcolor)
#define XDrawArc(a,b,c,d,e,f,g,h,i) pieColor(a,d,e,f,h/64,i/64,window[usewindow].fcolor)
#define XFillArc(a,b,c,d,e,f,g,h,i) ;
#define XQueryPointer(a,b,c,d,e,f,g,h,i) *(i)=SDL_GetMouseState(g,h)
#elif defined USE_GEM
......
......@@ -32,6 +32,9 @@
#ifdef FRAMEBUFFER
#include "raw_mouse.h"
#include "raw_keyboard.h"
#elif defined USE_SDL
#include <SDL/SDL.h>
#include <SDL/SDL_gfxPrimitives.h>
#endif
......@@ -228,7 +231,7 @@ void fetch_icon_pixmap(WINDOWDEF *,int);
static int create_window2(int nummer,const char *title, const char* info,int x,int y,unsigned int w,unsigned int h) {
#ifdef WINDOWS
static class_reg=0;
static int class_reg=0;
#endif
if(window[nummer].flags&WIN_CREATED) {
printf("X11-Basic: Window %d already open !\n",nummer);
......@@ -983,15 +986,14 @@ short form_do(OBJECT *tree,short startob) {
#endif
#if defined USE_X11 || defined FRAMEBUFFER
XWindowEvent(window[usewindow].display, window[usewindow].win,KeyPressMask |KeyReleaseMask|ExposureMask |ButtonReleaseMask| ButtonPressMask, &event);
#endif
#if defined USE_SDL
#elif defined USE_SDL
e=SDL_WaitEvent(&event);
if(e==0) return;
if(e==0) return(sbut);
while(event.type!=SDL_MOUSEBUTTONDOWN && event.type!=SDL_KEYDOWN &&
event.type!=SDL_MOUSEBUTTONUP) {
handle_event(&window[usewindow],&event);
e=SDL_WaitEvent(&event);
if(e==0) return;
if(e==0) return(sbut);
}
#endif
#if defined USE_X11 || defined FRAMEBUFFER || defined USE_SDL
......@@ -1854,12 +1856,13 @@ char *fileselector(const char *titel, const char *pfad, const char *sel) {
} else if(sbut==15) { /* Scalerhintergrund */
#ifdef USE_SDL
e=SDL_WaitEvent(&event);
if(e==0) return;
if(e==0) break;
while(event.type!=SDL_MOUSEBUTTONUP) {
handle_event(&window[usewindow],&event);
e=SDL_WaitEvent(&event);
if(e==0) return;
if(e==0) break;
}
if(e==0) break;
relobxy(objects,16,&obx, &oby);
if(event.button.y<oby) {
showstart=max(0,min(showstart-ANZSHOW,anzfiles-ANZSHOW));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment