Compare commits
1 Commits
0.12.10
...
debian-tes
| Author | SHA1 | Date | |
|---|---|---|---|
|
ed05f21f8c |
@@ -1,66 +0,0 @@
|
||||
# works with clang-format-3.7
|
||||
#
|
||||
# Most controversial fields are UseTab, IndentWidth, ContinuationIndentWidth, ColumnLimit, BreakBeforeBraces
|
||||
|
||||
#BasedOnStyle: Google
|
||||
AccessModifierOffset: 0
|
||||
AlignAfterOpenBracket: true
|
||||
AlignConsecutiveAssignments: false
|
||||
#AlignConsecutiveDeclarations: false
|
||||
AlignEscapedNewlinesLeft: true
|
||||
AlignOperands: true
|
||||
AlignTrailingComments: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: false
|
||||
AllowShortBlocksOnASingleLine: false
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: Empty
|
||||
AllowShortIfStatementsOnASingleLine: false
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
AlwaysBreakAfterDefinitionReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: false
|
||||
BinPackArguments: false
|
||||
BinPackParameters: false
|
||||
BreakBeforeBinaryOperators: None
|
||||
BreakBeforeBraces: Linux
|
||||
BreakBeforeTernaryOperators: true
|
||||
BreakConstructorInitializersBeforeComma: false
|
||||
ColumnLimit: 120
|
||||
CommentPragmas: ''
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: true
|
||||
ConstructorInitializerIndentWidth: 0
|
||||
ContinuationIndentWidth: 4
|
||||
Cpp11BracedListStyle: true
|
||||
DerivePointerAlignment: false
|
||||
DerivePointerBinding: false
|
||||
DisableFormat: false
|
||||
ForEachMacros: ['foreach']
|
||||
IndentCaseLabels: false
|
||||
IndentFunctionDeclarationAfterType: false
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: false
|
||||
Language: Cpp
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: None
|
||||
ObjCSpaceAfterProperty: true
|
||||
ObjCSpaceBeforeProtocolList: true
|
||||
PenaltyBreakBeforeFirstCallParameter: 1000
|
||||
PenaltyBreakComment: 100
|
||||
PenaltyBreakFirstLessLess: 0
|
||||
PenaltyBreakString: 100
|
||||
PenaltyExcessCharacter: 100
|
||||
PenaltyReturnTypeOnItsOwnLine: 2000
|
||||
PointerAlignment: Right
|
||||
SpaceAfterCStyleCast: false
|
||||
SpaceBeforeAssignmentOperators: true
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceInEmptyParentheses: false
|
||||
SpacesBeforeTrailingComments: 1
|
||||
SpacesInAngles: false
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInContainerLiterals: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: Cpp11
|
||||
TabWidth: 4
|
||||
UseTab: ForIndentation
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +0,0 @@
|
||||
build
|
||||
*.user
|
||||
version.h
|
||||
27
AUTHORS
27
AUTHORS
@@ -1,15 +1,14 @@
|
||||
|
||||
tint2 is developped by :
|
||||
- Thierry Lorthiois <lorthiois@bbsoft.fr> from Omega distribution
|
||||
- Andreas Fink <andreas.fink85@googlemail.com>
|
||||
- Euan Freeman <euan04@gmail.com> (tintwizard)
|
||||
- Christian Ruppert <Spooky85@gmail.com> (autotools build system)
|
||||
- Ovidiu M <mrovi9000 at gmail.com> : launcher, bug fixes
|
||||
- Mishael A Sibiryakov (death@junki.org) : freespace
|
||||
- Sebastian Reichel <sre@ring0.de> : battery, various fixes, debian package maintainer
|
||||
|
||||
tint2 is based on the ttm source code (http://code.google.com/p/ttm/)
|
||||
tint2 is based on ttm source code (http://code.google.com/p/ttm/)
|
||||
- 2007-2008 Pål Staurland <staura@gmail.com>
|
||||
|
||||
|
||||
Contributors:
|
||||
Kwaku Yeboah <kwakuyeboah@gmail.com> : wiki page
|
||||
Daniel Moerner <dmoerner@gmail.com> : man page and debian package
|
||||
@@ -17,23 +16,5 @@ Contributors:
|
||||
James Buren <ryuo@frugalware.org> : Frugalware package
|
||||
Pierre-Emmanuel Andre <pea@raveland.org> : openbsd port
|
||||
Redroar : arch package
|
||||
Rene Garcia <garciamx@gmail.com> : launcher SVG support
|
||||
Marcelo Vianna : taskbar sorting
|
||||
Xico Atelo : startup notifications
|
||||
Craig Oakes : WM flags, issue tracker organization
|
||||
Jeff Blake (https://gitlab.com/u/berkley4) : more mouse event handlers
|
||||
Vladimir <vladimir-csp@yandex.ru> : translations, bug reports
|
||||
|
||||
Translations:
|
||||
Bosnian:
|
||||
Dino Duratović <dinomol@mail.com>
|
||||
Croatian:
|
||||
Dino Duratović <dinomol@mail.com>
|
||||
French:
|
||||
Jocelyn <anechampenois@solydxk.com>
|
||||
The Bento team <meets@gmx.fr>
|
||||
Wagner <https://gitlab.com/u/wagmic>
|
||||
Polish:
|
||||
Daniel Napora <napcok@gmail.com>
|
||||
Serbian:
|
||||
Dino Duratović <dinomol@mail.com>
|
||||
|
||||
|
||||
181
CMakeLists.txt
181
CMakeLists.txt
@@ -1,21 +1,8 @@
|
||||
project( tint2 )
|
||||
cmake_minimum_required( VERSION 2.6 )
|
||||
|
||||
option( ENABLE_BATTERY "Enable battery status plugin" ON )
|
||||
option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON )
|
||||
option( ENABLE_EXTRA_THEMES "Install additional tint2 themes" ON )
|
||||
option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
|
||||
option( ENABLE_SN "Startup notification support" ON )
|
||||
option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF )
|
||||
option( ENABLE_BACKTRACE "Dump a backtrace in case of fatal errors (e.g. X11 I/O error)" OFF )
|
||||
option( ENABLE_BACKTRACE_ON_SIGNAL "Dump a backtrace also when receiving signals such as SIGSEGV" OFF )
|
||||
if( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
|
||||
option( ENABLE_UEVENT "Kernel event handling support" ON )
|
||||
endif( CMAKE_SYSTEM_NAME STREQUAL "Linux" )
|
||||
|
||||
include( FindPkgConfig )
|
||||
include( CheckLibraryExists )
|
||||
include( CheckCSourceCompiles )
|
||||
pkg_check_modules( X11 REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 )
|
||||
pkg_check_modules( PANGOCAIRO REQUIRED pangocairo )
|
||||
pkg_check_modules( PANGO REQUIRED pango )
|
||||
@@ -23,59 +10,20 @@ pkg_check_modules( CAIRO REQUIRED cairo )
|
||||
pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
|
||||
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
|
||||
pkg_check_modules( IMLIB2 REQUIRED imlib2>=1.4.2 )
|
||||
|
||||
if(ENABLE_BACKTRACE)
|
||||
check_c_source_compiles(
|
||||
"#include <stdlib.h>\n#include <execinfo.h>\nint main () { backtrace(NULL, 0); }"
|
||||
BACKTRACE_LIBC)
|
||||
|
||||
if(BACKTRACE_LIBC)
|
||||
set(BACKTRACE_LIBC_FOUND TRUE)
|
||||
set(BACKTRACE_L_FLAGS "-rdynamic")
|
||||
else()
|
||||
pkg_check_modules( UNWIND libunwind )
|
||||
find_library(EXECINFO_LIBRARIES NAMES execinfo)
|
||||
if(EXECINFO_LIBRARIES OR EXECINFO_LIBRARIES_FOUND)
|
||||
set(EXECINFO_FOUND TRUE)
|
||||
set(EXECINFO_LIBRARIES "-lexecinfo")
|
||||
set(BACKTRACE_L_FLAGS "-rdynamic")
|
||||
else()
|
||||
set(EXECINFO_LIBRARIES "")
|
||||
set(BACKTRACE_L_FLAGS "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if( NOT BACKTRACE_LIBC_FOUND AND NOT UNWIND_FOUND AND NOT EXECINFO_FOUND )
|
||||
message( WARNING "Backtrace support not available. You can enable it by installing libexecinfo or libunwind." )
|
||||
endif()
|
||||
else()
|
||||
set(EXECINFO_LIBRARIES "")
|
||||
set(BACKTRACE_L_FLAGS "")
|
||||
endif()
|
||||
|
||||
if( ENABLE_RSVG )
|
||||
pkg_check_modules( RSVG librsvg-2.0>=2.14.0 )
|
||||
endif( ENABLE_RSVG )
|
||||
|
||||
if( ENABLE_SN )
|
||||
pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
|
||||
endif(ENABLE_SN)
|
||||
|
||||
find_library( RT_LIBRARY rt )
|
||||
|
||||
if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
|
||||
message( FATAL_ERROR "Not all dependencies fulfilled. See https://gitlab.com/o9000/tint2/wikis/Install" )
|
||||
message( FATAL_ERROR "Not all dependencies fulfilled. See http://code.google.com/p/tint2/wiki/Install" )
|
||||
endif( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
|
||||
|
||||
string( REPLACE ";" " " FLAGS_REPLACED "${IMLIB2_LDFLAGS}" )
|
||||
set( CMAKE_REQUIRED_FLAGS "${FLAGS_REPLACED}" )
|
||||
check_library_exists( "${IMLIB2_LIBRARIES}" "imlib_context_set_display" "${IMLIB2_LIBRARY_DIRS}" IMLIB_BUILD_WITH_X )
|
||||
if( NOT IMLIB_BUILD_WITH_X )
|
||||
message( FATAL_ERROR "Imlib is not built with X support" )
|
||||
message( FATAL_ERROR "Imlib is not build with x support" )
|
||||
endif( NOT IMLIB_BUILD_WITH_X )
|
||||
|
||||
add_definitions( -D_GNU_SOURCE )
|
||||
|
||||
include_directories( ${PROJECT_BINARY_DIR}
|
||||
src
|
||||
src/battery
|
||||
@@ -85,8 +33,6 @@ include_directories( ${PROJECT_BINARY_DIR}
|
||||
src/launcher
|
||||
src/tooltip
|
||||
src/util
|
||||
src/execplugin
|
||||
src/freespace
|
||||
${X11_INCLUDE_DIRS}
|
||||
${PANGOCAIRO_INCLUDE_DIRS}
|
||||
${PANGO_INCLUDE_DIRS}
|
||||
@@ -94,8 +40,7 @@ include_directories( ${PROJECT_BINARY_DIR}
|
||||
${GLIB2_INCLUDE_DIRS}
|
||||
${GOBJECT2_INCLUDE_DIRS}
|
||||
${IMLIB2_INCLUDE_DIRS}
|
||||
${RSVG_INCLUDE_DIRS}
|
||||
${SN_INCLUDE_DIRS} )
|
||||
${SN_INCLUDE_DIRS} )
|
||||
|
||||
set( SOURCES src/config.c
|
||||
src/panel.c
|
||||
@@ -104,83 +49,36 @@ set( SOURCES src/config.c
|
||||
src/clock/clock.c
|
||||
src/systray/systraybar.c
|
||||
src/launcher/launcher.c
|
||||
src/launcher/apps-common.c
|
||||
src/launcher/icon-theme-common.c
|
||||
src/launcher/xsettings-client.c
|
||||
src/launcher/xsettings-common.c
|
||||
src/taskbar/task.c
|
||||
src/taskbar/taskbar.c
|
||||
src/taskbar/taskbarname.c
|
||||
src/tooltip/tooltip.c
|
||||
src/execplugin/execplugin.c
|
||||
src/freespace/freespace.c
|
||||
src/util/area.c
|
||||
src/util/common.c
|
||||
src/util/strnatcmp.c
|
||||
src/util/timer.c
|
||||
src/util/cache.c
|
||||
src/util/window.c )
|
||||
|
||||
if( ENABLE_BATTERY )
|
||||
set( SOURCES ${SOURCES} src/battery/battery.c)
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set( SOURCES ${SOURCES} src/battery/linux.c)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "DragonFly")
|
||||
set( SOURCES ${SOURCES} src/battery/freebsd.c)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
set( SOURCES ${SOURCES} src/battery/freebsd.c)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
|
||||
set( SOURCES ${SOURCES} src/battery/openbsd.c)
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
|
||||
set( SOURCES ${SOURCES} src/battery/openbsd.c)
|
||||
else(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set( SOURCES ${SOURCES} src/battery/dummy.c)
|
||||
endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
|
||||
add_definitions( -DENABLE_BATTERY )
|
||||
endif( ENABLE_BATTERY )
|
||||
|
||||
if( ENABLE_RSVG )
|
||||
if( RSVG_FOUND )
|
||||
add_definitions( -DHAVE_RSVG )
|
||||
else()
|
||||
message( FATAL_ERROR "SVG support enabled yet dependency not fulfilled: librsvg-2.0" )
|
||||
endif( RSVG_FOUND )
|
||||
endif( ENABLE_RSVG )
|
||||
|
||||
option( ENABLE_BATTERY "Enable battery status plugin" ON )
|
||||
option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme switcher for tint2" ON )
|
||||
option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
|
||||
option( ENABLE_SN "Startup notification support" OFF )
|
||||
if( ENABLE_SN )
|
||||
if( SN_FOUND )
|
||||
add_definitions( -DHAVE_SN -DSN_API_NOT_YET_FROZEN )
|
||||
else()
|
||||
message( FATAL_ERROR "Startup notification support enabled yet dependency not fulfilled: libstartup-notification-1.0" )
|
||||
endif( SN_FOUND )
|
||||
endif( ENABLE_SN)
|
||||
|
||||
if( ENABLE_UEVENT )
|
||||
add_definitions( -DENABLE_UEVENT )
|
||||
set( SOURCES ${SOURCES} src/util/uevent.c)
|
||||
endif( ENABLE_UEVENT )
|
||||
if( ENABLE_BATTERY )
|
||||
set( SOURCES ${SOURCES} src/battery/battery.c )
|
||||
add_definitions( -DENABLE_BATTERY )
|
||||
endif( ENABLE_BATTERY )
|
||||
|
||||
if(ENABLE_BACKTRACE)
|
||||
if(BACKTRACE_LIBC_FOUND)
|
||||
add_definitions( -DENABLE_EXECINFO )
|
||||
endif()
|
||||
|
||||
if( UNWIND_FOUND )
|
||||
add_definitions( -DENABLE_LIBUNWIND )
|
||||
endif( UNWIND_FOUND )
|
||||
|
||||
if( EXECINFO_FOUND )
|
||||
add_definitions( -DENABLE_EXECINFO )
|
||||
endif( EXECINFO_FOUND )
|
||||
|
||||
if(ENABLE_BACKTRACE_ON_SIGNAL)
|
||||
add_definitions( -DBACKTRACE_ON_SIGNAL )
|
||||
endif()
|
||||
else()
|
||||
add_definitions( -DDISABLE_BACKTRACE )
|
||||
endif()
|
||||
set( MANDIR share/man CACHE PATH "Directory for man pages" )
|
||||
set( DATADIR share CACHE PATH "Directory for shared data" )
|
||||
set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
|
||||
set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
|
||||
|
||||
if( ENABLE_TINT2CONF )
|
||||
add_definitions( -DHAVE_VERSION_H )
|
||||
@@ -188,20 +86,7 @@ if( ENABLE_TINT2CONF )
|
||||
add_dependencies( tint2conf version )
|
||||
endif( ENABLE_TINT2CONF )
|
||||
|
||||
if( ENABLE_ASAN )
|
||||
SET(ASAN_C_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic -Wshadow")
|
||||
SET(ASAN_L_FLAGS " -O0 -g3 -gdwarf-2 -fsanitize=address -fno-common -fno-omit-frame-pointer -rdynamic ")
|
||||
else()
|
||||
SET(ASAN_C_FLAGS "")
|
||||
SET(ASAN_L_FLAGS "")
|
||||
endif()
|
||||
|
||||
set( MANDIR share/man CACHE PATH "Directory for man pages" )
|
||||
set( DATADIR share CACHE PATH "Directory for shared data" )
|
||||
set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
|
||||
set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" )
|
||||
|
||||
add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" )
|
||||
add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_svnrev.sh" "\"${PROJECT_SOURCE_DIR}\"" )
|
||||
|
||||
link_directories( ${X11_LIBRARY_DIRS}
|
||||
${PANGOCAIRO_LIBRARY_DIRS}
|
||||
@@ -210,8 +95,7 @@ link_directories( ${X11_LIBRARY_DIRS}
|
||||
${GLIB2_LIBRARY_DIRS}
|
||||
${GOBJECT2_LIBRARY_DIRS}
|
||||
${IMLIB2_LIBRARY_DIRS}
|
||||
${RSVG_LIBRARY_DIRS}
|
||||
${SN_LIBRARY_DIRS} )
|
||||
${SN_LIBRARY_DIRS} )
|
||||
add_executable(tint2 ${SOURCES})
|
||||
target_link_libraries( tint2 ${X11_LIBRARIES}
|
||||
${PANGOCAIRO_LIBRARIES}
|
||||
@@ -219,33 +103,22 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
|
||||
${CAIRO_LIBRARIES}
|
||||
${GLIB2_LIBRARIES}
|
||||
${GOBJECT2_LIBRARIES}
|
||||
${IMLIB2_LIBRARIES}
|
||||
${UNWIND_LIBRARIES}
|
||||
${EXECINFO_LIBRARIES} )
|
||||
if( ENABLE_RSVG )
|
||||
target_link_libraries( tint2 ${RSVG_LIBRARIES} )
|
||||
endif( ENABLE_RSVG )
|
||||
if( ENABLE_SN )
|
||||
target_link_libraries( tint2 ${SN_LIBRARIES} )
|
||||
endif( ENABLE_SN )
|
||||
${IMLIB2_LIBRARIES}
|
||||
${SN_LIBRARIES} )
|
||||
if( RT_LIBRARY )
|
||||
target_link_libraries( tint2 ${RT_LIBRARY} )
|
||||
endif( RT_LIBRARY )
|
||||
|
||||
target_link_libraries( tint2 m )
|
||||
|
||||
add_dependencies( tint2 version )
|
||||
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 ${ASAN_C_FLAGS}" )
|
||||
set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasing ${ASAN_L_FLAGS} ${BACKTRACE_L_FLAGS}" )
|
||||
set_target_properties( tint2 PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
|
||||
set_target_properties(tint2 PROPERTIES LINK_FLAGS "-pthread" )
|
||||
|
||||
install( TARGETS tint2 DESTINATION bin )
|
||||
install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
|
||||
install( FILES tint2.desktop DESTINATION ${DATADIR}/applications )
|
||||
install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
|
||||
install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
|
||||
install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
|
||||
install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 )
|
||||
install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} )
|
||||
install( FILES AUTHORS ChangeLog README DESTINATION ${DOCDIR} )
|
||||
install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 )
|
||||
if( ENABLE_EXTRA_THEMES )
|
||||
add_subdirectory(themes)
|
||||
endif( ENABLE_EXTRA_THEMES )
|
||||
if( ENABLE_EXAMPLES )
|
||||
file( GLOB SAMPLEFILES sample/*.tint2rc )
|
||||
install( FILES ${SAMPLEFILES} DESTINATION ${DOCDIR}/examples )
|
||||
endif( ENABLE_EXAMPLES )
|
||||
|
||||
238
ChangeLog
238
ChangeLog
@@ -1,239 +1,3 @@
|
||||
2016-05-07 0.12.10
|
||||
- Fixes:
|
||||
- Fixed crash in systray with non-Latin languagess (thanks zcodes)
|
||||
- Invalidate cached pixmaps on resize/move (issue #576)
|
||||
- Battery: do not show negative durations when the sensors return garbage
|
||||
- Proper workaround for issue #555
|
||||
|
||||
2016-04-02 0.12.9
|
||||
- Fixes:
|
||||
- Regression: Do not detect empty areas as clickable (issue #572)
|
||||
- Regression: Position and resize task icon correctly (issue #575)
|
||||
- Use imlib2 for taking screenshot; if it fails, use Xlib (issue #574)
|
||||
- Battery: lower sample frequency when there is no support for reading current/power
|
||||
|
||||
2016-03-25 0.12.8
|
||||
- Major changes (see details below):
|
||||
- Icon cache and lazy icon theme loading to improve performance in tint2 and tint2conf
|
||||
- Extra tint2rc themes are installed to /usr/share/tint2 and available in tint2conf
|
||||
- Tint2conf GUI improvements
|
||||
- Config options with changed behavior:
|
||||
- The launcher now also allows launcher_item_app entries without a full path.
|
||||
In this case the .desktop file is searched in the standard application directories (issue #565).
|
||||
- If the panel size is given as a percentage and a non-zero margin is also specified,
|
||||
the size is now computed as a fraction of the available size (i.e. monitor size - margin).
|
||||
Before it was computed as a fraction of the monitor size first, then the margin was subtracted from the value, which
|
||||
was not intuitive (issue #559).
|
||||
- Fixes:
|
||||
- Taskbar icons are now resized correctly for certain geometries (issue #560)
|
||||
- Fix get_version.sh so that it returns the correct version when .git is missing
|
||||
- Fix build on powerpc
|
||||
- Temporary files are now created in /tmp
|
||||
- The XDG paths are now used in the icon and application lookup in addition to the hardcoded defaults
|
||||
- Brigtness adjustments no longer distort colors
|
||||
- Fixed race in sorting systray icons by name
|
||||
- Fixed desktop entry parsing (issue #570)
|
||||
- tint2conf:
|
||||
- Applications are now sorted correctly
|
||||
- Avoid duplicate icon themes due to symlinks
|
||||
- Avoid loading desktop files marked as NoDisplay
|
||||
- Enhancements:
|
||||
- Launcher icon paths are now cached, which greatly improves loading time for tint2 and tint2conf.
|
||||
The correct icon should be found even if you change the icon theme or install a new theme.
|
||||
If this is not the case, delete the file ~/.cache/tint2/icon.cache, restart tint2 and please file a bug report
|
||||
indicating the application name and the icon theme name.
|
||||
- Fallback icon themes are loaded lazily to speed up tint2 and tint2conf startup
|
||||
- A better Name and GenericName is used in the tint2 and tint2conf .desktop files
|
||||
- tint2conf:
|
||||
- Allows selection of themes from /usr/share
|
||||
- Menu reorganization (thanks @Vladimir-csp for feedback)
|
||||
- Icon themes are now sorted in the displayed list
|
||||
- Updated ru translation (thanks @Vladimir-csp)
|
||||
|
||||
2016-01-29 0.12.7
|
||||
- Fixes:
|
||||
- Fix crash caused by race when reading inconsistent values for _NET_CURRENT_DESKTOP and _NET_NUMBER_OF_DESKTOPS
|
||||
- Fix regression (all desktop tasks not working)
|
||||
- Fix small memory leak in launcher
|
||||
|
||||
2016-01-25 0.12.6
|
||||
- Fixes:
|
||||
- Fix crash on 32-bit systems (issue #546)
|
||||
- Fix compilation on Slackware (issue #547)
|
||||
- Terminal color reset code moved to the same line to prevent interference with logging (issue #545)
|
||||
- Enhancements:
|
||||
- Executor now sends click coordinates via environment variables (issue #544)
|
||||
|
||||
2016-01-24 0.12.5
|
||||
- Fixes:
|
||||
- Fix rendering corruption triggered occasionally when the compositor is disabled (regression in 0.12.4)
|
||||
|
||||
2016-01-23 0.12.4
|
||||
- Enhancements:
|
||||
- Support for NETWM viewports (as used by Compiz or Unity) (issue #94)
|
||||
- The default desktop font (Gtk/FontName from XSettings) is used when a font is not specified in the config file
|
||||
- When no fonts are specified in the config, tint2 picks up the default font of the desktop environment via XSettings
|
||||
- Tint2 is now able to dump a stack trace to stderr and ~/.tint2-crash.log in case of a crash.
|
||||
If the cmake flag ENABLE_BACKTRACE is set, stack traces are dumped on X11 I/O errors.
|
||||
If the cmake flag ENABLE_BACKTRACE_ON_SIGNAL is set, stack traces are dumped also on signals such as SIGSEGV.
|
||||
Both ENABLE_BACKTRACE and ENABLE_BACKTRACE_ON_SIGNAL are disabled by default.
|
||||
- Pixmaps are cached instead of always redrawn between different button states when mouse effects are enabled,
|
||||
to improve performance
|
||||
- Tooltips are no longer very wide
|
||||
- Default config looks nicer
|
||||
- New config options:
|
||||
- Executor: new plugin that displays the output of a command in the panel (issue #161)
|
||||
- New taskbar sort order options: least-recently-used (lru), most-recently-used (mru) (issue #532)
|
||||
- Place the primary monitor before all the other monitors (primary_monitor_first, issue #538)
|
||||
- taskbar_always_show_all_desktop_tasks (issue #279)
|
||||
- Config options with changed behavior:
|
||||
- Mouse effects are enabled by default
|
||||
- Fixes:
|
||||
- Battery changes visibility correctly (issue #531)
|
||||
- Fixed rendering corruption (issue #543)
|
||||
- Reverted the window flags back to the value in 0.11 to make sure the window manager detects that tint2 is a panel
|
||||
(affected kwin, bspwm; fixes issue #537, breaks issue #455)
|
||||
- Fixed a rare crash caused by the system tray code
|
||||
- The system tray now reorders icons correctly when the icon name changes and the sorting order is configured as
|
||||
ascending or descending (affected GTK icons, which sometimes set their name late after creating the icon)
|
||||
- Tint2conf no longer copies sample themes to ~/.config
|
||||
- New optional dependencies:
|
||||
- libexecinfo on the *BSDs (only if the cmake flag ENABLE_BACKTRACE is set)
|
||||
|
||||
2015-11-12 0.12.3
|
||||
- Enhancements:
|
||||
- Battery: Multiple batteries are now supported under Linux (issue #139;
|
||||
thanks to Sebastian Reichel)
|
||||
- Battery: The time left for charging/discharging the battery is now estimated
|
||||
when the system is not able to read current data from sensors (issue #522;
|
||||
thanks to Sebastian Reichel)
|
||||
- Battery: Reacts to plug/unplug events (thanks to Sebastian Reichel)
|
||||
- tint2conf: Backgrounds now have a text label showing which panel component
|
||||
uses them, to make them easier to identify; the label is saved as a comment
|
||||
in the config file (issue #521)
|
||||
- New config options:
|
||||
- Mouse over effects (mouse_effects, background_color_hover, border_color_hover)
|
||||
- Launcher icon background (launcher_icon_background_id)
|
||||
- Enable/disable battery tooltips (battery_tooltip_enabled)
|
||||
- Fixes:
|
||||
- Updated French translation
|
||||
- The correct icon is now used in tint2.desktop (issue #523)
|
||||
- The font setting for the desktop name is no longer lost on tint2 restart
|
||||
|
||||
2015-08-11 0.12.2
|
||||
- Fixes:
|
||||
- Systray: do not move empty icons to the side, as it breaks GTK2 StatusIcon blinking (issue #515)
|
||||
- tint2conf: Fix read of panel_monitor (issue #520)
|
||||
- Fix command line argument processing (issue #516)
|
||||
- Fix battery option parsing
|
||||
|
||||
2015-08-01 0.12.1
|
||||
- Fixes:
|
||||
- Config:
|
||||
- Read config correctly when panel_items is at the end of the config file (issue #511)
|
||||
- Panel:
|
||||
- Do not use nested event loops (related: issue #509)
|
||||
- System tray:
|
||||
- Set _NET_SYSTEM_TRAY_ICON_SIZE and _NET_SYSTEM_TRAY_PADDING
|
||||
- Throttle repeated resizes (workaround for issue #509)
|
||||
- Taskbar:
|
||||
- Use consistent visibility for sticky (all desktop) windows (related: issue #279)
|
||||
- Compute monitor correctly for windows when Openbox animations are enabled (issue #511)
|
||||
- tint2conf:
|
||||
- Bad read of option panel_margin
|
||||
- New config options:
|
||||
- Battery mouse actions and clock middle click and wheel actions (thanks to Jeff Blake)
|
||||
|
||||
2015-07-12 0.12
|
||||
- Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
|
||||
offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
|
||||
already present. They are marked with '(already released by distros)'.
|
||||
- Major changes:
|
||||
- Panel:
|
||||
- Checks if a compositor is launched during the first 30 seconds after startup and if found, restarts the panel with
|
||||
transparency enabled.
|
||||
- Launcher:
|
||||
- The launcher is now considered stable
|
||||
- Enhancement: SVG icon support
|
||||
- Enhancement: more thorough search for icons
|
||||
- Configuration GUI: tint2conf
|
||||
- Experimental, testing/feedback needed
|
||||
- Icons (system tray, task buttons, launcher):
|
||||
- Changed rendering method to fix icon corruptions (please report any problems)
|
||||
- System tray:
|
||||
- Icon rendering is faster
|
||||
- Several kinds of graphical corruptions have been fixed
|
||||
- Added workaround for misbehaving applications leaving empty tray icons
|
||||
- Many bugfixes
|
||||
- New config options (see https://gitlab.com/o9000/tint2/wikis/Configure):
|
||||
- Panel:
|
||||
- panel_window_name
|
||||
- panel_items (already released by distros)
|
||||
- disable_transparency
|
||||
- Taskbar:
|
||||
- taskbar_distribute_size
|
||||
- taskbar_hide_different_monitor
|
||||
- taskbar_hide_inactive_tasks
|
||||
- taskbar_sort_order
|
||||
- taskbar_name (already released by distros)
|
||||
- task_align (already released by distros)
|
||||
- Launcher:
|
||||
- launcher* (already released by distros)
|
||||
- launcher_apps_dir (previously patched in by some distros)
|
||||
- startup_notifications
|
||||
- launcher_icon_theme_override
|
||||
- System tray:
|
||||
- systray_monitor
|
||||
- Freespace (already released by distros)
|
||||
- Config options with changed behavior:
|
||||
- Panel:
|
||||
- panel_dock: previously, 'panel_dock = 1' was actually not placing the panel into the dock. This option now
|
||||
functions correctly. Due to the fact that OpenBox forcefully draws a border around dock windows, you might want to
|
||||
set it to zero (or change the border color/style to match tint2). If you set it to zero, make sure you do not have
|
||||
reserved space at the edge of the screen in the OpenBox config.
|
||||
Reason for change: issues 257, 394, 461, 465, 481.
|
||||
- panel_layer: previously, 'panel_layer = normal' was not functioning correctly. Now it does (it requires panel_dock = 0).
|
||||
Note that in this case some compositors will draw shadows of other windows behind tint2. This can be avoided in compton
|
||||
using the option shadow-exclude-reg = "x35+0-0" where 35 should be replaced with the size of the panel.
|
||||
- font_shadow: shadows are thicker and softer, and are now applied to all text elements, not just the taskbar.
|
||||
Reason for change: legibility improved for transparent panels.
|
||||
- Launcher:
|
||||
- launcher_item_app: now it expands leading ~ to the path to the user's home directory.
|
||||
- Known issues:
|
||||
- tint2 might close unexpectedly and/or cause X to freeze on certain ATI graphics cards.
|
||||
Workaround: set 'disable_transparency = 1' in the config.
|
||||
Reference: https://gitlab.com/o9000/tint2/issues/497
|
||||
- Project hosting:
|
||||
- Migrated from https://code.google.com/p/tint2 to https://gitlab.com/o9000/tint2 and switched from svn to git
|
||||
- Bugfixes:
|
||||
- task switching from tint2 using the mouse wheel (mouse_scroll_up = prev_task and mouse_scroll_down = next_task) with
|
||||
multiple desktops and taskbar_mode = multi_desktop when hovering over the first/last window in the taskbar was broken;
|
||||
also when a window is set to appear on all desktops;
|
||||
- the launcher was not loading an icon if the icon theme was not providing it in a size close to the value of launcher_icon_size;
|
||||
- the launcher was not loading an icon if the extension was incorrect (e.g. file contents were PNG but the file name
|
||||
had extension SVG);
|
||||
- some launcher icons (PNG files saved with an indexed colormap and alpha mask) were sometimes rendered with white instead of
|
||||
transparency;
|
||||
- icons looked washed out when the panel was very transparent;
|
||||
- the panel border was rendered in the background of every systray icon; sometimes systray icons were rendered in the
|
||||
background of other icons;
|
||||
- a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
|
||||
number of empty icons in the system tray;
|
||||
- a crash caused by the system tray code on computers with ATI cards;
|
||||
- the panel window had a shadow;
|
||||
- some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
|
||||
- the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after
|
||||
suspend with the battery unplugged);
|
||||
- crashed caused by incomplete or malformed config files;
|
||||
- with the fvwm window manager, the window title was sometimes not displayed correctly if it changed right after an
|
||||
application was started;
|
||||
- seconds were not updating in the clock;
|
||||
- tint2 hang triggered when an application started from the launcher was closed and startup notifications were enabled;
|
||||
- tint2 may fail to process X events for a few seconds when a new icon is added to the system tray;
|
||||
- the code that loads SVG icons was using a lot of memory;
|
||||
- fixed occasional race at startup in detecting screen resolution changes;
|
||||
- modified timer code to prevent some rare double-frees or duplicate timers.
|
||||
|
||||
2010-06-26
|
||||
- unhide tint2 panel when dragging something
|
||||
- battery FreeBSD uses the new ACPI API (thx to yamagi.burmeister)
|
||||
@@ -819,3 +583,5 @@ released tint-0.2
|
||||
2008-04-22
|
||||
- fork ttm projet from p://code.google.com/p/ttm/ (by Pål Staurland staura@gmail.com)
|
||||
while the projet is no longer in developpement, have not changed the name of 'tint'.
|
||||
|
||||
|
||||
|
||||
@@ -7,4 +7,5 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr ../
|
||||
make
|
||||
sudo make install
|
||||
|
||||
To see additional options you can set at the 'cmake' step, run 'cmake -L ../'
|
||||
To see additional options you can do after the cmake step a 'cmake -L ../'
|
||||
|
||||
|
||||
10
README
Normal file
10
README
Normal file
@@ -0,0 +1,10 @@
|
||||
---------------------------------------------------------
|
||||
execute "tint2"
|
||||
or "tint2 -c path_to_config_file"
|
||||
|
||||
|
||||
check http://code.google.com/p/tint2/
|
||||
for latest release, documentation and sample config file.
|
||||
|
||||
|
||||
|
||||
78
README.md
78
README.md
@@ -1,78 +0,0 @@
|
||||
# Latest stable release: 0.12.10
|
||||
Changes: https://gitlab.com/o9000/tint2/blob/0.12.10/ChangeLog
|
||||
|
||||
Documentation: https://gitlab.com/o9000/tint2/wikis/Configure
|
||||
|
||||
Compile it with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
|
||||
```
|
||||
git clone https://gitlab.com/o9000/tint2.git
|
||||
cd tint2
|
||||
git checkout 0.12.10
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
make -j4
|
||||
```
|
||||
|
||||
To install, run (as root):
|
||||
```
|
||||
make install
|
||||
```
|
||||
|
||||
And then you can run the panel `tint2` and the configuration program `tint2conf`.
|
||||
|
||||
Please report any problems to https://gitlab.com/o9000/tint2/issues. Your feedback is much appreciated.
|
||||
|
||||
P.S. GitLab is now the official location of the tint2 project, migrated from Google Code, which is shutting down. In case you are wondering why not GitHub, BitBucket etc., we chose GitLab because it is open source, it is mature and works well, looks cool and has a very nice team.
|
||||
|
||||
# What is tint2?
|
||||
|
||||
tint2 is a simple panel/taskbar made for modern X window managers. It was specifically made for Openbox but it should also work with other window managers (GNOME, KDE, XFCE etc.). It is based on ttm http://code.google.com/p/ttm/.
|
||||
|
||||
# Features
|
||||
|
||||
* Panel with taskbar, system tray, clock and launcher icons;
|
||||
* Easy to customize: color/transparency on fonts, icons, borders and backgrounds;
|
||||
* Pager like capability: move tasks between workspaces (virtual desktops), switch between workspaces;
|
||||
* Multi-monitor capability: create one panel per monitor, showing only the tasks from the current monitor;
|
||||
* Customizable mouse events.
|
||||
|
||||
# Goals
|
||||
|
||||
* Be unintrusive and light (in terms of memory, CPU and aesthetic);
|
||||
* Follow the freedesktop.org specifications;
|
||||
* Make certain workflows, such as multi-desktop and multi-monitor, easy to use.
|
||||
|
||||
# I want it!
|
||||
|
||||
* [Install tint2](https://gitlab.com/o9000/tint2/wikis/Install)
|
||||
|
||||
# How do I ...
|
||||
|
||||
* [Install](https://gitlab.com/o9000/tint2/wikis/Install)
|
||||
* [Configure](https://gitlab.com/o9000/tint2/wikis/Configure)
|
||||
* [Add applet not supported by tint2](https://gitlab.com/o9000/tint2/wikis/ThirdPartyApplets)
|
||||
* [Other frequently asked questions](https://gitlab.com/o9000/tint2/wikis/FAQ)
|
||||
* [Obtain a stack trace when tint2 crashes](https://gitlab.com/o9000/tint2/wikis/Debug)
|
||||
|
||||
# How can I help out?
|
||||
|
||||
* Report bugs and ask questions on the [issue tracker](https://gitlab.com/o9000/tint2/issues);
|
||||
* Contribute to the development by helping us fix bugs and suggesting new features.
|
||||
|
||||
# Links
|
||||
* Home page: https://gitlab.com/o9000/tint2
|
||||
* Git repository: https://gitlab.com/o9000/tint2.git
|
||||
* Documentation: https://gitlab.com/o9000/tint2/wikis/home
|
||||
* Downloads: https://gitlab.com/o9000/tint2-archive/tree/master or https://code.google.com/p/tint2/downloads/list
|
||||
* Old project location (inactive): https://code.google.com/p/tint2
|
||||
|
||||
# Screenshots
|
||||
|
||||
## Default config:
|
||||
|
||||
|
||||
|
||||
## Various configs:
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
DEPENDENCIES:
|
||||
cairo (with X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage, imlib2 (with X support)
|
||||
you might need -dev packages on Debian
|
||||
cairo (whit X support), pango, glib2, libX11, libXinerama, libXrandr, libXrender, libXcomposite, libXdamage imlib2 (with X support)
|
||||
you might need -dev packages on debian
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
.\" First parameter, NAME, should be all caps
|
||||
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
||||
.\" other parameters are allowed: see man(7), man(1)
|
||||
.TH TINT2 1 "2015-07-05"
|
||||
.TH TINT2 1 "2009-01-17"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
@@ -37,7 +37,7 @@ compliance with freedesktop specifications.
|
||||
.PP
|
||||
On the first startup tint2 creates a config file in $HOME/.config/tint2/tint2rc.
|
||||
.PP
|
||||
See the wiki page at https://gitlab.com/o9000/tint2/wikis/home for more information.
|
||||
See wiki page on http://code.google.com/p/tint2/wiki/Welcome for more information.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-c config-file
|
||||
|
||||
27
get_svnrev.sh
Executable file
27
get_svnrev.sh
Executable file
@@ -0,0 +1,27 @@
|
||||
#!/bin/sh
|
||||
|
||||
FALLBACK=\"0.11-svn\"
|
||||
|
||||
if [ $# -eq 0 ]; then
|
||||
DIR=.
|
||||
else
|
||||
DIR=$1
|
||||
fi
|
||||
|
||||
if [ -f version.h ]; then
|
||||
REV_OLD=$(cat version.h | cut -d" " -f3)
|
||||
else
|
||||
REV_OLD=\"\"
|
||||
fi
|
||||
|
||||
if [ -x "$(which svnversion 2>/dev/null)" -a -d "${DIR}/.svn" ] ; then
|
||||
REV=\"$(svnversion -n ${DIR})\"
|
||||
else
|
||||
REV=${FALLBACK}
|
||||
fi
|
||||
|
||||
if [ ${REV_OLD} != ${REV} ]; then
|
||||
echo "Building new version.h"
|
||||
echo "Rev_old: ${REV_OLD} Rev: ${REV}"
|
||||
echo "#define VERSION_STRING ${REV}" > version.h
|
||||
fi
|
||||
@@ -1,46 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
MAJOR=0.12
|
||||
DIRTY=""
|
||||
|
||||
if git status 1>/dev/null 2>/dev/null
|
||||
then
|
||||
git update-index -q --ignore-submodules --refresh
|
||||
# Disallow unstaged changes in the working tree
|
||||
if ! git diff-files --quiet --ignore-submodules --
|
||||
then
|
||||
if [ "$1" = "--strict" ]
|
||||
then
|
||||
echo >&2 "Error: there are unstaged changes."
|
||||
git diff-files --name-status -r --ignore-submodules -- >&2
|
||||
exit 1
|
||||
else
|
||||
DIRTY="-dirty"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disallow uncommitted changes in the index
|
||||
if ! git diff-index --cached --quiet HEAD --ignore-submodules --
|
||||
then
|
||||
if [ "$1" = "--strict" ]
|
||||
then
|
||||
echo >&2 "Error: there are uncommitted changes."
|
||||
git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
|
||||
exit 1
|
||||
else
|
||||
DIRTY="-dirty"
|
||||
fi
|
||||
fi
|
||||
VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY
|
||||
else
|
||||
VERSION=$(head -n 1 ChangeLog | cut -d ' ' -f 2)
|
||||
if [ $VERSION = "master" ]
|
||||
then
|
||||
VERSION=$VERSION-$(head -n 1 ChangeLog | cut -d ' ' -f 1)
|
||||
fi
|
||||
fi
|
||||
|
||||
VERSION=$(echo "$VERSION" | sed 's/^v//')
|
||||
|
||||
echo '#define VERSION_STRING "'$VERSION'"' > version.h
|
||||
echo $VERSION
|
||||
@@ -1,48 +1,23 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Usage: ./make_release.sh
|
||||
# Creates a tar.gz archive of the current tree.
|
||||
#
|
||||
# To bump the version number for the current commit (make sure you are in HEAD!), run manually:
|
||||
#
|
||||
# git tag -a v0.12 -m 'Version 0.12'
|
||||
#
|
||||
# To generate a release for an older tagged commit, first list the tags with:
|
||||
#
|
||||
# git tag
|
||||
#
|
||||
# then checkout the tagged commit with:
|
||||
#
|
||||
# git checkout tags/v0.1
|
||||
#
|
||||
# Finally, to revert to HEAD:
|
||||
#
|
||||
# git checkout master
|
||||
#
|
||||
# See more at https://gitlab.com/o9000/tint2/wikis/Development
|
||||
# usage: ./make_release.sh RELEASE_VERSION_NUMBER
|
||||
|
||||
VERSION=$(./get_version.sh --strict)
|
||||
if [ ! $? -eq 0 ]
|
||||
then
|
||||
echo >&2 "Error: get_version.sh failed!"
|
||||
exit 1
|
||||
if [[ $# -ne 1 ]]; then
|
||||
echo "usage: $0 RELEASE_VERSION_NUMBER"
|
||||
exit
|
||||
fi
|
||||
|
||||
DIR=tint2-$VERSION
|
||||
ARCHIVE=$DIR.tar.gz
|
||||
echo "Making release $DIR"
|
||||
rm -rf $DIR $ARCHIVE
|
||||
DIR=tint2-${1}
|
||||
echo "Making release ${DIR}"
|
||||
rm -Rf ${DIR}
|
||||
svn export . ${DIR} > /dev/null
|
||||
|
||||
git checkout-index --prefix=$DIR/ -a
|
||||
# delete unneeded files
|
||||
rm -f ${DIR}/configure ${DIR}/make_release.sh
|
||||
|
||||
# Delete unneeded files
|
||||
rm -f $DIR/make_release.sh
|
||||
# replace get_svnrev.sh by a simple echo command
|
||||
echo "echo \"#define VERSION_STRING \\\"${1}\\\"\" > version.h" > ${DIR}/get_svnrev.sh
|
||||
|
||||
echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
|
||||
|
||||
# Create tarball and remove the exported directory
|
||||
tar -czf $ARCHIVE $DIR
|
||||
rm -rf $DIR
|
||||
|
||||
sha1sum -b $ARCHIVE
|
||||
sha256sum -b $ARCHIVE
|
||||
# create tarball and remove the exported directory
|
||||
tar -cjf ${DIR}.tar.bz2 ${DIR}
|
||||
rm -Rf ${DIR}
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -x
|
||||
|
||||
rm -rf tint2* 2>/dev/null || true
|
||||
|
||||
if [ ! -z "$1" ]
|
||||
then
|
||||
MINOR="$1"
|
||||
else
|
||||
MINOR="1"
|
||||
fi
|
||||
|
||||
# Get version (and check that the repository is clean)
|
||||
VERSION=$(../get_version.sh --strict)
|
||||
if [ ! $? -eq 0 ]
|
||||
then
|
||||
echo >&2 "Error: get_version.sh failed!"
|
||||
exit 1
|
||||
fi
|
||||
rm -f version.h
|
||||
VERSION=$(git describe --exact-match 2>/dev/null)
|
||||
if [ $? -eq 0 ]
|
||||
then
|
||||
VERSION=$(echo "$VERSION" | sed 's/^v//')
|
||||
REPO="tint2"
|
||||
else
|
||||
VERSION="$(git show -s --pretty=format:%cI.%ct.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g').$MINOR"
|
||||
REPO="tint2-git"
|
||||
fi
|
||||
|
||||
# Export repository contents to source directory
|
||||
DIR=tint2-$VERSION
|
||||
echo "Making release $DIR"
|
||||
|
||||
pushd .
|
||||
cd ..
|
||||
git checkout-index --prefix=packaging/$DIR/ -a
|
||||
popd
|
||||
|
||||
# Update version file in source directory
|
||||
rm -f $DIR/make_release.sh
|
||||
echo "echo \"#define VERSION_STRING \\\"$VERSION\\\"\" > version.h" > $DIR/get_version.sh
|
||||
|
||||
# Copy the debian files into the source directory
|
||||
cp -r ubuntu $DIR/debian
|
||||
|
||||
for DISTRO in precise trusty wily xenial
|
||||
do
|
||||
# Cleanup from previous builds
|
||||
rm -rf tint2_$VERSION-*
|
||||
|
||||
# Update debian package changelog if necessary
|
||||
echo -e "tint2 ($VERSION-$DISTRO-1) $DISTRO; urgency=medium\n\n$(git log --pretty=format:' * %h %an (%ci) %s %d')\n -- o9000 <mrovi9000@gmail.com> $(date -R)\n" > $DIR/debian/changelog
|
||||
|
||||
# Create source tarball
|
||||
ARCHIVE=tint2_$VERSION-$DISTRO.orig.tar.gz
|
||||
rm -rf $ARCHIVE
|
||||
tar -czf $ARCHIVE $DIR
|
||||
|
||||
# Build package
|
||||
KEY=$(gpg --list-secret-keys | awk '/^sec/ { print $2 }' | cut -d / -f 2)
|
||||
|
||||
pushd .
|
||||
cd $DIR
|
||||
debuild -S -k$KEY
|
||||
popd
|
||||
|
||||
# Upload package
|
||||
dput ppa:o9000/$REPO tint2_$VERSION-$DISTRO-1_source.changes
|
||||
done
|
||||
|
||||
# Cleanup
|
||||
rm -rf $DIR $ARCHIVE
|
||||
rm -rf tint2_$VERSION-*
|
||||
@@ -1,212 +0,0 @@
|
||||
tint2 (0.12.7-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
* Update Debian Standards Version to 3.9.7
|
||||
* Drop -dbg package (Debian will build -dbgsym package automatically)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Wed, 10 Feb 2016 00:42:23 +0100
|
||||
|
||||
tint2 (0.12.3-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* Fix privacy-breach-generic in documentation
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Thu, 26 Nov 2015 22:49:26 +0100
|
||||
|
||||
tint2 (0.12.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
* Drop all patches (applied upstream)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Fri, 11 Sep 2015 18:41:22 +0200
|
||||
|
||||
tint2 (0.12.1-2) unstable; urgency=medium
|
||||
|
||||
* Import upstream patch fixing bug with blinking systray icon
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Tue, 04 Aug 2015 01:16:08 +0200
|
||||
|
||||
tint2 (0.12.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Mon, 03 Aug 2015 17:03:13 +0200
|
||||
|
||||
tint2 (0.12-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release (Closes: #793797)
|
||||
- Drop 04-freespace.patch (applied upstream)
|
||||
- Drop 05-task-align.patch (needs rework)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Wed, 29 Jul 2015 18:53:03 +0200
|
||||
|
||||
tint2 (0.11+svn20121014-3) unstable; urgency=low
|
||||
|
||||
* Add some patches from upstream's bug tracker. Those are already
|
||||
used by the Debian based VSIDO distribution for some time.
|
||||
- 03-launcher_apps_dir.patch
|
||||
Add support for loading multiple launcher icons by specifing
|
||||
the directory for their *.desktop files.
|
||||
- 04-freespace.patch
|
||||
Add support for a separator panel element.
|
||||
- 05-task-align.patch, 06-sample-task-align.patch
|
||||
Add support for task alignment.
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Thu, 05 Jun 2014 17:39:43 +0200
|
||||
|
||||
tint2 (0.11+svn20121014-2) unstable; urgency=low
|
||||
|
||||
* Reintroduce tint2conf (Closes: #720200)
|
||||
* Add patch fixing argv evaluation (Closes: #716390)
|
||||
* Add patch fixing incorrect function declaration (Closes: #748171)
|
||||
* Bump Debian Standards Version to 3.9.5
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Sun, 01 Jun 2014 17:13:06 +0200
|
||||
|
||||
tint2 (0.11+svn20121014-1) unstable; urgency=low
|
||||
|
||||
* New upstream checkout (Closes: #678918)
|
||||
- Fix for no task cycling if all windows are minimized
|
||||
- Fix for incorrect task cycling when windows visible on
|
||||
all desktops are present
|
||||
- Adding startup-notification support
|
||||
- Drag and drop support for launchers
|
||||
- Localize launcher tooltips
|
||||
- Launcher: add icon lookup in ~/.local and /usr/local
|
||||
- Disable mouse hover events when the launcher tooltip
|
||||
is disabled
|
||||
* Do not install tint2conf (Closes: #672840)
|
||||
* Add libstartup-notification dependency
|
||||
* Bump Debian Standards Version to 3.9.4
|
||||
* Bump compat level to 9
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Thu, 25 Oct 2012 13:35:15 +0200
|
||||
|
||||
tint2 (0.11+svn20111022-3) unstable; urgency=low
|
||||
|
||||
* Update debian/copyright to conform with Debian copyright format 1.0
|
||||
* Update Debian Standards Version to 3.9.3
|
||||
* Add dump of tint2's FAQ and Configure wiki page as offline
|
||||
documentation (Closes: #658226)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Wed, 07 Mar 2012 10:09:20 +0100
|
||||
|
||||
tint2 (0.11+svn20111022-2) unstable; urgency=low
|
||||
|
||||
* Add inform-about-unsupported-saving.patch (Closes: #646055)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Sun, 23 Oct 2011 10:57:35 +0200
|
||||
|
||||
tint2 (0.11+svn20111022-1) unstable; urgency=low
|
||||
|
||||
* New upstream checkout
|
||||
- Fix double free of launcher configuration (Closes: #645208)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Sat, 22 Oct 2011 08:17:18 +0200
|
||||
|
||||
tint2 (0.11+svn20111011-2) unstable; urgency=low
|
||||
|
||||
* build debug symbols
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Fri, 21 Oct 2011 16:30:50 +0200
|
||||
|
||||
tint2 (0.11+svn20111011-1) unstable; urgency=low
|
||||
|
||||
* New upstream snapshot
|
||||
- misc. fixes
|
||||
- added alpha, saturation, brightness control for launcher icons
|
||||
- launcher tooltips configurable, default off
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Wed, 19 Oct 2011 19:49:54 +0200
|
||||
|
||||
tint2 (0.11+svn20110307-1) unstable; urgency=low
|
||||
|
||||
* New upstream snapshot (Closes: #624792)
|
||||
* Remove power_now support patch (applied upstream)
|
||||
* Do not install tintwizard (it does not support config of SVN snapshot)
|
||||
* Also build a tint2-dbg package
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Sun, 01 May 2011 19:35:32 +0200
|
||||
|
||||
tint2 (0.11-2) unstable; urgency=low
|
||||
|
||||
* Recommend python-gtk2 instead of python-gtk
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Sun, 05 Dec 2010 05:05:46 +0100
|
||||
|
||||
tint2 (0.11-1) unstable; urgency=low
|
||||
|
||||
* Make me the maintainer of this package (Closes: #598688)
|
||||
* New Upstream Version (Closes: #591008)
|
||||
* drop patch (applied upstream)
|
||||
* Update watch file
|
||||
+ use googlecode.debian.net
|
||||
+ new files are release as tar.bz2
|
||||
* Update Debian Standards Version to 3.9.1
|
||||
* Use DEP5 for debian/copyright
|
||||
* Added build dependencies: cmake, libgtk2.0-dev
|
||||
* Add patch renaming tintwizard.py to tintwizard
|
||||
* Add patch adding power_now support
|
||||
* Recommend python (needed by tintwizard)
|
||||
|
||||
-- Sebastian Reichel <sre@debian.org> Fri, 26 Nov 2010 22:01:43 +0100
|
||||
|
||||
tint2 (0.9-2) unstable; urgency=low
|
||||
|
||||
* debian/patches/update-systray-clock-every-second.diff: Cherry-pick
|
||||
patch from upstream to keep systray clock in sync with system time.
|
||||
(Closes: #572227)
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Wed, 03 Mar 2010 23:40:02 -0800
|
||||
|
||||
tint2 (0.9-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* debian/watch: Upstream uses both _beta and -rc1 for version strings,
|
||||
update uversionmangle to handle both.
|
||||
* debian/control:
|
||||
- Bump to Version 3.8.4, no changes.
|
||||
- Add libxdamage-dev and libxcomposite-dev to Build-Depends.
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Wed, 24 Feb 2010 10:21:01 -0800
|
||||
|
||||
tint2 (0.8-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* debian/examples: Upstream has renamed the sample tint2rc files.
|
||||
* debian/source: Switch to dpkg-source 3.0 (quilt) format.
|
||||
* debian/copyright: Update with new upstream authors.
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Tue, 12 Jan 2010 11:48:49 -0800
|
||||
|
||||
tint2 (0.7.1-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version
|
||||
* debian/watch: add uversionmangle line to ignore upstream's beta
|
||||
releases.
|
||||
* debian/control: Update to Debian Policy 3.8.3, fix description typo.
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Sun, 06 Sep 2009 18:57:06 -0700
|
||||
|
||||
tint2 (0.7-1) unstable; urgency=low
|
||||
|
||||
* New Upstream Version. (LP: #319436)
|
||||
- Update watch file to point to tint2 instead of tint.
|
||||
- Remove debian/tint.1: integrated upstream (Closes: #532307)
|
||||
- Remove dpatch and patches/01-remove-strip-from-makefile.dpatch:
|
||||
integrated upstream.
|
||||
- Refresh debian/examples and remove debian/docs
|
||||
- tint2 is now licensed under the GPL-2.
|
||||
* Added Vcs-Git and Vcs-Browser fields to debian/control.
|
||||
* Updated to Standards Version 3.8.2
|
||||
* Switched to tiny dh 7 rules file with overrides.
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Wed, 01 Jul 2009 02:01:27 -0700
|
||||
|
||||
tint2 (0.6.0-1) unstable; urgency=low
|
||||
|
||||
* Initial release (closes: #491596)
|
||||
* Wrote manpage from upstream docs
|
||||
* 01-remove-strip-from-makefile.dpatch: dh_strip will strip the binary instead
|
||||
|
||||
-- Daniel Moerner <dmoerner@gmail.com> Sat, 06 Sep 2008 07:54:24 -0700
|
||||
@@ -1 +0,0 @@
|
||||
9
|
||||
@@ -1,36 +0,0 @@
|
||||
Source: tint2
|
||||
Section: x11
|
||||
Priority: optional
|
||||
Maintainer: o9000 <mrovi9000@gmail.com>
|
||||
Build-Depends: cmake,
|
||||
debhelper (>= 9),
|
||||
libcairo2-dev,
|
||||
libglib2.0-dev,
|
||||
libgtk2.0-dev,
|
||||
libimlib2-dev,
|
||||
libpango1.0-dev,
|
||||
librsvg2-dev,
|
||||
libstartup-notification0-dev,
|
||||
libxcomposite-dev,
|
||||
libxdamage-dev,
|
||||
libxinerama-dev,
|
||||
libxrandr-dev
|
||||
Standards-Version: 3.9.7
|
||||
Vcs-Git: git://anonscm.debian.org/collab-maint/tint2.git
|
||||
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tint2.git
|
||||
Homepage: https://gitlab.com/o9000/tint2/
|
||||
|
||||
Package: tint2
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends}
|
||||
Description: lightweight taskbar
|
||||
Tint is a simple panel/taskbar intentionally made for openbox3, but should
|
||||
also work with other window managers. The taskbar includes transparency and
|
||||
color settings for the font, icons, border, and background. It also supports
|
||||
multihead setups, customized mouse actions, and a built-in clock. Tint was
|
||||
originally based on ttm code. Since then, support has also been added
|
||||
for a battery monitor and system tray.
|
||||
.
|
||||
The goal is to keep a clean and unintrusive look with lightweight code and
|
||||
compliance with freedesktop specification.
|
||||
@@ -1,66 +0,0 @@
|
||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Source: https://gitlab.com/o9000/tint2.git
|
||||
|
||||
Files: *
|
||||
Copyright: 2007-2008 Pål Staurland <staura@gmail.com>
|
||||
2008-2009 Thierry Lorthiois <lorthiois@bbsoft.fr>
|
||||
2009 Andreas Fink <andreas.fink85@googlemail.com>
|
||||
2011-2015 Ovidiu M <mrovi9000@gmail.com>
|
||||
License: GPL-2
|
||||
|
||||
Files: src/battery/*
|
||||
Copyright: 2009 Sebastian Reichel <sre@debian.org>
|
||||
License: GPL-2+
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation, or (at your option) any
|
||||
later version.
|
||||
.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
MA 02110-1301, USA.
|
||||
.
|
||||
On Debian systems, the full text of the GNU General Public License 2
|
||||
can be found in `/usr/share/common-licenses/GPL-2'.
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2008-2010 Daniel Moerner <dmoerner@gmail.com>
|
||||
2010-2012 Sebastian Reichel <sre@debian.org>
|
||||
License: ISC
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
.
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, 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.
|
||||
|
||||
Files: debian/wiki/*
|
||||
Copyright: 2009-2012 Andreas Fink <andreas.fink85@googlemail.com>
|
||||
License: GPL-2
|
||||
|
||||
License: GPL-2
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
version 2 as published by the Free Software Foundation.
|
||||
.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
MA 02110-1301, USA.
|
||||
.
|
||||
On Debian systems, the full text of the GNU General Public License 2
|
||||
can be found in `/usr/share/common-licenses/GPL-2'.
|
||||
@@ -1 +0,0 @@
|
||||
sample/*.tint2rc
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
%:
|
||||
dh $@
|
||||
|
||||
override_dh_auto_configure:
|
||||
dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install --destdir=$(CURDIR)/debian/tmp
|
||||
|
||||
override_dh_installdocs:
|
||||
dh_installdocs --link-doc=tint2
|
||||
cp -r debian/wiki debian/tint2/usr/share/doc/tint2/html
|
||||
@@ -1 +0,0 @@
|
||||
3.0 (quilt)
|
||||
@@ -1,4 +0,0 @@
|
||||
debian/wiki/3265475271_81e8ed56e0.jpg
|
||||
debian/wiki/3265475337_262799ded3.jpg
|
||||
debian/wiki/3266303192_476a188196.jpg
|
||||
debian/wiki/3266303292_14d9b6b623.jpg
|
||||
@@ -1,12 +0,0 @@
|
||||
/usr/bin/tint2
|
||||
/usr/bin/tint2conf
|
||||
/etc/xdg/tint2/tint2rc
|
||||
/usr/share/applications/tint2.desktop
|
||||
/usr/share/applications/tint2conf.desktop
|
||||
/usr/share/man/man1/tint2.1
|
||||
/usr/share/doc/tint2/AUTHORS
|
||||
/usr/share/doc/tint2/README.md
|
||||
/usr/share/icons/hicolor/scalable/apps/tint2.svg
|
||||
/usr/share/icons/hicolor/scalable/apps/tint2conf.svg
|
||||
/usr/share/locale/*
|
||||
/usr/share/tint2/*
|
||||
@@ -1 +0,0 @@
|
||||
debian/tint2conf.1
|
||||
@@ -1,15 +0,0 @@
|
||||
.TH TINT2CONF 1 "April 25, 2011"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.SH NAME
|
||||
tint2conf \- tint configuration manager
|
||||
.SH SYNOPSIS
|
||||
.B tint2conf
|
||||
.SH DESCRIPTION
|
||||
tint2conf is a GTK based configuration previewer for tint2.
|
||||
.SH OPTIONS
|
||||
tint2conf takes no parameters.
|
||||
.SH AUTHOR
|
||||
tint2conf was written by the tint2 team.
|
||||
.PP
|
||||
This manual page was written by Sebastian Reichel <sre@debian.org>,
|
||||
for the Debian project (but may be used by others).
|
||||
@@ -1,4 +0,0 @@
|
||||
version=3
|
||||
|
||||
opts=filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/tint2-$1\.tar\.gz/g,uversionmangle=s/\-rc(\d)/\~rc$1/ \
|
||||
https://gitlab.com/o9000/tint2/tags .*archive\.tar\.gz\?ref=v?(\d\S*)
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
@@ -1,405 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>tint2 - Configure</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
</head>
|
||||
|
||||
<body class="t6">
|
||||
|
||||
<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
|
||||
<tbody><tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<td class="bevel-right" valign="top" align="right"></td>
|
||||
</tr>
|
||||
</tbody></table>
|
||||
|
||||
|
||||
|
||||
<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
|
||||
|
||||
|
||||
<!-- IE -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="wikipage">
|
||||
<table>
|
||||
<tbody><tr>
|
||||
|
||||
|
||||
|
||||
|
||||
<td style="vertical-align: top; padding-left: 5px;">
|
||||
|
||||
|
||||
|
||||
<div id="wikicontent">
|
||||
<div class="vt" id="wikimaincol">
|
||||
|
||||
<h1>tint2 - Configure</h1>
|
||||
|
||||
<p></p><ul><li><a href="#Background_and_border">Background and border</a></li><li><a href="#Panel">Panel</a></li><li><a href="#Launcher_SVN_Only">Launcher SVN Only</a></li><li><a href="#Taskbar_%28pager_like_capability%29">Taskbar (pager like capability)</a></li><li><a href="#Task">Task</a></li><li><a href="#System_Tray">System Tray</a></li><li><a href="#Clock">Clock</a></li><li><a href="#Tooltip">Tooltip</a></li><li><a href="#Battery">Battery</a></li><li><a href="#Mouse_action_on_task">Mouse action on task</a></li><li><a href="#Panel_autohide">Panel autohide</a></li><li><a href="#An_example_tint2rc">An example tint2rc</a></li></ul> <p></p><p>The first time you run tint2, it will create the config file in <tt>$HOME/.config/tint2/tint2rc</tt> . (this is true if you have done a clean install. running tint2 in the source directory without doing 'make install' will not create the config file.) </p><p>You can specify another file on the command line with -c option. eg. : <tt>tint2 -c $HOME/tint2.conf</tt> </p><p>When you change the config file, the command line 'killall -SIGUSR1 tint2' will force tint2 to reload it. </p><p>Configuration marked as <tt>SVN ONLY</tt> are not yet supported and could change in the next stable release. </p><h1><a name="Background_and_border"></a>Background and border<a href="#Background_and_border" class="section_anchor"></a></h1><blockquote>tint2rc config file starts with background option.
|
||||
</blockquote><p> </p><ul><li><tt>rounded = number_of_pixels</tt> : How rounded the borders are </li></ul><p></p><ul><li><tt>background_color = color opacity</tt> </li><ul><li><tt>opacity = 0</tt> to get background transparency </li></ul></ul><p> </p><ul><li><tt>border_width = width</tt> </li></ul><p></p><ul><li><tt>border_color = color opacity (0 to 100)</tt> </li><ul><li><tt>opacity = 0</tt> to get border transparency </li></ul></ul><blockquote>you are free to put 1, 2, 3... background
|
||||
<pre class="prettyprint"> rounded = 1
|
||||
border_width = 0
|
||||
background_color = #282828 100
|
||||
border_color = #000000 0
|
||||
|
||||
rounded = 1
|
||||
border_width = 0
|
||||
background_color = #f6b655 90
|
||||
border_color = #cccccc 40</pre>tint2 automatically identifies each background with a number (1, 2, ...).
|
||||
then you can applied background on objects (panel, taskbar, task, clock, systray) with
|
||||
<pre class="prettyprint"> panel_background_id = 1
|
||||
taskbar_background_id = 0
|
||||
task_background_id = 0
|
||||
task_active_background_id = 2
|
||||
systray_background_id = 0
|
||||
clock_background_id = 0</pre>identifier 0 applied full transparency, identifer 1 applied the first background...
|
||||
</blockquote><h1><a name="Panel"></a>Panel<a href="#Panel" class="section_anchor"></a></h1><ul><li><tt>panel_monitor = monitor (all, 1, 2, ...)</tt> Which monitor tint2 draws the panel on </li><ul><li>the first monitor is <tt>1</tt> </li><li>use <tt>panel_monitor = all</tt> to get one panel per monitor (unless it's included into another one) </li></ul></ul><p> </p><blockquote><img src="3265475271_81e8ed56e0.jpg">
|
||||
</blockquote><p></p><p> </p><ul><li><tt>panel_position = vertical_position horizontal_position orientation</tt> </li><ul><li><tt>value for vertical_position : bottom, top, center</tt> </li><li><tt>value for horizontal_position : left, right, center</tt> </li><li><tt>value for orientation : horizontal, vertical</tt> </li></ul></ul> <ul><li><tt>panel_size = width height</tt> </li><ul><li><tt>width = 0</tt> to get full monitor width </li><li>Use <tt>%</tt> to adjust the panel size to monitor size. </li></ul></ul> <blockquote>Example:
|
||||
<p></p><pre class="prettyprint"> #The panel's width is 94% the size of the monitor
|
||||
panel_size = 94% 30</pre></blockquote><ul><li><tt>panel_items = LTSBC</tt> define the items tint2 will show and the order of those items. panel_items = STC will show the Systray, the taskbar and the clock (from left to right). SVN ONLY. </li><ul><li>L to show Launcher </li><li>T to show Taskbar </li><li>S to show Systray (also called notification area) </li><li>B to show Battery status </li><li>C to show Clock </li></ul></ul><ul><li><tt>panel_margin = horizontal_margin vertical_margin</tt> </li><ul><li><tt>horizontal_margin = 0</tt> to get full monitor width </li></ul></ul><blockquote><img src="3266303192_476a188196.jpg">
|
||||
</blockquote><p> </p><ul><li><tt>panel_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>font_shadow = boolean (0 or 1)</tt> </li></ul><ul><li><tt>panel_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>wm_menu = boolean (0 or 1)</tt> : Allow tint2 to forward mouse event to your Window Manager. </li></ul><ul><li><tt>panel_dock = boolean (0 or 1)</tt> : Put tint2 into the window managers dock. For the openbox window manager I can advise to use also a modifier for the moveButton option, otherwise the mouse click is not forwarded to tint2 (in ~/.config/openbox/rc.xml). </li></ul><p> </p><ul><li><tt>panel_layer = bottom,normal,top</tt> : Puts tint2 into the bottom/normal/top layer. Default is the bottom layer, but for real transparency normal or top layer may be a nice alternative. </li></ul><p></p><ul><li><tt>strut_policy = follow_size/minimum/none</tt> : STRUTs are used by the window manager to decide the size of maximized windows. Should the 'maximized windows' follow tint2 size (follow_size) or use the minimum size (minimum), or use the screen size (none). <tt>minimum</tt> option is interresting when used with <tt>autohide_height</tt> parameter. </li></ul><h1><a name="Launcher_SVN_Only"></a>Launcher SVN Only<a href="#Launcher_SVN_Only" class="section_anchor"></a></h1><ul><li><tt>launcher_icon_theme = name_of_theme</tt> tint2 will follow the theme of your desktop when you have an XSETTINGS manager running. Otherwise, <tt>launcher_icon_theme</tt> parameter is used. </li><li><tt>launcher_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li><li><tt>launcher_background_id = integer</tt> : Which background to use </li><li><tt>launcher_icon_size = number</tt> : Set the launcher icon size to <tt>number</tt>. </li><li><tt>launcher_item_app = path_to_application</tt> : Each launcher_item_app must be a full path to a .desktop file. </li></ul><h1><a name="Taskbar_(pager_like_capability)"></a>Taskbar (pager like capability)<a href="#Taskbar_%28pager_like_capability%29" class="section_anchor"></a></h1><ul><li><tt>taskbar_mode = single_desktop or multi_desktop</tt> </li><ul><li><tt>taskbar_mode = single_desktop</tt> : Show one(1) taskbar (current desktop) </li><li><tt>taskbar_mode = multi_desktop</tt> : Pager like capability. Show one(1) taskbar per desktop </li><ul><li>You can drag-and-drop task between desktops` </li><li>And also click on an empty taskbar to switch desktops` </li></ul></ul></ul><p> </p><ul><li><tt>taskbar_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><p></p><ul><li><tt>taskbar_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>taskbar_active_background_id = integer</tt> : Which background to use for current desktop. </li></ul><blockquote><img src="3266303292_14d9b6b623.jpg">
|
||||
</blockquote><ul><li><tt>taskbar_name = boolean (0 or 1)</tt> : SVN Only enabled(=1) or disabled(=0) desktop name in taskbar </li></ul><ul><li><tt>taskbar_name_padding = left_right_padding</tt> SVN Only </li></ul><ul><li><tt>taskbar_name_background_id = integer</tt> : SVN Only Which background to use </li></ul><ul><li><tt>taskbar_name_active_background_id = integer</tt> : SVN Only Which background to use for current desktop. </li></ul><ul><li><tt>taskbar_name_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> SVN Only </li></ul><ul><li><tt>taskbar_name_font_color = color opacity (0 to 100)</tt> SVN Only </li></ul><ul><li><tt>taskbar_name_active_font_color = color opacity (0 to 100)</tt> </li></ul><h1><a name="Task"></a>Task<a href="#Task" class="section_anchor"></a></h1><ul><li><tt>urgent_nb_of_blink = integer</tt> : Number of blink on 'get attention' event </li></ul><ul><li><tt>task_icon = boolean (0 or 1)</tt> : Display task icon or not </li></ul><ul><li><tt>task_text = boolean (0 or 1)</tt> : Display task text or not </li></ul><ul><li><tt>task_centered = boolean (0 or 1)</tt> : Task name centered or not </li></ul><ul><li><tt>task_maximum_size = width height</tt> </li><ul><li><tt>width is used with horizontal panel. width = 0 to get full taskbar width</tt> </li><li><tt>height is used with vertical panel</tt> </li></ul></ul><p> </p><ul><li><tt>task_padding = horizontal_padding vertical_padding</tt> </li></ul><p></p><ul><li><tt>task_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>task_font_color = color opacity (0 to 100)</tt> </li></ul><p> </p><ul><li><tt>task_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for task. </li></ul><p></p><ul><li><tt>task_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><blockquote>For the next 3 options STATUS can be <tt>active</tt> / <tt>iconified</tt> / <tt>urgent</tt>.
|
||||
</blockquote><ul><li><tt>task_STATUS_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>task_STATUS_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for active task </li></ul><ul><li><tt>task_STATUS_background_id = integer</tt> : Which background to use when task is selected </li></ul><ul><li><tt>task_tooltip = boolean (0 or 1)</tt> : enabled(=1) or disabled(=0) tooltip on task </li></ul><blockquote><img src="3265475337_262799ded3.jpg">
|
||||
</blockquote><h1><a name="System_Tray"></a>System Tray<a href="#System_Tray" class="section_anchor"></a></h1><ul><li><tt>systray = boolean (0 or 1)</tt> : enabled(=1) or disabled(=0) systray </li></ul><ul><li><tt>systray_padding = horizontal_left_right_padding vertical_padding horizontal_spacing</tt> </li></ul><ul><li><tt>systray_background_id = integer</tt> : Which background to use for non selected tasks </li></ul><ul><li> <tt>systray_sort = ascending/descending/left2right/right2left</tt> : Sorting order for icon's systray (if left2right or right2left the order can be different on restart) </li></ul><ul><li> <tt>systray_icon_size = max_icon_size</tt> : Set the maximum system tray icon size to <tt>number</tt>. Set to <tt>0</tt> for automatic icon size </li></ul><ul><li><tt>systray_icon_asb = alpha (0 to 100) saturation (-100 to 100) brightness (-100 to 100)</tt> : adjust icon's color and transparency for system tray icons </li></ul><h1><a name="Clock"></a>Clock<a href="#Clock" class="section_anchor"></a></h1><ul><li><tt>time1_format = %H:%M</tt> </li><ul><li>time1_format, time2_format and clock_tooltip use 'strftime' syntax. more info on parameters on <a href="http://www.manpagez.com/man/3/strftime/" rel="nofollow">http://www.manpagez.com/man/3/strftime/</a> </li><li>comment time1_format and time2_format to hide clock </li></ul></ul><p> </p><ul><li><tt>time1_timezone = :US/Hawaii</tt> </li><ul><li>time1_timezone, time2_timezone and clock_tooltip_timezone can be used to specify a timezone. If you do not specify a value the system-wide timezone is used. The timezones can usually be found in /usr/share/zoneinfo. If your timezones are in a different directory, you need to specify the absolute path, i.e. time1_timezone = :/different/zoneinfo/dir/US/Hawaii (always prepend with a ':') </li></ul></ul><p></p><ul><li><tt>time1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>time2_format = %A %d %B</tt> </li></ul><ul><li><tt>time2_timezone = :Europe/Berlin</tt> </li></ul><ul><li><tt>time2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>clock_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>clock_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>clock_background_id = integer</tt> : Which background to use </li></ul><ul><li><tt>clock_tooltip = %a, %d. %b %Y : clock tooltip text</tt> </li></ul><ul><li><tt>clock_tooltip_timezone = :UTC</tt> </li></ul><ul><li><tt>clock_lclick_command = text</tt> : Which command to execute on left click </li></ul><ul><li><tt>clock_rclick_command = text</tt> : Which command to execute on right click </li></ul><h1><a name="Tooltip"></a>Tooltip<a href="#Tooltip" class="section_anchor"></a></h1><ul><li><tt>tooltip_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>tooltip_show_timeout = float</tt> : delay to show tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_hide_timeout = float</tt> : delay to close tooltip in second. Use '.' as decimal separator. </li></ul><ul><li><tt>tooltip_background_id = integer</tt> : Which background to use (in fake transparency the alpha channel and rounded are not respected) </li></ul><ul><li><tt>tooltip_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>tooltip_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><h1><a name="Battery"></a>Battery<a href="#Battery" class="section_anchor"></a></h1><ul><li><tt>battery = boolean (0 or 1)</tt> : enabled(=1) or disabled(=0) battery applet </li></ul><ul><li><tt>battery_hide = never or an integer (0 to 100)</tt>: At what battery percent does the battery hide </li></ul><ul><li><tt>battery_low_status = integer</tt>: At what battery percent does the icon show battery low command </li></ul><ul><li><tt>battery_low_cmd = notify-send "battery low"</tt> :What to do when battery is low </li></ul><ul><li><tt>bat1_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>bat2_font = [FAMILY-LIST] [STYLE-OPTIONS] [SIZE]</tt> </li></ul><ul><li><tt>battery_font_color = color opacity (0 to 100)</tt> </li></ul><ul><li><tt>battery_padding = horizontal_padding vertical_padding</tt> </li></ul><ul><li><tt>battery_background_id = integer</tt> : Which background to use </li></ul><h1><a name="Mouse_action_on_task"></a>Mouse action on task<a href="#Mouse_action_on_task" class="section_anchor"></a></h1><blockquote>Customize mouse action with : <tt>none, close, toggle, iconify, shade, toggle_iconify, maximize_restore, desktop_left, desktop_right, next_task, prev_task</tt>.
|
||||
</blockquote><blockquote>Sample format:
|
||||
<pre class="prettyprint"> mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
mouse_scroll_down = iconify</pre></blockquote><pre class="prettyprint"> close : close the task
|
||||
toggle : toggle the task
|
||||
iconify : iconify the task
|
||||
toggle_iconify : toggle or iconify the task
|
||||
maximize_restore : maximized or minimized the task
|
||||
desktop_left : send the task to the desktop on the left
|
||||
desktop_right : send the task to the desktop on the right
|
||||
next_task : send the focus to next task
|
||||
prev_task : send the focus to previous task</pre><p>If a mouse action is set to <tt>none</tt> and <tt>wm_menu = 1</tt> is set, the mouse click is forwarded to the window manager </p><h1><a name="Panel_autohide"></a>Panel autohide<a href="#Panel_autohide" class="section_anchor"></a></h1><ul><li><tt>autohide = boolean (0 or 1)</tt> : enable(=1) or disable(=0) autohiding </li></ul><ul><li><tt>autohide_show_timeout = float</tt> : show timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_hide_timeout = float</tt> : hide timeout in seconds. Use '.' as decimal separator. </li></ul><ul><li><tt>autohide_height = integer</tt> : panel height (width for vertical panels) in hidden mode </li></ul><h1><a name="An_example_tint2rc"></a>An example tint2rc<a href="#An_example_tint2rc" class="section_anchor"></a></h1><pre class="prettyprint">#---------------------------------------------
|
||||
# TINT2 CONFIG FILE
|
||||
#---------------------------------------------
|
||||
|
||||
#---------------------------------------------
|
||||
# BACKGROUND AND BORDER
|
||||
#---------------------------------------------
|
||||
rounded = 7
|
||||
border_width = 2
|
||||
background_color = #000000 60
|
||||
border_color = #ffffff 18
|
||||
|
||||
rounded = 5
|
||||
border_width = 0
|
||||
background_color = #ffffff 40
|
||||
border_color = #ffffff 50
|
||||
|
||||
rounded = 5
|
||||
border_width = 0
|
||||
background_color = #ffffff 18
|
||||
border_color = #ffffff 70
|
||||
|
||||
#---------------------------------------------
|
||||
# PANEL
|
||||
#---------------------------------------------
|
||||
panel_monitor = all
|
||||
panel_position = bottom center
|
||||
panel_size = 94% 30
|
||||
panel_margin = 0 0
|
||||
panel_padding = 7 0
|
||||
font_shadow = 0
|
||||
panel_background_id = 1
|
||||
wm_menu = 0
|
||||
panel_dock = 0
|
||||
panel_layer = bottom
|
||||
|
||||
#---------------------------------------------
|
||||
# TASKBAR
|
||||
#---------------------------------------------
|
||||
#taskbar_mode = multi_desktop
|
||||
taskbar_mode = single_desktop
|
||||
taskbar_padding = 2 3 2
|
||||
taskbar_background_id = 0
|
||||
#taskbar_active_background_id = 0
|
||||
|
||||
#---------------------------------------------
|
||||
# TASKS
|
||||
#---------------------------------------------
|
||||
task_icon = 1
|
||||
task_text = 1
|
||||
task_maximum_size = 140 35
|
||||
task_centered = 1
|
||||
task_padding = 6 3
|
||||
task_font = sans 7
|
||||
task_font_color = #ffffff 70
|
||||
task_background_id = 3
|
||||
task_icon_asb = 100 0 0
|
||||
# replace STATUS by 'urgent', 'active' or 'iconfied'
|
||||
#task_STATUS_background_id = 2
|
||||
#task_STATUS_font_color = #ffffff 85
|
||||
#task_STATUS_icon_asb = 100 0 0
|
||||
# example:
|
||||
task_active_background_id = 2
|
||||
task_active_font_color = #ffffff 85
|
||||
task_active_icon_asb = 100 0 0
|
||||
urgent_nb_of_blink = 8
|
||||
|
||||
#---------------------------------------------
|
||||
# SYSTRAYBAR
|
||||
#---------------------------------------------
|
||||
systray = 1
|
||||
systray_padding = 0 4 5
|
||||
systray_background_id = 0
|
||||
systray_sort = left2right
|
||||
systray_icon_size = 0
|
||||
systray_icon_asb = 100 0 0
|
||||
|
||||
#---------------------------------------------
|
||||
# CLOCK
|
||||
#---------------------------------------------
|
||||
time1_format = %H:%M
|
||||
time1_font = sans 8
|
||||
time2_format = %A %d %B
|
||||
time2_font = sans 6
|
||||
clock_font_color = #ffffff 76
|
||||
clock_padding = 1 0
|
||||
clock_background_id = 0
|
||||
#clock_lclick_command = xclock
|
||||
clock_rclick_command = orage
|
||||
#clock_tooltip = %A %d %B
|
||||
#time1_timezone = :US/Hawaii
|
||||
#time2_timezone = :Europe/Berlin
|
||||
#clock_tooltip_timezone = :/usr/share/zoneinfo/Europe/Paris
|
||||
|
||||
#---------------------------------------------
|
||||
# BATTERY
|
||||
#---------------------------------------------
|
||||
battery = 0
|
||||
battery_hide = 98
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
battery_font_color = #ffffff 76
|
||||
battery_padding = 1 0
|
||||
battery_background_id = 0
|
||||
|
||||
#---------------------------------------------
|
||||
# TOOLTIP
|
||||
#---------------------------------------------
|
||||
tooltip = 0
|
||||
tooltip_padding = 2 2
|
||||
tooltip_show_timeout = 0.7
|
||||
tooltip_hide_timeout = 0.3
|
||||
tooltip_background_id = 1
|
||||
tooltip_font_color = #OOOOOO 80
|
||||
tooltip_font = sans 10
|
||||
|
||||
#---------------------------------------------
|
||||
# MOUSE ACTION ON TASK
|
||||
#---------------------------------------------
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
mouse_scroll_down = iconify
|
||||
|
||||
#---------------------------------------------
|
||||
# AUTOHIDE OPTIONS
|
||||
#---------------------------------------------
|
||||
autohide = 0
|
||||
autohide_show_timeout = 0.3
|
||||
autohide_hide_timeout = 2
|
||||
autohide_height = 4
|
||||
strut_policy = minimum</pre>
|
||||
</div>
|
||||
</div>
|
||||
</td></tr><tr>
|
||||
</tr></tbody></table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div id="wikicommentcol">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="collapse">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="commentlist">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="hostedBy" style="margin-top: -20px;">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</body></html>
|
||||
@@ -1,217 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>tint2 - FAQ</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
</head>
|
||||
|
||||
<body class="t6">
|
||||
|
||||
<table class="st" width="100%" cellpadding="0" cellspacing="0" align="center" border="0">
|
||||
<tbody><tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<td class="bevel-right" valign="top" align="right"></td>
|
||||
</tr>
|
||||
</tbody></table>
|
||||
|
||||
|
||||
|
||||
<div id="maincol" style="padding: 0pt 3px 3px 0pt; margin: 0pt;">
|
||||
|
||||
<!-- IE -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="wikipage">
|
||||
<table>
|
||||
<tbody><tr>
|
||||
|
||||
|
||||
|
||||
|
||||
<td style="vertical-align: top; padding-left: 5px;">
|
||||
|
||||
|
||||
|
||||
<div id="wikicontent">
|
||||
<div class="vt" id="wikimaincol">
|
||||
|
||||
<h1>tint2 - FAQ</h1>
|
||||
|
||||
<p></p><ul><li><a href="#What_is_tint2?">What is tint2?</a></li><li><a href="#Who_is_the_developer_of_tint2_?">Who is the developer of tint2 ?</a></li><li><a href="#Does_tint2_have_a_system_tray/notification_area?">Does tint2 have a system tray/notification area?</a></li><li><a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray">I have the latest build of tint2 but still no system tray</a></li><li><a href="#tint2_doesn%27t_show_the_systray/notification">tint2 doesn't show the systray/notification</a></li><li><a href="#Why_did_some_systray_icons_disappear_from_the_panel?">Why did some systray icons disappear from the panel?</a></li><li><a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a">Why don't some systray icons appear when you run tint2 in a KDE session?</a></li><li><a href="#I_want_to_disable_the_tint2_systray">I want to disable the tint2 systray</a></li><li><a href="#How_to_configure_real_transparency">How to configure real transparency</a></li><li><a href="#Tint2_doesn%27t_work_on_compiz_correctly?">Tint2 doesn't work on compiz correctly?</a></li><li><a href="#I_want_to_disable_compiz_shadow_on_Tint2">I want to disable compiz shadow on Tint2</a></li><li><a href="#Adding_a_%27show_desktop%27_button">Adding a 'show desktop' button</a></li><li><a href="#Task_list_is_limited">Task list is limited</a></li><li><a href="#How_can_I_get_%27pager_like_capability%27_?">How can I get 'pager like capability' ?</a></li><li><a href="#I_want_to_hide_some_tasks_from_the_panel_?">I want to hide some tasks from the panel ?</a></li><li><a href="#The_tint2_panel_is_blank">The tint2 panel is blank</a></li><li><a href="#How_to_maximize_window_over_tint2">How to maximize window over tint2</a></li><li><a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own">I get errors when I try to compile tint2 on my own</a></li><li><a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs">I upgraded to tint2 and I still have the old panel with its bugs</a></li><li><a href="#Tint2_doesn%27t_show_in_Pekwm">Tint2 doesn't show in Pekwm</a></li><li><a href="#Is_there_an_IRC_channel?">Is there an IRC channel?</a></li></ul> <p></p><p>Frequently asked questions. Please add any extra tips to the comments. </p><h1><a name="What_is_tint2?"></a>What is tint2?<a href="#What_is_tint2?" class="section_anchor"></a></h1><ul><li>Tint2 is a panel/taskbar for modern x window managers like GNOME, KDE, XFCE, openbox, pekwm,etc.. </li></ul><h1><a name="Who_is_the_developer_of_tint2_?"></a>Who is the developer of tint2 ?<a href="#Who_is_the_developer_of_tint2_?" class="section_anchor"></a></h1><ul><li>Main developers of tint2 are Thierry Lorthiois and Andreas Fink </li></ul><h1><a name="Does_tint2_have_a_system_tray/notification_area?"></a>Does tint2 have a system tray/notification area?<a href="#Does_tint2_have_a_system_tray/notification_area?" class="section_anchor"></a></h1><ul><li>YES! Tint2 finally has system tray/notification area. Please <a href="https://code.google.com/p/tint2/wiki/Install">install</a> the latest build if your current build doesn't have it. </li></ul><h1><a name="I_have_the_latest_build_of_tint2_but_still_no_system_tray"></a>I have the latest build of tint2 but still no system tray<a href="#I_have_the_latest_build_of_tint2_but_still_no_system_tray" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have the systray option configured and the options are not commented out. </li><li>The systray section looks like this </li><pre class="prettyprint">#---------------------------------------------
|
||||
# SYSTRAYBAR
|
||||
#---------------------------------------------
|
||||
systray = 1
|
||||
systray_padding = 0 3 3
|
||||
systray_background_id = 0
|
||||
systray_sort = left2right</pre></ul><h1><a name="tint2_doesn't_show_the_systray/notification"></a>tint2 doesn't show the systray/notification<a href="#tint2_doesn%27t_show_the_systray/notification" class="section_anchor"></a></h1><ul><li>Check your tint2rc to see if you have 'systray = 1' </li><li>run tint2 in a terminal. if you get 'tint2 : another systray is running' it's because you have another systray/notification and you can't run more than one at a time. </li><ul><li>In gnome, remove the systray/notification with a right clic on the separator before your systray/notification -> remove </li></ul></ul><h1><a name="Why_did_some_systray_icons_disappear_from_the_panel?"></a>Why did some systray icons disappear from the panel?<a href="#Why_did_some_systray_icons_disappear_from_the_panel?" class="section_anchor"></a></h1><ul><li>tint2 stops/restarts the systray protocol on some events (like switching theme with tint2conf). But some systray icons do not implement the stop/restart of the manager and so disappear from the panel. You can report the problem to us and also to the systray icon developer. </li></ul><h1><a name="Why_don't_some_systray_icons_appear_when_you_run_tint2_in_a"></a>Why don't some systray icons appear when you run tint2 in a KDE session?<a href="#Why_don%27t_some_systray_icons_appear_when_you_run_tint2_in_a" class="section_anchor"></a></h1><ul><li>Some KDE applications use the KDE status notifier service to show system tray icons. If you disable this service (systemsettings -> Startup and Shutdown -> Service Manager -> uncheck "Status Notifier Manager") all the icons should appear normally in tint2. </li></ul><h1><a name="I_want_to_disable_the_tint2_systray"></a>I want to disable the tint2 systray<a href="#I_want_to_disable_the_tint2_systray" class="section_anchor"></a></h1><ul><li>To disable the systray, just put <tt>systray = 0</tt> in your tint2rc </li><li>Example: </li><pre class="prettyprint">systray = 0
|
||||
systray_padding = 0 3 3
|
||||
systray_background_id = 0</pre></ul><h1><a name="How_to_configure_real_transparency"></a>How to configure real transparency<a href="#How_to_configure_real_transparency" class="section_anchor"></a></h1><ul><li>tint2 autodetects your composite manager and uses real transparency when possible. However, xcompmgr have a little bug which prevents tint2 from detecting it. </li><li>If you want autodetect with xcompmgr, download and apply xcompmgr's patch (in bug report). See <a href="http://bugs.freedesktop.org/show_bug.cgi?id=26090" rel="nofollow">xcompmgr patch</a> </li></ul><h1><a name="Tint2_doesn't_work_on_compiz_correctly?"></a>Tint2 doesn't work on compiz correctly?<a href="#Tint2_doesn%27t_work_on_compiz_correctly?" class="section_anchor"></a></h1><ul><li>All my tasks are on one desktop in compiz? </li><ul><li>This is a known issue in compiz. Compiz doesn't support 'Virtual desktop' specification (or you have to disabled visual effect).<br>I look like 'Desktop number' use Viewport instead of 'Virtual desktop'. So pager capabilities are not supported. <br>See <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/153322</a> <br>or <a href="http://forum.compiz.org/viewtopic.php?f=86&t=11943" rel="nofollow">http://forum.compiz.org/viewtopic.php?f=86&t=11943</a> <br>or <a href="https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690" rel="nofollow">https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/150690</a> </li></ul><li>Tint is being decorated with a window/ has a shadow /is not fully transparent </li><ul><li>Open CompizConfig Settings manager -> Window Decorations Plugin </li><ul><li>In the box for Decoration windows, put <tt>any & !type=dock</tt> </li><li>In the box for Shadow windows, put <tt>any & !type=dock</tt> </li></ul></ul><blockquote>
|
||||
</blockquote><li>Tint has ugly white streaks </li><ul><li>Set a background for your desktop </li></ul></ul><h1><a name="I_want_to_disable_compiz_shadow_on_Tint2"></a>I want to disable compiz shadow on Tint2<a href="#I_want_to_disable_compiz_shadow_on_Tint2" class="section_anchor"></a></h1><ul><li>Run ccsm the compiz configuration tool. Go to Window Decorations. For both decoration and shadow windows, replace 'any' with 'any & !name=tint2'. </li></ul><h1><a name="Adding_a_'show_desktop'_button"></a>Adding a 'show desktop' button<a href="#Adding_a_%27show_desktop%27_button" class="section_anchor"></a></h1><ul><li>tint2 doesn't implement 'show desktop' button. But here a way to get it. <br> </li></ul><p>Create a file with following text </p><pre class="prettyprint">#!/bin/sh
|
||||
if wmctrl -m | grep "mode: ON"; then
|
||||
exec wmctrl -k off
|
||||
else
|
||||
exec wmctrl -k on
|
||||
fi</pre><p>Save it in /usr/bin/show_desktop.sh and make it executable.<br> Install the package 'wmctrl'. And call the script in tint2rc config file. </p><pre class="prettyprint">time1_format = %H:%M
|
||||
time1_font = sans 8
|
||||
time2_format = %A %d %B
|
||||
time2_font = sans 6
|
||||
clock_font_color = #ffffff 76
|
||||
clock_padding = 4 4
|
||||
clock_background_id = 0
|
||||
clock_lclick_command = show_desktop.sh</pre><p>Then left click on the clock will do it. </p><h1><a name="Task_list_is_limited"></a>Task list is limited<a href="#Task_list_is_limited" class="section_anchor"></a></h1><ul><li>In your tint2rc file, check the value of <tt>taskbar_mode</tt>. If it's <tt>multi_desktop</tt>, tint2 show one taskbar per desktop. Change the value to <tt>single_desktop</tt> if you want just one taskbar. </li></ul><h1><a name="How_can_I_get_'pager_like_capability'_?"></a>How can I get 'pager like capability' ?<a href="#How_can_I_get_%27pager_like_capability%27_?" class="section_anchor"></a></h1><ul><li>In your tint2rc file, change the value of <tt>taskbar_mode</tt> to <tt>multi_desktop</tt>. This option will show one taskbar per desktop. So you can detect on witch desktop is an application and witch desktop is empty (or full). You can close an application whithout switching to the desktop. You can drag n drop application between desktop. </li></ul><h1><a name="I_want_to_hide_some_tasks_from_the_panel_?"></a>I want to hide some tasks from the panel ?<a href="#I_want_to_hide_some_tasks_from_the_panel_?" class="section_anchor"></a></h1><ul><li>In Openbox config file 'rc.xml' you can assign the property 'skip_taskbar' to your window </li></ul><h1><a name="The_tint2_panel_is_blank"></a>The tint2 panel is blank<a href="#The_tint2_panel_is_blank" class="section_anchor"></a></h1><ul><li>A new option, called <tt>panel_items</tt> has been added to the config file. This option defines the items tint2 will show and the order of those items(from left to right). Please define that in your tint2rc file. The format is shown below. The options are <tt>L</tt> for <tt>Launcher</tt>, <tt>S</tt> for the <tt>Systray</tt>, <tt>T</tt> for the <tt>taskbar</tt>, <tt>C</tt> for the <tt>clock</tt> and <tt>B</tt> for the <tt>battery</tt>. </li><pre class="prettyprint">panel_items = LTSBC </pre></ul><h1><a name="How_to_maximize_window_over_tint2"></a>How to maximize window over tint2<a href="#How_to_maximize_window_over_tint2" class="section_anchor"></a></h1><ul><li>You can manage interaction between tint2 and window with : </li><pre class="prettyprint">panel_layer = bottom,normal,top
|
||||
strut_policy = follow_size/minimum/none
|
||||
autohide_height = integer</pre></ul><blockquote>If you want maximized window never cover tint2:
|
||||
<pre class="prettyprint">panel_layer = top
|
||||
strut_policy = follow_size</pre>If you want maximized window behind tint2:
|
||||
<pre class="prettyprint">panel_layer = top
|
||||
strut_policy = none</pre>If you want maximized window behind tint2, but 2 pixels free so you can use desktop action (right click, ...):
|
||||
<pre class="prettyprint">panel_layer = top
|
||||
strut_policy = minimum
|
||||
autohide_height = 2</pre></blockquote><h1><a name="I_get_errors_when_I_try_to_compile_tint2_on_my_own"></a>I get errors when I try to compile tint2 on my own<a href="#I_get_errors_when_I_try_to_compile_tint2_on_my_own" class="section_anchor"></a></h1><ul><li>Do you have all the dependencies installed? Please check <a href="https://code.google.com/p/tint2/wiki/Install#Dependencies">here</a> </li></ul><h1><a name="I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs"></a>I upgraded to tint2 and I still have the old panel with its bugs<a href="#I_upgraded_to_tint2_and_I_still_have_the_old_panel_with_its_bugs" class="section_anchor"></a></h1><ul><li>The tint binary was renamed tint2 to avoid a conflict with another package.So your new tint2 startup command is <strong>tint2</strong> </li><li>Since a new stable release hasn't been released yet, both the old tint and the new tint2 binaries will be on your system when you upgrade just incase you run into some problems and want to fall back on the old binary. </li></ul><h1><a name="Tint2_doesn't_show_in_Pekwm"></a>Tint2 doesn't show in Pekwm<a href="#Tint2_doesn%27t_show_in_Pekwm" class="section_anchor"></a></h1><ul><li>The problem is that pekwm defines by default edge borders, and doesn't allow a panel to get inside these edge borders. The config option is in <tt>~/.pekwm/config</tt> under <tt>Screen/EdgeSize</tt>. You can either disable the edge borders or set tint2 to a size where it doesn't enter these borders (i.e. play with <tt>panel_size</tt> and <tt>panel_margin</tt>) </li><li>Setting the margin to one pixel made it appear on my screen. With horizontal panel: </li><pre class="prettyprint">panel_size = 95% height
|
||||
panel_margin = 0 1</pre><li>With vertical panel: </li><pre class="prettyprint">panel_size = width 95%
|
||||
panel_margin = 1 0</pre></ul><h1><a name="Is_there_an_IRC_channel?"></a>Is there an IRC channel?<a href="#Is_there_an_IRC_channel?" class="section_anchor"></a></h1><ul><li>Yes. There is now an irc channel, <strong>#tint2</strong> on <a href="irc://irc.freenode.net" rel="nofollow">irc.freenode.net</a>. </li><li>Just ask your question and stay there, because we are not always watching the channel ;) </li></ul>
|
||||
</div>
|
||||
</div>
|
||||
</td></tr><tr>
|
||||
</tr></tbody></table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div id="wikicommentcol">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="collapse">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div id="commentform">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="hostedBy" style="margin-top: -20px;">
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</body></html>
|
||||
@@ -99,7 +99,6 @@ tooltip_font = sans 10
|
||||
tooltip_font_color = #000000 80
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -98,7 +98,6 @@ tooltip_font = Sans 10
|
||||
tooltip_font_color = #000000 80
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = close
|
||||
mouse_right = none
|
||||
mouse_scroll_up = toggle
|
||||
@@ -104,7 +104,6 @@ tooltip_font = Sans 9
|
||||
tooltip_font_color = #5E5E5E 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -104,7 +104,6 @@ tooltip_font = Sans 12
|
||||
tooltip_font_color = #FFFFFF 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -118,7 +118,6 @@ tooltip_font = Sans 8
|
||||
tooltip_font_color = #FFFFFF 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -106,7 +106,6 @@ tooltip_font = sans 10
|
||||
tooltip_font_color = #000000 80
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -95,7 +95,6 @@ tooltip_font = sans 10
|
||||
tooltip_font_color = #000000 80
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = none
|
||||
mouse_scroll_up = toggle
|
||||
@@ -95,7 +95,6 @@ tooltip_font = Sans 10
|
||||
tooltip_font_color = #FFFFFF 80
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -106,7 +106,6 @@ tooltip_font = sans 8
|
||||
tooltip_font_color = #000000 89
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -102,7 +102,6 @@ tooltip_font = Sans 7
|
||||
tooltip_font_color = #FFFFFF 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -112,7 +112,6 @@ tooltip_font = Aller 8
|
||||
tooltip_font_color = #D3CAAA 33
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -112,7 +112,6 @@ tooltip_font = Aller 8
|
||||
tooltip_font_color = #D3CAAA 33
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -90,7 +90,6 @@ tooltip_font = Sans 9
|
||||
tooltip_font_color = #FFFFFF 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -83,7 +83,6 @@ tooltip_font = Sans 12
|
||||
tooltip_font_color = #FFFFFF 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -96,7 +96,6 @@ tooltip_font = AvantGardeLTMedium 8
|
||||
tooltip_font_color = #434141 100
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
@@ -89,7 +89,6 @@ tooltip_font = Aller 8
|
||||
tooltip_font_color = #D3CAAA 33
|
||||
|
||||
# Mouse
|
||||
mouse_left = toggle_iconify
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
118
sample/tint2rc
Normal file
118
sample/tint2rc
Normal file
@@ -0,0 +1,118 @@
|
||||
# Tint2 config file
|
||||
# Generated by tintwizard (http://code.google.com/p/tintwizard/)
|
||||
# For information on manually configuring tint2 see http://code.google.com/p/tint2/wiki/Configure
|
||||
|
||||
# Background definitions
|
||||
# ID 1
|
||||
rounded = 7
|
||||
border_width = 2
|
||||
background_color = #000000 60
|
||||
border_color = #FFFFFF 16
|
||||
|
||||
# ID 2
|
||||
rounded = 5
|
||||
border_width = 0
|
||||
background_color = #FFFFFF 40
|
||||
border_color = #FFFFFF 48
|
||||
|
||||
# ID 3
|
||||
rounded = 5
|
||||
border_width = 0
|
||||
background_color = #FFFFFF 16
|
||||
border_color = #FFFFFF 68
|
||||
|
||||
# Panel
|
||||
panel_monitor = all
|
||||
panel_position = bottom center horizontal
|
||||
panel_size = 94% 30
|
||||
panel_margin = 0 0
|
||||
panel_padding = 7 0 7
|
||||
panel_dock = 0
|
||||
wm_menu = 0
|
||||
panel_layer = top
|
||||
panel_background_id = 1
|
||||
|
||||
# Panel Autohide
|
||||
autohide = 0
|
||||
autohide_show_timeout = 0.3
|
||||
autohide_hide_timeout = 2
|
||||
autohide_height = 2
|
||||
strut_policy = follow_size
|
||||
|
||||
# Taskbar
|
||||
taskbar_mode = single_desktop
|
||||
taskbar_padding = 2 3 2
|
||||
taskbar_background_id = 0
|
||||
taskbar_active_background_id = 0
|
||||
|
||||
# Tasks
|
||||
urgent_nb_of_blink = 8
|
||||
task_icon = 1
|
||||
task_text = 1
|
||||
task_centered = 1
|
||||
task_maximum_size = 140 35
|
||||
task_padding = 6 2
|
||||
task_background_id = 3
|
||||
task_active_background_id = 2
|
||||
task_urgent_background_id = 2
|
||||
task_iconified_background_id = 3
|
||||
task_tooltip = 0
|
||||
|
||||
# Task Icons
|
||||
task_icon_asb = 70 0 0
|
||||
task_active_icon_asb = 100 0 0
|
||||
task_urgent_icon_asb = 100 0 0
|
||||
task_iconified_icon_asb = 70 0 0
|
||||
|
||||
# Fonts
|
||||
task_font = sans 7
|
||||
task_font_color = #FFFFFF 68
|
||||
task_active_font_color = #FFFFFF 83
|
||||
task_urgent_font_color = #FFFFFF 83
|
||||
task_iconified_font_color = #FFFFFF 68
|
||||
font_shadow = 0
|
||||
|
||||
# System Tray
|
||||
systray = 1
|
||||
systray_padding = 0 4 5
|
||||
systray_sort = ascending
|
||||
systray_background_id = 0
|
||||
systray_icon_size = 16
|
||||
systray_icon_asb = 70 0 0
|
||||
|
||||
# Clock
|
||||
time1_format = %H:%M
|
||||
time1_font = sans 8
|
||||
time2_format = %A %d %B
|
||||
time2_font = sans 6
|
||||
clock_font_color = #FFFFFF 74
|
||||
clock_padding = 1 0
|
||||
clock_background_id = 0
|
||||
clock_rclick_command = orage
|
||||
|
||||
# Tooltips
|
||||
tooltip_padding = 2 2
|
||||
tooltip_show_timeout = 0.7
|
||||
tooltip_hide_timeout = 0.3
|
||||
tooltip_background_id = 1
|
||||
tooltip_font = sans 10
|
||||
tooltip_font_color = #000000 80
|
||||
|
||||
# Mouse
|
||||
mouse_middle = none
|
||||
mouse_right = close
|
||||
mouse_scroll_up = toggle
|
||||
mouse_scroll_down = iconify
|
||||
|
||||
# Battery
|
||||
battery = 0
|
||||
battery_low_status = 10
|
||||
battery_low_cmd = notify-send "battery low"
|
||||
battery_hide = 98
|
||||
bat1_font = sans 8
|
||||
bat2_font = sans 6
|
||||
battery_font_color = #FFFFFF 74
|
||||
battery_padding = 1 0
|
||||
battery_background_id = 0
|
||||
|
||||
# End of config
|
||||
@@ -1,8 +1,8 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : Generic battery
|
||||
* Tint2 : battery
|
||||
*
|
||||
* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
|
||||
* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
@@ -24,6 +24,18 @@
|
||||
#include <cairo-xlib.h>
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
#include <machine/apmvar.h>
|
||||
#include <err.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#if defined(__FreeBSD__)
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
#include "window.h"
|
||||
#include "server.h"
|
||||
#include "panel.h"
|
||||
@@ -31,261 +43,402 @@
|
||||
#include "timer.h"
|
||||
#include "common.h"
|
||||
|
||||
gboolean bat1_has_font;
|
||||
PangoFontDescription *bat1_font_desc;
|
||||
gboolean bat2_has_font;
|
||||
PangoFontDescription *bat2_font_desc;
|
||||
struct BatteryState battery_state;
|
||||
gboolean battery_enabled;
|
||||
gboolean battery_tooltip_enabled;
|
||||
struct batstate battery_state;
|
||||
int battery_enabled;
|
||||
int percentage_hide;
|
||||
static timeout *battery_timeout;
|
||||
static timeout* battery_timeout;
|
||||
|
||||
static char buf_bat_percentage[10];
|
||||
static char buf_bat_time[20];
|
||||
|
||||
int8_t battery_low_status;
|
||||
gboolean battery_low_cmd_sent;
|
||||
char *ac_connected_cmd;
|
||||
char *ac_disconnected_cmd;
|
||||
unsigned char battery_low_cmd_send;
|
||||
char *battery_low_cmd;
|
||||
char *battery_lclick_command;
|
||||
char *battery_mclick_command;
|
||||
char *battery_rclick_command;
|
||||
char *battery_uwheel_command;
|
||||
char *battery_dwheel_command;
|
||||
gboolean battery_found;
|
||||
char *path_energy_now;
|
||||
char *path_energy_full;
|
||||
char *path_current_now;
|
||||
char *path_status;
|
||||
|
||||
void battery_init_fonts();
|
||||
char *battery_get_tooltip(void *obj);
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
int apm_fd;
|
||||
#endif
|
||||
|
||||
void update_batterys(void* arg)
|
||||
{
|
||||
int old_percentage = battery_state.percentage;
|
||||
int16_t old_hours = battery_state.time.hours;
|
||||
int8_t old_minutes = battery_state.time.minutes;
|
||||
|
||||
update_battery();
|
||||
if (old_percentage == battery_state.percentage && old_hours == battery_state.time.hours && old_minutes == battery_state.time.minutes)
|
||||
return;
|
||||
|
||||
int i;
|
||||
for (i=0 ; i < nb_panel ; i++) {
|
||||
if (battery_state.percentage >= percentage_hide) {
|
||||
if (panel1[i].battery.area.on_screen == 1) {
|
||||
hide(&panel1[i].battery.area);
|
||||
panel_refresh = 1;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (panel1[i].battery.area.on_screen == 0) {
|
||||
show(&panel1[i].battery.area);
|
||||
panel_refresh = 1;
|
||||
}
|
||||
}
|
||||
if (panel1[i].battery.area.on_screen == 1) {
|
||||
panel1[i].battery.area.resize = 1;
|
||||
panel_refresh = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void default_battery()
|
||||
{
|
||||
battery_enabled = FALSE;
|
||||
battery_tooltip_enabled = TRUE;
|
||||
battery_found = FALSE;
|
||||
battery_enabled = 0;
|
||||
percentage_hide = 101;
|
||||
battery_low_cmd_sent = FALSE;
|
||||
battery_timeout = NULL;
|
||||
bat1_has_font = FALSE;
|
||||
bat1_font_desc = NULL;
|
||||
bat2_has_font = FALSE;
|
||||
bat2_font_desc = NULL;
|
||||
ac_connected_cmd = NULL;
|
||||
ac_disconnected_cmd = NULL;
|
||||
battery_low_cmd = NULL;
|
||||
battery_lclick_command = NULL;
|
||||
battery_mclick_command = NULL;
|
||||
battery_rclick_command = NULL;
|
||||
battery_uwheel_command = NULL;
|
||||
battery_dwheel_command = NULL;
|
||||
battery_low_cmd_send = 0;
|
||||
battery_timeout = 0;
|
||||
bat1_font_desc = 0;
|
||||
bat2_font_desc = 0;
|
||||
battery_low_cmd = 0;
|
||||
path_energy_now = 0;
|
||||
path_energy_full = 0;
|
||||
path_current_now = 0;
|
||||
path_status = 0;
|
||||
battery_state.percentage = 0;
|
||||
battery_state.time.hours = 0;
|
||||
battery_state.time.minutes = 0;
|
||||
battery_state.time.seconds = 0;
|
||||
battery_state.state = BATTERY_UNKNOWN;
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
apm_fd = -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
void cleanup_battery()
|
||||
{
|
||||
pango_font_description_free(bat1_font_desc);
|
||||
bat1_font_desc = NULL;
|
||||
pango_font_description_free(bat2_font_desc);
|
||||
bat2_font_desc = NULL;
|
||||
free(battery_low_cmd);
|
||||
battery_low_cmd = NULL;
|
||||
free(battery_lclick_command);
|
||||
battery_lclick_command = NULL;
|
||||
free(battery_mclick_command);
|
||||
battery_mclick_command = NULL;
|
||||
free(battery_rclick_command);
|
||||
battery_rclick_command = NULL;
|
||||
free(battery_uwheel_command);
|
||||
battery_uwheel_command = NULL;
|
||||
free(battery_dwheel_command);
|
||||
battery_dwheel_command = NULL;
|
||||
free(ac_connected_cmd);
|
||||
ac_connected_cmd = NULL;
|
||||
free(ac_disconnected_cmd);
|
||||
ac_disconnected_cmd = NULL;
|
||||
stop_timeout(battery_timeout);
|
||||
battery_timeout = NULL;
|
||||
battery_found = FALSE;
|
||||
if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
|
||||
if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
|
||||
if (path_energy_now) g_free(path_energy_now);
|
||||
if (path_energy_full) g_free(path_energy_full);
|
||||
if (path_current_now) g_free(path_current_now);
|
||||
if (path_status) g_free(path_status);
|
||||
if (battery_low_cmd) g_free(battery_low_cmd);
|
||||
if (battery_timeout) stop_timeout(battery_timeout);
|
||||
|
||||
battery_os_free();
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
if ((apm_fd != -1) && (close(apm_fd) == -1))
|
||||
warn("cannot close /dev/apm");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void init_battery()
|
||||
{
|
||||
if (!battery_enabled)
|
||||
if (!battery_enabled) return;
|
||||
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
apm_fd = open("/dev/apm", O_RDONLY);
|
||||
if (apm_fd < 0) {
|
||||
warn("init_battery: failed to open /dev/apm.");
|
||||
battery_enabled = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
battery_found = battery_os_init();
|
||||
#elif !defined(__FreeBSD__)
|
||||
// check battery
|
||||
GDir *directory = 0;
|
||||
GError *error = NULL;
|
||||
const char *entryname;
|
||||
char *battery_dir = 0;
|
||||
|
||||
if (!battery_timeout)
|
||||
battery_timeout = add_timeout(10, 30000, update_battery_tick, 0, &battery_timeout);
|
||||
directory = g_dir_open("/sys/class/power_supply", 0, &error);
|
||||
if (error)
|
||||
g_error_free(error);
|
||||
else {
|
||||
while ((entryname=g_dir_read_name(directory))) {
|
||||
if (strncmp(entryname,"AC", 2) == 0) continue;
|
||||
|
||||
update_battery();
|
||||
char *path1 = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
|
||||
if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
|
||||
g_free(path1);
|
||||
battery_dir = g_build_filename("/sys/class/power_supply", entryname, NULL);
|
||||
break;
|
||||
}
|
||||
g_free(path1);
|
||||
}
|
||||
}
|
||||
if (directory)
|
||||
g_dir_close(directory);
|
||||
if (!battery_dir) {
|
||||
fprintf(stderr, "ERROR: battery applet can't found power_supply\n");
|
||||
default_battery();
|
||||
return;
|
||||
}
|
||||
|
||||
char *path1 = g_build_filename(battery_dir, "energy_now", NULL);
|
||||
if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
|
||||
path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
|
||||
path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
|
||||
}
|
||||
else {
|
||||
char *path2 = g_build_filename(battery_dir, "charge_now", NULL);
|
||||
if (g_file_test (path2, G_FILE_TEST_EXISTS)) {
|
||||
path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
|
||||
path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
|
||||
}
|
||||
else {
|
||||
fprintf(stderr, "ERROR: can't found energy_* or charge_*\n");
|
||||
}
|
||||
g_free(path2);
|
||||
}
|
||||
|
||||
path_current_now = g_build_filename(battery_dir, "power_now", NULL);
|
||||
if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
|
||||
g_free(path_current_now);
|
||||
path_current_now = g_build_filename(battery_dir, "current_now", NULL);
|
||||
}
|
||||
|
||||
if (path_energy_now && path_energy_full) {
|
||||
path_status = g_build_filename(battery_dir, "status", NULL);
|
||||
|
||||
// check file
|
||||
FILE *fp1, *fp2, *fp3, *fp4;
|
||||
fp1 = fopen(path_energy_now, "r");
|
||||
fp2 = fopen(path_energy_full, "r");
|
||||
fp3 = fopen(path_current_now, "r");
|
||||
fp4 = fopen(path_status, "r");
|
||||
if (fp1 == NULL || fp2 == NULL || fp3 == NULL || fp4 == NULL) {
|
||||
cleanup_battery();
|
||||
default_battery();
|
||||
fprintf(stderr, "ERROR: battery applet can't open energy_now\n");
|
||||
}
|
||||
fclose(fp1);
|
||||
fclose(fp2);
|
||||
fclose(fp3);
|
||||
fclose(fp4);
|
||||
}
|
||||
|
||||
g_free(path1);
|
||||
g_free(battery_dir);
|
||||
#endif
|
||||
|
||||
if (battery_enabled && battery_timeout==0)
|
||||
battery_timeout = add_timeout(10, 10000, update_batterys, 0);
|
||||
}
|
||||
|
||||
void reinit_battery()
|
||||
{
|
||||
battery_os_free();
|
||||
battery_found = battery_os_init();
|
||||
update_battery();
|
||||
}
|
||||
|
||||
void init_battery_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
Panel *panel = (Panel*)p;
|
||||
Battery *battery = &panel->battery;
|
||||
|
||||
if (!battery_enabled)
|
||||
return;
|
||||
|
||||
battery_init_fonts();
|
||||
|
||||
if (!battery->area.bg)
|
||||
if (battery->area.bg == 0)
|
||||
battery->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
|
||||
battery->area.parent = p;
|
||||
battery->area.panel = p;
|
||||
snprintf(battery->area.name, sizeof(battery->area.name), "Battery");
|
||||
battery->area._draw_foreground = draw_battery;
|
||||
battery->area.size_mode = LAYOUT_FIXED;
|
||||
battery->area.size_mode = SIZE_BY_CONTENT;
|
||||
battery->area._resize = resize_battery;
|
||||
battery->area._is_under_mouse = full_width_area_is_under_mouse;
|
||||
battery->area.on_screen = TRUE;
|
||||
battery->area.resize_needed = 1;
|
||||
battery->area.has_mouse_over_effect =
|
||||
panel_config.mouse_effects && (battery_lclick_command || battery_mclick_command || battery_rclick_command ||
|
||||
battery_uwheel_command || battery_dwheel_command);
|
||||
battery->area.has_mouse_press_effect = battery->area.has_mouse_over_effect;
|
||||
if (battery_tooltip_enabled)
|
||||
battery->area._get_tooltip_text = battery_get_tooltip;
|
||||
battery->area.on_screen = 1;
|
||||
battery->area.resize = 1;
|
||||
}
|
||||
|
||||
void battery_init_fonts()
|
||||
{
|
||||
if (!bat1_font_desc) {
|
||||
bat1_font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_size(bat1_font_desc, pango_font_description_get_size(bat1_font_desc) - PANGO_SCALE);
|
||||
}
|
||||
if (!bat2_font_desc) {
|
||||
bat2_font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_size(bat2_font_desc, pango_font_description_get_size(bat2_font_desc) - PANGO_SCALE);
|
||||
}
|
||||
}
|
||||
|
||||
void battery_default_font_changed()
|
||||
{
|
||||
if (!battery_enabled)
|
||||
return;
|
||||
if (bat1_has_font && bat2_has_font)
|
||||
return;
|
||||
if (!bat1_has_font) {
|
||||
pango_font_description_free(bat1_font_desc);
|
||||
bat1_font_desc = NULL;
|
||||
}
|
||||
if (!bat2_has_font) {
|
||||
pango_font_description_free(bat2_font_desc);
|
||||
bat2_font_desc = NULL;
|
||||
}
|
||||
battery_init_fonts();
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
panels[i].battery.area.resize_needed = TRUE;
|
||||
schedule_redraw(&panels[i].battery.area);
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
void update_battery() {
|
||||
#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
|
||||
// unused on OpenBSD, silence compiler warnings
|
||||
FILE *fp;
|
||||
char tmp[25];
|
||||
int64_t current_now = 0;
|
||||
#endif
|
||||
#if defined(__FreeBSD__)
|
||||
int sysctl_out = 0;
|
||||
size_t len = 0;
|
||||
#endif
|
||||
int64_t energy_now = 0, energy_full = 0;
|
||||
int seconds = 0;
|
||||
int8_t new_percentage = 0;
|
||||
|
||||
void update_battery_tick(void *arg)
|
||||
{
|
||||
if (!battery_enabled)
|
||||
return;
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
struct apm_power_info info;
|
||||
if (ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) < 0)
|
||||
warn("power update: APM_IOC_GETPOWER");
|
||||
|
||||
gboolean old_found = battery_found;
|
||||
int old_percentage = battery_state.percentage;
|
||||
gboolean old_ac_connected = battery_state.ac_connected;
|
||||
int16_t old_hours = battery_state.time.hours;
|
||||
int8_t old_minutes = battery_state.time.minutes;
|
||||
|
||||
if (!battery_found) {
|
||||
init_battery();
|
||||
old_ac_connected = battery_state.ac_connected;
|
||||
}
|
||||
if (update_battery() != 0) {
|
||||
// Try to reconfigure on failed update
|
||||
init_battery();
|
||||
}
|
||||
|
||||
if (old_ac_connected != battery_state.ac_connected) {
|
||||
if (battery_state.ac_connected)
|
||||
tint_exec(ac_connected_cmd);
|
||||
else
|
||||
tint_exec(ac_disconnected_cmd);
|
||||
}
|
||||
|
||||
if (battery_state.percentage < battery_low_status && battery_state.state == BATTERY_DISCHARGING &&
|
||||
!battery_low_cmd_sent) {
|
||||
tint_exec(battery_low_cmd);
|
||||
battery_low_cmd_sent = TRUE;
|
||||
}
|
||||
if (battery_state.percentage > battery_low_status && battery_state.state == BATTERY_CHARGING &&
|
||||
battery_low_cmd_sent) {
|
||||
battery_low_cmd_sent = FALSE;
|
||||
}
|
||||
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
// Show/hide if needed
|
||||
if (!battery_found) {
|
||||
if (panels[i].battery.area.on_screen) {
|
||||
hide(&panels[i].battery.area);
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
} else {
|
||||
if (battery_state.percentage >= percentage_hide) {
|
||||
if (panels[i].battery.area.on_screen) {
|
||||
hide(&panels[i].battery.area);
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
} else {
|
||||
if (!panels[i].battery.area.on_screen) {
|
||||
show(&panels[i].battery.area);
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Redraw if needed
|
||||
if (panels[i].battery.area.on_screen) {
|
||||
if (old_found != battery_found || old_percentage != battery_state.percentage ||
|
||||
old_hours != battery_state.time.hours || old_minutes != battery_state.time.minutes) {
|
||||
panels[i].battery.area.resize_needed = TRUE;
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int update_battery()
|
||||
{
|
||||
// Reset
|
||||
// best attempt at mapping to linux battery states
|
||||
battery_state.state = BATTERY_UNKNOWN;
|
||||
battery_state.percentage = 0;
|
||||
battery_state.ac_connected = FALSE;
|
||||
battery_state_set_time(&battery_state, 0);
|
||||
switch (info.battery_state) {
|
||||
case APM_BATT_CHARGING:
|
||||
battery_state.state = BATTERY_CHARGING;
|
||||
break;
|
||||
default:
|
||||
battery_state.state = BATTERY_DISCHARGING;
|
||||
break;
|
||||
}
|
||||
|
||||
int err = battery_os_update(&battery_state);
|
||||
if (info.battery_life == 100)
|
||||
battery_state.state = BATTERY_FULL;
|
||||
|
||||
// Clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
|
||||
if (battery_state.percentage > 100) {
|
||||
// no mapping for openbsd really
|
||||
energy_full = 0;
|
||||
energy_now = 0;
|
||||
|
||||
if (info.minutes_left != -1)
|
||||
seconds = info.minutes_left * 60;
|
||||
else
|
||||
seconds = -1;
|
||||
|
||||
new_percentage = info.battery_life;
|
||||
|
||||
#elif defined(__FreeBSD__)
|
||||
len = sizeof(sysctl_out);
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) != 0)
|
||||
fprintf(stderr, "power update: no such sysctl");
|
||||
|
||||
// attemp to map the battery state to linux
|
||||
battery_state.state = BATTERY_UNKNOWN;
|
||||
|
||||
switch(sysctl_out) {
|
||||
case 1:
|
||||
battery_state.state = BATTERY_DISCHARGING;
|
||||
break;
|
||||
case 2:
|
||||
battery_state.state = BATTERY_CHARGING;
|
||||
break;
|
||||
default:
|
||||
battery_state.state = BATTERY_FULL;
|
||||
break;
|
||||
}
|
||||
|
||||
// no mapping for freebsd
|
||||
energy_full = 0;
|
||||
energy_now = 0;
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) != 0)
|
||||
seconds = -1;
|
||||
else
|
||||
seconds = sysctl_out * 60;
|
||||
|
||||
// charging or error
|
||||
if (seconds < 0)
|
||||
seconds = 0;
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) != 0)
|
||||
new_percentage = -1;
|
||||
else
|
||||
new_percentage = sysctl_out;
|
||||
|
||||
#else
|
||||
fp = fopen(path_status, "r");
|
||||
if(fp != NULL) {
|
||||
if (fgets(tmp, sizeof tmp, fp)) {
|
||||
battery_state.state = BATTERY_UNKNOWN;
|
||||
if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING;
|
||||
if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING;
|
||||
if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL;
|
||||
}
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
fp = fopen(path_energy_now, "r");
|
||||
if(fp != NULL) {
|
||||
if (fgets(tmp, sizeof tmp, fp)) energy_now = atoi(tmp);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
fp = fopen(path_energy_full, "r");
|
||||
if(fp != NULL) {
|
||||
if (fgets(tmp, sizeof tmp, fp)) energy_full = atoi(tmp);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
fp = fopen(path_current_now, "r");
|
||||
if(fp != NULL) {
|
||||
if (fgets(tmp, sizeof tmp, fp)) current_now = atoi(tmp);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
if(current_now > 0) {
|
||||
switch(battery_state.state) {
|
||||
case BATTERY_CHARGING:
|
||||
seconds = 3600 * (energy_full - energy_now) / current_now;
|
||||
break;
|
||||
case BATTERY_DISCHARGING:
|
||||
seconds = 3600 * energy_now / current_now;
|
||||
break;
|
||||
default:
|
||||
seconds = 0;
|
||||
break;
|
||||
}
|
||||
} else seconds = 0;
|
||||
#endif
|
||||
|
||||
battery_state.time.hours = seconds / 3600;
|
||||
seconds -= 3600 * battery_state.time.hours;
|
||||
battery_state.time.minutes = seconds / 60;
|
||||
seconds -= 60 * battery_state.time.minutes;
|
||||
battery_state.time.seconds = seconds;
|
||||
|
||||
if(energy_full > 0)
|
||||
new_percentage = (energy_now*100)/energy_full;
|
||||
|
||||
if(battery_low_status > new_percentage && battery_state.state == BATTERY_DISCHARGING && !battery_low_cmd_send) {
|
||||
tint_exec(battery_low_cmd);
|
||||
battery_low_cmd_send = 1;
|
||||
}
|
||||
if(battery_low_status < new_percentage && battery_state.state == BATTERY_CHARGING && battery_low_cmd_send) {
|
||||
battery_low_cmd_send = 0;
|
||||
}
|
||||
|
||||
battery_state.percentage = new_percentage;
|
||||
|
||||
// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
|
||||
if(battery_state.percentage > 100) {
|
||||
battery_state.percentage = 100;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
gboolean resize_battery(void *obj)
|
||||
|
||||
void draw_battery (void *obj, cairo_t *c)
|
||||
{
|
||||
Battery *battery = obj;
|
||||
PangoLayout *layout;
|
||||
|
||||
layout = pango_cairo_create_layout (c);
|
||||
|
||||
// draw layout
|
||||
pango_layout_set_font_description(layout, bat1_font_desc);
|
||||
pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
|
||||
|
||||
cairo_set_source_rgba(c, battery->font.color[0], battery->font.color[1], battery->font.color[2], battery->font.alpha);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
cairo_move_to(c, 0, battery->bat1_posy);
|
||||
pango_cairo_show_layout(c, layout);
|
||||
|
||||
pango_layout_set_font_description(layout, bat2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
|
||||
pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
cairo_move_to(c, 0, battery->bat2_posy);
|
||||
pango_cairo_show_layout(c, layout);
|
||||
|
||||
g_object_unref(layout);
|
||||
}
|
||||
|
||||
|
||||
int resize_battery(void *obj)
|
||||
{
|
||||
Battery *battery = obj;
|
||||
Panel *panel = battery->area.panel;
|
||||
@@ -293,53 +446,33 @@ gboolean resize_battery(void *obj)
|
||||
int bat_time_height, bat_time_width, bat_time_height_ink;
|
||||
int ret = 0;
|
||||
|
||||
schedule_redraw(&battery->area);
|
||||
battery->area.redraw = 1;
|
||||
|
||||
snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
|
||||
if (battery_state.state == BATTERY_FULL) {
|
||||
if(battery_state.state == BATTERY_FULL) {
|
||||
strcpy(buf_bat_time, "Full");
|
||||
} else {
|
||||
snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
|
||||
}
|
||||
get_text_size2(bat1_font_desc,
|
||||
&bat_percentage_height_ink,
|
||||
&bat_percentage_height,
|
||||
&bat_percentage_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
buf_bat_percentage,
|
||||
strlen(buf_bat_percentage),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
FALSE);
|
||||
get_text_size2(bat2_font_desc,
|
||||
&bat_time_height_ink,
|
||||
&bat_time_height,
|
||||
&bat_time_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
buf_bat_time,
|
||||
strlen(buf_bat_time),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
FALSE);
|
||||
get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width, panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage));
|
||||
get_text_size2(bat2_font_desc, &bat_time_height_ink, &bat_time_height, &bat_time_width, panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time));
|
||||
|
||||
if (panel_horizontal) {
|
||||
int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
|
||||
new_size += 2 * battery->area.paddingxlr + 2 * battery->area.bg->border.width;
|
||||
if (new_size > battery->area.width || new_size < battery->area.width - 2) {
|
||||
new_size += (2*battery->area.paddingxlr) + (2*battery->area.bg->border.width);
|
||||
if (new_size > battery->area.width || new_size < (battery->area.width-2)) {
|
||||
// we try to limit the number of resize
|
||||
battery->area.width = new_size;
|
||||
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height) / 2;
|
||||
battery->area.width = new_size;
|
||||
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height)/2;
|
||||
battery->bat2_posy = battery->bat1_posy + bat_percentage_height;
|
||||
ret = 1;
|
||||
}
|
||||
} else {
|
||||
int new_size =
|
||||
bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
|
||||
if (new_size > battery->area.height || new_size < battery->area.height - 2) {
|
||||
battery->area.height = new_size;
|
||||
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2) / 2;
|
||||
}
|
||||
else {
|
||||
int new_size = bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
|
||||
if (new_size > battery->area.height || new_size < (battery->area.height-2)) {
|
||||
battery->area.height = new_size;
|
||||
battery->bat1_posy = (battery->area.height - bat_percentage_height - bat_time_height - 2)/2;
|
||||
battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2;
|
||||
ret = 1;
|
||||
}
|
||||
@@ -347,65 +480,3 @@ gboolean resize_battery(void *obj)
|
||||
return ret;
|
||||
}
|
||||
|
||||
void draw_battery(void *obj, cairo_t *c)
|
||||
{
|
||||
Battery *battery = obj;
|
||||
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_font_description(layout, bat1_font_desc);
|
||||
pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
|
||||
|
||||
cairo_set_source_rgba(c,
|
||||
battery->font_color.rgb[0],
|
||||
battery->font_color.rgb[1],
|
||||
battery->font_color.rgb[2],
|
||||
battery->font_color.alpha);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, 0, battery->bat1_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
|
||||
|
||||
pango_layout_set_font_description(layout, bat2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
|
||||
pango_layout_set_width(layout, battery->area.width * PANGO_SCALE);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, 0, battery->bat2_posy, &battery->font_color, ((Panel *)battery->area.panel)->font_shadow);
|
||||
pango_cairo_show_layout(c, layout);
|
||||
|
||||
g_object_unref(layout);
|
||||
}
|
||||
|
||||
char *battery_get_tooltip(void *obj)
|
||||
{
|
||||
return battery_os_tooltip();
|
||||
}
|
||||
|
||||
void battery_action(int button)
|
||||
{
|
||||
char *command = NULL;
|
||||
switch (button) {
|
||||
case 1:
|
||||
command = battery_lclick_command;
|
||||
break;
|
||||
case 2:
|
||||
command = battery_mclick_command;
|
||||
break;
|
||||
case 3:
|
||||
command = battery_rclick_command;
|
||||
break;
|
||||
case 4:
|
||||
command = battery_uwheel_command;
|
||||
break;
|
||||
case 5:
|
||||
command = battery_dwheel_command;
|
||||
break;
|
||||
}
|
||||
tint_exec(command);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
/**************************************************************************
|
||||
* Copyright (C) 2009-2015 Sebastian Reichel <sre@ring0.de>
|
||||
* Copyright (C) 2009 Sebastian Reichel <elektranox@gmail.com>
|
||||
*
|
||||
* Battery with functional data (percentage, time to life) and drawing data
|
||||
* (area, font, ...). Each panel use his own drawing data.
|
||||
* Need kernel > 2.6.23.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
@@ -16,77 +17,45 @@
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
|
||||
|
||||
// battery drawing parameter (per panel)
|
||||
typedef struct Battery {
|
||||
// always start with area
|
||||
Area area;
|
||||
Color font_color;
|
||||
|
||||
Color font;
|
||||
int bat1_posy;
|
||||
int bat2_posy;
|
||||
} Battery;
|
||||
|
||||
typedef enum ChargeState {
|
||||
BATTERY_UNKNOWN = 0,
|
||||
enum chargestate {
|
||||
BATTERY_UNKNOWN,
|
||||
BATTERY_CHARGING,
|
||||
BATTERY_DISCHARGING,
|
||||
BATTERY_FULL,
|
||||
} ChargeState;
|
||||
BATTERY_FULL
|
||||
};
|
||||
|
||||
typedef struct BatteryTime {
|
||||
typedef struct battime {
|
||||
int16_t hours;
|
||||
int8_t minutes;
|
||||
int8_t seconds;
|
||||
} BatteryTime;
|
||||
} battime;
|
||||
|
||||
typedef struct BatteryState {
|
||||
typedef struct batstate {
|
||||
int percentage;
|
||||
BatteryTime time;
|
||||
ChargeState state;
|
||||
gboolean ac_connected;
|
||||
} BatteryState;
|
||||
struct battime time;
|
||||
enum chargestate state;
|
||||
} batstate;
|
||||
|
||||
extern struct BatteryState battery_state;
|
||||
extern gboolean bat1_has_font;
|
||||
extern struct batstate battery_state;
|
||||
extern PangoFontDescription *bat1_font_desc;
|
||||
extern gboolean bat2_has_font;
|
||||
extern PangoFontDescription *bat2_font_desc;
|
||||
extern gboolean battery_enabled;
|
||||
extern gboolean battery_tooltip_enabled;
|
||||
extern int battery_enabled;
|
||||
extern int percentage_hide;
|
||||
|
||||
extern int8_t battery_low_status;
|
||||
extern char *battery_low_cmd;
|
||||
|
||||
extern char *ac_connected_cmd;
|
||||
extern char *ac_disconnected_cmd;
|
||||
|
||||
extern char *battery_lclick_command;
|
||||
extern char *battery_mclick_command;
|
||||
extern char *battery_rclick_command;
|
||||
extern char *battery_uwheel_command;
|
||||
extern char *battery_dwheel_command;
|
||||
|
||||
static inline gchar *chargestate2str(ChargeState state)
|
||||
{
|
||||
switch (state) {
|
||||
case BATTERY_CHARGING:
|
||||
return "Charging";
|
||||
case BATTERY_DISCHARGING:
|
||||
return "Discharging";
|
||||
case BATTERY_FULL:
|
||||
return "Full";
|
||||
case BATTERY_UNKNOWN:
|
||||
default:
|
||||
return "Unknown";
|
||||
};
|
||||
}
|
||||
|
||||
static inline void battery_state_set_time(BatteryState *state, int seconds)
|
||||
{
|
||||
state->time.hours = seconds / 3600;
|
||||
seconds -= 3600 * state->time.hours;
|
||||
state->time.minutes = seconds / 60;
|
||||
seconds -= 60 * state->time.minutes;
|
||||
state->time.seconds = seconds;
|
||||
}
|
||||
extern char *path_energy_now, *path_energy_full, *path_current_now, *path_status;
|
||||
|
||||
// default global data
|
||||
void default_battery();
|
||||
@@ -94,24 +63,14 @@ void default_battery();
|
||||
// freed memory
|
||||
void cleanup_battery();
|
||||
|
||||
void update_battery_tick(void *arg);
|
||||
int update_battery();
|
||||
// initialize clock : y position, ...
|
||||
void update_battery();
|
||||
|
||||
void init_battery();
|
||||
void init_battery_panel(void *panel);
|
||||
|
||||
void reinit_battery();
|
||||
void draw_battery(void *obj, cairo_t *c);
|
||||
void battery_default_font_changed();
|
||||
|
||||
gboolean resize_battery(void *obj);
|
||||
|
||||
void battery_action(int button);
|
||||
|
||||
/* operating system specific functions */
|
||||
gboolean battery_os_init();
|
||||
void battery_os_free();
|
||||
int battery_os_update(BatteryState *state);
|
||||
char *battery_os_tooltip();
|
||||
int resize_battery(void *obj);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : Dummy battery (non-functional)
|
||||
*
|
||||
* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* or any later version as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#include <string.h>
|
||||
#include "common.h"
|
||||
#include "battery.h"
|
||||
|
||||
#warning tint2 has no battery support for this operating system!
|
||||
|
||||
gboolean battery_os_init()
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void battery_os_free()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int battery_os_update(BatteryState *state)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
char *battery_os_tooltip()
|
||||
{
|
||||
return strdup("Operating System not supported");
|
||||
}
|
||||
@@ -1,102 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : FreeBSD battery
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* or any later version as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "battery.h"
|
||||
|
||||
gboolean battery_os_init()
|
||||
{
|
||||
int sysctl_out = 0;
|
||||
size_t len = sizeof(sysctl_out);
|
||||
|
||||
return (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) ||
|
||||
(sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0) ||
|
||||
(sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0);
|
||||
}
|
||||
|
||||
void battery_os_free()
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int battery_os_update(BatteryState *state)
|
||||
{
|
||||
int sysctl_out = 0;
|
||||
size_t len = sizeof(sysctl_out);
|
||||
gboolean err = 0;
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.state", &sysctl_out, &len, NULL, 0) == 0) {
|
||||
switch (sysctl_out) {
|
||||
case 1:
|
||||
state->state = BATTERY_DISCHARGING;
|
||||
break;
|
||||
case 2:
|
||||
state->state = BATTERY_CHARGING;
|
||||
break;
|
||||
default:
|
||||
state->state = BATTERY_FULL;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
fprintf(stderr, "power update: no such sysctl");
|
||||
err = -1;
|
||||
}
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.time", &sysctl_out, &len, NULL, 0) == 0)
|
||||
battery_state_set_time(state, sysctl_out * 60);
|
||||
else
|
||||
err = -1;
|
||||
|
||||
if (sysctlbyname("hw.acpi.battery.life", &sysctl_out, &len, NULL, 0) == 0)
|
||||
state->percentage = sysctl_out;
|
||||
else
|
||||
err = -1;
|
||||
|
||||
if (sysctlbyname("hw.acpi.acline", &sysctl_out, &len, NULL, 0) == 0)
|
||||
state->ac_connected = sysctl_out;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
char *battery_os_tooltip()
|
||||
{
|
||||
GString *tooltip = g_string_new("");
|
||||
gchar *result;
|
||||
|
||||
g_string_append_printf(tooltip, "Battery\n");
|
||||
|
||||
gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
|
||||
|
||||
g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
|
||||
|
||||
g_string_append_c(tooltip, '\n');
|
||||
g_string_append_printf(tooltip, "AC\n");
|
||||
g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
|
||||
|
||||
result = tooltip->str;
|
||||
g_string_free(tooltip, FALSE);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,541 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : Linux battery
|
||||
*
|
||||
* Copyright (C) 2015 Sebastian Reichel <sre@ring0.de>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* or any later version as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#ifdef __linux__
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "battery.h"
|
||||
#include "uevent.h"
|
||||
|
||||
enum psy_type {
|
||||
PSY_UNKNOWN,
|
||||
PSY_BATTERY,
|
||||
PSY_MAINS,
|
||||
};
|
||||
|
||||
struct psy_battery {
|
||||
/* generic properties */
|
||||
gchar *name;
|
||||
/* monotonic time, in microseconds */
|
||||
gint64 timestamp;
|
||||
/* sysfs files */
|
||||
gchar *path_present;
|
||||
gchar *path_energy_now;
|
||||
gchar *path_energy_full;
|
||||
gchar *path_power_now;
|
||||
gchar *path_status;
|
||||
/* sysfs hints */
|
||||
gboolean energy_in_uamp;
|
||||
gboolean power_in_uamp;
|
||||
/* values */
|
||||
gboolean present;
|
||||
gint energy_now;
|
||||
gint energy_full;
|
||||
gint power_now;
|
||||
ChargeState status;
|
||||
};
|
||||
|
||||
struct psy_mains {
|
||||
/* generic properties */
|
||||
gchar *name;
|
||||
/* sysfs files */
|
||||
gchar *path_online;
|
||||
/* values */
|
||||
gboolean online;
|
||||
};
|
||||
|
||||
static void uevent_battery_update()
|
||||
{
|
||||
update_battery_tick(NULL);
|
||||
}
|
||||
static struct uevent_notify psy_change = {UEVENT_CHANGE, "power_supply", NULL, uevent_battery_update};
|
||||
|
||||
static void uevent_battery_plug()
|
||||
{
|
||||
printf("reinitialize batteries after HW change\n");
|
||||
reinit_battery();
|
||||
}
|
||||
static struct uevent_notify psy_plug = {UEVENT_ADD | UEVENT_REMOVE, "power_supply", NULL, uevent_battery_plug};
|
||||
|
||||
#define RETURN_ON_ERROR(err) \
|
||||
if (error) { \
|
||||
g_error_free(err); \
|
||||
return FALSE; \
|
||||
}
|
||||
|
||||
static GList *batteries = NULL;
|
||||
static GList *mains = NULL;
|
||||
|
||||
static guint8 energy_to_percent(gint energy_now, gint energy_full)
|
||||
{
|
||||
return 0.5 + ((energy_now <= energy_full ? energy_now : energy_full) * 100.0) / energy_full;
|
||||
}
|
||||
|
||||
static enum psy_type power_supply_get_type(const gchar *entryname)
|
||||
{
|
||||
gchar *path_type = g_build_filename("/sys/class/power_supply", entryname, "type", NULL);
|
||||
GError *error = NULL;
|
||||
gchar *type;
|
||||
gsize typelen;
|
||||
|
||||
g_file_get_contents(path_type, &type, &typelen, &error);
|
||||
g_free(path_type);
|
||||
if (error) {
|
||||
g_error_free(error);
|
||||
return PSY_UNKNOWN;
|
||||
}
|
||||
|
||||
if (!g_strcmp0(type, "Battery\n")) {
|
||||
g_free(type);
|
||||
return PSY_BATTERY;
|
||||
}
|
||||
|
||||
if (!g_strcmp0(type, "Mains\n")) {
|
||||
g_free(type);
|
||||
return PSY_MAINS;
|
||||
}
|
||||
|
||||
g_free(type);
|
||||
|
||||
return PSY_UNKNOWN;
|
||||
}
|
||||
|
||||
static gboolean init_linux_battery(struct psy_battery *bat)
|
||||
{
|
||||
const gchar *entryname = bat->name;
|
||||
|
||||
bat->energy_in_uamp = FALSE;
|
||||
bat->power_in_uamp = FALSE;
|
||||
|
||||
bat->path_present = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
|
||||
if (!g_file_test(bat->path_present, G_FILE_TEST_EXISTS)) {
|
||||
goto err0;
|
||||
}
|
||||
|
||||
bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "energy_now", NULL);
|
||||
if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
|
||||
g_free(bat->path_energy_now);
|
||||
bat->path_energy_now = g_build_filename("/sys/class/power_supply", entryname, "charge_now", NULL);
|
||||
bat->energy_in_uamp = TRUE;
|
||||
}
|
||||
if (!g_file_test(bat->path_energy_now, G_FILE_TEST_EXISTS)) {
|
||||
goto err1;
|
||||
}
|
||||
|
||||
if (!bat->energy_in_uamp) {
|
||||
bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "energy_full", NULL);
|
||||
if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
|
||||
goto err2;
|
||||
} else {
|
||||
bat->path_energy_full = g_build_filename("/sys/class/power_supply", entryname, "charge_full", NULL);
|
||||
if (!g_file_test(bat->path_energy_full, G_FILE_TEST_EXISTS))
|
||||
goto err2;
|
||||
}
|
||||
|
||||
bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "power_now", NULL);
|
||||
if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
|
||||
g_free(bat->path_power_now);
|
||||
bat->path_power_now = g_build_filename("/sys/class/power_supply", entryname, "current_now", NULL);
|
||||
bat->power_in_uamp = TRUE;
|
||||
}
|
||||
if (!g_file_test(bat->path_power_now, G_FILE_TEST_EXISTS)) {
|
||||
goto err3;
|
||||
}
|
||||
|
||||
bat->path_status = g_build_filename("/sys/class/power_supply", entryname, "status", NULL);
|
||||
if (!g_file_test(bat->path_status, G_FILE_TEST_EXISTS)) {
|
||||
goto err4;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
err4:
|
||||
g_free(bat->path_status);
|
||||
err3:
|
||||
g_free(bat->path_power_now);
|
||||
err2:
|
||||
g_free(bat->path_energy_full);
|
||||
err1:
|
||||
g_free(bat->path_energy_now);
|
||||
err0:
|
||||
g_free(bat->path_present);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean init_linux_mains(struct psy_mains *ac)
|
||||
{
|
||||
const gchar *entryname = ac->name;
|
||||
|
||||
ac->path_online = g_build_filename("/sys/class/power_supply", entryname, "online", NULL);
|
||||
if (!g_file_test(ac->path_online, G_FILE_TEST_EXISTS)) {
|
||||
g_free(ac->path_online);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void psy_battery_free(gpointer data)
|
||||
{
|
||||
struct psy_battery *bat = data;
|
||||
g_free(bat->name);
|
||||
g_free(bat->path_status);
|
||||
g_free(bat->path_power_now);
|
||||
g_free(bat->path_energy_full);
|
||||
g_free(bat->path_energy_now);
|
||||
g_free(bat->path_present);
|
||||
g_free(bat);
|
||||
}
|
||||
|
||||
static void psy_mains_free(gpointer data)
|
||||
{
|
||||
struct psy_mains *ac = data;
|
||||
g_free(ac->name);
|
||||
g_free(ac->path_online);
|
||||
g_free(ac);
|
||||
}
|
||||
|
||||
void battery_os_free()
|
||||
{
|
||||
uevent_unregister_notifier(&psy_change);
|
||||
uevent_unregister_notifier(&psy_plug);
|
||||
|
||||
g_list_free_full(batteries, psy_battery_free);
|
||||
batteries = NULL;
|
||||
g_list_free_full(mains, psy_mains_free);
|
||||
mains = NULL;
|
||||
}
|
||||
|
||||
static void add_battery(const char *entryname)
|
||||
{
|
||||
struct psy_battery *bat = g_malloc0(sizeof(*bat));
|
||||
bat->name = g_strdup(entryname);
|
||||
|
||||
if (init_linux_battery(bat)) {
|
||||
batteries = g_list_append(batteries, bat);
|
||||
fprintf(stdout, "found battery \"%s\"\n", bat->name);
|
||||
} else {
|
||||
g_free(bat);
|
||||
fprintf(stderr, RED "failed to initialize battery \"%s\"" RESET "\n", entryname);
|
||||
}
|
||||
}
|
||||
|
||||
static void add_mains(const char *entryname)
|
||||
{
|
||||
struct psy_mains *ac = g_malloc0(sizeof(*ac));
|
||||
ac->name = g_strdup(entryname);
|
||||
|
||||
if (init_linux_mains(ac)) {
|
||||
mains = g_list_append(mains, ac);
|
||||
fprintf(stdout, "found mains \"%s\"\n", ac->name);
|
||||
} else {
|
||||
g_free(ac);
|
||||
fprintf(stderr, RED "failed to initialize mains \"%s\"" RESET "\n", entryname);
|
||||
}
|
||||
}
|
||||
|
||||
gboolean battery_os_init()
|
||||
{
|
||||
GDir *directory = 0;
|
||||
GError *error = NULL;
|
||||
const char *entryname;
|
||||
|
||||
battery_os_free();
|
||||
|
||||
directory = g_dir_open("/sys/class/power_supply", 0, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
|
||||
while ((entryname = g_dir_read_name(directory))) {
|
||||
enum psy_type type = power_supply_get_type(entryname);
|
||||
|
||||
switch (type) {
|
||||
case PSY_BATTERY:
|
||||
add_battery(entryname);
|
||||
break;
|
||||
case PSY_MAINS:
|
||||
add_mains(entryname);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
g_dir_close(directory);
|
||||
|
||||
uevent_register_notifier(&psy_change);
|
||||
uevent_register_notifier(&psy_plug);
|
||||
|
||||
return batteries != NULL;
|
||||
}
|
||||
|
||||
static gint estimate_power_usage(struct psy_battery *bat, gint old_energy_now, gint64 old_timestamp)
|
||||
{
|
||||
gint64 diff_power = ABS(bat->energy_now - old_energy_now);
|
||||
gint64 diff_time = bat->timestamp - old_timestamp;
|
||||
|
||||
/* µW = (µWh * 3600) / (µs / 1000000) */
|
||||
gint power = diff_power * 3600 * 1000000 / MAX(1, diff_time);
|
||||
|
||||
return power;
|
||||
}
|
||||
|
||||
static gboolean update_linux_battery(struct psy_battery *bat)
|
||||
{
|
||||
GError *error = NULL;
|
||||
gchar *data;
|
||||
gsize datalen;
|
||||
|
||||
gint64 old_timestamp = bat->timestamp;
|
||||
int old_energy_now = bat->energy_now;
|
||||
gint old_power_now = bat->power_now;
|
||||
|
||||
/* reset values */
|
||||
bat->present = 0;
|
||||
bat->status = BATTERY_UNKNOWN;
|
||||
bat->energy_now = 0;
|
||||
bat->energy_full = 0;
|
||||
bat->power_now = 0;
|
||||
bat->timestamp = g_get_monotonic_time();
|
||||
|
||||
/* present */
|
||||
g_file_get_contents(bat->path_present, &data, &datalen, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
bat->present = (atoi(data) == 1);
|
||||
g_free(data);
|
||||
|
||||
/* we are done, if battery is not present */
|
||||
if (!bat->present)
|
||||
return TRUE;
|
||||
|
||||
/* status */
|
||||
bat->status = BATTERY_UNKNOWN;
|
||||
g_file_get_contents(bat->path_status, &data, &datalen, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
if (!g_strcmp0(data, "Charging\n")) {
|
||||
bat->status = BATTERY_CHARGING;
|
||||
} else if (!g_strcmp0(data, "Discharging\n")) {
|
||||
bat->status = BATTERY_DISCHARGING;
|
||||
} else if (!g_strcmp0(data, "Full\n")) {
|
||||
bat->status = BATTERY_FULL;
|
||||
}
|
||||
g_free(data);
|
||||
|
||||
/* energy now */
|
||||
g_file_get_contents(bat->path_energy_now, &data, &datalen, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
bat->energy_now = atoi(data);
|
||||
g_free(data);
|
||||
|
||||
/* energy full */
|
||||
g_file_get_contents(bat->path_energy_full, &data, &datalen, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
bat->energy_full = atoi(data);
|
||||
g_free(data);
|
||||
|
||||
/* power now */
|
||||
g_file_get_contents(bat->path_power_now, &data, &datalen, &error);
|
||||
if (g_error_matches(error, G_FILE_ERROR, G_FILE_ERROR_NODEV)) {
|
||||
/* some hardware does not support reading current power consumption */
|
||||
g_error_free(error);
|
||||
bat->power_now = estimate_power_usage(bat, old_energy_now, old_timestamp);
|
||||
if (bat->power_now == 0 && bat->status != BATTERY_FULL) {
|
||||
/* If the hardware updates the level slower than our sampling period,
|
||||
* we need to sample more rarely */
|
||||
bat->power_now = old_power_now;
|
||||
bat->timestamp = old_timestamp;
|
||||
}
|
||||
} else if (error) {
|
||||
g_error_free(error);
|
||||
return FALSE;
|
||||
} else {
|
||||
bat->power_now = atoi(data);
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean update_linux_mains(struct psy_mains *ac)
|
||||
{
|
||||
GError *error = NULL;
|
||||
gchar *data;
|
||||
gsize datalen;
|
||||
ac->online = FALSE;
|
||||
|
||||
/* online */
|
||||
g_file_get_contents(ac->path_online, &data, &datalen, &error);
|
||||
RETURN_ON_ERROR(error);
|
||||
ac->online = (atoi(data) == 1);
|
||||
g_free(data);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
int battery_os_update(BatteryState *state)
|
||||
{
|
||||
GList *l;
|
||||
|
||||
gint64 total_energy_now = 0;
|
||||
gint64 total_energy_full = 0;
|
||||
gint64 total_power_now = 0;
|
||||
gint seconds = 0;
|
||||
|
||||
gboolean charging = FALSE;
|
||||
gboolean discharging = FALSE;
|
||||
gboolean full = FALSE;
|
||||
gboolean ac_connected = FALSE;
|
||||
|
||||
for (l = batteries; l != NULL; l = l->next) {
|
||||
struct psy_battery *bat = l->data;
|
||||
update_linux_battery(bat);
|
||||
|
||||
total_energy_now += bat->energy_now;
|
||||
total_energy_full += bat->energy_full;
|
||||
total_power_now += bat->power_now;
|
||||
|
||||
charging |= (bat->status == BATTERY_CHARGING);
|
||||
discharging |= (bat->status == BATTERY_DISCHARGING);
|
||||
full |= (bat->status == BATTERY_FULL);
|
||||
}
|
||||
|
||||
for (l = mains; l != NULL; l = l->next) {
|
||||
struct psy_mains *ac = l->data;
|
||||
update_linux_mains(ac);
|
||||
ac_connected |= (ac->online);
|
||||
}
|
||||
|
||||
/* build global state */
|
||||
if (charging && !discharging)
|
||||
state->state = BATTERY_CHARGING;
|
||||
else if (!charging && discharging)
|
||||
state->state = BATTERY_DISCHARGING;
|
||||
else if (!charging && !discharging && full)
|
||||
state->state = BATTERY_FULL;
|
||||
|
||||
/* calculate seconds */
|
||||
if (total_power_now > 0) {
|
||||
if (state->state == BATTERY_CHARGING)
|
||||
seconds = 3600 * (total_energy_full - total_energy_now) / total_power_now;
|
||||
else if (state->state == BATTERY_DISCHARGING)
|
||||
seconds = 3600 * total_energy_now / total_power_now;
|
||||
seconds = MAX(0, seconds);
|
||||
}
|
||||
battery_state_set_time(state, seconds);
|
||||
|
||||
/* calculate percentage */
|
||||
state->percentage = energy_to_percent(total_energy_now, total_energy_full);
|
||||
|
||||
/* AC state */
|
||||
state->ac_connected = ac_connected;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static gchar *energy_human_readable(struct psy_battery *bat)
|
||||
{
|
||||
gint now = bat->energy_now;
|
||||
gint full = bat->energy_full;
|
||||
gchar unit = bat->energy_in_uamp ? 'A' : 'W';
|
||||
|
||||
if (full >= 1000000) {
|
||||
return g_strdup_printf("%d.%d / %d.%d %ch",
|
||||
now / 1000000,
|
||||
(now % 1000000) / 100000,
|
||||
full / 1000000,
|
||||
(full % 1000000) / 100000,
|
||||
unit);
|
||||
} else if (full >= 1000) {
|
||||
return g_strdup_printf("%d.%d / %d.%d m%ch",
|
||||
now / 1000,
|
||||
(now % 1000) / 100,
|
||||
full / 1000,
|
||||
(full % 1000) / 100,
|
||||
unit);
|
||||
} else {
|
||||
return g_strdup_printf("%d / %d µ%ch", now, full, unit);
|
||||
}
|
||||
}
|
||||
|
||||
static gchar *power_human_readable(struct psy_battery *bat)
|
||||
{
|
||||
gint power = bat->power_now;
|
||||
gchar unit = bat->power_in_uamp ? 'A' : 'W';
|
||||
|
||||
if (power >= 1000000) {
|
||||
return g_strdup_printf("%d.%d %c", power / 1000000, (power % 1000000) / 100000, unit);
|
||||
} else if (power >= 1000) {
|
||||
return g_strdup_printf("%d.%d m%c", power / 1000, (power % 1000) / 100, unit);
|
||||
} else if (power > 0) {
|
||||
return g_strdup_printf("%d µ%c", power, unit);
|
||||
} else {
|
||||
return g_strdup_printf("0 %c", unit);
|
||||
}
|
||||
}
|
||||
|
||||
char *battery_os_tooltip()
|
||||
{
|
||||
GList *l;
|
||||
GString *tooltip = g_string_new("");
|
||||
gchar *result;
|
||||
|
||||
for (l = batteries; l != NULL; l = l->next) {
|
||||
struct psy_battery *bat = l->data;
|
||||
|
||||
if (tooltip->len)
|
||||
g_string_append_c(tooltip, '\n');
|
||||
|
||||
g_string_append_printf(tooltip, "%s\n", bat->name);
|
||||
|
||||
if (!bat->present) {
|
||||
g_string_append_printf(tooltip, "\tnot connected");
|
||||
continue;
|
||||
}
|
||||
|
||||
gchar *power = power_human_readable(bat);
|
||||
gchar *energy = energy_human_readable(bat);
|
||||
gchar *state = (bat->status == BATTERY_UNKNOWN) ? "Level" : chargestate2str(bat->status);
|
||||
|
||||
guint8 percentage = energy_to_percent(bat->energy_now, bat->energy_full);
|
||||
|
||||
g_string_append_printf(tooltip, "\t%s: %s (%u %%)\n\tPower: %s", state, energy, percentage, power);
|
||||
|
||||
g_free(power);
|
||||
g_free(energy);
|
||||
}
|
||||
|
||||
for (l = mains; l != NULL; l = l->next) {
|
||||
struct psy_mains *ac = l->data;
|
||||
|
||||
if (tooltip->len)
|
||||
g_string_append_c(tooltip, '\n');
|
||||
|
||||
g_string_append_printf(tooltip, "%s\n", ac->name);
|
||||
g_string_append_printf(tooltip, ac->online ? "\tConnected" : "\tDisconnected");
|
||||
}
|
||||
|
||||
result = tooltip->str;
|
||||
g_string_free(tooltip, FALSE);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -1,108 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : OpenBSD & NetBSD battery
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* or any later version as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
|
||||
#include <stdint.h>
|
||||
#include <err.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <machine/apmvar.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "battery.h"
|
||||
|
||||
int apm_fd = -1;
|
||||
|
||||
gboolean battery_os_init()
|
||||
{
|
||||
if (apm_fd > 0)
|
||||
close(apm_fd);
|
||||
|
||||
apm_fd = open("/dev/apm", O_RDONLY);
|
||||
|
||||
if (apm_fd < 0) {
|
||||
warn("ERROR: battery applet cannot open /dev/apm.");
|
||||
return FALSE;
|
||||
} else {
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
void battery_os_free()
|
||||
{
|
||||
if ((apm_fd != -1) && (close(apm_fd) == -1))
|
||||
warn("cannot close /dev/apm");
|
||||
apm_fd = -1;
|
||||
}
|
||||
|
||||
int battery_os_update(BatteryState *state)
|
||||
{
|
||||
struct apm_power_info info;
|
||||
|
||||
if (apm_fd > 0 && ioctl(apm_fd, APM_IOC_GETPOWER, &(info)) == 0) {
|
||||
// best attempt at mapping to Linux battery states
|
||||
switch (info.battery_state) {
|
||||
case APM_BATT_CHARGING:
|
||||
state->state = BATTERY_CHARGING;
|
||||
break;
|
||||
default:
|
||||
state->state = BATTERY_DISCHARGING;
|
||||
break;
|
||||
}
|
||||
|
||||
if (info.battery_life > 100)
|
||||
info.battery_life = 100;
|
||||
if (info.battery_life == 100)
|
||||
state->state = BATTERY_FULL;
|
||||
|
||||
state->percentage = info.battery_life;
|
||||
if (info.minutes_left != -1)
|
||||
battery_state_set_time(state, info.minutes_left * 60);
|
||||
|
||||
state->ac_connected = info.ac_state == APM_AC_ON;
|
||||
} else {
|
||||
warn("power update: APM_IOC_GETPOWER");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *battery_os_tooltip()
|
||||
{
|
||||
GString *tooltip = g_string_new("");
|
||||
gchar *result;
|
||||
|
||||
g_string_append_printf(tooltip, "Battery\n");
|
||||
|
||||
gchar *state = (battery_state.state == BATTERY_UNKNOWN) ? "Level" : chargestate2str(battery_state.state);
|
||||
|
||||
g_string_append_printf(tooltip, "\t%s: %d%%", state, battery_state.percentage);
|
||||
|
||||
g_string_append_c(tooltip, '\n');
|
||||
g_string_append_printf(tooltip, "AC\n");
|
||||
g_string_append_printf(tooltip, battery_state.ac_connected ? "\tConnected" : "\tDisconnected");
|
||||
|
||||
result = tooltip->str;
|
||||
g_string_free(tooltip, FALSE);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "timer.h"
|
||||
#include "common.h"
|
||||
|
||||
|
||||
char *time1_format;
|
||||
char *time1_timezone;
|
||||
char *time2_format;
|
||||
@@ -38,162 +39,124 @@ char *time2_timezone;
|
||||
char *time_tooltip_format;
|
||||
char *time_tooltip_timezone;
|
||||
char *clock_lclick_command;
|
||||
char *clock_mclick_command;
|
||||
char *clock_rclick_command;
|
||||
char *clock_uwheel_command;
|
||||
char *clock_dwheel_command;
|
||||
struct timeval time_clock;
|
||||
gboolean time1_has_font;
|
||||
PangoFontDescription *time1_font_desc;
|
||||
gboolean time2_has_font;
|
||||
PangoFontDescription *time2_font_desc;
|
||||
static char buf_time[256];
|
||||
static char buf_date[256];
|
||||
static char buf_tooltip[512];
|
||||
int clock_enabled;
|
||||
static timeout *clock_timeout;
|
||||
static timeout* clock_timeout;
|
||||
|
||||
void clock_init_fonts();
|
||||
char *clock_get_tooltip(void *obj);
|
||||
|
||||
void default_clock()
|
||||
{
|
||||
clock_enabled = 0;
|
||||
clock_timeout = NULL;
|
||||
time1_format = NULL;
|
||||
time1_timezone = NULL;
|
||||
time2_format = NULL;
|
||||
time2_timezone = NULL;
|
||||
time_tooltip_format = NULL;
|
||||
time_tooltip_timezone = NULL;
|
||||
clock_lclick_command = NULL;
|
||||
clock_mclick_command = NULL;
|
||||
clock_rclick_command = NULL;
|
||||
clock_uwheel_command = NULL;
|
||||
clock_dwheel_command = NULL;
|
||||
time1_has_font = FALSE;
|
||||
time1_font_desc = NULL;
|
||||
time2_has_font = FALSE;
|
||||
time2_font_desc = NULL;
|
||||
clock_timeout = 0;
|
||||
time1_format = 0;
|
||||
time1_timezone = 0;
|
||||
time2_format = 0;
|
||||
time2_timezone = 0;
|
||||
time_tooltip_format = 0;
|
||||
time_tooltip_timezone = 0;
|
||||
clock_lclick_command = 0;
|
||||
clock_rclick_command = 0;
|
||||
time1_font_desc = 0;
|
||||
time2_font_desc = 0;
|
||||
}
|
||||
|
||||
void cleanup_clock()
|
||||
{
|
||||
pango_font_description_free(time1_font_desc);
|
||||
time1_font_desc = NULL;
|
||||
pango_font_description_free(time2_font_desc);
|
||||
time2_font_desc = NULL;
|
||||
free(time1_format);
|
||||
time1_format = NULL;
|
||||
free(time2_format);
|
||||
time2_format = NULL;
|
||||
free(time_tooltip_format);
|
||||
time_tooltip_format = NULL;
|
||||
free(time1_timezone);
|
||||
time1_timezone = NULL;
|
||||
free(time2_timezone);
|
||||
time2_timezone = NULL;
|
||||
free(time_tooltip_timezone);
|
||||
time_tooltip_timezone = NULL;
|
||||
free(clock_lclick_command);
|
||||
clock_lclick_command = NULL;
|
||||
free(clock_mclick_command);
|
||||
clock_mclick_command = NULL;
|
||||
free(clock_rclick_command);
|
||||
clock_rclick_command = NULL;
|
||||
free(clock_uwheel_command);
|
||||
clock_uwheel_command = NULL;
|
||||
free(clock_dwheel_command);
|
||||
clock_dwheel_command = NULL;
|
||||
stop_timeout(clock_timeout);
|
||||
clock_timeout = NULL;
|
||||
if (time1_font_desc) pango_font_description_free(time1_font_desc);
|
||||
if (time2_font_desc) pango_font_description_free(time2_font_desc);
|
||||
if (time1_format) g_free(time1_format);
|
||||
if (time2_format) g_free(time2_format);
|
||||
if (time_tooltip_format) g_free(time_tooltip_format);
|
||||
if (time1_timezone) g_free(time1_timezone);
|
||||
if (time2_timezone) g_free(time2_timezone);
|
||||
if (time_tooltip_timezone) g_free(time_tooltip_timezone);
|
||||
if (clock_lclick_command) g_free(clock_lclick_command);
|
||||
if (clock_rclick_command) g_free(clock_rclick_command);
|
||||
if (clock_timeout) stop_timeout(clock_timeout);
|
||||
}
|
||||
|
||||
void update_clocks_sec(void *arg)
|
||||
|
||||
void update_clocks_sec(void* arg)
|
||||
{
|
||||
gettimeofday(&time_clock, 0);
|
||||
int i;
|
||||
if (time1_format) {
|
||||
for (int i = 0; i < num_panels; i++)
|
||||
panels[i].clock.area.resize_needed = 1;
|
||||
for (i=0 ; i < nb_panel ; i++)
|
||||
panel1[i].clock.area.resize = 1;
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
panel_refresh = 1;
|
||||
}
|
||||
|
||||
void update_clocks_min(void *arg)
|
||||
void update_clocks_min(void* arg)
|
||||
{
|
||||
// remember old_sec because after suspend/hibernate the clock should be updated directly, and not
|
||||
// on next minute change
|
||||
time_t old_sec = time_clock.tv_sec;
|
||||
gettimeofday(&time_clock, 0);
|
||||
if (time_clock.tv_sec % 60 == 0 || time_clock.tv_sec - old_sec > 60) {
|
||||
int i;
|
||||
if (time1_format) {
|
||||
for (int i = 0; i < num_panels; i++)
|
||||
panels[i].clock.area.resize_needed = 1;
|
||||
for (i=0 ; i < nb_panel ; i++)
|
||||
panel1[i].clock.area.resize = 1;
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
panel_refresh = 1;
|
||||
}
|
||||
}
|
||||
|
||||
struct tm *clock_gettime_for_tz(const char *timezone)
|
||||
{
|
||||
struct tm* clock_gettime_for_tz(const char* timezone) {
|
||||
if (timezone) {
|
||||
const char *old_tz = getenv("TZ");
|
||||
const char* old_tz = getenv("TZ");
|
||||
setenv("TZ", timezone, 1);
|
||||
struct tm *result = localtime(&time_clock.tv_sec);
|
||||
if (old_tz)
|
||||
setenv("TZ", old_tz, 1);
|
||||
else
|
||||
unsetenv("TZ");
|
||||
struct tm* result = localtime(&time_clock.tv_sec);
|
||||
if (old_tz) setenv("TZ", old_tz, 1);
|
||||
else unsetenv("TZ");
|
||||
return result;
|
||||
} else {
|
||||
return localtime(&time_clock.tv_sec);
|
||||
}
|
||||
else return localtime(&time_clock.tv_sec);
|
||||
}
|
||||
|
||||
gboolean time_format_needs_sec_ticks(char *time_format)
|
||||
const char* clock_get_tooltip(void* obj)
|
||||
{
|
||||
if (!time_format)
|
||||
return FALSE;
|
||||
if (strchr(time_format, 'S') || strchr(time_format, 'T') || strchr(time_format, 'r'))
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
|
||||
return buf_tooltip;
|
||||
}
|
||||
|
||||
|
||||
void init_clock()
|
||||
{
|
||||
if (!clock_timeout) {
|
||||
if (time_format_needs_sec_ticks(time1_format) || time_format_needs_sec_ticks(time2_format)) {
|
||||
clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0, &clock_timeout);
|
||||
} else {
|
||||
clock_timeout = add_timeout(10, 1000, update_clocks_min, 0, &clock_timeout);
|
||||
}
|
||||
if(time1_format && clock_timeout==0) {
|
||||
if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
|
||||
clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0);
|
||||
else
|
||||
clock_timeout = add_timeout(10, 1000, update_clocks_min, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_clock_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
Panel *panel =(Panel*)p;
|
||||
Clock *clock = &panel->clock;
|
||||
|
||||
if (!clock->area.bg)
|
||||
if (clock->area.bg == 0)
|
||||
clock->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
clock_init_fonts();
|
||||
clock->area.parent = p;
|
||||
clock->area.panel = p;
|
||||
snprintf(clock->area.name, sizeof(clock->area.name), "Clock");
|
||||
clock->area._is_under_mouse = full_width_area_is_under_mouse;
|
||||
clock->area.has_mouse_press_effect = clock->area.has_mouse_over_effect =
|
||||
panel_config.mouse_effects && (clock_lclick_command || clock_mclick_command || clock_rclick_command ||
|
||||
clock_uwheel_command || clock_dwheel_command);
|
||||
clock->area._draw_foreground = draw_clock;
|
||||
clock->area.size_mode = LAYOUT_FIXED;
|
||||
clock->area.size_mode = SIZE_BY_CONTENT;
|
||||
clock->area._resize = resize_clock;
|
||||
// check consistency
|
||||
if (!time1_format)
|
||||
if (time1_format == 0)
|
||||
return;
|
||||
|
||||
clock->area.resize_needed = 1;
|
||||
clock->area.on_screen = TRUE;
|
||||
clock->area.resize = 1;
|
||||
clock->area.on_screen = 1;
|
||||
|
||||
if (time_tooltip_format) {
|
||||
clock->area._get_tooltip_text = clock_get_tooltip;
|
||||
@@ -201,164 +164,100 @@ void init_clock_panel(void *p)
|
||||
}
|
||||
}
|
||||
|
||||
void clock_init_fonts()
|
||||
|
||||
void draw_clock (void *obj, cairo_t *c)
|
||||
{
|
||||
if (!time1_font_desc) {
|
||||
time1_font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_weight(time1_font_desc, PANGO_WEIGHT_BOLD);
|
||||
pango_font_description_set_size(time1_font_desc, pango_font_description_get_size(time1_font_desc));
|
||||
}
|
||||
if (!time2_font_desc) {
|
||||
time2_font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_size(time2_font_desc,
|
||||
pango_font_description_get_size(time2_font_desc) - PANGO_SCALE);
|
||||
Clock *clock = obj;
|
||||
PangoLayout *layout;
|
||||
|
||||
layout = pango_cairo_create_layout (c);
|
||||
|
||||
// draw layout
|
||||
pango_layout_set_font_description (layout, time1_font_desc);
|
||||
pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_text (layout, buf_time, strlen(buf_time));
|
||||
|
||||
cairo_set_source_rgba (c, clock->font.color[0], clock->font.color[1], clock->font.color[2], clock->font.alpha);
|
||||
|
||||
pango_cairo_update_layout (c, layout);
|
||||
cairo_move_to (c, 0, clock->time1_posy);
|
||||
pango_cairo_show_layout (c, layout);
|
||||
|
||||
if (time2_format) {
|
||||
pango_layout_set_font_description (layout, time2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text (layout, buf_date, strlen(buf_date));
|
||||
pango_layout_set_width (layout, clock->area.width * PANGO_SCALE);
|
||||
|
||||
pango_cairo_update_layout (c, layout);
|
||||
cairo_move_to (c, 0, clock->time2_posy);
|
||||
pango_cairo_show_layout (c, layout);
|
||||
}
|
||||
|
||||
g_object_unref (layout);
|
||||
}
|
||||
|
||||
void clock_default_font_changed()
|
||||
{
|
||||
if (!clock_enabled)
|
||||
return;
|
||||
if (time1_has_font && time2_has_font)
|
||||
return;
|
||||
if (!time1_has_font) {
|
||||
pango_font_description_free(time1_font_desc);
|
||||
time1_font_desc = NULL;
|
||||
}
|
||||
if (!time2_has_font) {
|
||||
pango_font_description_free(time2_font_desc);
|
||||
time2_font_desc = NULL;
|
||||
}
|
||||
clock_init_fonts();
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
panels[i].clock.area.resize_needed = TRUE;
|
||||
schedule_redraw(&panels[i].clock.area);
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
|
||||
gboolean resize_clock(void *obj)
|
||||
int resize_clock (void *obj)
|
||||
{
|
||||
Clock *clock = obj;
|
||||
Panel *panel = clock->area.panel;
|
||||
int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width;
|
||||
gboolean result = FALSE;
|
||||
int time_height_ink, time_height, time_width, date_height_ink, date_height, date_width, ret = 0;
|
||||
|
||||
schedule_redraw(&clock->area);
|
||||
clock->area.redraw = 1;
|
||||
|
||||
date_height = date_width = 0;
|
||||
strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
|
||||
get_text_size2(time1_font_desc,
|
||||
&time_height_ink,
|
||||
&time_height,
|
||||
&time_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
buf_time,
|
||||
strlen(buf_time),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
FALSE);
|
||||
get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
|
||||
if (time2_format) {
|
||||
strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
|
||||
get_text_size2(time2_font_desc,
|
||||
&date_height_ink,
|
||||
&date_height,
|
||||
&date_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
buf_date,
|
||||
strlen(buf_date),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
FALSE);
|
||||
get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
|
||||
}
|
||||
|
||||
if (panel_horizontal) {
|
||||
int new_size = (time_width > date_width) ? time_width : date_width;
|
||||
new_size += (2 * clock->area.paddingxlr) + (2 * clock->area.bg->border.width);
|
||||
if (new_size > clock->area.width || new_size < (clock->area.width - 6)) {
|
||||
// we try to limit the number of resizes
|
||||
new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
|
||||
if (new_size > clock->area.width || new_size < (clock->area.width-6)) {
|
||||
// we try to limit the number of resize
|
||||
clock->area.width = new_size + 1;
|
||||
clock->time1_posy = (clock->area.height - time_height) / 2;
|
||||
if (time2_format) {
|
||||
clock->time1_posy -= (date_height) / 2;
|
||||
clock->time1_posy -= (date_height)/2;
|
||||
clock->time2_posy = clock->time1_posy + time_height;
|
||||
}
|
||||
result = TRUE;
|
||||
ret = 1;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
int new_size = time_height + date_height + (2 * (clock->area.paddingxlr + clock->area.bg->border.width));
|
||||
if (new_size != clock->area.height) {
|
||||
// we try to limit the number of resizes
|
||||
clock->area.height = new_size;
|
||||
// we try to limit the number of resize
|
||||
clock->area.height = new_size;
|
||||
clock->time1_posy = (clock->area.height - time_height) / 2;
|
||||
if (time2_format) {
|
||||
clock->time1_posy -= (date_height) / 2;
|
||||
clock->time1_posy -= (date_height)/2;
|
||||
clock->time2_posy = clock->time1_posy + time_height;
|
||||
}
|
||||
result = TRUE;
|
||||
ret = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
return ret;
|
||||
}
|
||||
|
||||
void draw_clock(void *obj, cairo_t *c)
|
||||
{
|
||||
Clock *clock = obj;
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
|
||||
pango_layout_set_font_description(layout, time1_font_desc);
|
||||
pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
pango_layout_set_text(layout, buf_time, strlen(buf_time));
|
||||
|
||||
cairo_set_source_rgba(c, clock->font.rgb[0], clock->font.rgb[1], clock->font.rgb[2], clock->font.alpha);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, 0, clock->time1_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
|
||||
|
||||
if (time2_format) {
|
||||
pango_layout_set_font_description(layout, time2_font_desc);
|
||||
pango_layout_set_indent(layout, 0);
|
||||
pango_layout_set_text(layout, buf_date, strlen(buf_date));
|
||||
pango_layout_set_width(layout, clock->area.width * PANGO_SCALE);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, 0, clock->time2_posy, &clock->font, ((Panel *)clock->area.panel)->font_shadow);
|
||||
}
|
||||
|
||||
g_object_unref(layout);
|
||||
}
|
||||
|
||||
char *clock_get_tooltip(void *obj)
|
||||
{
|
||||
strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
|
||||
return strdup(buf_tooltip);
|
||||
}
|
||||
|
||||
void clock_action(int button)
|
||||
{
|
||||
char *command = NULL;
|
||||
char *command = 0;
|
||||
switch (button) {
|
||||
case 1:
|
||||
case 1:
|
||||
command = clock_lclick_command;
|
||||
break;
|
||||
case 2:
|
||||
command = clock_mclick_command;
|
||||
break;
|
||||
case 3:
|
||||
case 3:
|
||||
command = clock_rclick_command;
|
||||
break;
|
||||
case 4:
|
||||
command = clock_uwheel_command;
|
||||
break;
|
||||
case 5:
|
||||
command = clock_dwheel_command;
|
||||
break;
|
||||
}
|
||||
tint_exec(command);
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
|
||||
|
||||
typedef struct Clock {
|
||||
// always start with area
|
||||
Area area;
|
||||
@@ -22,22 +23,19 @@ typedef struct Clock {
|
||||
int time2_posy;
|
||||
} Clock;
|
||||
|
||||
|
||||
extern char *time1_format;
|
||||
extern char *time1_timezone;
|
||||
extern char *time2_format;
|
||||
extern char *time2_timezone;
|
||||
extern char *time_tooltip_format;
|
||||
extern char *time_tooltip_timezone;
|
||||
extern gboolean time1_has_font;
|
||||
extern PangoFontDescription *time1_font_desc;
|
||||
extern gboolean time2_has_font;
|
||||
extern PangoFontDescription *time2_font_desc;
|
||||
extern char *clock_lclick_command;
|
||||
extern char *clock_mclick_command;
|
||||
extern char *clock_rclick_command;
|
||||
extern char *clock_uwheel_command;
|
||||
extern char *clock_dwheel_command;
|
||||
extern gboolean clock_enabled;
|
||||
extern int clock_enabled;
|
||||
|
||||
|
||||
// default global data
|
||||
void default_clock();
|
||||
@@ -48,11 +46,10 @@ void cleanup_clock();
|
||||
// initialize clock : y position, precision, ...
|
||||
void init_clock();
|
||||
void init_clock_panel(void *panel);
|
||||
void clock_default_font_changed();
|
||||
|
||||
void draw_clock(void *obj, cairo_t *c);
|
||||
void draw_clock (void *obj, cairo_t *c);
|
||||
|
||||
gboolean resize_clock(void *obj);
|
||||
int resize_clock (void *obj);
|
||||
|
||||
void clock_action(int button);
|
||||
|
||||
|
||||
1201
src/config.c
1201
src/config.c
File diff suppressed because it is too large
Load Diff
@@ -9,8 +9,6 @@
|
||||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
extern char *config_path;
|
||||
extern char *snapshot_path;
|
||||
|
||||
@@ -20,6 +18,8 @@ void default_config();
|
||||
// freed memory
|
||||
void cleanup_config();
|
||||
|
||||
gboolean config_read();
|
||||
int config_read_file (const char *path);
|
||||
int config_read ();
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,734 +0,0 @@
|
||||
#include "execplugin.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
#include <math.h>
|
||||
#include <pango/pangocairo.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "window.h"
|
||||
#include "server.h"
|
||||
#include "panel.h"
|
||||
#include "timer.h"
|
||||
#include "common.h"
|
||||
|
||||
void execp_timer_callback(void *arg);
|
||||
char *execp_get_tooltip(void *obj);
|
||||
void execp_init_fonts();
|
||||
|
||||
void default_execp()
|
||||
{
|
||||
}
|
||||
|
||||
Execp *create_execp()
|
||||
{
|
||||
Execp *execp = calloc(1, sizeof(Execp));
|
||||
execp->backend = calloc(1, sizeof(ExecpBackend));
|
||||
execp->backend->child_pipe = -1;
|
||||
|
||||
execp->backend->interval = 30;
|
||||
execp->backend->cache_icon = TRUE;
|
||||
execp->backend->centered = TRUE;
|
||||
execp->backend->font_color.alpha = 0.5;
|
||||
|
||||
return execp;
|
||||
}
|
||||
|
||||
gpointer create_execp_frontend(gconstpointer arg, gpointer data)
|
||||
{
|
||||
Execp *execp_backend = (Execp *)arg;
|
||||
|
||||
Execp *execp_frontend = calloc(1, sizeof(Execp));
|
||||
execp_frontend->backend = execp_backend->backend;
|
||||
execp_backend->backend->instances = g_list_append(execp_backend->backend->instances, execp_frontend);
|
||||
execp_frontend->frontend = calloc(1, sizeof(ExecpFrontend));
|
||||
return execp_frontend;
|
||||
}
|
||||
|
||||
void destroy_execp(void *obj)
|
||||
{
|
||||
Execp *execp = (Execp *)obj;
|
||||
if (execp->frontend) {
|
||||
// This is a frontend element
|
||||
execp->backend->instances = g_list_remove_all(execp->backend->instances, execp);
|
||||
free_and_null(execp->frontend);
|
||||
} else {
|
||||
// This is a backend element
|
||||
stop_timeout(execp->backend->timer);
|
||||
execp->backend->timer = NULL;
|
||||
|
||||
if (execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
imlib_free_image();
|
||||
execp->backend->icon = NULL;
|
||||
}
|
||||
free_and_null(execp->backend->buf_output);
|
||||
free_and_null(execp->backend->text);
|
||||
free_and_null(execp->backend->icon_path);
|
||||
if (execp->backend->child) {
|
||||
kill(-execp->backend->child, SIGHUP);
|
||||
execp->backend->child = 0;
|
||||
}
|
||||
if (execp->backend->child_pipe >= 0) {
|
||||
close(execp->backend->child_pipe);
|
||||
execp->backend->child_pipe = -1;
|
||||
}
|
||||
|
||||
execp->backend->bg = NULL;
|
||||
pango_font_description_free(execp->backend->font_desc);
|
||||
execp->backend->font_desc = NULL;
|
||||
free_and_null(execp->backend->command);
|
||||
free_and_null(execp->backend->tooltip);
|
||||
free_and_null(execp->backend->lclick_command);
|
||||
free_and_null(execp->backend->mclick_command);
|
||||
free_and_null(execp->backend->rclick_command);
|
||||
free_and_null(execp->backend->dwheel_command);
|
||||
free_and_null(execp->backend->uwheel_command);
|
||||
|
||||
if (execp->backend->instances) {
|
||||
fprintf(stderr, "Error: Attempt to destroy backend while there are still frontend instances!\n");
|
||||
exit(-1);
|
||||
}
|
||||
free(execp->backend);
|
||||
free(execp);
|
||||
}
|
||||
}
|
||||
|
||||
void init_execp()
|
||||
{
|
||||
GList *to_remove = panel_config.execp_list;
|
||||
for (int k = 0; k < strlen(panel_items_order) && to_remove; k++) {
|
||||
if (panel_items_order[k] == 'E') {
|
||||
to_remove = to_remove->next;
|
||||
}
|
||||
}
|
||||
|
||||
if (to_remove) {
|
||||
if (to_remove == panel_config.execp_list) {
|
||||
g_list_free_full(to_remove, destroy_execp);
|
||||
panel_config.execp_list = NULL;
|
||||
} else {
|
||||
// Cut panel_config.execp_list
|
||||
if (to_remove->prev)
|
||||
to_remove->prev->next = NULL;
|
||||
to_remove->prev = NULL;
|
||||
// Remove all elements of to_remove and to_remove itself
|
||||
g_list_free_full(to_remove, destroy_execp);
|
||||
}
|
||||
}
|
||||
|
||||
execp_init_fonts();
|
||||
for (GList *l = panel_config.execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
|
||||
// Set missing config options
|
||||
if (!execp->backend->bg)
|
||||
execp->backend->bg = &g_array_index(backgrounds, Background, 0);
|
||||
execp->backend->buf_capacity = 1024;
|
||||
execp->backend->buf_output = calloc(execp->backend->buf_capacity, 1);
|
||||
execp->backend->text = strdup(" ");
|
||||
execp->backend->icon_path = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void init_execp_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
|
||||
// Make sure this is only done once if there are multiple items
|
||||
if (panel->execp_list && ((Execp *)panel->execp_list->data)->frontend)
|
||||
return;
|
||||
|
||||
// panel->execp_list is now a copy of the pointer panel_config.execp_list
|
||||
// We make it a deep copy
|
||||
panel->execp_list = g_list_copy_deep(panel_config.execp_list, create_execp_frontend, NULL);
|
||||
|
||||
for (GList *l = panel->execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
execp->area.bg = execp->backend->bg;
|
||||
execp->area.paddingx = execp->backend->paddingx;
|
||||
execp->area.paddingy = execp->backend->paddingy;
|
||||
execp->area.paddingxlr = execp->backend->paddingxlr;
|
||||
execp->area.parent = panel;
|
||||
execp->area.panel = panel;
|
||||
snprintf(execp->area.name, sizeof(execp->area.name), "Execp %s", execp->backend->command ? execp->backend->command : "null");
|
||||
execp->area._draw_foreground = draw_execp;
|
||||
execp->area.size_mode = LAYOUT_FIXED;
|
||||
execp->area._resize = resize_execp;
|
||||
execp->area._get_tooltip_text = execp_get_tooltip;
|
||||
execp->area._is_under_mouse = full_width_area_is_under_mouse;
|
||||
execp->area.has_mouse_press_effect =
|
||||
panel_config.mouse_effects &&
|
||||
(execp->area.has_mouse_over_effect = execp->backend->lclick_command || execp->backend->mclick_command ||
|
||||
execp->backend->rclick_command || execp->backend->uwheel_command ||
|
||||
execp->backend->dwheel_command);
|
||||
|
||||
execp->area.resize_needed = TRUE;
|
||||
execp->area.on_screen = TRUE;
|
||||
|
||||
if (!execp->backend->timer)
|
||||
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
}
|
||||
}
|
||||
|
||||
void execp_init_fonts()
|
||||
{
|
||||
for (GList *l = panel_config.execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
if (!execp->backend->font_desc)
|
||||
execp->backend->font_desc = pango_font_description_from_string(get_default_font());
|
||||
}
|
||||
}
|
||||
|
||||
void execp_default_font_changed()
|
||||
{
|
||||
gboolean needs_update = FALSE;
|
||||
for (GList *l = panel_config.execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
|
||||
if (!execp->backend->has_font) {
|
||||
pango_font_description_free(execp->backend->font_desc);
|
||||
execp->backend->font_desc = NULL;
|
||||
needs_update = TRUE;
|
||||
}
|
||||
}
|
||||
if (!needs_update)
|
||||
return;
|
||||
|
||||
execp_init_fonts();
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
for (GList *l = panels[i].execp_list; l; l = l->next) {
|
||||
Execp *execp = l->data;
|
||||
|
||||
if (!execp->backend->has_font) {
|
||||
execp->area.resize_needed = TRUE;
|
||||
schedule_redraw(&execp->area);
|
||||
}
|
||||
}
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
|
||||
void cleanup_execp()
|
||||
{
|
||||
// Cleanup frontends
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
g_list_free_full(panels[i].execp_list, destroy_execp);
|
||||
panels[i].execp_list = NULL;
|
||||
}
|
||||
|
||||
// Cleanup backends
|
||||
g_list_free_full(panel_config.execp_list, destroy_execp);
|
||||
panel_config.execp_list = NULL;
|
||||
}
|
||||
|
||||
// Called from backend functions.
|
||||
gboolean reload_icon(Execp *execp)
|
||||
{
|
||||
char *icon_path = execp->backend->icon_path;
|
||||
|
||||
if (execp->backend->has_icon && icon_path) {
|
||||
if (execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
imlib_free_image();
|
||||
}
|
||||
execp->backend->icon = load_image(icon_path, execp->backend->cache_icon);
|
||||
if (execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
int w = imlib_image_get_width();
|
||||
int h = imlib_image_get_height();
|
||||
if (w && h) {
|
||||
if (execp->backend->icon_w) {
|
||||
if (!execp->backend->icon_h) {
|
||||
h = (int)(0.5 + h * execp->backend->icon_w / (float)(w));
|
||||
w = execp->backend->icon_w;
|
||||
} else {
|
||||
w = execp->backend->icon_w;
|
||||
h = execp->backend->icon_h;
|
||||
}
|
||||
} else {
|
||||
if (execp->backend->icon_h) {
|
||||
w = (int)(0.5 + w * execp->backend->icon_h / (float)(h));
|
||||
h = execp->backend->icon_h;
|
||||
}
|
||||
}
|
||||
if (w < 1)
|
||||
w = 1;
|
||||
if (h < 1)
|
||||
h = 1;
|
||||
}
|
||||
if (w != imlib_image_get_width() || h != imlib_image_get_height()) {
|
||||
Imlib_Image icon_scaled =
|
||||
imlib_create_cropped_scaled_image(0, 0, imlib_image_get_width(), imlib_image_get_height(), w, h);
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
imlib_free_image();
|
||||
execp->backend->icon = icon_scaled;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gboolean resize_execp(void *obj)
|
||||
{
|
||||
Execp *execp = obj;
|
||||
Panel *panel = execp->area.panel;
|
||||
int horiz_padding = (panel_horizontal ? execp->area.paddingxlr : execp->area.paddingy);
|
||||
int vert_padding = (panel_horizontal ? execp->area.paddingy : execp->area.paddingxlr);
|
||||
int interior_padding = execp->area.paddingx;
|
||||
|
||||
schedule_redraw(&execp->area);
|
||||
|
||||
int icon_w, icon_h;
|
||||
if (reload_icon(execp)) {
|
||||
if (execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
icon_w = imlib_image_get_width();
|
||||
icon_h = imlib_image_get_height();
|
||||
} else {
|
||||
icon_w = icon_h = 0;
|
||||
}
|
||||
} else {
|
||||
icon_w = icon_h = 0;
|
||||
}
|
||||
|
||||
int text_next_line = !panel_horizontal && icon_w > execp->area.width / 2;
|
||||
|
||||
int txt_height_ink, txt_height, txt_width;
|
||||
if (panel_horizontal) {
|
||||
get_text_size2(execp->backend->font_desc,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
execp->backend->text,
|
||||
strlen(execp->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
execp->backend->has_markup);
|
||||
} else {
|
||||
get_text_size2(execp->backend->font_desc,
|
||||
&txt_height_ink,
|
||||
&txt_height,
|
||||
&txt_width,
|
||||
panel->area.height,
|
||||
!text_next_line
|
||||
? execp->area.width - icon_w - (icon_w ? interior_padding : 0) -
|
||||
2 * (horiz_padding + execp->area.bg->border.width)
|
||||
: execp->area.width - 2 * (horiz_padding + execp->area.bg->border.width),
|
||||
execp->backend->text,
|
||||
strlen(execp->backend->text),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
execp->backend->has_markup);
|
||||
}
|
||||
|
||||
gboolean result = FALSE;
|
||||
if (panel_horizontal) {
|
||||
int new_size = txt_width;
|
||||
if (icon_w)
|
||||
new_size += interior_padding + icon_w;
|
||||
new_size += 2 * (horiz_padding + execp->area.bg->border.width);
|
||||
if (new_size > execp->area.width || new_size < (execp->area.width - 6)) {
|
||||
// we try to limit the number of resize
|
||||
execp->area.width = new_size + 1;
|
||||
result = TRUE;
|
||||
}
|
||||
} else {
|
||||
int new_size;
|
||||
if (!text_next_line) {
|
||||
new_size = txt_height + (2 * (vert_padding + execp->area.bg->border.width));
|
||||
if (new_size < icon_h + (2 * (vert_padding + execp->area.bg->border.width))) {
|
||||
new_size = icon_h + (2 * (vert_padding + execp->area.bg->border.width));
|
||||
}
|
||||
} else {
|
||||
new_size = icon_h + interior_padding + txt_height + (2 * (vert_padding + execp->area.bg->border.width));
|
||||
}
|
||||
if (new_size != execp->area.height) {
|
||||
execp->area.height = new_size;
|
||||
result = TRUE;
|
||||
}
|
||||
}
|
||||
execp->frontend->textw = txt_width;
|
||||
execp->frontend->texth = txt_height;
|
||||
if (execp->backend->centered) {
|
||||
if (icon_w) {
|
||||
if (!text_next_line) {
|
||||
execp->frontend->icony = (execp->area.height - icon_h) / 2;
|
||||
execp->frontend->iconx = (execp->area.width - txt_width - interior_padding - icon_w) / 2;
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
|
||||
} else {
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = (execp->area.width - icon_w) / 2;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = (execp->area.width - txt_width) / 2;
|
||||
}
|
||||
} else {
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = (execp->area.width - txt_width) / 2;
|
||||
}
|
||||
} else {
|
||||
if (icon_w) {
|
||||
if (!text_next_line) {
|
||||
execp->frontend->icony = (execp->area.height - icon_h) / 2;
|
||||
execp->frontend->iconx = execp->area.bg->border.width + horiz_padding;
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = execp->frontend->iconx + icon_w + interior_padding;
|
||||
} else {
|
||||
execp->frontend->icony = (execp->area.height - icon_h - interior_padding - txt_height) / 2;
|
||||
execp->frontend->iconx = execp->area.bg->border.width + horiz_padding;
|
||||
execp->frontend->texty = execp->frontend->icony + icon_h + interior_padding;
|
||||
execp->frontend->textx = execp->frontend->iconx;
|
||||
}
|
||||
} else {
|
||||
execp->frontend->texty = (execp->area.height - txt_height) / 2;
|
||||
execp->frontend->textx = execp->area.bg->border.width + horiz_padding;
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void draw_execp(void *obj, cairo_t *c)
|
||||
{
|
||||
Execp *execp = obj;
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
|
||||
if (execp->backend->has_icon && execp->backend->icon) {
|
||||
imlib_context_set_image(execp->backend->icon);
|
||||
// Render icon
|
||||
render_image(execp->area.pix, execp->frontend->iconx, execp->frontend->icony);
|
||||
}
|
||||
|
||||
// draw layout
|
||||
pango_layout_set_font_description(layout, execp->backend->font_desc);
|
||||
pango_layout_set_width(layout, execp->frontend->textw * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, execp->backend->centered ? PANGO_ALIGN_CENTER : PANGO_ALIGN_LEFT);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
if (!execp->backend->has_markup)
|
||||
pango_layout_set_text(layout, execp->backend->text, strlen(execp->backend->text));
|
||||
else
|
||||
pango_layout_set_markup(layout, execp->backend->text, strlen(execp->backend->text));
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout,
|
||||
c,
|
||||
execp->frontend->textx,
|
||||
execp->frontend->texty,
|
||||
&execp->backend->font_color,
|
||||
panel_config.font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
}
|
||||
|
||||
void execp_action(void *obj, int button, int x, int y)
|
||||
{
|
||||
Execp *execp = obj;
|
||||
char *command = NULL;
|
||||
switch (button) {
|
||||
case 1:
|
||||
command = execp->backend->lclick_command;
|
||||
break;
|
||||
case 2:
|
||||
command = execp->backend->mclick_command;
|
||||
break;
|
||||
case 3:
|
||||
command = execp->backend->rclick_command;
|
||||
break;
|
||||
case 4:
|
||||
command = execp->backend->uwheel_command;
|
||||
break;
|
||||
case 5:
|
||||
command = execp->backend->dwheel_command;
|
||||
break;
|
||||
}
|
||||
if (command) {
|
||||
char *full_cmd = g_strdup_printf("export EXECP_X=%d;"
|
||||
"export EXECP_Y=%d;"
|
||||
"export EXECP_W=%d;"
|
||||
"export EXECP_H=%d; %s",
|
||||
x,
|
||||
y,
|
||||
execp->area.width,
|
||||
execp->area.height,
|
||||
command);
|
||||
tint_exec(full_cmd);
|
||||
g_free(full_cmd);
|
||||
} else {
|
||||
if (execp->backend->child_pipe > 0) {
|
||||
// Command currently running, nothing to do
|
||||
} else {
|
||||
if (execp->backend->timer)
|
||||
stop_timeout(execp->backend->timer);
|
||||
// Run command right away
|
||||
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void execp_timer_callback(void *arg)
|
||||
{
|
||||
Execp *execp = arg;
|
||||
|
||||
if (!execp->backend->command)
|
||||
return;
|
||||
|
||||
// Still running!
|
||||
if (execp->backend->child_pipe > 0)
|
||||
return;
|
||||
|
||||
int pipe_fd[2];
|
||||
if (pipe(pipe_fd)) {
|
||||
// TODO maybe write this in tooltip, but if this happens we're screwed anyways
|
||||
fprintf(stderr, "Execp: Creating pipe failed!\n");
|
||||
return;
|
||||
}
|
||||
|
||||
fcntl(pipe_fd[0], F_SETFL, O_NONBLOCK | fcntl(pipe_fd[0], F_GETFL));
|
||||
|
||||
// Fork and run command, capturing stdout in pipe
|
||||
pid_t child = fork();
|
||||
if (child == -1) {
|
||||
// TODO maybe write this in tooltip, but if this happens we're screwed anyways
|
||||
fprintf(stderr, "Fork failed.\n");
|
||||
close(pipe_fd[1]);
|
||||
close(pipe_fd[0]);
|
||||
return;
|
||||
} else if (child == 0) {
|
||||
// We are in the child
|
||||
close(pipe_fd[0]);
|
||||
dup2(pipe_fd[1], 1); // 1 is stdout
|
||||
close(pipe_fd[1]);
|
||||
setpgid(0, 0);
|
||||
execl("/bin/sh", "/bin/sh", "-c", execp->backend->command, NULL);
|
||||
// This should never happen!
|
||||
fprintf(stdout, "execl() failed\nexecl() failed\n");
|
||||
fflush(stdout);
|
||||
exit(0);
|
||||
}
|
||||
close(pipe_fd[1]);
|
||||
execp->backend->child = child;
|
||||
execp->backend->child_pipe = pipe_fd[0];
|
||||
execp->backend->buf_length = 0;
|
||||
execp->backend->buf_output[execp->backend->buf_length] = '\0';
|
||||
execp->backend->last_update_start_time = time(NULL);
|
||||
}
|
||||
|
||||
gboolean read_execp(void *obj)
|
||||
{
|
||||
Execp *execp = (Execp *)obj;
|
||||
|
||||
if (execp->backend->child_pipe < 0)
|
||||
return FALSE;
|
||||
|
||||
gboolean command_finished = FALSE;
|
||||
while (1) {
|
||||
// Make sure there is free space in the buffer
|
||||
if (execp->backend->buf_capacity - execp->backend->buf_length < 1024) {
|
||||
execp->backend->buf_capacity *= 2;
|
||||
execp->backend->buf_output = realloc(execp->backend->buf_output, execp->backend->buf_capacity);
|
||||
}
|
||||
ssize_t count = read(execp->backend->child_pipe,
|
||||
execp->backend->buf_output + execp->backend->buf_length,
|
||||
execp->backend->buf_capacity - execp->backend->buf_length - 1);
|
||||
if (count > 0) {
|
||||
// Successful read
|
||||
execp->backend->buf_length += count;
|
||||
execp->backend->buf_output[execp->backend->buf_length] = '\0';
|
||||
continue;
|
||||
} else if (count == 0) {
|
||||
// End of file
|
||||
command_finished = TRUE;
|
||||
break;
|
||||
} else if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
||||
// No more data available at the moment
|
||||
break;
|
||||
} else if (errno == EINTR) {
|
||||
// Harmless interruption by signal
|
||||
continue;
|
||||
} else {
|
||||
// Error
|
||||
command_finished = TRUE;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (command_finished) {
|
||||
execp->backend->child = 0;
|
||||
close(execp->backend->child_pipe);
|
||||
execp->backend->child_pipe = -1;
|
||||
if (execp->backend->interval)
|
||||
execp->backend->timer =
|
||||
add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
|
||||
}
|
||||
|
||||
if (!execp->backend->continuous && command_finished) {
|
||||
free_and_null(execp->backend->text);
|
||||
free_and_null(execp->backend->icon_path);
|
||||
if (!execp->backend->has_icon) {
|
||||
execp->backend->text = strdup(execp->backend->buf_output);
|
||||
} else {
|
||||
char *text = strchr(execp->backend->buf_output, '\n');
|
||||
if (text) {
|
||||
*text = '\0';
|
||||
text++;
|
||||
execp->backend->text = strdup(text);
|
||||
} else {
|
||||
execp->backend->text = strdup("");
|
||||
}
|
||||
execp->backend->icon_path = strdup(execp->backend->buf_output);
|
||||
}
|
||||
int len = strlen(execp->backend->text);
|
||||
if (len > 0 && execp->backend->text[len - 1] == '\n')
|
||||
execp->backend->text[len - 1] = '\0';
|
||||
execp->backend->buf_length = 0;
|
||||
execp->backend->buf_output[execp->backend->buf_length] = '\0';
|
||||
execp->backend->last_update_finish_time = time(NULL);
|
||||
execp->backend->last_update_duration =
|
||||
execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
|
||||
return TRUE;
|
||||
} else if (execp->backend->continuous > 0) {
|
||||
// Count lines in buffer
|
||||
int num_lines = 0;
|
||||
char *last = execp->backend->buf_output;
|
||||
char *end = NULL;
|
||||
for (char *c = execp->backend->buf_output; *c; c++) {
|
||||
if (*c == '\n') {
|
||||
num_lines++;
|
||||
if (num_lines == execp->backend->continuous)
|
||||
end = c;
|
||||
}
|
||||
last = c;
|
||||
}
|
||||
if (*last && *last != '\n')
|
||||
num_lines++;
|
||||
if (num_lines >= execp->backend->continuous) {
|
||||
if (end)
|
||||
*end = '\0';
|
||||
free_and_null(execp->backend->text);
|
||||
free_and_null(execp->backend->icon_path);
|
||||
if (!execp->backend->has_icon) {
|
||||
execp->backend->text = strdup(execp->backend->buf_output);
|
||||
} else {
|
||||
char *text = strchr(execp->backend->buf_output, '\n');
|
||||
if (text) {
|
||||
*text = '\0';
|
||||
text++;
|
||||
execp->backend->text = strdup(text);
|
||||
} else {
|
||||
execp->backend->text = strdup("");
|
||||
}
|
||||
execp->backend->icon_path = strdup(execp->backend->buf_output);
|
||||
}
|
||||
int len = strlen(execp->backend->text);
|
||||
if (len > 0 && execp->backend->text[len - 1] == '\n')
|
||||
execp->backend->text[len - 1] = '\0';
|
||||
|
||||
if (end) {
|
||||
char *next = end + 1;
|
||||
int copied = next - execp->backend->buf_output;
|
||||
int remaining = execp->backend->buf_length - copied;
|
||||
if (remaining > 0) {
|
||||
memmove(execp->backend->buf_output, next, remaining);
|
||||
execp->backend->buf_length = remaining;
|
||||
execp->backend->buf_output[execp->backend->buf_length] = '\0';
|
||||
} else {
|
||||
execp->backend->buf_length = 0;
|
||||
execp->backend->buf_output[execp->backend->buf_length] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
execp->backend->last_update_finish_time = time(NULL);
|
||||
execp->backend->last_update_duration =
|
||||
execp->backend->last_update_finish_time - execp->backend->last_update_start_time;
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
const char *time_to_string(int seconds, char *buffer)
|
||||
{
|
||||
if (seconds < 60) {
|
||||
sprintf(buffer, "%ds", seconds);
|
||||
} else if (seconds < 60 * 60) {
|
||||
int m = seconds / 60;
|
||||
seconds = seconds % 60;
|
||||
int s = seconds;
|
||||
sprintf(buffer, "%d:%ds", m, s);
|
||||
} else {
|
||||
int h = seconds / (60 * 60);
|
||||
seconds = seconds % (60 * 60);
|
||||
int m = seconds / 60;
|
||||
seconds = seconds % 60;
|
||||
int s = seconds;
|
||||
sprintf(buffer, "%d:%d:%ds", h, m, s);
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
||||
char *execp_get_tooltip(void *obj)
|
||||
{
|
||||
Execp *execp = obj;
|
||||
|
||||
if (execp->backend->tooltip) {
|
||||
if (strlen(execp->backend->tooltip) > 0)
|
||||
return strdup(execp->backend->tooltip);
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
time_t now = time(NULL);
|
||||
|
||||
char tmp_buf1[256];
|
||||
char tmp_buf2[256];
|
||||
char tmp_buf3[256];
|
||||
if (execp->backend->child_pipe < 0) {
|
||||
// Not executing command
|
||||
if (execp->backend->last_update_finish_time) {
|
||||
// We updated at least once
|
||||
if (execp->backend->interval > 0) {
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago (took %s). Next update starting in %s.",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2),
|
||||
time_to_string((int)(execp->backend->interval - (now - execp->backend->last_update_finish_time)),
|
||||
tmp_buf3));
|
||||
} else {
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago (took %s).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)execp->backend->last_update_duration, tmp_buf2));
|
||||
}
|
||||
} else {
|
||||
// we never requested an update
|
||||
sprintf(execp->backend->tooltip_text, "Never updated. No update scheduled.");
|
||||
}
|
||||
} else {
|
||||
// Currently executing command
|
||||
if (execp->backend->last_update_finish_time) {
|
||||
// we finished updating at least once
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"Last update finished %s ago. Update in progress (started %s ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_finish_time), tmp_buf1),
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf3));
|
||||
} else {
|
||||
// we never finished an update
|
||||
sprintf(execp->backend->tooltip_text,
|
||||
"First update in progress (started %s seconds ago).",
|
||||
time_to_string((int)(now - execp->backend->last_update_start_time), tmp_buf1));
|
||||
}
|
||||
}
|
||||
return strdup(execp->backend->tooltip_text);
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
#ifndef EXECPLUGIN_H
|
||||
#define EXECPLUGIN_H
|
||||
|
||||
#include <sys/time.h>
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
#include "area.h"
|
||||
#include "common.h"
|
||||
#include "timer.h"
|
||||
|
||||
// Architecture:
|
||||
// Panel panel_config contains an array of Execp, each storing all config options and all the state variables.
|
||||
// Only these run commands.
|
||||
//
|
||||
// Tint2 maintains an array of Panels, one for each monitor. Each stores an array of Execp which was initially copied
|
||||
// from panel_config. Each works as a frontend to the corresponding Execp in panel_config as backend, using the
|
||||
// backend's config and state variables.
|
||||
|
||||
typedef struct ExecpBackend {
|
||||
// Config:
|
||||
// Command to execute at a specified interval
|
||||
char *command;
|
||||
// Interval in seconds
|
||||
int interval;
|
||||
// 1 if first line of output is an icon path
|
||||
gboolean has_icon;
|
||||
gboolean cache_icon;
|
||||
int icon_w;
|
||||
int icon_h;
|
||||
char *tooltip;
|
||||
gboolean centered;
|
||||
gboolean has_font;
|
||||
PangoFontDescription *font_desc;
|
||||
Color font_color;
|
||||
int continuous;
|
||||
gboolean has_markup;
|
||||
char *lclick_command;
|
||||
char *mclick_command;
|
||||
char *rclick_command;
|
||||
char *uwheel_command;
|
||||
char *dwheel_command;
|
||||
// paddingxlr = horizontal padding left/right
|
||||
// paddingx = horizontal padding between childs
|
||||
int paddingxlr, paddingx, paddingy;
|
||||
Background *bg;
|
||||
|
||||
// Backend state:
|
||||
timeout *timer;
|
||||
int child_pipe;
|
||||
pid_t child;
|
||||
|
||||
// Command output buffer
|
||||
char *buf_output;
|
||||
int buf_length;
|
||||
int buf_capacity;
|
||||
|
||||
// Text extracted from the output buffer
|
||||
char *text;
|
||||
// Icon path extracted from the output buffer
|
||||
char *icon_path;
|
||||
Imlib_Image icon;
|
||||
char tooltip_text[512];
|
||||
|
||||
// The time the last command was started
|
||||
time_t last_update_start_time;
|
||||
// The time the last output was obtained
|
||||
time_t last_update_finish_time;
|
||||
// The time it took to execute last command
|
||||
time_t last_update_duration;
|
||||
|
||||
// List of Execp which are frontends for this backend, one for each panel
|
||||
GList *instances;
|
||||
} ExecpBackend;
|
||||
|
||||
typedef struct ExecpFrontend {
|
||||
// Frontend state:
|
||||
int iconx;
|
||||
int icony;
|
||||
int textx;
|
||||
int texty;
|
||||
int textw;
|
||||
int texth;
|
||||
} ExecpFrontend;
|
||||
|
||||
typedef struct Execp {
|
||||
Area area;
|
||||
// All elements have the backend pointer set. However only backend elements have ownership.
|
||||
ExecpBackend *backend;
|
||||
// Set only for frontend Execp items.
|
||||
ExecpFrontend *frontend;
|
||||
} Execp;
|
||||
|
||||
// Called before the config is read and panel_config/panels are created.
|
||||
// Afterwards, the config parsing code creates the array of Execp in panel_config and populates the configuration fields
|
||||
// in the backend.
|
||||
// Probably does nothing.
|
||||
void default_execp();
|
||||
|
||||
// Creates a new Execp item with only the backend field set. The state is NOT initialized. The config is initialized to
|
||||
// the default values.
|
||||
// This will be used by the config code to populate its backedn config fields.
|
||||
Execp *create_execp();
|
||||
|
||||
void destroy_execp(void *obj);
|
||||
|
||||
// Called after the config is read and panel_config is populated, but before panels are created.
|
||||
// Initializes the state of the backend items.
|
||||
// panel_config.panel_items is used to determine which backend items are enabled. The others should be destroyed and
|
||||
// removed from panel_config.execp_list.
|
||||
void init_execp();
|
||||
|
||||
// Called after each on-screen panel is created, with a pointer to the panel.
|
||||
// Initializes the state of the frontend items. Also adds a pointer to it in backend->instances.
|
||||
// At this point the Area has not been added yet to the GUI tree, but it will be added right away.
|
||||
void init_execp_panel(void *panel);
|
||||
|
||||
// Called just before the panels are destroyed. Afterwards, tint2 exits or restarts and reads the config again.
|
||||
// Releases all frontends and then all the backends.
|
||||
// The frontend items are not freed by this function, only their members. The items are Areas which are freed in the
|
||||
// GUI element tree cleanup function (remove_area).
|
||||
void cleanup_execp();
|
||||
|
||||
// Called on draw, obj = pointer to the front-end Execp item.
|
||||
void draw_execp(void *obj, cairo_t *c);
|
||||
|
||||
// Called on resize, obj = pointer to the front-end Execp item.
|
||||
// Returns 1 if the new size is different than the previous size.
|
||||
gboolean resize_execp(void *obj);
|
||||
|
||||
// Called on mouse click event.
|
||||
void execp_action(void *obj, int button, int x, int y);
|
||||
|
||||
// Called to check if new output from the command can be read.
|
||||
// No command might be running.
|
||||
// Returns 1 if the output has been updated and a redraw is needed.
|
||||
gboolean read_execp(void *obj);
|
||||
|
||||
void execp_default_font_changed();
|
||||
|
||||
#endif // EXECPLUGIN_H
|
||||
@@ -1,94 +0,0 @@
|
||||
/**************************************************************************
|
||||
*
|
||||
* Tint2 : freespace
|
||||
*
|
||||
* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
#include <pango/pangocairo.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "window.h"
|
||||
#include "server.h"
|
||||
#include "panel.h"
|
||||
#include "freespace.h"
|
||||
#include "common.h"
|
||||
|
||||
void init_freespace_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
FreeSpace *freespace = &panel->freespace;
|
||||
|
||||
if (!freespace->area.bg)
|
||||
freespace->area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
freespace->area.parent = p;
|
||||
freespace->area.panel = p;
|
||||
snprintf(freespace->area.name, sizeof(freespace->area.name), "Freespace");
|
||||
freespace->area.size_mode = LAYOUT_FIXED;
|
||||
freespace->area.resize_needed = 1;
|
||||
freespace->area.on_screen = TRUE;
|
||||
freespace->area._resize = resize_freespace;
|
||||
}
|
||||
|
||||
int freespace_get_max_size(Panel *p)
|
||||
{
|
||||
// Get space used by every element except the freespace
|
||||
int size = 0;
|
||||
for (GList *walk = p->area.children; walk; walk = g_list_next(walk)) {
|
||||
Area *a = (Area *)walk->data;
|
||||
|
||||
if (a->_resize == resize_freespace || !a->on_screen)
|
||||
continue;
|
||||
|
||||
if (panel_horizontal)
|
||||
size += a->width + (a->bg->border.width * 2) + p->area.paddingx;
|
||||
else
|
||||
size += a->height + (a->bg->border.width * 2) + p->area.paddingy;
|
||||
}
|
||||
|
||||
if (panel_horizontal)
|
||||
size = p->area.width - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
|
||||
else
|
||||
size = p->area.height - size - (p->area.bg->border.width * 2) - p->area.paddingxlr;
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
gboolean resize_freespace(void *obj)
|
||||
{
|
||||
FreeSpace *freespace = (FreeSpace *)obj;
|
||||
Panel *panel = (Panel *)freespace->area.panel;
|
||||
if (!freespace->area.on_screen)
|
||||
return FALSE;
|
||||
|
||||
int old_size = panel_horizontal ? freespace->area.width : freespace->area.height;
|
||||
int size = freespace_get_max_size(panel);
|
||||
if (old_size == size)
|
||||
return FALSE;
|
||||
|
||||
if (panel_horizontal) {
|
||||
freespace->area.width = size;
|
||||
} else {
|
||||
freespace->area.height = size;
|
||||
}
|
||||
|
||||
schedule_redraw(&freespace->area);
|
||||
panel_refresh = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
/**************************************************************************
|
||||
* Copyright (C) 2011 Mishael A Sibiryakov (death@junki.org)
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef FREESPACE_H
|
||||
#define FREESPACE_H
|
||||
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
|
||||
typedef struct FreeSpace {
|
||||
Area area;
|
||||
} FreeSpace;
|
||||
|
||||
void cleanup_freespace();
|
||||
void init_freespace_panel(void *panel);
|
||||
|
||||
gboolean resize_freespace(void *obj);
|
||||
|
||||
#endif
|
||||
@@ -1,306 +0,0 @@
|
||||
/**************************************************************************
|
||||
* Tint2 : .desktop file handling
|
||||
*
|
||||
* Copyright (C) 2015 (mrovi9000@gmail.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
/* http://standards.freedesktop.org/desktop-entry-spec/ */
|
||||
|
||||
#include "apps-common.h"
|
||||
#include "common.h"
|
||||
#include "strnatcmp.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
static gint compare_strings(gconstpointer a, gconstpointer b)
|
||||
{
|
||||
return strnatcasecmp((const char *)a, (const char *)b);
|
||||
}
|
||||
|
||||
int parse_dektop_line(char *line, char **key, char **value)
|
||||
{
|
||||
char *p;
|
||||
int found = 0;
|
||||
*key = line;
|
||||
for (p = line; *p; p++) {
|
||||
if (*p == '=') {
|
||||
*value = p + 1;
|
||||
*p = 0;
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
return 0;
|
||||
if (found && (strlen(*key) == 0 || strlen(*value) == 0))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void expand_exec(DesktopEntry *entry, const char *path)
|
||||
{
|
||||
// Expand % in exec
|
||||
// %i -> --icon Icon
|
||||
// %c -> Name
|
||||
// %k -> path
|
||||
if (entry->exec) {
|
||||
char *exec2 = calloc(strlen(entry->exec) + (entry->name ? strlen(entry->name) : 1) +
|
||||
(entry->icon ? strlen(entry->icon) : 1) + 100,
|
||||
1);
|
||||
char *p, *q;
|
||||
// p will never point to an escaped char
|
||||
for (p = entry->exec, q = exec2; *p; p++, q++) {
|
||||
*q = *p; // Copy
|
||||
if (*p == '\\') {
|
||||
p++, q++;
|
||||
// Copy the escaped char
|
||||
if (*p == '%') // For % we delete the backslash, i.e. write % over it
|
||||
q--;
|
||||
*q = *p;
|
||||
if (!*p)
|
||||
break;
|
||||
continue;
|
||||
}
|
||||
if (*p == '%') {
|
||||
p++;
|
||||
if (!*p)
|
||||
break;
|
||||
if (*p == 'i' && entry->icon != NULL) {
|
||||
sprintf(q, "--icon '%s'", entry->icon);
|
||||
q += strlen("--icon ''");
|
||||
q += strlen(entry->icon);
|
||||
q--; // To balance the q++ in the for
|
||||
} else if (*p == 'c' && entry->name != NULL) {
|
||||
sprintf(q, "'%s'", entry->name);
|
||||
q += strlen("''");
|
||||
q += strlen(entry->name);
|
||||
q--; // To balance the q++ in the for
|
||||
} else if (*p == 'c') {
|
||||
sprintf(q, "'%s'", path);
|
||||
q += strlen("''");
|
||||
q += strlen(path);
|
||||
q--; // To balance the q++ in the for
|
||||
} else {
|
||||
// We don't care about other expansions
|
||||
q--; // Delete the last % from q
|
||||
}
|
||||
continue;
|
||||
}
|
||||
}
|
||||
*q = '\0';
|
||||
free(entry->exec);
|
||||
entry->exec = exec2;
|
||||
}
|
||||
}
|
||||
|
||||
gboolean read_desktop_file_full_path(const char *path, DesktopEntry *entry)
|
||||
{
|
||||
entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
|
||||
entry->hidden_from_menus = FALSE;
|
||||
|
||||
FILE *fp = fopen(path, "rt");
|
||||
if (fp == NULL) {
|
||||
fprintf(stderr, "Could not open file %s\n", path);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
const gchar **languages = (const gchar **)g_get_language_names();
|
||||
// lang_index is the index of the language for the best Name key in the language vector
|
||||
// lang_index_default is a constant that encodes the Name key without a language
|
||||
int lang_index_default = 1;
|
||||
#define LANG_DBG 0
|
||||
if (LANG_DBG)
|
||||
printf("Languages:");
|
||||
for (int i = 0; languages[i]; i++) {
|
||||
lang_index_default = i + 1;
|
||||
if (LANG_DBG)
|
||||
printf(" %s", languages[i]);
|
||||
}
|
||||
if (LANG_DBG)
|
||||
printf("\n");
|
||||
// we currently do not know about any Name key at all, so use an invalid index
|
||||
int lang_index_name = lang_index_default + 1;
|
||||
int lang_index_generic_name = lang_index_default + 1;
|
||||
|
||||
gboolean inside_desktop_entry = 0;
|
||||
char *line = NULL;
|
||||
size_t line_size;
|
||||
while (getline(&line, &line_size, fp) >= 0) {
|
||||
int len = strlen(line);
|
||||
if (len == 0)
|
||||
continue;
|
||||
if (line[len - 1] == '\n')
|
||||
line[len - 1] = '\0';
|
||||
if (line[0] == '[') {
|
||||
inside_desktop_entry = (strcmp(line, "[Desktop Entry]") == 0);
|
||||
}
|
||||
char *key, *value;
|
||||
if (inside_desktop_entry && parse_dektop_line(line, &key, &value)) {
|
||||
if (strstr(key, "Name") == key) {
|
||||
if (strcmp(key, "Name") == 0 && lang_index_name > lang_index_default) {
|
||||
entry->name = strdup(value);
|
||||
lang_index_name = lang_index_default;
|
||||
} else {
|
||||
for (int i = 0; languages[i] && i < lang_index_name; i++) {
|
||||
gchar *localized_key = g_strdup_printf("Name[%s]", languages[i]);
|
||||
if (strcmp(key, localized_key) == 0) {
|
||||
if (entry->name)
|
||||
free(entry->name);
|
||||
entry->name = strdup(value);
|
||||
lang_index_name = i;
|
||||
}
|
||||
g_free(localized_key);
|
||||
}
|
||||
}
|
||||
} else if (strstr(key, "GenericName") == key) {
|
||||
if (strcmp(key, "GenericName") == 0 && lang_index_generic_name > lang_index_default) {
|
||||
entry->generic_name = strdup(value);
|
||||
lang_index_generic_name = lang_index_default;
|
||||
} else {
|
||||
for (int i = 0; languages[i] && i < lang_index_generic_name; i++) {
|
||||
gchar *localized_key = g_strdup_printf("GenericName[%s]", languages[i]);
|
||||
if (strcmp(key, localized_key) == 0) {
|
||||
if (entry->generic_name)
|
||||
free(entry->generic_name);
|
||||
entry->generic_name = strdup(value);
|
||||
lang_index_generic_name = i;
|
||||
}
|
||||
g_free(localized_key);
|
||||
}
|
||||
}
|
||||
} else if (!entry->exec && strcmp(key, "Exec") == 0) {
|
||||
entry->exec = strdup(value);
|
||||
} else if (!entry->icon && strcmp(key, "Icon") == 0) {
|
||||
entry->icon = strdup(value);
|
||||
} else if (strcmp(key, "NoDisplay") == 0) {
|
||||
entry->hidden_from_menus = strcasecmp(value, "true") == 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(fp);
|
||||
// From this point:
|
||||
// entry->name, entry->generic_name, entry->icon, entry->exec will never be empty strings (can be NULL though)
|
||||
|
||||
expand_exec(entry, entry->path);
|
||||
|
||||
free(line);
|
||||
return entry->exec != NULL;
|
||||
}
|
||||
|
||||
gboolean read_desktop_file_from_dir(const char *path, const char *file_name, DesktopEntry *entry)
|
||||
{
|
||||
gchar *full_path = g_build_filename(path, file_name, NULL);
|
||||
if (read_desktop_file_full_path(full_path, entry)) {
|
||||
g_free(full_path);
|
||||
return TRUE;
|
||||
}
|
||||
free(entry->name);
|
||||
free(entry->generic_name);
|
||||
free(entry->icon);
|
||||
free(entry->exec);
|
||||
entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
|
||||
|
||||
GList *subdirs = NULL;
|
||||
|
||||
GDir *d = g_dir_open(path, 0, NULL);
|
||||
if (d) {
|
||||
const gchar *name;
|
||||
while ((name = g_dir_read_name(d))) {
|
||||
gchar *child = g_build_filename(path, name, NULL);
|
||||
if (g_file_test(child, G_FILE_TEST_IS_DIR)) {
|
||||
subdirs = g_list_append(subdirs, child);
|
||||
} else {
|
||||
g_free(child);
|
||||
}
|
||||
}
|
||||
g_dir_close(d);
|
||||
}
|
||||
|
||||
subdirs = g_list_sort(subdirs, compare_strings);
|
||||
gboolean found = FALSE;
|
||||
for (GList *l = subdirs; l; l = g_list_next(l)) {
|
||||
if (read_desktop_file_from_dir(l->data, file_name, entry)) {
|
||||
found = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (GList *l = subdirs; l; l = g_list_next(l)) {
|
||||
g_free(l->data);
|
||||
}
|
||||
g_list_free(subdirs);
|
||||
g_free(full_path);
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
gboolean read_desktop_file(const char *path, DesktopEntry *entry)
|
||||
{
|
||||
entry->path = strdup(path);
|
||||
entry->name = entry->generic_name = entry->icon = entry->exec = NULL;
|
||||
|
||||
if (strchr(path, '/'))
|
||||
return read_desktop_file_full_path(path, entry);
|
||||
for (const GSList *location = get_apps_locations(); location; location = g_slist_next(location)) {
|
||||
if (read_desktop_file_from_dir(location->data, path, entry))
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void free_desktop_entry(DesktopEntry *entry)
|
||||
{
|
||||
free(entry->name);
|
||||
free(entry->generic_name);
|
||||
free(entry->icon);
|
||||
free(entry->exec);
|
||||
free(entry->path);
|
||||
entry->name = entry->generic_name = entry->icon = entry->exec = entry->path = NULL;
|
||||
}
|
||||
|
||||
void test_read_desktop_file()
|
||||
{
|
||||
fprintf(stdout, "\033[1;33m");
|
||||
DesktopEntry entry;
|
||||
read_desktop_file("/usr/share/applications/firefox.desktop", &entry);
|
||||
printf("Name:%s GenericName:%s Icon:%s Exec:%s\n", entry.name, entry.generic_name, entry.icon, entry.exec);
|
||||
fprintf(stdout, "\033[0m");
|
||||
}
|
||||
|
||||
GSList *apps_locations = NULL;
|
||||
// Do not free the result.
|
||||
const GSList *get_apps_locations()
|
||||
{
|
||||
if (apps_locations)
|
||||
return apps_locations;
|
||||
|
||||
apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_HOME", "applications", NULL);
|
||||
|
||||
apps_locations =
|
||||
g_slist_append(apps_locations, g_build_filename(g_get_home_dir(), ".local/share/applications", NULL));
|
||||
|
||||
apps_locations = load_locations_from_env(apps_locations, "XDG_DATA_DIRS", "applications", NULL);
|
||||
|
||||
apps_locations = g_slist_append(apps_locations, g_strdup("/usr/local/share/applications"));
|
||||
apps_locations = g_slist_append(apps_locations, g_strdup("/usr/share/applications"));
|
||||
apps_locations = g_slist_append(apps_locations, g_strdup("/opt/share/applications"));
|
||||
|
||||
apps_locations = slist_remove_duplicates(apps_locations, g_str_equal, g_free);
|
||||
|
||||
return apps_locations;
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
/**************************************************************************
|
||||
* Copyright (C) 2015 (mrovi9000@gmail.com)
|
||||
*
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef APPS_COMMON_H
|
||||
#define APPS_COMMON_H
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
typedef struct DesktopEntry {
|
||||
char *name;
|
||||
char *generic_name;
|
||||
char *exec;
|
||||
char *icon;
|
||||
char *path;
|
||||
gboolean hidden_from_menus;
|
||||
} DesktopEntry;
|
||||
|
||||
// Parses a line of the form "key = value". Modifies the line.
|
||||
// Returns 1 if successful, and parts are not empty.
|
||||
// Key and value point to the parts.
|
||||
int parse_dektop_line(char *line, char **key, char **value);
|
||||
|
||||
// Reads the .desktop file from the given path into the DesktopEntry entry.
|
||||
// The DesktopEntry object must be initially empty.
|
||||
// Returns 1 if successful.
|
||||
gboolean read_desktop_file(const char *path, DesktopEntry *entry);
|
||||
|
||||
// Empties DesktopEntry: releases the memory of the *members* of entry.
|
||||
void free_desktop_entry(DesktopEntry *entry);
|
||||
|
||||
// Returns a list of the directories used to store desktop files.
|
||||
// Do not free the result, it is cached.
|
||||
const GSList *get_apps_locations();
|
||||
|
||||
#endif
|
||||
@@ -1,779 +0,0 @@
|
||||
/**************************************************************************
|
||||
* Tint2 : Icon theme handling
|
||||
*
|
||||
* Copyright (C) 2015 (mrovi9000@gmail.com)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
**************************************************************************/
|
||||
|
||||
/* http://standards.freedesktop.org/icon-theme-spec/ */
|
||||
|
||||
#include "icon-theme-common.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "apps-common.h"
|
||||
#include "common.h"
|
||||
#include "cache.h"
|
||||
|
||||
#define ICON_DIR_TYPE_SCALABLE 0
|
||||
#define ICON_DIR_TYPE_FIXED 1
|
||||
#define ICON_DIR_TYPE_THRESHOLD 2
|
||||
typedef struct IconThemeDir {
|
||||
char *name;
|
||||
int size;
|
||||
int type;
|
||||
int max_size;
|
||||
int min_size;
|
||||
int threshold;
|
||||
} IconThemeDir;
|
||||
|
||||
int parse_theme_line(char *line, char **key, char **value)
|
||||
{
|
||||
return parse_dektop_line(line, key, value);
|
||||
}
|
||||
|
||||
GSList *icon_locations = NULL;
|
||||
// Do not free the result.
|
||||
const GSList *get_icon_locations()
|
||||
{
|
||||
if (icon_locations)
|
||||
return icon_locations;
|
||||
|
||||
icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_HOME", ".icons", NULL);
|
||||
|
||||
icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".icons", NULL));
|
||||
icon_locations = g_slist_append(icon_locations, g_build_filename(g_get_home_dir(), ".local/share/icons", NULL));
|
||||
|
||||
icon_locations = load_locations_from_env(icon_locations, "XDG_DATA_DIRS", ".icons", ".pixmaps", NULL);
|
||||
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/icons"));
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/usr/local/share/pixmaps"));
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/icons"));
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/usr/share/pixmaps"));
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/opt/share/icons"));
|
||||
icon_locations = g_slist_append(icon_locations, g_strdup("/opt/share/pixmaps"));
|
||||
|
||||
icon_locations = slist_remove_duplicates(icon_locations, g_str_equal, g_free);
|
||||
|
||||
return icon_locations;
|
||||
}
|
||||
|
||||
IconTheme *make_theme(const char *name)
|
||||
{
|
||||
IconTheme *theme = calloc(1, sizeof(IconTheme));
|
||||
theme->name = strdup(name);
|
||||
theme->list_inherits = NULL;
|
||||
theme->list_directories = NULL;
|
||||
return theme;
|
||||
}
|
||||
|
||||
// TODO Use UTF8 when parsing the file
|
||||
IconTheme *load_theme_from_index(const char *file_name, const char *name)
|
||||
{
|
||||
IconTheme *theme;
|
||||
FILE *f;
|
||||
char *line = NULL;
|
||||
size_t line_size;
|
||||
|
||||
if ((f = fopen(file_name, "rt")) == NULL) {
|
||||
fprintf(stderr, "Could not open theme '%s'\n", file_name);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
theme = make_theme(name);
|
||||
|
||||
IconThemeDir *current_dir = NULL;
|
||||
int inside_header = 1;
|
||||
while (getline(&line, &line_size, f) >= 0) {
|
||||
char *key, *value;
|
||||
|
||||
int line_len = strlen(line);
|
||||
if (line_len >= 1) {
|
||||
if (line[line_len - 1] == '\n') {
|
||||
line[line_len - 1] = '\0';
|
||||
line_len--;
|
||||
}
|
||||
}
|
||||
|
||||
if (line_len == 0)
|
||||
continue;
|
||||
|
||||
if (inside_header) {
|
||||
if (parse_theme_line(line, &key, &value)) {
|
||||
if (strcmp(key, "Inherits") == 0) {
|
||||
// value is like oxygen,wood,default
|
||||
char *token;
|
||||
token = strtok(value, ",\n");
|
||||
while (token != NULL) {
|
||||
theme->list_inherits = g_slist_append(theme->list_inherits, strdup(token));
|
||||
token = strtok(NULL, ",\n");
|
||||
}
|
||||
} else if (strcmp(key, "Directories") == 0) {
|
||||
// value is like 48x48/apps,48x48/mimetypes,32x32/apps,scalable/apps,scalable/mimetypes
|
||||
char *token;
|
||||
token = strtok(value, ",\n");
|
||||
while (token != NULL) {
|
||||
IconThemeDir *dir = calloc(1, sizeof(IconThemeDir));
|
||||
dir->name = strdup(token);
|
||||
dir->max_size = dir->min_size = dir->size = -1;
|
||||
dir->type = ICON_DIR_TYPE_THRESHOLD;
|
||||
dir->threshold = 2;
|
||||
theme->list_directories = g_slist_append(theme->list_directories, dir);
|
||||
token = strtok(NULL, ",\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (current_dir != NULL) {
|
||||
if (parse_theme_line(line, &key, &value)) {
|
||||
if (strcmp(key, "Size") == 0) {
|
||||
// value is like 24
|
||||
sscanf(value, "%d", ¤t_dir->size);
|
||||
if (current_dir->max_size == -1)
|
||||
current_dir->max_size = current_dir->size;
|
||||
if (current_dir->min_size == -1)
|
||||
current_dir->min_size = current_dir->size;
|
||||
} else if (strcmp(key, "MaxSize") == 0) {
|
||||
// value is like 24
|
||||
sscanf(value, "%d", ¤t_dir->max_size);
|
||||
} else if (strcmp(key, "MinSize") == 0) {
|
||||
// value is like 24
|
||||
sscanf(value, "%d", ¤t_dir->min_size);
|
||||
} else if (strcmp(key, "Threshold") == 0) {
|
||||
// value is like 2
|
||||
sscanf(value, "%d", ¤t_dir->threshold);
|
||||
} else if (strcmp(key, "Type") == 0) {
|
||||
// value is Fixed, Scalable or Threshold : default to scalable for unknown Type.
|
||||
if (strcmp(value, "Fixed") == 0) {
|
||||
current_dir->type = ICON_DIR_TYPE_FIXED;
|
||||
} else if (strcmp(value, "Threshold") == 0) {
|
||||
current_dir->type = ICON_DIR_TYPE_THRESHOLD;
|
||||
} else {
|
||||
current_dir->type = ICON_DIR_TYPE_SCALABLE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (line[0] == '[' && line[line_len - 1] == ']' && strcmp(line, "[Icon Theme]") != 0) {
|
||||
inside_header = 0;
|
||||
current_dir = NULL;
|
||||
line[line_len - 1] = '\0';
|
||||
char *dir_name = line + 1;
|
||||
GSList *dir_item = theme->list_directories;
|
||||
while (dir_item != NULL) {
|
||||
IconThemeDir *dir = dir_item->data;
|
||||
if (strcmp(dir->name, dir_name) == 0) {
|
||||
current_dir = dir;
|
||||
break;
|
||||
}
|
||||
dir_item = g_slist_next(dir_item);
|
||||
}
|
||||
}
|
||||
}
|
||||
fclose(f);
|
||||
|
||||
free(line);
|
||||
return theme;
|
||||
}
|
||||
|
||||
void load_theme_from_fs_dir(IconTheme *theme, const char *dir_name)
|
||||
{
|
||||
gchar *file_name = g_build_filename(dir_name, "index.theme", NULL);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
g_free(file_name);
|
||||
return;
|
||||
}
|
||||
|
||||
GDir *d = g_dir_open(dir_name, 0, NULL);
|
||||
if (d) {
|
||||
const gchar *size_name;
|
||||
while ((size_name = g_dir_read_name(d))) {
|
||||
gchar *full_size_name = g_build_filename(dir_name, size_name, NULL);
|
||||
if (g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
|
||||
int size, size2;
|
||||
if ((sscanf(size_name, "%dx%d", &size, &size2) == 2 && size == size2) ||
|
||||
(sscanf(size_name, "%d", &size) == 1)) {
|
||||
GDir *dSize = g_dir_open(full_size_name, 0, NULL);
|
||||
if (dSize) {
|
||||
const gchar *subdir_name;
|
||||
while ((subdir_name = g_dir_read_name(dSize))) {
|
||||
IconThemeDir *dir = calloc(1, sizeof(IconThemeDir));
|
||||
// value is like 48x48/apps
|
||||
gchar *value = g_build_filename(size_name, subdir_name, NULL);
|
||||
dir->name = strdup(value);
|
||||
g_free(value);
|
||||
dir->max_size = dir->min_size = dir->size = size;
|
||||
dir->type = ICON_DIR_TYPE_FIXED;
|
||||
theme->list_directories = g_slist_append(theme->list_directories, dir);
|
||||
}
|
||||
g_dir_close(dSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
g_free(full_size_name);
|
||||
}
|
||||
g_dir_close(d);
|
||||
}
|
||||
}
|
||||
|
||||
IconTheme *load_theme_from_fs(const char *name, IconTheme *theme)
|
||||
{
|
||||
gchar *dir_name = NULL;
|
||||
for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
|
||||
gchar *path = (gchar *)location->data;
|
||||
dir_name = g_build_filename(path, name, NULL);
|
||||
if (g_file_test(dir_name, G_FILE_TEST_IS_DIR)) {
|
||||
if (!theme) {
|
||||
theme = make_theme(name);
|
||||
}
|
||||
load_theme_from_fs_dir(theme, dir_name);
|
||||
}
|
||||
g_free(dir_name);
|
||||
dir_name = NULL;
|
||||
}
|
||||
|
||||
return theme;
|
||||
}
|
||||
|
||||
IconTheme *load_theme(const char *name)
|
||||
{
|
||||
// Look for name/index.theme in $HOME/.icons, /usr/share/icons, /usr/share/pixmaps (stop at the first found)
|
||||
// Parse index.theme -> list of IconThemeDir with attributes
|
||||
// Return IconTheme*
|
||||
|
||||
if (name == NULL)
|
||||
return NULL;
|
||||
|
||||
gchar *file_name = NULL;
|
||||
for (const GSList *location = get_icon_locations(); location; location = g_slist_next(location)) {
|
||||
gchar *path = (gchar *)location->data;
|
||||
file_name = g_build_filename(path, name, "index.theme", NULL);
|
||||
if (!g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
g_free(file_name);
|
||||
file_name = NULL;
|
||||
}
|
||||
if (file_name)
|
||||
break;
|
||||
}
|
||||
|
||||
IconTheme *theme = NULL;
|
||||
if (file_name) {
|
||||
theme = load_theme_from_index(file_name, name);
|
||||
g_free(file_name);
|
||||
}
|
||||
|
||||
return load_theme_from_fs(name, theme);
|
||||
}
|
||||
|
||||
void free_icon_theme(IconTheme *theme)
|
||||
{
|
||||
if (!theme)
|
||||
return;
|
||||
free(theme->name);
|
||||
theme->name = NULL;
|
||||
free(theme->description);
|
||||
theme->description = NULL;
|
||||
for (GSList *l_inherits = theme->list_inherits; l_inherits; l_inherits = l_inherits->next) {
|
||||
free(l_inherits->data);
|
||||
}
|
||||
g_slist_free(theme->list_inherits);
|
||||
theme->list_inherits = NULL;
|
||||
for (GSList *l_dir = theme->list_directories; l_dir; l_dir = l_dir->next) {
|
||||
IconThemeDir *dir = (IconThemeDir *)l_dir->data;
|
||||
free(dir->name);
|
||||
free(l_dir->data);
|
||||
}
|
||||
g_slist_free(theme->list_directories);
|
||||
theme->list_directories = NULL;
|
||||
}
|
||||
|
||||
void free_themes(IconThemeWrapper *wrapper)
|
||||
{
|
||||
if (!wrapper)
|
||||
return;
|
||||
for (GSList *l = wrapper->themes; l; l = l->next) {
|
||||
IconTheme *theme = (IconTheme *)l->data;
|
||||
free_icon_theme(theme);
|
||||
free(theme);
|
||||
}
|
||||
g_slist_free(wrapper->themes);
|
||||
for (GSList *l = wrapper->themes_fallback; l; l = l->next) {
|
||||
IconTheme *theme = (IconTheme *)l->data;
|
||||
free_icon_theme(theme);
|
||||
free(theme);
|
||||
}
|
||||
g_slist_free(wrapper->themes_fallback);
|
||||
g_slist_free_full(wrapper->_queued, free);
|
||||
free_cache(&wrapper->_cache);
|
||||
free(wrapper);
|
||||
}
|
||||
|
||||
void test_launcher_read_theme_file()
|
||||
{
|
||||
fprintf(stdout, "\033[1;33m");
|
||||
IconTheme *theme = load_theme("oxygen");
|
||||
if (!theme) {
|
||||
printf("Could not load theme\n");
|
||||
return;
|
||||
}
|
||||
printf("Loaded theme: %s\n", theme->name);
|
||||
GSList *item = theme->list_inherits;
|
||||
while (item != NULL) {
|
||||
printf("Inherits:%s\n", (char *)item->data);
|
||||
item = g_slist_next(item);
|
||||
}
|
||||
item = theme->list_directories;
|
||||
while (item != NULL) {
|
||||
IconThemeDir *dir = item->data;
|
||||
printf("Dir:%s Size=%d MinSize=%d MaxSize=%d Threshold=%d Type=%s\n",
|
||||
dir->name,
|
||||
dir->size,
|
||||
dir->min_size,
|
||||
dir->max_size,
|
||||
dir->threshold,
|
||||
dir->type == ICON_DIR_TYPE_FIXED ? "Fixed" : dir->type == ICON_DIR_TYPE_SCALABLE
|
||||
? "Scalable"
|
||||
: dir->type == ICON_DIR_TYPE_THRESHOLD ? "Threshold"
|
||||
: "?????");
|
||||
item = g_slist_next(item);
|
||||
}
|
||||
fprintf(stdout, "\033[0m");
|
||||
}
|
||||
|
||||
gboolean str_list_contains(const GSList *list, const char *value)
|
||||
{
|
||||
const GSList *item = list;
|
||||
while (item != NULL) {
|
||||
if (g_str_equal(item->data, value)) {
|
||||
return TRUE;
|
||||
}
|
||||
item = g_slist_next(item);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void load_themes_helper(const char *name, GSList **themes, GSList **queued)
|
||||
{
|
||||
if (str_list_contains(*queued, name))
|
||||
return;
|
||||
GSList *queue = g_slist_append(NULL, strdup(name));
|
||||
*queued = g_slist_append(*queued, strdup(name));
|
||||
|
||||
// Load wrapper->themes
|
||||
while (queue) {
|
||||
char *queued_name = queue->data;
|
||||
queue = g_slist_remove(queue, queued_name);
|
||||
|
||||
fprintf(stderr, " '%s',", queued_name);
|
||||
IconTheme *theme = load_theme(queued_name);
|
||||
if (theme != NULL) {
|
||||
*themes = g_slist_append(*themes, theme);
|
||||
|
||||
GSList *item = theme->list_inherits;
|
||||
int pos = 0;
|
||||
while (item != NULL) {
|
||||
char *parent = item->data;
|
||||
if (!str_list_contains(*queued, parent)) {
|
||||
queue = g_slist_insert(queue, strdup(parent), pos);
|
||||
pos++;
|
||||
*queued = g_slist_append(*queued, strdup(parent));
|
||||
}
|
||||
item = g_slist_next(item);
|
||||
}
|
||||
}
|
||||
|
||||
free(queued_name);
|
||||
}
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
// Free the queue
|
||||
GSList *l;
|
||||
for (l = queue; l; l = l->next)
|
||||
free(l->data);
|
||||
g_slist_free(queue);
|
||||
}
|
||||
|
||||
void load_default_theme(IconThemeWrapper *wrapper)
|
||||
{
|
||||
if (wrapper->_themes_loaded)
|
||||
return;
|
||||
|
||||
fprintf(stderr, GREEN "Loading icon theme %s:" RESET "\n", wrapper->icon_theme_name);
|
||||
|
||||
load_themes_helper(wrapper->icon_theme_name, &wrapper->themes, &wrapper->_queued);
|
||||
load_themes_helper("hicolor", &wrapper->themes, &wrapper->_queued);
|
||||
|
||||
wrapper->_themes_loaded = TRUE;
|
||||
}
|
||||
|
||||
void load_fallbacks(IconThemeWrapper *wrapper)
|
||||
{
|
||||
if (wrapper->_fallback_loaded)
|
||||
return;
|
||||
|
||||
fprintf(stderr, RED "Loading additional icon themes (this means your icon theme is incomplete)..." RESET "\n");
|
||||
|
||||
// Load wrapper->themes_fallback
|
||||
const GSList *location;
|
||||
for (location = get_icon_locations(); location; location = g_slist_next(location)) {
|
||||
gchar *path = (gchar *)location->data;
|
||||
GDir *d = g_dir_open(path, 0, NULL);
|
||||
if (d) {
|
||||
const gchar *name;
|
||||
while ((name = g_dir_read_name(d))) {
|
||||
gchar *file_name = g_build_filename(path, name, "index.theme", NULL);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS) && !g_file_test(file_name, G_FILE_TEST_IS_DIR)) {
|
||||
load_themes_helper(name, &wrapper->themes_fallback, &wrapper->_queued);
|
||||
}
|
||||
g_free(file_name);
|
||||
}
|
||||
g_dir_close(d);
|
||||
}
|
||||
}
|
||||
|
||||
wrapper->_fallback_loaded = TRUE;
|
||||
}
|
||||
|
||||
gchar *get_icon_cache_path()
|
||||
{
|
||||
return g_build_filename(g_get_user_cache_dir(), "tint2", "icon.cache", NULL);
|
||||
}
|
||||
|
||||
void load_icon_cache(IconThemeWrapper *wrapper)
|
||||
{
|
||||
if (wrapper->_cache.loaded)
|
||||
return;
|
||||
|
||||
fprintf(stderr, GREEN "Loading icon theme cache..." RESET "\n");
|
||||
|
||||
gchar *cache_path = get_icon_cache_path();
|
||||
load_cache(&wrapper->_cache, cache_path);
|
||||
g_free(cache_path);
|
||||
}
|
||||
|
||||
void save_icon_cache(IconThemeWrapper *wrapper)
|
||||
{
|
||||
if (!wrapper || !wrapper->_cache.dirty)
|
||||
return;
|
||||
|
||||
fprintf(stderr, GREEN "Saving icon theme cache..." RESET "\n");
|
||||
gchar *cache_path = get_icon_cache_path();
|
||||
save_cache(&wrapper->_cache, cache_path);
|
||||
g_free(cache_path);
|
||||
}
|
||||
|
||||
IconThemeWrapper *load_themes(const char *icon_theme_name)
|
||||
{
|
||||
IconThemeWrapper *wrapper = calloc(1, sizeof(IconThemeWrapper));
|
||||
|
||||
if (!icon_theme_name) {
|
||||
fprintf(stderr, "Missing icon_theme_name theme, default to 'hicolor'.\n");
|
||||
icon_theme_name = "hicolor";
|
||||
}
|
||||
|
||||
wrapper->icon_theme_name = strdup(icon_theme_name);
|
||||
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
int directory_matches_size(IconThemeDir *dir, int size)
|
||||
{
|
||||
if (dir->type == ICON_DIR_TYPE_FIXED) {
|
||||
return dir->size == size;
|
||||
} else if (dir->type == ICON_DIR_TYPE_SCALABLE) {
|
||||
return dir->min_size <= size && size <= dir->max_size;
|
||||
} else /*if (dir->type == ICON_DIR_TYPE_THRESHOLD)*/ {
|
||||
return dir->size - dir->threshold <= size && size <= dir->size + dir->threshold;
|
||||
}
|
||||
}
|
||||
|
||||
int directory_size_distance(IconThemeDir *dir, int size)
|
||||
{
|
||||
if (dir->type == ICON_DIR_TYPE_FIXED) {
|
||||
return abs(dir->size - size);
|
||||
} else if (dir->type == ICON_DIR_TYPE_SCALABLE) {
|
||||
if (size < dir->min_size) {
|
||||
return dir->min_size - size;
|
||||
} else if (size > dir->max_size) {
|
||||
return size - dir->max_size;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
} else /*if (dir->type == ICON_DIR_TYPE_THRESHOLD)*/ {
|
||||
if (size < dir->size - dir->threshold) {
|
||||
return dir->min_size - size;
|
||||
} else if (size > dir->size + dir->threshold) {
|
||||
return size - dir->max_size;
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gint compare_theme_directories(gconstpointer a, gconstpointer b, gpointer size_query)
|
||||
{
|
||||
int size = GPOINTER_TO_INT(size_query);
|
||||
const IconThemeDir *da = (const IconThemeDir *)a;
|
||||
const IconThemeDir *db = (const IconThemeDir *)b;
|
||||
return abs(da->size - size) - abs(db->size - size);
|
||||
}
|
||||
|
||||
#define DEBUG_ICON_SEARCH 0
|
||||
char *get_icon_path_helper(GSList *themes, const char *icon_name, int size)
|
||||
{
|
||||
if (icon_name == NULL)
|
||||
return NULL;
|
||||
|
||||
// If the icon_name is already a path and the file exists, return it
|
||||
if (strstr(icon_name, "/") == icon_name) {
|
||||
if (g_file_test(icon_name, G_FILE_TEST_EXISTS))
|
||||
return strdup(icon_name);
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const GSList *basenames = get_icon_locations();
|
||||
GSList *extensions = NULL;
|
||||
extensions = g_slist_append(extensions, ".png");
|
||||
extensions = g_slist_append(extensions, ".xpm");
|
||||
#ifdef HAVE_RSVG
|
||||
extensions = g_slist_append(extensions, ".svg");
|
||||
#endif
|
||||
// if the icon name already contains one of the extensions (e.g. vlc.png instead of vlc) add a special entry
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *extension = (char *)ext->data;
|
||||
if (strlen(icon_name) > strlen(extension) &&
|
||||
strcmp(extension, icon_name + strlen(icon_name) - strlen(extension)) == 0) {
|
||||
extensions = g_slist_append(extensions, "");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
GSList *theme;
|
||||
|
||||
// Best size match
|
||||
// Contrary to the freedesktop spec, we are not choosing the closest icon in size, but the next larger icon
|
||||
// otherwise the quality is usually crap (for size 22, if you can choose 16 or 32, you're better with 32)
|
||||
// We do fallback to the closest size if we cannot find a larger or equal icon
|
||||
|
||||
// These 3 variables are used for keeping the closest size match
|
||||
int minimal_size = INT_MAX;
|
||||
char *best_file_name = NULL;
|
||||
GSList *best_file_theme = NULL;
|
||||
|
||||
// These 3 variables are used for keeping the next larger match
|
||||
int next_larger_size = -1;
|
||||
char *next_larger = NULL;
|
||||
GSList *next_larger_theme = NULL;
|
||||
|
||||
int file_name_size = 4096;
|
||||
char *file_name = calloc(file_name_size, 1);
|
||||
|
||||
for (theme = themes; theme; theme = g_slist_next(theme)) {
|
||||
((IconTheme *)theme->data)->list_directories =
|
||||
g_slist_sort_with_data(((IconTheme *)theme->data)->list_directories,
|
||||
compare_theme_directories,
|
||||
GINT_TO_POINTER(size));
|
||||
GSList *dir;
|
||||
for (dir = ((IconTheme *)theme->data)->list_directories; dir; dir = g_slist_next(dir)) {
|
||||
// Closest match
|
||||
gboolean possible = directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
|
||||
(!best_file_theme ? TRUE : theme == best_file_theme);
|
||||
// Next larger match
|
||||
possible = possible || (((IconThemeDir *)dir->data)->size >= size &&
|
||||
(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
|
||||
(!next_larger_theme ? 1 : theme == next_larger_theme));
|
||||
if (!possible)
|
||||
continue;
|
||||
const GSList *base;
|
||||
for (base = basenames; base; base = g_slist_next(base)) {
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *base_name = (char *)base->data;
|
||||
char *theme_name = ((IconTheme *)theme->data)->name;
|
||||
char *dir_name = ((IconThemeDir *)dir->data)->name;
|
||||
char *extension = (char *)ext->data;
|
||||
if (strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
|
||||
strlen(extension) + 100 >
|
||||
file_name_size) {
|
||||
file_name_size = strlen(base_name) + strlen(theme_name) + strlen(dir_name) + strlen(icon_name) +
|
||||
strlen(extension) + 100;
|
||||
file_name = realloc(file_name, file_name_size);
|
||||
}
|
||||
file_name[0] = 0;
|
||||
// filename = directory/$(themename)/subdirectory/iconname.extension
|
||||
sprintf(file_name, "%s/%s/%s/%s%s", base_name, theme_name, dir_name, icon_name, extension);
|
||||
if (DEBUG_ICON_SEARCH)
|
||||
printf("checking %s\n", file_name);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
if (DEBUG_ICON_SEARCH)
|
||||
printf("found: %s\n", file_name);
|
||||
// Closest match
|
||||
if (directory_size_distance((IconThemeDir *)dir->data, size) < minimal_size &&
|
||||
(!best_file_theme ? 1 : theme == best_file_theme)) {
|
||||
if (best_file_name) {
|
||||
free(best_file_name);
|
||||
best_file_name = NULL;
|
||||
}
|
||||
best_file_name = strdup(file_name);
|
||||
minimal_size = directory_size_distance((IconThemeDir *)dir->data, size);
|
||||
best_file_theme = theme;
|
||||
if (DEBUG_ICON_SEARCH)
|
||||
printf("best_file_name = %s; minimal_size = %d\n", best_file_name, minimal_size);
|
||||
}
|
||||
// Next larger match
|
||||
if (((IconThemeDir *)dir->data)->size >= size &&
|
||||
(next_larger_size == -1 || ((IconThemeDir *)dir->data)->size < next_larger_size) &&
|
||||
(!next_larger_theme ? 1 : theme == next_larger_theme)) {
|
||||
if (next_larger) {
|
||||
free(next_larger);
|
||||
next_larger = NULL;
|
||||
}
|
||||
next_larger = strdup(file_name);
|
||||
next_larger_size = ((IconThemeDir *)dir->data)->size;
|
||||
next_larger_theme = theme;
|
||||
if (DEBUG_ICON_SEARCH)
|
||||
printf("next_larger = %s; next_larger_size = %d\n", next_larger, next_larger_size);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
free(file_name);
|
||||
file_name = NULL;
|
||||
if (next_larger) {
|
||||
g_slist_free(extensions);
|
||||
free(best_file_name);
|
||||
return next_larger;
|
||||
}
|
||||
if (best_file_name) {
|
||||
g_slist_free(extensions);
|
||||
return best_file_name;
|
||||
}
|
||||
|
||||
// Look in unthemed icons
|
||||
{
|
||||
for (const GSList *base = basenames; base; base = g_slist_next(base)) {
|
||||
for (GSList *ext = extensions; ext; ext = g_slist_next(ext)) {
|
||||
char *base_name = (char *)base->data;
|
||||
char *extension = (char *)ext->data;
|
||||
file_name = calloc(strlen(base_name) + strlen(icon_name) + strlen(extension) + 100, 1);
|
||||
// filename = directory/iconname.extension
|
||||
sprintf(file_name, "%s/%s%s", base_name, icon_name, extension);
|
||||
if (DEBUG_ICON_SEARCH)
|
||||
printf("checking %s\n", file_name);
|
||||
if (g_file_test(file_name, G_FILE_TEST_EXISTS)) {
|
||||
g_slist_free(extensions);
|
||||
return file_name;
|
||||
} else {
|
||||
free(file_name);
|
||||
file_name = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g_slist_free(extensions);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char *get_icon_path_from_cache(IconThemeWrapper *wrapper, const char *icon_name, int size)
|
||||
{
|
||||
if (!wrapper || !icon_name || strlen(icon_name) == 0)
|
||||
return NULL;
|
||||
|
||||
load_icon_cache(wrapper);
|
||||
|
||||
gchar *key = g_strdup_printf("%s\t%s\t%d", wrapper->icon_theme_name, icon_name, size);
|
||||
const gchar *value = get_from_cache(&wrapper->_cache, key);
|
||||
g_free(key);
|
||||
|
||||
if (!value) {
|
||||
fprintf(stderr,
|
||||
YELLOW "Icon path not found in cache: theme = %s, icon = %s, size = %d" RESET "\n",
|
||||
wrapper->icon_theme_name,
|
||||
icon_name,
|
||||
size);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (!g_file_test(value, G_FILE_TEST_EXISTS))
|
||||
return NULL;
|
||||
|
||||
// fprintf(stderr, "Icon path found in cache: theme = %s, icon = %s, size = %d, path = %s\n",
|
||||
// wrapper->icon_theme_name, icon_name, size, value);
|
||||
|
||||
return strdup(value);
|
||||
}
|
||||
|
||||
void add_icon_path_to_cache(IconThemeWrapper *wrapper, const char *icon_name, int size, const char *path)
|
||||
{
|
||||
if (!wrapper || !icon_name || strlen(icon_name) == 0 || !path || strlen(path) == 0)
|
||||
return;
|
||||
|
||||
fprintf(stderr,
|
||||
"Adding icon path to cache: theme = %s, icon = %s, size = %d, path = %s\n",
|
||||
wrapper->icon_theme_name,
|
||||
icon_name,
|
||||
size,
|
||||
path);
|
||||
|
||||
load_icon_cache(wrapper);
|
||||
|
||||
gchar *key = g_strdup_printf("%s\t%s\t%d", wrapper->icon_theme_name, icon_name, size);
|
||||
add_to_cache(&wrapper->_cache, key, path);
|
||||
g_free(key);
|
||||
}
|
||||
|
||||
char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size)
|
||||
{
|
||||
if (!wrapper)
|
||||
return NULL;
|
||||
|
||||
if (!icon_name || strlen(icon_name) == 0)
|
||||
goto notfound;
|
||||
|
||||
char *path = get_icon_path_from_cache(wrapper, icon_name, size);
|
||||
if (path)
|
||||
return path;
|
||||
|
||||
load_default_theme(wrapper);
|
||||
|
||||
icon_name = icon_name ? icon_name : DEFAULT_ICON;
|
||||
path = get_icon_path_helper(wrapper->themes, icon_name, size);
|
||||
if (path) {
|
||||
add_icon_path_to_cache(wrapper, icon_name, size, path);
|
||||
return path;
|
||||
}
|
||||
|
||||
fprintf(stderr, YELLOW "Icon not found in default theme: %s" RESET "\n", icon_name);
|
||||
load_fallbacks(wrapper);
|
||||
|
||||
path = get_icon_path_helper(wrapper->themes_fallback, icon_name, size);
|
||||
if (path) {
|
||||
add_icon_path_to_cache(wrapper, icon_name, size, path);
|
||||
return path;
|
||||
}
|
||||
|
||||
notfound:
|
||||
fprintf(stderr, RED "Could not find icon '%s', using default." RESET "\n", icon_name);
|
||||
path = get_icon_path_helper(wrapper->themes, DEFAULT_ICON, size);
|
||||
if (path)
|
||||
return path;
|
||||
path = get_icon_path_helper(wrapper->themes_fallback, DEFAULT_ICON, size);
|
||||
return path;
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
/**************************************************************************
|
||||
* Copyright (C) 2015 (mrovi9000@gmail.com)
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef ICON_THEME_COMMON_H
|
||||
#define ICON_THEME_COMMON_H
|
||||
|
||||
#include <glib.h>
|
||||
#include "cache.h"
|
||||
|
||||
typedef struct IconThemeWrapper {
|
||||
// The icon theme name for which this wrapper was created
|
||||
char *icon_theme_name;
|
||||
// List of IconTheme*
|
||||
GSList *themes;
|
||||
// Themes are loaded lazily when needed.
|
||||
gboolean _themes_loaded;
|
||||
// List of IconTheme*
|
||||
GSList *themes_fallback;
|
||||
// Fallback themes are loaded lazily when needed.
|
||||
gboolean _fallback_loaded;
|
||||
Cache _cache;
|
||||
// List of icon theme names that have been queued for loading.
|
||||
// Used to avoid loading the same theme twice, and to avoid cycles.
|
||||
GSList *_queued;
|
||||
} IconThemeWrapper;
|
||||
|
||||
typedef struct IconTheme {
|
||||
char *name;
|
||||
char *description;
|
||||
GSList *list_inherits; // each item is a char* (theme name)
|
||||
GSList *list_directories; // each item is an IconThemeDir*
|
||||
} IconTheme;
|
||||
|
||||
// Parses a line of the form "key = value". Modifies the line.
|
||||
// Returns 1 if successful, and parts are not empty.
|
||||
// Key and value point to the parts.
|
||||
int parse_theme_line(char *line, char **key, char **value);
|
||||
|
||||
// Returns an IconThemeWrapper* containing the icon theme identified by the name icon_theme_name, all the
|
||||
// inherited themes, the hicolor theme and possibly fallback themes.
|
||||
IconThemeWrapper *load_themes(const char *icon_theme_name);
|
||||
|
||||
void save_icon_cache(IconThemeWrapper *wrapper);
|
||||
|
||||
void free_themes(IconThemeWrapper *wrapper);
|
||||
void free_icon_theme(IconTheme *theme);
|
||||
|
||||
#define DEFAULT_ICON "application-x-executable"
|
||||
|
||||
// Returns the full path to an icon file (or NULL) given the list of icon themes to search and the icon name
|
||||
// Note: needs to be released with free().
|
||||
char *get_icon_path(IconThemeWrapper *wrapper, const char *icon_name, int size);
|
||||
|
||||
// Returns a list of the directories used to store icons.
|
||||
// Do not free the result, it is cached.
|
||||
const GSList *get_icon_locations();
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,22 +10,20 @@
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
#include "xsettings-client.h"
|
||||
#include "icon-theme-common.h"
|
||||
|
||||
typedef struct Launcher {
|
||||
// always start with area
|
||||
Area area;
|
||||
GSList *list_apps; // List of char*, each is a path to a app.desktop file
|
||||
GSList *list_icons; // List of LauncherIcon*
|
||||
IconThemeWrapper *icon_theme_wrapper;
|
||||
GSList *list_apps; // List of char*, each is a path to a app.desktop file
|
||||
GSList *list_icons; // List of LauncherIcon*
|
||||
GSList *list_themes; // List of IconTheme*
|
||||
} Launcher;
|
||||
|
||||
typedef struct LauncherIcon {
|
||||
// always start with area
|
||||
Area area;
|
||||
Imlib_Image image;
|
||||
Imlib_Image image_hover;
|
||||
Imlib_Image image_pressed;
|
||||
Imlib_Image icon_scaled;
|
||||
Imlib_Image icon_original;
|
||||
char *cmd;
|
||||
char *icon_name;
|
||||
char *icon_path;
|
||||
@@ -35,17 +33,39 @@ typedef struct LauncherIcon {
|
||||
int x, y;
|
||||
} LauncherIcon;
|
||||
|
||||
extern gboolean launcher_enabled;
|
||||
typedef struct DesktopEntry {
|
||||
char *name;
|
||||
char *exec;
|
||||
char *icon;
|
||||
} DesktopEntry;
|
||||
|
||||
#define ICON_DIR_TYPE_SCALABLE 0
|
||||
#define ICON_DIR_TYPE_FIXED 1
|
||||
#define ICON_DIR_TYPE_THRESHOLD 2
|
||||
typedef struct IconThemeDir {
|
||||
char *name;
|
||||
int size;
|
||||
int type;
|
||||
int max_size;
|
||||
int min_size;
|
||||
int threshold;
|
||||
char *context;
|
||||
} IconThemeDir;
|
||||
|
||||
typedef struct IconTheme {
|
||||
char *name;
|
||||
GSList *list_inherits; // each item is a char* (theme name)
|
||||
GSList *list_directories; // each item is an IconThemeDir*
|
||||
} IconTheme;
|
||||
|
||||
extern int launcher_enabled;
|
||||
extern int launcher_max_icon_size;
|
||||
extern int launcher_tooltip_enabled;
|
||||
extern int launcher_alpha;
|
||||
extern int launcher_saturation;
|
||||
extern int launcher_brightness;
|
||||
extern char *icon_theme_name_xsettings; // theme name
|
||||
extern char *icon_theme_name_config;
|
||||
extern int launcher_icon_theme_override;
|
||||
extern int startup_notifications;
|
||||
extern Background *launcher_icon_bg;
|
||||
extern char *icon_theme_name; // theme name
|
||||
extern XSettingsClient *xsettings_client;
|
||||
|
||||
// default global data
|
||||
void default_launcher();
|
||||
@@ -56,15 +76,14 @@ void init_launcher_panel(void *panel);
|
||||
void cleanup_launcher();
|
||||
void cleanup_launcher_theme(Launcher *launcher);
|
||||
|
||||
gboolean resize_launcher(void *obj);
|
||||
void draw_launcher(void *obj, cairo_t *c);
|
||||
void launcher_default_icon_theme_changed();
|
||||
int resize_launcher(void *obj);
|
||||
void draw_launcher (void *obj, cairo_t *c);
|
||||
|
||||
// Populates the list_icons list
|
||||
void launcher_load_icons(Launcher *launcher);
|
||||
// Populates the list_themes list
|
||||
void launcher_load_themes(Launcher *launcher);
|
||||
void launcher_action(LauncherIcon *icon, XEvent *e);
|
||||
// Populates the list_icons list
|
||||
void launcher_load_icons(Launcher *launcher);
|
||||
void launcher_action(LauncherIcon *icon, XEvent* e);
|
||||
|
||||
void test_launcher_read_desktop_file();
|
||||
void test_launcher_read_theme_file();
|
||||
|
||||
@@ -26,14 +26,15 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xmd.h> /* For CARD16 */
|
||||
#include <X11/Xmd.h> /* For CARD16 */
|
||||
|
||||
#include "xsettings-client.h"
|
||||
#include "server.h"
|
||||
#include "panel.h"
|
||||
#include "launcher.h"
|
||||
|
||||
struct _XSettingsClient {
|
||||
struct _XSettingsClient
|
||||
{
|
||||
Display *display;
|
||||
int screen;
|
||||
XSettingsNotifyFunc notify;
|
||||
@@ -44,32 +45,33 @@ struct _XSettingsClient {
|
||||
XSettingsList *settings;
|
||||
};
|
||||
|
||||
void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
|
||||
|
||||
void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data)
|
||||
{
|
||||
//printf("xsettings_notify_cb\n");
|
||||
if ((action == XSETTINGS_ACTION_NEW || action == XSETTINGS_ACTION_CHANGED) && name != NULL && setting != NULL) {
|
||||
if (strcmp(name, "Net/IconThemeName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
|
||||
fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
|
||||
if (icon_theme_name_xsettings) {
|
||||
if (strcmp(icon_theme_name_xsettings, setting->data.v_string) == 0)
|
||||
if (!strcmp(name, "Net/IconThemeName") && setting->type == XSETTINGS_TYPE_STRING) {
|
||||
if (icon_theme_name) {
|
||||
if (strcmp(icon_theme_name, setting->data.v_string) == 0)
|
||||
return;
|
||||
free(icon_theme_name_xsettings);
|
||||
free(icon_theme_name);
|
||||
}
|
||||
icon_theme_name_xsettings = strdup(setting->data.v_string);
|
||||
default_icon_theme_changed();
|
||||
} else if (strcmp(name, "Gtk/FontName") == 0 && setting->type == XSETTINGS_TYPE_STRING) {
|
||||
fprintf(stderr, "xsettings: %s = %s\n", name, setting->data.v_string);
|
||||
if (default_font) {
|
||||
if (strcmp(default_font, setting->data.v_string) == 0)
|
||||
return;
|
||||
free(default_font);
|
||||
icon_theme_name = strdup(setting->data.v_string);
|
||||
|
||||
int i;
|
||||
for (i = 0 ; i < nb_panel ; i++) {
|
||||
Launcher *launcher = &panel1[i].launcher;
|
||||
cleanup_launcher_theme(launcher);
|
||||
launcher_load_themes(launcher);
|
||||
launcher_load_icons(launcher);
|
||||
launcher->area.resize = 1;
|
||||
}
|
||||
default_font = strdup(setting->data.v_string);
|
||||
default_font_changed();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
|
||||
|
||||
static void notify_changes (XSettingsClient *client, XSettingsList *old_list)
|
||||
{
|
||||
XSettingsList *old_iter = old_list;
|
||||
XSettingsList *new_iter = client->settings;
|
||||
@@ -81,19 +83,21 @@ static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
|
||||
int cmp;
|
||||
|
||||
if (old_iter && new_iter)
|
||||
cmp = strcmp(old_iter->setting->name, new_iter->setting->name);
|
||||
cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
|
||||
else if (old_iter)
|
||||
cmp = -1;
|
||||
else
|
||||
cmp = 1;
|
||||
|
||||
if (cmp < 0) {
|
||||
client->notify(old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
|
||||
} else if (cmp == 0) {
|
||||
if (!xsettings_setting_equal(old_iter->setting, new_iter->setting))
|
||||
client->notify(old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
|
||||
} else {
|
||||
client->notify(new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
|
||||
client->notify (old_iter->setting->name, XSETTINGS_ACTION_DELETED, NULL, client->cb_data);
|
||||
}
|
||||
else if (cmp == 0) {
|
||||
if (!xsettings_setting_equal (old_iter->setting, new_iter->setting))
|
||||
client->notify (old_iter->setting->name, XSETTINGS_ACTION_CHANGED, new_iter->setting, client->cb_data);
|
||||
}
|
||||
else {
|
||||
client->notify (new_iter->setting->name, XSETTINGS_ACTION_NEW, new_iter->setting, client->cb_data);
|
||||
}
|
||||
|
||||
if (old_iter)
|
||||
@@ -103,7 +107,8 @@ static void notify_changes(XSettingsClient *client, XSettingsList *old_list)
|
||||
}
|
||||
}
|
||||
|
||||
static int ignore_errors(Display *display, XErrorEvent *event)
|
||||
|
||||
static int ignore_errors (Display *display, XErrorEvent *event)
|
||||
{
|
||||
return True;
|
||||
}
|
||||
@@ -112,11 +117,11 @@ static char local_byte_order = '\0';
|
||||
|
||||
#define BYTES_LEFT(buffer) ((buffer)->data + (buffer)->len - (buffer)->pos)
|
||||
|
||||
static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
|
||||
static XSettingsResult fetch_card16 (XSettingsBuffer *buffer, CARD16 *result)
|
||||
{
|
||||
CARD16 x;
|
||||
|
||||
if (BYTES_LEFT(buffer) < 2)
|
||||
if (BYTES_LEFT (buffer) < 2)
|
||||
return XSETTINGS_ACCESS;
|
||||
|
||||
x = *(CARD16 *)buffer->pos;
|
||||
@@ -130,23 +135,25 @@ static XSettingsResult fetch_card16(XSettingsBuffer *buffer, CARD16 *result)
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
static XSettingsResult fetch_ushort(XSettingsBuffer *buffer, unsigned short *result)
|
||||
|
||||
static XSettingsResult fetch_ushort (XSettingsBuffer *buffer, unsigned short *result)
|
||||
{
|
||||
CARD16 x;
|
||||
XSettingsResult r;
|
||||
|
||||
r = fetch_card16(buffer, &x);
|
||||
r = fetch_card16 (buffer, &x);
|
||||
if (r == XSETTINGS_SUCCESS)
|
||||
*result = x;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
|
||||
|
||||
static XSettingsResult fetch_card32 (XSettingsBuffer *buffer, CARD32 *result)
|
||||
{
|
||||
CARD32 x;
|
||||
|
||||
if (BYTES_LEFT(buffer) < 4)
|
||||
if (BYTES_LEFT (buffer) < 4)
|
||||
return XSETTINGS_ACCESS;
|
||||
|
||||
x = *(CARD32 *)buffer->pos;
|
||||
@@ -160,20 +167,20 @@ static XSettingsResult fetch_card32(XSettingsBuffer *buffer, CARD32 *result)
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
static XSettingsResult fetch_card8(XSettingsBuffer *buffer, CARD8 *result)
|
||||
static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
|
||||
{
|
||||
if (BYTES_LEFT(buffer) < 1)
|
||||
return XSETTINGS_ACCESS;
|
||||
if (BYTES_LEFT (buffer) < 1)
|
||||
return XSETTINGS_ACCESS;
|
||||
|
||||
*result = *(CARD8 *)buffer->pos;
|
||||
buffer->pos += 1;
|
||||
*result = *(CARD8 *)buffer->pos;
|
||||
buffer->pos += 1;
|
||||
|
||||
return XSETTINGS_SUCCESS;
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
|
||||
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
|
||||
|
||||
static XSettingsList *parse_settings(unsigned char *data, size_t len)
|
||||
static XSettingsList *parse_settings (unsigned char *data, size_t len)
|
||||
{
|
||||
XSettingsBuffer buffer;
|
||||
XSettingsResult result = XSETTINGS_SUCCESS;
|
||||
@@ -183,26 +190,25 @@ static XSettingsList *parse_settings(unsigned char *data, size_t len)
|
||||
CARD32 i;
|
||||
XSettingsSetting *setting = NULL;
|
||||
|
||||
local_byte_order = xsettings_byte_order();
|
||||
local_byte_order = xsettings_byte_order ();
|
||||
|
||||
buffer.byte_order = local_byte_order;
|
||||
buffer.pos = buffer.data = data;
|
||||
buffer.len = len;
|
||||
|
||||
result = fetch_card8(&buffer, (CARD8 *)&buffer.byte_order);
|
||||
result = fetch_card8 (&buffer, (CARD8*)&buffer.byte_order);
|
||||
if (buffer.byte_order != MSBFirst && buffer.byte_order != LSBFirst) {
|
||||
fprintf(stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
|
||||
fprintf (stderr, "Invalid byte order %x in XSETTINGS property\n", buffer.byte_order);
|
||||
result = XSETTINGS_FAILED;
|
||||
goto out;
|
||||
}
|
||||
|
||||
buffer.pos += 3;
|
||||
|
||||
result = fetch_card32(&buffer, &serial);
|
||||
result = fetch_card32 (&buffer, &serial);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
|
||||
result = fetch_card32(&buffer, &n_entries);
|
||||
result = fetch_card32 (&buffer, &n_entries);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
|
||||
@@ -212,196 +218,188 @@ static XSettingsList *parse_settings(unsigned char *data, size_t len)
|
||||
CARD32 v_int;
|
||||
size_t pad_len;
|
||||
|
||||
result = fetch_card8(&buffer, &type);
|
||||
result = fetch_card8 (&buffer, &type);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
|
||||
buffer.pos += 1;
|
||||
|
||||
result = fetch_card16(&buffer, &name_len);
|
||||
result = fetch_card16 (&buffer, &name_len);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
|
||||
pad_len = XSETTINGS_PAD(name_len, 4);
|
||||
if (BYTES_LEFT(&buffer) < pad_len) {
|
||||
if (BYTES_LEFT (&buffer) < pad_len) {
|
||||
result = XSETTINGS_ACCESS;
|
||||
goto out;
|
||||
}
|
||||
|
||||
setting = calloc(1, sizeof *setting);
|
||||
setting = malloc (sizeof *setting);
|
||||
if (!setting) {
|
||||
result = XSETTINGS_NO_MEM;
|
||||
goto out;
|
||||
}
|
||||
setting->type = XSETTINGS_TYPE_INT; /* No allocated memory */
|
||||
|
||||
setting->name = calloc(name_len + 1, 1);
|
||||
setting->name = malloc (name_len + 1);
|
||||
if (!setting->name) {
|
||||
result = XSETTINGS_NO_MEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
memcpy(setting->name, buffer.pos, name_len);
|
||||
memcpy (setting->name, buffer.pos, name_len);
|
||||
setting->name[name_len] = '\0';
|
||||
buffer.pos += pad_len;
|
||||
|
||||
result = fetch_card32(&buffer, &v_int);
|
||||
result = fetch_card32 (&buffer, &v_int);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
setting->last_change_serial = v_int;
|
||||
|
||||
switch (type) {
|
||||
case XSETTINGS_TYPE_INT:
|
||||
result = fetch_card32(&buffer, &v_int);
|
||||
case XSETTINGS_TYPE_INT:
|
||||
result = fetch_card32 (&buffer, &v_int);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
setting->data.v_int = (INT32)v_int;
|
||||
break;
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
result = fetch_card32(&buffer, &v_int);
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
result = fetch_card32 (&buffer, &v_int);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
|
||||
pad_len = XSETTINGS_PAD(v_int, 4);
|
||||
pad_len = XSETTINGS_PAD (v_int, 4);
|
||||
if (v_int + 1 == 0 || /* Guard against wrap-around */
|
||||
BYTES_LEFT(&buffer) < pad_len) {
|
||||
BYTES_LEFT (&buffer) < pad_len) {
|
||||
result = XSETTINGS_ACCESS;
|
||||
goto out;
|
||||
}
|
||||
|
||||
setting->data.v_string = calloc(v_int + 1, 1);
|
||||
setting->data.v_string = malloc (v_int + 1);
|
||||
if (!setting->data.v_string) {
|
||||
result = XSETTINGS_NO_MEM;
|
||||
goto out;
|
||||
}
|
||||
|
||||
memcpy(setting->data.v_string, buffer.pos, v_int);
|
||||
memcpy (setting->data.v_string, buffer.pos, v_int);
|
||||
setting->data.v_string[v_int] = '\0';
|
||||
buffer.pos += pad_len;
|
||||
break;
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
result = fetch_ushort(&buffer, &setting->data.v_color.red);
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
result = fetch_ushort (&buffer, &setting->data.v_color.red);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
result = fetch_ushort(&buffer, &setting->data.v_color.green);
|
||||
result = fetch_ushort (&buffer, &setting->data.v_color.green);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
result = fetch_ushort(&buffer, &setting->data.v_color.blue);
|
||||
result = fetch_ushort (&buffer, &setting->data.v_color.blue);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
result = fetch_ushort(&buffer, &setting->data.v_color.alpha);
|
||||
result = fetch_ushort (&buffer, &setting->data.v_color.alpha);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
break;
|
||||
default:
|
||||
default:
|
||||
/* Quietly ignore unknown types */
|
||||
break;
|
||||
}
|
||||
|
||||
setting->type = type;
|
||||
|
||||
result = xsettings_list_insert(&settings, setting);
|
||||
result = xsettings_list_insert (&settings, setting);
|
||||
if (result != XSETTINGS_SUCCESS)
|
||||
goto out;
|
||||
goto out;
|
||||
|
||||
setting = NULL;
|
||||
}
|
||||
|
||||
out:
|
||||
out:
|
||||
|
||||
if (result != XSETTINGS_SUCCESS) {
|
||||
switch (result) {
|
||||
case XSETTINGS_NO_MEM:
|
||||
case XSETTINGS_NO_MEM:
|
||||
fprintf(stderr, "Out of memory reading XSETTINGS property\n");
|
||||
break;
|
||||
case XSETTINGS_ACCESS:
|
||||
case XSETTINGS_ACCESS:
|
||||
fprintf(stderr, "Invalid XSETTINGS property (read off end)\n");
|
||||
break;
|
||||
case XSETTINGS_DUPLICATE_ENTRY:
|
||||
fprintf(stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
|
||||
case XSETTINGS_FAILED:
|
||||
case XSETTINGS_SUCCESS:
|
||||
case XSETTINGS_NO_ENTRY:
|
||||
case XSETTINGS_DUPLICATE_ENTRY:
|
||||
fprintf (stderr, "Duplicate XSETTINGS entry for '%s'\n", setting->name);
|
||||
case XSETTINGS_FAILED:
|
||||
case XSETTINGS_SUCCESS:
|
||||
case XSETTINGS_NO_ENTRY:
|
||||
break;
|
||||
}
|
||||
|
||||
if (setting)
|
||||
xsettings_setting_free(setting);
|
||||
xsettings_setting_free (setting);
|
||||
|
||||
xsettings_list_free(settings);
|
||||
xsettings_list_free (settings);
|
||||
settings = NULL;
|
||||
}
|
||||
|
||||
return settings;
|
||||
}
|
||||
|
||||
static void read_settings(XSettingsClient *client)
|
||||
|
||||
static void read_settings (XSettingsClient *client)
|
||||
{
|
||||
Atom type;
|
||||
int format;
|
||||
unsigned long n_items;
|
||||
unsigned long bytes_after;
|
||||
unsigned char *data;
|
||||
int result;
|
||||
|
||||
int (*old_handler)(Display *, XErrorEvent *);
|
||||
int (*old_handler) (Display *, XErrorEvent *);
|
||||
|
||||
XSettingsList *old_list = client->settings;
|
||||
client->settings = NULL;
|
||||
|
||||
old_handler = XSetErrorHandler(ignore_errors);
|
||||
int result = XGetWindowProperty(client->display,
|
||||
client->manager_window,
|
||||
server.atom._XSETTINGS_SETTINGS,
|
||||
0,
|
||||
LONG_MAX,
|
||||
False,
|
||||
server.atom._XSETTINGS_SETTINGS,
|
||||
&type,
|
||||
&format,
|
||||
&n_items,
|
||||
&bytes_after,
|
||||
&data);
|
||||
XSetErrorHandler(old_handler);
|
||||
old_handler = XSetErrorHandler (ignore_errors);
|
||||
result = XGetWindowProperty (client->display, client->manager_window, server.atom._XSETTINGS_SETTINGS, 0, LONG_MAX, False, server.atom._XSETTINGS_SETTINGS, &type, &format, &n_items, &bytes_after, &data);
|
||||
XSetErrorHandler (old_handler);
|
||||
|
||||
if (result == Success && type == server.atom._XSETTINGS_SETTINGS) {
|
||||
if (format != 8) {
|
||||
fprintf(stderr, "Invalid format for XSETTINGS property %d", format);
|
||||
} else
|
||||
client->settings = parse_settings(data, n_items);
|
||||
XFree(data);
|
||||
fprintf (stderr, "Invalid format for XSETTINGS property %d", format);
|
||||
}
|
||||
else
|
||||
client->settings = parse_settings (data, n_items);
|
||||
XFree (data);
|
||||
}
|
||||
|
||||
notify_changes(client, old_list);
|
||||
xsettings_list_free(old_list);
|
||||
notify_changes (client, old_list);
|
||||
xsettings_list_free (old_list);
|
||||
}
|
||||
|
||||
static void check_manager_window(XSettingsClient *client)
|
||||
|
||||
static void check_manager_window (XSettingsClient *client)
|
||||
{
|
||||
if (client->manager_window && client->watch)
|
||||
client->watch(client->manager_window, False, 0, client->cb_data);
|
||||
client->watch (client->manager_window, False, 0, client->cb_data);
|
||||
|
||||
XGrabServer(client->display);
|
||||
XGrabServer (client->display);
|
||||
|
||||
client->manager_window = XGetSelectionOwner(server.display, server.atom._XSETTINGS_SCREEN);
|
||||
client->manager_window = XGetSelectionOwner (server.dsp, server.atom._XSETTINGS_SCREEN);
|
||||
if (client->manager_window)
|
||||
XSelectInput(server.display, client->manager_window, PropertyChangeMask | StructureNotifyMask);
|
||||
XSelectInput (server.dsp, client->manager_window, PropertyChangeMask | StructureNotifyMask);
|
||||
|
||||
XUngrabServer(client->display);
|
||||
XFlush(client->display);
|
||||
XUngrabServer (client->display);
|
||||
XFlush (client->display);
|
||||
|
||||
if (client->manager_window && client->watch)
|
||||
client->watch(client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
|
||||
client->watch (client->manager_window, True, PropertyChangeMask | StructureNotifyMask, client->cb_data);
|
||||
|
||||
read_settings(client);
|
||||
read_settings (client);
|
||||
}
|
||||
|
||||
XSettingsClient *xsettings_client_new(Display *display,
|
||||
int screen,
|
||||
XSettingsNotifyFunc notify,
|
||||
XSettingsWatchFunc watch,
|
||||
void *cb_data)
|
||||
|
||||
XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data)
|
||||
{
|
||||
XSettingsClient *client = calloc(1, sizeof *client);
|
||||
XSettingsClient *client;
|
||||
|
||||
client = malloc (sizeof *client);
|
||||
if (!client)
|
||||
return NULL;
|
||||
|
||||
@@ -415,63 +413,68 @@ XSettingsClient *xsettings_client_new(Display *display,
|
||||
client->settings = NULL;
|
||||
|
||||
if (client->watch)
|
||||
client->watch(RootWindow(display, screen), True, StructureNotifyMask, client->cb_data);
|
||||
client->watch (RootWindow (display, screen), True, StructureNotifyMask, client->cb_data);
|
||||
|
||||
check_manager_window(client);
|
||||
check_manager_window (client);
|
||||
|
||||
if (client->manager_window == None) {
|
||||
printf("No XSETTINGS manager, tint2 uses config option 'launcher_icon_theme'.\n");
|
||||
free(client);
|
||||
printf("NO XSETTINGS manager, tint2 use config 'launcher_icon_theme'.\n");
|
||||
free (client);
|
||||
return NULL;
|
||||
} else {
|
||||
return client;
|
||||
}
|
||||
else
|
||||
return client;
|
||||
}
|
||||
|
||||
void xsettings_client_destroy(XSettingsClient *client)
|
||||
|
||||
void xsettings_client_destroy (XSettingsClient *client)
|
||||
{
|
||||
if (!client)
|
||||
return;
|
||||
if (client->watch)
|
||||
client->watch(RootWindow(client->display, client->screen), False, 0, client->cb_data);
|
||||
client->watch (RootWindow (client->display, client->screen), False, 0, client->cb_data);
|
||||
if (client->manager_window && client->watch)
|
||||
client->watch(client->manager_window, False, 0, client->cb_data);
|
||||
client->watch (client->manager_window, False, 0, client->cb_data);
|
||||
|
||||
xsettings_list_free(client->settings);
|
||||
free(client);
|
||||
xsettings_list_free (client->settings);
|
||||
free (client);
|
||||
}
|
||||
|
||||
XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting)
|
||||
|
||||
XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting)
|
||||
{
|
||||
XSettingsSetting *search = xsettings_list_lookup(client->settings, name);
|
||||
XSettingsSetting *search = xsettings_list_lookup (client->settings, name);
|
||||
if (search) {
|
||||
*setting = xsettings_setting_copy(search);
|
||||
*setting = xsettings_setting_copy (search);
|
||||
return *setting ? XSETTINGS_SUCCESS : XSETTINGS_NO_MEM;
|
||||
} else
|
||||
}
|
||||
else
|
||||
return XSETTINGS_NO_ENTRY;
|
||||
}
|
||||
|
||||
Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev)
|
||||
|
||||
Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev)
|
||||
{
|
||||
/* The checks here will not unlikely cause us to reread
|
||||
* the properties from the manager window a number of
|
||||
* times when the manager changes from A->B. But manager changes
|
||||
* are going to be pretty rare.
|
||||
*/
|
||||
if (xev->xany.window == RootWindow(server.display, server.screen)) {
|
||||
if (xev->xany.window == RootWindow (server.dsp, server.screen)) {
|
||||
if (xev->xany.type == ClientMessage && xev->xclient.message_type == server.atom.MANAGER) {
|
||||
check_manager_window(client);
|
||||
check_manager_window (client);
|
||||
return True;
|
||||
}
|
||||
} else if (xev->xany.window == client->manager_window) {
|
||||
}
|
||||
else if (xev->xany.window == client->manager_window) {
|
||||
if (xev->xany.type == DestroyNotify) {
|
||||
check_manager_window(client);
|
||||
check_manager_window (client);
|
||||
return True;
|
||||
} else if (xev->xany.type == PropertyNotify) {
|
||||
read_settings(client);
|
||||
}
|
||||
else if (xev->xany.type == PropertyNotify) {
|
||||
read_settings (client);
|
||||
return True;
|
||||
}
|
||||
}
|
||||
|
||||
return False;
|
||||
}
|
||||
|
||||
|
||||
@@ -32,22 +32,23 @@ extern "C" {
|
||||
|
||||
typedef struct _XSettingsClient XSettingsClient;
|
||||
|
||||
typedef enum { XSETTINGS_ACTION_NEW, XSETTINGS_ACTION_CHANGED, XSETTINGS_ACTION_DELETED } XSettingsAction;
|
||||
typedef enum
|
||||
{
|
||||
XSETTINGS_ACTION_NEW,
|
||||
XSETTINGS_ACTION_CHANGED,
|
||||
XSETTINGS_ACTION_DELETED
|
||||
} XSettingsAction;
|
||||
|
||||
typedef void (*XSettingsNotifyFunc)(const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
|
||||
typedef void (*XSettingsWatchFunc)(Window window, Bool is_start, long mask, void *cb_data);
|
||||
typedef void (*XSettingsNotifyFunc) (const char *name, XSettingsAction action, XSettingsSetting *setting, void *cb_data);
|
||||
typedef void (*XSettingsWatchFunc) (Window window, Bool is_start, long mask, void *cb_data);
|
||||
|
||||
XSettingsClient *xsettings_client_new(Display *display,
|
||||
int screen,
|
||||
XSettingsNotifyFunc notify,
|
||||
XSettingsWatchFunc watch,
|
||||
void *cb_data);
|
||||
void xsettings_client_destroy(XSettingsClient *client);
|
||||
Bool xsettings_client_process_event(XSettingsClient *client, XEvent *xev);
|
||||
XSettingsClient *xsettings_client_new (Display *display, int screen, XSettingsNotifyFunc notify, XSettingsWatchFunc watch, void *cb_data);
|
||||
void xsettings_client_destroy (XSettingsClient *client);
|
||||
Bool xsettings_client_process_event (XSettingsClient *client, XEvent *xev);
|
||||
|
||||
void xsettings_notify_cb(const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
|
||||
void xsettings_notify_cb (const char *name, XSettingsAction action, XSettingsSetting *setting, void *data);
|
||||
|
||||
XSettingsResult xsettings_client_get_setting(XSettingsClient *client, const char *name, XSettingsSetting **setting);
|
||||
XSettingsResult xsettings_client_get_setting (XSettingsClient *client, const char *name, XSettingsSetting **setting);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -24,222 +24,245 @@
|
||||
#include "stdlib.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xmd.h> /* For CARD32 */
|
||||
#include <X11/Xmd.h> /* For CARD32 */
|
||||
|
||||
#include "xsettings-common.h"
|
||||
|
||||
XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting)
|
||||
XSettingsSetting *
|
||||
xsettings_setting_copy (XSettingsSetting *setting)
|
||||
{
|
||||
XSettingsSetting *result;
|
||||
size_t str_len;
|
||||
XSettingsSetting *result;
|
||||
size_t str_len;
|
||||
|
||||
result = calloc(1, sizeof *result);
|
||||
if (!result)
|
||||
return NULL;
|
||||
result = malloc (sizeof *result);
|
||||
if (!result)
|
||||
return NULL;
|
||||
|
||||
str_len = strlen(setting->name);
|
||||
result->name = calloc(str_len + 1, 1);
|
||||
if (!result->name)
|
||||
goto err;
|
||||
str_len = strlen (setting->name);
|
||||
result->name = malloc (str_len + 1);
|
||||
if (!result->name)
|
||||
goto err;
|
||||
|
||||
memcpy(result->name, setting->name, str_len + 1);
|
||||
memcpy (result->name, setting->name, str_len + 1);
|
||||
|
||||
result->type = setting->type;
|
||||
result->type = setting->type;
|
||||
|
||||
switch (setting->type) {
|
||||
case XSETTINGS_TYPE_INT:
|
||||
result->data.v_int = setting->data.v_int;
|
||||
break;
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
result->data.v_color = setting->data.v_color;
|
||||
break;
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
str_len = strlen(setting->data.v_string);
|
||||
result->data.v_string = calloc(str_len + 1, 1);
|
||||
if (!result->data.v_string)
|
||||
goto err;
|
||||
switch (setting->type)
|
||||
{
|
||||
case XSETTINGS_TYPE_INT:
|
||||
result->data.v_int = setting->data.v_int;
|
||||
break;
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
result->data.v_color = setting->data.v_color;
|
||||
break;
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
str_len = strlen (setting->data.v_string);
|
||||
result->data.v_string = malloc (str_len + 1);
|
||||
if (!result->data.v_string)
|
||||
goto err;
|
||||
|
||||
memcpy(result->data.v_string, setting->data.v_string, str_len + 1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
result->last_change_serial = setting->last_change_serial;
|
||||
|
||||
return result;
|
||||
|
||||
err:
|
||||
if (result->name)
|
||||
free (result->name);
|
||||
free (result);
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
XSettingsList *
|
||||
xsettings_list_copy (XSettingsList *list)
|
||||
{
|
||||
XSettingsList *new = NULL;
|
||||
XSettingsList *old_iter = list;
|
||||
XSettingsList *new_iter = NULL;
|
||||
|
||||
while (old_iter)
|
||||
{
|
||||
XSettingsList *new_node;
|
||||
|
||||
new_node = malloc (sizeof *new_node);
|
||||
if (!new_node)
|
||||
goto error;
|
||||
|
||||
new_node->setting = xsettings_setting_copy (old_iter->setting);
|
||||
if (!new_node->setting)
|
||||
{
|
||||
free (new_node);
|
||||
goto error;
|
||||
}
|
||||
|
||||
result->last_change_serial = setting->last_change_serial;
|
||||
if (new_iter)
|
||||
new_iter->next = new_node;
|
||||
else
|
||||
new = new_node;
|
||||
|
||||
return result;
|
||||
new_iter = new_node;
|
||||
|
||||
err:
|
||||
if (result->name)
|
||||
free(result->name);
|
||||
free(result);
|
||||
old_iter = old_iter->next;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return new;
|
||||
|
||||
error:
|
||||
xsettings_list_free (new);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
XSettingsList *xsettings_list_copy(XSettingsList *list)
|
||||
int
|
||||
xsettings_setting_equal (XSettingsSetting *setting_a,
|
||||
XSettingsSetting *setting_b)
|
||||
{
|
||||
XSettingsList *new = NULL;
|
||||
XSettingsList *old_iter = list;
|
||||
XSettingsList *new_iter = NULL;
|
||||
if (setting_a->type != setting_b->type)
|
||||
return 0;
|
||||
|
||||
while (old_iter) {
|
||||
XSettingsList *new_node;
|
||||
if (strcmp (setting_a->name, setting_b->name) != 0)
|
||||
return 0;
|
||||
|
||||
new_node = calloc(1, sizeof *new_node);
|
||||
if (!new_node)
|
||||
goto error;
|
||||
switch (setting_a->type)
|
||||
{
|
||||
case XSETTINGS_TYPE_INT:
|
||||
return setting_a->data.v_int == setting_b->data.v_int;
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
|
||||
setting_a->data.v_color.green == setting_b->data.v_color.green &&
|
||||
setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
|
||||
setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
new_node->setting = xsettings_setting_copy(old_iter->setting);
|
||||
if (!new_node->setting) {
|
||||
free(new_node);
|
||||
goto error;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (new_iter)
|
||||
new_iter->next = new_node;
|
||||
else
|
||||
new = new_node;
|
||||
void
|
||||
xsettings_setting_free (XSettingsSetting *setting)
|
||||
{
|
||||
if (setting->type == XSETTINGS_TYPE_STRING)
|
||||
free (setting->data.v_string);
|
||||
|
||||
new_iter = new_node;
|
||||
if (setting->name)
|
||||
free (setting->name);
|
||||
|
||||
old_iter = old_iter->next;
|
||||
free (setting);
|
||||
}
|
||||
|
||||
void
|
||||
xsettings_list_free (XSettingsList *list)
|
||||
{
|
||||
while (list)
|
||||
{
|
||||
XSettingsList *next = list->next;
|
||||
|
||||
xsettings_setting_free (list->setting);
|
||||
free (list);
|
||||
|
||||
list = next;
|
||||
}
|
||||
}
|
||||
|
||||
XSettingsResult
|
||||
xsettings_list_insert (XSettingsList **list,
|
||||
XSettingsSetting *setting)
|
||||
{
|
||||
XSettingsList *node;
|
||||
XSettingsList *iter;
|
||||
XSettingsList *last = NULL;
|
||||
|
||||
node = malloc (sizeof *node);
|
||||
if (!node)
|
||||
return XSETTINGS_NO_MEM;
|
||||
node->setting = setting;
|
||||
|
||||
iter = *list;
|
||||
while (iter)
|
||||
{
|
||||
int cmp = strcmp (setting->name, iter->setting->name);
|
||||
|
||||
if (cmp < 0)
|
||||
break;
|
||||
else if (cmp == 0)
|
||||
{
|
||||
free (node);
|
||||
return XSETTINGS_DUPLICATE_ENTRY;
|
||||
}
|
||||
|
||||
return new;
|
||||
last = iter;
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
error:
|
||||
xsettings_list_free(new);
|
||||
return NULL;
|
||||
if (last)
|
||||
last->next = node;
|
||||
else
|
||||
*list = node;
|
||||
|
||||
node->next = iter;
|
||||
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b)
|
||||
XSettingsResult
|
||||
xsettings_list_delete (XSettingsList **list,
|
||||
const char *name)
|
||||
{
|
||||
if (setting_a->type != setting_b->type)
|
||||
return 0;
|
||||
XSettingsList *iter;
|
||||
XSettingsList *last = NULL;
|
||||
|
||||
if (strcmp(setting_a->name, setting_b->name) != 0)
|
||||
return 0;
|
||||
iter = *list;
|
||||
while (iter)
|
||||
{
|
||||
if (strcmp (name, iter->setting->name) == 0)
|
||||
{
|
||||
if (last)
|
||||
last->next = iter->next;
|
||||
else
|
||||
*list = iter->next;
|
||||
|
||||
switch (setting_a->type) {
|
||||
case XSETTINGS_TYPE_INT:
|
||||
return setting_a->data.v_int == setting_b->data.v_int;
|
||||
case XSETTINGS_TYPE_COLOR:
|
||||
return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
|
||||
setting_a->data.v_color.green == setting_b->data.v_color.green &&
|
||||
setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
|
||||
setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
|
||||
case XSETTINGS_TYPE_STRING:
|
||||
return strcmp(setting_a->data.v_string, setting_b->data.v_string) == 0;
|
||||
default:
|
||||
break;
|
||||
xsettings_setting_free (iter->setting);
|
||||
free (iter);
|
||||
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
return 0;
|
||||
last = iter;
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
return XSETTINGS_FAILED;
|
||||
}
|
||||
|
||||
void xsettings_setting_free(XSettingsSetting *setting)
|
||||
XSettingsSetting *
|
||||
xsettings_list_lookup (XSettingsList *list,
|
||||
const char *name)
|
||||
{
|
||||
if (setting->type == XSETTINGS_TYPE_STRING)
|
||||
free(setting->data.v_string);
|
||||
XSettingsList *iter;
|
||||
|
||||
if (setting->name)
|
||||
free(setting->name);
|
||||
iter = list;
|
||||
while (iter)
|
||||
{
|
||||
if (strcmp (name, iter->setting->name) == 0)
|
||||
return iter->setting;
|
||||
|
||||
free(setting);
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void xsettings_list_free(XSettingsList *list)
|
||||
char
|
||||
xsettings_byte_order (void)
|
||||
{
|
||||
while (list) {
|
||||
XSettingsList *next = list->next;
|
||||
|
||||
xsettings_setting_free(list->setting);
|
||||
free(list);
|
||||
|
||||
list = next;
|
||||
}
|
||||
}
|
||||
|
||||
XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting)
|
||||
{
|
||||
XSettingsList *node;
|
||||
XSettingsList *iter;
|
||||
XSettingsList *last = NULL;
|
||||
|
||||
node = calloc(1, sizeof *node);
|
||||
if (!node)
|
||||
return XSETTINGS_NO_MEM;
|
||||
node->setting = setting;
|
||||
|
||||
iter = *list;
|
||||
while (iter) {
|
||||
int cmp = strcmp(setting->name, iter->setting->name);
|
||||
|
||||
if (cmp < 0)
|
||||
break;
|
||||
else if (cmp == 0) {
|
||||
free(node);
|
||||
return XSETTINGS_DUPLICATE_ENTRY;
|
||||
}
|
||||
|
||||
last = iter;
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
if (last)
|
||||
last->next = node;
|
||||
else
|
||||
*list = node;
|
||||
|
||||
node->next = iter;
|
||||
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name)
|
||||
{
|
||||
XSettingsList *iter;
|
||||
XSettingsList *last = NULL;
|
||||
|
||||
iter = *list;
|
||||
while (iter) {
|
||||
if (strcmp(name, iter->setting->name) == 0) {
|
||||
if (last)
|
||||
last->next = iter->next;
|
||||
else
|
||||
*list = iter->next;
|
||||
|
||||
xsettings_setting_free(iter->setting);
|
||||
free(iter);
|
||||
|
||||
return XSETTINGS_SUCCESS;
|
||||
}
|
||||
|
||||
last = iter;
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
return XSETTINGS_FAILED;
|
||||
}
|
||||
|
||||
XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name)
|
||||
{
|
||||
XSettingsList *iter;
|
||||
|
||||
iter = list;
|
||||
while (iter) {
|
||||
if (strcmp(name, iter->setting->name) == 0)
|
||||
return iter->setting;
|
||||
|
||||
iter = iter->next;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
char xsettings_byte_order(void)
|
||||
{
|
||||
CARD32 myint = 0x01020304;
|
||||
return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
|
||||
CARD32 myint = 0x01020304;
|
||||
return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
|
||||
}
|
||||
|
||||
@@ -27,72 +27,82 @@
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
typedef struct _XSettingsBuffer XSettingsBuffer;
|
||||
typedef struct _XSettingsColor XSettingsColor;
|
||||
typedef struct _XSettingsList XSettingsList;
|
||||
typedef struct _XSettingsBuffer XSettingsBuffer;
|
||||
typedef struct _XSettingsColor XSettingsColor;
|
||||
typedef struct _XSettingsList XSettingsList;
|
||||
typedef struct _XSettingsSetting XSettingsSetting;
|
||||
|
||||
/* Types of settings possible. Enum values correspond to
|
||||
* protocol values.
|
||||
*/
|
||||
typedef enum {
|
||||
XSETTINGS_TYPE_INT = 0,
|
||||
XSETTINGS_TYPE_STRING = 1,
|
||||
XSETTINGS_TYPE_COLOR = 2,
|
||||
XSETTINGS_TYPE_NONE = 0xff
|
||||
typedef enum
|
||||
{
|
||||
XSETTINGS_TYPE_INT = 0,
|
||||
XSETTINGS_TYPE_STRING = 1,
|
||||
XSETTINGS_TYPE_COLOR = 2,
|
||||
XSETTINGS_TYPE_NONE = 0xff
|
||||
} XSettingsType;
|
||||
|
||||
typedef enum {
|
||||
XSETTINGS_SUCCESS,
|
||||
XSETTINGS_NO_MEM,
|
||||
XSETTINGS_ACCESS,
|
||||
XSETTINGS_FAILED,
|
||||
XSETTINGS_NO_ENTRY,
|
||||
XSETTINGS_DUPLICATE_ENTRY
|
||||
typedef enum
|
||||
{
|
||||
XSETTINGS_SUCCESS,
|
||||
XSETTINGS_NO_MEM,
|
||||
XSETTINGS_ACCESS,
|
||||
XSETTINGS_FAILED,
|
||||
XSETTINGS_NO_ENTRY,
|
||||
XSETTINGS_DUPLICATE_ENTRY
|
||||
} XSettingsResult;
|
||||
|
||||
struct _XSettingsBuffer {
|
||||
char byte_order;
|
||||
size_t len;
|
||||
unsigned char *data;
|
||||
unsigned char *pos;
|
||||
struct _XSettingsBuffer
|
||||
{
|
||||
char byte_order;
|
||||
size_t len;
|
||||
unsigned char *data;
|
||||
unsigned char *pos;
|
||||
};
|
||||
|
||||
struct _XSettingsColor {
|
||||
unsigned short red, green, blue, alpha;
|
||||
struct _XSettingsColor
|
||||
{
|
||||
unsigned short red, green, blue, alpha;
|
||||
};
|
||||
|
||||
struct _XSettingsList {
|
||||
XSettingsSetting *setting;
|
||||
XSettingsList *next;
|
||||
struct _XSettingsList
|
||||
{
|
||||
XSettingsSetting *setting;
|
||||
XSettingsList *next;
|
||||
};
|
||||
|
||||
struct _XSettingsSetting {
|
||||
char *name;
|
||||
XSettingsType type;
|
||||
struct _XSettingsSetting
|
||||
{
|
||||
char *name;
|
||||
XSettingsType type;
|
||||
|
||||
union {
|
||||
int v_int;
|
||||
char *v_string;
|
||||
XSettingsColor v_color;
|
||||
} data;
|
||||
union {
|
||||
int v_int;
|
||||
char *v_string;
|
||||
XSettingsColor v_color;
|
||||
} data;
|
||||
|
||||
unsigned long last_change_serial;
|
||||
unsigned long last_change_serial;
|
||||
};
|
||||
|
||||
XSettingsSetting *xsettings_setting_copy(XSettingsSetting *setting);
|
||||
void xsettings_setting_free(XSettingsSetting *setting);
|
||||
int xsettings_setting_equal(XSettingsSetting *setting_a, XSettingsSetting *setting_b);
|
||||
XSettingsSetting *xsettings_setting_copy (XSettingsSetting *setting);
|
||||
void xsettings_setting_free (XSettingsSetting *setting);
|
||||
int xsettings_setting_equal (XSettingsSetting *setting_a,
|
||||
XSettingsSetting *setting_b);
|
||||
|
||||
void xsettings_list_free(XSettingsList *list);
|
||||
XSettingsList *xsettings_list_copy(XSettingsList *list);
|
||||
XSettingsResult xsettings_list_insert(XSettingsList **list, XSettingsSetting *setting);
|
||||
XSettingsSetting *xsettings_list_lookup(XSettingsList *list, const char *name);
|
||||
XSettingsResult xsettings_list_delete(XSettingsList **list, const char *name);
|
||||
void xsettings_list_free (XSettingsList *list);
|
||||
XSettingsList *xsettings_list_copy (XSettingsList *list);
|
||||
XSettingsResult xsettings_list_insert (XSettingsList **list,
|
||||
XSettingsSetting *setting);
|
||||
XSettingsSetting *xsettings_list_lookup (XSettingsList *list,
|
||||
const char *name);
|
||||
XSettingsResult xsettings_list_delete (XSettingsList **list,
|
||||
const char *name);
|
||||
|
||||
char xsettings_byte_order(void);
|
||||
char xsettings_byte_order (void);
|
||||
|
||||
#define XSETTINGS_PAD(n, m) ((n + m - 1) & (~(m - 1)))
|
||||
#define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
1056
src/panel.c
1056
src/panel.c
File diff suppressed because it is too large
Load Diff
174
src/panel.h
174
src/panel.h
@@ -20,124 +20,109 @@
|
||||
#include "taskbar.h"
|
||||
#include "systraybar.h"
|
||||
#include "launcher.h"
|
||||
#include "freespace.h"
|
||||
#include "execplugin.h"
|
||||
|
||||
#ifdef ENABLE_BATTERY
|
||||
#include "battery.h"
|
||||
#endif
|
||||
|
||||
|
||||
extern int signal_pending;
|
||||
// --------------------------------------------------
|
||||
// mouse events
|
||||
extern MouseAction mouse_left;
|
||||
extern MouseAction mouse_middle;
|
||||
extern MouseAction mouse_right;
|
||||
extern MouseAction mouse_scroll_up;
|
||||
extern MouseAction mouse_scroll_down;
|
||||
extern MouseAction mouse_tilt_left;
|
||||
extern MouseAction mouse_tilt_right;
|
||||
extern int mouse_middle;
|
||||
extern int mouse_right;
|
||||
extern int mouse_scroll_up;
|
||||
extern int mouse_scroll_down;
|
||||
extern int mouse_tilt_left;
|
||||
extern int mouse_tilt_right;
|
||||
|
||||
// panel mode
|
||||
typedef enum TaskbarMode {
|
||||
SINGLE_DESKTOP = 0,
|
||||
MULTI_DESKTOP,
|
||||
} TaskbarMode;
|
||||
//panel mode
|
||||
enum { SINGLE_DESKTOP=0, MULTI_DESKTOP };
|
||||
enum { BOTTOM_LAYER, NORMAL_LAYER, TOP_LAYER };
|
||||
extern int panel_mode;
|
||||
extern int wm_menu;
|
||||
extern int panel_dock;
|
||||
extern int panel_layer;
|
||||
|
||||
typedef enum Layer {
|
||||
BOTTOM_LAYER,
|
||||
NORMAL_LAYER,
|
||||
TOP_LAYER,
|
||||
} Layer;
|
||||
//panel position
|
||||
enum { LEFT=0x01, RIGHT=0x02, CENTER=0X04, TOP=0X08, BOTTOM=0x10 };
|
||||
extern int panel_position;
|
||||
extern int panel_horizontal;
|
||||
|
||||
// panel position
|
||||
typedef enum PanelPosition {
|
||||
LEFT = 0x01,
|
||||
RIGHT = 0x02,
|
||||
CENTER = 0X04,
|
||||
TOP = 0X08,
|
||||
BOTTOM = 0x10,
|
||||
} PanelPosition;
|
||||
extern int panel_refresh;
|
||||
extern int task_dragged;
|
||||
|
||||
typedef enum Strut {
|
||||
STRUT_MINIMUM,
|
||||
STRUT_FOLLOW_SIZE,
|
||||
STRUT_NONE,
|
||||
} Strut;
|
||||
|
||||
extern TaskbarMode taskbar_mode;
|
||||
extern gboolean wm_menu;
|
||||
extern gboolean panel_dock;
|
||||
extern Layer panel_layer;
|
||||
extern char *panel_window_name;
|
||||
extern PanelPosition panel_position;
|
||||
extern gboolean panel_horizontal;
|
||||
extern gboolean panel_refresh;
|
||||
extern gboolean task_dragged;
|
||||
extern gboolean panel_autohide;
|
||||
//panel autohide
|
||||
enum { STRUT_MINIMUM, STRUT_FOLLOW_SIZE, STRUT_NONE };
|
||||
extern int panel_autohide;
|
||||
extern int panel_autohide_show_timeout;
|
||||
extern int panel_autohide_hide_timeout;
|
||||
extern int panel_autohide_height; // for vertical panels this is of course the width
|
||||
extern Strut panel_strut_policy;
|
||||
extern int panel_autohide_height; // for vertical panels this is of course the width
|
||||
extern int panel_strut_policy;
|
||||
extern char *panel_items_order;
|
||||
extern int max_tick_urgent;
|
||||
extern GArray *backgrounds;
|
||||
extern Imlib_Image default_icon;
|
||||
#define DEFAULT_FONT "sans 10"
|
||||
extern char *default_font;
|
||||
extern XSettingsClient *xsettings_client;
|
||||
|
||||
typedef struct Panel {
|
||||
extern int max_tick_urgent;
|
||||
|
||||
extern GArray* backgrounds;
|
||||
|
||||
extern Imlib_Image default_icon;
|
||||
|
||||
|
||||
// tint2 use one panel per monitor and one taskbar per desktop.
|
||||
typedef struct {
|
||||
// always start with area
|
||||
// area.list own all objects of the panel according to config file
|
||||
Area area;
|
||||
|
||||
// --------------------------------------------------
|
||||
// panel
|
||||
Window main_win;
|
||||
Pixmap temp_pmap;
|
||||
|
||||
// position relative to root window
|
||||
int posx, posy;
|
||||
int marginx, marginy;
|
||||
gboolean fractional_width, fractional_height;
|
||||
int pourcentx, pourcenty;
|
||||
// location of the panel (monitor number)
|
||||
int monitor;
|
||||
int font_shadow;
|
||||
gboolean mouse_effects;
|
||||
// Mouse effects for icons
|
||||
int mouse_over_alpha;
|
||||
int mouse_over_saturation;
|
||||
int mouse_over_brightness;
|
||||
int mouse_pressed_alpha;
|
||||
int mouse_pressed_saturation;
|
||||
int mouse_pressed_brightness;
|
||||
|
||||
// Per-panel parameters and states for Taskbar and Task
|
||||
GlobalTaskbar g_taskbar;
|
||||
GlobalTask g_task;
|
||||
// --------------------------------------------------
|
||||
// task and taskbar parameter per panel
|
||||
Global_taskbar g_taskbar;
|
||||
Global_task g_task;
|
||||
|
||||
// Array of Taskbar, with num_desktops items
|
||||
// --------------------------------------------------
|
||||
// taskbar point to the first taskbar in panel.area.list.
|
||||
// number of tasbar == nb_desktop. taskbar[i] is for desktop(i).
|
||||
// taskbar[i] is used to loop over taskbar,
|
||||
// while panel->area.list is used to loop over all panel's objects
|
||||
Taskbar *taskbar;
|
||||
int num_desktops;
|
||||
gboolean taskbarname_has_font;
|
||||
PangoFontDescription *taskbarname_font_desc;
|
||||
int nb_desktop;
|
||||
|
||||
// --------------------------------------------------
|
||||
// clock
|
||||
Clock clock;
|
||||
|
||||
// --------------------------------------------------
|
||||
// battery
|
||||
#ifdef ENABLE_BATTERY
|
||||
Battery battery;
|
||||
#endif
|
||||
|
||||
Launcher launcher;
|
||||
FreeSpace freespace;
|
||||
GList *execp_list;
|
||||
|
||||
// Autohide
|
||||
gboolean is_hidden;
|
||||
// autohide
|
||||
int is_hidden;
|
||||
int hidden_width, hidden_height;
|
||||
Pixmap hidden_pixmap;
|
||||
timeout *autohide_timeout;
|
||||
timeout* autohide_timeout;
|
||||
} Panel;
|
||||
|
||||
|
||||
extern Panel panel_config;
|
||||
extern Panel *panels;
|
||||
extern int num_panels;
|
||||
extern Panel *panel1;
|
||||
extern int nb_panel;
|
||||
|
||||
|
||||
// default global data
|
||||
void default_panel();
|
||||
@@ -150,12 +135,9 @@ void cleanup_panel();
|
||||
void init_panel();
|
||||
|
||||
void init_panel_size_and_position(Panel *panel);
|
||||
gboolean resize_panel(void *obj);
|
||||
void render_panel(Panel *panel);
|
||||
int resize_panel(void *obj);
|
||||
|
||||
void set_panel_items_order(Panel *p);
|
||||
void place_panel_all_desktops(Panel *p);
|
||||
void replace_panel_all_desktops(Panel *p);
|
||||
void set_panel_properties(Panel *p);
|
||||
|
||||
// draw background panel
|
||||
@@ -164,27 +146,17 @@ void set_panel_background(Panel *p);
|
||||
// detect witch panel
|
||||
Panel *get_panel(Window win);
|
||||
|
||||
Taskbar *click_taskbar(Panel *panel, int x, int y);
|
||||
Task *click_task(Panel *panel, int x, int y);
|
||||
Launcher *click_launcher(Panel *panel, int x, int y);
|
||||
LauncherIcon *click_launcher_icon(Panel *panel, int x, int y);
|
||||
Clock *click_clock(Panel *panel, int x, int y);
|
||||
Taskbar *click_taskbar (Panel *panel, int x, int y);
|
||||
Task *click_task (Panel *panel, int x, int y);
|
||||
Launcher *click_launcher (Panel *panel, int x, int y);
|
||||
LauncherIcon *click_launcher_icon (Panel *panel, int x, int y);
|
||||
int click_padding(Panel *panel, int x, int y);
|
||||
int click_clock(Panel *panel, int x, int y);
|
||||
Area* click_area(Panel *panel, int x, int y);
|
||||
|
||||
#ifdef ENABLE_BATTERY
|
||||
Battery *click_battery(Panel *panel, int x, int y);
|
||||
#endif
|
||||
|
||||
Area *click_area(Panel *panel, int x, int y);
|
||||
Execp *click_execp(Panel *panel, int x, int y);
|
||||
|
||||
void autohide_show(void *p);
|
||||
void autohide_hide(void *p);
|
||||
void autohide_trigger_show(Panel *p);
|
||||
void autohide_trigger_hide(Panel *p);
|
||||
|
||||
const char *get_default_font();
|
||||
|
||||
void default_icon_theme_changed();
|
||||
void default_font_changed();
|
||||
void autohide_show(void* p);
|
||||
void autohide_hide(void* p);
|
||||
void autohide_trigger_show(Panel* p);
|
||||
void autohide_trigger_hide(Panel* p);
|
||||
|
||||
#endif
|
||||
|
||||
615
src/server.c
615
src/server.c
@@ -21,135 +21,120 @@
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "server.h"
|
||||
#include "config.h"
|
||||
#include "task.h"
|
||||
#include "window.h"
|
||||
|
||||
Server server;
|
||||
void server_catch_error (Display *d, XErrorEvent *ev){}
|
||||
|
||||
gboolean primary_monitor_first = FALSE;
|
||||
|
||||
void server_catch_error(Display *d, XErrorEvent *ev)
|
||||
void server_init_atoms ()
|
||||
{
|
||||
}
|
||||
|
||||
void server_init_atoms()
|
||||
{
|
||||
server.atom._XROOTPMAP_ID = XInternAtom(server.display, "_XROOTPMAP_ID", False);
|
||||
server.atom._XROOTMAP_ID = XInternAtom(server.display, "_XROOTMAP_ID", False);
|
||||
server.atom._NET_CURRENT_DESKTOP = XInternAtom(server.display, "_NET_CURRENT_DESKTOP", False);
|
||||
server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom(server.display, "_NET_NUMBER_OF_DESKTOPS", False);
|
||||
server.atom._NET_DESKTOP_NAMES = XInternAtom(server.display, "_NET_DESKTOP_NAMES", False);
|
||||
server.atom._NET_DESKTOP_GEOMETRY = XInternAtom(server.display, "_NET_DESKTOP_GEOMETRY", False);
|
||||
server.atom._NET_DESKTOP_VIEWPORT = XInternAtom(server.display, "_NET_DESKTOP_VIEWPORT", False);
|
||||
server.atom._NET_WORKAREA = XInternAtom(server.display, "_NET_WORKAREA", False);
|
||||
server.atom._NET_ACTIVE_WINDOW = XInternAtom(server.display, "_NET_ACTIVE_WINDOW", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE", False);
|
||||
server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom(server.display, "_NET_WM_STATE_SKIP_PAGER", False);
|
||||
server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom(server.display, "_NET_WM_STATE_SKIP_TASKBAR", False);
|
||||
server.atom._NET_WM_STATE_STICKY = XInternAtom(server.display, "_NET_WM_STATE_STICKY", False);
|
||||
server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom(server.display, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DOCK", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_MENU = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_MENU", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_SPLASH = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_SPLASH", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DIALOG = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(server.display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
|
||||
server.atom._NET_WM_DESKTOP = XInternAtom(server.display, "_NET_WM_DESKTOP", False);
|
||||
server.atom.WM_STATE = XInternAtom(server.display, "WM_STATE", False);
|
||||
server.atom._NET_WM_STATE = XInternAtom(server.display, "_NET_WM_STATE", False);
|
||||
server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
|
||||
server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom(server.display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
|
||||
server.atom._NET_WM_STATE_SHADED = XInternAtom(server.display, "_NET_WM_STATE_SHADED", False);
|
||||
server.atom._NET_WM_STATE_HIDDEN = XInternAtom(server.display, "_NET_WM_STATE_HIDDEN", False);
|
||||
server.atom._NET_WM_STATE_BELOW = XInternAtom(server.display, "_NET_WM_STATE_BELOW", False);
|
||||
server.atom._NET_WM_STATE_ABOVE = XInternAtom(server.display, "_NET_WM_STATE_ABOVE", False);
|
||||
server.atom._NET_WM_STATE_MODAL = XInternAtom(server.display, "_NET_WM_STATE_MODAL", False);
|
||||
server.atom._NET_CLIENT_LIST = XInternAtom(server.display, "_NET_CLIENT_LIST", False);
|
||||
server.atom._NET_WM_VISIBLE_NAME = XInternAtom(server.display, "_NET_WM_VISIBLE_NAME", False);
|
||||
server.atom._NET_WM_NAME = XInternAtom(server.display, "_NET_WM_NAME", False);
|
||||
server.atom._NET_WM_STRUT = XInternAtom(server.display, "_NET_WM_STRUT", False);
|
||||
server.atom._NET_WM_ICON = XInternAtom(server.display, "_NET_WM_ICON", False);
|
||||
server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.display, "_NET_WM_ICON_GEOMETRY", False);
|
||||
server.atom._NET_WM_ICON_NAME = XInternAtom(server.display, "_NET_WM_ICON_NAME", False);
|
||||
server.atom._NET_CLOSE_WINDOW = XInternAtom(server.display, "_NET_CLOSE_WINDOW", False);
|
||||
server.atom.UTF8_STRING = XInternAtom(server.display, "UTF8_STRING", False);
|
||||
server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_SUPPORTING_WM_CHECK", False);
|
||||
server.atom._NET_WM_CM_S0 = XInternAtom(server.display, "_NET_WM_CM_S0", False);
|
||||
server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom(server.display, "_NET_WM_NAME", False);
|
||||
server.atom._NET_WM_STRUT_PARTIAL = XInternAtom(server.display, "_NET_WM_STRUT_PARTIAL", False);
|
||||
server.atom.WM_NAME = XInternAtom(server.display, "WM_NAME", False);
|
||||
server.atom.__SWM_VROOT = XInternAtom(server.display, "__SWM_VROOT", False);
|
||||
server.atom._MOTIF_WM_HINTS = XInternAtom(server.display, "_MOTIF_WM_HINTS", False);
|
||||
server.atom.WM_HINTS = XInternAtom(server.display, "WM_HINTS", False);
|
||||
gchar *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.display));
|
||||
server.atom._XSETTINGS_SCREEN = XInternAtom(server.display, name, False);
|
||||
server.atom._XROOTPMAP_ID = XInternAtom (server.dsp, "_XROOTPMAP_ID", False);
|
||||
server.atom._XROOTMAP_ID = XInternAtom (server.dsp, "_XROOTMAP_ID", False);
|
||||
server.atom._NET_CURRENT_DESKTOP = XInternAtom (server.dsp, "_NET_CURRENT_DESKTOP", False);
|
||||
server.atom._NET_NUMBER_OF_DESKTOPS = XInternAtom (server.dsp, "_NET_NUMBER_OF_DESKTOPS", False);
|
||||
server.atom._NET_DESKTOP_NAMES = XInternAtom (server.dsp, "_NET_DESKTOP_NAMES", False);
|
||||
server.atom._NET_DESKTOP_GEOMETRY = XInternAtom (server.dsp, "_NET_DESKTOP_GEOMETRY", False);
|
||||
server.atom._NET_DESKTOP_VIEWPORT = XInternAtom (server.dsp, "_NET_DESKTOP_VIEWPORT", False);
|
||||
server.atom._NET_ACTIVE_WINDOW = XInternAtom (server.dsp, "_NET_ACTIVE_WINDOW", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE", False);
|
||||
server.atom._NET_WM_STATE_SKIP_PAGER = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_PAGER", False);
|
||||
server.atom._NET_WM_STATE_SKIP_TASKBAR = XInternAtom (server.dsp, "_NET_WM_STATE_SKIP_TASKBAR", False);
|
||||
server.atom._NET_WM_STATE_STICKY = XInternAtom (server.dsp, "_NET_WM_STATE_STICKY", False);
|
||||
server.atom._NET_WM_STATE_DEMANDS_ATTENTION = XInternAtom (server.dsp, "_NET_WM_STATE_DEMANDS_ATTENTION", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DOCK = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DOCK", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DESKTOP = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_TOOLBAR = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_TOOLBAR", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_MENU = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_MENU", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_SPLASH = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_SPLASH", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_DIALOG = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||
server.atom._NET_WM_WINDOW_TYPE_NORMAL = XInternAtom (server.dsp, "_NET_WM_WINDOW_TYPE_NORMAL", False);
|
||||
server.atom._NET_WM_DESKTOP = XInternAtom (server.dsp, "_NET_WM_DESKTOP", False);
|
||||
server.atom.WM_STATE = XInternAtom (server.dsp, "WM_STATE", False);
|
||||
server.atom._NET_WM_STATE = XInternAtom (server.dsp, "_NET_WM_STATE", False);
|
||||
server.atom._NET_WM_STATE_MAXIMIZED_VERT = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_VERT", False);
|
||||
server.atom._NET_WM_STATE_MAXIMIZED_HORZ = XInternAtom (server.dsp, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
|
||||
server.atom._NET_WM_STATE_SHADED = XInternAtom (server.dsp, "_NET_WM_STATE_SHADED", False);
|
||||
server.atom._NET_WM_STATE_HIDDEN = XInternAtom (server.dsp, "_NET_WM_STATE_HIDDEN", False);
|
||||
server.atom._NET_WM_STATE_BELOW = XInternAtom (server.dsp, "_NET_WM_STATE_BELOW", False);
|
||||
server.atom._NET_WM_STATE_ABOVE = XInternAtom (server.dsp, "_NET_WM_STATE_ABOVE", False);
|
||||
server.atom._NET_WM_STATE_MODAL = XInternAtom (server.dsp, "_NET_WM_STATE_MODAL", False);
|
||||
server.atom._NET_CLIENT_LIST = XInternAtom (server.dsp, "_NET_CLIENT_LIST", False);
|
||||
server.atom._NET_WM_VISIBLE_NAME = XInternAtom (server.dsp, "_NET_WM_VISIBLE_NAME", False);
|
||||
server.atom._NET_WM_NAME = XInternAtom (server.dsp, "_NET_WM_NAME", False);
|
||||
server.atom._NET_WM_STRUT = XInternAtom (server.dsp, "_NET_WM_STRUT", False);
|
||||
server.atom._NET_WM_ICON = XInternAtom (server.dsp, "_NET_WM_ICON", False);
|
||||
server.atom._NET_WM_ICON_GEOMETRY = XInternAtom(server.dsp, "_NET_WM_ICON_GEOMETRY", False );
|
||||
server.atom._NET_CLOSE_WINDOW = XInternAtom (server.dsp, "_NET_CLOSE_WINDOW", False);
|
||||
server.atom.UTF8_STRING = XInternAtom (server.dsp, "UTF8_STRING", False);
|
||||
server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_SUPPORTING_WM_CHECK", False);
|
||||
server.atom._NET_WM_CM_S0 = XInternAtom (server.dsp, "_NET_WM_CM_S0", False);
|
||||
server.atom._NET_SUPPORTING_WM_CHECK = XInternAtom (server.dsp, "_NET_WM_NAME", False);
|
||||
server.atom._NET_WM_STRUT_PARTIAL = XInternAtom (server.dsp, "_NET_WM_STRUT_PARTIAL", False);
|
||||
server.atom.WM_NAME = XInternAtom(server.dsp, "WM_NAME", False);
|
||||
server.atom.__SWM_VROOT = XInternAtom(server.dsp, "__SWM_VROOT", False);
|
||||
server.atom._MOTIF_WM_HINTS = XInternAtom(server.dsp, "_MOTIF_WM_HINTS", False);
|
||||
server.atom.WM_HINTS = XInternAtom(server.dsp, "WM_HINTS", False);
|
||||
char *name = g_strdup_printf("_XSETTINGS_S%d", DefaultScreen(server.dsp));
|
||||
server.atom._XSETTINGS_SCREEN = XInternAtom(server.dsp, name, False);
|
||||
g_free(name);
|
||||
server.atom._XSETTINGS_SETTINGS = XInternAtom(server.display, "_XSETTINGS_SETTINGS", False);
|
||||
server.atom._XSETTINGS_SETTINGS = XInternAtom(server.dsp, "_XSETTINGS_SETTINGS", False);
|
||||
|
||||
// systray protocol
|
||||
name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.display));
|
||||
server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.display, name, False);
|
||||
name = g_strdup_printf("_NET_SYSTEM_TRAY_S%d", DefaultScreen(server.dsp));
|
||||
server.atom._NET_SYSTEM_TRAY_SCREEN = XInternAtom(server.dsp, name, False);
|
||||
g_free(name);
|
||||
server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_OPCODE", False);
|
||||
server.atom.MANAGER = XInternAtom(server.display, "MANAGER", False);
|
||||
server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.display, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
|
||||
server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
||||
server.atom._NET_SYSTEM_TRAY_ICON_SIZE = XInternAtom(server.display, "_NET_SYSTEM_TRAY_ICON_SIZE", False);
|
||||
server.atom._NET_SYSTEM_TRAY_PADDING = XInternAtom(server.display, "_NET_SYSTEM_TRAY_PADDING", False);
|
||||
server.atom._XEMBED = XInternAtom(server.display, "_XEMBED", False);
|
||||
server.atom._XEMBED_INFO = XInternAtom(server.display, "_XEMBED_INFO", False);
|
||||
server.atom._NET_WM_PID = XInternAtom(server.display, "_NET_WM_PID", True);
|
||||
server.atom._NET_SYSTEM_TRAY_OPCODE = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_OPCODE", False);
|
||||
server.atom.MANAGER = XInternAtom(server.dsp, "MANAGER", False);
|
||||
server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
|
||||
server.atom._NET_SYSTEM_TRAY_ORIENTATION = XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
||||
server.atom._XEMBED = XInternAtom(server.dsp, "_XEMBED", False);
|
||||
server.atom._XEMBED_INFO = XInternAtom(server.dsp, "_XEMBED_INFO", False);
|
||||
|
||||
// drag 'n' drop
|
||||
server.atom.XdndAware = XInternAtom(server.display, "XdndAware", False);
|
||||
server.atom.XdndEnter = XInternAtom(server.display, "XdndEnter", False);
|
||||
server.atom.XdndPosition = XInternAtom(server.display, "XdndPosition", False);
|
||||
server.atom.XdndStatus = XInternAtom(server.display, "XdndStatus", False);
|
||||
server.atom.XdndDrop = XInternAtom(server.display, "XdndDrop", False);
|
||||
server.atom.XdndLeave = XInternAtom(server.display, "XdndLeave", False);
|
||||
server.atom.XdndSelection = XInternAtom(server.display, "XdndSelection", False);
|
||||
server.atom.XdndTypeList = XInternAtom(server.display, "XdndTypeList", False);
|
||||
server.atom.XdndActionCopy = XInternAtom(server.display, "XdndActionCopy", False);
|
||||
server.atom.XdndFinished = XInternAtom(server.display, "XdndFinished", False);
|
||||
server.atom.TARGETS = XInternAtom(server.display, "TARGETS", False);
|
||||
server.atom.XdndAware = XInternAtom(server.dsp, "XdndAware", False);
|
||||
server.atom.XdndEnter = XInternAtom(server.dsp, "XdndEnter", False);
|
||||
server.atom.XdndPosition = XInternAtom(server.dsp, "XdndPosition", False);
|
||||
server.atom.XdndStatus = XInternAtom(server.dsp, "XdndStatus", False);
|
||||
server.atom.XdndDrop = XInternAtom(server.dsp, "XdndDrop", False);
|
||||
server.atom.XdndLeave = XInternAtom(server.dsp, "XdndLeave", False);
|
||||
server.atom.XdndSelection = XInternAtom(server.dsp, "XdndSelection", False);
|
||||
server.atom.XdndTypeList = XInternAtom(server.dsp, "XdndTypeList", False);
|
||||
server.atom.XdndActionCopy = XInternAtom(server.dsp, "XdndActionCopy", False);
|
||||
server.atom.XdndFinished = XInternAtom(server.dsp, "XdndFinished", False);
|
||||
server.atom.TARGETS = XInternAtom(server.dsp, "TARGETS", False);
|
||||
}
|
||||
|
||||
|
||||
void cleanup_server()
|
||||
{
|
||||
if (server.colormap)
|
||||
XFreeColormap(server.display, server.colormap);
|
||||
server.colormap = 0;
|
||||
if (server.colormap32)
|
||||
XFreeColormap(server.display, server.colormap32);
|
||||
server.colormap32 = 0;
|
||||
if (server.monitors) {
|
||||
for (int i = 0; i < server.num_monitors; ++i) {
|
||||
g_strfreev(server.monitors[i].names);
|
||||
server.monitors[i].names = NULL;
|
||||
}
|
||||
free(server.monitors);
|
||||
server.monitors = NULL;
|
||||
if (server.colormap) XFreeColormap(server.dsp, server.colormap);
|
||||
if (server.colormap32) XFreeColormap(server.dsp, server.colormap32);
|
||||
if (server.monitor) {
|
||||
int i;
|
||||
for (i=0; i<server.nb_monitor; ++i)
|
||||
if (server.monitor[i].names)
|
||||
g_strfreev(server.monitor[i].names);
|
||||
free(server.monitor);
|
||||
}
|
||||
if (server.gc)
|
||||
XFreeGC(server.display, server.gc);
|
||||
server.gc = NULL;
|
||||
server.disable_transparency = FALSE;
|
||||
if (server.gc) XFreeGC(server.dsp, server.gc);
|
||||
}
|
||||
|
||||
void send_event32(Window win, Atom at, long data1, long data2, long data3)
|
||||
|
||||
void send_event32 (Window win, Atom at, long data1, long data2, long data3)
|
||||
{
|
||||
XEvent event;
|
||||
|
||||
event.xclient.type = ClientMessage;
|
||||
event.xclient.serial = 0;
|
||||
event.xclient.send_event = True;
|
||||
event.xclient.display = server.display;
|
||||
event.xclient.display = server.dsp;
|
||||
event.xclient.window = win;
|
||||
event.xclient.message_type = at;
|
||||
|
||||
@@ -160,10 +145,11 @@ void send_event32(Window win, Atom at, long data1, long data2, long data3)
|
||||
event.xclient.data.l[3] = 0;
|
||||
event.xclient.data.l[4] = 0;
|
||||
|
||||
XSendEvent(server.display, server.root_win, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
|
||||
XSendEvent(server.dsp, server.root_win, False, SubstructureRedirectMask|SubstructureNotifyMask, &event);
|
||||
}
|
||||
|
||||
int get_property32(Window win, Atom at, Atom type)
|
||||
|
||||
int get_property32 (Window win, Atom at, Atom type)
|
||||
{
|
||||
Atom type_ret;
|
||||
int format_ret = 0, data = 0;
|
||||
@@ -172,431 +158,256 @@ int get_property32(Window win, Atom at, Atom type)
|
||||
unsigned char *prop_value = 0;
|
||||
int result;
|
||||
|
||||
if (!win)
|
||||
return 0;
|
||||
if (!win) return 0;
|
||||
|
||||
result = XGetWindowProperty(server.display,
|
||||
win,
|
||||
at,
|
||||
0,
|
||||
0x7fffffff,
|
||||
False,
|
||||
type,
|
||||
&type_ret,
|
||||
&format_ret,
|
||||
&nitems_ret,
|
||||
&bafter_ret,
|
||||
&prop_value);
|
||||
result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
|
||||
|
||||
if (result == Success && prop_value) {
|
||||
data = ((gulong *)prop_value)[0];
|
||||
XFree(prop_value);
|
||||
data = ((gulong*)prop_value)[0];
|
||||
XFree (prop_value);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
void *server_get_property(Window win, Atom at, Atom type, int *num_results)
|
||||
|
||||
void *server_get_property (Window win, Atom at, Atom type, int *num_results)
|
||||
{
|
||||
Atom type_ret;
|
||||
int format_ret = 0;
|
||||
unsigned long nitems_ret = 0;
|
||||
unsigned long bafter_ret = 0;
|
||||
unsigned char *prop_value;
|
||||
int result;
|
||||
|
||||
if (!win)
|
||||
return NULL;
|
||||
if (!win) return 0;
|
||||
|
||||
int result = XGetWindowProperty(server.display,
|
||||
win,
|
||||
at,
|
||||
0,
|
||||
0x7fffffff,
|
||||
False,
|
||||
type,
|
||||
&type_ret,
|
||||
&format_ret,
|
||||
&nitems_ret,
|
||||
&bafter_ret,
|
||||
&prop_value);
|
||||
result = XGetWindowProperty(server.dsp, win, at, 0, 0x7fffffff, False, type, &type_ret, &format_ret, &nitems_ret, &bafter_ret, &prop_value);
|
||||
|
||||
// Send fill_color resultcount
|
||||
if (num_results)
|
||||
*num_results = (int)nitems_ret;
|
||||
// Send back resultcount
|
||||
if (num_results) *num_results = (int)nitems_ret;
|
||||
|
||||
if (result == Success && prop_value)
|
||||
return prop_value;
|
||||
else
|
||||
return NULL;
|
||||
if (result == Success && prop_value) return prop_value;
|
||||
else return 0;
|
||||
}
|
||||
|
||||
|
||||
void get_root_pixmap()
|
||||
{
|
||||
Pixmap ret = None;
|
||||
|
||||
Atom pixmap_atoms[] = {server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID};
|
||||
for (int i = 0; i < sizeof(pixmap_atoms) / sizeof(Atom); ++i) {
|
||||
unsigned long *res = (unsigned long *)server_get_property(server.root_win, pixmap_atoms[i], XA_PIXMAP, NULL);
|
||||
unsigned long *res;
|
||||
Atom pixmap_atoms[] = { server.atom._XROOTPMAP_ID, server.atom._XROOTMAP_ID };
|
||||
int i;
|
||||
|
||||
for (i=0; i<sizeof(pixmap_atoms)/sizeof(Atom); ++i) {
|
||||
res = server_get_property (server.root_win, pixmap_atoms[i], XA_PIXMAP, 0);
|
||||
if (res) {
|
||||
ret = *((Pixmap *)res);
|
||||
ret = *((Pixmap*)res);
|
||||
XFree(res);
|
||||
break;
|
||||
}
|
||||
}
|
||||
server.root_pmap = ret;
|
||||
|
||||
if (server.root_pmap == None) {
|
||||
if (server.root_pmap == None)
|
||||
fprintf(stderr, "tint2 : pixmap background detection failed\n");
|
||||
} else {
|
||||
XGCValues gcv;
|
||||
else {
|
||||
XGCValues gcv;
|
||||
gcv.ts_x_origin = 0;
|
||||
gcv.ts_y_origin = 0;
|
||||
gcv.fill_style = FillTiled;
|
||||
uint mask = GCTileStipXOrigin | GCTileStipYOrigin | GCFillStyle | GCTile;
|
||||
|
||||
gcv.tile = server.root_pmap;
|
||||
XChangeGC(server.display, server.gc, mask, &gcv);
|
||||
XChangeGC(server.dsp, server.gc, mask, &gcv);
|
||||
}
|
||||
}
|
||||
|
||||
int compare_monitor_pos(const void *monitor1, const void *monitor2)
|
||||
{
|
||||
const Monitor *m1 = (const Monitor *)monitor1;
|
||||
const Monitor *m2 = (const Monitor *)monitor2;
|
||||
|
||||
if (primary_monitor_first) {
|
||||
if (m1->primary && !m2->primary)
|
||||
return -1;
|
||||
if (!m1->primary && m2->primary)
|
||||
return 1;
|
||||
}
|
||||
int compareMonitorPos(const void *monitor1, const void *monitor2)
|
||||
{
|
||||
Monitor *m1 = (Monitor*)monitor1;
|
||||
Monitor *m2 = (Monitor*)monitor2;
|
||||
|
||||
if (m1->x < m2->x) {
|
||||
return -1;
|
||||
} else if (m1->x > m2->x) {
|
||||
}
|
||||
else if (m1->x > m2->x) {
|
||||
return 1;
|
||||
} else if (m1->y < m2->y) {
|
||||
}
|
||||
else if (m1->y < m2->y) {
|
||||
return -1;
|
||||
} else if (m1->y > m2->y) {
|
||||
}
|
||||
else if (m1->y > m2->y) {
|
||||
return 1;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
int monitor_includes_monitor(const void *monitor1, const void *monitor2)
|
||||
{
|
||||
const Monitor *m1 = (const Monitor *)monitor1;
|
||||
const Monitor *m2 = (const Monitor *)monitor2;
|
||||
|
||||
if (m1->x >= m2->x && m1->y >= m2->y && (m1->x + m1->width) <= (m2->x + m2->width) &&
|
||||
(m1->y + m1->height) <= (m2->y + m2->height)) {
|
||||
int compareMonitorIncluded(const void *monitor1, const void *monitor2)
|
||||
{
|
||||
Monitor *m1 = (Monitor*)monitor1;
|
||||
Monitor *m2 = (Monitor*)monitor2;
|
||||
|
||||
if (m1->x >= m2->x && m1->y >= m2->y && (m1->x+m1->width) <= (m2->x+m2->width) && (m1->y+m1->height) <= (m2->y+m2->height)) {
|
||||
// m1 included inside m2
|
||||
return 1;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void get_monitors()
|
||||
{
|
||||
if (XineramaIsActive(server.display)) {
|
||||
int num_monitors;
|
||||
XineramaScreenInfo *info = XineramaQueryScreens(server.display, &num_monitors);
|
||||
XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.display, server.root_win);
|
||||
RROutput primary_output = XRRGetOutputPrimary(server.display, server.root_win);
|
||||
int i, j, nbmonitor;
|
||||
if (XineramaIsActive(server.dsp)) {
|
||||
XineramaScreenInfo *info = XineramaQueryScreens(server.dsp, &nbmonitor);
|
||||
XRRScreenResources *res = XRRGetScreenResourcesCurrent(server.dsp, server.root_win);
|
||||
|
||||
if (res && res->ncrtc >= num_monitors) {
|
||||
if (res && res->ncrtc >= nbmonitor) {
|
||||
// use xrandr to identify monitors (does not work with proprietery nvidia drivers)
|
||||
|
||||
// Workaround for issue https://gitlab.com/o9000/tint2/issues/353
|
||||
// on some recent configs, XRRGetScreenResourcesCurrent returns a fantom monitor at last position
|
||||
{
|
||||
int i = res->ncrtc - 1;
|
||||
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
|
||||
if (!(crtc_info->x || crtc_info->y || crtc_info->width || crtc_info->height)) {
|
||||
res->ncrtc -= 1;
|
||||
}
|
||||
XRRFreeCrtcInfo(crtc_info);
|
||||
}
|
||||
|
||||
printf("xRandr: Found crtc's: %d\n", res->ncrtc);
|
||||
server.monitors = calloc(res->ncrtc, sizeof(Monitor));
|
||||
for (int i = 0; i < res->ncrtc; ++i) {
|
||||
XRRCrtcInfo *crtc_info = XRRGetCrtcInfo(server.display, res, res->crtcs[i]);
|
||||
server.monitors[i].x = crtc_info->x;
|
||||
server.monitors[i].y = crtc_info->y;
|
||||
server.monitors[i].width = crtc_info->width;
|
||||
server.monitors[i].height = crtc_info->height;
|
||||
server.monitors[i].names = calloc((crtc_info->noutput + 1), sizeof(gchar *));
|
||||
for (int j = 0; j < crtc_info->noutput; ++j) {
|
||||
XRROutputInfo *output_info = XRRGetOutputInfo(server.display, res, crtc_info->outputs[j]);
|
||||
printf("xRandr: Found crtc's: %d\n", res->ncrtc );
|
||||
server.monitor = malloc(res->ncrtc * sizeof(Monitor));
|
||||
for (i=0; i<res->ncrtc; ++i) {
|
||||
XRRCrtcInfo* crtc_info = XRRGetCrtcInfo(server.dsp, res, res->crtcs[i]);
|
||||
server.monitor[i].x = crtc_info->x;
|
||||
server.monitor[i].y = crtc_info->y;
|
||||
server.monitor[i].width = crtc_info->width;
|
||||
server.monitor[i].height = crtc_info->height;
|
||||
server.monitor[i].names = malloc((crtc_info->noutput+1) * sizeof(char*));
|
||||
for (j=0; j<crtc_info->noutput; ++j) {
|
||||
XRROutputInfo* output_info = XRRGetOutputInfo(server.dsp, res, crtc_info->outputs[j]);
|
||||
printf("xRandr: Linking output %s with crtc %d\n", output_info->name, i);
|
||||
server.monitors[i].names[j] = g_strdup(output_info->name);
|
||||
server.monitor[i].names[j] = g_strdup(output_info->name);
|
||||
XRRFreeOutputInfo(output_info);
|
||||
server.monitors[i].primary = crtc_info->outputs[j] == primary_output;
|
||||
}
|
||||
server.monitors[i].names[crtc_info->noutput] = NULL;
|
||||
server.monitor[i].names[j] = 0;
|
||||
XRRFreeCrtcInfo(crtc_info);
|
||||
}
|
||||
num_monitors = res->ncrtc;
|
||||
} else if (info && num_monitors > 0) {
|
||||
server.monitors = calloc(num_monitors, sizeof(Monitor));
|
||||
for (int i = 0; i < num_monitors; i++) {
|
||||
server.monitors[i].x = info[i].x_org;
|
||||
server.monitors[i].y = info[i].y_org;
|
||||
server.monitors[i].width = info[i].width;
|
||||
server.monitors[i].height = info[i].height;
|
||||
server.monitors[i].names = 0;
|
||||
nbmonitor = res->ncrtc;
|
||||
}
|
||||
else if (info && nbmonitor > 0) {
|
||||
server.monitor = malloc(nbmonitor * sizeof(Monitor));
|
||||
for (i=0 ; i < nbmonitor ; i++) {
|
||||
server.monitor[i].x = info[i].x_org;
|
||||
server.monitor[i].y = info[i].y_org;
|
||||
server.monitor[i].width = info[i].width;
|
||||
server.monitor[i].height = info[i].height;
|
||||
server.monitor[i].names = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Sort monitors by inclusion
|
||||
qsort(server.monitors, num_monitors, sizeof(Monitor), monitor_includes_monitor);
|
||||
// ordered monitor
|
||||
qsort(server.monitor, nbmonitor, sizeof(Monitor), compareMonitorIncluded);
|
||||
|
||||
// Remove monitors included in other ones
|
||||
int i = 0;
|
||||
while (i < num_monitors) {
|
||||
for (int j = 0; j < i; j++) {
|
||||
if (monitor_includes_monitor(&server.monitors[i], &server.monitors[j]) > 0) {
|
||||
// remove monitor included into another one
|
||||
i = 0;
|
||||
while (i < nbmonitor) {
|
||||
for (j=0; j < i ; j++) {
|
||||
if (compareMonitorIncluded(&server.monitor[i], &server.monitor[j]) > 0) {
|
||||
goto next;
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
next:
|
||||
for (int j = i; j < num_monitors; ++j)
|
||||
if (server.monitors[j].names)
|
||||
g_strfreev(server.monitors[j].names);
|
||||
server.num_monitors = i;
|
||||
server.monitors = realloc(server.monitors, server.num_monitors * sizeof(Monitor));
|
||||
qsort(server.monitors, server.num_monitors, sizeof(Monitor), compare_monitor_pos);
|
||||
next:
|
||||
for (j=i; j<nbmonitor; ++j)
|
||||
if (server.monitor[j].names)
|
||||
g_strfreev(server.monitor[j].names);
|
||||
server.nb_monitor = i;
|
||||
server.monitor = realloc(server.monitor, server.nb_monitor * sizeof(Monitor));
|
||||
qsort(server.monitor, server.nb_monitor, sizeof(Monitor), compareMonitorPos);
|
||||
|
||||
if (res)
|
||||
XRRFreeScreenResources(res);
|
||||
XFree(info);
|
||||
}
|
||||
|
||||
if (!server.num_monitors) {
|
||||
server.num_monitors = 1;
|
||||
server.monitors = calloc(1, sizeof(Monitor));
|
||||
server.monitors[0].x = server.monitors[0].y = 0;
|
||||
server.monitors[0].width = DisplayWidth(server.display, server.screen);
|
||||
server.monitors[0].height = DisplayHeight(server.display, server.screen);
|
||||
server.monitors[0].names = 0;
|
||||
if (!server.nb_monitor) {
|
||||
server.nb_monitor = 1;
|
||||
server.monitor = malloc(sizeof(Monitor));
|
||||
server.monitor[0].x = server.monitor[0].y = 0;
|
||||
server.monitor[0].width = DisplayWidth (server.dsp, server.screen);
|
||||
server.monitor[0].height = DisplayHeight (server.dsp, server.screen);
|
||||
server.monitor[0].names = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void print_monitors()
|
||||
{
|
||||
fprintf(stderr, "Number of monitors: %d\n", server.num_monitors);
|
||||
for (int i = 0; i < server.num_monitors; i++) {
|
||||
fprintf(stderr,
|
||||
"Monitor %d: x = %d, y = %d, w = %d, h = %d\n",
|
||||
i + 1,
|
||||
server.monitors[i].x,
|
||||
server.monitors[i].y,
|
||||
server.monitors[i].width,
|
||||
server.monitors[i].height);
|
||||
}
|
||||
}
|
||||
|
||||
void server_get_number_of_desktops()
|
||||
{
|
||||
if (server.viewports) {
|
||||
free(server.viewports);
|
||||
server.viewports = NULL;
|
||||
}
|
||||
|
||||
server.num_desktops = get_property32(server.root_win, server.atom._NET_NUMBER_OF_DESKTOPS, XA_CARDINAL);
|
||||
if (server.num_desktops > 1)
|
||||
return;
|
||||
|
||||
int num_results;
|
||||
long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
|
||||
if (!work_area_size)
|
||||
return;
|
||||
int work_area_width = work_area_size[0] + work_area_size[2];
|
||||
int work_area_height = work_area_size[1] + work_area_size[3];
|
||||
XFree(work_area_size);
|
||||
|
||||
long *x_screen_size =
|
||||
server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
|
||||
if (!x_screen_size)
|
||||
return;
|
||||
int x_screen_width = x_screen_size[0];
|
||||
int x_screen_height = x_screen_size[1];
|
||||
XFree(x_screen_size);
|
||||
|
||||
int num_viewports = MAX(x_screen_width / work_area_width, 1) * MAX(x_screen_height / work_area_height, 1);
|
||||
if (num_viewports <= 1) {
|
||||
server.num_desktops = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
server.viewports = calloc(num_viewports, sizeof(Viewport));
|
||||
int k = 0;
|
||||
for (int i = 0; i < MAX(x_screen_height / work_area_height, 1); i++) {
|
||||
for (int j = 0; j < MAX(x_screen_width / work_area_width, 1); j++) {
|
||||
server.viewports[k].x = j * work_area_width;
|
||||
server.viewports[k].y = i * work_area_height;
|
||||
server.viewports[k].width = work_area_width;
|
||||
server.viewports[k].height = work_area_height;
|
||||
k++;
|
||||
}
|
||||
}
|
||||
|
||||
server.num_desktops = num_viewports;
|
||||
}
|
||||
|
||||
GSList *get_desktop_names()
|
||||
{
|
||||
if (server.viewports) {
|
||||
GSList *list = NULL;
|
||||
for (int j = 0; j < server.num_desktops; j++) {
|
||||
list = g_slist_append(list, g_strdup_printf("%d", j + 1));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
int count;
|
||||
GSList *list = NULL;
|
||||
gchar *data_ptr =
|
||||
server_get_property(server.root_win, server.atom._NET_DESKTOP_NAMES, server.atom.UTF8_STRING, &count);
|
||||
if (data_ptr) {
|
||||
list = g_slist_append(list, g_strdup(data_ptr));
|
||||
for (int j = 0; j < count - 1; j++) {
|
||||
if (*(data_ptr + j) == '\0') {
|
||||
gchar *ptr = (gchar *)data_ptr + j + 1;
|
||||
list = g_slist_append(list, g_strdup(ptr));
|
||||
}
|
||||
}
|
||||
XFree(data_ptr);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
int get_current_desktop()
|
||||
{
|
||||
if (!server.viewports) {
|
||||
return MAX(0,
|
||||
MIN(server.num_desktops - 1,
|
||||
get_property32(server.root_win, server.atom._NET_CURRENT_DESKTOP, XA_CARDINAL)));
|
||||
}
|
||||
|
||||
int num_results;
|
||||
long *work_area_size = server_get_property(server.root_win, server.atom._NET_WORKAREA, XA_CARDINAL, &num_results);
|
||||
if (!work_area_size)
|
||||
return 0;
|
||||
int work_area_width = work_area_size[0] + work_area_size[2];
|
||||
int work_area_height = work_area_size[1] + work_area_size[3];
|
||||
XFree(work_area_size);
|
||||
|
||||
if (work_area_width <= 0 || work_area_height <= 0)
|
||||
return 0;
|
||||
|
||||
long *viewport = server_get_property(server.root_win, server.atom._NET_DESKTOP_VIEWPORT, XA_CARDINAL, &num_results);
|
||||
if (!viewport)
|
||||
return 0;
|
||||
int viewport_x = viewport[0];
|
||||
int viewport_y = viewport[1];
|
||||
XFree(viewport);
|
||||
|
||||
long *x_screen_size =
|
||||
server_get_property(server.root_win, server.atom._NET_DESKTOP_GEOMETRY, XA_CARDINAL, &num_results);
|
||||
if (!x_screen_size)
|
||||
return 0;
|
||||
int x_screen_width = x_screen_size[0];
|
||||
XFree(x_screen_size);
|
||||
|
||||
int ncols = x_screen_width / work_area_width;
|
||||
|
||||
// fprintf(stderr, "\n");
|
||||
// fprintf(stderr, "Work area size: %d x %d\n", work_area_width, work_area_height);
|
||||
// fprintf(stderr, "Viewport pos: %d x %d\n", viewport_x, viewport_y);
|
||||
// fprintf(stderr, "Viewport i: %d\n", (viewport_y / work_area_height) * ncols + viewport_x / work_area_width);
|
||||
|
||||
int result = (viewport_y / work_area_height) * ncols + viewport_x / work_area_width;
|
||||
return MAX(0, MIN(server.num_desktops - 1, result));
|
||||
}
|
||||
|
||||
void change_desktop(int desktop)
|
||||
{
|
||||
if (!server.viewports) {
|
||||
send_event32(server.root_win, server.atom._NET_CURRENT_DESKTOP, desktop, 0, 0);
|
||||
} else {
|
||||
send_event32(server.root_win,
|
||||
server.atom._NET_DESKTOP_VIEWPORT,
|
||||
server.viewports[desktop].x,
|
||||
server.viewports[desktop].y,
|
||||
0);
|
||||
}
|
||||
}
|
||||
|
||||
void get_desktops()
|
||||
{
|
||||
int i;
|
||||
|
||||
// detect number of desktops
|
||||
// wait 15s to leave some time for window manager startup
|
||||
for (int i = 0; i < 15; i++) {
|
||||
server_get_number_of_desktops();
|
||||
if (server.num_desktops > 0)
|
||||
break;
|
||||
for (i=0 ; i < 15 ; i++) {
|
||||
server.nb_desktop = server_get_number_of_desktop ();
|
||||
if (server.nb_desktop > 0) break;
|
||||
sleep(1);
|
||||
}
|
||||
if (server.num_desktops == 0) {
|
||||
server.num_desktops = 1;
|
||||
if (server.nb_desktop == 0) {
|
||||
server.nb_desktop = 1;
|
||||
fprintf(stderr, "warning : WM doesn't respect NETWM specs. tint2 default to 1 desktop.\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void server_init_visual()
|
||||
{
|
||||
// inspired by freedesktops fdclock ;)
|
||||
XVisualInfo templ = {.screen = server.screen, .depth = 32, .class = TrueColor};
|
||||
XVisualInfo *xvi;
|
||||
XVisualInfo templ = { .screen=server.screen, .depth=32, .class=TrueColor };
|
||||
int nvi;
|
||||
XVisualInfo *xvi =
|
||||
XGetVisualInfo(server.display, VisualScreenMask | VisualDepthMask | VisualClassMask, &templ, &nvi);
|
||||
xvi = XGetVisualInfo(server.dsp, VisualScreenMask|VisualDepthMask|VisualClassMask, &templ, &nvi);
|
||||
|
||||
Visual *visual = NULL;
|
||||
Visual *visual = 0;
|
||||
if (xvi) {
|
||||
int i;
|
||||
XRenderPictFormat *format;
|
||||
for (int i = 0; i < nvi; i++) {
|
||||
format = XRenderFindVisualFormat(server.display, xvi[i].visual);
|
||||
for (i = 0; i < nvi; i++) {
|
||||
format = XRenderFindVisualFormat(server.dsp, xvi[i].visual);
|
||||
if (format->type == PictTypeDirect && format->direct.alphaMask) {
|
||||
visual = xvi[i].visual;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
XFree(xvi);
|
||||
XFree (xvi);
|
||||
|
||||
// check composite manager
|
||||
server.composite_manager = XGetSelectionOwner(server.display, server.atom._NET_WM_CM_S0);
|
||||
server.composite_manager = XGetSelectionOwner(server.dsp, server.atom._NET_WM_CM_S0);
|
||||
if (server.colormap)
|
||||
XFreeColormap(server.display, server.colormap);
|
||||
XFreeColormap(server.dsp, server.colormap);
|
||||
if (server.colormap32)
|
||||
XFreeColormap(server.display, server.colormap32);
|
||||
XFreeColormap(server.dsp, server.colormap32);
|
||||
|
||||
if (visual) {
|
||||
server.visual32 = visual;
|
||||
server.colormap32 = XCreateColormap(server.display, server.root_win, visual, AllocNone);
|
||||
server.colormap32 = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
|
||||
}
|
||||
|
||||
if (!server.disable_transparency && visual && server.composite_manager != None && !snapshot_path) {
|
||||
if (visual && server.composite_manager != None && snapshot_path == 0) {
|
||||
XSetWindowAttributes attrs;
|
||||
attrs.event_mask = StructureNotifyMask;
|
||||
XChangeWindowAttributes(server.display, server.composite_manager, CWEventMask, &attrs);
|
||||
XChangeWindowAttributes (server.dsp, server.composite_manager, CWEventMask, &attrs);
|
||||
|
||||
server.real_transparency = TRUE;
|
||||
server.real_transparency = 1;
|
||||
server.depth = 32;
|
||||
printf("real transparency on... depth: %d\n", server.depth);
|
||||
server.colormap = XCreateColormap(server.display, server.root_win, visual, AllocNone);
|
||||
server.colormap = XCreateColormap(server.dsp, server.root_win, visual, AllocNone);
|
||||
server.visual = visual;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
// no composite manager or snapshot mode => fake transparency
|
||||
server.real_transparency = FALSE;
|
||||
server.depth = DefaultDepth(server.display, server.screen);
|
||||
server.real_transparency = 0;
|
||||
server.depth = DefaultDepth(server.dsp, server.screen);
|
||||
printf("real transparency off.... depth: %d\n", server.depth);
|
||||
server.colormap = DefaultColormap(server.display, server.screen);
|
||||
server.visual = DefaultVisual(server.display, server.screen);
|
||||
server.colormap = DefaultColormap(server.dsp, server.screen);
|
||||
server.visual = DefaultVisual(server.dsp, server.screen);
|
||||
}
|
||||
}
|
||||
|
||||
70
src/server.h
70
src/server.h
@@ -15,12 +15,12 @@
|
||||
|
||||
#ifdef HAVE_SN
|
||||
#include <libsn/sn.h>
|
||||
#endif
|
||||
#include <glib.h>
|
||||
#endif
|
||||
|
||||
extern gboolean primary_monitor_first;
|
||||
|
||||
typedef struct Global_atom {
|
||||
typedef struct Global_atom
|
||||
{
|
||||
Atom _XROOTPMAP_ID;
|
||||
Atom _XROOTMAP_ID;
|
||||
Atom _NET_CURRENT_DESKTOP;
|
||||
@@ -28,7 +28,6 @@ typedef struct Global_atom {
|
||||
Atom _NET_DESKTOP_NAMES;
|
||||
Atom _NET_DESKTOP_GEOMETRY;
|
||||
Atom _NET_DESKTOP_VIEWPORT;
|
||||
Atom _NET_WORKAREA;
|
||||
Atom _NET_ACTIVE_WINDOW;
|
||||
Atom _NET_WM_WINDOW_TYPE;
|
||||
Atom _NET_WM_STATE_SKIP_PAGER;
|
||||
@@ -58,7 +57,6 @@ typedef struct Global_atom {
|
||||
Atom _NET_WM_STRUT;
|
||||
Atom _NET_WM_ICON;
|
||||
Atom _NET_WM_ICON_GEOMETRY;
|
||||
Atom _NET_WM_ICON_NAME;
|
||||
Atom _NET_CLOSE_WINDOW;
|
||||
Atom UTF8_STRING;
|
||||
Atom _NET_SUPPORTING_WM_CHECK;
|
||||
@@ -73,11 +71,8 @@ typedef struct Global_atom {
|
||||
Atom MANAGER;
|
||||
Atom _NET_SYSTEM_TRAY_MESSAGE_DATA;
|
||||
Atom _NET_SYSTEM_TRAY_ORIENTATION;
|
||||
Atom _NET_SYSTEM_TRAY_ICON_SIZE;
|
||||
Atom _NET_SYSTEM_TRAY_PADDING;
|
||||
Atom _XEMBED;
|
||||
Atom _XEMBED_INFO;
|
||||
Atom _NET_WM_PID;
|
||||
Atom _XSETTINGS_SCREEN;
|
||||
Atom _XSETTINGS_SETTINGS;
|
||||
Atom XdndAware;
|
||||
@@ -93,40 +88,33 @@ typedef struct Global_atom {
|
||||
Atom TARGETS;
|
||||
} Global_atom;
|
||||
|
||||
typedef struct Monitor {
|
||||
|
||||
|
||||
typedef struct Monitor
|
||||
{
|
||||
int x;
|
||||
int y;
|
||||
int width;
|
||||
int height;
|
||||
gboolean primary;
|
||||
gchar **names;
|
||||
char** names;
|
||||
} Monitor;
|
||||
|
||||
typedef struct Viewport {
|
||||
int x;
|
||||
int y;
|
||||
int width;
|
||||
int height;
|
||||
} Viewport;
|
||||
|
||||
typedef struct Server {
|
||||
Display *display;
|
||||
typedef struct
|
||||
{
|
||||
Display *dsp;
|
||||
Window root_win;
|
||||
Window composite_manager;
|
||||
gboolean real_transparency;
|
||||
gboolean disable_transparency;
|
||||
int real_transparency;
|
||||
// current desktop
|
||||
int desktop;
|
||||
int screen;
|
||||
int depth;
|
||||
int num_desktops;
|
||||
int nb_desktop;
|
||||
// number of monitor (without monitor included into another one)
|
||||
int num_monitors;
|
||||
// Non-null only if WM uses viewports (compiz) and number of viewports > 1.
|
||||
// In that case there are num_desktops viewports.
|
||||
Viewport *viewports;
|
||||
Monitor *monitors;
|
||||
gboolean got_root_win;
|
||||
int nb_monitor;
|
||||
Monitor *monitor;
|
||||
int got_root_win;
|
||||
Visual *visual;
|
||||
Visual *visual32;
|
||||
// root background
|
||||
@@ -136,22 +124,24 @@ typedef struct Server {
|
||||
Colormap colormap32;
|
||||
Global_atom atom;
|
||||
#ifdef HAVE_SN
|
||||
SnDisplay *sn_display;
|
||||
SnDisplay *sn_dsp;
|
||||
GTree *pids;
|
||||
#endif // HAVE_SN
|
||||
} Server;
|
||||
} Server_global;
|
||||
|
||||
|
||||
Server_global server;
|
||||
|
||||
extern Server server;
|
||||
|
||||
// freed memory
|
||||
void cleanup_server();
|
||||
|
||||
void send_event32(Window win, Atom at, long data1, long data2, long data3);
|
||||
int get_property32(Window win, Atom at, Atom type);
|
||||
void *server_get_property(Window win, Atom at, Atom type, int *num_results);
|
||||
Atom server_get_atom(char *atom_name);
|
||||
void server_catch_error(Display *d, XErrorEvent *ev);
|
||||
void server_init_atoms();
|
||||
void send_event32 (Window win, Atom at, long data1, long data2, long data3);
|
||||
int get_property32 (Window win, Atom at, Atom type);
|
||||
void *server_get_property (Window win, Atom at, Atom type, int *num_results);
|
||||
Atom server_get_atom (char *atom_name);
|
||||
void server_catch_error (Display *d, XErrorEvent *ev);
|
||||
void server_init_atoms ();
|
||||
void server_init_visual();
|
||||
|
||||
// detect root background
|
||||
@@ -159,11 +149,7 @@ void get_root_pixmap();
|
||||
|
||||
// detect monitors and desktops
|
||||
void get_monitors();
|
||||
void print_monitors();
|
||||
void get_desktops();
|
||||
void server_get_number_of_desktops();
|
||||
GSList *get_desktop_names();
|
||||
int get_current_desktop();
|
||||
void change_desktop(int desktop);
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,65 +16,42 @@
|
||||
#include <X11/extensions/Xdamage.h>
|
||||
|
||||
// XEMBED messages
|
||||
#define XEMBED_EMBEDDED_NOTIFY 0
|
||||
#define XEMBED_EMBEDDED_NOTIFY 0
|
||||
// Flags for _XEMBED_INFO
|
||||
#define XEMBED_MAPPED (1 << 0)
|
||||
#define XEMBED_MAPPED (1 << 0)
|
||||
|
||||
typedef enum SystraySortMethod {
|
||||
SYSTRAY_SORT_ASCENDING = 0,
|
||||
SYSTRAY_SORT_DESCENDING,
|
||||
SYSTRAY_SORT_LEFT2RIGHT,
|
||||
SYSTRAY_SORT_RIGHT2LEFT,
|
||||
} SystraySortMethod;
|
||||
|
||||
typedef struct {
|
||||
// always start with area
|
||||
Area area;
|
||||
|
||||
GSList *list_icons;
|
||||
SystraySortMethod sort;
|
||||
int sort;
|
||||
int alpha, saturation, brightness;
|
||||
int icon_size, icons_per_column, icons_per_row, margin;
|
||||
} Systray;
|
||||
int icon_size, icons_per_column, icons_per_row, marging;
|
||||
} Systraybar;
|
||||
|
||||
typedef struct {
|
||||
// The actual tray icon window (created by the application)
|
||||
Window win;
|
||||
// The parent window created by tint2 to embed the icon
|
||||
Window parent;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Window id;
|
||||
Window tray_id;
|
||||
int x, y;
|
||||
int width, height;
|
||||
// TODO: manage icon's show/hide
|
||||
int hide;
|
||||
int depth;
|
||||
gboolean reparented;
|
||||
gboolean embedded;
|
||||
// Process PID or zero.
|
||||
int pid;
|
||||
// A number that is incremented for each new icon, used to sort them by the order in which they were created.
|
||||
int chrono;
|
||||
// Name of the tray icon window.
|
||||
char *name;
|
||||
// Members used for rendering
|
||||
struct timespec time_last_render;
|
||||
int num_fast_renders;
|
||||
timeout *render_timeout;
|
||||
// Members used for resizing
|
||||
int bad_size_counter;
|
||||
struct timespec time_last_resize;
|
||||
timeout *resize_timeout;
|
||||
// Icon contents if we are compositing the icon, otherwise null
|
||||
Imlib_Image image;
|
||||
// XDamage
|
||||
Damage damage;
|
||||
timeout* render_timeout;
|
||||
} TrayWindow;
|
||||
|
||||
|
||||
// net_sel_win != None when protocol started
|
||||
extern Window net_sel_win;
|
||||
extern Systray systray;
|
||||
extern gboolean refresh_systray;
|
||||
extern gboolean systray_enabled;
|
||||
extern Systraybar systray;
|
||||
extern int refresh_systray;
|
||||
extern int systray_enabled;
|
||||
extern int systray_max_icon_size;
|
||||
extern int systray_monitor;
|
||||
extern gboolean systray_profile;
|
||||
|
||||
// default global data
|
||||
void default_systray();
|
||||
@@ -87,9 +64,9 @@ void init_systray();
|
||||
void init_systray_panel(void *p);
|
||||
|
||||
void draw_systray(void *obj, cairo_t *c);
|
||||
gboolean resize_systray(void *obj);
|
||||
int resize_systray(void *obj);
|
||||
void on_change_systray(void *obj);
|
||||
gboolean systray_on_monitor(int i_monitor, int num_panels);
|
||||
|
||||
|
||||
// systray protocol
|
||||
// many tray icon doesn't manage stop/restart of the systray manager
|
||||
@@ -98,20 +75,11 @@ void stop_net();
|
||||
void net_message(XClientMessageEvent *e);
|
||||
|
||||
gboolean add_icon(Window id);
|
||||
gboolean reparent_icon(TrayWindow *traywin);
|
||||
gboolean embed_icon(TrayWindow *traywin);
|
||||
void remove_icon(TrayWindow *traywin);
|
||||
|
||||
void refresh_systray_icons();
|
||||
void systray_render_icon(void *t);
|
||||
gboolean request_embed_icon(TrayWindow *traywin);
|
||||
void systray_resize_request_event(TrayWindow *traywin, XEvent *e);
|
||||
gboolean request_embed_icon(TrayWindow *traywin);
|
||||
void systray_reconfigure_event(TrayWindow *traywin, XEvent *e);
|
||||
void systray_property_notify(TrayWindow *traywin, XEvent *e);
|
||||
void systray_destroy_event(TrayWindow *traywin);
|
||||
void refresh_systray_icon();
|
||||
void systray_render_icon(TrayWindow* traywin);
|
||||
void kde_update_icons();
|
||||
|
||||
TrayWindow *systray_find_icon(Window win);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,20 +13,20 @@
|
||||
#include "common.h"
|
||||
#include "timer.h"
|
||||
|
||||
typedef enum TaskState {
|
||||
TASK_NORMAL = 0,
|
||||
TASK_ACTIVE,
|
||||
TASK_ICONIFIED,
|
||||
TASK_URGENT,
|
||||
TASK_UNDEFINED,
|
||||
TASK_STATE_COUNT,
|
||||
} TaskState;
|
||||
|
||||
typedef struct GlobalTask {
|
||||
enum { TASK_NORMAL, TASK_ACTIVE, TASK_ICONIFIED, TASK_URGENT, TASK_STATE_COUNT };
|
||||
extern timeout* urgent_timeout;
|
||||
extern GSList* urgent_list;
|
||||
|
||||
// --------------------------------------------------
|
||||
// global task parameter
|
||||
typedef struct {
|
||||
Area area;
|
||||
gboolean has_text;
|
||||
gboolean has_icon;
|
||||
gboolean centered;
|
||||
|
||||
int text;
|
||||
int icon;
|
||||
int centered;
|
||||
|
||||
int icon_posy;
|
||||
int icon_size1;
|
||||
int maximum_width;
|
||||
@@ -35,63 +35,55 @@ typedef struct GlobalTask {
|
||||
int saturation[TASK_STATE_COUNT];
|
||||
int brightness[TASK_STATE_COUNT];
|
||||
int config_asb_mask;
|
||||
Background *background[TASK_STATE_COUNT];
|
||||
Background* background[TASK_STATE_COUNT];
|
||||
int config_background_mask;
|
||||
// starting position for text ~ task_padding + task_border + icon_size
|
||||
double text_posx, text_height;
|
||||
gboolean has_font;
|
||||
|
||||
int font_shadow;
|
||||
PangoFontDescription *font_desc;
|
||||
Color font[TASK_STATE_COUNT];
|
||||
int config_font_mask;
|
||||
gboolean tooltip_enabled;
|
||||
} GlobalTask;
|
||||
int tooltip_enabled;
|
||||
} Global_task;
|
||||
|
||||
// Stores information about a task.
|
||||
// Warning: any dynamically allocated members are shared between the Task instances created for the same window
|
||||
// (if the task appears on all desktops, there will be a different instance on each desktop's taskbar).
|
||||
typedef struct Task {
|
||||
|
||||
|
||||
typedef struct {
|
||||
// always start with area
|
||||
Area area;
|
||||
|
||||
// TODO: group task with list of windows here
|
||||
Window win;
|
||||
int desktop;
|
||||
TaskState current_state;
|
||||
int desktop;
|
||||
int current_state;
|
||||
Imlib_Image icon[TASK_STATE_COUNT];
|
||||
Imlib_Image icon_hover[TASK_STATE_COUNT];
|
||||
Imlib_Image icon_press[TASK_STATE_COUNT];
|
||||
Pixmap state_pix[TASK_STATE_COUNT];
|
||||
unsigned int icon_width;
|
||||
unsigned int icon_height;
|
||||
char *title;
|
||||
int urgent_tick;
|
||||
// These may not be up-to-date
|
||||
int win_x;
|
||||
int win_y;
|
||||
int win_w;
|
||||
int win_h;
|
||||
struct timespec last_activation_time;
|
||||
} Task;
|
||||
|
||||
extern timeout *urgent_timeout;
|
||||
extern GSList *urgent_list;
|
||||
|
||||
Task *add_task(Window win);
|
||||
void remove_task(Task *task);
|
||||
Task *add_task (Window win);
|
||||
void remove_task (Task *tsk);
|
||||
|
||||
void draw_task(void *obj, cairo_t *c);
|
||||
void on_change_task(void *obj);
|
||||
void draw_task (void *obj, cairo_t *c);
|
||||
void on_change_task (void *obj);
|
||||
|
||||
void task_update_icon(Task *task);
|
||||
gboolean task_update_title(Task *task);
|
||||
void reset_active_task();
|
||||
void set_task_state(Task *task, TaskState state);
|
||||
void get_icon (Task *tsk);
|
||||
int get_title(Task *tsk);
|
||||
void active_task();
|
||||
void set_task_state(Task* tsk, int state);
|
||||
void set_task_redraw(Task* tsk);
|
||||
|
||||
// Given a pointer to the task that is currently under the mouse (current_task),
|
||||
// returns a pointer to the Task for the active window on the same taskbar.
|
||||
// If not found, returns the current task.
|
||||
Task *find_active_task(Task *current_task);
|
||||
Task *find_active_task(Task *current_task, Task *active_task);
|
||||
Task *next_task (Task *tsk);
|
||||
Task *prev_task (Task *tsk);
|
||||
|
||||
Task *next_task(Task *task);
|
||||
Task *prev_task(Task *task);
|
||||
|
||||
void add_urgent(Task *task);
|
||||
void del_urgent(Task *task);
|
||||
void add_urgent(Task *tsk);
|
||||
void del_urgent(Task *tsk);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -31,147 +31,115 @@
|
||||
#include "server.h"
|
||||
#include "window.h"
|
||||
#include "panel.h"
|
||||
#include "strnatcmp.h"
|
||||
|
||||
GHashTable *win_to_task;
|
||||
|
||||
Task *active_task;
|
||||
/* win_to_task_table holds for every Window an array of tasks. Usually the array contains only one
|
||||
element. However for omnipresent windows (windows which are visible in every taskbar) the array
|
||||
contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop)
|
||||
*/
|
||||
GHashTable* win_to_task_table;
|
||||
|
||||
Task *task_active;
|
||||
Task *task_drag;
|
||||
gboolean taskbar_enabled;
|
||||
gboolean taskbar_distribute_size;
|
||||
gboolean hide_inactive_tasks;
|
||||
gboolean hide_task_diff_monitor;
|
||||
gboolean always_show_all_desktop_tasks;
|
||||
TaskbarSortMethod taskbar_sort_method;
|
||||
Alignment taskbar_alignment;
|
||||
int taskbar_enabled;
|
||||
|
||||
void taskbar_init_fonts();
|
||||
guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
|
||||
gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
|
||||
void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
|
||||
|
||||
// Removes the task with &win = key. The other args are ignored.
|
||||
void taskbar_remove_task(Window *win);
|
||||
|
||||
guint win_hash(gconstpointer key)
|
||||
{
|
||||
return *((const Window *)key);
|
||||
}
|
||||
|
||||
gboolean win_compare(gconstpointer a, gconstpointer b)
|
||||
{
|
||||
return (*((const Window *)a) == *((const Window *)b));
|
||||
}
|
||||
|
||||
void free_ptr_array(gpointer data)
|
||||
{
|
||||
g_ptr_array_free(data, 1);
|
||||
}
|
||||
|
||||
void default_taskbar()
|
||||
{
|
||||
win_to_task = NULL;
|
||||
urgent_timeout = NULL;
|
||||
urgent_list = NULL;
|
||||
taskbar_enabled = FALSE;
|
||||
taskbar_distribute_size = FALSE;
|
||||
hide_inactive_tasks = FALSE;
|
||||
hide_task_diff_monitor = FALSE;
|
||||
always_show_all_desktop_tasks = FALSE;
|
||||
taskbar_sort_method = TASKBAR_NOSORT;
|
||||
taskbar_alignment = ALIGN_LEFT;
|
||||
win_to_task_table = 0;
|
||||
urgent_timeout = 0;
|
||||
urgent_list = 0;
|
||||
taskbar_enabled = 0;
|
||||
default_taskbarname();
|
||||
}
|
||||
|
||||
void cleanup_taskbar()
|
||||
{
|
||||
cleanup_taskbarname();
|
||||
if (win_to_task) {
|
||||
while (g_hash_table_size(win_to_task)) {
|
||||
GHashTableIter iter;
|
||||
gpointer key, value;
|
||||
Panel *panel;
|
||||
Taskbar *tskbar;
|
||||
int i, j, k;
|
||||
|
||||
g_hash_table_iter_init(&iter, win_to_task);
|
||||
if (g_hash_table_iter_next(&iter, &key, &value)) {
|
||||
taskbar_remove_task(key);
|
||||
cleanup_taskbarname();
|
||||
if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
|
||||
for (i=0 ; i < nb_panel ; i++) {
|
||||
panel = &panel1[i];
|
||||
for (j=0 ; j < panel->nb_desktop ; j++) {
|
||||
tskbar = &panel->taskbar[j];
|
||||
for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
|
||||
if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
|
||||
}
|
||||
}
|
||||
g_hash_table_destroy(win_to_task);
|
||||
win_to_task = NULL;
|
||||
}
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
Panel *panel = &panels[i];
|
||||
for (int j = 0; j < panel->num_desktops; j++) {
|
||||
Taskbar *taskbar = &panel->taskbar[j];
|
||||
free_area(&taskbar->area);
|
||||
free_area (&tskbar->area);
|
||||
// remove taskbar from the panel
|
||||
remove_area((Area *)taskbar);
|
||||
panel->area.list = g_slist_remove(panel->area.list, tskbar);
|
||||
}
|
||||
if (panel->taskbar) {
|
||||
free(panel->taskbar);
|
||||
panel->taskbar = NULL;
|
||||
panel->taskbar = 0;
|
||||
}
|
||||
}
|
||||
|
||||
g_slist_free(urgent_list);
|
||||
urgent_list = NULL;
|
||||
|
||||
stop_timeout(urgent_timeout);
|
||||
if (win_to_task_table) {
|
||||
g_hash_table_destroy(win_to_task_table);
|
||||
win_to_task_table = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_taskbar()
|
||||
{
|
||||
if (!panel_config.g_task.has_text && !panel_config.g_task.has_icon) {
|
||||
panel_config.g_task.has_text = panel_config.g_task.has_icon = 1;
|
||||
}
|
||||
if (win_to_task_table == 0)
|
||||
win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
|
||||
|
||||
if (!win_to_task)
|
||||
win_to_task = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
|
||||
|
||||
active_task = 0;
|
||||
task_active = 0;
|
||||
task_drag = 0;
|
||||
}
|
||||
|
||||
|
||||
void init_taskbar_panel(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
Panel *panel =(Panel*)p;
|
||||
int j;
|
||||
|
||||
if (!panel->g_taskbar.background[TASKBAR_NORMAL]) {
|
||||
if (panel->g_taskbar.background[TASKBAR_NORMAL] == 0) {
|
||||
panel->g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
|
||||
panel->g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
|
||||
}
|
||||
if (!panel->g_taskbar.background_name[TASKBAR_NORMAL]) {
|
||||
if (panel->g_taskbar.background_name[TASKBAR_NORMAL] == 0) {
|
||||
panel->g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
|
||||
panel->g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
|
||||
}
|
||||
if (!panel->g_task.area.bg)
|
||||
if (panel->g_task.area.bg == 0)
|
||||
panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
|
||||
taskbar_init_fonts();
|
||||
|
||||
// taskbar name
|
||||
panel->g_taskbar.area_name.panel = panel;
|
||||
snprintf(panel->g_taskbar.area_name.name, sizeof(panel->g_taskbar.area_name.name), "Taskbarname");
|
||||
panel->g_taskbar.area_name.size_mode = LAYOUT_FIXED;
|
||||
panel->g_taskbar.area_name.size_mode = SIZE_BY_CONTENT;
|
||||
panel->g_taskbar.area_name._resize = resize_taskbarname;
|
||||
panel->g_taskbar.area_name._is_under_mouse = full_width_area_is_under_mouse;
|
||||
panel->g_taskbar.area_name._draw_foreground = draw_taskbarname;
|
||||
panel->g_taskbar.area_name._on_change_layout = 0;
|
||||
panel->g_taskbar.area_name.resize_needed = 1;
|
||||
panel->g_taskbar.area_name.on_screen = TRUE;
|
||||
panel->g_taskbar.area_name.resize = 1;
|
||||
panel->g_taskbar.area_name.on_screen = 1;
|
||||
|
||||
// taskbar
|
||||
panel->g_taskbar.area.parent = panel;
|
||||
panel->g_taskbar.area.panel = panel;
|
||||
snprintf(panel->g_taskbar.area.name, sizeof(panel->g_taskbar.area.name), "Taskbar");
|
||||
panel->g_taskbar.area.size_mode = LAYOUT_DYNAMIC;
|
||||
panel->g_taskbar.area.alignment = taskbar_alignment;
|
||||
panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
|
||||
panel->g_taskbar.area._resize = resize_taskbar;
|
||||
panel->g_taskbar.area._is_under_mouse = full_width_area_is_under_mouse;
|
||||
panel->g_taskbar.area.resize_needed = 1;
|
||||
panel->g_taskbar.area.on_screen = TRUE;
|
||||
panel->g_taskbar.area._draw_foreground = draw_taskbar;
|
||||
panel->g_taskbar.area._on_change_layout = on_change_taskbar;
|
||||
panel->g_taskbar.area.resize = 1;
|
||||
panel->g_taskbar.area.on_screen = 1;
|
||||
if (panel_horizontal) {
|
||||
panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
|
||||
panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
|
||||
panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
|
||||
panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
|
||||
panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
|
||||
panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
|
||||
@@ -180,427 +148,244 @@ void init_taskbar_panel(void *p)
|
||||
|
||||
// task
|
||||
panel->g_task.area.panel = panel;
|
||||
snprintf(panel->g_task.area.name, sizeof(panel->g_task.area.name), "Task");
|
||||
panel->g_task.area.size_mode = LAYOUT_DYNAMIC;
|
||||
panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
|
||||
panel->g_task.area._draw_foreground = draw_task;
|
||||
panel->g_task.area._on_change_layout = on_change_task;
|
||||
panel->g_task.area.resize_needed = 1;
|
||||
panel->g_task.area.on_screen = TRUE;
|
||||
if ((panel->g_task.config_asb_mask & (1 << TASK_NORMAL)) == 0) {
|
||||
panel->g_task.area.resize = 1;
|
||||
panel->g_task.area.on_screen = 1;
|
||||
if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
|
||||
panel->g_task.alpha[TASK_NORMAL] = 100;
|
||||
panel->g_task.saturation[TASK_NORMAL] = 0;
|
||||
panel->g_task.brightness[TASK_NORMAL] = 0;
|
||||
}
|
||||
if ((panel->g_task.config_asb_mask & (1 << TASK_ACTIVE)) == 0) {
|
||||
if ((panel->g_task.config_asb_mask & (1<<TASK_ACTIVE)) == 0) {
|
||||
panel->g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL];
|
||||
panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL];
|
||||
panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL];
|
||||
}
|
||||
if ((panel->g_task.config_asb_mask & (1 << TASK_ICONIFIED)) == 0) {
|
||||
if ((panel->g_task.config_asb_mask & (1<<TASK_ICONIFIED)) == 0) {
|
||||
panel->g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL];
|
||||
panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL];
|
||||
panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL];
|
||||
}
|
||||
if ((panel->g_task.config_asb_mask & (1 << TASK_URGENT)) == 0) {
|
||||
if ((panel->g_task.config_asb_mask & (1<<TASK_URGENT)) == 0) {
|
||||
panel->g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE];
|
||||
panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE];
|
||||
panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE];
|
||||
}
|
||||
if ((panel->g_task.config_font_mask & (1 << TASK_NORMAL)) == 0)
|
||||
panel->g_task.font[TASK_NORMAL] = (Color){{1, 1, 1}, 1};
|
||||
if ((panel->g_task.config_font_mask & (1 << TASK_ACTIVE)) == 0)
|
||||
panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
|
||||
if ((panel->g_task.config_font_mask & (1 << TASK_ICONIFIED)) == 0)
|
||||
panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
|
||||
if ((panel->g_task.config_font_mask & (1 << TASK_URGENT)) == 0)
|
||||
panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
|
||||
if ((panel->g_task.config_background_mask & (1 << TASK_NORMAL)) == 0)
|
||||
panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
|
||||
if ((panel->g_task.config_background_mask & (1 << TASK_ACTIVE)) == 0)
|
||||
panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
|
||||
if ((panel->g_task.config_background_mask & (1 << TASK_ICONIFIED)) == 0)
|
||||
panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
|
||||
if ((panel->g_task.config_background_mask & (1 << TASK_URGENT)) == 0)
|
||||
panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
|
||||
|
||||
if (!panel->g_task.maximum_width)
|
||||
panel->g_task.maximum_width = server.monitors[panel->monitor].width;
|
||||
if (!panel->g_task.maximum_height)
|
||||
panel->g_task.maximum_height = server.monitors[panel->monitor].height;
|
||||
if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.font[TASK_NORMAL] = (Color){{0, 0, 0}, 0};
|
||||
if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
|
||||
if ((panel->g_task.config_font_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
|
||||
if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
|
||||
if ((panel->g_task.config_background_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
|
||||
if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
|
||||
if ((panel->g_task.config_background_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
|
||||
if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
|
||||
|
||||
if (panel_horizontal) {
|
||||
panel->g_task.area.posy = panel->g_taskbar.area.posy +
|
||||
panel->g_taskbar.background[TASKBAR_NORMAL]->border.width +
|
||||
panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.width = panel->g_task.maximum_width;
|
||||
panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
|
||||
} else {
|
||||
panel->g_task.area.posx = panel->g_taskbar.area.posx +
|
||||
panel->g_taskbar.background[TASKBAR_NORMAL]->border.width +
|
||||
panel->g_taskbar.area.paddingy;
|
||||
}
|
||||
else {
|
||||
panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
|
||||
panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
|
||||
panel->g_task.area.height = panel->g_task.maximum_height;
|
||||
}
|
||||
|
||||
for (int j = 0; j < TASK_STATE_COUNT; ++j) {
|
||||
if (!panel->g_task.background[j])
|
||||
for (j=0; j<TASK_STATE_COUNT; ++j) {
|
||||
if (panel->g_task.background[j] == 0)
|
||||
panel->g_task.background[j] = &g_array_index(backgrounds, Background, 0);
|
||||
if (panel->g_task.background[j]->border.radius > panel->g_task.area.height / 2) {
|
||||
printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n",
|
||||
j == 0 ? "_" : j == 1 ? "_active_" : j == 2 ? "_iconified_" : "_urgent_");
|
||||
if (panel->g_task.background[j]->border.rounded > panel->g_task.area.height/2) {
|
||||
printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n", j==0 ? "_" : j==1 ? "_active_" : j==2 ? "_iconified_" : "_urgent_");
|
||||
g_array_append_val(backgrounds, *panel->g_task.background[j]);
|
||||
panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len - 1);
|
||||
panel->g_task.background[j]->border.radius = panel->g_task.area.height / 2;
|
||||
panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len-1);
|
||||
panel->g_task.background[j]->border.rounded = panel->g_task.area.height/2;
|
||||
}
|
||||
}
|
||||
|
||||
// compute vertical position : text and icon
|
||||
int height_ink, height, width;
|
||||
get_text_size2(panel->g_task.font_desc,
|
||||
&height_ink,
|
||||
&height,
|
||||
&width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
"TAjpg",
|
||||
5,
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_END,
|
||||
FALSE);
|
||||
int height_ink, height;
|
||||
get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
|
||||
|
||||
if (!panel->g_task.maximum_width && panel_horizontal)
|
||||
panel->g_task.maximum_width = server.monitor[panel->monitor].width;
|
||||
|
||||
panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
|
||||
panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
|
||||
if (panel->g_task.has_icon) {
|
||||
panel->g_task.icon_size1 =
|
||||
MIN(MIN(panel->g_task.maximum_width, panel->g_task.maximum_height),
|
||||
MIN(panel->g_task.area.width, panel->g_task.area.height)) -
|
||||
(2 * panel->g_task.area.paddingy) - 2 * panel->g_task.area.bg->border.width;
|
||||
panel->g_task.text_posx += panel->g_task.icon_size1 + panel->g_task.area.paddingx;
|
||||
if (panel->g_task.icon) {
|
||||
panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
|
||||
panel->g_task.text_posx += panel->g_task.icon_size1;
|
||||
panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
|
||||
if (0)
|
||||
printf("task: icon_size = %d, textx = %f, texth = %f, icony = %d, w = %d, h = %d, maxw = %d, maxh = %d\n",
|
||||
panel->g_task.icon_size1,
|
||||
panel->g_task.text_posx,
|
||||
panel->g_task.text_height,
|
||||
panel->g_task.icon_posy,
|
||||
panel->g_task.area.width,
|
||||
panel->g_task.area.height,
|
||||
panel->g_task.maximum_width,
|
||||
panel->g_task.maximum_height);
|
||||
}
|
||||
//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
|
||||
|
||||
Taskbar *taskbar;
|
||||
panel->num_desktops = server.num_desktops;
|
||||
panel->taskbar = calloc(server.num_desktops, sizeof(Taskbar));
|
||||
for (int j = 0; j < panel->num_desktops; j++) {
|
||||
taskbar = &panel->taskbar[j];
|
||||
memcpy(&taskbar->area, &panel->g_taskbar.area, sizeof(Area));
|
||||
taskbar->desktop = j;
|
||||
Taskbar *tskbar;
|
||||
panel->nb_desktop = server.nb_desktop;
|
||||
panel->taskbar = calloc(server.nb_desktop, sizeof(Taskbar));
|
||||
for (j=0 ; j < panel->nb_desktop ; j++) {
|
||||
tskbar = &panel->taskbar[j];
|
||||
memcpy(&tskbar->area, &panel->g_taskbar.area, sizeof(Area));
|
||||
tskbar->desktop = j;
|
||||
if (j == server.desktop)
|
||||
taskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
|
||||
tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
|
||||
else
|
||||
taskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
|
||||
tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
|
||||
}
|
||||
init_taskbarname_panel(panel);
|
||||
}
|
||||
|
||||
void taskbar_init_fonts()
|
||||
|
||||
void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
|
||||
{
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
if (!panels[i].g_task.font_desc) {
|
||||
panels[i].g_task.font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_size(panels[i].g_task.font_desc,
|
||||
pango_font_description_get_size(panels[i].g_task.font_desc) - PANGO_SCALE);
|
||||
}
|
||||
}
|
||||
remove_task(task_get_task(*(Window*)key));
|
||||
}
|
||||
|
||||
void taskbar_default_font_changed()
|
||||
{
|
||||
if (!taskbar_enabled)
|
||||
return;
|
||||
|
||||
gboolean needs_update = FALSE;
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
if (!panels[i].g_task.has_font) {
|
||||
pango_font_description_free(panels[i].g_task.font_desc);
|
||||
panels[i].g_task.font_desc = NULL;
|
||||
needs_update = TRUE;
|
||||
}
|
||||
}
|
||||
if (!needs_update)
|
||||
return;
|
||||
taskbar_init_fonts();
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
for (int j = 0; j < panels[i].num_desktops; j++) {
|
||||
Taskbar *taskbar = &panels[i].taskbar[j];
|
||||
for (GList *c = taskbar->area.children; c; c = c->next) {
|
||||
Task *t = c->data;
|
||||
t->area.resize_needed = TRUE;
|
||||
schedule_redraw(&t->area);
|
||||
}
|
||||
}
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
Task *task_get_task (Window win)
|
||||
{
|
||||
GPtrArray* task_group = task_get_tasks(win);
|
||||
if (task_group)
|
||||
return g_ptr_array_index(task_group, 0);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
void taskbar_remove_task(Window *win)
|
||||
|
||||
GPtrArray* task_get_tasks(Window win)
|
||||
{
|
||||
remove_task(get_task(*win));
|
||||
if (win_to_task_table && taskbar_enabled)
|
||||
return g_hash_table_lookup(win_to_task_table, &win);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
Task *get_task(Window win)
|
||||
|
||||
void task_refresh_tasklist ()
|
||||
{
|
||||
GPtrArray *task_buttons = get_task_buttons(win);
|
||||
if (task_buttons)
|
||||
return g_ptr_array_index(task_buttons, 0);
|
||||
return NULL;
|
||||
}
|
||||
Window *win;
|
||||
int num_results, i;
|
||||
|
||||
GPtrArray *get_task_buttons(Window win)
|
||||
{
|
||||
if (win_to_task && taskbar_enabled)
|
||||
return g_hash_table_lookup(win_to_task, &win);
|
||||
return NULL;
|
||||
}
|
||||
if (!taskbar_enabled) return;
|
||||
win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
|
||||
if (!win) return;
|
||||
|
||||
void taskbar_refresh_tasklist()
|
||||
{
|
||||
if (!taskbar_enabled)
|
||||
return;
|
||||
// fprintf(stderr, "%s %d:\n", __FUNCTION__, __LINE__);
|
||||
|
||||
int num_results;
|
||||
Window *win = server_get_property(server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
|
||||
if (!win)
|
||||
return;
|
||||
|
||||
GList *win_list = g_hash_table_get_keys(win_to_task);
|
||||
for (GList *it = win_list; it; it = it->next) {
|
||||
int i;
|
||||
GList* win_list = g_hash_table_get_keys(win_to_task_table);
|
||||
GList* it;
|
||||
for (it=win_list; it; it=it->next) {
|
||||
for (i = 0; i < num_results; i++)
|
||||
if (*((Window *)it->data) == win[i])
|
||||
if (*((Window*)it->data) == win[i])
|
||||
break;
|
||||
if (i == num_results)
|
||||
taskbar_remove_task(it->data);
|
||||
taskbar_remove_task(it->data, 0, 0);
|
||||
}
|
||||
g_list_free(win_list);
|
||||
|
||||
// Add any new
|
||||
for (int i = 0; i < num_results; i++)
|
||||
if (!get_task(win[i]))
|
||||
add_task(win[i]);
|
||||
for (i = 0; i < num_results; i++)
|
||||
if (!task_get_task (win[i]))
|
||||
add_task (win[i]);
|
||||
|
||||
XFree(win);
|
||||
XFree (win);
|
||||
}
|
||||
|
||||
gboolean resize_taskbar(void *obj)
|
||||
{
|
||||
Taskbar *taskbar = (Taskbar *)obj;
|
||||
Panel *panel = (Panel *)taskbar->area.panel;
|
||||
|
||||
// printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
|
||||
void draw_taskbar (void *obj, cairo_t *c)
|
||||
{
|
||||
Taskbar *taskbar = obj;
|
||||
int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
|
||||
|
||||
taskbar->state_pix[state] = taskbar->area.pix;
|
||||
}
|
||||
|
||||
|
||||
int resize_taskbar(void *obj)
|
||||
{
|
||||
Taskbar *taskbar = (Taskbar*)obj;
|
||||
Panel *panel = (Panel*)taskbar->area.panel;
|
||||
int text_width;
|
||||
|
||||
//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
|
||||
if (panel_horizontal) {
|
||||
relayout_with_constraint(&taskbar->area, panel->g_task.maximum_width);
|
||||
resize_by_layout(obj, panel->g_task.maximum_width);
|
||||
|
||||
int text_width = panel->g_task.maximum_width;
|
||||
GList *l = taskbar->area.children;
|
||||
if (taskbarname_enabled)
|
||||
l = l->next;
|
||||
for (; l != NULL; l = l->next) {
|
||||
if (((Task *)l->data)->area.on_screen) {
|
||||
text_width = ((Task *)l->data)->area.width;
|
||||
break;
|
||||
}
|
||||
text_width = panel->g_task.maximum_width;
|
||||
GSList *l = taskbar->area.list;
|
||||
if (taskbarname_enabled) l = l->next;
|
||||
if (l != NULL) {
|
||||
text_width = ((Task *)l->data)->area.width;
|
||||
}
|
||||
taskbar->text_width =
|
||||
text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
|
||||
} else {
|
||||
relayout_with_constraint(&taskbar->area, panel->g_task.maximum_height);
|
||||
|
||||
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx -
|
||||
panel->g_task.area.bg->border.width - panel->g_task.area.paddingxlr;
|
||||
taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
else {
|
||||
resize_by_layout(obj, panel->g_task.maximum_height);
|
||||
|
||||
void set_taskbar_state(Taskbar *taskbar, TaskbarState state)
|
||||
{
|
||||
taskbar->area.bg = panels[0].g_taskbar.background[state];
|
||||
if (taskbarname_enabled) {
|
||||
taskbar->bar_name.area.bg = panels[0].g_taskbar.background_name[state];
|
||||
}
|
||||
if (taskbar_mode != MULTI_DESKTOP) {
|
||||
if (state == TASKBAR_NORMAL)
|
||||
taskbar->area.on_screen = FALSE;
|
||||
else
|
||||
taskbar->area.on_screen = TRUE;
|
||||
}
|
||||
if (taskbar->area.on_screen) {
|
||||
schedule_redraw(&taskbar->area);
|
||||
if (taskbarname_enabled) {
|
||||
schedule_redraw(&taskbar->bar_name.area);
|
||||
}
|
||||
if (taskbar_mode == MULTI_DESKTOP &&
|
||||
panels[0].g_taskbar.background[TASKBAR_NORMAL] != panels[0].g_taskbar.background[TASKBAR_ACTIVE]) {
|
||||
GList *l = taskbar->area.children;
|
||||
if (taskbarname_enabled)
|
||||
l = l->next;
|
||||
for (; l; l = l->next)
|
||||
schedule_redraw((Area *)l->data);
|
||||
}
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
|
||||
void update_taskbar_visibility(void *p)
|
||||
{
|
||||
Panel *panel = (Panel *)p;
|
||||
|
||||
for (int j = 0; j < panel->num_desktops; j++) {
|
||||
Taskbar *taskbar = &panel->taskbar[j];
|
||||
if (taskbar_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
|
||||
// SINGLE_DESKTOP and not current desktop
|
||||
taskbar->area.on_screen = FALSE;
|
||||
} else {
|
||||
taskbar->area.on_screen = TRUE;
|
||||
}
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
|
||||
#define NONTRIVIAL 2
|
||||
gint compare_tasks_trivial(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
if (a == b)
|
||||
return 0;
|
||||
if (taskbarname_enabled) {
|
||||
if (a == taskbar->area.children->data)
|
||||
return -1;
|
||||
if (b == taskbar->area.children->data)
|
||||
return 1;
|
||||
}
|
||||
return NONTRIVIAL;
|
||||
}
|
||||
|
||||
gboolean contained_within(Task *a, Task *b)
|
||||
{
|
||||
if ((a->win_x <= b->win_x) && (a->win_y <= b->win_y) && (a->win_x + a->win_w >= b->win_x + b->win_w) &&
|
||||
(a->win_y + a->win_h >= b->win_y + b->win_h)) {
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gint compare_task_centers(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
int trivial = compare_tasks_trivial(a, b, taskbar);
|
||||
if (trivial != NONTRIVIAL)
|
||||
return trivial;
|
||||
|
||||
// If a window has the same coordinates and size as the other,
|
||||
// they are considered to be equal in the comparison.
|
||||
if ((a->win_x == b->win_x) && (a->win_y == b->win_y) && (a->win_w == b->win_w) && (a->win_h == b->win_h)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// If a window is completely contained in another,
|
||||
// then it is considered to come after (to the right/bottom) of the other.
|
||||
if (contained_within(a, b))
|
||||
return -1;
|
||||
if (contained_within(b, a))
|
||||
return 1;
|
||||
|
||||
// Compare centers
|
||||
int a_horiz_c = a->win_x + a->win_w / 2;
|
||||
int b_horiz_c = b->win_x + b->win_w / 2;
|
||||
int a_vert_c = a->win_y + a->win_h / 2;
|
||||
int b_vert_c = b->win_y + b->win_h / 2;
|
||||
if (panel_horizontal) {
|
||||
if (a_horiz_c != b_horiz_c) {
|
||||
return a_horiz_c - b_horiz_c;
|
||||
}
|
||||
return a_vert_c - b_vert_c;
|
||||
} else {
|
||||
if (a_vert_c != b_vert_c) {
|
||||
return a_vert_c - b_vert_c;
|
||||
}
|
||||
return a_horiz_c - b_horiz_c;
|
||||
}
|
||||
}
|
||||
|
||||
gint compare_task_titles(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
int trivial = compare_tasks_trivial(a, b, taskbar);
|
||||
if (trivial != NONTRIVIAL)
|
||||
return trivial;
|
||||
return strnatcasecmp(a->title ? a->title : "", b->title ? b->title : "");
|
||||
}
|
||||
|
||||
gint compare_tasks(Task *a, Task *b, Taskbar *taskbar)
|
||||
{
|
||||
int trivial = compare_tasks_trivial(a, b, taskbar);
|
||||
if (trivial != NONTRIVIAL)
|
||||
return trivial;
|
||||
if (taskbar_sort_method == TASKBAR_NOSORT) {
|
||||
return 0;
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_CENTER) {
|
||||
return compare_task_centers(a, b, taskbar);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_TITLE) {
|
||||
return compare_task_titles(a, b, taskbar);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_LRU) {
|
||||
return compare_timespecs(&a->last_activation_time, &b->last_activation_time);
|
||||
} else if (taskbar_sort_method == TASKBAR_SORT_MRU) {
|
||||
return -compare_timespecs(&a->last_activation_time, &b->last_activation_time);
|
||||
taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
gboolean taskbar_needs_sort(Taskbar *taskbar)
|
||||
{
|
||||
if (taskbar_sort_method == TASKBAR_NOSORT)
|
||||
return FALSE;
|
||||
|
||||
for (GList *i = taskbar->area.children, *j = i ? i->next : NULL; i && j; i = i->next, j = j->next) {
|
||||
if (compare_tasks(i->data, j->data, taskbar) > 0) {
|
||||
return TRUE;
|
||||
void on_change_taskbar (void *obj)
|
||||
{
|
||||
Taskbar *tskbar = obj;
|
||||
int k;
|
||||
|
||||
// reset Pixmap when position/size changed
|
||||
for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
|
||||
if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
|
||||
tskbar->state_pix[k] = 0;
|
||||
}
|
||||
tskbar->area.pix = 0;
|
||||
tskbar->area.redraw = 1;
|
||||
}
|
||||
|
||||
|
||||
void set_taskbar_state(Taskbar *tskbar, int state)
|
||||
{
|
||||
tskbar->area.bg = panel1[0].g_taskbar.background[state];
|
||||
tskbar->area.pix = tskbar->state_pix[state];
|
||||
if (taskbarname_enabled) {
|
||||
tskbar->bar_name.area.bg = panel1[0].g_taskbar.background_name[state];
|
||||
tskbar->bar_name.area.pix = tskbar->bar_name.state_pix[state];
|
||||
}
|
||||
if (panel_mode != MULTI_DESKTOP) {
|
||||
if (state == TASKBAR_NORMAL)
|
||||
tskbar->area.on_screen = 0;
|
||||
else
|
||||
tskbar->area.on_screen = 1;
|
||||
}
|
||||
if (tskbar->area.on_screen == 1) {
|
||||
if (tskbar->state_pix[state] == 0)
|
||||
tskbar->area.redraw = 1;
|
||||
if (taskbarname_enabled && tskbar->bar_name.state_pix[state] == 0)
|
||||
tskbar->bar_name.area.redraw = 1;
|
||||
if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
|
||||
GSList *l = tskbar->area.list;
|
||||
if (taskbarname_enabled) l = l->next;
|
||||
for ( ; l ; l = l->next)
|
||||
set_task_redraw(l->data);
|
||||
}
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
panel_refresh = 1;
|
||||
}
|
||||
|
||||
void sort_tasks(Taskbar *taskbar)
|
||||
|
||||
void visible_taskbar(void *p)
|
||||
{
|
||||
if (!taskbar)
|
||||
return;
|
||||
if (!taskbar_needs_sort(taskbar))
|
||||
return;
|
||||
Panel *panel =(Panel*)p;
|
||||
int j;
|
||||
|
||||
taskbar->area.children = g_list_sort_with_data(taskbar->area.children, (GCompareDataFunc)compare_tasks, taskbar);
|
||||
taskbar->area.resize_needed = TRUE;
|
||||
panel_refresh = TRUE;
|
||||
((Panel *)taskbar->area.panel)->area.resize_needed = TRUE;
|
||||
}
|
||||
|
||||
void sort_taskbar_for_win(Window win)
|
||||
{
|
||||
if (taskbar_sort_method == TASKBAR_NOSORT)
|
||||
return;
|
||||
|
||||
GPtrArray *task_buttons = get_task_buttons(win);
|
||||
if (task_buttons) {
|
||||
Task *task0 = g_ptr_array_index(task_buttons, 0);
|
||||
if (task0) {
|
||||
get_window_coordinates(win, &task0->win_x, &task0->win_y, &task0->win_w, &task0->win_h);
|
||||
Taskbar *taskbar;
|
||||
for (j=0 ; j < panel->nb_desktop ; j++) {
|
||||
taskbar = &panel->taskbar[j];
|
||||
if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
|
||||
// SINGLE_DESKTOP and not current desktop
|
||||
taskbar->area.on_screen = 0;
|
||||
}
|
||||
for (int i = 0; i < task_buttons->len; ++i) {
|
||||
Task *task = g_ptr_array_index(task_buttons, i);
|
||||
task->win_x = task0->win_x;
|
||||
task->win_y = task0->win_y;
|
||||
task->win_w = task0->win_w;
|
||||
task->win_h = task0->win_h;
|
||||
sort_tasks(task->area.parent);
|
||||
else {
|
||||
taskbar->area.on_screen = 1;
|
||||
}
|
||||
}
|
||||
panel_refresh = 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -11,84 +11,67 @@
|
||||
#include "task.h"
|
||||
#include "taskbarname.h"
|
||||
|
||||
typedef enum TaskbarState {
|
||||
TASKBAR_NORMAL = 0,
|
||||
TASKBAR_ACTIVE,
|
||||
TASKBAR_STATE_COUNT,
|
||||
} TaskbarState;
|
||||
enum { TASKBAR_NORMAL, TASKBAR_ACTIVE, TASKBAR_STATE_COUNT };
|
||||
extern GHashTable* win_to_task_table;
|
||||
extern Task *task_active;
|
||||
extern Task *task_drag;
|
||||
extern int taskbar_enabled;
|
||||
|
||||
typedef enum TaskbarSortMethod {
|
||||
TASKBAR_NOSORT = 0,
|
||||
TASKBAR_SORT_CENTER,
|
||||
TASKBAR_SORT_TITLE,
|
||||
TASKBAR_SORT_LRU,
|
||||
TASKBAR_SORT_MRU,
|
||||
} TaskbarSortMethod;
|
||||
|
||||
typedef struct {
|
||||
// always start with area
|
||||
Area area;
|
||||
gchar *name;
|
||||
int posy;
|
||||
} TaskbarName;
|
||||
Pixmap state_pix[TASKBAR_STATE_COUNT];
|
||||
|
||||
char *name;
|
||||
int posy;
|
||||
} Taskbarname;
|
||||
|
||||
// tint2 use one taskbar per desktop.
|
||||
typedef struct {
|
||||
// always start with area
|
||||
Area area;
|
||||
|
||||
int desktop;
|
||||
TaskbarName bar_name;
|
||||
Pixmap state_pix[TASKBAR_STATE_COUNT];
|
||||
|
||||
Taskbarname bar_name;
|
||||
|
||||
// task parameters
|
||||
int text_width;
|
||||
} Taskbar;
|
||||
|
||||
typedef struct GlobalTaskbar {
|
||||
typedef struct {
|
||||
//always start with area
|
||||
Area area;
|
||||
Area area_name;
|
||||
Background *background[TASKBAR_STATE_COUNT];
|
||||
Background *background_name[TASKBAR_STATE_COUNT];
|
||||
} GlobalTaskbar;
|
||||
Background* background[TASKBAR_STATE_COUNT];
|
||||
Background* background_name[TASKBAR_STATE_COUNT];
|
||||
} Global_taskbar;
|
||||
|
||||
extern gboolean taskbar_enabled;
|
||||
extern gboolean taskbar_distribute_size;
|
||||
extern gboolean hide_inactive_tasks;
|
||||
extern gboolean hide_task_diff_monitor;
|
||||
extern gboolean always_show_all_desktop_tasks;
|
||||
extern TaskbarSortMethod taskbar_sort_method;
|
||||
extern Alignment taskbar_alignment;
|
||||
|
||||
// win_to_task holds for every Window an array of tasks. Usually the array contains only one
|
||||
// element. However for omnipresent windows (windows which are visible in every taskbar) the array
|
||||
// contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.num_desktops)
|
||||
extern GHashTable *win_to_task;
|
||||
|
||||
extern Task *active_task;
|
||||
extern Task *task_drag;
|
||||
|
||||
// default global data
|
||||
void default_taskbar();
|
||||
|
||||
// freed memory
|
||||
void cleanup_taskbar();
|
||||
|
||||
void init_taskbar();
|
||||
void init_taskbar_panel(void *p);
|
||||
|
||||
gboolean resize_taskbar(void *obj);
|
||||
void taskbar_default_font_changed();
|
||||
void draw_taskbar (void *obj, cairo_t *c);
|
||||
void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data);
|
||||
Task *task_get_task (Window win);
|
||||
GPtrArray* task_get_tasks(Window win);
|
||||
void task_refresh_tasklist ();
|
||||
|
||||
// Reloads the entire list of tasks from the window manager and recreates the task buttons.
|
||||
void taskbar_refresh_tasklist();
|
||||
int resize_taskbar(void *obj);
|
||||
void on_change_taskbar (void *obj);
|
||||
void set_taskbar_state(Taskbar *tskbar, int state);
|
||||
|
||||
// Returns the task button for this window. If there are multiple buttons, returns the first one.
|
||||
Task *get_task(Window win);
|
||||
// show/hide taskbar according to current desktop
|
||||
void visible_taskbar(void *p);
|
||||
|
||||
// Returns the task buttons for this window, usually having only one element.
|
||||
// However for windows shown on all desktops, there are multiple buttons, one for each taskbar.
|
||||
GPtrArray *get_task_buttons(Window win);
|
||||
|
||||
void set_taskbar_state(Taskbar *taskbar, TaskbarState state);
|
||||
|
||||
// Updates the visibility of each taskbar when the current desktop changes.
|
||||
void update_taskbar_visibility(void *p);
|
||||
|
||||
// Sorts the taskbar(s) on which the window is present.
|
||||
void sort_taskbar_for_win(Window win);
|
||||
|
||||
void sort_tasks(Taskbar *taskbar);
|
||||
|
||||
gboolean taskbar_is_under_mouse(void *obj, int x, int y);
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -32,157 +32,130 @@
|
||||
#include "server.h"
|
||||
#include "taskbarname.h"
|
||||
|
||||
gboolean taskbarname_enabled;
|
||||
int taskbarname_enabled;
|
||||
PangoFontDescription *taskbarname_font_desc;
|
||||
Color taskbarname_font;
|
||||
Color taskbarname_active_font;
|
||||
|
||||
void taskbarname_init_fonts();
|
||||
|
||||
void default_taskbarname()
|
||||
{
|
||||
taskbarname_enabled = FALSE;
|
||||
taskbarname_enabled = 0;
|
||||
taskbarname_font_desc = 0;
|
||||
}
|
||||
|
||||
|
||||
void init_taskbarname_panel(void *p)
|
||||
{
|
||||
if (!taskbarname_enabled)
|
||||
return;
|
||||
Panel *panel =(Panel*)p;
|
||||
Taskbar *tskbar;
|
||||
int j;
|
||||
|
||||
Panel *panel = (Panel *)p;
|
||||
if (!taskbarname_enabled) return;
|
||||
|
||||
taskbarname_init_fonts();
|
||||
|
||||
GSList *list = get_desktop_names();
|
||||
GSList *l = list;
|
||||
for (int j = 0; j < panel->num_desktops; j++) {
|
||||
Taskbar *taskbar = &panel->taskbar[j];
|
||||
memcpy(&taskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
|
||||
taskbar->bar_name.area.parent = taskbar;
|
||||
taskbar->bar_name.area.has_mouse_over_effect = panel_config.mouse_effects;
|
||||
taskbar->bar_name.area.has_mouse_press_effect = panel_config.mouse_effects;
|
||||
GSList *l, *list = server_get_name_of_desktop();
|
||||
for (j=0, l=list ; j < panel->nb_desktop ; j++) {
|
||||
tskbar = &panel->taskbar[j];
|
||||
memcpy(&tskbar->bar_name.area, &panel->g_taskbar.area_name, sizeof(Area));
|
||||
tskbar->bar_name.area.parent = tskbar;
|
||||
if (j == server.desktop)
|
||||
taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
|
||||
tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_ACTIVE];
|
||||
else
|
||||
taskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
|
||||
tskbar->bar_name.area.bg = panel->g_taskbar.background_name[TASKBAR_NORMAL];
|
||||
|
||||
// use desktop number if name is missing
|
||||
if (l) {
|
||||
taskbar->bar_name.name = g_strdup(l->data);
|
||||
tskbar->bar_name.name = g_strdup(l->data);
|
||||
l = l->next;
|
||||
} else {
|
||||
taskbar->bar_name.name = g_strdup_printf("%d", j + 1);
|
||||
}
|
||||
else
|
||||
tskbar->bar_name.name = g_strdup_printf("%d", j+1);
|
||||
|
||||
// append the name at the beginning of taskbar
|
||||
taskbar->area.children = g_list_append(taskbar->area.children, &taskbar->bar_name);
|
||||
tskbar->area.list = g_slist_append(tskbar->area.list, &tskbar->bar_name);
|
||||
}
|
||||
|
||||
for (l = list; l; l = l->next)
|
||||
for (l=list ; l ; l = l->next)
|
||||
g_free(l->data);
|
||||
g_slist_free(list);
|
||||
}
|
||||
|
||||
void taskbarname_init_fonts()
|
||||
{
|
||||
if (!panel_config.taskbarname_font_desc) {
|
||||
panel_config.taskbarname_font_desc = pango_font_description_from_string(get_default_font());
|
||||
pango_font_description_set_weight(panel_config.taskbarname_font_desc, PANGO_WEIGHT_BOLD);
|
||||
}
|
||||
}
|
||||
|
||||
void taskbarname_default_font_changed()
|
||||
{
|
||||
if (!taskbar_enabled)
|
||||
return;
|
||||
if (!taskbarname_enabled)
|
||||
return;
|
||||
if (panel_config.taskbarname_has_font)
|
||||
return;
|
||||
|
||||
pango_font_description_free(panel_config.taskbarname_font_desc);
|
||||
panel_config.taskbarname_font_desc = NULL;
|
||||
taskbarname_init_fonts();
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
for (int j = 0; j < panels[i].num_desktops; j++) {
|
||||
Taskbar *taskbar = &panels[i].taskbar[j];
|
||||
taskbar->bar_name.area.resize_needed = TRUE;
|
||||
schedule_redraw(&taskbar->bar_name.area);
|
||||
}
|
||||
}
|
||||
panel_refresh = TRUE;
|
||||
}
|
||||
|
||||
void cleanup_taskbarname()
|
||||
{
|
||||
for (int i = 0; i < num_panels; i++) {
|
||||
Panel *panel = &panels[i];
|
||||
for (int j = 0; j < panel->num_desktops; j++) {
|
||||
Taskbar *taskbar = &panel->taskbar[j];
|
||||
g_free(taskbar->bar_name.name);
|
||||
taskbar->bar_name.name = NULL;
|
||||
free_area(&taskbar->bar_name.area);
|
||||
remove_area((Area *)&taskbar->bar_name);
|
||||
int i, j, k;
|
||||
Panel *panel;
|
||||
Taskbar *tskbar;
|
||||
|
||||
for (i=0 ; i < nb_panel ; i++) {
|
||||
panel = &panel1[i];
|
||||
for (j=0 ; j < panel->nb_desktop ; j++) {
|
||||
tskbar = &panel->taskbar[j];
|
||||
if (tskbar->bar_name.name) g_free(tskbar->bar_name.name);
|
||||
free_area (&tskbar->bar_name.area);
|
||||
for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
|
||||
if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
|
||||
}
|
||||
tskbar->area.list = g_slist_remove(tskbar->area.list, &tskbar->bar_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gboolean resize_taskbarname(void *obj)
|
||||
|
||||
void draw_taskbarname (void *obj, cairo_t *c)
|
||||
{
|
||||
TaskbarName *taskbar_name = obj;
|
||||
Taskbarname *taskbar_name = obj;
|
||||
Taskbar *taskbar = taskbar_name->area.parent;
|
||||
PangoLayout *layout;
|
||||
Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
|
||||
|
||||
int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
|
||||
taskbar_name->state_pix[state] = taskbar_name->area.pix;
|
||||
|
||||
// draw content
|
||||
layout = pango_cairo_create_layout (c);
|
||||
pango_layout_set_font_description (layout, taskbarname_font_desc);
|
||||
pango_layout_set_width (layout, taskbar_name->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_text (layout, taskbar_name->name, strlen(taskbar_name->name));
|
||||
|
||||
cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
|
||||
|
||||
pango_cairo_update_layout (c, layout);
|
||||
cairo_move_to (c, 0, taskbar_name->posy);
|
||||
pango_cairo_show_layout (c, layout);
|
||||
|
||||
g_object_unref (layout);
|
||||
//printf("draw_taskbarname %s ******************************\n", taskbar_name->name);
|
||||
}
|
||||
|
||||
|
||||
int resize_taskbarname(void *obj)
|
||||
{
|
||||
Taskbarname *taskbar_name = obj;
|
||||
Panel *panel = taskbar_name->area.panel;
|
||||
int name_height, name_width, name_height_ink;
|
||||
gboolean result = FALSE;
|
||||
int ret = 0;
|
||||
|
||||
schedule_redraw(&taskbar_name->area);
|
||||
get_text_size2(panel_config.taskbarname_font_desc,
|
||||
&name_height_ink,
|
||||
&name_height,
|
||||
&name_width,
|
||||
panel->area.height,
|
||||
panel->area.width,
|
||||
taskbar_name->name,
|
||||
strlen(taskbar_name->name),
|
||||
PANGO_WRAP_WORD_CHAR,
|
||||
PANGO_ELLIPSIZE_NONE,
|
||||
FALSE);
|
||||
taskbar_name->area.redraw = 1;
|
||||
get_text_size2(taskbarname_font_desc, &name_height_ink, &name_height, &name_width, panel->area.height, panel->area.width, taskbar_name->name, strlen(taskbar_name->name));
|
||||
|
||||
if (panel_horizontal) {
|
||||
int new_size = name_width + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
|
||||
int new_size = name_width + (2* (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
|
||||
if (new_size != taskbar_name->area.width) {
|
||||
taskbar_name->area.width = new_size;
|
||||
taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
|
||||
result = TRUE;
|
||||
}
|
||||
} else {
|
||||
int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
|
||||
if (new_size != taskbar_name->area.height) {
|
||||
taskbar_name->area.height = new_size;
|
||||
taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
|
||||
result = TRUE;
|
||||
ret = 1;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
else {
|
||||
int new_size = name_height + (2 * (taskbar_name->area.paddingxlr + taskbar_name->area.bg->border.width));
|
||||
if (new_size != taskbar_name->area.height) {
|
||||
taskbar_name->area.height = new_size;
|
||||
taskbar_name->posy = (taskbar_name->area.height - name_height) / 2;
|
||||
ret = 1;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
void draw_taskbarname(void *obj, cairo_t *c)
|
||||
{
|
||||
TaskbarName *taskbar_name = obj;
|
||||
Taskbar *taskbar = taskbar_name->area.parent;
|
||||
Color *config_text = (taskbar->desktop == server.desktop) ? &taskbarname_active_font : &taskbarname_font;
|
||||
|
||||
// draw content
|
||||
PangoLayout *layout = pango_cairo_create_layout(c);
|
||||
pango_layout_set_font_description(layout, panel_config.taskbarname_font_desc);
|
||||
pango_layout_set_width(layout, taskbar_name->area.width * PANGO_SCALE);
|
||||
pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
|
||||
pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
|
||||
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_NONE);
|
||||
pango_layout_set_text(layout, taskbar_name->name, strlen(taskbar_name->name));
|
||||
|
||||
cairo_set_source_rgba(c, config_text->rgb[0], config_text->rgb[1], config_text->rgb[2], config_text->alpha);
|
||||
|
||||
pango_cairo_update_layout(c, layout);
|
||||
draw_text(layout, c, 0, taskbar_name->posy, config_text, ((Panel *)taskbar_name->area.panel)->font_shadow);
|
||||
|
||||
g_object_unref(layout);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
#include "common.h"
|
||||
#include "area.h"
|
||||
|
||||
extern gboolean taskbarname_enabled;
|
||||
extern int taskbarname_enabled;
|
||||
extern PangoFontDescription *taskbarname_font_desc;
|
||||
extern Color taskbarname_font;
|
||||
extern Color taskbarname_active_font;
|
||||
|
||||
@@ -19,8 +20,8 @@ void init_taskbarname_panel(void *p);
|
||||
|
||||
void draw_taskbarname(void *obj, cairo_t *c);
|
||||
|
||||
gboolean resize_taskbarname(void *obj);
|
||||
int resize_taskbarname(void *obj);
|
||||
|
||||
void taskbarname_default_font_changed();
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
2107
src/tint.c
2107
src/tint.c
File diff suppressed because it is too large
Load Diff
@@ -2,13 +2,12 @@ project(tint2conf)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
|
||||
include( FindPkgConfig )
|
||||
pkg_check_modules( X11_T2C REQUIRED x11 xcomposite xdamage xinerama xrender xrandr>=1.3 )
|
||||
pkg_check_modules( X11_T2C REQUIRED x11 xrender )
|
||||
pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
|
||||
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
|
||||
pkg_check_modules( IMLIB2 REQUIRED imlib2 )
|
||||
pkg_check_modules( GTHREAD2 REQUIRED gthread-2.0 )
|
||||
pkg_check_modules( GTK2 REQUIRED gtk+-x11-2.0 )
|
||||
pkg_check_modules( RSVG librsvg-2.0>=2.36.0 )
|
||||
|
||||
include_directories( ../util
|
||||
${X11_T2C_INCLUDE_DIRS}
|
||||
@@ -16,60 +15,37 @@ include_directories( ../util
|
||||
${GOBJECT2_INCLUDE_DIRS}
|
||||
${IMLIB2_INCLUDE_DIRS}
|
||||
${GTHREAD2_INCLUDE_DIRS}
|
||||
${GTK2_INCLUDE_DIRS}
|
||||
${RSVG_INCLUDE_DIRS} )
|
||||
${GTK2_INCLUDE_DIRS} )
|
||||
|
||||
set(SOURCES ../util/common.c
|
||||
../util/strnatcmp.c
|
||||
../util/cache.c
|
||||
../config.c
|
||||
../server.c
|
||||
../launcher/apps-common.c
|
||||
../launcher/icon-theme-common.c
|
||||
main.c
|
||||
properties.c
|
||||
properties_rw.c
|
||||
theme_view.c )
|
||||
|
||||
add_definitions( -DTINT2CONF )
|
||||
|
||||
option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
|
||||
|
||||
if( ENABLE_RSVG )
|
||||
if( RSVG_FOUND )
|
||||
add_definitions( -DHAVE_RSVG )
|
||||
endif( RSVG_FOUND )
|
||||
endif( ENABLE_RSVG )
|
||||
|
||||
link_directories( ${X11_T2C_LIBRARY_DIRS}
|
||||
${GLIB2_LIBRARY_DIRS}
|
||||
${GOBJECT2_LIBRARY_DIRS}
|
||||
${IMLIB2_LIBRARY_DIRS}
|
||||
${GTHREAD2_LIBRARY_DIRS}
|
||||
${GTK2_LIBRARY_DIRS}
|
||||
${RSVG_LIBRARY_DIRS} )
|
||||
${GTK2_LIBRARY_DIRS} )
|
||||
add_executable( tint2conf ${SOURCES} )
|
||||
target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}
|
||||
${GLIB2_LIBRARIES}
|
||||
${GOBJECT2_LIBRARIES}
|
||||
${IMLIB2_LIBRARIES}
|
||||
${GTHREAD2_LIBRARIES}
|
||||
${GTK2_LIBRARIES}
|
||||
${RSVG_LIBRARIES} )
|
||||
${GTK2_LIBRARIES} )
|
||||
|
||||
if ( NOT DATADIR )
|
||||
set(DATADIR share)
|
||||
set( DATADIR share )
|
||||
endif( NOT DATADIR )
|
||||
|
||||
add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
|
||||
add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale\" )
|
||||
add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" )
|
||||
set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" )
|
||||
set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread" )
|
||||
set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" )
|
||||
|
||||
add_subdirectory(po)
|
||||
|
||||
install( TARGETS tint2conf DESTINATION bin )
|
||||
install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
|
||||
install( PROGRAMS tintwizard.py DESTINATION bin )
|
||||
install( FILES taskbar.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps )
|
||||
install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications )
|
||||
install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" )
|
||||
|
||||
1168
src/tint2conf/main.c
1168
src/tint2conf/main.c
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,4 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
@@ -11,11 +12,5 @@
|
||||
#include <glib/gi18n-lib.h>
|
||||
#else
|
||||
#define _(String) String
|
||||
#define GETTEXT_PACKAGE "tint2conf"
|
||||
#endif
|
||||
|
||||
#define SNAPSHOT_TICK 190
|
||||
gboolean update_snapshot();
|
||||
void menuApply();
|
||||
void refresh_current_theme();
|
||||
extern GtkWidget *g_window;
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
include(FindGettext)
|
||||
if (GETTEXT_FOUND)
|
||||
set(GETTEXT_PACKAGE tint2conf)
|
||||
file(GLOB POTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.po")
|
||||
string(REPLACE ".po" " " LANGUAGES ${POTFILES})
|
||||
message(STATUS "gettext found languages: ${LANGUAGES}")
|
||||
string(REPLACE " " ";" LANGUAGES ${LANGUAGES})
|
||||
if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.8")
|
||||
GETTEXT_CREATE_TRANSLATIONS("${CMAKE_CURRENT_SOURCE_DIR}/tint2conf.pot" ALL ${POTFILES})
|
||||
else()
|
||||
foreach(LANG ${LANGUAGES})
|
||||
GETTEXT_PROCESS_PO_FILES(${LANG} ALL PO_FILES ${LANG}.po)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo"
|
||||
DESTINATION "${CMAKE_INSTALL_PREFIX}/${DATADIR}/locale/${LANG}/LC_MESSAGES"
|
||||
RENAME "${GETTEXT_PACKAGE}.mo")
|
||||
endforeach ()
|
||||
endif()
|
||||
else ()
|
||||
message(STATUS "gettext not found")
|
||||
endif ()
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,11 +0,0 @@
|
||||
Updating pot file:
|
||||
|
||||
find .. -name '*.c' | sort -r | xargs xgettext --keyword=_ --language=C --output=updated.pot -
|
||||
|
||||
Followed by manual editing of updated.pot to make sure the header is OK. Then:
|
||||
|
||||
cat updated.pot > tint2conf.pot && rm -f updated.pot
|
||||
|
||||
Then update the po files:
|
||||
|
||||
for f in *.po ; do lang=$(basename $f .po); echo $lang ; msgmerge -i -o $lang.pox $lang.po tint2conf.pot ; cat ${lang}.pox > ${lang}.po ; rm ${lang}.pox ; done
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -3,209 +3,49 @@
|
||||
#define PROPERTIES
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdk.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
|
||||
#include "../launcher/icon-theme-common.h"
|
||||
|
||||
|
||||
// panel
|
||||
extern GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y, *panel_spacing;
|
||||
extern GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
|
||||
extern GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
|
||||
extern GtkWidget *panel_window_name, *disable_transparency;
|
||||
extern GtkWidget *panel_mouse_effects;
|
||||
extern GtkWidget *mouse_hover_icon_opacity, *mouse_hover_icon_saturation, *mouse_hover_icon_brightness;
|
||||
extern GtkWidget *mouse_pressed_icon_opacity, *mouse_pressed_icon_saturation, *mouse_pressed_icon_brightness;
|
||||
extern GtkWidget *panel_primary_monitor_first;
|
||||
|
||||
enum {
|
||||
itemsColName = 0,
|
||||
itemsColValue,
|
||||
itemsNumCols
|
||||
};
|
||||
extern GtkListStore *panel_items, *all_items;
|
||||
extern GtkWidget *panel_items_view, *all_items_view;
|
||||
char *get_panel_items();
|
||||
void set_panel_items(const char *items);
|
||||
|
||||
extern GtkWidget *screen_position[12];
|
||||
extern GSList *screen_position_group;
|
||||
extern GtkWidget *panel_background;
|
||||
|
||||
#define POS_TLH 0
|
||||
#define POS_TCH 1
|
||||
#define POS_TRH 2
|
||||
|
||||
#define POS_TLV 3
|
||||
#define POS_CLV 4
|
||||
#define POS_BLV 5
|
||||
|
||||
#define POS_TRV 6
|
||||
#define POS_CRV 7
|
||||
#define POS_BRV 8
|
||||
|
||||
#define POS_BLH 9
|
||||
#define POS_BCH 10
|
||||
#define POS_BRH 11
|
||||
GtkWidget *panel_width, *panel_height, *panel_margin_x, *panel_margin_y, *panel_padding_x, *panel_padding_y, *panel_spacing;
|
||||
GtkWidget *panel_wm_menu, *panel_dock, *panel_autohide, *panel_autohide_show_time, *panel_autohide_hide_time, *panel_autohide_size;
|
||||
GtkWidget *panel_combo_strut_policy, *panel_combo_layer, *panel_combo_width_type, *panel_combo_height_type, *panel_combo_monitor;
|
||||
GtkWidget *items_order;
|
||||
|
||||
// taskbar
|
||||
extern GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
|
||||
extern GtkWidget *taskbar_hide_inactive_tasks, *taskbar_hide_diff_monitor;
|
||||
extern GtkWidget *taskbar_name_padding_x, *taskbar_name_padding_y, *taskbar_name_inactive_color, *taskbar_name_active_color;
|
||||
extern GtkWidget *taskbar_name_font, *taskbar_name_font_set;
|
||||
extern GtkWidget *taskbar_active_background, *taskbar_inactive_background;
|
||||
extern GtkWidget *taskbar_name_active_background, *taskbar_name_inactive_background;
|
||||
extern GtkWidget *taskbar_distribute_size, *taskbar_sort_order, *taskbar_alignment, *taskbar_always_show_all_desktop_tasks;
|
||||
GtkWidget *taskbar_show_desktop, *taskbar_show_name, *taskbar_padding_x, *taskbar_padding_y, *taskbar_spacing;
|
||||
GtkWidget *taskbar_name_padding_x, *taskbar_name_inactive_color, *taskbar_name_active_color, *taskbar_name_font;
|
||||
|
||||
// task
|
||||
extern GtkWidget *task_mouse_left, *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
|
||||
extern GtkWidget *task_show_icon, *task_show_text, *task_align_center, *font_shadow;
|
||||
extern GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_spacing;
|
||||
extern GtkWidget *task_font, *task_font_set;
|
||||
extern GtkWidget *task_default_color, *task_default_color_set,
|
||||
*task_default_icon_opacity, *task_default_icon_osb_set,
|
||||
*task_default_icon_saturation,
|
||||
*task_default_icon_brightness,
|
||||
*task_default_background, *task_default_background_set;
|
||||
extern GtkWidget *task_normal_color, *task_normal_color_set,
|
||||
*task_normal_icon_opacity, *task_normal_icon_osb_set,
|
||||
*task_normal_icon_saturation,
|
||||
*task_normal_icon_brightness,
|
||||
*task_normal_background, *task_normal_background_set;
|
||||
extern GtkWidget *task_active_color, *task_active_color_set,
|
||||
*task_active_icon_opacity, *task_active_icon_osb_set,
|
||||
*task_active_icon_saturation,
|
||||
*task_active_icon_brightness,
|
||||
*task_active_background, *task_active_background_set;
|
||||
extern GtkWidget *task_urgent_color, *task_urgent_color_set,
|
||||
*task_urgent_icon_opacity, *task_urgent_icon_osb_set,
|
||||
*task_urgent_icon_saturation,
|
||||
*task_urgent_icon_brightness,
|
||||
*task_urgent_background, *task_urgent_background_set;
|
||||
extern GtkWidget *task_urgent_blinks;
|
||||
extern GtkWidget *task_iconified_color, *task_iconified_color_set,
|
||||
*task_iconified_icon_opacity, *task_iconified_icon_osb_set,
|
||||
*task_iconified_icon_saturation,
|
||||
*task_iconified_icon_brightness,
|
||||
*task_iconified_background, *task_iconified_background_set;
|
||||
GtkWidget *task_mouse_middle, *task_mouse_right, *task_mouse_scroll_up, *task_mouse_scroll_down;
|
||||
GtkWidget *task_show_icon, *task_show_text, *task_align_center, *task_font_shadow;
|
||||
GtkWidget *task_maximum_width, *task_maximum_height, *task_padding_x, *task_padding_y, *task_font;
|
||||
|
||||
// clock
|
||||
extern GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
|
||||
extern GtkWidget *clock_left_command, *clock_right_command;
|
||||
extern GtkWidget *clock_mclick_command, *clock_rclick_command, *clock_uwheel_command, *clock_dwheel_command;
|
||||
extern GtkWidget *clock_padding_x, *clock_padding_y;
|
||||
extern GtkWidget *clock_font_line1, *clock_font_line1_set, *clock_font_line2, *clock_font_line2_set, *clock_font_color;
|
||||
extern GtkWidget *clock_background;
|
||||
GtkWidget *clock_format_line1, *clock_format_line2, *clock_tmz_line1, *clock_tmz_line2;
|
||||
GtkWidget *clock_left_command, *clock_right_command;
|
||||
GtkWidget *clock_padding_x, *clock_padding_y, *clock_font_line1, *clock_font_line2, *clock_font_color;
|
||||
|
||||
// battery
|
||||
extern GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
|
||||
extern GtkWidget *battery_padding_x, *battery_padding_y;
|
||||
extern GtkWidget *battery_font_line1, *battery_font_line1_set, *battery_font_line2, *battery_font_line2_set, *battery_font_color;
|
||||
extern GtkWidget *battery_background;
|
||||
extern GtkWidget *battery_tooltip;
|
||||
extern GtkWidget *battery_left_command, *battery_mclick_command, *battery_right_command, *battery_uwheel_command, *battery_dwheel_command;
|
||||
extern GtkWidget *ac_connected_cmd, *ac_disconnected_cmd;
|
||||
GtkWidget *battery_hide_if_higher, *battery_alert_if_lower, *battery_alert_cmd;
|
||||
GtkWidget *battery_padding_x, *battery_padding_y, *battery_font_line1, *battery_font_line2, *battery_font_color;
|
||||
|
||||
// systray
|
||||
extern GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
|
||||
extern GtkWidget *systray_icon_size, *systray_icon_opacity, *systray_icon_saturation, *systray_icon_brightness;
|
||||
extern GtkWidget *systray_background, *systray_monitor;
|
||||
GtkWidget *systray_icon_order, *systray_padding_x, *systray_padding_y, *systray_spacing;
|
||||
GtkWidget *systray_icon_size, *systray_icon_opacity, *systray_icon_saturation, *systray_icon_brightness;
|
||||
|
||||
// tooltip
|
||||
extern GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_set, *tooltip_font_color;
|
||||
extern GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
|
||||
extern GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
|
||||
extern GtkWidget *tooltip_background;
|
||||
|
||||
// Executor
|
||||
typedef struct Executor {
|
||||
char name[256];
|
||||
GtkWidget *container;
|
||||
GtkWidget *page_execp;
|
||||
GtkWidget *page_label;
|
||||
GtkWidget *execp_command, *execp_interval, *execp_has_icon, *execp_cache_icon, *execp_show_tooltip;
|
||||
GtkWidget *execp_continuous, *execp_markup, *execp_tooltip;
|
||||
GtkWidget *execp_left_command, *execp_right_command;
|
||||
GtkWidget *execp_mclick_command, *execp_rclick_command, *execp_uwheel_command, *execp_dwheel_command;
|
||||
GtkWidget *execp_font, *execp_font_set, *execp_font_color, *execp_padding_x, *execp_padding_y, *execp_centered;
|
||||
GtkWidget *execp_background, *execp_icon_w, *execp_icon_h;
|
||||
} Executor;
|
||||
|
||||
extern GArray *executors;
|
||||
GtkWidget *tooltip_padding_x, *tooltip_padding_y, *tooltip_font, *tooltip_font_color;
|
||||
GtkWidget *tooltip_task_show, *tooltip_show_after, *tooltip_hide_after;
|
||||
GtkWidget *clock_format_tooltip, *clock_tmz_tooltip;
|
||||
|
||||
// launcher
|
||||
|
||||
enum {
|
||||
appsColIcon = 0,
|
||||
appsColIconName,
|
||||
appsColText,
|
||||
appsColPath,
|
||||
appsNumCols
|
||||
};
|
||||
|
||||
extern GtkListStore *launcher_apps, *all_apps;
|
||||
extern GtkWidget *launcher_apps_view, *all_apps_view;
|
||||
extern GtkWidget *launcher_apps_dirs;
|
||||
|
||||
extern GtkWidget *launcher_icon_size, *launcher_icon_theme, *launcher_padding_x, *launcher_padding_y, *launcher_spacing;
|
||||
extern GtkWidget *launcher_icon_opacity, *launcher_icon_saturation, *launcher_icon_brightness;
|
||||
extern GtkWidget *margin_x, *margin_y;
|
||||
extern GtkWidget *launcher_background, *launcher_icon_background;
|
||||
extern GtkWidget *startup_notifications;
|
||||
extern IconThemeWrapper *icon_theme;
|
||||
extern GtkWidget *launcher_tooltip;
|
||||
extern GtkWidget *launcher_icon_theme_override;
|
||||
|
||||
void load_desktop_file(const char *file, gboolean selected);
|
||||
void set_current_icon_theme(const char *theme);
|
||||
gchar *get_current_icon_theme();
|
||||
GtkWidget *launcher_icon_size, *launcher_icon_theme, *launcher_padding_x, *launcher_padding_y, *launcher_spacing;
|
||||
|
||||
// background
|
||||
enum {
|
||||
bgColPixbuf = 0,
|
||||
bgColFillColor,
|
||||
bgColFillOpacity,
|
||||
bgColBorderColor,
|
||||
bgColBorderOpacity,
|
||||
bgColBorderWidth,
|
||||
bgColCornerRadius,
|
||||
bgColText,
|
||||
bgColFillColorOver,
|
||||
bgColFillOpacityOver,
|
||||
bgColBorderColorOver,
|
||||
bgColBorderOpacityOver,
|
||||
bgColFillColorPress,
|
||||
bgColFillOpacityPress,
|
||||
bgColBorderColorPress,
|
||||
bgColBorderOpacityPress,
|
||||
bgNumCols
|
||||
};
|
||||
|
||||
extern GtkListStore *backgrounds;
|
||||
extern GtkWidget *current_background,
|
||||
*background_fill_color,
|
||||
*background_border_color,
|
||||
*background_fill_color_over,
|
||||
*background_border_color_over,
|
||||
*background_fill_color_press,
|
||||
*background_border_color_press,
|
||||
*background_border_width,
|
||||
*background_corner_radius;
|
||||
|
||||
void background_create_new();
|
||||
void background_force_update();
|
||||
int background_index_safe(int index);
|
||||
GtkWidget *combo_background;
|
||||
GtkWidget *margin_x, *margin_y;
|
||||
|
||||
GtkWidget *create_properties();
|
||||
|
||||
void execp_create_new();
|
||||
Executor *execp_get_last();
|
||||
void execp_remove(int i);
|
||||
void execp_update_indices();
|
||||
|
||||
void create_please_wait(GtkWindow *parent);
|
||||
void process_events();
|
||||
void destroy_please_wait();
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user