Changeset 78e39f0d6ddac05f824b1beb6bfc712088b17fdc

Show
Ignore:
Timestamp:
22/03/08 23:32:32 (7 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1206225152 -0700
git-parent:

[31dcf0ddf0b7e545c8f2d3d06efcc393cf42a452]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1206225152 -0700
Message:

Uniformisation and configurability of Mouse Hidding Time. Patch by Lukas Durfina

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/beos/VideoOutput.cpp

    r54c23b6 r78e39f0  
    7878}; 
    7979 
    80 #define MOUSE_IDLE_TIMEOUT 2000000    // two seconds 
    8180#define MIN_AUTO_VSYNC_REFRESH 61    // Hz 
    8281 
    …… 
    985984{ 
    986985    p_vout = p_vout_instance; 
     986    fMouseHideTimeout = var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    987987    SetViewColor(B_TRANSPARENT_32_BIT); 
    988988} 
    …… 
    11701170    { 
    11711171        if (fCursorInside 
    1172             && mdate() - fLastMouseMovedTime > MOUSE_IDLE_TIMEOUT) 
     1172            && mdate() - fLastMouseMovedTime > fMouseHideTimeout) 
    11731173        { 
    11741174            be_app->ObscureCursor(); 

  • modules/gui/beos/VideoWindow.h

    r6ee1e19 r78e39f0  
    123123 
    124124            bigtime_t        fLastMouseMovedTime; 
     125            int             fMouseHideTimeout; 
    125126            bool            fCursorHidden; 
    126127            bool            fCursorInside; 

  • modules/video_output/msw/direct3d.c

    ra78e273 r78e39f0  
    184184    p_vout->p_sys->b_cursor_hidden = 0; 
    185185    p_vout->p_sys->i_lastmoved = mdate(); 
     186    p_vout->p_sys->i_mouse_hide_timeout = 
     187        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    186188 
    187189    var_Create( p_vout, "video-title", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); 
    …… 
    476478     */ 
    477479    if( p_vout->b_fullscreen && !p_vout->p_sys->b_cursor_hidden && 
    478         (mdate() - p_vout->p_sys->i_lastmoved) > 5000000 ) 
     480        (mdate() - p_vout->p_sys->i_lastmoved) > 
     481            p_vout->p_sys->i_mouse_hide_timeout ) 
    479482    { 
    480483        POINT point; 

  • modules/video_output/msw/directx.c

    r0f00164 r78e39f0  
    262262    p_vout->p_sys->b_cursor_hidden = 0; 
    263263    p_vout->p_sys->i_lastmoved = mdate(); 
     264    p_vout->p_sys->i_mouse_hide_timeout = 
     265        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    264266 
    265267    /* Set main window's size */ 
    …… 
    639641     */ 
    640642    if( p_vout->b_fullscreen && !p_vout->p_sys->b_cursor_hidden && 
    641         (mdate() - p_vout->p_sys->i_lastmoved) > 5000000 ) 
     643        (mdate() - p_vout->p_sys->i_lastmoved) > 
     644            p_vout->p_sys->i_mouse_hide_timeout ) 
    642645    { 
    643646        POINT point; 

  • modules/video_output/msw/glwin32.c

    ra78e273 r78e39f0  
    119119    p_vout->p_sys->b_cursor_hidden = 0; 
    120120    p_vout->p_sys->i_lastmoved = mdate(); 
     121    p_vout->p_sys->i_mouse_hide_timeout = 
     122        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    121123 
    122124    /* Set main window's size */ 
    …… 
    338340     */ 
    339341    if( p_vout->b_fullscreen && !p_vout->p_sys->b_cursor_hidden && 
    340         (mdate() - p_vout->p_sys->i_lastmoved) > 5000000 ) 
     342        (mdate() - p_vout->p_sys->i_lastmoved) > 
     343            p_vout->p_sys->i_mouse_hide_timeout ) 
    341344    { 
    342345        POINT point; 

  • modules/video_output/msw/vout.h

    re54cc50 r78e39f0  
    7373    volatile vlc_bool_t b_cursor_hidden; 
    7474    volatile mtime_t    i_lastmoved; 
     75    mtime_t             i_mouse_hide_timeout; 
    7576 
    7677    /* Misc */ 

  • modules/video_output/msw/wingdi.c

    rdbddc5a r78e39f0  
    232232    p_vout->p_sys->b_cursor_hidden = 0; 
    233233    p_vout->p_sys->i_lastmoved = mdate(); 
     234    p_vout->p_sys->i_mouse_hide_timeout = 
     235        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    234236 
    235237    /* Set main window's size */ 
    …… 
    566568     */ 
    567569    if( p_vout->b_fullscreen && !p_vout->p_sys->b_cursor_hidden && 
    568         (mdate() - p_vout->p_sys->i_lastmoved) > 5000000 ) 
     570        (mdate() - p_vout->p_sys->i_lastmoved) > 
     571            p_vout->p_sys->i_mouse_hide_timeout ) 
    569572    { 
    570573        POINT point; 

  • modules/video_output/qte/qte.cpp

    ra78e273 r78e39f0  
    391391    /* Pointer change */ 
    392392//    if( ! p_vout->p_sys->b_cursor_autohidden && 
    393 //        ( mdate() - p_vout->p_sys->i_lastmoved > 2000000 ) ) 
     393//        ( mdate() - p_vout->p_sys->i_lastmoved > 
     394//            p_vout->p_sys->i_mouse_hide_timeout ) ) 
    394395//    { 
    395396//        /* Hide the mouse automatically */ 

  • modules/video_output/sdl.c

    rb321beb r78e39f0  
    7878    vlc_bool_t  b_cursor_autohidden; 
    7979    mtime_t     i_lastmoved; 
     80    mtime_t     i_mouse_hide_timeout; 
    8081    mtime_t     i_lastpressed;                        /* to track dbl-clicks */ 
    8182}; 
    …… 
    228229    p_vout->p_sys->b_cursor_autohidden = 0; 
    229230    p_vout->p_sys->i_lastmoved = p_vout->p_sys->i_lastpressed = mdate(); 
     231    p_vout->p_sys->i_mouse_hide_timeout = 
     232        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    230233 
    231234    if( OpenDisplay( p_vout ) ) 
    …… 
    626629    /* Pointer change */ 
    627630    if( ! p_vout->p_sys->b_cursor_autohidden && 
    628         ( mdate() - p_vout->p_sys->i_lastmoved > 2000000 ) ) 
     631        ( mdate() - p_vout->p_sys->i_lastmoved > 
     632            p_vout->p_sys->i_mouse_hide_timeout ) ) 
    629633    { 
    630634        /* Hide the mouse automatically */ 

  • modules/video_output/x11/xcommon.c

    r2e7e224 r78e39f0  
    343343    /* Create blank cursor (for mouse cursor autohiding) */ 
    344344    p_vout->p_sys->i_time_mouse_last_moved = mdate(); 
     345    p_vout->p_sys->i_mouse_hide_timeout = 
     346        var_GetInteger(p_vout, "mouse-hide-timeout") * 1000; 
    345347    p_vout->p_sys->b_mouse_pointer_visible = 1; 
    346348    CreateCursor( p_vout ); 
    …… 
    15541556 
    15551557    /* Autohide Cursour */ 
    1556     if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 2000000 ) 
     1558    if( mdate() - p_vout->p_sys->i_time_mouse_last_moved > 
     1559        p_vout->p_sys->i_mouse_hide_timeout ) 
    15571560    { 
    15581561        /* Hide the mouse automatically */ 

  • modules/video_output/x11/xcommon.h

    r55da14e r78e39f0  
    253253    vlc_bool_t          b_mouse_pointer_visible; 
    254254    mtime_t             i_time_mouse_last_moved; /* used to auto-hide pointer*/ 
     255    mtime_t             i_mouse_hide_timeout;      /* after time hide cursor */ 
    255256    Cursor              blank_cursor;                   /* the hidden cursor */ 
    256257    mtime_t             i_time_button_last_pressed;   /* to track dbl-clicks */ 

  • src/libvlc-module.c

    r6ee1e74 r78e39f0  
    400400    "Place on video where to display the title (default bottom center).") 
    401401 
     402#define MOUSE_HIDE_TIMEOUT_TEXT N_("Hide cursor and fullscreen " \ 
     403                                   "controller after x miliseconds.") 
     404#define MOUSE_HIDE_TIMEOUT_LONGTEXT N_( \ 
     405    "Hide mouse cursor and fullscreen controller after " \ 
     406    "n miliseconds, default is 3000 ms (3 sec.)") 
     407 
    402408static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; 
    403409static const char *ppsz_pos_descriptions[] = 
    …… 
    14861492    add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT, 
    14871493                 VIDEO_TITLE_POSITION_LONGTEXT, VLC_FALSE ); 
     1494    // autohide after 3s 
     1495    add_integer( "mouse-hide-timeout", 3000, NULL, MOUSE_HIDE_TIMEOUT_TEXT, 
     1496                 MOUSE_HIDE_TIMEOUT_LONGTEXT, VLC_FALSE ); 
    14881497        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); 
    14891498 

  • src/video_output/vout_intf.c

    r0305cda r78e39f0  
    288288    var_Create( p_vout, "video-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); 
    289289 
     290    var_Create( p_vout, "mouse-hide-timeout", 
     291                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); 
     292 
    290293    p_vout->b_title_show = var_CreateGetBool( p_vout, "video-title-show" ); 
    291294    p_vout->i_title_timeout =