diff options
Diffstat (limited to 'intern')
76 files changed, 2969 insertions, 501 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 33bf9bb476c..fe30d6cfa0c 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,7 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -add_subdirectory(audaspace) add_subdirectory(string) add_subdirectory(ghost) add_subdirectory(guardedalloc) @@ -32,13 +31,20 @@ add_subdirectory(moto) add_subdirectory(memutil) add_subdirectory(iksolver) add_subdirectory(opennl) -add_subdirectory(smoke) add_subdirectory(mikktspace) +if(WITH_AUDASPACE) + add_subdirectory(audaspace) +endif() + if(WITH_MOD_FLUID) add_subdirectory(elbeem) endif() +if(WITH_MOD_SMOKE) + add_subdirectory(smoke) +endif() + if(WITH_MOD_DECIMATE) add_subdirectory(container) add_subdirectory(decimation) diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 74f483eab05..7eef13b103b 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -1,7 +1,7 @@ # $Id$ # ***** BEGIN LGPL LICENSE BLOCK ***** # -# Copyright 2009 Jörg Hermann Müller +# Copyright 2009 Jrg Hermann Mller # # This file is part of AudaSpace. # @@ -22,10 +22,14 @@ set(INC . + FX + SRC intern - FX SRC - ${PTHREADS_INC} - ${LIBSAMPLERATE_INC} + ../ffmpeg +) + +set(INC_SYS + ${PTHREADS_INCLUDE_DIRS} ) set(SRC @@ -155,8 +159,13 @@ set(SRC if(WITH_CODEC_FFMPEG) add_definitions(-DWITH_FFMPEG) - list(APPEND INC ffmpeg ${FFMPEG_INC}) - set(FFMPEGSRC + list(APPEND INC + ffmpeg + ) + list(APPEND INC_SYS + ${FFMPEG_INCLUDE_DIRS} + ) + list(APPEND SRC ffmpeg/AUD_FFMPEGFactory.cpp ffmpeg/AUD_FFMPEGReader.cpp @@ -167,8 +176,13 @@ endif() if(WITH_SDL) add_definitions(-DWITH_SDL) - list(APPEND INC SDL ${SDL_INCLUDE_DIR}) - set(SDLSRC + list(APPEND INC + SDL + ) + list(APPEND INC_SYS + ${SDL_INCLUDE_DIR} + ) + list(APPEND SRC SDL/AUD_SDLDevice.cpp SDL/AUD_SDLDevice.h @@ -177,18 +191,28 @@ endif() if(WITH_OPENAL) add_definitions(-DWITH_OPENAL) - list(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR}) - set(OPENALSRC + list(APPEND INC + OpenAL + ) + list(APPEND INC_SYS + ${OPENAL_INCLUDE_DIR} + ) + list(APPEND SRC OpenAL/AUD_OpenALDevice.cpp OpenAL/AUD_OpenALDevice.h - ) + ) endif() if(WITH_JACK) add_definitions(-DWITH_JACK) - list(APPEND INC jack ${JACK_INC}) - set(JACKSRC + list(APPEND INC + jack + ) + list(APPEND INC_SYS + ${JACK_INCLUDE_DIRS} + ) + list(APPEND SRC jack/AUD_JackDevice.cpp jack/AUD_JackDevice.h @@ -197,8 +221,13 @@ endif() if(WITH_CODEC_SNDFILE) add_definitions(-DWITH_SNDFILE) - list(APPEND INC sndfile ${SNDFILE_INC}) - set(SNDFILESRC + list(APPEND INC + sndfile + ) + list(APPEND INC_SYS + ${SNDFILE_INCLUDE_DIRS} + ) + list(APPEND SRC sndfile/AUD_SndFileFactory.cpp sndfile/AUD_SndFileReader.cpp @@ -209,7 +238,10 @@ endif() if(WITH_SAMPLERATE) add_definitions(-DWITH_SAMPLERATE) - set(SRCFILESRC + list(APPEND INC_SYS + ${SAMPLERATE_INCLUDE_DIRS} + ) + list(APPEND SRC SRC/AUD_SRCResampleFactory.cpp SRC/AUD_SRCResampleReader.cpp @@ -220,8 +252,13 @@ endif() if(WITH_FFTW3 AND FALSE) add_definitions(-DWITH_FFTW3) - list(APPEND INC fftw ${FFTW3_INC}) - set(FFTW3SRC + list(APPEND INC + fftw + ) + list(APPEND INC_SYS + ${FFTW3_INCLUDE_DIRS} + ) + list(APPEND SRC fftw/AUD_BandPassFactory.cpp fftw/AUD_BandPassReader.cpp @@ -231,8 +268,13 @@ if(WITH_FFTW3 AND FALSE) endif() if(WITH_PYTHON) - list(APPEND INC Python ${PYTHON_INCLUDE_DIRS}) - set(PYTHONSRC + list(APPEND INC + Python + ) + list(APPEND INC_SYS + ${PYTHON_INCLUDE_DIRS} + ) + list(APPEND SRC Python/AUD_PyAPI.cpp Python/AUD_PyAPI.h @@ -240,16 +282,4 @@ if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() -set(SRC - ${SRC} - ${FFMPEGSRC} - ${SNDFILESRC} - ${SRCFILESRC} - ${FFTW3SRC} - ${SDLSRC} - ${OPENALSRC} - ${JACKSRC} - ${PYTHONSRC} -) - -blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}") +blender_add_lib(bf_intern_audaspace "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp index b9e30bbf62a..71e7b7677e8 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp @@ -105,12 +105,15 @@ void* AUD_openalRunThread(void* device) return NULL; } -void AUD_OpenALDevice::start() +void AUD_OpenALDevice::start(bool join) { lock(); if(!m_playing) { + if(join) + pthread_join(m_thread, NULL); + pthread_attr_t attr; pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); @@ -271,8 +274,8 @@ void AUD_OpenALDevice::updateStreams() // stop thread if(m_playingSounds->empty() || (cerr != ALC_NO_ERROR)) { - unlock(); m_playing = false; + unlock(); pthread_exit(NULL); } @@ -366,6 +369,8 @@ AUD_OpenALDevice::AUD_OpenALDevice(AUD_DeviceSpecs specs, int buffersize) pthread_mutex_init(&m_mutex, &attr); pthread_mutexattr_destroy(&attr); + + start(false); } AUD_OpenALDevice::~AUD_OpenALDevice() @@ -414,13 +419,8 @@ AUD_OpenALDevice::~AUD_OpenALDevice() alcProcessContext(m_context); // wait for the thread to stop - if(m_playing) - { - unlock(); - pthread_join(m_thread, NULL); - } - else - unlock(); + unlock(); + pthread_join(m_thread, NULL); delete m_playingSounds; delete m_pausedSounds; diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.h b/intern/audaspace/OpenAL/AUD_OpenALDevice.h index 3bbbe85d7e6..127f69beca8 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.h +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.h @@ -106,7 +106,7 @@ private: /** * Starts the streaming thread. */ - void start(); + void start(bool join = true); /** * Checks if a handle is valid. diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index ecc94987185..67f859b0e5f 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -8,7 +8,7 @@ defs = [] if env['WITH_BF_FFMPEG']: sources += env.Glob('ffmpeg/*.cpp') - incs += ' ffmpeg ' + env['BF_FFMPEG_INC'] + incs += ' ffmpeg #/intern/ffmpeg ' + env['BF_FFMPEG_INC'] defs.append('WITH_FFMPEG') if env['WITH_BF_SDL']: diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index ea6e0c549fa..4597432e7d1 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -39,6 +39,7 @@ extern "C" { #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> +#include "ffmpeg_compat.h" } int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer) @@ -52,6 +53,10 @@ int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer) int read_length, data_size; + AVPacket tmp_pkt; + + av_init_packet(&tmp_pkt); + // as long as there is still data in the package while(audio_pkg_size > 0) { @@ -64,15 +69,14 @@ int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer& buffer) // read samples from the packet data_size = buf_size - buf_pos; - /*read_length = avcodec_decode_audio3(m_codecCtx, - (int16_t*)(((data_t*)buffer.getBuffer())+buf_pos), - &data_size, - packet);*/ - read_length = avcodec_decode_audio2(m_codecCtx, - (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos), - &data_size, - audio_pkg_data, - audio_pkg_size); + + tmp_pkt.data = audio_pkg_data; + tmp_pkt.size = audio_pkg_size; + + read_length = avcodec_decode_audio3( + m_codecCtx, + (int16_t*)(((data_t*)buffer.getBuffer()) + buf_pos), + &data_size, &tmp_pkt); // read error, next packet! if(read_length < 0) @@ -112,7 +116,7 @@ void AUD_FFMPEGReader::init() for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++) { - if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) + if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) && (m_stream < 0)) { m_stream=i; diff --git a/intern/boolop/CMakeLists.txt b/intern/boolop/CMakeLists.txt index 7e36f255268..742c0f1d42c 100644 --- a/intern/boolop/CMakeLists.txt +++ b/intern/boolop/CMakeLists.txt @@ -26,16 +26,20 @@ set(INC . - ./intern - ./extern - ../memutil + extern + intern ../container ../guardedalloc + ../memutil ../moto/include ../../source/blender/blenlib ../../source/blender/makesdna ) +set(INC_SYS + +) + set(SRC intern/BOP_BBox.cpp intern/BOP_BSPNode.cpp @@ -75,4 +79,4 @@ set(SRC intern/BOP_Vertex.h ) -blender_add_lib(bf_intern_bop "${SRC}" "${INC}") +blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index 2e615314543..a844db3257e 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -25,10 +25,15 @@ # ***** END GPL LICENSE BLOCK ***** set(INC - ./intern + intern ../container - ../moto/include + ../guardedalloc ../memutil + ../moto/include +) + +set(INC_SYS + ) set(SRC @@ -43,4 +48,4 @@ set(SRC intern/BSP_MeshPrimitives.h ) -blender_add_lib(bf_intern_bsp "${SRC}" "${INC}") +blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index 43952f4ff18..4927c33dc8a 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('intern/*.cpp') -incs = 'intern ../container ../moto/include ../memutil' +incs = 'intern ../container ../moto/include ../memutil ../guardedalloc' env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], libtype=['core','player'], priority=[200,100] ) diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt index 7e83acf68ce..42c8de6a08e 100644 --- a/intern/container/CMakeLists.txt +++ b/intern/container/CMakeLists.txt @@ -29,6 +29,10 @@ set(INC ../guardedalloc ) +set(INC_SYS + +) + set(SRC intern/CTR_List.cpp @@ -40,4 +44,4 @@ set(SRC CTR_UHeap.h ) -blender_add_lib(bf_intern_ctr "${SRC}" "${INC}") +blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/container/CTR_TaggedIndex.h b/intern/container/CTR_TaggedIndex.h index 0a57ce11d19..b5284a5da30 100644 --- a/intern/container/CTR_TaggedIndex.h +++ b/intern/container/CTR_TaggedIndex.h @@ -52,6 +52,8 @@ #include <functional> +#include "MEM_sys_types.h" + enum { empty_tag = 0x0, @@ -100,9 +102,9 @@ public: #if defined(_WIN64) CTR_TaggedIndex( - const unsigned __int64 val + const uint64_t val ) : - m_val ( ((unsigned __int64)val & index_mask) + m_val ( ((uint64_t)val & index_mask) | ( (empty_tag << tag_shift) & (~index_mask) ) ) { } @@ -140,8 +142,8 @@ public: } #if defined(_WIN64) - operator unsigned __int64 () const { - return (unsigned __int64)(m_val & index_mask); + operator uint64_t () const { + return (uint64_t)(m_val & index_mask); } #endif diff --git a/intern/decimation/CMakeLists.txt b/intern/decimation/CMakeLists.txt index b726a8cd6a1..53ba92e416b 100644 --- a/intern/decimation/CMakeLists.txt +++ b/intern/decimation/CMakeLists.txt @@ -27,10 +27,15 @@ set(INC . ../container + ../guardedalloc ../memutil ../moto/include ) +set(INC_SYS + +) + set(SRC intern/LOD_EdgeCollapser.cpp intern/LOD_ExternNormalEditor.cpp @@ -56,4 +61,4 @@ set(SRC intern/LOD_QuadricEditor.h ) -blender_add_lib(bf_intern_decimate "${SRC}" "${INC}") +blender_add_lib(bf_intern_decimate "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 6e2929cb650..6f4befb3ffa 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -3,6 +3,6 @@ Import ('env') sources = env.Glob('intern/*.cpp') -incs = '. ../moto/include ../container ../memutil' +incs = '. ../moto/include ../container ../memutil ../guardedalloc' env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] ) diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index dd23e854a25..7a842a29b98 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -26,6 +26,9 @@ set(INC extern +) + +set(INC_SYS ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -88,11 +91,11 @@ set(SRC add_definitions(-DNOGUI -DELBEEM_BLENDER=1) if(WINDOWS) - add_definitions(-DUSE_MSVC6FIXES) + add_definitions(-DUSE_MSVC6FIXES) endif() if(WITH_OPENMP) - add_definitions(-DPARALLEL=1) + add_definitions(-DPARALLEL=1) endif() -blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}") +blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/elbeem/extern/elbeem.h b/intern/elbeem/extern/elbeem.h index f5538df8805..6df08ccebd2 100644 --- a/intern/elbeem/extern/elbeem.h +++ b/intern/elbeem/extern/elbeem.h @@ -77,6 +77,10 @@ typedef struct elbeemSimulationSettings { /* boundary types and settings for domain walls */ short domainobsType; float domainobsPartslip; + + /* what surfaces to generate */ + int mFsSurfGenSetting; + /* generate speed vectors for vertices (e.g. for image based motion blur)*/ short generateVertexVectors; /* strength of surface smoothing */ @@ -108,10 +112,12 @@ typedef struct elbeemSimulationSettings { #define OB_FLUIDSIM_PARTICLE 64 #define OB_FLUIDSIM_CONTROL 128 -// defines for elbeemMesh->obstacleType below +// defines for elbeemMesh->obstacleType below (low bits) high bits (>=64) are reserved for mFsSurfGenSetting flags which are defined in solver_class.h #define FLUIDSIM_OBSTACLE_NOSLIP 1 #define FLUIDSIM_OBSTACLE_PARTSLIP 2 #define FLUIDSIM_OBSTACLE_FREESLIP 3 +#define FLUIDSIM_FSSG_NOOBS 64 + #define OB_VOLUMEINIT_VOLUME 1 #define OB_VOLUMEINIT_SHELL 2 diff --git a/intern/elbeem/intern/simulation_object.cpp b/intern/elbeem/intern/simulation_object.cpp index 2544b8fe29c..87828b26088 100644 --- a/intern/elbeem/intern/simulation_object.cpp +++ b/intern/elbeem/intern/simulation_object.cpp @@ -181,6 +181,9 @@ int SimulationObject::initializeLbmSimulation(ntlRenderGlobals *glob) mpLbm->setGenerateParticles(mpElbeemSettings->generateParticles); // set initial particles mpParts->setNumInitialParticles(mpElbeemSettings->numTracerParticles); + + // surface generation flag + mpLbm->setSurfGenSettings(mpElbeemSettings->mFsSurfGenSetting); string dinitType = string("no"); if (mpElbeemSettings->domainobsType==FLUIDSIM_OBSTACLE_PARTSLIP) dinitType = string("part"); diff --git a/intern/elbeem/intern/solver_class.h b/intern/elbeem/intern/solver_class.h index 8662ac3f12a..1548aaa19bc 100644 --- a/intern/elbeem/intern/solver_class.h +++ b/intern/elbeem/intern/solver_class.h @@ -308,6 +308,9 @@ class LbmFsgrSolver : //! for raytracing, preprocess void prepareVisualization( void ); + /* surface generation settings */ + virtual void setSurfGenSettings(short value); + protected: //! internal quick print function (for debugging) diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 899b1e0ecbc..7e9f5e7f420 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -539,6 +539,15 @@ void LbmFsgrSolver::parseAttrList() /****************************************************************************** + * (part of enabling chapter 6 of "Free Surface Flows with Moving and Deforming Objects for LBM") + *****************************************************************************/ +void LbmFsgrSolver::setSurfGenSettings(short value) +{ + mFsSurfGenSetting = value; +} + + +/****************************************************************************** * Initialize omegas and forces on all levels (for init/timestep change) *****************************************************************************/ void LbmFsgrSolver::initLevelOmegas() diff --git a/intern/elbeem/intern/solver_interface.h b/intern/elbeem/intern/solver_interface.h index 71b347d683d..8f3181a307d 100644 --- a/intern/elbeem/intern/solver_interface.h +++ b/intern/elbeem/intern/solver_interface.h @@ -271,6 +271,9 @@ class LbmSolverInterface /*! debug object display */ virtual vector<ntlGeometryObject*> getDebugObjects() { vector<ntlGeometryObject*> empty(0); return empty; } + /* surface generation settings */ + virtual void setSurfGenSettings(short value) = 0; + #if LBM_USE_GUI==1 /*! show simulation info */ virtual void debugDisplay(int) = 0; diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h new file mode 100644 index 00000000000..fae8590568d --- /dev/null +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -0,0 +1,133 @@ +#ifndef __ffmpeg_compat_h_included__ +#define __ffmpeg_compat_h_included__ 1 + +/* + * $Id$ + * + * compatibility macros to make every ffmpeg installation appear + * like the most current installation (wrapping some functionality sometimes) + * it also includes all ffmpeg header files at once, no need to do it + * seperately. + * + * Copyright (c) 2011 Peter Schlaile + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + + +#include <libavformat/avformat.h> +#include <libavcodec/avcodec.h> +#include <libavutil/rational.h> + +#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101)) +#define FFMPEG_HAVE_PARSE_UTILS 1 +#include <libavutil/parseutils.h> +#endif + +#include <libswscale/swscale.h> +#include <libavcodec/opt.h> + +#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 105)) +#define FFMPEG_HAVE_AVIO 1 +#endif + +#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121)) +#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1 +#endif + +#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 101)) +#define FFMPEG_HAVE_AV_DUMP_FORMAT 1 +#endif + +#if (LIBAVFORMAT_VERSION_MAJOR > 52) || ((LIBAVFORMAT_VERSION_MAJOR >= 52) && (LIBAVFORMAT_VERSION_MINOR >= 45)) +#define FFMPEG_HAVE_AV_GUESS_FORMAT 1 +#endif + +#if (LIBAVCODEC_VERSION_MAJOR > 52) || ((LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 23)) +#define FFMPEG_HAVE_DECODE_AUDIO3 1 +#define FFMPEG_HAVE_DECODE_VIDEO2 1 +#endif + +#if (LIBAVCODEC_VERSION_MAJOR > 52) || ((LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 64)) +#define FFMPEG_HAVE_AVMEDIA_TYPES 1 +#endif + +#if ((LIBAVCODEC_VERSION_MAJOR > 52) || (LIBAVCODEC_VERSION_MAJOR >= 52) && (LIBAVCODEC_VERSION_MINOR >= 29)) && \ + ((LIBSWSCALE_VERSION_MAJOR > 0) || (LIBSWSCALE_VERSION_MAJOR >= 0) && (LIBSWSCALE_VERSION_MINOR >= 10)) +#define FFMPEG_SWSCALE_COLOR_SPACE_SUPPORT +#endif + +#ifndef FFMPEG_HAVE_AVIO +#define AVIO_FLAG_WRITE URL_WRONLY +#define avio_open url_fopen +#define avio_tell url_ftell +#define avio_close url_fclose +#endif + +/* there are some version inbetween, which have avio_... functions but no + AVIO_FLAG_... */ +#ifndef AVIO_FLAG_WRITE +#define AVIO_FLAG_WRITE URL_WRONLY +#endif + +#ifndef AV_PKT_FLAG_KEY +#define AV_PKT_FLAG_KEY PKT_FLAG_KEY +#endif + +#ifndef FFMPEG_HAVE_AV_DUMP_FORMAT +#define av_dump_format dump_format +#endif + +#ifndef FFMPEG_HAVE_AV_GUESS_FORMAT +#define av_guess_format guess_format +#endif + +#ifndef FFMPEG_HAVE_PARSE_UTILS +#define av_parse_video_rate av_parse_video_frame_rate +#endif + +#ifdef FFMPEG_HAVE_DEFAULT_VAL_UNION +#define FFMPEG_DEF_OPT_VAL_INT(OPT) OPT->default_val.i64 +#define FFMPEG_DEF_OPT_VAL_DOUBLE(OPT) OPT->default_val.dbl +#else +#define FFMPEG_DEF_OPT_VAL_INT(OPT) OPT->default_val +#define FFMPEG_DEF_OPT_VAL_DOUBLE(OPT) OPT->default_val +#endif + +#ifndef FFMPEG_HAVE_AVMEDIA_TYPES +#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO +#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO +#endif + +#ifndef FFMPEG_HAVE_DECODE_AUDIO3 +static inline +int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples, + int *frame_size_ptr, AVPacket *avpkt) +{ + return avcodec_decode_audio2(avctx, samples, + frame_size_ptr, avpkt->data, + avpkt->size); +} +#endif + +#ifndef FFMPEG_HAVE_DECODE_VIDEO2 +static inline +int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, + AVPacket *avpkt) +{ + return avcodec_decode_video(avctx, picture, got_picture_ptr, + avpkt->data, avpkt->size); +} +#endif + +#endif diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 0d7a64ddfa9..ccd763ef42c 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -29,22 +29,24 @@ set(INC ../string ../../source/blender/imbuf ../../source/blender/makesdna - ${GLEW_INCLUDE_PATH} +) + +set(INC_SYS + ${GLEW_INCLUDE_PATH} ) set(SRC intern/GHOST_Buttons.cpp - intern/GHOST_CallbackEventConsumer.cpp intern/GHOST_C-api.cpp - intern/GHOST_Path-api.cpp + intern/GHOST_CallbackEventConsumer.cpp intern/GHOST_DisplayManager.cpp intern/GHOST_EventManager.cpp - intern/GHOST_EventPrinter.cpp intern/GHOST_ISystem.cpp intern/GHOST_ISystemPaths.cpp intern/GHOST_ModifierKeys.cpp intern/GHOST_NDOFManager.cpp intern/GHOST_Path-api.cpp + intern/GHOST_Path-api.cpp intern/GHOST_Rect.cpp intern/GHOST_System.cpp intern/GHOST_TimerManager.cpp @@ -61,6 +63,7 @@ set(SRC GHOST_Path-api.h GHOST_Rect.h GHOST_Types.h + intern/GHOST_Buttons.h intern/GHOST_CallbackEventConsumer.h intern/GHOST_Debug.h @@ -72,7 +75,6 @@ set(SRC intern/GHOST_EventKey.h intern/GHOST_EventManager.h intern/GHOST_EventNDOF.h - intern/GHOST_EventPrinter.h intern/GHOST_EventString.h intern/GHOST_EventTrackpad.h intern/GHOST_EventWheel.h @@ -86,7 +88,70 @@ set(SRC intern/GHOST_WindowManager.h ) -if(APPLE) +if(WITH_GHOST_DEBUG) + list(APPEND SRC + intern/GHOST_EventPrinter.cpp + + intern/GHOST_EventPrinter.h + ) + add_definitions(-DWITH_GHOST_DEBUG) +endif() + + +if(WITH_HEADLESS OR WITH_GHOST_SDL) + if(WITH_HEADLESS) + list(APPEND SRC + intern/GHOST_DisplayManagerNULL.h + intern/GHOST_SystemNULL.h + intern/GHOST_WindowNULL.h + ) + add_definitions(-DWITH_HEADLESS) + else() + list(APPEND SRC + intern/GHOST_DisplayManagerSDL.cpp + intern/GHOST_SystemSDL.cpp + intern/GHOST_WindowSDL.cpp + + intern/GHOST_DisplayManagerSDL.h + intern/GHOST_SystemSDL.h + intern/GHOST_WindowSDL.h + ) + add_definitions(-DWITH_GHOST_SDL) + endif() + + + # ack, this is still system dependant + if(APPLE) + if(WITH_COCOA) + list(APPEND SRC + intern/GHOST_SystemPathsCocoa.mm + intern/GHOST_SystemPathsCocoa.h + ) + else() + list(APPEND SRC + intern/GHOST_SystemPathsCarbon.cpp + intern/GHOST_SystemPathsCarbon.h + ) + endif() + elseif(UNIX) + list(APPEND SRC + intern/GHOST_SystemPathsX11.cpp + intern/GHOST_SystemPathsX11.h + ) + elseif(WIN32) + + list(APPEND SRC + intern/GHOST_SystemPathsWin32.cpp + + intern/GHOST_SystemPathsWin32.h + ) + endif() + + list(APPEND INC_SYS + ${SDL_INCLUDE_DIR} + ) + +elseif(APPLE) if(WITH_COCOA) list(APPEND SRC intern/GHOST_DisplayManagerCocoa.mm @@ -123,7 +188,9 @@ elseif(UNIX) add_definitions(-DWITH_X11_XINPUT) endif() - list(APPEND INC ${X11_X11_INCLUDE_PATH}) + list(APPEND INC_SYS + ${X11_X11_INCLUDE_PATH} + ) list(APPEND SRC intern/GHOST_DisplayManagerX11.cpp @@ -143,7 +210,9 @@ elseif(UNIX) if(X11_XF86keysym_INCLUDE_PATH) add_definitions(-DWITH_XF86KEYSYM) - list(APPEND INC ${X11_XF86keysym_INCLUDE_PATH}) + list(APPEND INC_SYS + ${X11_XF86keysym_INCLUDE_PATH} + ) endif() elseif(WIN32) @@ -151,7 +220,9 @@ elseif(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") endif() - list(APPEND INC ${WINTAB_INC}) + list(APPEND INC_SYS + ${WINTAB_INC} + ) list(APPEND SRC intern/GHOST_DisplayManagerWin32.cpp @@ -169,5 +240,5 @@ elseif(WIN32) ) endif() -blender_add_lib(bf_intern_ghost "${SRC}" "${INC}") +blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 705f4916619..6a4da5c9d38 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -218,8 +218,9 @@ typedef enum { GHOST_kStandardCursorBottomLeftCorner, GHOST_kStandardCursorCopy, GHOST_kStandardCursorCustom, - GHOST_kStandardCursorNumCursors, - GHOST_kStandardCursorPencil + GHOST_kStandardCursorPencil, + + GHOST_kStandardCursorNumCursors } GHOST_TStandardCursor; diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index b67545f216a..c65ec58a97b 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -14,11 +14,24 @@ if window_system == 'darwin': pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget'] defs=['_USE_MATH_DEFINES'] -if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): +incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] + +if env['WITH_GHOST_SDL']: + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + except ValueError: + pass + incs += ' ' + env['BF_SDL_INC'] + defs += ['WITH_GHOST_SDL'] +elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): for f in pf: try: sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option @@ -29,6 +42,7 @@ elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64 try: sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass elif window_system == 'darwin': @@ -42,6 +56,7 @@ elif window_system == 'darwin': sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass else: @@ -50,6 +65,7 @@ elif window_system == 'darwin': sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Cocoa.mm') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass @@ -58,9 +74,10 @@ else: Exit() if env['BF_GHOST_DEBUG']: - defs.append('BF_GHOST_DEBUG') + defs.append('WITH_GHOST_DEBUG') +else: + sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp') -incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs diff --git a/intern/ghost/intern/GHOST_Debug.h b/intern/ghost/intern/GHOST_Debug.h index e77f3b9c461..ef1099b5cf6 100644 --- a/intern/ghost/intern/GHOST_Debug.h +++ b/intern/ghost/intern/GHOST_Debug.h @@ -41,9 +41,9 @@ #endif // DEBUG #endif // WIN32 -#ifdef BF_GHOST_DEBUG +#ifdef WITH_GHOST_DEBUG #define GHOST_DEBUG // spit ghost events to stdout -#endif // BF_GHOST_DEBUG +#endif // WITH_GHOST_DEBUG #ifdef GHOST_DEBUG #include <iostream> diff --git a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm index ab3abdd659f..86f5f4cdddb 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm +++ b/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm @@ -164,5 +164,5 @@ GHOST_TSuccess GHOST_DisplayManagerCocoa::setCurrentDisplaySetting(GHOST_TUns8 d //CGDisplayErr err = ::CGDisplaySwitchToMode(m_displayIDs[display], displayModeValues); - return /*err == CGDisplayNoErr ? GHOST_kSuccess :*/ GHOST_kFailure; + return /*err == CGDisplayNoErr ?*/ GHOST_kSuccess /*: GHOST_kFailure*/; } diff --git a/intern/ghost/intern/GHOST_DisplayManagerNULL.h b/intern/ghost/intern/GHOST_DisplayManagerNULL.h new file mode 100644 index 00000000000..ba4a36ee3d1 --- /dev/null +++ b/intern/ghost/intern/GHOST_DisplayManagerNULL.h @@ -0,0 +1,51 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_DisplayManagerNULL.h + * \ingroup GHOST + * Declaration of GHOST_DisplayManagerNULL class. + */ + +#ifndef _GHOST_DISPLAY_MANAGER_NULL_H_ +#define _GHOST_DISPLAY_MANAGER_NULL_H_ + +#include "GHOST_DisplayManager.h" +#include "GHOST_SystemNULL.h" + +class GHOST_SystemNULL; + +class GHOST_DisplayManagerNULL : public GHOST_DisplayManager +{ +public: + GHOST_DisplayManagerNULL( GHOST_SystemNULL *system ) : GHOST_DisplayManager(), m_system(system) { /* nop */ } + GHOST_TSuccess getNumDisplays( GHOST_TUns8& numDisplays ) const { return GHOST_kFailure; } + GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display, GHOST_TInt32& numSettings ) const{ return GHOST_kFailure; } + GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32 index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; } + GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display, GHOST_DisplaySetting& setting ) const { return getDisplaySetting(display,GHOST_TInt32(0),setting); } + GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; } + +private : + GHOST_SystemNULL * m_system; +}; + +#endif /* _GHOST_DISPLAY_MANAGER_NULL_H_ */ diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp new file mode 100644 index 00000000000..2e55957e60a --- /dev/null +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -0,0 +1,93 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_DisplayManagerSDL.cpp + * \ingroup GHOST + */ + +#include "GHOST_SystemSDL.h" +#include "GHOST_DisplayManagerSDL.h" + +GHOST_DisplayManagerSDL::GHOST_DisplayManagerSDL(GHOST_SystemSDL *system) + : + GHOST_DisplayManager(), + m_system(system) +{ + /* do nothing */ +} + +GHOST_TSuccess +GHOST_DisplayManagerSDL::getNumDisplays(GHOST_TUns8& numDisplays) +{ + numDisplays= SDL_GetNumVideoDisplays(); + return GHOST_kSuccess; +} + + +GHOST_TSuccess GHOST_DisplayManagerSDL::getNumDisplaySettings(GHOST_TUns8 display, + GHOST_TInt32& numSettings) +{ + GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n"); + numSettings= GHOST_TInt32(1); + return GHOST_kSuccess; +} + +GHOST_TSuccess +GHOST_DisplayManagerSDL::getDisplaySetting(GHOST_TUns8 display, + GHOST_TInt32 index, + GHOST_DisplaySetting& setting) +{ + + GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n"); + GHOST_ASSERT(index < 1, "Requested setting outside of valid range.\n"); + SDL_DisplayMode mode; + + SDL_GetDesktopDisplayMode(display, &mode); + + setting.xPixels= mode.w; + setting.yPixels= mode.h; + setting.bpp= SDL_BYTESPERPIXEL(mode.format); + /* assume 60 when unset */ + setting.frequency= mode.refresh_rate ? mode.refresh_rate : 60; + + return GHOST_kSuccess; +} + +GHOST_TSuccess +GHOST_DisplayManagerSDL::getCurrentDisplaySetting(GHOST_TUns8 display, + GHOST_DisplaySetting& setting) +{ + return getDisplaySetting(display,GHOST_TInt32(0),setting); +} + +GHOST_TSuccess +GHOST_DisplayManagerSDL:: setCurrentDisplaySetting(GHOST_TUns8 display, + const GHOST_DisplaySetting& setting) +{ + // This is never going to work robustly in X + // but it's currently part of the full screen interface + + // we fudge it for now. + + return GHOST_kSuccess; +} diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.h b/intern/ghost/intern/GHOST_DisplayManagerSDL.h new file mode 100644 index 00000000000..2a815b1dc28 --- /dev/null +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.h @@ -0,0 +1,73 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_DisplayManagerSDL.h + * \ingroup GHOST + * Declaration of GHOST_DisplayManagerSDL class. + */ + +#ifndef _GHOST_DISPLAY_MANAGER_SDL_H_ +#define _GHOST_DISPLAY_MANAGER_SDL_H_ + +#include "GHOST_DisplayManager.h" + +extern "C" { + #include "SDL.h" +} + +#if !SDL_VERSION_ATLEAST(1, 3, 0) +# error "SDL 1.3 or newer is needed to build with Ghost" +#endif + +class GHOST_SystemSDL; + +class GHOST_DisplayManagerSDL : public GHOST_DisplayManager +{ +public: + GHOST_DisplayManagerSDL(GHOST_SystemSDL *system); + + GHOST_TSuccess + getNumDisplays(GHOST_TUns8& numDisplays); + + GHOST_TSuccess + getNumDisplaySettings(GHOST_TUns8 display, + GHOST_TInt32& numSettings); + + GHOST_TSuccess + getDisplaySetting(GHOST_TUns8 display, + GHOST_TInt32 index, + GHOST_DisplaySetting& setting); + + GHOST_TSuccess + getCurrentDisplaySetting(GHOST_TUns8 display, + GHOST_DisplaySetting& setting); + + GHOST_TSuccess + setCurrentDisplaySetting(GHOST_TUns8 display, + const GHOST_DisplaySetting& setting); + +private : + GHOST_SystemSDL * m_system; +}; + +#endif /* _GHOST_DISPLAY_MANAGER_SDL_H_ */ diff --git a/intern/ghost/intern/GHOST_EventPrinter.cpp b/intern/ghost/intern/GHOST_EventPrinter.cpp index 139c4beb412..9fa0b278353 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.cpp +++ b/intern/ghost/intern/GHOST_EventPrinter.cpp @@ -37,6 +37,7 @@ #include "GHOST_EventDragnDrop.h" #include "GHOST_Debug.h" +#include <stdio.h> bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) { @@ -82,17 +83,17 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) case GHOST_kEventKeyUp: { GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData(); - STR_String str; + char str[32]= {'\0'}; getKeyString(keyData->key, str); - std::cout << "GHOST_kEventKeyUp, key: " << str.Ptr(); + std::cout << "GHOST_kEventKeyUp, key: " << str; } break; case GHOST_kEventKeyDown: { GHOST_TEventKeyData* keyData = (GHOST_TEventKeyData*)((GHOST_IEvent*)event)->getData(); - STR_String str; + char str[32]= {'\0'}; getKeyString(keyData->key, str); - std::cout << "GHOST_kEventKeyDown, key: " << str.Ptr(); + std::cout << "GHOST_kEventKeyDown, key: " << str; } break; @@ -183,165 +184,161 @@ bool GHOST_EventPrinter::processEvent(GHOST_IEvent* event) } -void GHOST_EventPrinter::getKeyString(GHOST_TKey key, STR_String& str) const +void GHOST_EventPrinter::getKeyString(GHOST_TKey key, char str[32]) const { if ((key >= GHOST_kKeyComma) && (key <= GHOST_kKeyRightBracket)) { - str = ((char)key); + sprintf(str, "%c", (char)key); } else if ((key >= GHOST_kKeyNumpad0) && (key <= GHOST_kKeyNumpad9)) { - int number = key - GHOST_kKeyNumpad0; - STR_String numberStr (number); - str = "Numpad"; - str += numberStr; + sprintf(str, "Numpad %d", (key - GHOST_kKeyNumpad0)); #if defined(__sun__) || defined(__sun) } else if (key == 268828432) { /* solaris keyboards are messed up */ /* This should really test XK_F11 but that doesn't work */ - str = "F11"; + strcpy(str, "F11"); } else if (key == 268828433) { /* solaris keyboards are messed up */ /* This should really test XK_F12 but that doesn't work */ - str = "F12"; + strcpy(str, "F12"); #endif } else if ((key >= GHOST_kKeyF1) && (key <= GHOST_kKeyF24)) { - int number = key - GHOST_kKeyF1 + 1; - STR_String numberStr (number); - str = "F"; - str += numberStr; + sprintf(str, "F%d", key - GHOST_kKeyF1 + 1); } else { - switch (key) - { + const char *tstr= NULL; + switch (key) { case GHOST_kKeyBackSpace: - str = "BackSpace"; + tstr = "BackSpace"; break; case GHOST_kKeyTab: - str = "Tab"; + tstr = "Tab"; break; case GHOST_kKeyLinefeed: - str = "Linefeed"; + tstr = "Linefeed"; break; case GHOST_kKeyClear: - str = "Clear"; + tstr = "Clear"; break; case GHOST_kKeyEnter: - str = "Enter"; + tstr = "Enter"; break; case GHOST_kKeyEsc: - str = "Esc"; + tstr = "Esc"; break; case GHOST_kKeySpace: - str = "Space"; + tstr = "Space"; break; case GHOST_kKeyQuote: - str = "Quote"; + tstr = "Quote"; break; case GHOST_kKeyBackslash: - str = "\\"; + tstr = "\\"; break; case GHOST_kKeyAccentGrave: - str = "`"; + tstr = "`"; break; case GHOST_kKeyLeftShift: - str = "LeftShift"; + tstr = "LeftShift"; break; case GHOST_kKeyRightShift: - str = "RightShift"; + tstr = "RightShift"; break; case GHOST_kKeyLeftControl: - str = "LeftControl"; + tstr = "LeftControl"; break; case GHOST_kKeyRightControl: - str = "RightControl"; + tstr = "RightControl"; break; case GHOST_kKeyLeftAlt: - str = "LeftAlt"; + tstr = "LeftAlt"; break; case GHOST_kKeyRightAlt: - str = "RightAlt"; + tstr = "RightAlt"; break; case GHOST_kKeyOS: - str = "OS"; + tstr = "OS"; break; case GHOST_kKeyGrLess: // PC german! - str = "GrLess"; + tstr = "GrLess"; break; case GHOST_kKeyCapsLock: - str = "CapsLock"; + tstr = "CapsLock"; break; case GHOST_kKeyNumLock: - str = "NumLock"; + tstr = "NumLock"; break; case GHOST_kKeyScrollLock: - str = "ScrollLock"; + tstr = "ScrollLock"; break; case GHOST_kKeyLeftArrow: - str = "LeftArrow"; + tstr = "LeftArrow"; break; case GHOST_kKeyRightArrow: - str = "RightArrow"; + tstr = "RightArrow"; break; case GHOST_kKeyUpArrow: - str = "UpArrow"; + tstr = "UpArrow"; break; case GHOST_kKeyDownArrow: - str = "DownArrow"; + tstr = "DownArrow"; break; case GHOST_kKeyPrintScreen: - str = "PrintScreen"; + tstr = "PrintScreen"; break; case GHOST_kKeyPause: - str = "Pause"; + tstr = "Pause"; break; case GHOST_kKeyInsert: - str = "Insert"; + tstr = "Insert"; break; case GHOST_kKeyDelete: - str = "Delete"; + tstr = "Delete"; break; case GHOST_kKeyHome: - str = "Home"; + tstr = "Home"; break; case GHOST_kKeyEnd: - str = "End"; + tstr = "End"; break; case GHOST_kKeyUpPage: - str = "UpPage"; + tstr = "UpPage"; break; case GHOST_kKeyDownPage: - str = "DownPage"; + tstr = "DownPage"; break; case GHOST_kKeyNumpadPeriod: - str = "NumpadPeriod"; + tstr = "NumpadPeriod"; break; case GHOST_kKeyNumpadEnter: - str = "NumpadEnter"; + tstr = "NumpadEnter"; break; case GHOST_kKeyNumpadPlus: - str = "NumpadPlus"; + tstr = "NumpadPlus"; break; case GHOST_kKeyNumpadMinus: - str = "NumpadMinus"; + tstr = "NumpadMinus"; break; case GHOST_kKeyNumpadAsterisk: - str = "NumpadAsterisk"; + tstr = "NumpadAsterisk"; break; case GHOST_kKeyNumpadSlash: - str = "NumpadSlash"; + tstr = "NumpadSlash"; break; case GHOST_kKeyMediaPlay: - str = "MediaPlayPause"; + tstr = "MediaPlayPause"; break; case GHOST_kKeyMediaStop: - str = "MediaStop"; + tstr = "MediaStop"; break; case GHOST_kKeyMediaFirst: - str = "MediaFirst"; + tstr = "MediaFirst"; break; case GHOST_kKeyMediaLast: - str = "MediaLast"; + tstr = "MediaLast"; break; default: - str = "unknown"; + tstr = "unknown"; break; } + + sprintf(str, "%s", tstr); } } diff --git a/intern/ghost/intern/GHOST_EventPrinter.h b/intern/ghost/intern/GHOST_EventPrinter.h index 74c379e76a8..d9b7f86c04e 100644 --- a/intern/ghost/intern/GHOST_EventPrinter.h +++ b/intern/ghost/intern/GHOST_EventPrinter.h @@ -58,7 +58,7 @@ protected: * @param key The GHOST key code to convert. * @param str The GHOST key code converted to a readable string. */ - void getKeyString(GHOST_TKey key, STR_String& str) const; + void getKeyString(GHOST_TKey key, char str[32]) const; }; #endif // _GHOST_EVENT_PRINTER_H_ diff --git a/intern/ghost/intern/GHOST_ISystem.cpp b/intern/ghost/intern/GHOST_ISystem.cpp index 040164e2c40..278c224ff85 100644 --- a/intern/ghost/intern/GHOST_ISystem.cpp +++ b/intern/ghost/intern/GHOST_ISystem.cpp @@ -41,7 +41,11 @@ #include "GHOST_ISystem.h" -#ifdef WIN32 +#ifdef WITH_HEADLESS +# include "GHOST_SystemNULL.h" +#elif defined(WITH_GHOST_SDL) +# include "GHOST_SystemSDL.h" +#elif defined(WIN32) # include "GHOST_SystemWin32.h" #else # ifdef __APPLE__ @@ -63,7 +67,11 @@ GHOST_TSuccess GHOST_ISystem::createSystem() { GHOST_TSuccess success; if (!m_system) { -#ifdef WIN32 +#ifdef WITH_HEADLESS + m_system = new GHOST_SystemNULL(); +#elif defined(WITH_GHOST_SDL) + m_system = new GHOST_SystemSDL(); +#elif defined(WIN32) m_system = new GHOST_SystemWin32 (); #else # ifdef __APPLE__ diff --git a/intern/ghost/intern/GHOST_NDOFManager.cpp b/intern/ghost/intern/GHOST_NDOFManager.cpp index 95626ec26ea..dae6cb5b544 100644 --- a/intern/ghost/intern/GHOST_NDOFManager.cpp +++ b/intern/ghost/intern/GHOST_NDOFManager.cpp @@ -81,8 +81,12 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window, #if 0 printf("%i client \n", Pid); #endif - #if defined(_WIN32) || defined(__APPLE__) + #if defined(WITH_HEADLESS) + /* do nothing */ + #elif defined(_WIN32) || defined(__APPLE__) m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues); + #elif defined(WITH_GHOST_SDL) + /* do nothing */ #else GHOST_SystemX11 *sys; sys = static_cast<GHOST_SystemX11*>(GHOST_ISystem::getSystem()); diff --git a/intern/ghost/intern/GHOST_SystemCocoa.h b/intern/ghost/intern/GHOST_SystemCocoa.h index e7a8178a382..ce777358389 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.h +++ b/intern/ghost/intern/GHOST_SystemCocoa.h @@ -119,14 +119,6 @@ public: const GHOST_TEmbedderWindowID parentWindow = 0 ); - virtual GHOST_TSuccess beginFullScreen( - const GHOST_DisplaySetting& setting, - GHOST_IWindow** window, - const bool stereoVisual - ); - - virtual GHOST_TSuccess endFullScreen( void ); - /*************************************************************************************** ** Event management functionality ***************************************************************************************/ diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index bf401138cf1..bb3d6e3aee3 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -741,11 +741,13 @@ GHOST_IWindow* GHOST_SystemCocoa::createWindow( NSRect contentRect = [NSWindow contentRectForFrameRect:frame styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask)]; + GHOST_TInt32 bottom = (contentRect.size.height - 1) - height - top; + //Ensures window top left is inside this available rect left = left > contentRect.origin.x ? left : contentRect.origin.x; - top = top > contentRect.origin.y ? top : contentRect.origin.y; - - window = new GHOST_WindowCocoa (this, title, left, top, width, height, state, type, stereoVisual, numOfAASamples); + bottom = bottom > contentRect.origin.y ? bottom : contentRect.origin.y; + + window = new GHOST_WindowCocoa (this, title, left, bottom, width, height, state, type, stereoVisual, numOfAASamples); if (window) { if (window->getValid()) { @@ -771,26 +773,6 @@ GHOST_IWindow* GHOST_SystemCocoa::createWindow( return window; } -GHOST_TSuccess GHOST_SystemCocoa::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual) -{ - GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow(); - *window = currentWindow; - - if(!currentWindow) return GHOST_kFailure; - - return currentWindow->setState(GHOST_kWindowStateFullScreen); -} - -GHOST_TSuccess GHOST_SystemCocoa::endFullScreen(void) -{ - GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow(); - if(!currentWindow) return GHOST_kFailure; - - return currentWindow->setState(GHOST_kWindowStateNormal); -} - - - /** * @note : returns coordinates in Cocoa screen coordinates */ @@ -809,7 +791,6 @@ GHOST_TSuccess GHOST_SystemCocoa::getCursorPosition(GHOST_TInt32& x, GHOST_TInt3 */ GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) { - GHOST_TInt32 wx,wy; GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow(); if (!window) return GHOST_kFailure; @@ -820,8 +801,7 @@ GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 CGAssociateMouseAndMouseCursorPosition(true); //Force mouse move event (not pushed by Cocoa) - window->screenToClient(x, y, wx, wy); - pushEvent(new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, wx,wy)); + pushEvent(new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, x, y)); m_outsideLoopEventProcessed = true; return GHOST_kSuccess; @@ -1433,9 +1413,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr, short eventT GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) { NSEvent *event = (NSEvent *)eventPtr; - GHOST_Window* window; + GHOST_WindowCocoa* window; - window = (GHOST_Window*)m_windowManager->getWindowAssociatedWithOSWindow((void*)[event window]); + window = (GHOST_WindowCocoa*)m_windowManager->getWindowAssociatedWithOSWindow((void*)[event window]); if (!window) { //printf("\nW failure for event 0x%x",[event type]); return GHOST_kFailure; @@ -1499,7 +1479,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) switch (window->getCursorGrabMode()) { case GHOST_kGrabHide: //Cursor hidden grab operation : no cursor move { - GHOST_TInt32 x_warp, y_warp, x_accum, y_accum; + GHOST_TInt32 x_warp, y_warp, x_accum, y_accum, x, y; window->getCursorGrabInitPos(x_warp, y_warp); @@ -1508,7 +1488,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) y_accum += -[event deltaY]; //Strange Apple implementation (inverted coordinates for the deltaY) ... window->setCursorGrabAccum(x_accum, y_accum); - pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, x_warp+x_accum, y_warp+y_accum)); + window->clientToScreenIntern(x_warp+x_accum, y_warp+y_accum, x, y); + pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, x, y)); } break; case GHOST_kGrabWrap: //Wrap cursor at area/window boundaries @@ -1516,7 +1497,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) NSPoint mousePos = [event locationInWindow]; GHOST_TInt32 x_mouse= mousePos.x; GHOST_TInt32 y_mouse= mousePos.y; - GHOST_TInt32 x_accum, y_accum, x_cur, y_cur; + GHOST_TInt32 x_accum, y_accum, x_cur, y_cur, x, y; GHOST_Rect bounds, windowBounds, correctedBounds; /* fallback to window bounds */ @@ -1525,7 +1506,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) //Switch back to Cocoa coordinates orientation (y=0 at botton,the same as blender internal btw!), and to client coordinates window->getClientBounds(windowBounds); - window->screenToClient(bounds.m_l,bounds.m_b, correctedBounds.m_l, correctedBounds.m_t); + window->screenToClient(bounds.m_l, bounds.m_b, correctedBounds.m_l, correctedBounds.m_t); window->screenToClient(bounds.m_r, bounds.m_t, correctedBounds.m_r, correctedBounds.m_b); correctedBounds.m_b = (windowBounds.m_b - windowBounds.m_t) - correctedBounds.m_b; correctedBounds.m_t = (windowBounds.m_b - windowBounds.m_t) - correctedBounds.m_t; @@ -1547,19 +1528,24 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) m_cursorDelta_y = y_mouse-mousePos.y; //Set new cursor position - window->clientToScreen(x_mouse, y_mouse, x_cur, y_cur); + window->clientToScreenIntern(x_mouse, y_mouse, x_cur, y_cur); setMouseCursorPosition(x_cur, y_cur); /* wrap */ //Post event window->getCursorGrabInitPos(x_cur, y_cur); - pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, x_cur + x_accum, y_cur + y_accum)); + window->clientToScreenIntern(x_cur + x_accum, y_cur + y_accum, x, y); + pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, x, y)); } break; default: { //Normal cursor operation: send mouse position in window NSPoint mousePos = [event locationInWindow]; - pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, mousePos.x, mousePos.y)); + GHOST_TInt32 x, y; + + window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); + pushEvent(new GHOST_EventCursor([event timestamp]*1000, GHOST_kEventCursorMove, window, x, y)); + m_cursorDelta_x=0; m_cursorDelta_y=0; //Mouse motion occurred between two cursor warps, so we can reset the delta counter } @@ -1581,6 +1567,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) } else { NSPoint mousePos = [event locationInWindow]; + GHOST_TInt32 x, y; double dx = [event deltaX]; double dy = -[event deltaY]; @@ -1597,7 +1584,10 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) if (dy<0.0) dy-=0.5; else dy+=0.5; if (dy< -deltaMax) dy= -deltaMax; else if (dy>deltaMax) dy=deltaMax; - pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventScroll, mousePos.x, mousePos.y, dx, dy)); + window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); + dy = -dy; + + pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventScroll, x, y, dx, dy)); } } break; @@ -1605,7 +1595,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) case NSEventTypeMagnify: { NSPoint mousePos = [event locationInWindow]; - pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventMagnify, mousePos.x, mousePos.y, + GHOST_TInt32 x, y; + window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); + pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventMagnify, x, y, [event magnification]*250.0 + 0.1, 0)); } break; @@ -1613,7 +1605,9 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) case NSEventTypeRotate: { NSPoint mousePos = [event locationInWindow]; - pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventRotate, mousePos.x, mousePos.y, + GHOST_TInt32 x, y; + window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); + pushEvent(new GHOST_EventTrackpad([event timestamp]*1000, window, GHOST_kTrackpadEventRotate, x, y, -[event rotation] * 5.0, 0)); } case NSEventTypeBeginGesture: diff --git a/intern/ghost/intern/GHOST_SystemNULL.h b/intern/ghost/intern/GHOST_SystemNULL.h new file mode 100644 index 00000000000..3bc68b45b0d --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemNULL.h @@ -0,0 +1,93 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_SystemNULL.h + * \ingroup GHOST + * Declaration of GHOST_SystemNULL class. + */ + +#ifndef _GHOST_SYSTEM_NULL_H_ +#define _GHOST_SYSTEM_NULL_H_ + +#include "GHOST_System.h" +#include "../GHOST_Types.h" +#include "GHOST_DisplayManagerNULL.h" +#include "GHOST_WindowNULL.h" + +class GHOST_WindowNULL; + +class GHOST_SystemNULL : public GHOST_System { +public: + + GHOST_SystemNULL( ) : GHOST_System() { /* nop */ } + ~GHOST_SystemNULL() { /* nop */ } + bool processEvents(bool waitForEvent) { return false; } + int toggleConsole(int action) { return 0; } + GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const { return GHOST_kSuccess; } + GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const { return GHOST_kSuccess; } + GHOST_TUns8 *getClipboard(bool selection) const { return NULL; } + void putClipboard(GHOST_TInt8 *buffer, bool selection) const { /* nop */ } + GHOST_TUns64 getMilliSeconds( ) const { return 0; } + GHOST_TUns8 getNumDisplays( ) const { return GHOST_TUns8(1); } + GHOST_TSuccess getCursorPosition( GHOST_TInt32& x, GHOST_TInt32& y ) const { return GHOST_kFailure; } + GHOST_TSuccess setCursorPosition( GHOST_TInt32 x, GHOST_TInt32 y ) { return GHOST_kFailure; } + void getMainDisplayDimensions( GHOST_TUns32& width, GHOST_TUns32& height ) const { /* nop */ } + + GHOST_TSuccess init() { + GHOST_TSuccess success = GHOST_System::init(); + + if (success) { + m_displayManager = new GHOST_DisplayManagerNULL(this); + + if (m_displayManager) { + return GHOST_kSuccess; + } + } + + return GHOST_kFailure; + } + + GHOST_IWindow* createWindow( + const STR_String& title, + GHOST_TInt32 left, + GHOST_TInt32 top, + GHOST_TUns32 width, + GHOST_TUns32 height, + GHOST_TWindowState state, + GHOST_TDrawingContextType type, + bool stereoVisual, + const GHOST_TUns16 numOfAASamples, + const GHOST_TEmbedderWindowID parentWindow + ) { + return new GHOST_WindowNULL (this, title, left, top, width, height, state, parentWindow, type, stereoVisual, 1); + } +}; + +#endif + + + + + + + diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp new file mode 100644 index 00000000000..2c61acc2d93 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -0,0 +1,555 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_SystemSDL.cpp + * \ingroup GHOST + */ + +#include <assert.h> + +#include "GHOST_SystemSDL.h" + +#include "GHOST_WindowManager.h" + +#include "GHOST_EventCursor.h" +#include "GHOST_EventKey.h" +#include "GHOST_EventButton.h" +#include "GHOST_EventWheel.h" + +GHOST_SystemSDL::GHOST_SystemSDL() + : + GHOST_System() +{ + if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER) != 0) { + printf ("Error initializing SDL: %s\n", SDL_GetError()); + } + + /* SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); */ + /* SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); */ + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); + SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); +} + +GHOST_SystemSDL::~GHOST_SystemSDL() +{ + SDL_Quit(); +} + +GHOST_IWindow * +GHOST_SystemSDL::createWindow(const STR_String& title, + GHOST_TInt32 left, + GHOST_TInt32 top, + GHOST_TUns32 width, + GHOST_TUns32 height, + GHOST_TWindowState state, + GHOST_TDrawingContextType type, + bool stereoVisual, + const GHOST_TUns16 numOfAASamples, + const GHOST_TEmbedderWindowID parentWindow + ) +{ + GHOST_WindowSDL *window= NULL; + + window= new GHOST_WindowSDL (this, title, left, top, width, height, state, parentWindow, type, stereoVisual, 1); + + if (window) { + if (window->getValid()) { + m_windowManager->addWindow(window); + pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window)); + } + else { + delete window; + window= NULL; + } + } + return window; +} + +GHOST_TSuccess +GHOST_SystemSDL::init() { + GHOST_TSuccess success = GHOST_System::init(); + + if (success) { + m_displayManager = new GHOST_DisplayManagerSDL(this); + + if (m_displayManager) { + return GHOST_kSuccess; + } + } + + return GHOST_kFailure; +} + +void +GHOST_SystemSDL::getMainDisplayDimensions(GHOST_TUns32& width, + GHOST_TUns32& height) const +{ + SDL_DisplayMode mode; + SDL_GetCurrentDisplayMode(0, &mode); /* note, always 0 display */ + width= mode.w; + height= mode.h; +} + +GHOST_TUns8 +GHOST_SystemSDL::getNumDisplays() const +{ + return SDL_GetNumVideoDisplays(); +} + +GHOST_TSuccess +GHOST_SystemSDL::getModifierKeys(GHOST_ModifierKeys& keys) const +{ + SDL_Keymod mod= SDL_GetModState(); + + keys.set(GHOST_kModifierKeyLeftShift, (mod & KMOD_LSHIFT) != 0); + keys.set(GHOST_kModifierKeyRightShift, (mod & KMOD_RSHIFT) != 0); + keys.set(GHOST_kModifierKeyLeftControl, (mod & KMOD_LCTRL) != 0); + keys.set(GHOST_kModifierKeyRightControl, (mod & KMOD_RCTRL) != 0); + keys.set(GHOST_kModifierKeyLeftAlt, (mod & KMOD_LALT) != 0); + keys.set(GHOST_kModifierKeyRightAlt, (mod & KMOD_RALT) != 0); + keys.set(GHOST_kModifierKeyOS, (mod & (KMOD_LGUI|KMOD_RGUI)) != 0); + + return GHOST_kSuccess; +} + +#define GXMAP(k,x,y) case x: k= y; break; + +static GHOST_TKey +convertSDLKey(SDL_Scancode key) +{ + GHOST_TKey type; + + if ((key >= SDL_SCANCODE_A) && (key <= SDL_SCANCODE_Z)) { + type= GHOST_TKey( key - SDL_SCANCODE_A + int(GHOST_kKeyA)); + } else if ((key >= SDL_SCANCODE_1) && (key <= SDL_SCANCODE_0)) { + type= GHOST_TKey(key - SDL_SCANCODE_1 + int(GHOST_kKey0)); + } else if ((key >= SDL_SCANCODE_F1) && (key <= SDL_SCANCODE_F12)) { + type= GHOST_TKey(key - SDL_SCANCODE_F1 + int(GHOST_kKeyF1)); + } else if ((key >= SDL_SCANCODE_F13) && (key <= SDL_SCANCODE_F24)) { + type= GHOST_TKey(key - SDL_SCANCODE_F13 + int(GHOST_kKeyF13)); + } else { + switch(key) { + /* TODO SDL_SCANCODE_NONUSBACKSLASH */ + + GXMAP(type,SDL_SCANCODE_BACKSPACE, GHOST_kKeyBackSpace); + GXMAP(type,SDL_SCANCODE_TAB, GHOST_kKeyTab); + GXMAP(type,SDL_SCANCODE_RETURN, GHOST_kKeyEnter); + GXMAP(type,SDL_SCANCODE_ESCAPE, GHOST_kKeyEsc); + GXMAP(type,SDL_SCANCODE_SPACE, GHOST_kKeySpace); + + GXMAP(type,SDL_SCANCODE_SEMICOLON, GHOST_kKeySemicolon); + GXMAP(type,SDL_SCANCODE_PERIOD, GHOST_kKeyPeriod); + GXMAP(type,SDL_SCANCODE_COMMA, GHOST_kKeyComma); + GXMAP(type,SDL_SCANCODE_APOSTROPHE, GHOST_kKeyQuote); + GXMAP(type,SDL_SCANCODE_GRAVE, GHOST_kKeyAccentGrave); + GXMAP(type,SDL_SCANCODE_MINUS, GHOST_kKeyMinus); + GXMAP(type,SDL_SCANCODE_SLASH, GHOST_kKeySlash); + GXMAP(type,SDL_SCANCODE_BACKSLASH, GHOST_kKeyBackslash); + GXMAP(type,SDL_SCANCODE_KP_EQUALS, GHOST_kKeyEqual); + GXMAP(type,SDL_SCANCODE_LEFTBRACKET, GHOST_kKeyLeftBracket); + GXMAP(type,SDL_SCANCODE_RIGHTBRACKET, GHOST_kKeyRightBracket); + GXMAP(type,SDL_SCANCODE_PAUSE, GHOST_kKeyPause); + + GXMAP(type,SDL_SCANCODE_LSHIFT, GHOST_kKeyLeftShift); + GXMAP(type,SDL_SCANCODE_RSHIFT, GHOST_kKeyRightShift); + GXMAP(type,SDL_SCANCODE_LCTRL, GHOST_kKeyLeftControl); + GXMAP(type,SDL_SCANCODE_RCTRL, GHOST_kKeyRightControl); + GXMAP(type,SDL_SCANCODE_LALT, GHOST_kKeyLeftAlt); + GXMAP(type,SDL_SCANCODE_RALT, GHOST_kKeyRightAlt); + GXMAP(type,SDL_SCANCODE_RGUI, GHOST_kKeyOS); + + GXMAP(type,SDL_SCANCODE_INSERT, GHOST_kKeyInsert); + GXMAP(type,SDL_SCANCODE_DELETE, GHOST_kKeyDelete); + GXMAP(type,SDL_SCANCODE_HOME, GHOST_kKeyHome); + GXMAP(type,SDL_SCANCODE_END, GHOST_kKeyEnd); + GXMAP(type,SDL_SCANCODE_PAGEUP, GHOST_kKeyUpPage); + GXMAP(type,SDL_SCANCODE_PAGEDOWN, GHOST_kKeyDownPage); + + GXMAP(type,SDL_SCANCODE_LEFT, GHOST_kKeyLeftArrow); + GXMAP(type,SDL_SCANCODE_RIGHT, GHOST_kKeyRightArrow); + GXMAP(type,SDL_SCANCODE_UP, GHOST_kKeyUpArrow); + GXMAP(type,SDL_SCANCODE_DOWN, GHOST_kKeyDownArrow); + + GXMAP(type,SDL_SCANCODE_CAPSLOCK, GHOST_kKeyCapsLock); + GXMAP(type,SDL_SCANCODE_SCROLLLOCK, GHOST_kKeyScrollLock); + GXMAP(type,SDL_SCANCODE_NUMLOCKCLEAR, GHOST_kKeyNumLock); + + /* keypad events */ + + /* note, sdl defines a bunch of kp defines I never saw before like + * SDL_SCANCODE_KP_PERCENT, SDL_SCANCODE_KP_XOR - campbell */ + GXMAP(type,SDL_SCANCODE_KP_0, GHOST_kKeyNumpad0); + GXMAP(type,SDL_SCANCODE_KP_1, GHOST_kKeyNumpad1); + GXMAP(type,SDL_SCANCODE_KP_2, GHOST_kKeyNumpad2); + GXMAP(type,SDL_SCANCODE_KP_3, GHOST_kKeyNumpad3); + GXMAP(type,SDL_SCANCODE_KP_4, GHOST_kKeyNumpad4); + GXMAP(type,SDL_SCANCODE_KP_5, GHOST_kKeyNumpad5); + GXMAP(type,SDL_SCANCODE_KP_6, GHOST_kKeyNumpad6); + GXMAP(type,SDL_SCANCODE_KP_7, GHOST_kKeyNumpad7); + GXMAP(type,SDL_SCANCODE_KP_8, GHOST_kKeyNumpad8); + GXMAP(type,SDL_SCANCODE_KP_9, GHOST_kKeyNumpad9); + GXMAP(type,SDL_SCANCODE_KP_PERIOD, GHOST_kKeyNumpadPeriod); + + GXMAP(type,SDL_SCANCODE_KP_ENTER, GHOST_kKeyNumpadEnter); + GXMAP(type,SDL_SCANCODE_KP_PLUS, GHOST_kKeyNumpadPlus); + GXMAP(type,SDL_SCANCODE_KP_MINUS, GHOST_kKeyNumpadMinus); + GXMAP(type,SDL_SCANCODE_KP_MULTIPLY, GHOST_kKeyNumpadAsterisk); + GXMAP(type,SDL_SCANCODE_KP_DIVIDE, GHOST_kKeyNumpadSlash); + + /* Media keys in some keyboards and laptops with XFree86/Xorg */ + GXMAP(type,SDL_SCANCODE_AUDIOPLAY, GHOST_kKeyMediaPlay); + GXMAP(type,SDL_SCANCODE_AUDIOSTOP, GHOST_kKeyMediaStop); + GXMAP(type,SDL_SCANCODE_AUDIOPREV, GHOST_kKeyMediaFirst); + // GXMAP(type,XF86XK_AudioRewind, GHOST_kKeyMediaFirst); + GXMAP(type,SDL_SCANCODE_AUDIONEXT, GHOST_kKeyMediaLast); + + default: + type= GHOST_kKeyUnknown; + break; + } + } + + return type; +} +#undef GXMAP + + +void +GHOST_SystemSDL::processEvent(SDL_Event *sdl_event) +{ + GHOST_Event * g_event= NULL; + + switch(sdl_event->type) { + case SDL_WINDOWEVENT: + { + SDL_WindowEvent &sdl_sub_evt= sdl_event->window; + GHOST_WindowSDL *window= findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID)); + //assert(window != NULL); // can be NULL on close window. + + switch (sdl_sub_evt.event) { + case SDL_WINDOWEVENT_EXPOSED: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowUpdate, window); + break; + case SDL_WINDOWEVENT_RESIZED: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window); + break; + case SDL_WINDOWEVENT_MOVED: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowMove, window); + break; + case SDL_WINDOWEVENT_FOCUS_GAINED: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowActivate, window); + break; + case SDL_WINDOWEVENT_FOCUS_LOST: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowDeactivate, window); + break; + case SDL_WINDOWEVENT_CLOSE: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowClose, window); + break; + } + } + break; + case SDL_QUIT: + g_event= new GHOST_Event(getMilliSeconds(), GHOST_kEventQuit, NULL); + break; + + case SDL_MOUSEMOTION: + { + SDL_MouseMotionEvent &sdl_sub_evt= sdl_event->motion; + SDL_Window *sdl_win= SDL_GetWindowFromID(sdl_sub_evt.windowID); + GHOST_WindowSDL *window= findGhostWindow(sdl_win); + assert(window != NULL); + + int x_win, y_win; + SDL_GetWindowPosition(sdl_win, &x_win, &y_win); + + GHOST_TInt32 x_root= sdl_sub_evt.x + x_win; + GHOST_TInt32 y_root= sdl_sub_evt.y + y_win; + +#if 0 + if(window->getCursorGrabMode() != GHOST_kGrabDisable && window->getCursorGrabMode() != GHOST_kGrabNormal) + { + GHOST_TInt32 x_new= x_root; + GHOST_TInt32 y_new= y_root; + GHOST_TInt32 x_accum, y_accum; + GHOST_Rect bounds; + + /* fallback to window bounds */ + if(window->getCursorGrabBounds(bounds)==GHOST_kFailure) + window->getClientBounds(bounds); + + /* could also clamp to screen bounds + * wrap with a window outside the view will fail atm */ + bounds.wrapPoint(x_new, y_new, 8); /* offset of one incase blender is at screen bounds */ + window->getCursorGrabAccum(x_accum, y_accum); + + // cant use setCursorPosition because the mouse may have no focus! + if(x_new != x_root || y_new != y_root) { + if (1 ) { //xme.time > m_last_warp) { + /* when wrapping we don't need to add an event because the + * setCursorPosition call will cause a new event after */ + SDL_WarpMouseInWindow(sdl_win, x_new - x_win, y_new - y_win); /* wrap */ + window->setCursorGrabAccum(x_accum + (x_root - x_new), y_accum + (y_root - y_new)); + // m_last_warp= lastEventTime(xme.time); + } else { + // setCursorPosition(x_new, y_new); /* wrap but don't accumulate */ + SDL_WarpMouseInWindow(sdl_win, x_new - x_win, y_new - y_win); + } + + g_event = new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, x_new, y_new); + } + else { + g_event = new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, x_root + x_accum, y_root + y_accum); + } + } + else +#endif + { + g_event= new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, x_root, y_root); + } + break; + } + case SDL_MOUSEBUTTONUP: + case SDL_MOUSEBUTTONDOWN: + { + SDL_MouseButtonEvent &sdl_sub_evt= sdl_event->button; + GHOST_TButtonMask gbmask= GHOST_kButtonMaskLeft; + GHOST_TEventType type= (sdl_sub_evt.state==SDL_PRESSED) ? GHOST_kEventButtonDown : GHOST_kEventButtonUp; + + GHOST_WindowSDL *window= findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID)); + assert(window != NULL); + + /* process rest of normal mouse buttons */ + if(sdl_sub_evt.button == SDL_BUTTON_LEFT) + gbmask= GHOST_kButtonMaskLeft; + else if(sdl_sub_evt.button == SDL_BUTTON_MIDDLE) + gbmask= GHOST_kButtonMaskMiddle; + else if(sdl_sub_evt.button == SDL_BUTTON_RIGHT) + gbmask= GHOST_kButtonMaskRight; + /* these buttons are untested! */ + else if(sdl_sub_evt.button == SDL_BUTTON_X1) + gbmask= GHOST_kButtonMaskButton4; + else if(sdl_sub_evt.button == SDL_BUTTON_X2) + gbmask= GHOST_kButtonMaskButton5; + else + break; + + g_event= new GHOST_EventButton(getMilliSeconds(), type, window, gbmask); + break; + } + case SDL_MOUSEWHEEL: + { + SDL_MouseWheelEvent &sdl_sub_evt= sdl_event->wheel; + GHOST_WindowSDL *window= findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID)); + assert(window != NULL); + g_event= new GHOST_EventWheel(getMilliSeconds(), window, sdl_sub_evt.y); + } + break; + case SDL_KEYDOWN: + case SDL_KEYUP: + { + SDL_KeyboardEvent &sdl_sub_evt= sdl_event->key; + GHOST_TEventType type= (sdl_sub_evt.state == SDL_PRESSED) ? GHOST_kEventKeyDown : GHOST_kEventKeyUp; + + GHOST_WindowSDL *window= findGhostWindow(SDL_GetWindowFromID(sdl_sub_evt.windowID)); + assert(window != NULL); + + GHOST_TKey gkey= convertSDLKey(sdl_sub_evt.keysym.scancode); + /* note, the sdl_sub_evt.keysym.sym is truncated, for unicode support ghost has to be modified */ + g_event= new GHOST_EventKey(getMilliSeconds(), type, window, gkey, sdl_sub_evt.keysym.sym); + } + break; + } + + if (g_event) { + pushEvent(g_event); + } +} + +GHOST_TSuccess +GHOST_SystemSDL::getCursorPosition(GHOST_TInt32& x, + GHOST_TInt32& y) const +{ + int x_win, y_win; + SDL_Window *win= SDL_GetMouseFocus(); + SDL_GetWindowPosition(win, &x_win, &y_win); + + int xi, yi; + SDL_GetMouseState(&xi, &yi); + x= xi + x_win; + y= yi + x_win; + + return GHOST_kSuccess; +} + +GHOST_TSuccess +GHOST_SystemSDL::setCursorPosition(GHOST_TInt32 x, + GHOST_TInt32 y) +{ + int x_win, y_win; + SDL_Window *win= SDL_GetMouseFocus(); + SDL_GetWindowPosition(win, &x_win, &y_win); + + SDL_WarpMouseInWindow(win, x - x_win, y - y_win); + return GHOST_kSuccess; +} + +bool +GHOST_SystemSDL::generateWindowExposeEvents() +{ + vector<GHOST_WindowSDL *>::iterator w_start= m_dirty_windows.begin(); + vector<GHOST_WindowSDL *>::const_iterator w_end= m_dirty_windows.end(); + bool anyProcessed= false; + + for (;w_start != w_end; ++w_start) { + GHOST_Event * g_event= new + GHOST_Event( + getMilliSeconds(), + GHOST_kEventWindowUpdate, + *w_start + ); + + (*w_start)->validate(); + + if (g_event) { + printf("Expose events pushed\n"); + pushEvent(g_event); + anyProcessed= true; + } + } + + m_dirty_windows.clear(); + return anyProcessed; +} + + +bool +GHOST_SystemSDL::processEvents(bool waitForEvent) +{ + // Get all the current events -- translate them into + // ghost events and call base class pushEvent() method. + + bool anyProcessed= false; + + do { + GHOST_TimerManager* timerMgr= getTimerManager(); + + if (waitForEvent && m_dirty_windows.empty() && !SDL_HasEvents(SDL_FIRSTEVENT, SDL_LASTEVENT)) { + GHOST_TUns64 next= timerMgr->nextFireTime(); + + if (next==GHOST_kFireTimeNever) { + SDL_WaitEventTimeout(NULL, -1); + //SleepTillEvent(m_display, -1); + } else { + GHOST_TInt64 maxSleep= next - getMilliSeconds(); + + if(maxSleep >= 0) { + SDL_WaitEventTimeout(NULL, next - getMilliSeconds()); + // SleepTillEvent(m_display, next - getMilliSeconds()); // X11 + } + } + } + + if (timerMgr->fireTimers(getMilliSeconds())) { + anyProcessed= true; + } + + SDL_Event sdl_event; + while (SDL_PollEvent(&sdl_event)) { + processEvent(&sdl_event); + anyProcessed= true; + } + + if (generateWindowExposeEvents()) { + anyProcessed= true; + } + } while (waitForEvent && !anyProcessed); + + return anyProcessed; +} + + +GHOST_WindowSDL * +GHOST_SystemSDL::findGhostWindow(SDL_Window *sdl_win) +{ + if (sdl_win == NULL) return NULL; + + // It is not entirely safe to do this as the backptr may point + // to a window that has recently been removed. + // We should always check the window manager's list of windows + // and only process events on these windows. + + vector<GHOST_IWindow *> & win_vec= m_windowManager->getWindows(); + + vector<GHOST_IWindow *>::iterator win_it= win_vec.begin(); + vector<GHOST_IWindow *>::const_iterator win_end= win_vec.end(); + + for (; win_it != win_end; ++win_it) { + GHOST_WindowSDL * window= static_cast<GHOST_WindowSDL *>(*win_it); + if (window->getSDLWindow() == sdl_win) { + return window; + } + } + return NULL; +} + + +void +GHOST_SystemSDL::addDirtyWindow(GHOST_WindowSDL *bad_wind) +{ + GHOST_ASSERT((bad_wind != NULL), "addDirtyWindow() NULL ptr trapped (window)"); + + m_dirty_windows.push_back(bad_wind); +} + + +GHOST_TSuccess GHOST_SystemSDL::getButtons(GHOST_Buttons& buttons) const +{ + Uint8 state= SDL_GetMouseState(NULL, NULL); + buttons.set(GHOST_kButtonMaskLeft, (state & SDL_BUTTON_LMASK) != 0); + buttons.set(GHOST_kButtonMaskMiddle, (state & SDL_BUTTON_MMASK) != 0); + buttons.set(GHOST_kButtonMaskRight, (state & SDL_BUTTON_RMASK) != 0); + + return GHOST_kSuccess; +} + +GHOST_TUns8 * +GHOST_SystemSDL::getClipboard(bool selection) const +{ + return (GHOST_TUns8 *)SDL_GetClipboardText(); +} + +void +GHOST_SystemSDL::putClipboard(GHOST_TInt8 *buffer, bool selection) const +{ + SDL_SetClipboardText(buffer); +} + +GHOST_TUns64 +GHOST_SystemSDL::getMilliSeconds() +{ + return GHOST_TUns64(SDL_GetTicks()); /* note, 32 -> 64bits */ +} diff --git a/intern/ghost/intern/GHOST_SystemSDL.h b/intern/ghost/intern/GHOST_SystemSDL.h new file mode 100644 index 00000000000..87d288117c5 --- /dev/null +++ b/intern/ghost/intern/GHOST_SystemSDL.h @@ -0,0 +1,126 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_SystemSDL.h + * \ingroup GHOST + * Declaration of GHOST_SystemSDL class. + */ + +#ifndef _GHOST_SYSTEM_SDL_H_ +#define _GHOST_SYSTEM_SDL_H_ + +#include "GHOST_System.h" +#include "../GHOST_Types.h" +#include "GHOST_DisplayManagerSDL.h" +#include "GHOST_TimerManager.h" +#include "GHOST_WindowSDL.h" +#include "GHOST_Event.h" + +extern "C" { + #include "SDL.h" +} + +#if !SDL_VERSION_ATLEAST(1, 3, 0) +# error "SDL 1.3 or newer is needed to build with Ghost" +#endif + + +class GHOST_WindowSDL; + + +class GHOST_SystemSDL : public GHOST_System { +public: + + void addDirtyWindow(GHOST_WindowSDL *bad_wind); + + GHOST_SystemSDL(); + ~GHOST_SystemSDL(); + + bool + processEvents(bool waitForEvent); + + int + toggleConsole(int action) { return 0; } + + GHOST_TSuccess + getModifierKeys(GHOST_ModifierKeys& keys) const; + + GHOST_TSuccess + getButtons(GHOST_Buttons& buttons) const; + + GHOST_TUns8 * + getClipboard(bool selection) const; + + void + putClipboard(GHOST_TInt8 *buffer, bool selection) const; + + GHOST_TUns64 + getMilliSeconds(); + + GHOST_TUns8 + getNumDisplays() const; + + GHOST_TSuccess + getCursorPosition(GHOST_TInt32& x, + GHOST_TInt32& y) const; + + GHOST_TSuccess + setCursorPosition(GHOST_TInt32 x, + GHOST_TInt32 y); + + void + getMainDisplayDimensions(GHOST_TUns32& width, + GHOST_TUns32& height) const; + +private: + + GHOST_TSuccess + init(); + + GHOST_IWindow * + createWindow(const STR_String& title, + GHOST_TInt32 left, + GHOST_TInt32 top, + GHOST_TUns32 width, + GHOST_TUns32 height, + GHOST_TWindowState state, + GHOST_TDrawingContextType type, + bool stereoVisual, + const GHOST_TUns16 numOfAASamples, + const GHOST_TEmbedderWindowID parentWindow + ); + + /* SDL spesific */ + GHOST_WindowSDL * findGhostWindow(SDL_Window *sdl_win); + + bool + generateWindowExposeEvents(); + + void + processEvent(SDL_Event *sdl_event); + + /// The vector of windows that need to be updated. + std::vector<GHOST_WindowSDL *> m_dirty_windows; +}; + +#endif diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 2fdddda835d..ace6cc0e0cf 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -42,7 +42,7 @@ #include <iostream> #ifdef FREE_WINDOWS -# define _WIN32_WINNT 0x0500 /* GetConsoleWindow() for MinGW */ +# define WINVER 0x0501 /* GetConsoleWindow() for MinGW */ #endif #include "GHOST_SystemWin32.h" @@ -304,7 +304,6 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent) // Process all the events waiting for us while (::PeekMessage(&msg, 0, 0, 0, PM_REMOVE) != 0) { - ::TranslateMessage(&msg); ::DispatchMessage(&msg); anyProcessed = true; } @@ -764,7 +763,7 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, WPARAM event = new GHOST_EventKey(system->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, ascii); -#ifdef BF_GHOST_DEBUG +#ifdef GHOST_DEBUG std::cout << ascii << std::endl; #endif } @@ -819,6 +818,11 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, // Keyboard events, processed //////////////////////////////////////////////////////////////////////// case WM_INPUT: + // check WM_INPUT from input sink when ghost window is not in the foreground + if (wParam == RIM_INPUTSINK) { + if (GetFocus() != hwnd) // WM_INPUT message not for this window + return 0; + } //else wPAram == RIM_INPUT event = processKeyEvent(window, wParam, lParam); if (!event) { GHOST_PRINT("GHOST_SystemWin32::wndProc: key event ") @@ -1174,25 +1178,29 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(bool selection) const char *temp_buff; if ( IsClipboardFormatAvailable(CF_TEXT) && OpenClipboard(NULL) ) { + size_t len = 0; HANDLE hData = GetClipboardData( CF_TEXT ); if (hData == NULL) { CloseClipboard(); return NULL; } buffer = (char*)GlobalLock( hData ); + if (!buffer) { + CloseClipboard(); + return NULL; + } - temp_buff = (char*) malloc(strlen(buffer)+1); - strcpy(temp_buff, buffer); + len = strlen(buffer); + temp_buff = (char*) malloc(len+1); + strncpy(temp_buff, buffer, len); + temp_buff[len] = '\0'; + /* Buffer mustn't be accessed after CloseClipboard + it would like accessing free-d memory */ GlobalUnlock( hData ); CloseClipboard(); - temp_buff[strlen(buffer)] = '\0'; - if (buffer) { - return (GHOST_TUns8*)temp_buff; - } else { - return NULL; - } + return (GHOST_TUns8*)temp_buff; } else { return NULL; } diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 2dad3a6f44d..729ad56d875 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -52,6 +52,9 @@ #ifndef RID_INPUT #define RID_INPUT 0x10000003 #endif +#ifndef RIM_INPUTSINK +#define RIM_INPUTSINK 0x1 +#endif #ifndef RI_KEY_BREAK #define RI_KEY_BREAK 0x1 #endif @@ -127,8 +130,6 @@ DECLARE_HANDLE(HRAWINPUT); #ifdef FREE_WINDOWS #define NEED_RAW_PROC typedef BOOL (WINAPI * LPFNDLLRRID)(RAWINPUTDEVICE*,UINT, UINT); -#define RegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize) ((pRegisterRawInputDevices)?pRegisterRawInputDevices(pRawInputDevices, uiNumDevices, cbSize):0) - typedef UINT (WINAPI * LPFNDLLGRID)(HRAWINPUT, UINT, LPVOID, PUINT, UINT); #define GetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader) ((pGetRawInputData)?pGetRawInputData(hRawInput, uiCommand, pData, pcbSize, cbSizeHeader):(UINT)-1) diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 378bc6b90be..dd296fa979c 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -76,6 +76,9 @@ #include <stdio.h> // for fprintf only #include <cstdlib> // for exit +static GHOST_TKey +convertXKey(KeySym key); + typedef struct NDOFPlatformInfo { Display *display; Window window; @@ -147,8 +150,9 @@ GHOST_SystemX11( if (gettimeofday(&tv,NULL) == -1) { GHOST_ASSERT(false,"Could not instantiate timer!"); } - - m_start_time = GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000); + + // Taking care not to overflow the tv.tv_sec*1000 + m_start_time = GHOST_TUns64(tv.tv_sec)*1000 + tv.tv_usec/1000; /* use detectable autorepeate, mac and windows also do this */ @@ -196,7 +200,8 @@ getMilliSeconds( GHOST_ASSERT(false,"Could not compute time!"); } - return GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000) - m_start_time; + // Taking care not to overflow the tv.tv_sec*1000 + return GHOST_TUns64(tv.tv_sec)*1000 + tv.tv_usec/1000 - m_start_time; } GHOST_TUns8 @@ -700,19 +705,24 @@ GHOST_SystemX11::processEvent(XEvent *xe) case EnterNotify: case LeaveNotify: { - // XCrossingEvents pointer leave enter window. - // also do cursor move here, MotionNotify only - // happens when motion starts & ends inside window + /* XCrossingEvents pointer leave enter window. + also do cursor move here, MotionNotify only + happens when motion starts & ends inside window. + we only do moves when the crossing mode is 'normal' + (really crossing between windows) since some windowmanagers + also send grab/ungrab crossings for mousewheel events. + */ XCrossingEvent &xce = xe->xcrossing; - - g_event = new - GHOST_EventCursor( - getMilliSeconds(), - GHOST_kEventCursorMove, - window, - xce.x_root, - xce.y_root - ); + if( xce.mode == NotifyNormal ) { + g_event = new + GHOST_EventCursor( + getMilliSeconds(), + GHOST_kEventCursorMove, + window, + xce.x_root, + xce.y_root + ); + } break; } case MapNotify: @@ -790,6 +800,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) } default: { +#ifdef WITH_X11_XINPUT if(xe->type == window->GetXTablet().MotionEvent) { XDeviceMotionEvent* data = (XDeviceMotionEvent*)xe; @@ -813,7 +824,7 @@ GHOST_SystemX11::processEvent(XEvent *xe) } else if(xe->type == window->GetXTablet().ProxOutEvent) window->GetXTablet().CommonData.Active= GHOST_kTabletModeNone; - +#endif // WITH_X11_XINPUT break; } } @@ -850,60 +861,28 @@ getModifierKeys( // now translate key symobols into keycodes and // test with vector. - const KeyCode shift_l = XKeysymToKeycode(m_display,XK_Shift_L); - const KeyCode shift_r = XKeysymToKeycode(m_display,XK_Shift_R); - const KeyCode control_l = XKeysymToKeycode(m_display,XK_Control_L); - const KeyCode control_r = XKeysymToKeycode(m_display,XK_Control_R); - const KeyCode alt_l = XKeysymToKeycode(m_display,XK_Alt_L); - const KeyCode alt_r = XKeysymToKeycode(m_display,XK_Alt_R); - const KeyCode super_l = XKeysymToKeycode(m_display,XK_Super_L); - const KeyCode super_r = XKeysymToKeycode(m_display,XK_Super_R); - - // Shift - if ((m_keyboard_vector[shift_l >> 3] >> (shift_l & 7)) & 1) { - keys.set(GHOST_kModifierKeyLeftShift,true); - } else { - keys.set(GHOST_kModifierKeyLeftShift,false); - } - if ((m_keyboard_vector[shift_r >> 3] >> (shift_r & 7)) & 1) { - - keys.set(GHOST_kModifierKeyRightShift,true); - } else { - keys.set(GHOST_kModifierKeyRightShift,false); - } - - // control (weep) - if ((m_keyboard_vector[control_l >> 3] >> (control_l & 7)) & 1) { - keys.set(GHOST_kModifierKeyLeftControl,true); - } else { - keys.set(GHOST_kModifierKeyLeftControl,false); - } - if ((m_keyboard_vector[control_r >> 3] >> (control_r & 7)) & 1) { - keys.set(GHOST_kModifierKeyRightControl,true); - } else { - keys.set(GHOST_kModifierKeyRightControl,false); - } - - // Alt (yawn) - if ((m_keyboard_vector[alt_l >> 3] >> (alt_l & 7)) & 1) { - keys.set(GHOST_kModifierKeyLeftAlt,true); - } else { - keys.set(GHOST_kModifierKeyLeftAlt,false); - } - if ((m_keyboard_vector[alt_r >> 3] >> (alt_r & 7)) & 1) { - keys.set(GHOST_kModifierKeyRightAlt,true); - } else { - keys.set(GHOST_kModifierKeyRightAlt,false); - } + const static KeyCode shift_l = XKeysymToKeycode(m_display,XK_Shift_L); + const static KeyCode shift_r = XKeysymToKeycode(m_display,XK_Shift_R); + const static KeyCode control_l = XKeysymToKeycode(m_display,XK_Control_L); + const static KeyCode control_r = XKeysymToKeycode(m_display,XK_Control_R); + const static KeyCode alt_l = XKeysymToKeycode(m_display,XK_Alt_L); + const static KeyCode alt_r = XKeysymToKeycode(m_display,XK_Alt_R); + const static KeyCode super_l = XKeysymToKeycode(m_display,XK_Super_L); + const static KeyCode super_r = XKeysymToKeycode(m_display,XK_Super_R); + + // shift + keys.set(GHOST_kModifierKeyLeftShift, ((m_keyboard_vector[shift_l >> 3] >> (shift_l & 7)) & 1) != 0); + keys.set(GHOST_kModifierKeyRightShift, ((m_keyboard_vector[shift_r >> 3] >> (shift_r & 7)) & 1) != 0); + // control + keys.set(GHOST_kModifierKeyLeftControl, ((m_keyboard_vector[control_l >> 3] >> (control_l & 7)) & 1) != 0); + keys.set(GHOST_kModifierKeyRightControl, ((m_keyboard_vector[control_r >> 3] >> (control_r & 7)) & 1) != 0); + // alt + keys.set(GHOST_kModifierKeyLeftAlt, ((m_keyboard_vector[alt_l >> 3] >> (alt_l & 7)) & 1) != 0); + keys.set(GHOST_kModifierKeyRightAlt, ((m_keyboard_vector[alt_r >> 3] >> (alt_r & 7)) & 1) != 0); + // super (windows) - only one GHOST-kModifierKeyOS, so mapping to either + keys.set(GHOST_kModifierKeyOS, ( ((m_keyboard_vector[super_l >> 3] >> (super_l & 7)) & 1) || + ((m_keyboard_vector[super_r >> 3] >> (super_r & 7)) & 1) ) != 0); - // Super (Windows) - only one GHOST-kModifierKeyOS, so mapping - // to either - if ( ((m_keyboard_vector[super_l >> 3] >> (super_l & 7)) & 1) || - ((m_keyboard_vector[super_r >> 3] >> (super_r & 7)) & 1) ) { - keys.set(GHOST_kModifierKeyOS,true); - } else { - keys.set(GHOST_kModifierKeyOS,false); - } return GHOST_kSuccess; } @@ -917,35 +896,20 @@ getButtons( int rx,ry,wx,wy; unsigned int mask_return; - if (XQueryPointer( - m_display, - RootWindow(m_display,DefaultScreen(m_display)), - &root_return, - &child_return, - &rx,&ry, - &wx,&wy, - &mask_return - ) == False) { + if (XQueryPointer(m_display, + RootWindow(m_display,DefaultScreen(m_display)), + &root_return, + &child_return, + &rx,&ry, + &wx,&wy, + &mask_return) == True) + { + buttons.set(GHOST_kButtonMaskLeft, (mask_return & Button1Mask) != 0); + buttons.set(GHOST_kButtonMaskMiddle, (mask_return & Button2Mask) != 0); + buttons.set(GHOST_kButtonMaskRight, (mask_return & Button3Mask) != 0); + } + else { return GHOST_kFailure; - } else { - - if (mask_return & Button1Mask) { - buttons.set(GHOST_kButtonMaskLeft,true); - } else { - buttons.set(GHOST_kButtonMaskLeft,false); - } - - if (mask_return & Button2Mask) { - buttons.set(GHOST_kButtonMaskMiddle,true); - } else { - buttons.set(GHOST_kButtonMaskMiddle,false); - } - - if (mask_return & Button3Mask) { - buttons.set(GHOST_kButtonMaskRight,true); - } else { - buttons.set(GHOST_kButtonMaskRight,false); - } } return GHOST_kSuccess; @@ -1050,11 +1014,9 @@ generateWindowExposeEvents( #define GXMAP(k,x,y) case x: k = y; break; - GHOST_TKey -GHOST_SystemX11:: -convertXKey( - KeySym key -){ +static GHOST_TKey +convertXKey(KeySym key) +{ GHOST_TKey type; if ((key >= XK_A) && (key <= XK_Z)) { @@ -1169,8 +1131,10 @@ convertXKey( GXMAP(type,XF86XK_AudioPrev, GHOST_kKeyMediaFirst); GXMAP(type,XF86XK_AudioRewind, GHOST_kKeyMediaFirst); GXMAP(type,XF86XK_AudioNext, GHOST_kKeyMediaLast); +#ifdef XF86XK_AudioForward /* Debian lenny's XF86keysym.h has no XF86XK_AudioForward define */ GXMAP(type,XF86XK_AudioForward, GHOST_kKeyMediaLast); #endif +#endif /* some extra sun cruft (NICE KEYBOARD!) */ #ifdef __sun__ diff --git a/intern/ghost/intern/GHOST_SystemX11.h b/intern/ghost/intern/GHOST_SystemX11.h index 0b001273634..746cd4ebdf4 100644 --- a/intern/ghost/intern/GHOST_SystemX11.h +++ b/intern/ghost/intern/GHOST_SystemX11.h @@ -300,12 +300,6 @@ private : bool generateWindowExposeEvents( ); - - GHOST_TKey - convertXKey( - KeySym key - ); - }; #endif diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp index c518272d614..e34bfe7ff26 100644 --- a/intern/ghost/intern/GHOST_Window.cpp +++ b/intern/ghost/intern/GHOST_Window.cpp @@ -41,8 +41,7 @@ GHOST_Window::GHOST_Window( - const STR_String& /*title*/, - GHOST_TInt32 /*left*/, GHOST_TInt32 /*top*/, GHOST_TUns32 width, GHOST_TUns32 height, + GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, const bool stereoVisual, diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index e0c676f53a5..66990abb555 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -76,9 +76,6 @@ public: * Constructor. * Creates a new window and opens it. * To check if the window was created properly, use the getValid() method. - * @param title The text shown in the title bar of the window. - * @param left The coordinate of the left edge of the window. - * @param top The coordinate of the top edge of the window. * @param width The width the window. * @param heigh The height the window. * @param state The state the window is initially opened with. @@ -87,9 +84,6 @@ public: * @param numOfAASamples Number of samples used for AA (zero if no AA) */ GHOST_Window( - const STR_String& title, - GHOST_TInt32 left, - GHOST_TInt32 top, GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index 1ffd117d658..c8bd67f9a5c 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -102,7 +102,7 @@ GHOST_WindowCarbon::GHOST_WindowCarbon( const bool stereoVisual, const GHOST_TUns16 numOfAASamples ) : - GHOST_Window(title, left, top, width, height, state, GHOST_kDrawingContextTypeNone), + GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone), m_windowRef(0), m_grafPtr(0), m_aglCtx(0), diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h index 98e0f9cedd1..ce28f8c4538 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.h +++ b/intern/ghost/intern/GHOST_WindowCocoa.h @@ -42,6 +42,7 @@ #include "STR_String.h" @class CocoaWindow; +@class CocoaOpenGLView; class GHOST_SystemCocoa; @@ -77,7 +78,7 @@ public: GHOST_SystemCocoa *systemCocoa, const STR_String& title, GHOST_TInt32 left, - GHOST_TInt32 top, + GHOST_TInt32 bottom, GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, @@ -181,6 +182,26 @@ public: virtual void clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; /** + * Converts a point in screen coordinates to client rectangle coordinates + * but without the y coordinate conversion needed for ghost compatibility. + * @param inX The x-coordinate in the client rectangle. + * @param inY The y-coordinate in the client rectangle. + * @param outX The x-coordinate on the screen. + * @param outY The y-coordinate on the screen. + */ + void clientToScreenIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + + /** + * Converts a point in screen coordinates to client rectangle coordinates, + * but without the y coordinate conversion needed for ghost compatibility. + * @param inX The x-coordinate in the client rectangle. + * @param inY The y-coordinate in the client rectangle. + * @param outX The x-coordinate on the screen. + * @param outY The y-coordinate on the screen. + */ + void screenToClientIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const; + + /** * Gets the screen the window is displayed in * @return The NSScreen object */ @@ -289,7 +310,7 @@ protected: CocoaWindow *m_window; /** The openGL view */ - NSOpenGLView *m_openGLView; + CocoaOpenGLView *m_openGLView; /** The opgnGL drawing context */ NSOpenGLContext *m_openGLContext; diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 8d28c9d5b17..937dffe9fba 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -241,10 +241,19 @@ extern "C" { //We need to subclass it in order to give Cocoa the feeling key events are trapped @interface CocoaOpenGLView : NSOpenGLView { + GHOST_SystemCocoa *systemCocoa; + GHOST_WindowCocoa *associatedWindow; } +- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa; @end @implementation CocoaOpenGLView +- (void)setSystemAndWindowCocoa:(GHOST_SystemCocoa *)sysCocoa windowCocoa:(GHOST_WindowCocoa *)winCocoa +{ + systemCocoa = sysCocoa; + associatedWindow = winCocoa; +} + - (BOOL)acceptsFirstResponder { return YES; @@ -294,6 +303,7 @@ extern "C" { else { [super drawRect:rect]; + systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow); } } @@ -308,14 +318,14 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( GHOST_SystemCocoa *systemCocoa, const STR_String& title, GHOST_TInt32 left, - GHOST_TInt32 top, + GHOST_TInt32 bottom, GHOST_TUns32 width, GHOST_TUns32 height, GHOST_TWindowState state, GHOST_TDrawingContextType type, const bool stereoVisual, const GHOST_TUns16 numOfAASamples ) : - GHOST_Window(title, left, top, width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, numOfAASamples), + GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual, numOfAASamples), m_customCursor(0) { NSOpenGLPixelFormatAttribute pixelFormatAttrsWindow[40]; @@ -327,13 +337,12 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - //Creates the window NSRect rect; NSSize minSize; rect.origin.x = left; - rect.origin.y = top; + rect.origin.y = bottom; rect.size.width = width; rect.size.height = height; @@ -425,6 +434,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( //Creates the OpenGL View inside the window m_openGLView = [[CocoaOpenGLView alloc] initWithFrame:rect pixelFormat:pixelFormat]; + + [m_openGLView setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; [pixelFormat release]; @@ -461,9 +472,13 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( GHOST_WindowCocoa::~GHOST_WindowCocoa() { - if (m_customCursor) delete m_customCursor; - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + if (m_customCursor) { + [m_customCursor release]; + m_customCursor = nil; + } + [m_openGLView release]; if (m_window) { @@ -688,7 +703,30 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const void GHOST_WindowCocoa::screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const { GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::screenToClient(): window invalid") - + + screenToClientIntern(inX, inY, outX, outY); + + /* switch y to match ghost convention */ + GHOST_Rect cBnds; + getClientBounds(cBnds); + outY = (cBnds.getHeight() - 1) - outY; +} + + +void GHOST_WindowCocoa::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const +{ + GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::clientToScreen(): window invalid") + + /* switch y to match ghost convention */ + GHOST_Rect cBnds; + getClientBounds(cBnds); + inY = (cBnds.getHeight() - 1) - inY; + + clientToScreenIntern(inX, inY, outX, outY); +} + +void GHOST_WindowCocoa::screenToClientIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const +{ NSPoint screenCoord; NSPoint baseCoord; @@ -701,11 +739,8 @@ void GHOST_WindowCocoa::screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST outY = baseCoord.y; } - -void GHOST_WindowCocoa::clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const +void GHOST_WindowCocoa::clientToScreenIntern(GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY) const { - GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::clientToScreen(): window invalid") - NSPoint screenCoord; NSPoint baseCoord; @@ -1207,7 +1242,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCursorGrab(GHOST_TGrabCursorMode mode NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; m_systemCocoa->getCursorPosition(x_old,y_old); - screenToClient(x_old, y_old, m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]); + screenToClientIntern(x_old, y_old, m_cursorGrabInitPos[0], m_cursorGrabInitPos[1]); //Warp position is stored in client (window base) coordinates setCursorGrabAccum(0, 0); diff --git a/intern/ghost/intern/GHOST_WindowNULL.h b/intern/ghost/intern/GHOST_WindowNULL.h new file mode 100644 index 00000000000..f979313af5c --- /dev/null +++ b/intern/ghost/intern/GHOST_WindowNULL.h @@ -0,0 +1,96 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_WindowNULL.h + * \ingroup GHOST + * Declaration of GHOST_WindowNULL class. + */ + +#ifndef _GHOST_WINDOWNULL_H_ +#define _GHOST_WINDOWNULL_H_ + +#include "GHOST_Window.h" + +#include <map> + +class STR_String; +class GHOST_SystemNULL; + +class GHOST_WindowNULL : public GHOST_Window +{ +public: + const GHOST_TabletData* GetTabletData() { return NULL; } + + GHOST_WindowNULL( + GHOST_SystemNULL *system, + const STR_String& title, + GHOST_TInt32 left, + GHOST_TInt32 top, + GHOST_TUns32 width, + GHOST_TUns32 height, + GHOST_TWindowState state, + const GHOST_TEmbedderWindowID parentWindow, + GHOST_TDrawingContextType type, + const bool stereoVisual, + const GHOST_TUns16 numOfAASamples + ) : + GHOST_Window(width,height,state,type,stereoVisual,numOfAASamples), + m_system (system) + { + setTitle(title); + } + +protected: + GHOST_TSuccess installDrawingContext( GHOST_TDrawingContextType type ){ return GHOST_kSuccess; } + GHOST_TSuccess removeDrawingContext( ){ return GHOST_kSuccess; } + GHOST_TSuccess setWindowCursorGrab( GHOST_TGrabCursorMode mode ){ return GHOST_kSuccess; } + GHOST_TSuccess setWindowCursorShape( GHOST_TStandardCursor shape ){ return GHOST_kSuccess; } + GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY ) { return GHOST_kSuccess; } + GHOST_TSuccess setWindowCustomCursorShape( GHOST_TUns8 *bitmap, GHOST_TUns8 *mask, int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color ){ return GHOST_kSuccess; } + + bool getValid( ) const { return true; } + void setTitle( const STR_String& title ){ /* nothing */ } + void getTitle( STR_String& title ) const { title= "untitled"; } + void getWindowBounds( GHOST_Rect& bounds ) const { getClientBounds(bounds); } + void getClientBounds( GHOST_Rect& bounds ) const { /* nothing */ } + GHOST_TSuccess setClientWidth( GHOST_TUns32 width ){ return GHOST_kFailure; } + GHOST_TSuccess setClientHeight( GHOST_TUns32 height ){ return GHOST_kFailure; } + GHOST_TSuccess setClientSize( GHOST_TUns32 width, GHOST_TUns32 height ){ return GHOST_kFailure; } + void screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; } + void clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const { outX = inX; outY = inY; } + GHOST_TSuccess swapBuffers( ){ return GHOST_kFailure; } + GHOST_TSuccess activateDrawingContext( ){ return GHOST_kFailure; } + ~GHOST_WindowNULL( ){ /* nothing */ } + GHOST_TSuccess setWindowCursorVisibility( bool visible ){ return GHOST_kSuccess; } + GHOST_TSuccess setState(GHOST_TWindowState state) { return GHOST_kSuccess; } + GHOST_TWindowState getState() const { return GHOST_kWindowStateNormal; } + GHOST_TSuccess invalidate() { return GHOST_kSuccess; } + GHOST_TSuccess setOrder(GHOST_TWindowOrder order) { return GHOST_kSuccess; } + + +private : + GHOST_SystemNULL * m_system; +}; + + +#endif // _GHOST_WINDOWNULL_H_ diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp new file mode 100644 index 00000000000..1675c1fb12b --- /dev/null +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -0,0 +1,628 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_WindowSDL.cpp + * \ingroup GHOST + */ + +#include "GHOST_WindowSDL.h" +#include "SDL_mouse.h" +#include <assert.h> + +static SDL_GLContext s_firstContext= NULL; + +GHOST_WindowSDL::GHOST_WindowSDL(GHOST_SystemSDL *system, + const STR_String& title, + GHOST_TInt32 left, + GHOST_TInt32 top, + GHOST_TUns32 width, + GHOST_TUns32 height, + GHOST_TWindowState state, + const GHOST_TEmbedderWindowID parentWindow, + GHOST_TDrawingContextType type, + const bool stereoVisual, + const GHOST_TUns16 numOfAASamples + ) + : + GHOST_Window(width,height,state,type,stereoVisual,numOfAASamples), + m_system (system), + m_invalid_window(false), + m_sdl_custom_cursor(NULL) +{ + m_sdl_win= SDL_CreateWindow(title, + left, + top, + width, + height, + SDL_WINDOW_RESIZABLE|SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN); + + //SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 1); + //SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 4); + SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); + SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24); + SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8); + SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8); + + m_sdl_glcontext= SDL_GL_CreateContext(m_sdl_win); + + //fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n", + // theEvent->error_code, theEvent->request_code) ; + + setTitle(title); +} + +GHOST_WindowSDL::~GHOST_WindowSDL() +{ + if(m_sdl_custom_cursor) { + SDL_FreeCursor(m_sdl_custom_cursor); + } + + if (m_sdl_glcontext != s_firstContext) { + SDL_GL_DeleteContext(m_sdl_glcontext); + } + + SDL_DestroyWindow(m_sdl_win); +} + + +GHOST_TSuccess +GHOST_WindowSDL::installDrawingContext(GHOST_TDrawingContextType type) +{ + // only support openGL for now. + GHOST_TSuccess success; + switch (type) { + case GHOST_kDrawingContextTypeOpenGL: + m_sdl_glcontext= SDL_GL_CreateContext(m_sdl_win); + + if (m_sdl_glcontext != NULL) { + if (!s_firstContext) { + s_firstContext= m_sdl_glcontext; + } + + success= (SDL_GL_MakeCurrent(m_sdl_win, m_sdl_glcontext) < 0) ? + GHOST_kFailure : GHOST_kSuccess; + } + else { + success= GHOST_kFailure; + } + + break; + + case GHOST_kDrawingContextTypeNone: + success= GHOST_kSuccess; + break; + + default: + success= GHOST_kFailure; + } + return success; +} + + +GHOST_TSuccess +GHOST_WindowSDL::invalidate(void) +{ + // So the idea of this function is to generate an expose event + // for the window. + // Unfortunately X does not handle expose events for you and + // it is the client's job to refresh the dirty part of the window. + // We need to queue up invalidate calls and generate GHOST events + // for them in the system. + + // We implement this by setting a boolean in this class to concatenate + // all such calls into a single event for this window. + + // At the same time we queue the dirty windows in the system class + // and generate events for them at the next processEvents call. + + if (m_invalid_window == false) { + m_system->addDirtyWindow(this); + m_invalid_window= true; + } + + return GHOST_kSuccess; +} + + +GHOST_TSuccess +GHOST_WindowSDL::swapBuffers() +{ + if (getDrawingContextType() == GHOST_kDrawingContextTypeOpenGL) { + SDL_GL_SwapWindow(m_sdl_win); + return GHOST_kSuccess; + } + else { + return GHOST_kFailure; + } +} + + +GHOST_TSuccess +GHOST_WindowSDL::activateDrawingContext() +{ + if (m_sdl_glcontext !=NULL) { + int status=SDL_GL_MakeCurrent(m_sdl_win, m_sdl_glcontext); + (void)status; + return GHOST_kSuccess; + } + return GHOST_kFailure; +} + + +GHOST_TSuccess +GHOST_WindowSDL::removeDrawingContext() +{ + GHOST_TSuccess success; + + if (m_sdl_glcontext != NULL) { + SDL_GL_DeleteContext(m_sdl_glcontext); + success= GHOST_kSuccess; + } + else { + success= GHOST_kFailure; + } + return success; +} + + +GHOST_TSuccess +GHOST_WindowSDL::setState(GHOST_TWindowState state) +{ + switch(state) { + case GHOST_kWindowStateNormal: + SDL_SetWindowFullscreen(m_sdl_win, SDL_FALSE); + SDL_RestoreWindow(m_sdl_win); + break; + case GHOST_kWindowStateMaximized: + SDL_SetWindowFullscreen(m_sdl_win, SDL_FALSE); + SDL_MaximizeWindow(m_sdl_win); + break; + case GHOST_kWindowStateMinimized: + SDL_MinimizeWindow(m_sdl_win); + break; + case GHOST_kWindowStateFullScreen: + SDL_SetWindowFullscreen(m_sdl_win, SDL_TRUE); + break; + default: + break; + } + + return GHOST_kSuccess; +} + + +GHOST_TWindowState +GHOST_WindowSDL::getState() const +{ + Uint32 flags= SDL_GetWindowFlags(m_sdl_win); + + if(flags & SDL_WINDOW_FULLSCREEN) return GHOST_kWindowStateFullScreen; + else if(flags & SDL_WINDOW_MAXIMIZED) return GHOST_kWindowStateMaximized; + else if(flags & SDL_WINDOW_MINIMIZED) return GHOST_kWindowStateMinimized; + return GHOST_kWindowStateNormal; +} + + +void +GHOST_WindowSDL::setTitle(const STR_String& title) +{ + SDL_SetWindowTitle(m_sdl_win, title.ReadPtr()); +} + + +void +GHOST_WindowSDL::getTitle(STR_String& title) const +{ + title= SDL_GetWindowTitle(m_sdl_win); +} + + +void +GHOST_WindowSDL::getWindowBounds(GHOST_Rect& bounds) const +{ + getClientBounds(bounds); +} + + +void +GHOST_WindowSDL::getClientBounds(GHOST_Rect& bounds) const +{ + int x, y, w, h; + SDL_GetWindowSize(m_sdl_win, &w, &h); + SDL_GetWindowPosition(m_sdl_win, &x, &y); + + bounds.m_l= x; + bounds.m_r= x + w; + bounds.m_t= y; + bounds.m_b= y + h; +} + +GHOST_TSuccess +GHOST_WindowSDL::setClientWidth(GHOST_TUns32 width) +{ + int height; + SDL_GetWindowSize(m_sdl_win, NULL, &height); + SDL_SetWindowSize(m_sdl_win, width, height); + return GHOST_kSuccess; +} + +GHOST_TSuccess +GHOST_WindowSDL::setClientHeight(GHOST_TUns32 height) +{ + int width; + SDL_GetWindowSize(m_sdl_win, &width, NULL); + SDL_SetWindowSize(m_sdl_win, width, height); + return GHOST_kSuccess; +} + +GHOST_TSuccess +GHOST_WindowSDL::setClientSize(GHOST_TUns32 width, + GHOST_TUns32 height) +{ + SDL_SetWindowSize(m_sdl_win, width, height); + return GHOST_kSuccess; +} + +void +GHOST_WindowSDL::screenToClient( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const +{ + /* XXXSDL_WEAK_ABS_COORDS */ + int x_win, y_win; + SDL_GetWindowPosition(m_sdl_win, &x_win, &y_win); + + outX = inX - x_win; + outY = inY - y_win; +} +void +GHOST_WindowSDL::clientToScreen( GHOST_TInt32 inX, GHOST_TInt32 inY, GHOST_TInt32& outX, GHOST_TInt32& outY ) const +{ + /* XXXSDL_WEAK_ABS_COORDS */ + int x_win, y_win; + SDL_GetWindowPosition(m_sdl_win, &x_win, &y_win); + + outX = inX + x_win; + outY = inY + y_win; +} + +/* mouse cursor */ +static unsigned char sdl_std_cursor_mask_xterm[]= {0xef,0x01,0xff,0x01,0xff,0x01,0x7c,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x38,0x00,0x7c,0x00,0xff,0x01,0xff,0x01,0xef,0x01,}; +static unsigned char sdl_std_cursor_xterm[]= {0x00,0x77,0x00,0x1c,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x1c,0x00,0x77,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_xterm 9 +#define sdl_std_cursor_HEIGHT_xterm 16 +#define sdl_std_cursor_HOT_X_xterm -3 +#define sdl_std_cursor_HOT_Y_xterm -7 + +static unsigned char sdl_std_cursor_mask_watch[]= {0xfc,0x0f,0xfc,0x0f,0xfc,0x0f,0xfe,0x1f,0xff,0x3f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0xfe,0x1f,0xfc,0x0f,0xfc,0x0f,0xfc,0x0f,}; +static unsigned char sdl_std_cursor_watch[]= {0xf8,0x07,0xf8,0x07,0xf8,0x07,0xfc,0x0f,0x86,0x18,0x83,0x30,0x81,0xe0,0xc1,0xe1,0xc1,0xe1,0x21,0xe0,0x13,0x30,0x06,0x18,0xfc,0x0f,0xf8,0x07,0xf8,0x07,0xf8,0x07,}; +#define sdl_std_cursor_WIDTH_watch 16 +#define sdl_std_cursor_HEIGHT_watch 16 +#define sdl_std_cursor_HOT_X_watch -15 +#define sdl_std_cursor_HOT_Y_watch -7 + +static unsigned char sdl_std_cursor_mask_umbrella[]= {0xe8,0x76,0xfb,0xdf,0xfd,0x3f,0xfe,0xff,0xff,0x3f,0xff,0xff,0xcf,0x79,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x07,0xc0,0x07,0xc0,0x07,0xc0,0x07,0x80,0x03,}; +static unsigned char sdl_std_cursor_umbrella[]= {0x88,0x04,0x20,0x0a,0xc9,0x32,0xf2,0x09,0x4c,0x06,0x43,0x18,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x01,0x40,0x01,0x80,0x00,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_umbrella 16 +#define sdl_std_cursor_HEIGHT_umbrella 16 +#define sdl_std_cursor_HOT_X_umbrella -7 +#define sdl_std_cursor_HOT_Y_umbrella -12 + +static unsigned char sdl_std_cursor_mask_top_side[]= {0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f,0xc0,0x01,0xe0,0x03,0xf0,0x07,0xf8,0x0f,0xdc,0x1d,0xcc,0x19,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,}; +static unsigned char sdl_std_cursor_top_side[]= {0xff,0x1f,0xff,0x1f,0x00,0x00,0x40,0x00,0xe0,0x00,0x50,0x01,0x48,0x02,0x44,0x04,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_top_side 15 +#define sdl_std_cursor_HEIGHT_top_side 16 +#define sdl_std_cursor_HOT_X_top_side -6 +#define sdl_std_cursor_HOT_Y_top_side -14 + +static unsigned char sdl_std_cursor_mask_top_right_corner[]= {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf0,0xfc,0xf7,0xfc,0xf7,0xfc,0xf7,0xc0,0xf7,0xe0,0xf7,0x70,0xf7,0x38,0xf7,0x1c,0xf7,0x0c,0xf7,0x00,0xf0,0x00,0xf0,}; +static unsigned char sdl_std_cursor_top_right_corner[]= {0xff,0x3f,0xff,0x3f,0x00,0x30,0x00,0x30,0x00,0x30,0xfc,0x31,0x80,0x31,0x40,0x31,0x20,0x31,0x10,0x31,0x08,0x31,0x04,0x31,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_top_right_corner 16 +#define sdl_std_cursor_HEIGHT_top_right_corner 16 +#define sdl_std_cursor_HOT_X_top_right_corner -13 +#define sdl_std_cursor_HOT_Y_top_right_corner -14 + +static unsigned char sdl_std_cursor_mask_top_left_corner[]= {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0f,0x00,0xef,0x3f,0xef,0x3f,0xef,0x3f,0xef,0x03,0xef,0x07,0xef,0x0e,0xef,0x1c,0xef,0x38,0xef,0x30,0x0f,0x00,0x0f,0x00,}; +static unsigned char sdl_std_cursor_top_left_corner[]= {0xff,0x3f,0xff,0x3f,0x03,0x00,0x03,0x00,0x03,0x00,0xe3,0x0f,0x63,0x00,0xa3,0x00,0x23,0x01,0x23,0x02,0x23,0x04,0x23,0x08,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_top_left_corner 16 +#define sdl_std_cursor_HEIGHT_top_left_corner 16 +#define sdl_std_cursor_HOT_X_top_left_corner 0 +#define sdl_std_cursor_HOT_Y_top_left_corner -14 + +static unsigned char sdl_std_cursor_mask_spraycan[]= {0x00,0x0c,0x18,0x0d,0x7c,0x0d,0x7c,0x0d,0x7e,0x0d,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,0xff,0x00,}; +static unsigned char sdl_std_cursor_spraycan[]= {0x00,0x06,0x80,0x00,0x2c,0x06,0x9e,0x00,0x16,0x06,0x3f,0x00,0x21,0x00,0x27,0x00,0x25,0x00,0x27,0x00,0x25,0x00,0x27,0x00,0x27,0x00,0x21,0x00,0x21,0x00,0x3f,0x00,}; +#define sdl_std_cursor_WIDTH_spraycan 12 +#define sdl_std_cursor_HEIGHT_spraycan 16 +#define sdl_std_cursor_HOT_X_spraycan -9 +#define sdl_std_cursor_HOT_Y_spraycan -14 + +static unsigned char sdl_std_cursor_mask_sb_v_double_arrow[]= {0x38,0x00,0x7c,0x00,0xfe,0x00,0xff,0x01,0xff,0x01,0x7c,0x00,0x7c,0x00,0x7c,0x00,0x7c,0x00,0x7c,0x00,0xff,0x01,0xff,0x01,0xfe,0x00,0x7c,0x00,0x38,0x00,}; +static unsigned char sdl_std_cursor_sb_v_double_arrow[]= {0x10,0x00,0x38,0x00,0x7c,0x00,0xfe,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0x28,0x00,0xfe,0x00,0x7c,0x00,0x38,0x00,0x10,0x00,}; +#define sdl_std_cursor_WIDTH_sb_v_double_arrow 9 +#define sdl_std_cursor_HEIGHT_sb_v_double_arrow 15 +#define sdl_std_cursor_HOT_X_sb_v_double_arrow -3 +#define sdl_std_cursor_HOT_Y_sb_v_double_arrow -8 + +static unsigned char sdl_std_cursor_mask_sb_h_double_arrow[]= {0x18,0x0c,0x1c,0x1c,0xfe,0x3f,0xff,0x7f,0xff,0x7f,0xff,0x7f,0xfe,0x3f,0x1c,0x1c,0x18,0x0c,}; +static unsigned char sdl_std_cursor_sb_h_double_arrow[]= {0x00,0x00,0x08,0x08,0x0c,0x18,0xfe,0x3f,0x0f,0x78,0xfe,0x3f,0x0c,0x18,0x08,0x08,0x00,0x00}; +#define sdl_std_cursor_WIDTH_sb_h_double_arrow 15 +#define sdl_std_cursor_HEIGHT_sb_h_double_arrow 9 +#define sdl_std_cursor_HOT_X_sb_h_double_arrow -7 +#define sdl_std_cursor_HOT_Y_sb_h_double_arrow -4 + +static unsigned char sdl_std_cursor_mask_right_side[]= {0x00,0xf0,0x00,0xf0,0xc0,0xf0,0xc0,0xf1,0x80,0xf3,0x00,0xf7,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xf7,0x80,0xf3,0xc0,0xf1,0xc0,0xf0,0x00,0xf0,0x00,0xf0,}; +static unsigned char sdl_std_cursor_right_side[]= {0x00,0x30,0x00,0x30,0x40,0x30,0x80,0x30,0x00,0x31,0x00,0x32,0xff,0x37,0x00,0x32,0x00,0x31,0x80,0x30,0x40,0x30,0x00,0x30,0x00,0x30,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_right_side 16 +#define sdl_std_cursor_HEIGHT_right_side 15 +#define sdl_std_cursor_HOT_X_right_side -13 +#define sdl_std_cursor_HOT_Y_right_side -7 + +static unsigned char sdl_std_cursor_mask_right_ptr[]= {0x00,0x03,0x80,0x03,0xc0,0x03,0xe0,0x03,0xf0,0x03,0xf8,0x03,0xfc,0x03,0xfe,0x03,0xff,0x03,0xff,0x03,0xf8,0x03,0xbc,0x03,0x3c,0x03,0x1e,0x00,0x1e,0x00,0x0c,0x00,}; +static unsigned char sdl_std_cursor_right_ptr[]= {0x00,0x80,0x00,0xc0,0x00,0xe0,0x00,0xf0,0x00,0xf8,0x00,0xfc,0x00,0xfe,0x00,0xff,0x00,0xf8,0x00,0xd8,0x00,0x8c,0x00,0x0c,0x00,0x06,0x00,0x06,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_right_ptr 10 +#define sdl_std_cursor_HEIGHT_right_ptr 16 +#define sdl_std_cursor_HOT_X_right_ptr -7 +#define sdl_std_cursor_HOT_Y_right_ptr -14 + +static unsigned char sdl_std_cursor_mask_question_arrow[]= {0xf8,0x00,0xfc,0x01,0xfe,0x03,0xff,0x07,0x8f,0x07,0x9f,0x07,0xde,0x07,0xfc,0x03,0xf8,0x01,0xf8,0x00,0xf8,0x00,0xfc,0x01,0xfe,0x03,0xfc,0x01,0xf8,0x00,0x70,0x00,}; +static unsigned char sdl_std_cursor_question_arrow[]= {0x7c,0x00,0xfe,0x00,0xc7,0x01,0x83,0x01,0x87,0x01,0xc6,0x01,0xe0,0x00,0x78,0x00,0x38,0x00,0x28,0x00,0x28,0x00,0xee,0x00,0x6c,0x00,0x38,0x00,0x10,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_question_arrow 11 +#define sdl_std_cursor_HEIGHT_question_arrow 16 +#define sdl_std_cursor_HOT_X_question_arrow -4 +#define sdl_std_cursor_HOT_Y_question_arrow -8 + +static unsigned char sdl_std_cursor_mask_pirate[]= {0xf0,0x03,0xf8,0x07,0xfc,0x0f,0xfe,0x1f,0xfe,0x1f,0xfc,0x0f,0xf8,0x07,0xf1,0x83,0xf1,0xe3,0xf3,0xf3,0xef,0x39,0x1e,0x1e,0xe0,0x01,0xfe,0xc7,0xff,0xff,0x0f,0x7c,}; +static unsigned char sdl_std_cursor_pirate[]= {0xe0,0x01,0xf0,0x03,0xf8,0x07,0xcc,0x0c,0xcc,0x0c,0xf8,0x07,0xf0,0x03,0xe0,0x01,0xe1,0x21,0xe1,0x61,0xc2,0x10,0x1c,0x0e,0xe0,0x01,0xf8,0x47,0x0f,0x7c,0x01,0x20,}; +#define sdl_std_cursor_WIDTH_pirate 16 +#define sdl_std_cursor_HEIGHT_pirate 16 +#define sdl_std_cursor_HOT_X_pirate -7 +#define sdl_std_cursor_HOT_Y_pirate -4 + +static unsigned char sdl_std_cursor_mask_left_side[]= {0x0f,0x00,0x0f,0x00,0x0f,0x03,0x8f,0x03,0xcf,0x01,0xef,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x00,0xcf,0x01,0x8f,0x03,0x0f,0x03,0x0f,0x00,0x0f,0x00,}; +static unsigned char sdl_std_cursor_left_side[]= {0x03,0x00,0x03,0x00,0x83,0x00,0x43,0x00,0x23,0x00,0x13,0x00,0xfb,0x3f,0x13,0x00,0x23,0x00,0x43,0x00,0x83,0x00,0x03,0x00,0x03,0x00,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_left_side 16 +#define sdl_std_cursor_HEIGHT_left_side 15 +#define sdl_std_cursor_HOT_X_left_side 0 +#define sdl_std_cursor_HOT_Y_left_side -7 + +static unsigned char sdl_std_cursor_mask_left_ptr[]= {0x03,0x00,0x07,0x00,0x0f,0x00,0x1f,0x00,0x3f,0x00,0x7f,0x00,0xff,0x00,0xff,0x01,0xff,0x03,0xff,0x03,0x7f,0x00,0xf7,0x00,0xf3,0x00,0xe0,0x01,0xe0,0x01,0xc0,0x00,}; +static unsigned char sdl_std_cursor_left_ptr[]= {0x00,0x00,0x02,0x00,0x06,0x00,0x0e,0x00,0x1e,0x00,0x3e,0x00,0x7e,0x00,0xfe,0x00,0xfe,0x00,0x3e,0x00,0x36,0x00,0x62,0x00,0x60,0x00,0xc0,0x00,0xc0,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_left_ptr 10 +#define sdl_std_cursor_HEIGHT_left_ptr 16 +#define sdl_std_cursor_HOT_X_left_ptr -8 +#define sdl_std_cursor_HOT_Y_left_ptr -14 + +static unsigned char sdl_std_cursor_mask_exchange[]= {0xe3,0x07,0xf7,0x0f,0xff,0x1f,0xff,0x3f,0x3f,0x38,0xff,0x30,0xff,0x00,0xff,0x00,0x00,0xff,0x00,0xff,0x0c,0xfe,0x1c,0xfc,0xfc,0xff,0xf8,0xff,0xf0,0xef,0xe0,0xc7,}; +static unsigned char sdl_std_cursor_exchange[]= {0xf1,0x03,0xfb,0x07,0x1f,0x0c,0x09,0x08,0x19,0x00,0x3f,0x00,0x00,0x00,0x00,0x00,0x00,0x3f,0x00,0x26,0x04,0x24,0x0c,0x3e,0xf8,0x37,0xf0,0x23,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_exchange 16 +#define sdl_std_cursor_HEIGHT_exchange 16 +#define sdl_std_cursor_HOT_X_exchange -6 +#define sdl_std_cursor_HOT_Y_exchange -8 + +static unsigned char sdl_std_cursor_mask_crosshair[]= {0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xff,0xff,0xff,0xff,0xff,0xff,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,}; +static unsigned char sdl_std_cursor_crosshair[]= {0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x7f,0xff,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x80,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_crosshair 16 +#define sdl_std_cursor_HEIGHT_crosshair 16 +#define sdl_std_cursor_HOT_X_crosshair -7 +#define sdl_std_cursor_HOT_Y_crosshair -8 + +static unsigned char sdl_std_cursor_mask_bottom_side[]= {0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xc0,0x01,0xcc,0x19,0xdc,0x1d,0xf8,0x0f,0xf0,0x07,0xe0,0x03,0xc0,0x01,0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f,}; +static unsigned char sdl_std_cursor_bottom_side[]= {0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x40,0x00,0x44,0x04,0x48,0x02,0x50,0x01,0xe0,0x00,0x40,0x00,0x00,0x00,0xff,0x1f,0xff,0x1f,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_bottom_side 15 +#define sdl_std_cursor_HEIGHT_bottom_side 16 +#define sdl_std_cursor_HOT_X_bottom_side -6 +#define sdl_std_cursor_HOT_Y_bottom_side -1 + +static unsigned char sdl_std_cursor_mask_bottom_right_corner[]= {0x00,0xf0,0x00,0xf0,0x0c,0xf7,0x1c,0xf7,0x38,0xf7,0x70,0xf7,0xe0,0xf7,0xc0,0xf7,0xfc,0xf7,0xfc,0xf7,0xfc,0xf7,0x00,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,}; +static unsigned char sdl_std_cursor_bottom_right_corner[]= {0x00,0x30,0x00,0x30,0x04,0x31,0x08,0x31,0x10,0x31,0x20,0x31,0x40,0x31,0x80,0x31,0xfc,0x31,0x00,0x30,0x00,0x30,0x00,0x30,0xff,0x3f,0xff,0x3f,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_bottom_right_corner 16 +#define sdl_std_cursor_HEIGHT_bottom_right_corner 16 +#define sdl_std_cursor_HOT_X_bottom_right_corner -13 +#define sdl_std_cursor_HOT_Y_bottom_right_corner -1 + +static unsigned char sdl_std_cursor_mask_bottom_left_corner[]= {0x0f,0x00,0x0f,0x00,0xef,0x30,0xef,0x38,0xef,0x1c,0xef,0x0e,0xef,0x07,0xef,0x03,0xef,0x3f,0xef,0x3f,0xef,0x3f,0x0f,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,}; +static unsigned char sdl_std_cursor_bottom_left_corner[]= {0x03,0x00,0x03,0x00,0x23,0x08,0x23,0x04,0x23,0x02,0x23,0x01,0xa3,0x00,0x63,0x00,0xe3,0x0f,0x03,0x00,0x03,0x00,0x03,0x00,0xff,0x3f,0xff,0x3f,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_bottom_left_corner 16 +#define sdl_std_cursor_HEIGHT_bottom_left_corner 16 +#define sdl_std_cursor_HOT_X_bottom_left_corner 0 +#define sdl_std_cursor_HOT_Y_bottom_left_corner -1 + +static unsigned char sdl_std_cursor_mask_arrow[]= {0x00,0xe0,0x00,0xf8,0x00,0xfe,0x80,0x7f,0xe0,0x7f,0xf8,0x3f,0xfc,0x3f,0xfc,0x1f,0xe0,0x1f,0xf0,0x0f,0xf8,0x0f,0x7c,0x07,0x3e,0x07,0x1f,0x02,0x0e,0x00,0x04,0x00,}; +static unsigned char sdl_std_cursor_arrow[]= {0x00,0x30,0x00,0x3c,0x00,0x1f,0xc0,0x1f,0xf0,0x0f,0xfc,0x0f,0xc0,0x07,0xe0,0x07,0x70,0x03,0x38,0x03,0x1c,0x01,0x0e,0x01,0x07,0x00,0x02,0x00,0x00,0x00,0x00,0x00,}; +#define sdl_std_cursor_WIDTH_arrow 16 +#define sdl_std_cursor_HEIGHT_arrow 16 +#define sdl_std_cursor_HOT_X_arrow -13 +#define sdl_std_cursor_HOT_Y_arrow -14 +/* end cursor data */ + + +static SDL_Cursor *sdl_std_cursor_array[(int)GHOST_kStandardCursorNumCursors]= {0}; + +/* utility function mostly a copy of SDL_CreateCursor but allows us to change + * color and supports blenders flipped bits */ +static SDL_Cursor * +sdl_ghost_CreateCursor(const Uint8 *data, + const Uint8 *mask, + int w, + int h, + int hot_x, + int hot_y) +{ + SDL_Surface *surface; + SDL_Cursor *cursor; + int x, y; + Uint32 *pixel; + Uint8 datab= 0, maskb= 0; + const Uint32 black= 0xFF000000; + const Uint32 white= 0xFFFFFFFF; + const Uint32 transparent= 0x00000000; + + /* Make sure the width is a multiple of 8 */ + w= ((w + 7) & ~7); + + /* Create the surface from a bitmap */ + surface= SDL_CreateRGBSurface(0, w, h, 32, + 0x00FF0000, + 0x0000FF00, + 0x000000FF, + 0xFF000000); + if (!surface) { + return NULL; + } + for (y= 0; y < h; ++y) { + pixel= (Uint32 *) ((Uint8 *) surface->pixels + y * surface->pitch); + for (x= 0; x < w; ++x) { + if ((x % 8) == 0) { + datab= *data++; + maskb= *mask++; + + /* reverse bit order */ + datab= (datab * 0x0202020202ULL & 0x010884422010ULL) % 1023; + maskb= (maskb * 0x0202020202ULL & 0x010884422010ULL) % 1023; + } + if (maskb & 0x80) { + *pixel++= (datab & 0x80) ? white : black; + } + else { + *pixel++= (datab & 0x80) ? white : transparent; + } + datab <<= 1; + maskb <<= 1; + } + } + + cursor= SDL_CreateColorCursor(surface, hot_x, hot_y); + + SDL_FreeSurface(surface); + + return cursor; +} + +/* TODO, this is currently never freed but it wont leak either. */ +static void sdl_cursor_init(void) +{ + +#define DEF_CURSOR(name, ind) \ + assert(\ + (\ + sdl_std_cursor_array[(int)ind]= \ + sdl_ghost_CreateCursor(sdl_std_cursor_##name, \ + sdl_std_cursor_mask_##name, \ + sdl_std_cursor_WIDTH_##name, \ + sdl_std_cursor_HEIGHT_##name, \ + (sdl_std_cursor_WIDTH_##name + (sdl_std_cursor_HOT_X_##name)) - 1, \ + (sdl_std_cursor_HEIGHT_##name + (sdl_std_cursor_HOT_Y_##name)) - 1) \ + ) != NULL) \ + + + DEF_CURSOR(left_ptr, GHOST_kStandardCursorDefault); + DEF_CURSOR(right_ptr, GHOST_kStandardCursorRightArrow); + DEF_CURSOR(left_ptr, GHOST_kStandardCursorLeftArrow); + DEF_CURSOR(umbrella, GHOST_kStandardCursorInfo); // TODO, replace this one. + DEF_CURSOR(pirate, GHOST_kStandardCursorDestroy); + DEF_CURSOR(question_arrow, GHOST_kStandardCursorHelp); + DEF_CURSOR(exchange, GHOST_kStandardCursorCycle); + DEF_CURSOR(spraycan, GHOST_kStandardCursorSpray); + DEF_CURSOR(watch, GHOST_kStandardCursorWait); + DEF_CURSOR(xterm, GHOST_kStandardCursorText); + DEF_CURSOR(crosshair, GHOST_kStandardCursorCrosshair); + DEF_CURSOR(sb_v_double_arrow, GHOST_kStandardCursorUpDown); + DEF_CURSOR(sb_h_double_arrow, GHOST_kStandardCursorLeftRight); + DEF_CURSOR(top_side, GHOST_kStandardCursorTopSide); + DEF_CURSOR(bottom_side, GHOST_kStandardCursorBottomSide); + DEF_CURSOR(left_side, GHOST_kStandardCursorLeftSide); + DEF_CURSOR(right_side, GHOST_kStandardCursorRightSide); + DEF_CURSOR(top_left_corner, GHOST_kStandardCursorTopLeftCorner); + DEF_CURSOR(top_right_corner, GHOST_kStandardCursorTopRightCorner); + DEF_CURSOR(bottom_right_corner, GHOST_kStandardCursorBottomRightCorner); + DEF_CURSOR(bottom_left_corner , GHOST_kStandardCursorBottomLeftCorner); + DEF_CURSOR(arrow , GHOST_kStandardCursorCopy); + //DEF_CURSOR(arrow, GHOST_kStandardCursorCustom); + DEF_CURSOR(arrow, GHOST_kStandardCursorPencil); + +#undef DEF_CURSOR + +} + + + +GHOST_TSuccess +GHOST_WindowSDL::setWindowCursorGrab(GHOST_TGrabCursorMode mode) +{ + return GHOST_kSuccess; +} + + +GHOST_TSuccess +GHOST_WindowSDL::setWindowCursorShape(GHOST_TStandardCursor shape) +{ + if(sdl_std_cursor_array[0] == NULL) { + sdl_cursor_init(); + } + + SDL_SetCursor(sdl_std_cursor_array[(int)shape]); + return GHOST_kSuccess; +} + + +GHOST_TSuccess +GHOST_WindowSDL::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TUns8 mask[16][2], + int hotX, + int hotY) +{ + return setWindowCustomCursorShape((GHOST_TUns8 *)bitmap, + (GHOST_TUns8 *)mask, + 16, 16, + hotX, hotY, + 0, 1); +} + + +GHOST_TSuccess +GHOST_WindowSDL::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, + GHOST_TUns8 *mask, + int sizex, int sizey, + int hotX, int hotY, + int fg_color, int bg_color) +{ + if(m_sdl_custom_cursor) { + SDL_FreeCursor(m_sdl_custom_cursor); + } + + m_sdl_custom_cursor= sdl_ghost_CreateCursor((const Uint8 *)bitmap, + (const Uint8 *)mask, + sizex, sizex, + hotX, hotY); + + SDL_SetCursor(m_sdl_custom_cursor); + return GHOST_kSuccess; +} + + +GHOST_TSuccess +GHOST_WindowSDL::setWindowCursorVisibility(bool visible) +{ + SDL_ShowCursor(visible); + return GHOST_kSuccess; +} diff --git a/intern/ghost/intern/GHOST_WindowSDL.h b/intern/ghost/intern/GHOST_WindowSDL.h new file mode 100644 index 00000000000..6b016b85126 --- /dev/null +++ b/intern/ghost/intern/GHOST_WindowSDL.h @@ -0,0 +1,167 @@ +/* + * $Id$ + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Campbell Barton + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file ghost/intern/GHOST_WindowSDL.h + * \ingroup GHOST + * Declaration of GHOST_WindowSDL class. + */ + +#ifndef _GHOST_WINDOWSDL_H_ +#define _GHOST_WINDOWSDL_H_ + +#include "GHOST_Window.h" +#include "GHOST_SystemSDL.h" +#include <map> + +extern "C" { + #include "SDL.h" +} + +#if !SDL_VERSION_ATLEAST(1, 3, 0) +# error "SDL 1.3 or newer is needed to build with Ghost" +#endif + +class STR_String; + +class GHOST_WindowSDL : public GHOST_Window +{ +private : + GHOST_SystemSDL * m_system; + bool m_invalid_window; + + SDL_Window * m_sdl_win; + SDL_GLContext m_sdl_glcontext; + SDL_Cursor * m_sdl_custom_cursor; + +public: + + const GHOST_TabletData* GetTabletData() { return NULL; } + + GHOST_WindowSDL(GHOST_SystemSDL *system, + const STR_String& title, + GHOST_TInt32 left, GHOST_TInt32 top, + GHOST_TUns32 width, GHOST_TUns32 height, + GHOST_TWindowState state, + const GHOST_TEmbedderWindowID parentWindow, + GHOST_TDrawingContextType type, + const bool stereoVisual, + const GHOST_TUns16 numOfAASamples + ); + + ~GHOST_WindowSDL(); + + /* SDL spesific */ + SDL_Window * + getSDLWindow() + { + return m_sdl_win; + } + + + GHOST_TSuccess invalidate(void); + + /** + * called by the X11 system implementation when expose events + * for the window have been pushed onto the GHOST queue + */ + + void validate() + { + m_invalid_window = false; + } + + bool getValid() const + { + return (m_sdl_win != NULL); + } + + void getWindowBounds(GHOST_Rect& bounds) const; + void getClientBounds(GHOST_Rect& bounds) const; + +protected: + GHOST_TSuccess installDrawingContext(GHOST_TDrawingContextType type); + GHOST_TSuccess removeDrawingContext(); + + GHOST_TSuccess + setWindowCursorGrab(GHOST_TGrabCursorMode mode); + + GHOST_TSuccess + setWindowCursorShape(GHOST_TStandardCursor shape); + + GHOST_TSuccess + setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], + GHOST_TUns8 mask[16][2], + int hotX, int hotY); + + GHOST_TSuccess + setWindowCustomCursorShape(GHOST_TUns8 *bitmap, + GHOST_TUns8 *mask, + int sizex, int sizey, + int hotX, int hotY, + int fg_color, int bg_color); + + GHOST_TSuccess + setWindowCursorVisibility(bool visible); + + void + setTitle(const STR_String& title); + + void + getTitle(STR_String& title) const; + + GHOST_TSuccess + setClientWidth(GHOST_TUns32 width); + + GHOST_TSuccess + setClientHeight(GHOST_TUns32 height); + + GHOST_TSuccess + setClientSize(GHOST_TUns32 width, + GHOST_TUns32 height); + + void + screenToClient(GHOST_TInt32 inX, GHOST_TInt32 inY, + GHOST_TInt32& outX, GHOST_TInt32& outY) const; + + void + clientToScreen(GHOST_TInt32 inX, GHOST_TInt32 inY, + GHOST_TInt32& outX, GHOST_TInt32& outY) const; + + GHOST_TSuccess + swapBuffers(); + + GHOST_TSuccess + activateDrawingContext(); + + GHOST_TSuccess + setState(GHOST_TWindowState state); + + GHOST_TWindowState + getState() const; + + GHOST_TSuccess setOrder(GHOST_TWindowOrder order) { return GHOST_kSuccess; } // TODO + +}; + + +#endif // _GHOST_WINDOWSDL_H_ diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index a89b2608bb4..1ba51376ff9 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -136,7 +136,7 @@ GHOST_WindowWin32::GHOST_WindowWin32( GHOST_TSuccess msEnabled, int msPixelFormat) : - GHOST_Window(title, left, top, width, height, state, GHOST_kDrawingContextTypeNone, + GHOST_Window(width, height, state, GHOST_kDrawingContextTypeNone, stereoVisual,numOfAASamples), m_system(system), m_hDC(0), @@ -307,6 +307,15 @@ GHOST_WindowWin32::GHOST_WindowWin32( } } + if (parentwindowhwnd != 0) { + RAWINPUTDEVICE device = {0}; + device.usUsagePage = 0x01; /* usUsagePage & usUsage for keyboard*/ + device.usUsage = 0x06; /* http://msdn.microsoft.com/en-us/windows/hardware/gg487473.aspx */ + device.dwFlags |= RIDEV_INPUTSINK; // makes WM_INPUT is visible for ghost when has parent window + device.hwndTarget = m_hWnd; + RegisterRawInputDevices(&device, 1, sizeof(device)); + } + m_wintab = ::LoadLibrary("Wintab32.dll"); if (m_wintab) { GHOST_WIN32_WTInfo fpWTInfo = ( GHOST_WIN32_WTInfo ) ::GetProcAddress( m_wintab, "WTInfoA" ); diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index aea5b5156d9..de725151607 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -164,7 +164,7 @@ GHOST_WindowX11( const bool stereoVisual, const GHOST_TUns16 numOfAASamples ) : - GHOST_Window(title,left,top,width,height,state,type,stereoVisual,numOfAASamples), + GHOST_Window(width,height,state,type,stereoVisual,numOfAASamples), m_context(NULL), m_display(display), m_normal_state(GHOST_kWindowStateNormal), @@ -182,9 +182,12 @@ GHOST_WindowX11( Atom atoms[2]; int natom; int glxVersionMajor, glxVersionMinor; // As in GLX major.minor - + +#ifdef WITH_X11_XINPUT /* initialize incase X11 fails to load */ memset(&m_xtablet, 0, sizeof(m_xtablet)); +#endif + m_visual= NULL; if (!glXQueryVersion(m_display, &glxVersionMajor, &glxVersionMinor)) { diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 96d8ad77d10..2cb269ea919 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -38,7 +38,9 @@ #include <X11/Xlib.h> #include <GL/glx.h> // For tablets -#include <X11/extensions/XInput.h> +#ifdef WITH_X11_XINPUT +# include <X11/extensions/XInput.h> +#endif #include <map> @@ -190,7 +192,7 @@ public: Window getXWindow( ); - +#ifdef WITH_X11_XINPUT class XTablet { public: @@ -214,6 +216,10 @@ public: const GHOST_TabletData* GetTabletData() { return &m_xtablet.CommonData; } +#else // WITH_X11_XINPUT + const GHOST_TabletData* GetTabletData() + { return NULL; } +#endif // WITH_X11_XINPUT /* * Need this in case that we want start the window @@ -321,7 +327,9 @@ private : getEmptyCursor( ); +#ifdef WITH_X11_XINPUT void initXInputDevices(); +#endif GLXContext m_context; Window m_window; @@ -350,8 +358,10 @@ private : /** Cache of XC_* ID's to XCursor structures */ std::map<unsigned int, Cursor> m_standard_cursors; +#ifdef WITH_X11_XINPUT /* Tablet devices */ XTablet m_xtablet; +#endif void icccmSetState(int state); int icccmGetState() const; diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt new file mode 100644 index 00000000000..f834b55b387 --- /dev/null +++ b/intern/ghost/test/CMakeLists.txt @@ -0,0 +1,155 @@ + +cmake_policy(SET CMP0003 NEW) +cmake_policy(SET CMP0005 NEW) + +cmake_minimum_required(VERSION 2.8) + +# ----------------------------------------------------------------------------- +# Macros + + +# stub macro, does nothing +macro(blender_add_lib + name + sources + includes + includes_sys + ) + +endmacro() + +# suffix relative paths so we can use external cmake files +macro(suffix_relpaths + new_files files prefix) + + set(${new_files}) + foreach(_file ${files}) + if(IS_ABSOLUTE _file) + list(APPEND ${new_files} ${_file}) + else() + list(APPEND ${new_files} "${prefix}${_file}") + endif() + endforeach() + unset(_file) +endmacro() + + +# ----------------------------------------------------------------------------- +# Libraries + +# ghost +include(${CMAKE_SOURCE_DIR}/../CMakeLists.txt) +suffix_relpaths(INC_NEW "${INC}" "../") +suffix_relpaths(SRC_NEW "${SRC}" "../") +include_directories(${INC_NEW}) +add_library(ghost_lib ${SRC_NEW}) + +# string +include(${CMAKE_SOURCE_DIR}/../../string/CMakeLists.txt) +suffix_relpaths(INC_NEW "${INC}" "../../string/") +suffix_relpaths(SRC_NEW "${SRC}" "../../string/") +include_directories(${INC_NEW}) +add_library(string_lib ${SRC_NEW}) + +# guardedalloc +include(${CMAKE_SOURCE_DIR}/../../guardedalloc/CMakeLists.txt) +suffix_relpaths(INC_NEW "${INC}" "../../guardedalloc/") +suffix_relpaths(SRC_NEW "${SRC}" "../../guardedalloc/") +include_directories(${INC_NEW}) +add_library(guardedalloc_lib ${SRC_NEW}) + +# blenfont +include(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont/CMakeLists.txt) +suffix_relpaths(INC_NEW "${INC}" "../../../source/blender/blenfont/") +suffix_relpaths(SRC_NEW "${SRC}" "../../../source/blender/blenfont/") +include_directories(${INC_NEW}) +add_library(blenfont_lib ${SRC_NEW}) + +# grr, blenfont needs BLI +include_directories( + "../../../source/blender/blenlib" + "../../../source/blender/blenloader" + ) +add_library(bli_lib + "../../../source/blender/blenlib/intern/fileops.c" + "../../../source/blender/blenlib/intern/rct.c" + "../../../source/blender/blenlib/intern/string.c" + "../../../source/blender/blenlib/intern/listbase.c" + "../../../source/blender/blenlib/intern/storage.c" + "../../../source/blender/blenlib/intern/path_util.c" + "../../../source/blender/blenlib/intern/BLI_dynstr.c" + "../../../source/blender/blenlib/intern/BLI_linklist.c" + "../../../source/blender/blenlib/intern/BLI_memarena.c" + ) + + +find_package(OpenGL REQUIRED) + +find_package(Freetype REQUIRED) + +include_directories(${CMAKE_SOURCE_DIR}/../) +include_directories(${OPENGL_INCLUDE_DIR}) +include_directories(${FREETYPE_INCLUDE_DIRS}) +include_directories(${CMAKE_SOURCE_DIR}/../../../source/blender/blenfont) + +if(UNIX AND NOT APPLE) + find_package(X11 REQUIRED) + + set(PLATFORM_LINKLIBS + ${X11_X11_LIB} + ${X11_Xinput_LIB} + ) +endif() + +# ----------------------------------------------------------------------------- +# Executables + + +# Gears (C) +add_executable(gears_c + ${CMAKE_SOURCE_DIR}/gears/GHOST_C-Test.c) + +target_link_libraries(gears_c + ghost_lib + string_lib + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${PLATFORM_LINKLIBS} + ) + + +# Gears (C++) +add_executable(gears_cpp + ${CMAKE_SOURCE_DIR}/gears/GHOST_Test.cpp) + +target_link_libraries(gears_cpp + ghost_lib + string_lib + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${PLATFORM_LINKLIBS} + ) + + +# MultiTest (C) +add_executable(multitest_c + ${CMAKE_SOURCE_DIR}/../../../source/blender/editors/datafiles/bfont.ttf.c + ${CMAKE_SOURCE_DIR}/multitest/Basic.c + ${CMAKE_SOURCE_DIR}/multitest/EventToBuf.c + ${CMAKE_SOURCE_DIR}/multitest/MultiTest.c + ${CMAKE_SOURCE_DIR}/multitest/ScrollBar.c + ${CMAKE_SOURCE_DIR}/multitest/Util.c + ${CMAKE_SOURCE_DIR}/multitest/WindowData.c +) + +target_link_libraries(multitest_c + blenfont_lib + bli_lib + ghost_lib + string_lib + guardedalloc_lib + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${FREETYPE_LIBRARY} + ${PLATFORM_LINKLIBS} + ) diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index b34a37132b6..c582d205258 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -474,6 +474,7 @@ int main(int argc, char** argv) 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, + FALSE, FALSE); if (!sMainWindow) { @@ -490,6 +491,7 @@ int main(int argc, char** argv) 200, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, + FALSE, FALSE); if (!sSecondaryWindow) { diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 6e269e1cede..930faf463b6 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -428,7 +428,7 @@ Application::Application(GHOST_ISystem* system) // Create the main window STR_String title1 ("gears - main window"); m_mainWindow = system->createWindow(title1, 10, 64, 320, 200, GHOST_kWindowStateNormal, - GHOST_kDrawingContextTypeOpenGL, true /* stereo flag */); + GHOST_kDrawingContextTypeOpenGL, false, false); if (!m_mainWindow) { std::cout << "could not create main window\n"; @@ -438,7 +438,7 @@ Application::Application(GHOST_ISystem* system) // Create a secondary window STR_String title2 ("gears - secondary window"); m_secondaryWindow = system->createWindow(title2, 340, 64, 320, 200, GHOST_kWindowStateNormal, - GHOST_kDrawingContextTypeOpenGL, false /* stereo flag */); + GHOST_kDrawingContextTypeOpenGL, false, false); if (!m_secondaryWindow) { cout << "could not create secondary window\n"; exit(-1); diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 848601b2cc7..00939e907d6 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -42,7 +42,18 @@ #include "MEM_guardedalloc.h" #include "GHOST_C-api.h" -#include "BMF_Api.h" + +#ifdef USE_BMF +# include "BMF_Api.h" +#else +# include "BLF_api.h" + extern int datatoc_bfont_ttf_size; + extern char datatoc_bfont_ttf[]; + + // XXX, bad, but BLI uses these + char bprogname[160]= ""; +char U[1024]= {0}; +#endif #include "Util.h" #include "Basic.h" @@ -291,7 +302,7 @@ MainWindow *mainwindow_new(MultiTestApp *app) { win= GHOST_CreateWindow(sys, "MultiTest:Main", 40, 40, 400, 400, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, - FALSE); + FALSE, FALSE); if (win) { MainWindow *mw= MEM_callocN(sizeof(*mw), "mainwindow_new"); @@ -324,8 +335,12 @@ struct _LoggerWindow { MultiTestApp *app; GHOST_WindowHandle win; - + +#ifdef USE_BMF BMF_Font *font; +#else + int font; +#endif int fonttexid; int fontheight; @@ -429,18 +444,26 @@ static void loggerwindow_do_draw(LoggerWindow *lw) { char *line= lw->loglines[(lw->nloglines-1)-(i+startline)]; int x_pos= lw->textarea[0][0] + 4; int y_pos= lw->textarea[0][1] + 4 + i*lw->fontheight; - + +#ifdef USE_BMF if (lw->fonttexid==-1) { glRasterPos2i(x_pos, y_pos); BMF_DrawString(lw->font, line); } else { BMF_DrawStringTexture(lw->font, line, x_pos, y_pos, 0.0); } +#else + BLF_position(lw->font, x_pos, y_pos, 0.0); + BLF_draw(lw->font, line, 256); // XXX +#endif } + +#ifdef USE_BMF if (lw->fonttexid!=-1) { glDisable(GL_TEXTURE_2D); glDisable(GL_BLEND); } +#endif GHOST_SwapWindowBuffers(lw->win); } @@ -531,19 +554,25 @@ LoggerWindow *loggerwindow_new(MultiTestApp *app) { GHOST_GetMainDisplayDimensions(sys, &screensize[0], &screensize[1]); win= GHOST_CreateWindow(sys, "MultiTest:Logger", 40, screensize[1]-432, 800, 300, GHOST_kWindowStateNormal, - GHOST_kDrawingContextTypeOpenGL, FALSE); + GHOST_kDrawingContextTypeOpenGL, FALSE, FALSE); if (win) { LoggerWindow *lw= MEM_callocN(sizeof(*lw), "loggerwindow_new"); int bbox[2][2]; lw->app= app; lw->win= win; - + +#ifdef USE_BMF lw->font= BMF_GetFont(BMF_kScreen12); lw->fonttexid= BMF_GetFontTexture(lw->font); BMF_GetBoundingBox(lw->font, &bbox[0][0], &bbox[0][1], &bbox[1][0], &bbox[1][1]); lw->fontheight= rect_height(bbox); +#else + lw->font= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); + BLF_size(lw->font, 11, 72); + lw->fontheight= BLF_height(lw->font, "A_"); +#endif lw->nloglines= lw->logsize= 0; lw->loglines= MEM_mallocN(sizeof(*lw->loglines)*lw->nloglines, "loglines"); @@ -711,7 +740,7 @@ ExtraWindow *extrawindow_new(MultiTestApp *app) { win= GHOST_CreateWindow(sys, "MultiTest:Extra", 500, 40, 400, 400, GHOST_kWindowStateNormal, GHOST_kDrawingContextTypeOpenGL, - FALSE); + FALSE, FALSE); if (win) { ExtraWindow *ew= MEM_callocN(sizeof(*ew), "mainwindow_new"); @@ -786,7 +815,7 @@ static int multitest_event_handler(GHOST_EventHandle evt, GHOST_TUserDataPtr dat MultiTestApp *multitestapp_new(void) { MultiTestApp *app= MEM_mallocN(sizeof(*app), "multitestapp_new"); GHOST_EventConsumerHandle consumer= GHOST_CreateEventConsumer(multitest_event_handler, app); - + app->sys= GHOST_CreateSystem(); if (!app->sys) fatal("Unable to create ghost system"); @@ -850,6 +879,10 @@ void multitestapp_free(MultiTestApp *app) { /***/ int main(int argc, char **argv) { +#ifndef USE_BMF + BLF_init(11, 72); +#endif + MultiTestApp *app= multitestapp_new(); multitestapp_run(app); diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 4a534d94eb8..b3fe29af570 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -24,7 +24,13 @@ # # ***** END GPL LICENSE BLOCK ***** -set(INC .) +set(INC + . +) + +set(INC_SYS + +) set(SRC ./intern/mallocn.c @@ -41,12 +47,12 @@ if(WIN32 AND NOT UNIX) ) endif() -blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}") +blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}") # Override C++ alloc, optional. if(WITH_CXX_GUARDEDALLOC) set(SRC cpp/mallocn.cpp ) - blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") + blender_add_lib(bf_intern_guardedalloc_cpp "${SRC}" "${INC}" "${INC_SYS}") endif() diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 46be310b7ec..5a7c0978599 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -30,6 +30,10 @@ set(INC ../moto/include ) +set(INC_SYS + +) + set(SRC intern/IK_QJacobian.cpp intern/IK_QJacobianSolver.cpp @@ -70,4 +74,4 @@ set(SRC intern/TNT/version.h ) -blender_add_lib(bf_intern_ik "${SRC}" "${INC}") +blender_add_lib(bf_intern_ik "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/iksolver/intern/IK_QJacobian.cpp b/intern/iksolver/intern/IK_QJacobian.cpp index 6cc73e9c808..5a216309cee 100644 --- a/intern/iksolver/intern/IK_QJacobian.cpp +++ b/intern/iksolver/intern/IK_QJacobian.cpp @@ -59,6 +59,7 @@ void IK_QJacobian::ArmMatrices(int dof, int task_size) m_d_theta.newsize(dof); m_d_theta_tmp.newsize(dof); + m_d_norm_weight.newsize(dof); m_norm.newsize(dof); m_norm = 0.0; @@ -111,11 +112,13 @@ void IK_QJacobian::SetBetas(int id, int, const MT_Vector3& v) m_beta[id+2] = v.z(); } -void IK_QJacobian::SetDerivatives(int id, int dof_id, const MT_Vector3& v) +void IK_QJacobian::SetDerivatives(int id, int dof_id, const MT_Vector3& v, MT_Scalar norm_weight) { m_jacobian[id][dof_id] = v.x()*m_weight_sqrt[dof_id]; m_jacobian[id+1][dof_id] = v.y()*m_weight_sqrt[dof_id]; m_jacobian[id+2][dof_id] = v.z()*m_weight_sqrt[dof_id]; + + m_d_norm_weight[dof_id] = norm_weight; } void IK_QJacobian::Invert() @@ -429,7 +432,7 @@ MT_Scalar IK_QJacobian::AngleUpdateNorm() const MT_Scalar mx = 0.0, dtheta_abs; for (i = 0; i < m_d_theta.size(); i++) { - dtheta_abs = MT_abs(m_d_theta[i]); + dtheta_abs = MT_abs(m_d_theta[i]*m_d_norm_weight[i]); if (dtheta_abs > mx) mx = dtheta_abs; } diff --git a/intern/iksolver/intern/IK_QJacobian.h b/intern/iksolver/intern/IK_QJacobian.h index 438b9a02c67..ecfaee5ff97 100644 --- a/intern/iksolver/intern/IK_QJacobian.h +++ b/intern/iksolver/intern/IK_QJacobian.h @@ -56,7 +56,7 @@ public: // Iteratively called void SetBetas(int id, int size, const MT_Vector3& v); - void SetDerivatives(int id, int dof_id, const MT_Vector3& v); + void SetDerivatives(int id, int dof_id, const MT_Vector3& v, MT_Scalar norm_weight); void Invert(); @@ -89,6 +89,7 @@ private: /// the vector of computed angle changes TVector m_d_theta; + TVector m_d_norm_weight; /// space required for SVD computation diff --git a/intern/iksolver/intern/IK_QSegment.cpp b/intern/iksolver/intern/IK_QSegment.cpp index 4f05e750e78..df4fbc8fadd 100644 --- a/intern/iksolver/intern/IK_QSegment.cpp +++ b/intern/iksolver/intern/IK_QSegment.cpp @@ -370,7 +370,7 @@ MT_Vector3 IK_QSphericalSegment::Axis(int dof) const void IK_QSphericalSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) { - if (lmin >= lmax) + if (lmin > lmax) return; if (axis == 1) { @@ -613,7 +613,7 @@ void IK_QRevoluteSegment::UpdateAngleApply() void IK_QRevoluteSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) { - if (lmin >= lmax || m_axis != axis) + if (lmin > lmax || m_axis != axis) return; // clamp and convert to axis angle parameters @@ -752,7 +752,7 @@ void IK_QSwingSegment::UpdateAngleApply() void IK_QSwingSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) { - if (lmin >= lmax) + if (lmin > lmax) return; // clamp and convert to axis angle parameters @@ -898,16 +898,13 @@ void IK_QElbowSegment::UpdateAngleApply() void IK_QElbowSegment::SetLimit(int axis, MT_Scalar lmin, MT_Scalar lmax) { - if (lmin >= lmax) + if (lmin > lmax) return; // clamp and convert to axis angle parameters lmin = MT_clamp(lmin, -MT_PI, MT_PI); lmax = MT_clamp(lmax, -MT_PI, MT_PI); - lmin = lmin; - lmax = lmax; - if (axis == 1) { m_min_twist = lmin; m_max_twist = lmax; diff --git a/intern/iksolver/intern/IK_QTask.cpp b/intern/iksolver/intern/IK_QTask.cpp index 32ecb833899..32143518533 100644 --- a/intern/iksolver/intern/IK_QTask.cpp +++ b/intern/iksolver/intern/IK_QTask.cpp @@ -95,10 +95,10 @@ void IK_QPositionTask::ComputeJacobian(IK_QJacobian& jacobian) MT_Vector3 axis = seg->Axis(i)*m_weight; if (seg->Translational()) - jacobian.SetDerivatives(m_id, seg->DoFId()+i, axis); + jacobian.SetDerivatives(m_id, seg->DoFId()+i, axis, 1e2); else { MT_Vector3 pa = p.cross(axis); - jacobian.SetDerivatives(m_id, seg->DoFId()+i, pa); + jacobian.SetDerivatives(m_id, seg->DoFId()+i, pa, 1e0); } } } @@ -147,10 +147,10 @@ void IK_QOrientationTask::ComputeJacobian(IK_QJacobian& jacobian) for (i = 0; i < seg->NumberOfDoF(); i++) { if (seg->Translational()) - jacobian.SetDerivatives(m_id, seg->DoFId()+i, MT_Vector3(0, 0, 0)); + jacobian.SetDerivatives(m_id, seg->DoFId()+i, MT_Vector3(0, 0, 0), 1e2); else { MT_Vector3 axis = seg->Axis(i)*m_weight; - jacobian.SetDerivatives(m_id, seg->DoFId()+i, axis); + jacobian.SetDerivatives(m_id, seg->DoFId()+i, axis, 1e0); } } } @@ -202,10 +202,10 @@ void IK_QCenterOfMassTask::JacobianSegment(IK_QJacobian& jacobian, MT_Vector3& c axis *= /*segment->Mass()**/m_total_mass_inv; if (segment->Translational()) - jacobian.SetDerivatives(m_id, segment->DoFId()+i, axis); + jacobian.SetDerivatives(m_id, segment->DoFId()+i, axis, 1e2); else { MT_Vector3 pa = axis.cross(p); - jacobian.SetDerivatives(m_id, segment->DoFId()+i, pa); + jacobian.SetDerivatives(m_id, segment->DoFId()+i, pa, 1e0); } } diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index a0489c48144..26b61f5c6ce 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC ../../extern/Eigen2 ) +set(INC_SYS + +) + set(SRC Armature.cpp Cache.cpp @@ -222,4 +226,4 @@ set(SRC ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h ) -blender_add_lib(bf_intern_itasc "${SRC}" "${INC}") +blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/itasc/ConstraintSet.cpp b/intern/itasc/ConstraintSet.cpp index 3b50e353758..b07dc5bb983 100644 --- a/intern/itasc/ConstraintSet.cpp +++ b/intern/itasc/ConstraintSet.cpp @@ -134,6 +134,7 @@ bool ConstraintSet::setControlParameter(int id, ConstraintAction action, double break; default: assert(action==ACT_NONE); + break; } return setControlParameters(&values, 1, timestep); } diff --git a/intern/memutil/CMakeLists.txt b/intern/memutil/CMakeLists.txt index aecd3d5b6c9..54e43cb7236 100644 --- a/intern/memutil/CMakeLists.txt +++ b/intern/memutil/CMakeLists.txt @@ -29,6 +29,10 @@ set(INC .. ) +set(INC_SYS + +) + set(SRC intern/MEM_CacheLimiterC-Api.cpp intern/MEM_RefCountedC-Api.cpp @@ -43,4 +47,4 @@ set(SRC MEM_SmartPtr.h ) -blender_add_lib(bf_intern_memutil "${SRC}" "${INC}") +blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/mikktspace/CMakeLists.txt b/intern/mikktspace/CMakeLists.txt index f84a499206c..b6552b18e37 100644 --- a/intern/mikktspace/CMakeLists.txt +++ b/intern/mikktspace/CMakeLists.txt @@ -28,11 +28,15 @@ set(INC . ) +set(INC_SYS + +) + set(SRC mikktspace.c mikktspace.h ) -blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}") +blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c index c05ada84773..1bb73553012 100644 --- a/intern/mikktspace/mikktspace.c +++ b/intern/mikktspace/mikktspace.c @@ -243,7 +243,7 @@ tbool genTangSpace(const SMikkTSpaceContext * pContext, const float fAngularThre int iNrActiveGroups = 0, index = 0; const int iNrFaces = pContext->m_pInterface->m_getNumFaces(pContext); tbool bRes = TFALSE; - const float fThresCos = (const float) cos((fAngularThreshold*(float)M_PI)/180.0f); + const float fThresCos = (float) cos((fAngularThreshold*(float)M_PI)/180.0f); // verify all call-backs have been set if( pContext->m_pInterface->m_getNumFaces==NULL || @@ -1411,7 +1411,7 @@ STSpace EvalTspace(int face_indices[], const int iFaces, const int piTriListIn[] // weight contribution by the angle // between the two edge vectors fCos = vdot(v1,v2); fCos=fCos>1?1:(fCos<(-1) ? (-1) : fCos); - fAngle = (const float) acos(fCos); + fAngle = (float) acos(fCos); fMagS = pTriInfos[f].fMagS; fMagT = pTriInfos[f].fMagT; diff --git a/intern/moto/CMakeLists.txt b/intern/moto/CMakeLists.txt index b9fd8986268..1e73f960907 100644 --- a/intern/moto/CMakeLists.txt +++ b/intern/moto/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC include ) +set(INC_SYS + +) + set(SRC intern/MT_Assert.cpp intern/MT_CmMatrix4x4.cpp @@ -67,4 +71,4 @@ set(SRC include/NM_Scalar.h ) -blender_add_lib(bf_intern_moto "${SRC}" "${INC}") +blender_add_lib(bf_intern_moto "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/opennl/CMakeLists.txt b/intern/opennl/CMakeLists.txt index 699d2dec795..55b0bc5855f 100644 --- a/intern/opennl/CMakeLists.txt +++ b/intern/opennl/CMakeLists.txt @@ -36,6 +36,10 @@ set(INC superlu ) +set(INC_SYS + +) + set(SRC intern/opennl.c superlu/colamd.c @@ -79,4 +83,4 @@ set(SRC superlu/util.h ) -blender_add_lib(bf_intern_opennl "${SRC}" "${INC}") +blender_add_lib(bf_intern_opennl "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 486ef92f638..094d398a83c 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -28,6 +28,9 @@ set(INC intern ../memutil ../../extern/bullet2/src +) + +set(INC_SYS ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} ) @@ -81,13 +84,15 @@ set(SRC ) if(WITH_OPENMP) - add_definitions(-DPARALLEL=1) + add_definitions(-DPARALLEL=1) endif() if(WITH_FFTW3) add_definitions(-DFFTW3=1) - list(APPEND INC ${FFTW3_INC}) + list(APPEND INC + ${FFTW3_INCLUDE_DIRS} + ) endif() -blender_add_lib(bf_intern_smoke "${SRC}" "${INC}") +blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}") diff --git a/intern/smoke/intern/Makefile.FFT b/intern/smoke/intern/Makefile.FFT index e45af1df29b..7e9d089cec2 100644 --- a/intern/smoke/intern/Makefile.FFT +++ b/intern/smoke/intern/Makefile.FFT @@ -1,22 +1,22 @@ -# common stuff
-LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng
-CFLAGS_COMMON = -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32
-
-CC = g++
-CFLAGS = ${CFLAGS_COMMON} -O3 -Wno-unused
-LDFLAGS = ${LDFLAGS_COMMON}
-EXECUTABLE = noiseFFT
-
-SOURCES = noiseFFT.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-
-all: $(SOURCES) $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
- $(CC) $(OBJECTS) $(LDFLAGS) -o $@
-
-.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
-
-clean:
- rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
+# common stuff +LDFLAGS_COMMON = -lfftw3 #-lglut -lglu32 -lopengl32 -lz -lpng +CFLAGS_COMMON = -c -Wall -I./ #-I/cygdrive/c/lib/glvu/include -D_WIN32 + +CC = g++ +CFLAGS = ${CFLAGS_COMMON} -O3 -Wno-unused +LDFLAGS = ${LDFLAGS_COMMON} +EXECUTABLE = noiseFFT + +SOURCES = noiseFFT.cpp +OBJECTS = $(SOURCES:.cpp=.o) + +all: $(SOURCES) $(EXECUTABLE) + +$(EXECUTABLE): $(OBJECTS) + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + +.cpp.o: + $(CC) $(CFLAGS) $< -o $@ + +clean: + rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE) diff --git a/intern/smoke/intern/Makefile.cygwin b/intern/smoke/intern/Makefile.cygwin index c93753a67fe..2a747219554 100644 --- a/intern/smoke/intern/Makefile.cygwin +++ b/intern/smoke/intern/Makefile.cygwin @@ -1,23 +1,23 @@ -CC = g++
-LDFLAGS = -lz -lpng
-CFLAGS = -O3 -Wno-unused -c -Wall -I./ -D_WIN32
-EXECUTABLE = FLUID_3D
-
-SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-
-all: $(SOURCES) $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
- $(CC) $(OBJECTS) $(LDFLAGS) -o $@
-
-.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
-
-SPHERE.o: SPHERE.h
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
-
-clean:
- rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
+CC = g++ +LDFLAGS = -lz -lpng +CFLAGS = -O3 -Wno-unused -c -Wall -I./ -D_WIN32 +EXECUTABLE = FLUID_3D + +SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp +OBJECTS = $(SOURCES:.cpp=.o) + +all: $(SOURCES) $(EXECUTABLE) + +$(EXECUTABLE): $(OBJECTS) + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + +.cpp.o: + $(CC) $(CFLAGS) $< -o $@ + +SPHERE.o: SPHERE.h +FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp +FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp +main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp + +clean: + rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE) diff --git a/intern/smoke/intern/Makefile.linux b/intern/smoke/intern/Makefile.linux index 8e71af465dd..5fbb6e6c3e3 100644 --- a/intern/smoke/intern/Makefile.linux +++ b/intern/smoke/intern/Makefile.linux @@ -1,23 +1,23 @@ -CC = g++
-LDFLAGS = -lz -lpng -fopenmp -lgomp
-CFLAGS = -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused
-EXECUTABLE = FLUID_3D
-
-SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-
-all: $(SOURCES) $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
- $(CC) $(OBJECTS) $(LDFLAGS) -o $@
-
-.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
-
-SPHERE.o: SPHERE.h
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
-
-clean:
- rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
+CC = g++ +LDFLAGS = -lz -lpng -fopenmp -lgomp +CFLAGS = -c -Wall -I./ -fopenmp -DPARALLEL=1 -O3 -Wno-unused +EXECUTABLE = FLUID_3D + +SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp +OBJECTS = $(SOURCES:.cpp=.o) + +all: $(SOURCES) $(EXECUTABLE) + +$(EXECUTABLE): $(OBJECTS) + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + +.cpp.o: + $(CC) $(CFLAGS) $< -o $@ + +SPHERE.o: SPHERE.h +FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp +FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp +main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp + +clean: + rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE) diff --git a/intern/smoke/intern/Makefile.mac b/intern/smoke/intern/Makefile.mac index 227aaa10a16..d0b7bd38c85 100644 --- a/intern/smoke/intern/Makefile.mac +++ b/intern/smoke/intern/Makefile.mac @@ -1,35 +1,35 @@ -CC = g++
-
-# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP
-#OPENMP_FLAGS = -fopenmp -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include
-#OPENMPLD_FLAGS = -fopenmp -lgomp -I/opt/gcc-4.3/usr/local/lib
-OPENMP_FLAGS =
-OPENMPLD_FLAGS =
-
-# assumes MacPorts libpng installation
-PNG_INCLUDE = -I/opt/local/include
-PNG_LIBS = -I/opt/local/lib
-
-LDFLAGS = $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS)
-CFLAGS = -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused
-EXECUTABLE = FLUID_3D
-
-SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-
-all: $(SOURCES) $(EXECUTABLE)
-
-$(EXECUTABLE): $(OBJECTS)
- $(CC) $(OBJECTS) $(LDFLAGS) -o $@
-
-.cpp.o:
- $(CC) $(CFLAGS) $< -o $@
-
-SPHERE.o: SPHERE.h
-FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp
-FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp
-main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp
-
-clean:
- rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE)
-
+CC = g++ + +# uncomment the other two OPENMP_... lines, if your gcc supports OpenMP +#OPENMP_FLAGS = -fopenmp -DPARALLEL=1 -I/opt/gcc-4.3/usr/local/include +#OPENMPLD_FLAGS = -fopenmp -lgomp -I/opt/gcc-4.3/usr/local/lib +OPENMP_FLAGS = +OPENMPLD_FLAGS = + +# assumes MacPorts libpng installation +PNG_INCLUDE = -I/opt/local/include +PNG_LIBS = -I/opt/local/lib + +LDFLAGS = $(PNG_LIBS)-lz -lpng $(OPENMPLD_FLAGS) +CFLAGS = -c -Wall -I./ $(PNG_INCLUDE) $(OPENMP_FLAGS) -O3 -Wno-unused +EXECUTABLE = FLUID_3D + +SOURCES = main.cpp FLUID_3D.cpp FLUID_3D_SOLVERS.cpp FLUID_3D_STATIC.cpp SPHERE.cpp WTURBULENCE.cpp +OBJECTS = $(SOURCES:.cpp=.o) + +all: $(SOURCES) $(EXECUTABLE) + +$(EXECUTABLE): $(OBJECTS) + $(CC) $(OBJECTS) $(LDFLAGS) -o $@ + +.cpp.o: + $(CC) $(CFLAGS) $< -o $@ + +SPHERE.o: SPHERE.h +FLUID_3D.o: FLUID_3D.h FLUID_3D.cpp +FLUID_3D_SOLVERS.o: FLUID_3D.h FLUID_3D_SOLVERS.cpp +main.o: FLUID_3D.h FLUID_3D.cpp FLUID_3D_SOLVERS.cpp + +clean: + rm -f *.o $(EXECUTABLE_LOADER) $(EXECUTABLE) + diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h index b556b4a2e66..66dfb95d143 100644 --- a/intern/smoke/intern/WAVELET_NOISE.h +++ b/intern/smoke/intern/WAVELET_NOISE.h @@ -45,6 +45,11 @@ #include <MERSENNETWISTER.h> +#ifdef WIN32 +#include <float.h> +#define isnan _isnan +#endif + // Tile file header, update revision upon any change done to the noise generator static const char tilefile_headerstring[] = "Noise Tile File rev. "; static const char tilefile_revision[] = "001"; @@ -69,7 +74,7 @@ static void downsampleX(float *from, float *to, int n){ const float *a = &downCoeffs[16]; for (int i = 0; i < n / 2; i++) { to[i] = 0; - for (int k = 2 * i - 16; k <= 2 * i + 16; k++) + for (int k = 2 * i - 16; k < 2 * i + 16; k++) to[i] += a[k - 2 * i] * from[modFast128(k)]; } } @@ -79,7 +84,7 @@ static void downsampleY(float *from, float *to, int n){ const float *a = &downCoeffs[16]; for (int i = 0; i < n / 2; i++) { to[i * n] = 0; - for (int k = 2 * i - 16; k <= 2 * i + 16; k++) + for (int k = 2 * i - 16; k < 2 * i + 16; k++) to[i * n] += a[k - 2 * i] * from[modFast128(k) * n]; } } @@ -89,7 +94,7 @@ static void downsampleZ(float *from, float *to, int n){ const float *a = &downCoeffs[16]; for (int i = 0; i < n / 2; i++) { to[i * n * n] = 0; - for (int k = 2 * i - 16; k <= 2 * i + 16; k++) + for (int k = 2 * i - 16; k < 2 * i + 16; k++) to[i * n * n] += a[k - 2 * i] * from[modFast128(k) * n * n]; } } @@ -262,6 +267,14 @@ static bool loadTile(float* const noiseTileData, std::string filename) printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), (int)bread); return false; } + + // check for invalid nan tile data that could be generated. bug is now + // fixed, but invalid files may still hang around + if (isnan(noiseTileData[0])) { + printf("loadTile: Noise tile '%s' contains nan values.\n", filename.c_str()); + return false; + } + return true; } diff --git a/intern/string/CMakeLists.txt b/intern/string/CMakeLists.txt index 60796185e70..28bd198d29f 100644 --- a/intern/string/CMakeLists.txt +++ b/intern/string/CMakeLists.txt @@ -28,6 +28,10 @@ set(INC . ) +set(INC_SYS + +) + set(SRC intern/STR_String.cpp @@ -35,4 +39,4 @@ set(SRC STR_String.h ) -blender_add_lib(bf_intern_string "${SRC}" "${INC}") +blender_add_lib(bf_intern_string "${SRC}" "${INC}" "${INC_SYS}") |