diff options
author | Dan Armak <danarmak@gentoo.org> | 2002-08-02 09:17:15 +0000 |
---|---|---|
committer | Dan Armak <danarmak@gentoo.org> | 2002-08-02 09:17:15 +0000 |
commit | 74203f7c378c7773da98cfad086ad1429dc886f4 (patch) | |
tree | bb940b84682e99a1e996b1013c02aeab3b5accfd /kde-base/kdelibs | |
parent | Narrow down arts dependencies: don't allow usage of a more recent version of ... (diff) | |
download | historical-74203f7c378c7773da98cfad086ad1429dc886f4.tar.gz historical-74203f7c378c7773da98cfad086ad1429dc886f4.tar.bz2 historical-74203f7c378c7773da98cfad086ad1429dc886f4.zip |
removing 3.1_alpha1 ebuilds: too many fixes have gone into the kde cvs which i don't want to baclport in response to bugreports. use the cvs ebuilds or wait for beta1.
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r-- | kde-base/kdelibs/files/digest-kdelibs-3.1_alpha1 | 1 | ||||
-rw-r--r-- | kde-base/kdelibs/files/kdelibs-3.1_alpha1-menushadows.diff | 393 | ||||
-rw-r--r-- | kde-base/kdelibs/kdelibs-3.1_alpha1.ebuild | 99 |
3 files changed, 0 insertions, 493 deletions
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.1_alpha1 b/kde-base/kdelibs/files/digest-kdelibs-3.1_alpha1 deleted file mode 100644 index 67ed274571f2..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.1_alpha1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c5b17936a30cf7fbed07e4a1939db5de kdelibs-3.0.6.tar.bz2 7993291 diff --git a/kde-base/kdelibs/files/kdelibs-3.1_alpha1-menushadows.diff b/kde-base/kdelibs/files/kdelibs-3.1_alpha1-menushadows.diff deleted file mode 100644 index 6d0c6930893f..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.1_alpha1-menushadows.diff +++ /dev/null @@ -1,393 +0,0 @@ ---- kdefx/kstyle.cpp 2002/03/25 21:08:41 1.17 -+++ kdefx/kstyle.cpp 2002/07/05 13:58:00 1.18 -@@ -1,5 +1,5 @@ - /* -- * $Id: kdelibs-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ -+ * $Id: kdelibs-3.1_alpha1-menushadows.diff,v 1.1 2002/07/16 20:37:01 danarmak Exp $ - * - * KStyle - * Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org> -@@ -31,6 +31,7 @@ - #include <qapplication.h> - #include <qbitmap.h> - #include <qcleanuphandler.h> -+#include <qmap.h> - #include <qimage.h> - #include <qlistview.h> - #include <qmenubar.h> -@@ -50,25 +51,77 @@ - #include <kimageeffect.h> - #include "kstyle.h" - --#ifdef HAVE_XRENDER - #include <X11/Xlib.h> -+#ifdef HAVE_XRENDER - #include <X11/extensions/Xrender.h> - extern bool qt_use_xrender; - #endif - -+namespace -+{ -+ // INTERNAL -+ enum TransparencyEngine { -+ Disabled = 0, -+ SoftwareTint, -+ SoftwareBlend, -+ XRender -+ }; -+ -+ // Drop Shadow -+ struct ShadowElements { -+ QWidget* w1; -+ QWidget* w2; -+ }; -+ typedef QMap<const QPopupMenu*,ShadowElements> ShadowMap; -+ ShadowMap shadowMap; -+ -+ // DO NOT ASK ME HOW I MADE THESE TABLES! -+ // (I probably won't remember anyway ;) -+ const double top_right_corner[16] = -+ { 0.949, 0.965, 0.980, 0.992, -+ 0.851, 0.890, 0.945, 0.980, -+ 0.706, 0.780, 0.890, 0.960, -+ 0.608, 0.706, 0.851, 0.949 }; -+ -+ const double bottom_right_corner[16] = -+ { 0.608, 0.706, 0.851, 0.949, -+ 0.706, 0.780, 0.890, 0.960, -+ 0.851, 0.890, 0.945, 0.980, -+ 0.949, 0.965, 0.980, 0.992 }; -+ -+ const double bottom_left_corner[16] = -+ { 0.949, 0.851, 0.706, 0.608, -+ 0.965, 0.890, 0.780, 0.706, -+ 0.980, 0.945, 0.890, 0.851, -+ 0.992, 0.980, 0.960, 0.949 }; - --// INTERNAL --enum TransparencyEngine { -- Disabled = 0, -- SoftwareTint, -- SoftwareBlend, -- XRender -+ const double shadow_strip[4] = -+ { 0.565, 0.675, 0.835, 0.945 }; - }; - -+ -+struct KStylePrivate -+{ -+ bool highcolor : 1; -+ bool useFilledFrameWorkaround : 1; -+ bool etchDisabledText : 1; -+ bool menuAltKeyNavigation : 1; -+ bool menuDropShadow : 1; -+ int popupMenuDelay; -+ float menuOpacity; -+ -+ TransparencyEngine transparencyEngine; -+ KStyle::KStyleScrollBarType scrollbarType; -+ TransparencyHandler* menuHandler; -+ KStyle::KStyleFlags flags; -+}; -+ -+ - class TransparencyHandler : public QObject - { - public: -- TransparencyHandler(KStyle* style, TransparencyEngine tEngine, float menuOpacity); -+ TransparencyHandler(KStyle* style, TransparencyEngine tEngine, -+ float menuOpacity, bool useDropShadow); - ~TransparencyHandler(); - bool eventFilter(QObject* object, QEvent* event); - -@@ -78,7 +131,12 @@ - #ifdef HAVE_XRENDER - void XRenderBlendToPixmap(const QPopupMenu* p); - #endif -+ void createShadowWindows(const QPopupMenu* p); -+ void removeShadowWindows(const QPopupMenu* p); -+ void rightShadow(QImage& dst); -+ void bottomShadow(QImage& dst); - private: -+ bool dropShadow; - float opacity; - QPixmap pix; - KStyle* kstyle; -@@ -86,21 +144,6 @@ - }; - - --struct KStylePrivate --{ -- bool highcolor : 1; -- bool useFilledFrameWorkaround : 1; -- bool etchDisabledText : 1; -- bool menuAltKeyNavigation : 1; -- int popupMenuDelay; -- float menuOpacity; -- -- TransparencyEngine transparencyEngine; -- KStyle::KStyleScrollBarType scrollbarType; -- TransparencyHandler* menuHandler; -- KStyle::KStyleFlags flags; --}; -- - // ----------------------------------------------------------------------------- - - -@@ -118,6 +161,7 @@ - d->popupMenuDelay = settings.readNumEntry ("/KStyle/Settings/PopupMenuDelay", 256); - d->etchDisabledText = settings.readBoolEntry("/KStyle/Settings/EtchDisabledText", true); - d->menuAltKeyNavigation = settings.readBoolEntry("/KStyle/Settings/MenuAltKeyNavigation", true); -+ d->menuDropShadow = settings.readBoolEntry("/KStyle/Settings/MenuDropShadow", false); - d->menuHandler = NULL; - - if (useMenuTransparency) { -@@ -140,9 +184,14 @@ - if (d->transparencyEngine != Disabled) { - // Create an instance of the menu transparency handler - d->menuOpacity = settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90); -- d->menuHandler = new TransparencyHandler(this, d->transparencyEngine, d->menuOpacity); -+ d->menuHandler = new TransparencyHandler(this, d->transparencyEngine, -+ d->menuOpacity, d->menuDropShadow); - } - } -+ -+ // Create a transparency handler if only drop shadows are enabled. -+ if (!d->menuHandler && d->menuDropShadow) -+ d->menuHandler = new TransparencyHandler(this, Disabled, 1.0, d->menuDropShadow); - } - - -@@ -1678,57 +1727,207 @@ - // ----------------------------------------------------------------------------- - - TransparencyHandler::TransparencyHandler( KStyle* style, -- TransparencyEngine tEngine, float menuOpacity ) -+ TransparencyEngine tEngine, float menuOpacity, bool useDropShadow ) - : QObject() - { - te = tEngine; - kstyle = style; - opacity = menuOpacity; -+ dropShadow = useDropShadow; - pix.setOptimization(QPixmap::BestOptim); - }; - -- - TransparencyHandler::~TransparencyHandler() - { - }; - -+// This is meant to be ugly but fast. -+void TransparencyHandler::rightShadow(QImage& dst) -+{ -+ if (dst.depth() != 32) -+ dst = dst.convertDepth(32); -+ -+ // blend top-right corner. -+ int pixels = dst.width() * dst.height(); -+#ifdef WORDS_BIGENDIAN -+ register unsigned char* data = dst.bits() + 1; // Skip alpha -+#else -+ register unsigned char* data = dst.bits(); // Skip alpha -+#endif -+ for(register int i = 0; i < 16; i++) { -+ *data++ = (unsigned char)((*data)*top_right_corner[i]); -+ *data++ = (unsigned char)((*data)*top_right_corner[i]); -+ *data++ = (unsigned char)((*data)*top_right_corner[i]); -+ data++; // skip alpha -+ } -+ -+ pixels -= 32; // tint right strip without rounded edges. -+ register int c = 0; -+ for(register int i = 0; i < pixels; i++) { -+ *data++ = (unsigned char)((*data)*shadow_strip[c]); -+ *data++ = (unsigned char)((*data)*shadow_strip[c]); -+ *data++ = (unsigned char)((*data)*shadow_strip[c]); -+ data++; // skip alpha -+ c = ++c % 4; -+ } -+ -+ // tint bottom edge -+ for(register int i = 0; i < 16; i++) { -+ *data++ = (unsigned char)((*data)*bottom_right_corner[i]); -+ *data++ = (unsigned char)((*data)*bottom_right_corner[i]); -+ *data++ = (unsigned char)((*data)*bottom_right_corner[i]); -+ data++; // skip alpha -+ } -+} -+ -+void TransparencyHandler::bottomShadow(QImage& dst) -+{ -+ if (dst.depth() != 32) -+ dst = dst.convertDepth(32); -+ -+ int line = 0; -+ int width = dst.width() - 4; -+ double strip_data = shadow_strip[0]; -+ double* corner = const_cast<double*>(bottom_left_corner); -+ -+#ifdef WORDS_BIGENDIAN -+ register unsigned char* data = dst.bits() + 1; // Skip alpha -+#else -+ register unsigned char* data = dst.bits(); // Skip alpha -+#endif -+ -+ for(int y = 0; y < 4; y++) -+ { -+ // Bottom-left Corner -+ for(register int x = 0; x < 4; x++) { -+ *data++ = (unsigned char)((*data)*(*corner)); -+ *data++ = (unsigned char)((*data)*(*corner)); -+ *data++ = (unsigned char)((*data)*(*corner)); -+ data++; // skip alpha -+ corner++; -+ } -+ -+ // Scanline -+ for(register int x = 0; x < width; x++) { -+ *data++ = (unsigned char)((*data)*strip_data); -+ *data++ = (unsigned char)((*data)*strip_data); -+ *data++ = (unsigned char)((*data)*strip_data); -+ data++; -+ } -+ -+ strip_data = shadow_strip[++line]; -+ } -+} -+ -+// Create a shadow of thickness 4. -+void TransparencyHandler::createShadowWindows(const QPopupMenu* p) -+{ -+ int x2 = p->x()+p->width(); -+ int y2 = p->y()+p->height(); -+ QRect shadow1(x2, p->y() + 4, 4, p->height()); -+ QRect shadow2(p->x() + 4, y2, p->width() - 4, 4); -+ -+ // Create a fake drop-down shadow effect via blended Xwindows -+ ShadowElements se; -+ se.w1 = new QWidget(0, 0, WStyle_Customize | WType_Popup | WX11BypassWM ); -+ se.w2 = new QWidget(0, 0, WStyle_Customize | WType_Popup | WX11BypassWM ); -+ se.w1->setGeometry(shadow1); -+ se.w2->setGeometry(shadow2); -+ // Insert a new ShadowMap entry -+ shadowMap[p] = se; -+ -+ // Some hocus-pocus here to create the drop-shadow. -+ QPixmap pix_shadow1 = QPixmap::grabWindow(qt_xrootwin(), -+ shadow1.x(), shadow1.y(), shadow1.width(), shadow1.height()); -+ QPixmap pix_shadow2 = QPixmap::grabWindow(qt_xrootwin(), -+ shadow2.x(), shadow2.y(), shadow2.width(), shadow2.height()); -+ -+ QImage img; -+ img = pix_shadow1.convertToImage(); -+ rightShadow(img); -+ pix_shadow1.convertFromImage(img); -+ img = pix_shadow2.convertToImage(); -+ bottomShadow(img); -+ pix_shadow2.convertFromImage(img); -+ -+ // Set the background pixmaps -+ se.w1->setErasePixmap(pix_shadow1); -+ se.w2->setErasePixmap(pix_shadow2); -+ -+ // Show the 'shadow' just before showing the popup menu window -+ // Don't use QWidget::show() so we don't confuse QEffects, thus causing broken focus. -+ XMapWindow(qt_xdisplay(), se.w1->winId()); -+ XMapWindow(qt_xdisplay(), se.w2->winId()); -+} -+ -+void TransparencyHandler::removeShadowWindows(const QPopupMenu* p) -+{ -+ ShadowMap::iterator it = shadowMap.find(p); -+ if (it != shadowMap.end()) -+ { -+ ShadowElements se = it.data(); -+ XUnmapWindow(qt_xdisplay(), se.w1->winId()); // hide -+ XUnmapWindow(qt_xdisplay(), se.w2->winId()); -+ delete se.w1; -+ delete se.w2; -+ shadowMap.erase(it); -+ } -+} - - bool TransparencyHandler::eventFilter( QObject* object, QEvent* event ) - { - // Transparency idea was borrowed from KDE2's "MegaGradient" Style, - // Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org> -+ -+ // Added 'fake' menu shadows <04-Jul-2002> -- Karol - QPopupMenu* p = (QPopupMenu*)object; - QEvent::Type et = event->type(); - -- if (et == QEvent::Show) -+ if (et == QEvent::Show) - { -- pix = QPixmap::grabWindow(qt_xrootwin(), -- p->x(), p->y(), p->width(), p->height()); -+ // Handle translucency -+ if (te != Disabled) -+ { -+ pix = QPixmap::grabWindow(qt_xrootwin(), -+ p->x(), p->y(), p->width(), p->height()); - -- switch (te) { -+ switch (te) { - #ifdef HAVE_XRENDER -- case XRender: -- if (qt_use_xrender) { -- XRenderBlendToPixmap(p); -- break; -- } -- // Fall through intended -+ case XRender: -+ if (qt_use_xrender) { -+ XRenderBlendToPixmap(p); -+ break; -+ } -+ // Fall through intended - #else -- case XRender: -+ case XRender: - #endif -- case SoftwareBlend: -- blendToPixmap(p->colorGroup(), p); -- break; -+ case SoftwareBlend: -+ blendToPixmap(p->colorGroup(), p); -+ break; - -- case SoftwareTint: -- default: -- blendToColor(p->colorGroup().button()); -- }; -+ case SoftwareTint: -+ default: -+ blendToColor(p->colorGroup().button()); -+ }; - -- p->setErasePixmap(pix); -- } -+ p->setErasePixmap(pix); -+ } -+ -+ // Handle drop shadow -+ if (dropShadow && p->width() > 16 && p->height() > 16) -+ createShadowWindows(p); -+ } - else if (et == QEvent::Hide) -- p->setErasePixmap(QPixmap()); -+ { -+ // Handle drop shadow -+ if (dropShadow && p->width() > 16 && p->height() > 16) -+ removeShadowWindows(p); -+ -+ // Handle translucency -+ if (te != Disabled) -+ p->setErasePixmap(QPixmap()); -+ } - - return false; - } diff --git a/kde-base/kdelibs/kdelibs-3.1_alpha1.ebuild b/kde-base/kdelibs/kdelibs-3.1_alpha1.ebuild deleted file mode 100644 index ca589ac57d38..000000000000 --- a/kde-base/kdelibs/kdelibs-3.1_alpha1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1_alpha1.ebuild,v 1.8 2002/08/02 09:05:51 danarmak Exp $ -inherit kde kde.org -#don't inherit kde-base or kde-dist! it calls need-kde which adds kdelibs to depend! - -# check need for glib >=1.3.3 (we have 1.2.10 only; configure has no glib flag but searches for it) - -DESCRIPTION="KDE $PV - base libraries needed by all kde programs" -KEYWORDS="x86" -HOMEPAGE="http//www.kde.org/" -S=${WORKDIR}/kdelibs-3.0.6 -SLOT="3.1" -LICENSE="GPL-2 LGPL-2" - -PATCHES="${FILESDIR}/${P}-menushadows.diff" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire -# DEPEND from scratch. -DEPEND="" -RDEPEND="" -newdepend "sys-devel/perl - >=media-libs/audiofile-0.1.9 - >=sys-apps/bzip2-1.0.1 - >=dev-libs/libxslt-1.0.7 - >=dev-libs/libpcre-3.5 - >=dev-libs/libxml2-2.4.10 - ssl? ( >=dev-libs/openssl-0.9.6 ) - alsa? ( >=media-libs/alsa-lib-0.5.9 ) - cups? ( >=net-print/cups-1.1.14 ) - >=media-libs/tiff-3.5.5 - app-admin/fam-oss - ~kde-base/arts-1.0.6 - app-text/ghostscript" - -newdepend "/c" -newdepend "/autotools" - -RDEPEND="$RDEPEND - app-text/sgml-common - cups? ( net-print/cups ) - dev-lang/python" - -myconf="$myconf --enable-final --with-distribution=Gentoo --enable-libfam --enable-dnotify " - -qtver-from-kdever ${PV} -need-qt $selected_version - -set-kdedir $PV - -src_unpack() { - - base_src_unpack - kde_sandbox_patch ${S}/kio/misc/kpac - -} - -src_compile() { - - kde_src_compile myconf - - use ipv6 || myconf="$myconf --with-ipv6-lookup=no" - use ssl && myconf="$myconf --with-ssl-dir=/usr" || myconf="$myconf --without-ssl" - use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa" - use cups && myconf="$myconf --enable-cups" || myconf="$myconf --disable-cups" - - [ "$ARCH" != "ppc" ] && \ - [ "$ARCH" != "sparc" ] && [ "$ARCH" != "sparc64" ] && \ - myconf="$myconf --enable-fast-malloc=full" - - kde_src_compile configure make - -} - -src_install() { - - kde_src_install - - dohtml *.html - - dodir /etc/env.d - - if [ "$PREFIX" != "/usr/kde/3" ]; then -echo "PATH=${PREFIX}/bin:/usr/kde/3/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin:/usr/kde/3/sbin:/usr/kde/3/bin -LDPATH=${PREFIX}/lib:/usr/kde/3/lib -KDEDIRS=${PREFIX}:/usr/kde/3" > ${D}/etc/env.d/50kdelibs-${PV} - else -echo "PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${PREFIX}/lib -KDEDIRS=${PREFIX}:/usr/kde/3" > ${D}/etc/env.d/50kdelibs-${PV} - fi - - echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/55kdedir-${PV} - -} - - |