new

8 files changed, 255 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..0220186a3a1d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,37 @@
+pkgbase = oblogout-blurlock
+	pkgdesc = Systemd/OpenRC-compatible logout script for Openbox, Fluxbox and others including OutMok icons and blurlock. Originally written for Manjaro-Fluxbox
+	pkgver = 20150926
+	pkgrel = 2
+	url = https://forum.manjaro.org/index.php?topic=25894.0
+	install = oblogout-blurlock.install
+	arch = any
+	license = GPL2
+	makedepends = git
+	depends = i3lock
+	depends = imagemagick
+	depends = pygtk
+	depends = python2-pillow
+	depends = python2-distutils-extra
+	depends = python2-dbus
+	optdepends = upower
+	optdepends = lightdm: for switch-user function
+	conflicts = fluxlogout
+	conflicts = oblogout
+	conflicts = openboxlogout-gnome
+	replaces = fluxlogout
+	backup = etc/oblogout.conf
+	source = fluxboxexit
+	source = ob_blurlock
+	source = oblogout.conf
+	source = oblogout_blur
+	source = http://www.oberon.at/oberon/src/OutMok.tar.xz
+	source = switch-user.patch
+	md5sums = f10cb96555b02245d944b381abb14221
+	md5sums = 67eff1ab5310456841c887ad6b06bf50
+	md5sums = 12a8c357f261db5752c7841ed7b4e678
+	md5sums = 0e9d42c6c83022515d3b14275f630f87
+	md5sums = a30813dafbe1b9d650db2f237ac1d89d
+	md5sums = 86a7a64ae86c0d733f69d37da05eb357
+
+pkgname = oblogout-blurlock
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..7575124b9961
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,71 @@
+# Maintainer: Bernhard Landauer <oberon@manjaro.org>
+# Contributor: Kirill Malyshev <keryascorpio at gmail.com>
+# Contributor: Robert Orzanna <orschiro@googlemail.com>
+
+pkgname=oblogout-blurlock
+_gitname="oblogout-fork"
+pkgver=20150926
+pkgrel=2
+pkgdesc="Systemd/OpenRC-compatible logout script for Openbox, Fluxbox and others including OutMok icons and blurlock. Originally written for Manjaro-Fluxbox"
+arch=('any')
+url="https://forum.manjaro.org/index.php?topic=25894.0"
+_gitroot="git://github.com/Cloudef/oblogout-fork.git"
+license=('GPL2')
+depends=('i3lock'
+	'imagemagick'
+	'pygtk'
+	'python2-pillow'
+	'python2-distutils-extra'
+	'python2-dbus')
+optdepends=('upower'
+	'lightdm: for switch-user function')
+makedepends=('git')
+install=$pkgname.install 
+conflicts=('fluxlogout'
+	'oblogout'
+	'openboxlogout-gnome')
+replaces=('fluxlogout')
+backup=('etc/oblogout.conf')
+source=(fluxboxexit
+	ob_blurlock
+	oblogout.conf
+	oblogout_blur
+	http://www.oberon.at/oberon/src/OutMok.tar.xz
+	switch-user.patch)
+md5sums=('f10cb96555b02245d944b381abb14221'
+         '67eff1ab5310456841c887ad6b06bf50'
+         '12a8c357f261db5752c7841ed7b4e678'
+         '0e9d42c6c83022515d3b14275f630f87'
+         'a30813dafbe1b9d650db2f237ac1d89d'
+         '86a7a64ae86c0d733f69d37da05eb357')
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
+  else
+    git clone $_gitroot $_gitname --dept=1
+  fi
+
+  cd "$srcdir/$_gitname"
+
+  patch -p1 < "$srcdir/switch-user.patch"
+}
+
+package() {
+  cd "$srcdir/$_gitname"
+  python2 setup.py install --root="$pkgdir/"
+
+  cd "$srcdir"
+  install -m755 "$srcdir/fluxboxexit" "$pkgdir/usr/bin/"
+  install -m755 "$srcdir/ob_blurlock" "$pkgdir/usr/bin/"
+  install -m755 "$srcdir/oblogout_blur" "$pkgdir/usr/bin/"
+  install -Dm644 "$srcdir/oblogout.conf" "$pkgdir/etc/oblogout-blurlock.conf"
+  mkdir -p "$pkgdir/usr/share/themes/OutMok" \
+	"$pkgdir/usr/share/themes/OutMok-small"
+  cp -r "$srcdir/OutMok/oblogout" "$pkgdir/usr/share/themes/OutMok"
+  cp -r "$srcdir/OutMok-small/oblogout" "$pkgdir/usr/share/themes/OutMok-small"
+}
diff --git a/fluxboxexit b/fluxboxexit
new file mode 100644
index 000000000000..5c1cb177e56c
--- /dev/null
+++ b/fluxboxexit
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+case "$1" in
+logout)
+  if [ $DESKTOP_SESSION = "fluxbox" ]; then
+    killall fluxbox
+  elif [ $DESKTOP_SESSION = "openbox" ]; then
+    openbox --exit
+  elif [ $DESKTOP_SESSION = "i3" ]; then
+    i3-msg exit
+  elif [ $DESKTOP_SESSION = "bspwm" ]; then
+    bspc quit 1
+  else
+    pkill -KILL -u $USER
+  fi
+;;
+suspend)
+  if [ $(cat /proc/1/comm) = "systemd" ]; then
+    systemctl suspend
+  else
+    dbus-send --system --dest=org.freedesktop.ConsoleKit --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Suspend boolean:true
+  fi
+;;
+hibernate)
+  if [ $(cat /proc/1/comm) = "systemd" ]; then
+    systemctl hibernate
+  else
+    dbus-send --system --dest=org.freedesktop.ConsoleKit --type=method_call --print-reply --reply-timeout=2000 /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Hibernate boolean:true
+  fi
+;;
+reboot)
+  if [ $(cat /proc/1/comm) = "systemd" ]; then
+    systemctl reboot
+  else
+    dbus-send --system --print-reply --type=method_call --reply-timeout=2000 --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Restart
+  fi
+;;
+shutdown)
+  if [ $(cat /proc/1/comm) = "systemd" ]; then
+    systemctl poweroff
+  else
+    dbus-send --system --print-reply --type=method_call --reply-timeout=2000 --dest=org.freedesktop.ConsoleKit /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop
+  fi
+;;
+esac
+exit 0
\ No newline at end of file
diff --git a/ob_blurlock b/ob_blurlock
new file mode 100755
index 000000000000..eea068539c26
--- /dev/null
+++ b/ob_blurlock
@@ -0,0 +1,11 @@
+# !/bin/bash
+# blurlock for oblogout-manjaro
+
+if [ -e /tmp/screenshot.png ]; then
+  convert /tmp/screenshot.png -blur 0x5 /tmp/screenshotblur.png
+  i3lock -i /tmp/screenshotblur.png
+else
+  i3lock -ec 000000
+fi
+
+exit 0
diff --git a/oblogout-blurlock.install b/oblogout-blurlock.install
new file mode 100644
index 000000000000..87418eda4b7a
--- /dev/null
+++ b/oblogout-blurlock.install
@@ -0,0 +1,20 @@
+post_install() {
+
+msg() {
+ALL_OFF="\e[1;0m"
+BOLD="\e[1;1m"
+GREEN="${BOLD}\e[1;32m"
+local mesg=$1; shift
+printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
+}
+
+if [ -e /etc/oblogout.conf ]; then
+  msg "existing oblogout.conf will be saved as /etc/oblogout.conf.bak"
+  mv /etc/oblogout.conf /etc/oblogout.conf.bak
+fi
+cp etc/oblogout-manjaro.conf etc/oblogout.conf
+}
+
+post_upgrade() {
+	post_install
+}
diff --git a/oblogout.conf b/oblogout.conf
new file mode 100644
index 000000000000..f37c9852d196
--- /dev/null
+++ b/oblogout.conf
@@ -0,0 +1,29 @@
+[settings]
+usehal = false
+
+[looks]
+opacity = 10
+bgcolor = black
+# buttontheme = OutMok
+buttontheme = OutMok-small
+buttons = lock, logout, switch, suspend, hibernate, restart, shutdown, cancel
+
+[shortcuts]
+lock = K
+logout = L
+switch = W
+suspend = U
+hibernate = H
+restart = R
+shutdown = S
+cancel = Escape
+
+[commands]
+lock = ob_blurlock
+# lock = i3lock -ec 1f1f1f
+logout = fluxboxexit logout
+switch = dm-tool switch-to-greeter
+suspend = fluxboxexit suspend
+hibernate = fluxboxexit hibernate
+restart = fluxboxexit reboot
+shutdown = fluxboxexit shutdown
diff --git a/oblogout_blur b/oblogout_blur
new file mode 100644
index 000000000000..a1593ade7e7e
--- /dev/null
+++ b/oblogout_blur
@@ -0,0 +1,8 @@
+# !/bin/bash
+# /usr/bin/oblogout_blur
+# lauch oblogout with blurlock
+
+scrot /tmp/screenshot.png &&
+oblogout
+
+exit 0
diff --git a/switch-user.patch b/switch-user.patch
new file mode 100644
index 000000000000..9354a96a5f18
--- /dev/null
+++ b/switch-user.patch
@@ -0,0 +1,33 @@
+diff --git a/data/oblogout.conf b/data/oblogout.conf
+index bcff191..3c9bc57 100644
+--- a/data/oblogout.conf
++++ b/data/oblogout.conf
+@@ -52,5 +52,5 @@ safesuspend = safesuspend
+ # <--
+ 
+ lock        = gnome-screensaver-command -l
+-switchuser  = gdm-control --switch-user
++switch      = gdm-control --switch-user
+ logout      = openbox --exit
+diff --git a/oblogout/__init__.py b/oblogout/__init__.py
+index 69ca4c5..78611e1 100755
+--- a/oblogout/__init__.py
++++ b/oblogout/__init__.py
+@@ -60,7 +60,7 @@ class OpenboxLogout():
+     cmd_hibernate = "pmi action hibernate"
+     cmd_safesuspend = ""
+     cmd_lock = "gnome-screensaver-command -l"
+-    cmd_switchuser = "gdm-control --switch-user"
++    cmd_switch = "gdm-control --switch-user"
+     cmd_logout = "openbox --exit"
+ 
+     def __init__(self, config=None, local=None):
+@@ -409,7 +409,7 @@ class OpenboxLogout():
+             self.__exec_cmd(self.cmd_lock)
+ 
+         elif (data == 'switch'):
+-            self.__exec_cmd(self.cmd_switchuser)
++            self.__exec_cmd(self.cmd_switch)
+ 
+         self.quit()
+