| 0a8ecfb9 | 2014-11-19 23:14:09 | Timothy Pearson |
Fix syntax errors in compton-tde configuration module Remove obsolete kompmgr |
||
|
M twin/CMakeLists.txt M twin/Makefile.am M twin/kcmtwin/twinoptions/windows.cpp R twin/kompmgr/CMakeLists.txt R twin/kompmgr/Makefile.am R twin/kompmgr/configure.in.in R twin/kompmgr/kompmgr.c |
||
diff --git a/twin/CMakeLists.txt b/twin/CMakeLists.txt
index a20f2c2..7b4badc 100644
--- a/twin/CMakeLists.txt
+++ b/twin/CMakeLists.txt
@@ -19,7 +19,6 @@
add_subdirectory( clients )
add_subdirectory( oldheaders )
add_subdirectory( data )
-tde_conditional_add_subdirectory( WITH_XCOMPOSITE kompmgr )
tde_conditional_add_subdirectory( WITH_XCOMPOSITE compton-tde )
diff --git a/twin/Makefile.am b/twin/Makefile.am
index 02e560d..1e93a84 100644
--- a/twin/Makefile.am
+++ b/twin/Makefile.am
@@ -1,10 +1,6 @@
INCLUDES = -I$(srcdir)/lib $(all_includes)
-if include_kompmgr
-KOMPMGR=kompmgr
-endif
-
-SUBDIRS = lib . killer kcmtwin pics clients oldheaders data $(KOMPMGR)
+SUBDIRS = lib . killer kcmtwin pics clients oldheaders data
bin_PROGRAMS =
lib_LTLIBRARIES =
diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp
index 04ca993..b0489a6 100644
--- a/twin/kcmtwin/twinoptions/windows.cpp
+++ b/twin/kcmtwin/twinoptions/windows.cpp
@@ -1735,22 +1735,22 @@
stream << "no-fading-openclose = " << ((fadeWindows||fadeMenuWindows)?"false":"true") << ";\n";
stream << "wintypes:" << "\n";
stream << "{" << "\n";
- stream << " menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; }" << "\n";
- stream << " dropdown_menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; }" << "\n";
- stream << " popup_menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; }" << "\n";
- stream << " tooltip = { shadow = " << (shadowsOnToolTipWindows?"true":"false") << "; fade = " << (fadeToolTipWindows?"true":"false") << "; no-fading-openclose = " << (fadeToolTipWindows?"false":"true") << "; }" << "\n";
- stream << " normal = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " dialog = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " unknown = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " toolbar = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " utility = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " splash = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
+ stream << " menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; };" << "\n";
+ stream << " dropdown_menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; };" << "\n";
+ stream << " popup_menu = { shadow = " << (shadowsOnMenuWindows?"true":"false") << "; fade = " << (fadeMenuWindows?"true":"false") << "; no-fading-openclose = " << (fadeMenuWindows?"false":"true") << "; };" << "\n";
+ stream << " tooltip = { shadow = " << (shadowsOnToolTipWindows?"true":"false") << "; fade = " << (fadeToolTipWindows?"true":"false") << "; no-fading-openclose = " << (fadeToolTipWindows?"false":"true") << "; };" << "\n";
+ stream << " normal = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " dialog = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " unknown = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " toolbar = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " utility = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " splash = { shadow = " << (shadows?"true":"false") << "; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
- stream << " notify = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " combo = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " desktop = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " dnd = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
- stream << " dock = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; }" << "\n";
+ stream << " notify = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " combo = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " desktop = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " dnd = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
+ stream << " dock = { shadow = false; fade = " << (fadeWindows?"true":"false") << "; no-fading-openclose = " << (fadeWindows?"false":"true") << "; };" << "\n";
stream << "}" << "\n";
stream << "fade-in-step = " << (fadeInSpeed->value()/1000.0) << ";\n";
diff --git a/twin/kompmgr/CMakeLists.txt b/twin/kompmgr/CMakeLists.txt
deleted file mode 100644
index e2eb0c1..0000000
--- a/twin/kompmgr/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-#################################################
-#
-# (C) 2010-2011 Serghei Amelian
-# serghei (DOT) amelian (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-
-if( NOT WITH_XRENDER )
- tde_message_fatal( "xrender support is needed to build kompmgr.\n Pass -DWITH_XRENDER=ON to cmake arguments." )
-elseif( NOT WITH_XFIXES )
- tde_message_fatal( "xfixes support is needed to build kompmgr.\n Pass -DWITH_XFIXES=ON to cmake arguments." )
-endif( )
-
-
-include_directories(
- ${TDE_INCLUDE_DIR}
- ${TQT_INCLUDE_DIRS}
-)
-
-link_directories(
- ${TQT_LIBRARY_DIRS}
-)
-
-
-##### kompmgr (executable) #######################
-
-tde_add_executable( kompmgr
- SOURCES kompmgr.c
- LINK m ${XRENDER_LIBRARIES} ${XFIXES_LIBRARIES} ${XDAMAGE_LIBRARIES} ${XEXT_LIBRARIES} ${XCOMPOSITE_LIBRARIES}
- DESTINATION ${BIN_INSTALL_DIR}
-)
diff --git a/twin/kompmgr/Makefile.am b/twin/kompmgr/Makefile.am
deleted file mode 100644
index 6cc8ce4..0000000
--- a/twin/kompmgr/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-bin_PROGRAMS = kompmgr
-
-kompmgr_SOURCES = kompmgr.c
-kompmgr_LDADD = $(X_LDFLAGS) $(X_RPATH) -lXcomposite -lXdamage -lXfixes $(LIB_XRENDER) $(LIB_X11) -lXext -lm
-
-INCLUDES = $(all_includes)
diff --git a/twin/kompmgr/configure.in.in b/twin/kompmgr/configure.in.in
deleted file mode 100644
index bbabdd7..0000000
--- a/twin/kompmgr/configure.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-if test "x$with_composite" != "xno"; then
- KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
- KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
- KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
-else
- compile_kompmgr=no
-fi
-AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" )
diff --git a/twin/kompmgr/kompmgr.c b/twin/kompmgr/kompmgr.c
deleted file mode 100644
index 150c06b..0000000
--- a/twin/kompmgr/kompmgr.c
+++ /dev/null
@@ -1,3960 +0,0 @@
-/*
- * $Id$
- *
- * Copyright �� 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-/* Modified by Matthew Hawn. I don't know what to say here so follow what it
- says above. Not that I can really do anything about it
-*/
-
-/* Modified by Dan Doel*/
-
-/* Modified by Timothy Pearson
- *
- * CHANGELOG:
- * http://patchwork.freedesktop.org/patch/1049/ [Add default background color option] 08/11/2011
- * http://patchwork.freedesktop.org/patch/1052/ [Prevent flicker on root pixmap change] 08/11/2011
- * Added SIGUSR1 handler to change process UID [Prevent flicker on login] 08/12/2011
- * Added ability to write PID of process to home directory 08/14/2011
- * Added SIGUSR2 handler to reload settings [Prevent flicker on settings change] 08/14/2011
- * Added SIGTERM handler to clean up stale PID files on exit 08/14/2011
- * Added hack to work around ATI fglrx XDamage event generation bugs [WORK_AROUND_FGLRX] 09/01/2011
- * Redraw root window automatically when X damage events are detected (this fixes xsetroot) 10/23/2011
- *
- * TODO:
- * http://patchwork.freedesktop.org/patch/1053/ [Fix window mapping with re-used window ids]
-*/
-
-/*
-Version 2.x of xcompmgr, kompmgr changes by Thomas L���bking and Heiko Przybyl
-check baghira.sf.net for more infos
-*/
-
-#define _VERSION_ 2.02
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <time.h>
-#include <unistd.h>
-#include <libgen.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xrender.h>
-#include <X11/extensions/shape.h>
-
-#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2
-#define HAS_NAME_WINDOW_PIXMAP 1
-#endif
-
-#define CAN_DO_USABLE 1
-
-#define WORK_AROUND_FGLRX 1
-
-#define _TOPHEIGHT_(x) ((x >> 24) & 0xff)
-#define _RIGHTWIDTH_(x) ((x >> 16) & 0xff)
-#define _BOTTOMHEIGHT_(x) ((x >> 8) & 0xff)
-#define _LEFTWIDTH_(x) (x & 0xff)
-
-/* #define USE_ENV_HOME 1 */
-#define WRITE_PID_FILE 1
-
-#ifndef USE_ENV_HOME
-#include <pwd.h>
-#endif
-
-typedef enum {
- WINTYPE_DESKTOP,
- WINTYPE_DOCK,
- WINTYPE_TOOLBAR,
- WINTYPE_MENU,
- WINTYPE_UTILITY,
- WINTYPE_SPLASH,
- WINTYPE_DIALOG,
- WINTYPE_NORMAL,
- WINTYPE_DROPDOWN_MENU,
- WINTYPE_POPUP_MENU,
- WINTYPE_TOOLTIP,
- WINTYPE_NOTIFY,
- WINTYPE_COMBO,
** Diff limit reached (max: 250 lines) **
|
||
| ac2a2efe | 2014-11-19 23:15:02 | Timothy Pearson |
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase |
||
|
M doc/kcontrol/crypto/index.docbook M doc/kcontrol/kcmaccess/index.docbook M doc/kcontrol/keys/index.docbook M kcontrol/access/kcmaccess.cpp M kcontrol/access/kcmaccess.h M kcontrol/arts/arts.cpp M kcontrol/arts/arts.h M kcontrol/crypto/crypto.cpp M kcontrol/crypto/crypto.h M kcontrol/keys/main.cpp M kcontrol/locale/toplevel.cpp M kcontrol/locale/toplevel.h M kxkb/kcmlayout.cpp M kxkb/kcmlayout.h R kcontrol/accessibility/Makefile.am R kcontrol/accessibility/accessibility.cpp R kcontrol/accessibility/accessibility.desktop R kcontrol/accessibility/accessibility.h R kcontrol/accessibility/accessibilityconfigwidget.ui R kcontrol/accessibility/accessibilityconfigwidget.ui.h R kcontrol/accessibility/configure.in.in R kcontrol/accessibility/kcm_accessibility.kcfg R kcontrol/accessibility/settings.kcfgc |
||
** Diff limit reached (max: 250 lines) ** |
||