Still some kompmgr code removal.
svn path=/branches/work/kwin_composite/; revision=632900
This commit is contained in:
parent
4019dff500
commit
5e8b2465b4
4 changed files with 2 additions and 28 deletions
|
@ -32,9 +32,10 @@ General TODO
|
||||||
and then the decoration - this should make it possible to paint the decoration
|
and then the decoration - this should make it possible to paint the decoration
|
||||||
without the random alpha that is right now handled by the alpha hack
|
without the random alpha that is right now handled by the alpha hack
|
||||||
|
|
||||||
* wait for decoration repaints
|
? wait for decoration repaints
|
||||||
- it is sometimes visible that the window contents are painted first and the decoration
|
- it is sometimes visible that the window contents are painted first and the decoration
|
||||||
only afterwards with a small delay
|
only afterwards with a small delay
|
||||||
|
? - this has been already greatly improved by r632378, so it's maybe not worth it anymore
|
||||||
- maybe posted paint events need to be processed immediatelly, or maybe the compositing
|
- maybe posted paint events need to be processed immediatelly, or maybe the compositing
|
||||||
code should not update the window until the decoration is finished painting
|
code should not update the window until the decoration is finished painting
|
||||||
|
|
||||||
|
@ -68,8 +69,6 @@ General TODO
|
||||||
- see the DynamicTwinView section in nvidia README
|
- see the DynamicTwinView section in nvidia README
|
||||||
- this makes KWin repaint at a different rate than it should
|
- this makes KWin repaint at a different rate than it should
|
||||||
|
|
||||||
% clean up completely after kompmgr (kwin sources, kdelibs classes)
|
|
||||||
|
|
||||||
|
|
||||||
OpenGL TODO
|
OpenGL TODO
|
||||||
=================================
|
=================================
|
||||||
|
|
12
atoms.cpp
12
atoms.cpp
|
@ -80,18 +80,6 @@ Atoms::Atoms()
|
||||||
atoms[n] = &net_wm_window_opacity;
|
atoms[n] = &net_wm_window_opacity;
|
||||||
names[n++] = (char*) "_NET_WM_WINDOW_OPACITY";
|
names[n++] = (char*) "_NET_WM_WINDOW_OPACITY";
|
||||||
|
|
||||||
atoms[n] = &net_wm_window_shadow;
|
|
||||||
names[n++] = (char*) "_KDE_WM_WINDOW_SHADOW";
|
|
||||||
|
|
||||||
atoms[n] = &net_wm_window_shade;
|
|
||||||
names[n++] = (char*) "_KDE_WM_WINDOW_SHADE";
|
|
||||||
|
|
||||||
atoms[n] = &net_wm_window_shapable;
|
|
||||||
names[n++] = (char*) "_KDE_WM_WINDOW_SHAPABLE";
|
|
||||||
|
|
||||||
atoms[n] = &net_wm_window_decohash;
|
|
||||||
names[n++] = (char*) "_KDE_WM_WINDOW_DECOHASH";
|
|
||||||
|
|
||||||
Atom fake;
|
Atom fake;
|
||||||
atoms[n] = &fake;
|
atoms[n] = &fake;
|
||||||
names[n++] = (char *) "_DT_SM_WINDOW_INFO";
|
names[n++] = (char *) "_DT_SM_WINDOW_INFO";
|
||||||
|
|
4
atoms.h
4
atoms.h
|
@ -41,10 +41,6 @@ class Atoms
|
||||||
Atom kde_system_tray_embedding;
|
Atom kde_system_tray_embedding;
|
||||||
Atom net_wm_take_activity;
|
Atom net_wm_take_activity;
|
||||||
Atom net_wm_window_opacity;
|
Atom net_wm_window_opacity;
|
||||||
Atom net_wm_window_shadow;
|
|
||||||
Atom net_wm_window_shade;
|
|
||||||
Atom net_wm_window_shapable;
|
|
||||||
Atom net_wm_window_decohash;
|
|
||||||
Atom xdnd_aware;
|
Atom xdnd_aware;
|
||||||
Atom xdnd_position;
|
Atom xdnd_position;
|
||||||
Atom net_frame_extents;
|
Atom net_frame_extents;
|
||||||
|
|
|
@ -779,9 +779,6 @@ void Client::setShade( ShadeMode mode )
|
||||||
// TODO all this unmapping, resizing etc. feels too much duplicated from elsewhere
|
// TODO all this unmapping, resizing etc. feels too much duplicated from elsewhere
|
||||||
if ( isShade())
|
if ( isShade())
|
||||||
{ // shade_mode == ShadeNormal
|
{ // shade_mode == ShadeNormal
|
||||||
// we're about to shade, texx xcompmgr to prepare
|
|
||||||
long _shade = 1;
|
|
||||||
XChangeProperty(display(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);
|
|
||||||
workspace()->addRepaint( geometry());
|
workspace()->addRepaint( geometry());
|
||||||
// shade
|
// shade
|
||||||
int h = height();
|
int h = height();
|
||||||
|
@ -792,8 +789,6 @@ void Client::setShade( ShadeMode mode )
|
||||||
XUnmapWindow( display(), wrapper );
|
XUnmapWindow( display(), wrapper );
|
||||||
XUnmapWindow( display(), client );
|
XUnmapWindow( display(), client );
|
||||||
XSelectInput( display(), wrapper, ClientWinMask | SubstructureNotifyMask );
|
XSelectInput( display(), wrapper, ClientWinMask | SubstructureNotifyMask );
|
||||||
//as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it
|
|
||||||
//done xcompmgr workaround
|
|
||||||
// FRAME repaint( false );
|
// FRAME repaint( false );
|
||||||
// bool wasStaticContents = testWFlags( WStaticContents );
|
// bool wasStaticContents = testWFlags( WStaticContents );
|
||||||
// setWFlags( WStaticContents );
|
// setWFlags( WStaticContents );
|
||||||
|
@ -816,9 +811,6 @@ void Client::setShade( ShadeMode mode )
|
||||||
else
|
else
|
||||||
workspace()->focusToNull();
|
workspace()->focusToNull();
|
||||||
}
|
}
|
||||||
// tell xcompmgr shade's done
|
|
||||||
_shade = 2;
|
|
||||||
XChangeProperty(display(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L);
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -846,7 +838,6 @@ void Client::setShade( ShadeMode mode )
|
||||||
setActive( true );
|
setActive( true );
|
||||||
XMapWindow( display(), wrapperId());
|
XMapWindow( display(), wrapperId());
|
||||||
XMapWindow( display(), window());
|
XMapWindow( display(), window());
|
||||||
XDeleteProperty (display(), client, atoms->net_wm_window_shade);
|
|
||||||
if ( isActive() )
|
if ( isActive() )
|
||||||
workspace()->requestFocus( this );
|
workspace()->requestFocus( this );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue