mirror of https://github.com/mpv-player/mpv
Cosmetics: reindent, remove tabs and break overlong lines.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19586 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
6fd61e1c4c
commit
6ec6374d6f
|
@ -430,12 +430,10 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
|
|||
hint.flags = PPosition | PSize;
|
||||
|
||||
/* Get some colors */
|
||||
|
||||
bg = WhitePixel(mDisplay, mScreen);
|
||||
fg = BlackPixel(mDisplay, mScreen);
|
||||
|
||||
/* Make the window */
|
||||
|
||||
vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
|
||||
if (vinfo == NULL)
|
||||
{
|
||||
|
@ -443,10 +441,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
|
|||
return -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual, hint.x, hint.y, hint.width, hint.height,
|
||||
vinfo->depth, XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone));
|
||||
vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual,
|
||||
hint.x, hint.y, hint.width, hint.height, vinfo->depth,
|
||||
XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone));
|
||||
|
||||
vo_x11_classhint( mDisplay,vo_window,"gl" );
|
||||
vo_hidecursor(mDisplay,vo_window);
|
||||
|
@ -458,19 +455,17 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
|
|||
XMapWindow(mDisplay, vo_window);
|
||||
|
||||
/* Wait for map. */
|
||||
do
|
||||
{
|
||||
do {
|
||||
XNextEvent(mDisplay, &xev);
|
||||
}
|
||||
while (xev.type != MapNotify || xev.xmap.event != vo_window);
|
||||
} while (xev.type != MapNotify || xev.xmap.event != vo_window);
|
||||
|
||||
XSelectInput(mDisplay, vo_window, NoEventMask);
|
||||
|
||||
XSync(mDisplay, False);
|
||||
|
||||
vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
|
||||
| ButtonPressMask | ButtonReleaseMask | ExposureMask
|
||||
);
|
||||
vo_x11_selectinput_witherr(mDisplay, vo_window,
|
||||
StructureNotifyMask | KeyPressMask | PointerMotionMask |
|
||||
ButtonPressMask | ButtonReleaseMask | ExposureMask);
|
||||
}
|
||||
if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
|
||||
|
||||
|
|
Loading…
Reference in New Issue