Changeset 241

Show
Ignore:
Timestamp:
03/25/08 10:42:08 (8 months ago)
Author:
sroret
Message:

Copied Blastoise branch to trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/BAL/CMakeConf.txt

    r173 r241  
    44# BINARY AND LIB REQUIREMENT FOR BAL 
    55#################################### 
     6 
     7IF (NOT BUILD_SHARED_LIBS) 
     8    SET (LIBRARIES_TO_LINK -Wl,-Bstatic) 
     9ENDIF (NOT BUILD_SHARED_LIBS) 
    610 
    711#################################### 
    …… 
    1721        SET(LIBRARIES_TO_LINK "${LIBRARIES_TO_LINK};${PNG_LIBRARIES}") 
    1822        SET(LIBRARIES_TO_INCLUDE "${LIBRARIES_TO_INCLUDE};${PNG_INCLUDE_DIR}") 
    19         LINK_LIBRARIES(${PNG_LIBRARIES}) 
     23        IF (NOT BUILD_SHARED_LIBS) 
     24            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${PNG_LIBRARIES}) 
     25        ELSE (NOT BUILD_SHARED_LIBS) 
     26            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${PNG_LIBRARIES}) 
     27        ENDIF (NOT BUILD_SHARED_LIBS) 
    2028    ELSE(PNG_FOUND) 
    2129        MESSAGE (FATAL_ERROR "Could not find libpng") 
    …… 
    2937        SET(LIBRARIES_TO_LINK "${LIBRARIES_TO_LINK};${JPEG_LIBRARIES}") 
    3038        SET(LIBRARIES_TO_INCLUDE "${LIBRARIES_TO_INCLUDE};${JPEG_INCLUDE_DIR}") 
    31         LINK_LIBRARIES(${JPEG_LIBRARIES}) 
     39        IF (NOT BUILD_SHARED_LIBS) 
     40            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${JPEG_LIBRARIES}) 
     41        ELSE (NOT BUILD_SHARED_LIBS) 
     42            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${JPEG_LIBRARIES}) 
     43        ENDIF (NOT BUILD_SHARED_LIBS) 
    3244    ELSE(JPEG_FOUND) 
    3345        MESSAGE (FATAL_ERROR "Could not find libjpeg") 
    …… 
    3547 
    3648    # FIXME may be ungif instead of gif ! 
    37     SET(LIBRARIES_TO_LINK "${LIBRARIES_TO_LINK};gif") 
     49    IF (NOT BUILD_SHARED_LIBS) 
     50       SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic gif) 
     51    ELSE (NOT BUILD_SHARED_LIBS) 
     52       SET (LIBRARIES_TO_LINK "${LIBRARIES_TO_LINK};gif") 
     53    ENDIF (NOT BUILD_SHARED_LIBS) 
    3854ENDIF(${WEBKIT_USE_IMAGEDECODER} STREQUAL "LIBRARY") 
    3955 
    …… 
    153169        MESSAGE ("sdl found with this parameter for libs : ${SDL_LIBRARY}") 
    154170        MESSAGE ("sdl found with this parameter for cflags : ${SDL_INCLUDE_DIR}") 
    155         SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${SDL_LIBRARY}) 
    156171        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${SDL_INCLUDE_DIR}) 
     172        IF (NOT BUILD_SHARED_LIBS) 
     173            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic libSDLmain.a libSDL.a libpthread.a) 
     174        ELSE (NOT BUILD_SHARED_LIBS) 
     175            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${SDL_LIBRARY}) 
     176        ENDIF (NOT BUILD_SHARED_LIBS) 
    157177    ELSE(SDL_FOUND) 
    158178        MESSAGE (FATAL_ERROR "Could not find libSDL") 
    …… 
    168188        MESSAGE ("sdl_gfx found with this parameter for libs : ${SDLGFX_LIBRARY}") 
    169189        MESSAGE ("sdl_gfx found with this parameter for cflags : ${SDLGFX_INCLUDE_DIR}") 
    170         SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK}  ${SDLGFX_LIBRARY}) 
    171190        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${SDLGFX_INCLUDE_DIR}) 
     191        IF (NOT BUILD_SHARED_LIBS) 
     192            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${SDLGFX_LIBRARY}) 
     193        ELSE (NOT BUILD_SHARED_LIBS) 
     194            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${SDLGFX_LIBRARY}) 
     195        ENDIF (NOT BUILD_SHARED_LIBS) 
    172196    ELSE(SDLGFX_FOUND) 
    173197        MESSAGE (FATAL_ERROR "Could not find SDL GFX") 
    …… 
    186210 
    187211    IF (ERROR_CODE EQUAL 0) 
    188         SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBFONTCONFIG_LIBS}) 
    189212        MESSAGE ("fontconfig found with this parameter for libs : "${LIBFONTCONFIG_LIBS}) 
     213        IF (NOT BUILD_SHARED_LIBS) 
     214            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${LIBFONTCONFIG_LIBS}) 
     215        ELSE (NOT BUILD_SHARED_LIBS) 
     216            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBFONTCONFIG_LIBS}) 
     217        ENDIF (NOT BUILD_SHARED_LIBS) 
    190218    ELSE (ERROR_CODE EQUAL 0) 
    191219        MESSAGE (FATAL_ERROR "fontconfig not found, cannot create owb without it") 
    …… 
    213241    IF (ERROR_CODE EQUAL 0) 
    214242        MESSAGE ("freetype found with this parameter for libs : ${LIBFREETYPE_LIBS}") 
    215         SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBFREETYPE_LIBS}) 
     243        IF (NOT BUILD_SHARED_LIBS) 
     244            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${LIBFREETYPE_LIBS}) 
     245        ELSE (NOT BUILD_SHARED_LIBS) 
     246            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBFREETYPE_LIBS}) 
     247        ENDIF (NOT BUILD_SHARED_LIBS) 
    216248    ELSE (ERROR_CODE EQUAL 0) 
    217249        MESSAGE (FATAL_ERROR "libfreetype not found. Cannot create owb with freetype support without it. On debian you must install libfreetype6-dev package") 
    …… 
    235267IF (ERROR_CODE EQUAL 0) 
    236268    MESSAGE ("curl found with this parameter for libs : ${LIBCURL_LIBS}") 
    237     SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBCURL_LIBS}) 
     269    IF (NOT BUILD_SHARED_LIBS) 
     270        SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${LIBCURL_LIBS}) 
     271    ELSE (NOT BUILD_SHARED_LIBS) 
     272        SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBCURL_LIBS}) 
     273    ENDIF (NOT BUILD_SHARED_LIBS) 
    238274ELSE (ERROR_CODE EQUAL 0) 
    239275    MESSAGE (FATAL_ERROR "libcurl not found, cannot create owb without it, on debian you must install libcurl3-gnutls-dev package") 
    …… 
    244280####################################### 
    245281 
    246 IF (WEBKIT_USE_XML_SUPPORT) 
     282IF (${WEBKIT_USE_XML_SUPPORT} STREQUAL "LIBXML") 
    247283 
    248284    FIND_PROGRAM (XML2_CONFIG_EXECUTABLE xml2-config) 
    …… 
    258294    IF (ERROR_CODE EQUAL 0) 
    259295        MESSAGE ("xml2 found with this parameter for libs : ${LIBXML2_LIBS}") 
    260         SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBXML2_LIBS}) 
     296        IF (NOT BUILD_SHARED_LIBS) 
     297            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${LIBXML2_LIBS}) 
     298        ELSE (NOT BUILD_SHARED_LIBS) 
     299            SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBXML2_LIBS}) 
     300        ENDIF (NOT BUILD_SHARED_LIBS) 
    261301                IF (NOT BUILD_SHARED_LIBS AND NOT WEBKIT_USE_JS) 
    262302                        SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} pthread) 
    …… 
    277317    ENDIF (ERROR_CODE EQUAL 0) 
    278318 
    279 ENDIF (WEBKIT_USE_XML_SUPPORT) 
     319ENDIF (${WEBKIT_USE_XML_SUPPORT} STREQUAL "LIBXML") 
    280320 
    281321####################################### 
    …… 
    283323####################################### 
    284324 
    285 IF (WEBKIT_USE_XSLT_SUPPORT) 
     325IF (${WEBKIT_USE_XSLT_SUPPORT} STREQUAL "LIBXSLT") 
    286326 
    287327FIND_PROGRAM (XSLT_CONFIG_EXECUTABLE xslt-config) 
    …… 
    297337IF (ERROR_CODE EQUAL 0) 
    298338    MESSAGE ("xslt found with this parameter for libs : ${LIBXSLT_LIBS}") 
    299     SET(LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBXSLT_LIBS}) 
     339    IF (NOT BUILD_SHARED_LIBS) 
     340        SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} -Wl,-Bstatic ${LIBXSLT_LIBS}) 
     341    ELSE (NOT BUILD_SHARED_LIBS) 
     342        SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBXSLT_LIBS}) 
     343    ENDIF (NOT BUILD_SHARED_LIBS) 
    300344ELSE (ERROR_CODE EQUAL 0) 
    301345    MESSAGE (FATAL_ERROR "libxslt not found, cannot create owb without it, on debian you must install libxslt1-dev package") 
    302346ENDIF (ERROR_CODE EQUAL 0) 
    303347 
    304 ENDIF (WEBKIT_USE_XSLT_SUPPORT) 
     348ENDIF (${WEBKIT_USE_XSLT_SUPPORT} STREQUAL "LIBXSLT") 
    305349 
    306350####################################### 
    …… 
    314358ENDIF (N800_BUILD) 
    315359 
    316 ###################################### 
    317 #Add -ldl for static link 
    318 #Warning: keep it at the end of file! 
    319 ###################################### 
    320 IF (NOT BUILD_SHARED_LIBS) 
    321     SET(LIBRARIES_TO_LINK "${LIBRARIES_TO_LINK};dl")     
    322 ENDIF (NOT BUILD_SHARED_LIBS) 
    323  
     360 
     361IF (WEBKIT_USE_NPAPI) 
     362 
     363    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --libs xt | sed s/-[[:upper:]][[:graph:]]*[[:blank:]]//g | sed s/-l//" 
     364        OUTPUT_VARIABLE LIBXT_LIBS 
     365        RETURN_VALUE ERROR_CODE) 
     366 
     367    IF (ERROR_CODE EQUAL 0) 
     368        MESSAGE ("xt found with this parameter for libs : "${LIBXT_LIBS}) 
     369    ELSE (ERROR_CODE EQUAL 0) 
     370        MESSAGE (FATAL_ERROR "libxt not found, cannot create owb without it") 
     371    ENDIF (ERROR_CODE EQUAL 0) 
     372    SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBXT_LIBS}) 
     373 
     374    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --libs gtk+-2.0 | sed s/-[[:upper:]][[:graph:]]*[[:blank:]]//g | sed s/-l//" 
     375        OUTPUT_VARIABLE LIBGTK_LIBS 
     376        RETURN_VALUE ERROR_CODE) 
     377 
     378    IF (ERROR_CODE EQUAL 0) 
     379        MESSAGE ("gtk found with this parameter for libs : "${LIBGTK_LIBS}) 
     380    ELSE (ERROR_CODE EQUAL 0) 
     381        MESSAGE (FATAL_ERROR "libgtk not found, cannot create owb without it") 
     382    ENDIF (ERROR_CODE EQUAL 0) 
     383    SET (LIBRARIES_TO_LINK ${LIBRARIES_TO_LINK} ${LIBGTK_LIBS}) 
     384 
     385    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --cflags gtk+-2.0 | sed s/-I// | sed 's/ -I/;/g'" 
     386        OUTPUT_VARIABLE LIBGTK_CFLAGS 
     387        RETURN_VALUE ERROR_CODE) 
     388 
     389    IF (ERROR_CODE EQUAL 0) 
     390        MESSAGE ("gtk found with this parameter for cflags : ${LIBGTK_CFLAGS}") 
     391        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${LIBGTK_CFLAGS}) 
     392    ELSE (ERROR_CODE EQUAL 0) 
     393        MESSAGE (FATAL_ERROR "libgtk not found, cannot create owb without it") 
     394    ENDIF (ERROR_CODE EQUAL 0) 
     395 
     396    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --cflags cairo | sed s/-I// | sed 's/ -I/;/g'" 
     397        OUTPUT_VARIABLE LIBCAIRO_CFLAGS 
     398        RETURN_VALUE ERROR_CODE) 
     399 
     400    IF (ERROR_CODE EQUAL 0) 
     401        MESSAGE ("cairo found with this parameter for cflags : ${LIBCAIRO_CFLAGS}") 
     402        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${LIBCAIRO_CFLAGS}) 
     403    ELSE (ERROR_CODE EQUAL 0) 
     404        MESSAGE (FATAL_ERROR "cairo not found, cannot create owb without it") 
     405    ENDIF (ERROR_CODE EQUAL 0) 
     406 
     407    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --cflags glib-2.0 | sed s/-I// | sed 's/ -I/;/g'" 
     408        OUTPUT_VARIABLE LIBGLIB_CFLAGS 
     409        RETURN_VALUE ERROR_CODE) 
     410 
     411    IF (ERROR_CODE EQUAL 0) 
     412        MESSAGE ("glib found with this parameter for cflags : ${LIBGLIB_CFLAGS}") 
     413        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${LIBGLIB_CFLAGS}) 
     414    ELSE (ERROR_CODE EQUAL 0) 
     415        MESSAGE (FATAL_ERROR "glib not found, cannot create owb without it") 
     416    ENDIF (ERROR_CODE EQUAL 0) 
     417 
     418    EXEC_PROGRAM ("${PKG_CONFIG_EXECUTABLE} --cflags pango | sed s/-I// | sed 's/ -I/;/g'" 
     419        OUTPUT_VARIABLE LIBPANGO_CFLAGS 
     420        RETURN_VALUE ERROR_CODE) 
     421 
     422    IF (ERROR_CODE EQUAL 0) 
     423        MESSAGE ("pango found with this parameter for cflags : ${LIBPANGO_CFLAGS}") 
     424        SET(LIBRARIES_TO_INCLUDE ${LIBRARIES_TO_INCLUDE} ${LIBPANGO_CFLAGS}) 
     425    ELSE (ERROR_CODE EQUAL 0) 
     426        MESSAGE (FATAL_ERROR "pango not found, cannot create owb without it") 
     427    ENDIF (ERROR_CODE EQUAL 0) 
     428ENDIF (WEBKIT_USE_NPAPI) 
     429 

  • trunk/BAL/Configuration/BALConfiguration.h

    r173 r241  
    8080    BIImageDecoder* createBCPNGImageDecoder(); 
    8181    BIImageDecoder* createBCGIFImageDecoder(); 
    82     inline BIImageDecoder* createBCBMPImageDecoder() { return 0; } 
     82    BIImageDecoder* createBCBMPImageDecoder(); 
    8383    void deleteBIImageDecoder( BIImageDecoder* ); 
    8484 
    …… 
    9898    // Window 
    9999    class BIWindowManager; 
    100 //    BIWindow* createBCWindowBal(int x, int y, int width, int height, int depth); 
    101100    BIWindowManager* getBIWindowManager(); 
    102101    void deleteBIWindowManager(); 
    …… 
    109108    // ResourceHandleManager 
    110109    class BIResourceHandleManager; 
    111     class BIResourceHandle; 
    112110    BIResourceHandleManager* getBIResourceHandleManager(); 
    113111    void deleteBIResourceHandleManager(); 
    114     // BIResourceHandle* createBCResourceHandle removed because of a static create 
    115112 
     113    // File 
     114    class BIFile; 
     115    BIFile* createBIFile(char* path); 
     116    void deleteBIFile(BIFile* file); 
    116117 
    117118    // Fonts 
    118 //     class BIFontCache; 
    119 //     class BIFontData; 
    120119    class BIFontPlatformDataPrivate; 
    121120    class BIGlyphBuffer; 
    122 //     BIFontCache* getBIFontCache(); 
    123121    BIGlyphBuffer* createBIGlyphBuffer(); 
    124122    void deleteBIGlyphBuffer(BIGlyphBuffer*); 
    …… 
    133131    BIGraphicsContext* createRGBA32GraphicsContext(unsigned width, unsigned height); 
    134132    void deleteRGBA32GraphicsContext(BIGraphicsContext*); 
    135 //    BINativeImage* createBCNativeImage(const RGBA32Array&, const WebCore::IntSize&); 
    136 //    BINativeImage* createBCNativeImage(const WebCore::IntSize&); 
    137133    BIGraphicsContext* getBIGraphicsContext(); 
    138134    BIGraphicsContext* createBIGraphicsContext(); 

  • trunk/BAL/Implementations/Events/SDL/BCEventLoopSDL.cpp

    r177 r241  
    3939 */ 
    4040 
     41#define DEEPSEE_LOGGER_USE 1 
     42#define DEEPSEE_MEMORY_USE 1 
     43#define DEEPSEE_PROGARGS_USE 1 
     44#define DEEPSEE_CONSOLE_USE 1 
     45#include DEEPSEE_INCLUDE 
     46 
    4147#include "config.h" 
    4248#include "PlatformString.h" 
    …… 
    114120    tcsetattr(0, TCSANOW,&term); 
    115121#endif 
     122 
     123    DS_NEW_CONSOLE(m_console); 
     124    DS_USE_CONSOLE( 
     125        DS_LOGGER_ADD_CMD_TO_CONSOLE(m_console); 
     126        DS_MEMORY_ADD_CMD_TO_CONSOLE(m_console); 
     127    ) 
     128 
    116129} 
    117130 
    …… 
    122135BC::BCEventLoopSDL::~BCEventLoopSDL() 
    123136{ 
    124     WebCore::stopSharedTimer(); 
     137    DS_DELETE_CONSOLE(m_console); 
    125138    m_event.clear(); 
    126139    SDL_QuitSubSystem(SDL_INIT_EVENTTHREAD); 
    …… 
    180193            return (aBALEvent != NULL); 
    181194        } else { 
     195            // give control to console, without blocking 
     196            DS_USE_CONSOLE( 
     197                 if (m_console->loop(false)) 
     198                 quit(); 
     199            ); 
    182200            usleep(10000); 
    183201            return false; 
    …… 
    287305      aSrc[1] = 0; 
    288306 
    289       DBGM(MODULE_EVENTS, "SDL KEY CODE %d\nWHICH %d MOD %d\n" 
    290               "SCANCODE %d UNICODE %d END\nSHIFT %d CTRL %d ALT %d META %d\n", 
     307      DBGM(MODULE_EVENTS, "SDLEvent sym=%d which=%d mod=%d " 
     308              "scancode=%d unicode=%d shift=%d ctrl=%d alt=%d meta=%d\n", 
    291309              aSDLEvent.key.keysym.sym, aSDLEvent.key.which, aSDLEvent.key.keysym.mod, 
    292310              aSDLEvent.key.keysym.scancode, aSDLEvent.key.keysym.unicode, 
    …… 
    296314      WebCore::String aUnmodifiedText(aSrc); 
    297315      WebCore::String aKeyIdentifier = keyIdentifierForSDLKeyCode( aSDLEvent.key.keysym.sym ); 
     316 
     317      DBGM(MODULE_EVENTS, "text='%s' identifier=%s\n", aText.ascii().data(), aKeyIdentifier.ascii().data()); 
     318 
    298319      BCKeyboardEvent* aKeyboardEvent = new BCKeyboardEvent( aText, aUnmodifiedText, aKeyIdentifier, 
    299320        bIsKeyUp, bShiftKey, bCtrlKey, bAltKey, bMetaKey, false/*bAutoRepeat*/, aVKey ); 
    …… 
    453474            return "U+00007F"; 
    454475        default: 
    455             return WebCore::String::format("U+%06X", toupper(keyCode)); 
     476            return WebCore::String::format("U+%06X", getBIInternationalization()->toUpper(keyCode)); 
    456477    } 
    457478} 

  • trunk/BAL/Implementations/Events/SDL/BCEventLoopSDL.h

    r173 r241  
    4141 */ 
    4242 
     43#define DEEPSEE_CONSOLE_USE 1