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

removed 'x11util'. Use kdecoration API instead

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1036345
This commit is contained in:
Hugo Pereira Da Costa 2009-10-17 03:56:04 +00:00
parent 4e1fd9e494
commit 2d88428b6d
4 changed files with 1 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/oxygen/CMakeLists.txt
View file

@ -15,7 +15,6 @@ set(kwin_oxygen_SRCS
oxygenshadowconfiguration.cpp
oxygenshadowcache.cpp
oxygensizegrip.cpp
x11util.cpp
)
kde4_add_plugin(kwin3_oxygen ${kwin_oxygen_SRCS})

9
clients/oxygen/oxygensizegrip.cpp
View file

@ -35,7 +35,6 @@
#include <KDebug>
#include "x11util.h"
#include <QtGui/QX11Info>
#include <X11/Xlib.h>
@ -181,14 +180,8 @@ namespace Oxygen
// check client window id
if( !client().windowId() ) break;
// get matching screen
int screen( client().widget()->x11Info().screen() );
client().widget()->setFocus();
// post event
X11Util::get().moveResizeWidget( client().windowId(), screen, event->globalPos(), X11Util::_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT );
client().decoration()->performWindowOperation( KDecorationDefines::ResizeOp );
}
break;

144
clients/oxygen/x11util.cpp
View file

@ -1,144 +0,0 @@
//////////////////////////////////////////////////////////////////////////////
// x11util.cpp
// -------------------
//
// Copyright (c) 2009 Hugo Pereira Da Costa <hugo.pereira@free.fr>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//////////////////////////////////////////////////////////////////////////////
#include "x11util.h"
namespace Oxygen
{
//________________________________________________________________________
X11Util& X11Util::get( void )
{
static X11Util singleton;
return singleton;
}
//________________________________________________________________________
X11Util::X11Util( void )
{
initializeAtomNames();
}
//________________________________________________________________________
bool X11Util::isSupported( const Atoms& atom )
{
SupportedAtomMap::const_iterator iter( supportedAtoms().find( atom ) );
if( iter != supportedAtoms().end() ) return iter->second;
Display* display( QX11Info::display() );
Atom net_supported( findAtom( _NET_SUPPORTED ) );
Atom searched( findAtom( atom ) );
Atom type;
int format;
unsigned char *data;
unsigned long count;
unsigned long unused;
// get window property
if( XGetWindowProperty(
display, QX11Info::appRootWindow(),
net_supported, 0l, 2048l,
false, XA_ATOM, &type,
&format, &count, &unused, (unsigned char **) &data) != Success )
{ return false; }
if( type != XA_ATOM || format != 32 || count <= 0 || data == None )
{ return false; }
long *states = (long *) data;
bool found = false;
for( unsigned long i = 0; (i<count) &&!( found = (searched == (Atom) states[i]) ); i++ )
{}
supportedAtoms_[atom] = found;
return found;
}
//________________________________________________________________________
bool X11Util::moveResizeWidget(
WId id,
int screen,
QPoint position,
X11Util::Direction direction,
Qt::MouseButton button )
{
// check
if( !isSupported( _NET_WM_MOVERESIZE ) ) return false;
Display* display( QX11Info::display() );
Atom net_wm_moveresize( findAtom( _NET_WM_MOVERESIZE ) );
XEvent event;
event.xclient.type = ClientMessage;
event.xclient.message_type = net_wm_moveresize;
event.xclient.display = display;
event.xclient.window = id;
event.xclient.format = 32;
event.xclient.data.l[0] = position.x();
event.xclient.data.l[1] = position.y();
event.xclient.data.l[2] = direction;
event.xclient.data.l[3] = button;
event.xclient.data.l[4] = 0;
XUngrabPointer( display, QX11Info::appTime() );
XSendEvent(display,
QX11Info::appRootWindow( screen ),
false,
SubstructureRedirectMask | SubstructureNotifyMask, &event);
return true;
}
//________________________________________________________________________
void X11Util::initializeAtomNames( void )
{
atomNames_[_NET_SUPPORTED] = "_NET_SUPPORTED";
atomNames_[_NET_WM_STATE] = "_NET_WM_STATE";
atomNames_[_NET_WM_MOVERESIZE] = "_NET_WM_MOVERESIZE";
return;
}
//________________________________________________________________________
Atom X11Util::findAtom( const Atoms& atom )
{
// find atom in map
AtomMap::iterator iter( atoms().find( atom ) );
if( iter != atoms().end() ) return iter->second;
// create atom if not found
Display* display( QX11Info::display() );
Atom out( XInternAtom(display, qPrintable( atomNames_[atom] ), false ) );
atoms_[atom] = out;
return out;
}
}

121
clients/oxygen/x11util.h
View file

@ -1,121 +0,0 @@
#ifndef X11Util_h
#define X11Util_h
//////////////////////////////////////////////////////////////////////////////
// x11util.h
// -------------------
//
// Copyright (c) 2009 Hugo Pereira Da Costa <hugo.pereira@free.fr>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//////////////////////////////////////////////////////////////////////////////
#include <QtGui/QWidget>
#include <map>
#include <QtGui/QX11Info>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
namespace Oxygen
{
class X11Util
{
public:
//! singleton
static X11Util& get( void );
//! Atoms enumeration
enum Atoms
{
_NET_SUPPORTED,
_NET_WM_STATE,
_NET_WM_MOVERESIZE
};
enum Direction
{
_NET_WM_MOVERESIZE_SIZE_TOPLEFT=0,
_NET_WM_MOVERESIZE_SIZE_TOP=1,
_NET_WM_MOVERESIZE_SIZE_TOPRIGHT=2,
_NET_WM_MOVERESIZE_SIZE_RIGHT=3,
_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT=4,
_NET_WM_MOVERESIZE_SIZE_BOTTOM=5,
_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT=6,
_NET_WM_MOVERESIZE_SIZE_LEFT=7,
_NET_WM_MOVERESIZE_MOVE=8,
_NET_WM_MOVERESIZE_SIZE_KEYBOARD=9,
_NET_WM_MOVERESIZE_MOVE_KEYBOARD=10
};
//! supported atoms
bool isSupported( const Atoms& atom );
//! move/resize widget using X11 window manager
/*! returns true on success */
bool moveResizeWidget( WId, int screen, QPoint, Direction, Qt::MouseButton button = Qt::LeftButton );
//! find atom
Atom findAtom( const Atoms& atom );
private:
//! constructor
X11Util( void );
//! atom names
typedef std::map<Atoms, QString> AtomNameMap;
//! atom names
void initializeAtomNames( void );
//! atom names
const AtomNameMap& atomNames( void ) const
{ return atomNames_; }
AtomNameMap atomNames_;
//! supported atoms
typedef std::map<Atoms, bool > SupportedAtomMap;
//! supported atoms
const SupportedAtomMap& supportedAtoms( void ) const
{ return supportedAtoms_; }
SupportedAtomMap supportedAtoms_;
//! atom map
typedef std::map<Atoms, Atom> AtomMap;
//! atoms
// const AtomMap& atoms( void ) const
AtomMap& atoms( void )
{ return atoms_; }
//! atoms
AtomMap atoms_;
};
}
#endif