yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Above -> KeepAbove

Browse source 
svn path=/trunk/kdebase/kwin/; revision=198736
This commit is contained in:
Luboš Luňák 2003-01-10 12:31:57 +00:00
parent 4577f0f474
commit 05063a30f5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -6,7 +6,7 @@ bin_PROGRAMS = kwin
lib_LTLIBRARIES = kwin.la lib_LTLIBRARIES = kwin.la
# workspace.cpp has to be first in order not to break --enable-final # workspace.cpp has to be first in order not to break --enable-final
kwin_la_SOURCES = client.cpp workspace.cpp placement.cpp atoms.cpp main.cpp \ kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp main.cpp \
popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
killwindow.cpp kwinbutton.cpp geometrytip.cpp killwindow.cpp kwinbutton.cpp geometrytip.cpp
kwin_la_LIBADD = $(LIB_KDEUI) kwin_la_LIBADD = $(LIB_KDEUI)

12
workspace.cpp
View file

@ -53,8 +53,6 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
const int XIconicState = IconicState; const int XIconicState = IconicState;
#undef IconicState #undef IconicState
const int XAbove = Above;
#undef Above
#include <kwin.h> #include <kwin.h>
#include <kdebug.h> #include <kdebug.h>
@ -457,12 +455,12 @@ void Workspace::init()
NET::MaxHoriz | NET::MaxHoriz |
NET::Shaded | NET::Shaded |
NET::SkipTaskbar | NET::SkipTaskbar |
NET::Above | NET::KeepAbove |
// NET::StaysOnTop | the same like Above // NET::StaysOnTop | the same like KeepAbove
NET::SkipPager | NET::SkipPager |
// NET::Hidden | TODO // NET::Hidden | TODO
// NET::FullScreen | TODO // NET::FullScreen | TODO
// NET::Below | TODO // NET::KeepBelow | TODO
0 0
}; };
@ -728,7 +726,7 @@ bool Workspace::workspaceEvent( XEvent * e )
wc.width = e->xconfigurerequest.width; wc.width = e->xconfigurerequest.width;
wc.height = e->xconfigurerequest.height; wc.height = e->xconfigurerequest.height;
wc.sibling = None; wc.sibling = None;
wc.stack_mode = XAbove; wc.stack_mode = Above;
value_mask = e->xconfigurerequest.value_mask | CWBorderWidth; value_mask = e->xconfigurerequest.value_mask | CWBorderWidth;
XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, & wc ); XConfigureWindow( qt_xdisplay(), e->xconfigurerequest.window, value_mask, & wc );
@ -877,6 +875,7 @@ bool Workspace::destroyClient( Client* c)
#include <stdarg.h> #include <stdarg.h>
static
bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... ) bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
{ {
va_list args; va_list args;
@ -917,6 +916,7 @@ bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
return bAll; return bAll;
} }
static
bool areModKeysDepressed( const KShortcut& cut ) bool areModKeysDepressed( const KShortcut& cut )
{ {