diff options
| author | Timothy Pearson <[email protected]> | 2012-02-07 21:32:15 -0600 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-03 03:26:51 +0200 |
| commit | 0dd46a86be31d728de1618f5c10ad0d7a3de794e (patch) | |
| tree | 4afa418a569a12795db2d2f17046c847d96c5771 /kdesktop/lock | |
| parent | 62a9582844524025136e3e595625c98dacc1e69f (diff) | |
| download | tdebase-0dd46a86be31d728de1618f5c10ad0d7a3de794e.tar.gz tdebase-0dd46a86be31d728de1618f5c10ad0d7a3de794e.zip | |
Update lock process to engage the lock in near real time
(cherry picked from commit 8d521d0b6ba88c6e679e7453f02897c8db7bbdf5)
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index 5ea297037..7093e476a 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -35,6 +35,6 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} + LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "-z\ now" DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index a54981296..bd8a8334c 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -1,6 +1,7 @@ /* This file is part of the KDE project Copyright (C) 1999 David Faure Copyright (c) 2003 Oswald Buddenhagen <[email protected]> + Copyright (c) 2010-2012 Timothy Pearson <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -43,6 +44,13 @@ bool trinity_desktop_lock_use_sak = FALSE; bool trinity_desktop_lock_forced = FALSE; +bool signalled_forcelock; +bool signalled_dontlock; +bool signalled_securedialog; +bool signalled_blank; +bool signalled_run; +bool in_internal_mode = FALSE; + bool MyApp::x11EventFilter( XEvent *ev ) { if (ev->type == XKeyPress || ev->type == ButtonPress) { |