comparison libvo/x11_common.c @ 15100:66956f842461

fix vo_xv_draw_colorkey to a workable state (using panscan makes x,y negative, so it is very bad idea they to be unsigned)

15099:bfb91d085f22

 * Draws the colorkey depending on the set method ( colorkey_handling ).
 *
 * It also draws the black bars ( when the video doesn't fit to the
 * display in full screen ) seperately, so they don't overlap with the
 * video area.
 *
 */
inline void vo_xv_draw_colorkey( uint32_t x, uint32_t y,
                                 uint32_t w, uint32_t h  )
{
  if( xv_ck_info.method == CK_METHOD_MANUALFILL )
  {
    XSetForeground( mDisplay, vo_gc, xv_colorkey );
    XFillRectangle( mDisplay, vo_window, vo_gc,
                    x, y,
                    w, h );
  }

  /* draw black bars if needed */
  if ( vo_fs )
  {
    XSetForeground( mDisplay, vo_gc, 0 );
    if ( y > 0 )
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, 0,
                      vo_screenwidth, y);
    if (x > 0)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, y,
                      x, h );
    if (x + w < vo_screenwidth)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      x + w, y,
                      vo_screenwidth - (x + w), h );
    if (y + h < vo_screenheight)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, y + h,
                      vo_screenwidth, vo_screenheight - (y + h) );
  }

  XFlush( mDisplay );
}

/** \brief tests if a valid arg for the ck suboption was given */ 
int xv_test_ck( void * arg )
{

15100:66956f842461

 * Draws the colorkey depending on the set method ( colorkey_handling ).
 *
 * It also draws the black bars ( when the video doesn't fit to the
 * display in full screen ) seperately, so they don't overlap with the
 * video area.
 * It doesn't call XFlush
 *
 */
inline void vo_xv_draw_colorkey(  int32_t x,  int32_t y,
                                  int32_t w,  int32_t h  )
{
  if( xv_ck_info.method == CK_METHOD_MANUALFILL ||
      xv_ck_info.method == CK_METHOD_BACKGROUND   )//less tearing than XClearWindow()
  {
    XSetForeground( mDisplay, vo_gc, xv_colorkey );
    XFillRectangle( mDisplay, vo_window, vo_gc,
                    x, y,
                    w, h );
  }

  /* draw black bars if needed */
  /* TODO! move this to vo_x11_clearwindow_part() */
  if ( vo_fs )
  {
    XSetForeground( mDisplay, vo_gc, 0 );
    /* making non overlap fills, requiare 8 checks instead of 4*/
    if ( y > 0 )
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, 0,
                      vo_screenwidth, y);
    if (x > 0)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, 0,
                      x, vo_screenheight);
    if (x + w < vo_screenwidth)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      x + w, 0,
                      vo_screenwidth, vo_screenheight);
    if (y + h < vo_screenheight)
      XFillRectangle( mDisplay, vo_window, vo_gc,
                      0, y + h,
                      vo_screenwidth, vo_screenheight);
  }
}

/** \brief tests if a valid arg for the ck suboption was given */ 
int xv_test_ck( void * arg )
{