Changeset 3075f6a40330e47d20bf76588881dad08bc0f4ff

Show
Ignore:
Timestamp:
13/04/03 22:07:34 (6 years ago)
Author:
Cyril Deguet <asmax@videolan.org>
git-committer:
Cyril Deguet <asmax@videolan.org> 1050264454 +0000
git-parent:

[4dec9682f6b5b0b6ed2d5187f4652cb680f39000]

git-author:
Cyril Deguet <asmax@videolan.org> 1050264454 +0000
Message:

* something will be visible soon, be patient...

(this silly GDK doesn't know BMP images :(

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/skins/gtk2/gtk2_bitmap.cpp

    r1bab4d1 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: gtk2_bitmap.cpp,v 1.2 2003/04/13 19:09:59 asmax Exp $ 
     5 * $Id: gtk2_bitmap.cpp,v 1.3 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Cyril Deguet     <asmax@videolan.org> 
    …… 
    2626 
    2727//--- GTK2 ----------------------------------------------------------------- 
    28 //#define WINVER  0x0500 
    29 //#include <windows.h> 
     28#include <gdk/gdk.h> 
    3029 
    3130//--- VLC ------------------------------------------------------------------- 
    …… 
    9998    // Delete objects 
    10099    DeleteObject( HBitmap );*/ 
     100     
    101101} 
    102102//--------------------------------------------------------------------------- 

  • modules/gui/skins/gtk2/gtk2_bitmap.h

    rf3bcd92 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: gtk2_bitmap.h,v 1.1 2003/04/12 21:43:27 asmax Exp $ 
     5 * $Id: gtk2_bitmap.h,v 1.2 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Cyril Deguet     <asmax@videolan.org> 
    …… 
    2828 
    2929//--- GTK2 ----------------------------------------------------------------- 
    30 //#include <windows.h> 
     30#include <gdk/gdk.h> 
    3131 
    3232//--- GENERAL --------------------------------------------------------------- 
    …… 
    4343{ 
    4444    private: 
    45 //        HDC bmpDC; 
     45        GdkBitmap *bmpDC; 
    4646 
    4747    public: 
    …… 
    6262        virtual void SetBmpPixel( int x, int y, int color ); 
    6363 
    64 //        HDC GetBmpDC() { return bmpDC; } 
     64        GdkBitmap *GetBmpDC() { return bmpDC; } 
    6565}; 
    6666//--------------------------------------------------------------------------- 

  • modules/gui/skins/gtk2/gtk2_graphics.cpp

    r1bab4d1 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: gtk2_graphics.cpp,v 1.4 2003/04/13 19:09:59 asmax Exp $ 
     5 * $Id: gtk2_graphics.cpp,v 1.5 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Cyril Deguet     <asmax@videolan.org> 
    …… 
    3434#include "gtk2_graphics.h" 
    3535 
    36  
    3736//--------------------------------------------------------------------------- 
    3837// GTK2 GRAPHICS 
    …… 
    5554    DeleteObject( HImage );*/ 
    5655     
    57 /*    Image = ( GdkDrawable* )( (GTK2Window *)from )->GetHandle(); 
    58     Gc = gdk_gc_new( Image );*/ 
     56    Image = ( GdkDrawable* )( (GTK2Window *)from )->GetHandle(); 
     57    Gc = gdk_gc_new( Image ); 
    5958} 
    6059//--------------------------------------------------------------------------- 
    …… 
    8180void GTK2Graphics::DrawRect( int x, int y, int w, int h, int color ) 
    8281{ 
    83 //    gdk_draw_rectangle( Image, Gc, TRUE, x, y, w, h); 
     82    gdk_draw_rectangle( Image, Gc, TRUE, x, y, w, h); 
    8483} 
    8584//--------------------------------------------------------------------------- 
    …… 
    9897GTK2Region::GTK2Region() 
    9998{ 
    100 /*    Rgn = CreateRectRgn( 0, 0, 0, 0 );*/ 
     99    Rgn = gdk_region_new(); 
    101100} 
    102101//--------------------------------------------------------------------------- 
    103102GTK2Region::GTK2Region( int x, int y, int w, int h ) 
    104103{ 
    105 /*    Rgn = CreateRectRgn( x, y, x + w, y + h );*/ 
     104    GdkRectangle rect; 
     105    rect.x = x; 
     106    rect.y = y; 
     107    rect.width = w; 
     108    rect.height = h; 
     109    Rgn = gdk_region_rectangle( &rect ); 
    106110} 
    107111//--------------------------------------------------------------------------- 
    …… 
    118122void GTK2Region::AddRectangle( int x, int y, int w, int h ) 
    119123{ 
    120 /*    HRGN Buffer; 
    121     Buffer = CreateRectRgn( x, y, x + w, y + h ); 
    122     CombineRgn( Rgn, Buffer, Rgn, 0x2 ); 
    123     DeleteObject( Buffer );*/ 
     124    GdkRectangle rect; 
     125    rect.x = x; 
     126    rect.y = y; 
     127    rect.width = w; 
     128    rect.height = h; 
     129    GdkRegion *Buffer = gdk_region_rectangle( &rect ); 
     130    gdk_region_union( Rgn, Buffer ); 
    124131} 
    125132//--------------------------------------------------------------------------- 
    …… 
    130137    CombineRgn( Rgn, Buffer, Rgn, 0x2 ); 
    131138    DeleteObject( Buffer );*/ 
     139    /*FIXME*/ 
    132140} 
    133141//--------------------------------------------------------------------------- 
    …… 
    139147bool GTK2Region::Hit( int x, int y ) 
    140148{ 
    141 /*    return PtInRegion( Rgn, x, y );*/ 
     149    return gdk_region_point_in( Rgn, x, y ); 
    142150} 
    143151//--------------------------------------------------------------------------- 

  • modules/gui/skins/gtk2/gtk2_theme.cpp

    r1bab4d1 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: gtk2_theme.cpp,v 1.3 2003/04/13 19:09:59 asmax Exp $ 
     5 * $Id: gtk2_theme.cpp,v 1.4 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Cyril Deguet     <asmax@videolan.org> 
    …… 
    264264    attr.title = "VLC Media Player"; 
    265265    attr.event_mask = GDK_ALL_EVENTS_MASK; 
    266     attr.width = 100; 
    267     attr.height = 100; 
     266    attr.x = 100; 
     267    attr.y = 100; 
     268    attr.window_type = GDK_WINDOW_TOPLEVEL; 
     269    attr.width = 400; 
     270    attr.height = 200; 
    268271    attr.window_type = GDK_WINDOW_TOPLEVEL; 
    269272    attr.wclass = GDK_INPUT_OUTPUT; 
    270      
    271     gint mask = GDK_WA_TITLE; 
     273    attr.override_redirect = FALSE; 
     274     
     275    gint mask = GDK_WA_TITLE|GDK_WA_X|GDK_WA_Y|GDK_WA_NOREDIR; 
    272276     
    273277    // Create the parent window 
    274278    ParentWindow = gdk_window_new( NULL, &attr, mask); 
     279    gdk_window_show( ParentWindow ); 
    275280} 
    276281//--------------------------------------------------------------------------- 
    …… 
    317322    attr.width = 100; 
    318323    attr.height = 100; 
    319     //attr.window_type = GDK_WINDOW_CHILD; 
    320     attr.window_type = GDK_WINDOW_TOPLEVEL; 
     324    attr.window_type = GDK_WINDOW_CHILD; 
    321325    attr.wclass = GDK_INPUT_OUTPUT; 
    322326     
    …… 
    324328     
    325329    // Create the parent window 
    326  //   GdkWindow *gwnd = gdk_window_new( ParentWindow, &attr, mask); 
    327     GdkWindow *gwnd = gdk_window_new( NULL, &attr, mask); 
     330    GdkWindow *gwnd = gdk_window_new( ParentWindow, &attr, mask); 
    328331    if( !gwnd ) 
    329332    { 
    …… 
    332335    } 
    333336     
     337    gdk_window_show( gwnd ); 
     338     
    334339    WindowList.push_back( (Window *)new OSWindow( p_intf, gwnd, x, y, visible, 
    335340        fadetime, alpha, movealpha, dragdrop ) ) ; 
    336    
    337     gdk_window_show( ParentWindow ); 
    338341 
    339342} 

  • modules/gui/skins/os_graphics.h

    rf3bcd92 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: os_graphics.h,v 1.2 2003/04/12 21:43:27 asmax Exp $ 
     5 * $Id: os_graphics.h,v 1.3 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    3333#else     
    3434    #include "gtk2_graphics.h" 
    35     #define SRC_COPY   SRCCOPY 
    36     #define SRC_AND    SRCAND 
     35    #define SRC_COPY   1 
     36    #define SRC_AND    2 
    3737    #define OSGraphics GTK2Graphics 
    3838    #define OSRegion   GTK2Region 

  • modules/gui/skins/src/window.cpp

    rdb008d0 r3075f6a  
    33 ***************************************************************************** 
    44 * Copyright (C) 2003 VideoLAN 
    5  * $Id: window.cpp,v 1.6 2003/04/13 17:46:23 asmax Exp $ 
     5 * $Id: window.cpp,v 1.7 2003/04/13 20:07:34 asmax Exp $ 
    66 * 
    77 * Authors: Olivier Teuli� <ipkiss@via.ecp.fr> 
    …… 
    279279 
    280280    // Copy buffer in Image 
    281 /* FIXME: kludge */ 
    282 #ifdef WIN32 
    283281    Image->CopyFrom( x, y, w, h, Buffer, 0, 0, SRC_COPY ); 
    284 #else 
    285   fprintf(stderr, "%X WARNING: FIXME in window.cpp !!!!", Buffer); 
    286 #endif 
    287282 
    288283    // Free memory