Mercurial > mplayer.hg
comparison libvo/vo_x11.c @ 4805:79b753e2e84a
mondom fix bazmeg.
author | pontscho |
---|---|
date | Fri, 22 Feb 2002 15:22:27 +0000 |
parents | 62a281be07ce |
children | 4eaa205201b0 |
comparison
equal
deleted
inserted
replaced
4804:62a281be07ce | 4805:79b753e2e84a |
---|---|
288 image_height=height; | 288 image_height=height; |
289 | 289 |
290 aspect= ((1<<16)*d_width + d_height/2)/d_height; | 290 aspect= ((1<<16)*d_width + d_height/2)/d_height; |
291 | 291 |
292 #ifdef HAVE_NEW_GUI | 292 #ifdef HAVE_NEW_GUI |
293 if ( vo_window != None ) { vo_window=vo_window; vo_gc=vo_gc; } | 293 if ( vo_window == None ) |
294 else | |
295 #endif | 294 #endif |
296 { | 295 { |
297 if( !vo_init() ) return 0; // Can't open X11 | 296 if( !vo_init() ) return 0; // Can't open X11 |
298 | 297 |
299 hint.x=0; | 298 hint.x=0; |
373 XSelectInput( mDisplay,vo_window,NoEventMask ); | 372 XSelectInput( mDisplay,vo_window,NoEventMask ); |
374 | 373 |
375 XFlush( mDisplay ); | 374 XFlush( mDisplay ); |
376 XSync( mDisplay,False ); | 375 XSync( mDisplay,False ); |
377 vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); | 376 vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); |
377 | |
378 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask ); | |
378 | 379 |
379 #ifdef HAVE_XF86VM | 380 #ifdef HAVE_XF86VM |
380 if ( vm ) | 381 if ( vm ) |
381 { | 382 { |
382 /* Grab the mouse pointer in our window */ | 383 /* Grab the mouse pointer in our window */ |
429 { | 430 { |
430 printf("hmm, arpi said that isnt used, contact the developers, thats weird\n" ); | 431 printf("hmm, arpi said that isnt used, contact the developers, thats weird\n" ); |
431 return -1; | 432 return -1; |
432 } | 433 } |
433 | 434 |
434 #ifdef HAVE_NEW_GUI | |
435 if ( vo_window == None ) | |
436 #endif | |
437 { | |
438 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | |
439 #ifdef HAVE_NEW_INPUT | |
440 | ButtonPressMask | ButtonReleaseMask | |
441 #endif | |
442 ); | |
443 } | |
444 saver_off(mDisplay); | 435 saver_off(mDisplay); |
445 return 0; | 436 return 0; |
446 } | 437 } |
447 | 438 |
448 static const vo_info_t* get_info( void ) | 439 static const vo_info_t* get_info( void ) |