summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Palmowski <wszystkie.fajne.loginy.zajete@gmail.com>2009-09-28 23:27:11 +0200
committerBartlomiej Palmowski <wszystkie.fajne.loginy.zajete@gmail.com>2009-09-28 23:27:11 +0200
commita50301cf8afc679aa99b3234e6dc99bf777b5eeb (patch)
tree988644e9dbee7fe8db6d87bee3ed13923210f6ab
parent0339a69f08188fac4899f96474543da7769e0f4d (diff)
downloadcontrib-a50301cf8afc679aa99b3234e6dc99bf777b5eeb.tar.gz
contrib-a50301cf8afc679aa99b3234e6dc99bf777b5eeb.tar.xz
awesome: updated to latest possible version
-rw-r--r--awesome/.footprint55
-rw-r--r--awesome/.md5sum10
-rw-r--r--awesome/Pkgfile14
-rw-r--r--awesome/README6
-rw-r--r--awesome/awesome-client.112
-rw-r--r--awesome/awesome.151
-rw-r--r--awesome/awesomerc.54
-rw-r--r--awesome/awsetbg.14
8 files changed, 101 insertions, 55 deletions
diff --git a/awesome/.footprint b/awesome/.footprint
index 7a98b4948..ff1fc8ec5 100644
--- a/awesome/.footprint
+++ b/awesome/.footprint
@@ -28,6 +28,8 @@ drwxr-xr-x root/root usr/share/awesome/icons/invaders/
-rw-r--r-- root/root usr/share/awesome/icons/invaders/player.png
drwxr-xr-x root/root usr/share/awesome/lib/
drwxr-xr-x root/root usr/share/awesome/lib/awful/
+-rw-r--r-- root/root usr/share/awesome/lib/awful/button.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/button.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/client.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/client.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/completion.lua
@@ -36,6 +38,8 @@ drwxr-xr-x root/root usr/share/awesome/lib/awful/
-rw-r--r-- root/root usr/share/awesome/lib/awful/hooks.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/init.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/init.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/key.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/key.lua.in
drwxr-xr-x root/root usr/share/awesome/lib/awful/layout/
-rw-r--r-- root/root usr/share/awesome/lib/awful/layout/init.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/layout/init.lua.in
@@ -60,16 +64,33 @@ drwxr-xr-x root/root usr/share/awesome/lib/awful/layout/suit/
-rw-r--r-- root/root usr/share/awesome/lib/awful/placement.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/prompt.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/prompt.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/remote.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/remote.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/screen.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/screen.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/startup_notification.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/startup_notification.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/tag.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/tag.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/titlebar.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/titlebar.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/awful/util.lua
-rw-r--r-- root/root usr/share/awesome/lib/awful/util.lua.in
--rw-r--r-- root/root usr/share/awesome/lib/awful/widget.lua
--rw-r--r-- root/root usr/share/awesome/lib/awful/widget.lua.in
+drwxr-xr-x root/root usr/share/awesome/lib/awful/widget/
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/button.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/button.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/common.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/common.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/init.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/init.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/launcher.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/launcher.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/prompt.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/prompt.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/taglist.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/taglist.lua.in
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/tasklist.lua
+-rw-r--r-- root/root usr/share/awesome/lib/awful/widget/tasklist.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/beautiful.lua
-rw-r--r-- root/root usr/share/awesome/lib/beautiful.lua.in
-rw-r--r-- root/root usr/share/awesome/lib/invaders.lua
@@ -90,6 +111,8 @@ drwxr-xr-x root/root usr/share/awesome/themes/default/layouts/
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/fairvw.png
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/floating.png
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/floatingw.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/fullscreen.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/fullscreenw.png
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/magnifier.png
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/magnifierw.png
-rw-r--r-- root/root usr/share/awesome/themes/default/layouts/max.png
@@ -109,11 +132,27 @@ drwxr-xr-x root/root usr/share/awesome/themes/default/taglist/
drwxr-xr-x root/root usr/share/awesome/themes/default/tasklist/
-rw-r--r-- root/root usr/share/awesome/themes/default/tasklist/floating.png
-rw-r--r-- root/root usr/share/awesome/themes/default/tasklist/floatingw.png
--rw-r--r-- root/root usr/share/awesome/themes/default/theme
--rw-r--r-- root/root usr/share/awesome/themes/default/theme.in
+-rw-r--r-- root/root usr/share/awesome/themes/default/theme.lua
+-rw-r--r-- root/root usr/share/awesome/themes/default/theme.lua.in
drwxr-xr-x root/root usr/share/awesome/themes/default/titlebar/
--rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/close.png
--rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/closer.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/close_focus.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/close_normal.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/floating_focus_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/floating_focus_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/floating_normal_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/floating_normal_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/maximized_focus_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/maximized_focus_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/maximized_normal_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/maximized_normal_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/ontop_focus_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/ontop_focus_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/ontop_normal_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/ontop_normal_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/sticky_focus_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/sticky_focus_inactive.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/sticky_normal_active.png
+-rw-r--r-- root/root usr/share/awesome/themes/default/titlebar/sticky_normal_inactive.png
drwxr-xr-x root/root usr/share/awesome/themes/sky/
-rw-r--r-- root/root usr/share/awesome/themes/sky/awesome-icon.png
drwxr-xr-x root/root usr/share/awesome/themes/sky/layouts/
@@ -128,7 +167,7 @@ drwxr-xr-x root/root usr/share/awesome/themes/sky/layouts/
-rw-r--r-- root/root usr/share/awesome/themes/sky/layouts/tileleft.png
-rw-r--r-- root/root usr/share/awesome/themes/sky/layouts/tiletop.png
-rw-r--r-- root/root usr/share/awesome/themes/sky/sky-background.png
--rw-r--r-- root/root usr/share/awesome/themes/sky/theme
--rw-r--r-- root/root usr/share/awesome/themes/sky/theme.in
+-rw-r--r-- root/root usr/share/awesome/themes/sky/theme.lua
+-rw-r--r-- root/root usr/share/awesome/themes/sky/theme.lua.in
drwxr-xr-x root/root usr/share/xsessions/
-rw-r--r-- root/root usr/share/xsessions/awesome.desktop
diff --git a/awesome/.md5sum b/awesome/.md5sum
index 383214ec3..6d04df119 100644
--- a/awesome/.md5sum
+++ b/awesome/.md5sum
@@ -1,5 +1,5 @@
-9bae1fface6b4cbbcd4380066845269f awesome-3.2.1.tar.bz2
-c3c2aecedef603d229b844d696d4ff42 awesome-client.1
-1980bff10d538a0df5cfd87af8252146 awesome.1
-e4e47464504f59174ab68c41b41c34e6 awesomerc.5
-9a9feae14c95cf50f9489de9ff2f6d75 awsetbg.1
+39cdf5e86f761c3ca73f0b2b6427a961 awesome-3.3.2.tar.bz2
+8fef72c3934633cafe00e0177be3f7f0 awesome-client.1
+d940145b5cd94128f1c9eb09931818e6 awesome.1
+acf34f1e71416edd4f722ccc846c375b awesomerc.5
+00e4641274ac1d2110d80c0ad7aba5dc awsetbg.1
diff --git a/awesome/Pkgfile b/awesome/Pkgfile
index bcc7908fb..7af6261ea 100644
--- a/awesome/Pkgfile
+++ b/awesome/Pkgfile
@@ -1,11 +1,11 @@
-# Description: extremely fast, small, and dynamic window manager for X
+# Description: fast, small, and dynamic window manager for X (which sucks more)
# URL: http://awesome.naquadah.org/
# Maintainer: Bartlomiej Palmowski, rotwang at crux dot org dot pl
-# Depends on: cmake gperf glib lua cairo pango imlib2 libev dbus
+# Depends on: cmake gperf glib lua cairo pango imlib2 libev dbus imagemagick libxdg-basedir xorg-xcb-util
name=awesome
-version=3.2.1
-release=2
+version=3.3.2
+release=1
source=(http://$name.naquadah.org/download/$name-$version.tar.bz2
$name-client.1 $name.1 awsetbg.1 ${name}rc.5)
@@ -20,18 +20,14 @@ build() {
sed -i '/\${AWESOME_OPTIONAL_INCLUDE_DIRS})$/s/)$/ ${LIBEV_INCLUDE_DIRS})/' \
CMakeLists.txt
# remove warnings on redundand declarations and undefined identifier stuff
- # so we doesnt get shitloads of warnings from ev.h
+ # so we doesn't get shitloads of warnings from ev.h
sed -i -e 's/-Wredundant-decls//' \
-e 's/-Wundef//' awesomeConfig.cmake
cmake . -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DXDG_CONFIG_DIR=/usr/etc/xdg \
-DAWESOME_MAN_PATH=/usr/man \
- -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-DGENERATE_MANPAGES=OFF \
-DLIBEV_INCLUDE_DIRS=/usr/include/libev
- # at this point i'd like to express my aversion to cmake
- # I sincerely hate it :<
make
make DESTDIR=$PKG install
diff --git a/awesome/README b/awesome/README
index 3f2a7e2c5..354d7675a 100644
--- a/awesome/README
+++ b/awesome/README
@@ -12,4 +12,10 @@ PRE-INSTALL
POST-INSTALL
+ After succesful installation you can use
+/usr/etc/xdg/awesome/rc.lua as default configuration file,
+awesome -c /usr/etc/xdg/awesome/rc.lua
+or copy it to your $HOME/.config/awesome
+ See awesome and awesomerc man pages for futher details.
+
PRECAUTION
diff --git a/awesome/awesome-client.1 b/awesome/awesome-client.1
index 9d0654ad1..8a0265740 100644
--- a/awesome/awesome-client.1
+++ b/awesome/awesome-client.1
@@ -1,27 +1,27 @@
.\" Title: awesome-client
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 04/20/2009
+.\" Date: 09/28/2009
.\" Manual:
.\" Source:
.\"
-.TH "AWESOME\-CLIENT" "1" "04/20/2009" "" ""
+.TH "AWESOME\-CLIENT" "1" "09/28/2009" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.SH "NAME"
-awesome-client - awesome window manager command line interface
+awesome-client - awesome window manager remote execution
.SH "SYNOPSIS"
awesome\-client
.sp
.SH "DESCRIPTION"
-awesome\-client is the command line interface to awesome\. It communicates with awesome via a socket located in the users\(cqs HOME directory\. It permits to execute Lua code remotely\.
+awesome\-client is a remote command line interface to awesome\. It communicates with awesome via D\-Bus\. It permits to execute Lua code remotely\.
.sp
.SH "USAGE"
-To determine which socket is to be used, it reads the DISPLAY environment variable\. awesome\-client reads commands from standard input\.
+awesome\-client reads commands from standard input and send via D\-Bus to awesome\. If \fIrlwrap\fR is installed, it will be used to provide a readline command line interface\.
.sp
-When you pipe multiple lines into awesome\-client, an empty line will flush already collected lines into awesome with an according immediate execution\.
+The \fIawful\.remote\fR module has to be loaded if you want this command to work\.
.sp
.SH "SEE ALSO"
awesome(1) awesomerc(5)
diff --git a/awesome/awesome.1 b/awesome/awesome.1
index 8c4d1d2de..66ba1e64e 100644
--- a/awesome/awesome.1
+++ b/awesome/awesome.1
@@ -1,11 +1,11 @@
.\" Title: awesome
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 04/20/2009
+.\" Date: 09/28/2009
.\" Manual:
.\" Source:
.\"
-.TH "AWESOME" "1" "04/20/2009" "" ""
+.TH "AWESOME" "1" "09/28/2009" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@@ -97,24 +97,24 @@ Resize window\.
.SH "DEFAULT KEY BINDINGS"
.SS "Window manager control"
.PP
-\fBMod4 + Control \e+ r\fR
+\fBMod4 \e+ Control \e+ r\fR
.RS 4
Restart
\fBawesome\fR\.
.RE
.PP
-\fBMod4 + Shift \e+ q\fR
+\fBMod4 \e+ Shift \e+ q\fR
.RS 4
Quit
\fBawesome\fR\.
.RE
.PP
-\fBMod4 \e+ F1\fR
+\fBMod4 \e+ r\fR
.RS 4
Run prompt\.
.RE
.PP
-\fBMod4 \e+ F4\fR
+\fBMod4 \e+ x\fR
.RS 4
Run Lua code prompt\.
.RE
@@ -123,9 +123,14 @@ Run Lua code prompt\.
.RS 4
Spawn terminal emulator\.
.RE
+.PP
+\fBMod4 \e+ w\fR
+.RS 4
+Open main menu\.
+.RE
.SS "Clients"
.PP
-\fBMod4 + Shift \e+ r\fR
+\fBMod4 \e+ Shift \e+ r\fR
.RS 4
Redraw the focused window\.
.RE
@@ -140,7 +145,7 @@ Maximize client\.
Set client fullscreen\.
.RE
.PP
-\fBMod4 + Shift \e+ c\fR
+\fBMod4 \e+ Shift \e+ c\fR
.RS 4
Kill focused client\.
.RE
@@ -181,12 +186,12 @@ View next tag\.
Switch to tag 1\-9\.
.RE
.PP
-\fBMod4 + Control \e+ j\fR
+\fBMod4 \e+ Control \e+ j\fR
.RS 4
Focus next screen\.
.RE
.PP
-\fBMod4 + Control \e+ k\fR
+\fBMod4 \e+ Control \e+ k\fR
.RS 4
Focus previous screen\.
.RE
@@ -197,12 +202,12 @@ Focus previously selected tag set\.
.RE
.SS "Layout modification"
.PP
-\fBMod4 + Shift \e+ j\fR
+\fBMod4 \e+ Shift \e+ j\fR
.RS 4
Switch client with next client\.
.RE
.PP
-\fBMod4 + Shift \e+ k\fR
+\fBMod4 \e+ Shift \e+ k\fR
.RS 4
Switch client with previous client\.
.RE
@@ -222,22 +227,22 @@ Decrease master width factor by 5%\.
Increase master width factor by 5%\.
.RE
.PP
-\fBMod4 + Shift \e+ h\fR
+\fBMod4 \e+ Shift \e+ h\fR
.RS 4
Increase number of master windows by 1\.
.RE
.PP
-\fBMod4 + Shift \e+ l\fR
+\fBMod4 \e+ Shift \e+ l\fR
.RS 4
Decrease number of master windows by 1\.
.RE
.PP
-\fBMod4 + Control \e+ h\fR
+\fBMod4 \e+ Control \e+ h\fR
.RS 4
Increase number of columns for non\-master windows by 1\.
.RE
.PP
-\fBMod4 + Control \e+ l\fR
+\fBMod4 \e+ Control \e+ l\fR
.RS 4
Decrease number of columns for non\-master windows by 1\.
.RE
@@ -247,37 +252,37 @@ Decrease number of columns for non\-master windows by 1\.
Switch to next layout\.
.RE
.PP
-\fBMod4 + Shift \e+ space\fR
+\fBMod4 \e+ Shift \e+ space\fR
.RS 4
Switch to previous layout\.
.RE
.PP
-\fBMod4 + Control \e+ space\fR
+\fBMod4 \e+ Control \e+ space\fR
.RS 4
Toggle client floating status\.
.RE
.PP
-\fBMod4 + Control \e+ Return\fR
+\fBMod4 \e+ Control \e+ Return\fR
.RS 4
Swap focused client with master\.
.RE
.PP
-\fBMod4 + Control \e+ 1\-9\fR
+\fBMod4 \e+ Control \e+ 1\-9\fR
.RS 4
Toggle tag view\.
.RE
.PP
-\fBMod4 + Shift \e+ 1\-9\fR
+\fBMod4 \e+ Shift \e+ 1\-9\fR
.RS 4
Tag client with tag\.
.RE
.PP
-\fBMod4 + Shift + Control \e+ 1\-9\fR
+\fBMod4 \e+ Shift \e+ Control \e+ 1\-9\fR
.RS 4
Toggle tag on client\.
.RE
.PP
-\fBMod4 + Shift \e+ F1\-9\fR
+\fBMod4 \e+ Shift \e+ F1\-9\fR
.RS 4
Tag marked clients with tag\.
.RE
diff --git a/awesome/awesomerc.5 b/awesome/awesomerc.5
index 45708a2e4..4305968ea 100644
--- a/awesome/awesomerc.5
+++ b/awesome/awesomerc.5
@@ -1,11 +1,11 @@
.\" Title: awesomerc
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 04/20/2009
+.\" Date: 09/28/2009
.\" Manual:
.\" Source:
.\"
-.TH "AWESOMERC" "5" "04/20/2009" "" ""
+.TH "AWESOMERC" "5" "09/28/2009" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
diff --git a/awesome/awsetbg.1 b/awesome/awsetbg.1
index e7bb73548..72a56c1b8 100644
--- a/awesome/awsetbg.1
+++ b/awesome/awsetbg.1
@@ -1,11 +1,11 @@
.\" Title: awsetbg
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 04/20/2009
+.\" Date: 09/28/2009
.\" Manual:
.\" Source:
.\"
-.TH "AWSETBG" "1" "04/20/2009" "" ""
+.TH "AWSETBG" "1" "09/28/2009" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)

Generated by cgit