head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.48 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.46 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.44 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.42 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.40 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.38 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.36 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.34 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.32 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.30 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.28 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.26 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.24 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.22 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.20 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.18 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.16 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.14 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.12 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.10 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.8 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.6 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.4 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.2 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.2 netbsd-1-5-PATCH001:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2004.09.01.11.08.46; author recht; state dead; branches; next 1.4; 1.4 date 2003.06.03.16.04.45; author jmmv; state Exp; branches; next 1.3; 1.3 date 2002.05.03.10.56.39; author wiz; state Exp; branches; next 1.2; 1.2 date 2002.02.26.09.41.40; author martti; state Exp; branches; next 1.1; 1.1 date 2000.12.12.02.03.48; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.12.12.02.03.48; author wiz; state Exp; branches; next ; desc @@ 1.5 log @update to 1.2.16 1.2.16: 2004-08-16 - fullscreen fix for _NET_WM_STATE_FULLSCREEN (affects mplayer) - use our own replacement for basename - ACPI battery status fix (gicco) - fix bug 984427 (addressbar ignores backspace when numlock pressed) - Polish translation update 1.2.15: 2004-08-09 - enable locale for icesh 1.2.15pre4: 2004-08-05 - fix crash/lockup at startup in ACPI status applet when ac module not loaded - tray icon sizing cleanups - fix bug 883518: keyboard gets locked until icewm menu is activated - double buffering fixes - French translation update - Finnish translation update (Taisto Kuikka) - menuprogreload menu keyword added (Konstantin Korikov) syntax: menuprogreload title icon timeout command ... - battery status display for FreeBSD (Hanspeter Roth) - smart snap window positioning triggered by C+S+A+numpad (Bert Wesarg) - key to show desktop (Super+D) 1.2.15pre3: 2004-08-01 - icesound gcc 2.95.3 compile fix (Thomas Zajic) - net status support for OpenBSD (Hanspeter Roth) - FreeBSD build fix (Hanspeter Roth) - basename cleanups for FreeBSD - systray cleanups for wine, ... - battery status uses design capacity (Hanspeter Roth) 1.2.15pre2: 2004-07-18 - Slovak translation (Radovan Stas) - fix activation from gnome-2.6 panel to properly raise window - fix transparency support (caused crashes in xchat...) - NetBSD support for NetStatus (Iain Hibbert) - net modifier setup code to cope with weird xorg modifier setup 1.2.15pre1: 2004-06-27 - fix ppp applet isdn online status - fix focusing new+maximized windows - fix some alt+tab pref combinations (hidden + all/group workspaces) - some more gcc 3.4 fixes (morfic) @ text @$NetBSD: patch-ab,v 1.4 2003/06/03 16:04:45 jmmv Exp $ --- src/aapm.cc.orig 2003-03-08 20:37:52.000000000 +0100 +++ src/aapm.cc @@@@ -15,6 +15,12 @@@@ #ifdef CONFIG_APPLET_APM +#if defined(__NetBSD__) +#include +#include +#include +#endif + #include "ylib.h" #include "sysdep.h" @@@@ -47,6 +53,7 @@@@ extern YColor *taskBarBg; void ApmStr(char *s, bool Tool) { +#if !defined(__NetBSD__) char buf[80]; int len, i, fd = open("/proc/apm", O_RDONLY); char driver[16]; @@@@ -121,6 +128,46 @@@@ void ApmStr(char *s, bool Tool) { strcat(s, _(" - Charging")); else strcat(s, _("C")); +#else + struct apm_power_info aip; + int fd = open(APMDEV, O_RDONLY); + + if (fd == -1) { + return; + } + + memset(&aip, 0, sizeof(aip)); + if (ioctl(fd, APM_IOC_GETPOWER, &aip) == -1) { + fprintf(stderr, "ioctl failed on APMDEV"); + close(fd); + return; + } + + if (!Tool) { + if (taskBarShowApmTime) { + if (aip.minutes_left == 0) { + sprintf(s, "%02d", aip.battery_life); + } else + sprintf(s, "%d:%02d", aip.minutes_left/60, aip.minutes_left%60); + } else + sprintf(s, "%02d", aip.battery_life); + } else { + sprintf(s, "%d%%", aip.battery_life); + } + + if (aip.ac_state == APM_AC_ON) + if (Tool) + strcat(s,_(" - Power")); + else + strcat(s,_("P")); + if (aip.battery_state == APM_BATT_CHARGING) + if (Tool) + strcat(s,_(" - Charging")); + else + strcat(s,_("M")); + + close(fd); +#endif } int ignore_directory_entry(struct dirent *de) { @ 1.4 log @Update icewm{,-gnome} to 1.2.7. Changes since 1.2.0: 1.2.7: 2003-03-08 - minor bug fixes 1.2.7pre3: 2003-03-02 - new option QuickSwitchGroupWorkspaces (if QuickSwitchToAllWorkspaces=1) - Italian translation update - more menu tweaks - implement NetWM window type SPLASH - ACPI status patch from Klaus Schneider - Made Alt+ behave in more standard manner - DoNotFocus window option added. 1.2.7pre2: 2003-02-26 - Major improvement in percieved speed of menus - Dutch translation by Ton Kersten - add new options: ShowRun, ShowAbout, ShowWindowList, ShowLogoutSubMenu, AllowFullscreen (Ton Kersten) - support WM_WINDOW_ROLE, too - fix detection of netwm hints for some apps - fix AutoReloadMenus bug 1.2.7pre1: 2003-02-23 - fix .order file handling for gnome menus (Thomas Zajic) - changed default theme to icedesert (Nehal Mistry) - fix crash in alt+tab when window closes - rewrite icewm.spec.in Christian W. Zuckschwerdt (zany@@triq.net) - Belarussian translation by Hleb Valoska (el_globus@@tut.by) - tweaked character set (CODESET) detection - 'Programs' menu is now invoked from menu file, not from the code - fixed fonts in Infadel2 theme when Xft is used 1.2.6: 2003-01-19 - Slovenian translation by Jernej Kovacic - improve focus handling on non-xinerama multihead displays - another submenu/icon handling fix for gnome menus (Thomas Zajic) - added nonICCCMconfigureRequest window option workaround for non ICCCM compliant applications - WINDOW_ROLE handling for winoptions (Stanislav Svirid) - fix crash in mail status checker in pop/imap configuration - implement startMinimized window option, similiar to startMaximized 1.2.5: 2003-01-05 - fix lockup when doing operations through window list - fix compile problem --with-xpm - fix icesh.cc focus handling (by Todd R. Eigenschink) - update workaround for some TK issues - slow startup fix (caused by broken lazy menu loading) 1.2.4: 2003-01-03 - fixed submenu/icon handling for gnome menus (Thomas Zajic) - acpi optimization (Michal Ceresna) - fix crash in "Tile ..." - fix submenu deactivation problem (reported by Bernhard Walle) - fix focus loss on xmms exit (reported by Bernhard Walle) - fix problem with restarting the wm (when icewm-menu-gnome1 not present) 1.2.3: 2002-12-26 - IMPORTANT: system configuration directory changed to /etc/icewm (from /etc/X11/icewm or /usr/local/etc/X11/icewm). icewm now installs it's data files in /usr/local/share/icewm. - added --disable-winmenu and --disable-taskbar configure options - bug fixes in menu code - fixed lockup when running under session manager (GNOME2) 1.2.3pre2: 2002-12-15 - support for Xinerama - rewritten RPM packaging - new "menuprog" statement in menu files for reading a submenu from a pipe - Italian translation update - moved gnome menu support into an external utility (icewm-menu-gnome1) (used trough "menuprog", requires gnome 1.x) - added keybinding for showing the window list menu (KeySysWinListMenu) 1.2.3pre1: 2002-10-20 + soon - some small fixes for the swedish translation (tucker) - new APM/ACPI monitor code by Michal Ceresna (cemi) - Norwegian translation by Petter Johan Olsen - the Address Bar in the taskbar now works even without TaskBarDoubleHeight (Ctrl+Alt+Space) - new APM/ACPI battery monitoring code - rewritten the work area implementation (doNotCover should now work much better) - new "preferences" setting: focusOnAppRaise - focus the window when application requests to raise it - cleaned up the icewmbg implementation (TODO: config file for it) - fixed the Reboot vs Shutdown issue - Alt+Left Button drag now used for window move and resize (no more Ctrl+Alt) - fixed configure option: --enable-depend now used for make depend 1.2.2: 2002-09-06 - fixed icewm.spec file for building RPMs - fixed CHANGES file 1.2.1: 2002-08-31 - TaskBar and root menu is no longer disabled under Gnome (adjust your ~/.icewm/preferences manually: ShowTaskBar=0; UseRootButtons=0) - feature: partial support of the Enhanced Window Manager Specification (NETWM) needed for GNOME2 and KDE3 compliance flux - feature: scriptable menus (as found in WindowMaker) - feature: execute "startup" or "restart" script found in resource path ($ICEWM_HOME, $ETCDIR, $LIBDIR) after initialization - bugfix: added --help switch to icewm, allow GNU stylish long options - feature: the directory for user preferences can be selected by the ICEWM_PRIVCFG variable now (default still is and will forever be ~/.icewm, but think about the beauty of setting ICEWM_PRIVCFG to "$HOME/.etc/icewm"...) - bugfix/feature: menu parser is case-insensitive now - bugfix/feature: normal users won't need GNU make anymore - cleanup of lib/.../*.xpm by Andrey Smagin - FocusChangesWorkspace option by Daniel Pittman -- determines if a new window open on another workspace switches to that workspace - PointerRaiseDelay focusing fix by Thomas Linder - bugfix: enable menu items in window list popup only when appropriate (closes bug 217168) - change the ppp status applet to decrease the scale when the troughput goes down. - feature: improved icesh's worth by adding support for window classes - ui-change: added fullscreen window menu action; changed default key binding for hide, rollup and undoArrange action - added startMaximized{,Vert,Horz} winoptions - initial UrgencyHint implementation - added "menufile" statement for menu files - configure script defaults changed: imlib, i18n, nls are now default @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2002/05/03 10:56:39 wiz Exp $ @ 1.3 log @Fix apm handling, per pkg/16626 from Joachim Koenig-Baltes. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/aapm.cc.orig Tue Oct 9 16:54:03 2001 d5 1 a5 1 @@@@ -25,6 +25,12 @@@@ d15 5 a19 5 YColor *YApm::apmBg = 0; YColor *YApm::apmFg = 0; YFont *YApm::apmFont = 0; @@@@ -32,6 +38,7 @@@@ extern YPixmap *taskbackPixmap; d23 1 a23 1 char buf[45]; d26 2 a27 2 @@@@ -102,6 +109,46 @@@@ strcat(s,_(" - Charging")); d29 1 a29 1 strcat(s,_("M")); d41 1 a41 1 + close(fd); d72 1 a72 1 YApm::YApm(YWindow *aParent): YWindow(aParent) { @ 1.2 log @Updated icewm to 1.0.9.2 (provided by Sergey Svishchev in pkg/15478) * a lot of bug fixes * new translations * NLS support @ text @d4 1 a4 1 +++ src/aapm.cc Tue Feb 26 09:02:17 2002 d26 1 a26 1 @@@@ -102,6 +109,44 @@@@ d38 1 d41 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2000/03/07 03:35:45 jlam Exp $ d3 3 a5 3 --- src/aapm.cc.orig Sun Feb 13 10:28:36 2000 +++ src/aapm.cc Mon Mar 6 22:22:36 2000 @@@@ -22,11 +22,18 @@@@ d7 1 a7 1 #ifdef CONFIG_APM d18 2 d22 1 a22 1 +#ifdef __linux__ d26 2 a27 2 @@@@ -97,6 +104,44 @@@@ strcat(s," - Charging"); d29 2 a30 2 strcat(s,"M"); +#elif defined(__NetBSD__) d57 1 a57 1 + strcat(s," - Power"); d59 1 a59 1 + strcat(s,"P"); d62 1 a62 1 + strcat(s," - Charging"); d64 1 a64 1 + strcat(s,"M"); @ 1.1.1.1 log @Add new category wm for window managers, and move lots of package from x11 here. Only changes are: `wm' in category added and some paths fixed. @ text @@