Search
j0ke.net Open Build Service
>
Projects
>
multimedia
:
SL11
>
ggi
> ggi-2.2-inwin.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File ggi-2.2-inwin.patch of Package ggi
--- display/X/mode.c.orig 2005-09-19 20:46:40.000000000 +0200 +++ display/X/mode.c 2008-03-10 21:48:47.000000000 +0100 @@ -130,27 +130,29 @@ * width will equal the virtual one. */ m->visible.x = FourMultiple( m->visible.x ); } - else if( priv->parentwin != None && priv->parentwin == priv->win ) { - /* This case is for -inwin=(some window other than root).. */ - XGetGeometry(priv->disp, priv->parentwin, - &dummywin, - (int *) &dummy, (int *) &dummy, - &w, &h, - &dummy, &dummy ); - m->visible.x = w; - m->visible.y = h; - } else { - /* Root window or fullscreen.. */ - char inroot = 0; + char inroot = 0; if(priv->parentwin == RootWindow(priv->disp, vi->vi->screen)) inroot = 1; + if( priv->parentwin != None && !inroot ) { + /* This case is for -inwin=(some window other than root).. */ + XGetGeometry(priv->disp, priv->parentwin, + &dummywin, + (int *) &dummy, (int *) &dummy, + &w, &h, + &dummy, &dummy ); + m->visible.x = w; + m->visible.y = h; + } + else { + /* Root window or fullscreen.. */ - if( (m->visible.x == GGI_AUTO) || inroot ) - m->visible.x = screenw; + if( (m->visible.x == GGI_AUTO) || inroot ) + m->visible.x = screenw; - if( (m->visible.y == GGI_AUTO) || inroot ) - m->visible.y = screenh; + if( (m->visible.y == GGI_AUTO) || inroot ) + m->visible.y = screenh; + } } } @@ -474,7 +476,7 @@ if( ! priv->ok_to_resize ) { /* XXX: Cleanup question: is this check neccessary? */ destroychild = destroychild && priv->win != priv->parentwin; - if (priv->parentwin == None) destroyparent = 0; + destroyparent = 0; if (priv->parentwin != None) createparent = 0; }