[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Inclusion of cursor themes in kdebase
From:       Marco Martin <notmart () gmail ! com>
Date:       2008-06-25 16:27:22
Message-ID: 200806251827.22553.notmart () gmail ! com
[Download RAW message or body]

On Wednesday 25 June 2008, Lubos Lunak wrote:
> On Tuesday 24 of June 2008, Marco Martin wrote:
> > Hi all,
> > the Oxygen team has completed the work for a first "shippable" version of
> > the oxygen mouse cursor theme, we hope to be able to put it in kdebase
> > before the artwork freeze.
> > the problem with them is that xcursor is a bit stupid and searches them
> > in some hardcoded paths plus the environment variable XCURSOR_PATH, so
> > since they should be installed in the icons folder that can also be
> > not /usr/share/icons where it searches by default the env path must be
> > set
> >
> > so i made a patch to the startkde script that sets the search path to
> > `kde4-config --path icon` plus the standard hardcoded ones (i know it's
> > ugly but otherwise it would not search in them anymore)
>
>  It is also broken, because that resets any possibly previously set
> $XCURSOR_PATH value.
>
>  And the other thing that it breaks is the work done to prevent loading of
> any KDE libraries before the splash (for a visually better login sequence).
> See the two last startkde.cmake commits for the same story.

What about this one?
it's not reeally pretty to see, but now it uses CMAKE_INSTALL_PREFIX var, so 
gets written in the script (should resolve the library loading issue?) and an 
eventual old $XCURSOR_PATH gets appended.
the export of the var is written in startkde only if the prefix is not /usr, 
so in that case an extra uglyness is avoided.
the cmake file becomes a bit ugly but is perhaps the less painful way? 
somebody has a better idea? (kinda need one, eheh :))
on another note, the setting of a default one gets apparently ignored when set 
as in last patch in kglobalsettings.cpp but it works if it's put in startkde 
as this patch, it this uhm, right?

Cheers,
Marco Martin





["startkde_xcursors2.diff" (text/x-diff)]

Index: startkde.cmake
===================================================================
--- startkde.cmake	(revision 824255)
+++ startkde.cmake	(working copy)
@@ -75,7 +75,7 @@
 mkdir -m 700 -p $kdehome/share
 mkdir -m 700 -p $kdehome/share/config
 cat >$kdehome/share/config/startupconfigkeys <<EOF
-kcminputrc Mouse cursorTheme ''
+kcminputrc Mouse cursorTheme 'Oxygen_Black'
 kcminputrc Mouse cursorSize ''
 ksplashrc KSplash Theme Default
 ksplashrc KSplash Engine KSplashX
@@ -96,6 +96,8 @@
 
 # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
 if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; \
then +    @EXPORT_XCURSOR_PATH@
+
     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
     if test $? -eq 10; then
         XCURSOR_THEME=default
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 824255)
+++ CMakeLists.txt	(working copy)
@@ -20,6 +20,9 @@
 if (NOT WIN32)
     configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
     configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+    if (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
+        set(EXPORT_XCURSOR_PATH "export \
XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"")
 +    endif (NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
     configure_file (startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde  @ONLY)
     configure_file (safestartkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/safestartkde  \
@ONLY)  endif (NOT WIN32)



>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]