Mercurial > mplayer.hg
comparison libvo/vo_x11.c @ 15540:91d210e8a19c
Make -wid behave more consistent.
Original patch by kiriuja |mplayer-patches >ta< en-directo >tod< net|
| author | al |
|---|---|
| date | Sat, 21 May 2005 17:31:44 +0000 |
| parents | 05aa13cdf92f |
| children | fd51fd1ff231 |
comparison
equal
deleted
inserted
replaced
| 15539:a66885bcbebe | 15540:91d210e8a19c |
|---|---|
| 375 if (WinID >= 0) | 375 if (WinID >= 0) |
| 376 { | 376 { |
| 377 vo_window = WinID ? ((Window) WinID) : mRootWin; | 377 vo_window = WinID ? ((Window) WinID) : mRootWin; |
| 378 if (WinID) | 378 if (WinID) |
| 379 { | 379 { |
| 380 int border; | |
| 381 Window win; | |
| 380 XUnmapWindow(mDisplay, vo_window); | 382 XUnmapWindow(mDisplay, vo_window); |
| 381 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | 383 XChangeWindowAttributes(mDisplay, vo_window, xswamask, |
| 382 &xswa); | 384 &xswa); |
| 383 vo_x11_selectinput_witherr(mDisplay, vo_window, | 385 vo_x11_selectinput_witherr(mDisplay, vo_window, |
| 384 StructureNotifyMask | | 386 StructureNotifyMask | |
| 387 PointerMotionMask | | 389 PointerMotionMask | |
| 388 ButtonPressMask | | 390 ButtonPressMask | |
| 389 ButtonReleaseMask | | 391 ButtonReleaseMask | |
| 390 ExposureMask); | 392 ExposureMask); |
| 391 XMapWindow(mDisplay, vo_window); | 393 XMapWindow(mDisplay, vo_window); |
| 394 XGetGeometry(mDisplay, vo_window, &mRootWin, | |
| 395 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
| 396 &border, &depth); | |
| 392 } else | 397 } else |
| 393 XSelectInput(mDisplay, vo_window, ExposureMask); | 398 XSelectInput(mDisplay, vo_window, ExposureMask); |
| 394 } else | 399 } else |
| 395 { | 400 { |
| 396 if (vo_window == None) | 401 if (vo_window == None) |