aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-02-10 12:57:42 (GMT)
committerrathnor <rathnor>2004-02-10 12:57:42 (GMT)
commita39fa9c192d19103470a515f5f10a07b08bc43b6 (patch)
treebcd9a9df49febd4d93bc4a9ba8088195df30f05c
parent7ebd8f91b885f18397057282d09419ad27782328 (diff)
downloadfluxbox_pavel-a39fa9c192d19103470a515f5f10a07b08bc43b6.zip
fluxbox_pavel-a39fa9c192d19103470a515f5f10a07b08bc43b6.tar.bz2
Han says:
Still the same changes from me and a few new menu-entries from Nero Wolfe <mrwolfe[at]linuxmail.org> Changelog: - Remove ``local'' keyword. Not supported by SUN. - Replace non-standard diff with standard cmp - Improve automatic reload of menu - Additional menu-entries from Nero Wolfe <mrwolfe[at]linuxmail.org>
-rw-r--r--ChangeLog4
-rwxr-xr-xutil/fluxbox-generate_menu.in74
2 files changed, 55 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 589df47..47ec055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.9: 2Changes for 0.9.9:
3*04/02/10:
4 * fbgm updates (Thanks Han and Nero Wolfe [mrwolfe<at>linuxmail.org])
5 - portability fixes, improve menu reloading, and new menu entries
6 fluxbox-generate_menu.in
3*04/01/30: 7*04/01/30:
4 * Tidy up a few slitlist things (Simon) 8 * Tidy up a few slitlist things (Simon)
5 - expand ~, trim spaces, allow comments, use WM_CLASS instead of NAME 9 - expand ~, trim spaces, allow comments, use WM_CLASS instead of NAME
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 70556b3..7da3594 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -22,7 +22,7 @@
22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23# DEALINGS IN THE SOFTWARE. 23# DEALINGS IN THE SOFTWARE.
24# 24#
25# $Id: fluxbox-generate_menu.in,v 1.12 2004/01/21 21:57:46 fluxgen Exp $ 25# $Id: fluxbox-generate_menu.in,v 1.13 2004/02/10 12:57:42 rathnor Exp $
26 26
27# 27#
28# Portability notes: 28# Portability notes:
@@ -220,9 +220,9 @@ clean_up() {
220# Some magic to clean up empty menus 220# Some magic to clean up empty menus
221rm -f ${MENUFILENAME}.tmp 221rm -f ${MENUFILENAME}.tmp
222touch ${MENUFILENAME}.tmp 222touch ${MENUFILENAME}.tmp
223local counter=10 # prevent looping in odd circumstances 223counter=10 # prevent looping in odd circumstances
224until [ $counter -lt 1 ] || \ 224until [ $counter -lt 1 ] || \
225 diff -u ${MENUFILENAME} ${MENUFILENAME}.tmp 2>&1 > /dev/null; do 225 cmp ${MENUFILENAME} ${MENUFILENAME}.tmp 2>&1 > /dev/null; do
226 [ -s ${MENUFILENAME}.tmp ] && mv ${MENUFILENAME}.tmp ${MENUFILENAME} 226 [ -s ${MENUFILENAME}.tmp ] && mv ${MENUFILENAME}.tmp ${MENUFILENAME}
227 counter=`expr $counter - 1` 227 counter=`expr $counter - 1`
228 grep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{ 228 grep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{
@@ -1031,10 +1031,11 @@ append "[exec] (${DEFAULT_TERMNAME}) {${DEFAULT_TERM}}"
1031 1031
1032case "$DEFAULT_BROWSERNAME" in 1032case "$DEFAULT_BROWSERNAME" in
1033 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;; 1033 links|w3m|lynx) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_TERM} -e ${DEFAULT_BROWSER} ${HOMEPAGE}}" ;;
1034 firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;; 1034 firefox|firebird|mozilla|phoenix|galeon|dillo|netscape) append "[exec] (${DEFAULT_BROWSERNAME}) {${DEFAULT_BROWSER}}" ;;
1035 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;; 1035 konqueror) append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" ;;
1036 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;; 1036 opera) append "[exec] (opera) {env QT_XFT=true opera}" ;;
1037 MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;; 1037 MozillaFirebird) append "[exec] (firebird) {MozillaFirebird}" ;;
1038 MozillaFirefox) append "[exec] (firefox) {MozillaFirefox}" ;;
1038 *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;; 1039 *) append "[exec] ($DEFAULT_BROWSERNAME) {$DEFAULT_BROWSER}" ;;
1039esac 1040esac
1040 1041
@@ -1048,7 +1049,7 @@ append_menu_end
1048 1049
1049append_submenu "${NETMENU}" 1050append_submenu "${NETMENU}"
1050 append_submenu "${BROWSERMENU}" 1051 append_submenu "${BROWSERMENU}"
1051 normal_find mozilla-firebird MozillaFirebird galeon mozilla dillo netscape 1052 normal_find mozilla-firefox MozillaFirefox galeon mozilla dillo netscape
1052 find_it opera append "[exec] (opera) {env QT_XFT=true opera}" 1053 find_it opera append "[exec] (opera) {env QT_XFT=true opera}"
1053 find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}" 1054 find_it konqueror append "[exec] (konqueror) {kfmclient openProfile webbrowsing}"
1054 find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}" 1055 find_it links append "[exec] (links) {${DEFAULT_TERM} -e links ${HOMEPAGE}}"
@@ -1067,11 +1068,14 @@ append_submenu "${NETMENU}"
1067 append_menu_end 1068 append_menu_end
1068 1069
1069 append_submenu IRC 1070 append_submenu IRC
1070 normal_find xchat ksirc 1071 normal_find xchat ksirc vyqchat lostirc logui konversation kvirc
1071 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}" 1072 find_it irssi append "[exec] (irssi) {${DEFAULT_TERM} -e irssi}"
1072 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \ 1073 find_it BitchX append "[exec] (BitchX) {${DEFAULT_TERM} -e BitchX -N}" || \
1073 find_it bitchx append "[exec] (BitchX) {${DEFAULT_TERM} -e bitchx -N}" 1074 find_it bitchx append "[exec] (BitchX) {${DEFAULT_TERM} -e bitchx -N}"
1074 find_it ircii append "[exec] (ircii) {${DEFAULT_TERM} -e ircii -s}" 1075 find_it ircii append "[exec] (ircii) {${DEFAULT_TERM} -e ircii -s}"
1076 find_it epic4 append "[exec] (epic4) {${DEFAULT_TERM} -e epic4}"
1077 find_it weechat append "[exec] (weechat) {${DEFAULT_TERM} -e weechat}"
1078 find_it ninja append "[exec] (ninja) {${DEFAULT_TERM} -e ninja}"
1075 append_menu_end 1079 append_menu_end
1076 1080
1077 append_submenu P2P 1081 append_submenu P2P
@@ -1121,7 +1125,7 @@ append_submenu "${MULTIMEDIAMENU}"
1121 append_submenu "${MUSICMENU}" 1125 append_submenu "${MUSICMENU}"
1122 normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \ 1126 normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gmix kmix kscd \
1123 grecord kmidi xplaycd soundtracker grip easytag audacity \ 1127 grecord kmidi xplaycd soundtracker grip easytag audacity \
1124 zinf rhythmbox kaboodle 1128 zinf rhythmbox kaboodle beep-media-player
1125 find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}" 1129 find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
1126 find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}" 1130 find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
1127 find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}" 1131 find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"
@@ -1144,14 +1148,22 @@ append_submenu "${OFFICEMENU}"
1144 normal_find xclock xcalc kcalc 1148 normal_find xclock xcalc kcalc
1145 find_it gcalc append "[exec] (gcalc) {gcalc}" || \ 1149 find_it gcalc append "[exec] (gcalc) {gcalc}" || \
1146 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}" 1150 find_it gnome-calculator append "[exec] (gcalc) {gnome-calculator}"
1147 find_it ooffice append "[exec] (Open Office) {ooffice}" 1151 find_it ooffice append "[exec] (Open Office) {ooffice}" || \
1148 find_it oocalc append "[exec] (OO Calc) {oocalc}" 1152 find_it ooffice append "[exec] (Ximian Open Office) {xooffice}"
1149 find_it oowriter append "[exec] (OO Writer) {oowriter}" 1153 find_it oocalc append "[exec] (OO Calc) {oocalc}" || \
1150 find_it ooimpress append "[exec] (OO Impress) {ooimpress}" 1154 find_it xoocalc append "[exec] (XOO Calc) {xoocalc}"
1151 find_it oodraw append "[exec] (OO Draw) {oodraw}" 1155 find_it oowriter append "[exec] (OO Writer) {oowriter}" || \
1152 find_it oomath append "[exec] (OO Math) {oomath}" 1156 find_it xoowriter append "[exec] (XOO Writer) {xoowriter}"
1153 find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}" 1157 find_it ooimpress append "[exec] (OO Impress) {ooimpress}" || \
1154 find_it mrproject append "[exec] (Mr.Project) {mrproject}" 1158 find_it xooimpress append "[exec] (XOO Impress) {xooimpress}"
1159 find_it oodraw append "[exec] (OO Draw) {oodraw}" || \
1160 find_it xoodraw append "[exec] (XOO Draw) {xoodraw}"
1161 find_it oomath append "[exec] (OO Math) {oomath}" || \
1162 find_it xoomath append "[exec] (XOO Math) {xoomath}"
1163 find_it oopadmin append "[exec] (OO Printer Administration) {oopadmin}" || \
1164 find_it xoopadmin append "[exec] (XOO Printer Administration) {xoopadmin}"
1165 find_it mrproject append "[exec] (Mr.Project) {mrproject}" || \
1166 find_it xmrproject append "[exec] (XMr.Project) {xmrproject}"
1155 find_it soffice append "[exec] (Star Office) {soffice}" 1167 find_it soffice append "[exec] (Star Office) {soffice}"
1156 normal_find abiword kword wordperfect katoob acroread xpdf 1168 normal_find abiword kword wordperfect katoob acroread xpdf
1157append_menu_end 1169append_menu_end
@@ -1163,6 +1175,9 @@ append_submenu "${GAMESMENU}"
1163 gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \ 1175 gtali tuxracer xpenguins xsnow xeyes xpenguins smclone openmortal \
1164 quake2 quake3 skoosh same-gnome enigma xbill icebreaker 1176 quake2 quake3 skoosh same-gnome enigma xbill icebreaker
1165 find_it et append "[exec] (Enemy Territory) {et}" 1177 find_it et append "[exec] (Enemy Territory) {et}"
1178 find_it ut append "[exec] (Unreal Tournament) {ut}" || \
1179 find_it ut2003 append "[exec] (Unreal Tournament 2003) {ut2003}"
1180
1166append_menu_end 1181append_menu_end
1167 1182
1168# We'll only use this once 1183# We'll only use this once
@@ -1193,6 +1208,7 @@ append_submenu "${FBSETTINGSMENU}"
1193 1208
1194 append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" 1209 append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
1195 append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" 1210 append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
1211 append "[stylesdir] (/usr/share/commonbox/styles/)"
1196 append_menu_end 1212 append_menu_end
1197 1213
1198 append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" 1214 append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
@@ -1283,10 +1299,22 @@ if [ ! "${REMOVE}" ]; then
1283 clean_up 1299 clean_up
1284fi 1300fi
1285 1301
1286# force all running fluxbox'es to reload their settings. 1302# Signal all running fluxbox'es to reload their menu.
1287for i in `ps xo pid,command|grep -v awk|grep -v /bin/sh|awk '/fluxbox/ {print $1}'`; do 1303case `uname` in
1288 kill -s USR1 $i 1304 *BSD|Linux)
1289done 1305 for i in `ps xco pid,command|awk '/fluxbox$/ {print $1}'`; do
1306 kill -s USR2 $i 2>&1 >/dev/null
1307 done
1308 ;;
1309 SunOS)
1310 for i in `ps -eco pid,comm|awk '/fluxbox$/ {print $1}'`; do
1311 kill -s USR2 $i 2>&1 >/dev/null
1312 done
1313 ;;
1314 *)
1315 echo 'You have to reload the settings manually.'
1316 ;;
1317esac
1290 1318
1291echo 'Menu successfully generated.' 1319echo 'Menu successfully generated.'
1292echo 'Use fluxbox-generate_menu -h to read about all the latest features.' 1320echo 'Use fluxbox-generate_menu -h to read about all the latest features.'