vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch kwin/killer to XCB 

No longer need to link XLib and doesn't use anything except defines
anyway.
icc-effect-5.14.5
Martin Gräßlin 2013-07-23 10:37:49 +02:00
parent 0dc344ee2c
commit 6bdbae0277
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
killer/CMakeLists.txt
View File

@ -5,6 +5,6 @@ set(kwin_killer_helper_SRCS killer.cpp )
kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} ${X11_X11_LIB})
target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS})
install(TARGETS kwin_killer_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )

9
killer/killer.cpp
View File

@ -30,14 +30,13 @@ DEALINGS IN THE SOFTWARE.
#include <kauth.h>
#include <kdebug.h>
#include <unistd.h>
#include <X11/Xlib.h>
#include <QX11Info>
#include <QProcess>
// TODO: remove with Qt 5, only for HTML escaping the caption
#include <QTextDocument>
#include <QWidget>
#include <signal.h>
#include <errno.h>
#include <xcb/xcb.h>
int main(int argc, char* argv[])
{
@ -61,11 +60,11 @@ int main(int argc, char* argv[])
QString caption = args->getOption("windowname");
QString appname = args->getOption("applicationname");
bool id_ok = false;
Window id = QString(args->getOption("wid")).toULong(&id_ok);
xcb_window_t id = QString(args->getOption("wid")).toULong(&id_ok);
bool time_ok = false;
Time timestamp = QString(args->getOption("timestamp")).toULong(&time_ok);
xcb_timestamp_t timestamp = QString(args->getOption("timestamp")).toULong(&time_ok);
args->clear();
if (!pid_ok || pid == 0 || !id_ok || id == None || !time_ok || timestamp == CurrentTime
if (!pid_ok || pid == 0 || !id_ok || id == XCB_WINDOW_NONE || !time_ok || timestamp == XCB_TIME_CURRENT_TIME
|| hostname.isEmpty() || caption.isEmpty() || appname.isEmpty()) {
KCmdLineArgs::usageError(i18n("This helper utility is not supposed to be called directly."));
return 1;