summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/fluxbox/fluxbox/fluxbox-gpe-session12
-rw-r--r--packages/fluxbox/fluxbox/gpe-logout.fluxbox17
-rw-r--r--packages/fluxbox/fluxbox/keylaunchrc.fluxbox28
-rw-r--r--packages/fluxbox/fluxbox/keys.akita7
-rw-r--r--packages/fluxbox/fluxbox/keys.default0
-rw-r--r--packages/fluxbox/fluxbox_0.99+1.0rc.bb18
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.67.bb12
-rw-r--r--packages/keylaunch/keylaunch_2.0.10.bb15
8 files changed, 104 insertions, 5 deletions
diff --git a/packages/fluxbox/fluxbox/fluxbox-gpe-session b/packages/fluxbox/fluxbox/fluxbox-gpe-session
index f6e03ede7e..099c83e4f2 100644
--- a/packages/fluxbox/fluxbox/fluxbox-gpe-session
+++ b/packages/fluxbox/fluxbox/fluxbox-gpe-session
@@ -9,9 +9,11 @@ MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\ \(.*\)/\1/p"`"
case $MACHINE in
*Akita | *Spitz | *Borzoi | *Terrier)
- APPS="apps.gpe.akita";;
+ APPS="apps.gpe.akita"
+ KEYS="keys.akita";;
*)
- APPS="apps.gpe.default";;
+ APPS="apps.gpe.default"
+ KEYS="keys.default";;
esac
if test -e /usr/share/fluxbox/$APPS
@@ -20,6 +22,12 @@ then
test -e $HOME/.fluxbox/apps || cp /usr/share/fluxbox/$APPS $HOME/.fluxbox/apps
fi
+if test -e /usr/share/fluxbox/$KEYS
+then
+ mkdir -p $HOME/.fluxbox
+ test -e $HOME/.fluxbox/KEYS || cp /usr/share/fluxbox/$KEYS $HOME/.fluxbox/keys
+fi
+
if [ -e $HOME/.fluxbox/session ]
then
diff --git a/packages/fluxbox/fluxbox/gpe-logout.fluxbox b/packages/fluxbox/fluxbox/gpe-logout.fluxbox
new file mode 100644
index 0000000000..29a6ab6ab3
--- /dev/null
+++ b/packages/fluxbox/fluxbox/gpe-logout.fluxbox
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+gpe-question --icon /usr/share/pixmaps/gpe-logout.png --question "<span weight='bold' size='larger'>Are you sure you want to log out?</span>
+
+Unsaved data from applications will be lost." --buttons !gtk-cancel "ok:Log out"
+
+# check for button number returned by gpe-question:
+if [ $? -eq 1 ]; then
+ echo "Logout.";
+ killall fluxbox
+fi
+# hack to run on simpad too
+ killall metacity;
+else
+ echo "Logout cancelled.";
+fi
+
diff --git a/packages/fluxbox/fluxbox/keylaunchrc.fluxbox b/packages/fluxbox/fluxbox/keylaunchrc.fluxbox
new file mode 100644
index 0000000000..921fa9fb1f
--- /dev/null
+++ b/packages/fluxbox/fluxbox/keylaunchrc.fluxbox
@@ -0,0 +1,28 @@
+key=....F9:-:gpe-calendar
+key=....F10:-:gpe-contacts
+key=....F13:-:sylpheed
+#key=....F12:-:~matchbox-remote -next
+#key=...*F12:-:~matchbox-remote -desktop
+#key=....F11:-:~matchbox-remote -menu
+#key=...*1:-:~zoom out
+#key=...*2:-:~zoom in
+key=...*3:-:~display-brightness.sh down
+key=...*4:-:~display-brightness.sh up
+
+# LCD Softkeys
+# Please note that the space _between_ two softkeys can be used, too ;)
+key=....F20:-:~matchbox-remote -next
+key=....F21:-:~matchbox-remote -desktop
+key=....F22:-:~matchbox-remote -prev
+key=....F23:-:sylpheed
+#key=....F24:-:
+key=....F25:-:gpe-contacts
+#key=....F26:-:
+key=....F27:-:gpe-calendar
+#key=....F28:-:
+key=....F29:-:gpe-mini-browser
+#key=....F30:-:
+
+# VT changing
+key=...*Left:-:~chvt 1
+key=...*Right:-:~chvt 3
diff --git a/packages/fluxbox/fluxbox/keys.akita b/packages/fluxbox/fluxbox/keys.akita
new file mode 100644
index 0000000000..ec84632597
--- /dev/null
+++ b/packages/fluxbox/fluxbox/keys.akita
@@ -0,0 +1,7 @@
+Mod1 Tab :NextWindow
+Mod1 Shift Tab :PrevWindow
+F12 :NextWindow 2
+F11 :ExecCommand matchbox-remote -menu
+Mod4 F11 :RootMenu
+Mod4 F12 :Minimize
+Mod1 r :Reconfigure
diff --git a/packages/fluxbox/fluxbox/keys.default b/packages/fluxbox/fluxbox/keys.default
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/fluxbox/fluxbox/keys.default
diff --git a/packages/fluxbox/fluxbox_0.99+1.0rc.bb b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
index 5cb05d96d5..0b03ffa9ee 100644
--- a/packages/fluxbox/fluxbox_0.99+1.0rc.bb
+++ b/packages/fluxbox/fluxbox_0.99+1.0rc.bb
@@ -10,7 +10,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
HOMEPAGE = "http://fluxbox.sourceforge.net"
LICENSE = "MIT"
REALPV = "1.0rc"
-PR = "r2"
+PR = "r3"
######################################################################################
@@ -23,7 +23,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/fluxbox/fluxbox-${REALPV}.tar.gz \
file://apps.gpe.* \
file://style.gpe-default \
file://fluxbox-gpe-session \
- file://fluxbox-gpe.session"
+ file://fluxbox-gpe.session \
+ file://keys.* \
+ file://keylaunchrc.fluxbox \
+ file://gpe-logout.fluxbox"
######################################################################################
@@ -41,6 +44,9 @@ FILES_${PN} = "/usr/bin \
/usr/share/fluxbox/menu "
FILES_${PN}-gpe = "/usr/share/fluxbox/apps.gpe* \
+ /usr/share/fluxbox/keys.* \
+ /usr/bin/gpe-logout.fluxbox \
+ /etc/keylaunchrc.fluxbox \
/usr/share/fluxbox/styles/gpe-default \
/usr/share/fluxbox/session \
/usr/bin/fluxbox-gpe-session"
@@ -64,19 +70,27 @@ do_install_append() {
install -d ${D}/usr/bin
install -d ${D}/usr/share/fluxbox
install -d ${D}/usr/share/fluxbox/styles
+ install -d ${D}/etc
install -m 0644 ${WORKDIR}/apps.gpe.* ${D}/usr/share/fluxbox
+ install -m 0644 ${WORKDIR}/keys.* ${D}/usr/share/fluxbox
install -m 0755 ${WORKDIR}/fluxbox-gpe.session ${D}/usr/share/fluxbox/session
install -m 0644 ${WORKDIR}/style.gpe-default ${D}/usr/share/fluxbox/styles/gpe-default
install -m 0755 ${WORKDIR}/fluxbox-gpe-session ${D}/usr/bin
+ install -m 0755 ${WORKDIR}/gpe-logout.fluxbox ${D}/usr/bin
+ install -m 0644 ${WORKDIR}/keylaunchrc.fluxbox ${D}/etc
}
######################################################################################
pkg_postinst_${PN}-gpe() {
update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/fluxbox-gpe-session 15
+ update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.fluxbox 15
+ update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.fluxbox 15
}
pkg_postrm_${PN}-gpe() {
update-alternatives --remove x-window-manager /usr/bin/fluxbox-gpe-session
+ update-alternatives --remove gpe-logout /usr/bin/gpe-logout.fluxbox
+ update-alternatives --remove keylaunchrc /etc/keylaunchrc.fluxbox
}
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
index 6a373cbd4b..8879833c6e 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -12,6 +12,8 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question
SRC_URI += "file://matchbox-session \
file://disable-composite.xsettings"
+PR = "r1"
+
#apply a patch to set the fontsize for bigdpi (200+) devices to 5
SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
@@ -29,6 +31,16 @@ do_install_append() {
install -d ${D}${sysconfdir}/gpe/xsettings-default.d
install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+
+ mv ${D}/usr/bin/gpe-logout ${D}/usr/bin/gpe-logout.matchbox
+}
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /usr/bin/gpe-logout gpe-logout /usr/bin/gpe-logout.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove gpe-logout /usr/bin/gpe-logout.matchbox
}
# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb
index 67ed0923f2..990de0cba7 100644
--- a/packages/keylaunch/keylaunch_2.0.10.bb
+++ b/packages/keylaunch/keylaunch_2.0.10.bb
@@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\
program is already running, keylaunch can bring its window to the front\
rather than just running another copy."
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r5"
+PR = "r6"
SRC_URI += " file://keylaunchrc"
@@ -21,4 +21,17 @@ do_install_prepend () {
install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc
}
+do_install_append() {
+ # yeah I know...this is less than ideal
+ mv ${D}/etc/keylaunchrc ${D}/etc/keylaunchrc.matchbox
+}
+
export CVSBUILD="no"
+
+pkg_postinst_${PN}() {
+ update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
+}