wok-next view compiz-manager/stuff/patches/compiz-manager.patch @ rev 21042

Update Compiz Reloaded project
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Nov 10 17:21:54 2018 +0200 (2018-11-10)
parents
children
line source
1 --- a/compiz-manager
2 +++ b/compiz-manager
3 @@ -1,4 +1,4 @@
4 -#!/bin/bash
5 +#!/bin/sh
6 # Compiz Manager wrapper script
7 #
8 # Copyright (c) 2007 Kristian Lyngstøl <kristian@bohemians.org>
9 @@ -27,15 +27,7 @@
10 #
11
12
13 -# LIBDIR differs between x86 and x86_64, arm and aarch64, ppc and ppc64.
14 -ARCH="$(uname -m)"
15 -if [ -d '/usr/lib64/' ] && [[ "$ARCH" = *64 ]]; then
16 - LIBDIR='/usr/lib64'
17 -else
18 - LIBDIR='/usr/lib'
19 -fi
20 -
21 -COMPIZ_BIN_PATH="$(dirname "$(which compiz)")" # For window decorators and compiz.
22 +COMPIZ_BIN_PATH="$(dirname $(which compiz))" # For window decorators and compiz.
23 PLUGIN_PATH="$LIBDIR/compiz"
24 GLXINFO="$(which glxinfo 2>/dev/null)"
25 METACITY="$(which metacity 2>/dev/null)"
26 @@ -52,9 +44,9 @@
27 # For detecting what driver is in use, the + is for one or more /'s.
28 XORG_DRIVER_PATH="$LIBDIR/xorg/.*/+"
29 FALLBACKWM="xterm"
30 -if [[ "$XDG_CURRENT_DESKTOP" == "MATE" ]] || [ ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
31 +if [ "$XDG_CURRENT_DESKTOP" == "MATE" -o ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
32 FALLBACKWM="$MARCO"
33 -elif [[ "$XDG_CURRENT_DESKTOP" == "GNOME" ]] || [ ! -z "$GNOME_DESKTOP_SESSION_ID" ]; then
34 +elif [ "$XDG_CURRENT_DESKTOP" == "GNOME" -o ! -z "$GNOME_DESKTOP_SESSION_ID" ]; then
35 FALLBACKWM="$METACITY"
36 elif ( xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1 ); then
37 FALLBACKWM="$XFWM"
38 @@ -78,7 +70,7 @@
39 # Echos the arguments if verbose.
40 verbose()
41 {
42 - if [[ "$VERBOSE" == "yes" ]]; then
43 + if [ "$VERBOSE" == "yes" ]; then
44 printf "$*"
45 fi
46 }
47 @@ -86,12 +78,12 @@
48 # Abort script and run fallback window manager.
49 abort_with_fallback_wm()
50 {
51 - if [[ "$SKIP_CHECKS" == "yes" ]]; then
52 + if [ "$SKIP_CHECKS" == "yes" ]; then
53 verbose "SKIP_CHECKS is yes, so continuing despite problems.\n"
54 return 0
55 fi
56
57 - if [[ "$CM_DRY" == "yes" ]]; then
58 + if [ "$CM_DRY" == "yes" ]; then
59 verbose "Dry run failed: Problems detected with 3D support.\n"
60 exit 1
61 fi
62 @@ -124,7 +116,7 @@
63 check_fbconfig()
64 {
65 verbose "Checking for FBConfig: "
66 - if [[ "$INDIRECT" == "yes" ]]; then
67 + if [ "$INDIRECT" == "yes" ]; then
68 "$GLXINFO" -i | grep -q 'GLX.*fbconfig'
69 FB=$?
70 else
71 @@ -132,7 +124,7 @@
72 FB=$?
73 fi
74
75 - if [[ $FB == "0" ]]; then
76 + if [ $FB == "0" ]; then
77 unset FB
78 verbose "present. \n"
79 return 0
80 @@ -153,7 +145,7 @@
81 return 0
82 else
83 verbose "not present. \n"
84 - if [[ "$INDIRECT" == "yes" ]]; then
85 + if [ "$INDIRECT" == "yes" ]; then
86 unset LIBGL_ALWAYS_INDIRECT
87 INDIRECT="no"
88 return 1
89 @@ -232,7 +224,7 @@
90 HRES=$(echo "$RESOLUTION" | cut -dx -f1)
91 VRES=$(echo "$RESOLUTION" | cut -dx -f2)
92 verbose "Comparing resolution ($res) to maximum 3D texture size ($TEXTURE_LIMIT): ";
93 - if [ "$VRES" -gt "$TEXTURE_LIMIT" ] || [ "$HRES" -gt "$TEXTURE_LIMIT" ]; then
94 + if [ "$VRES" -gt "$TEXTURE_LIMIT" -o "$HRES" -gt "$TEXTURE_LIMIT" ]; then
95 verbose "Failed.\n"
96 return 1
97 fi
98 @@ -246,7 +238,7 @@
99 if ( check_nvidia ); then
100 ENV="__GL_YIELD=NOTHING "
101 fi
102 - if [[ "$INDIRECT" == "yes" ]]; then
103 + if [ "$INDIRECT" == "yes" ]; then
104 ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 "
105 fi
106
107 @@ -259,14 +251,14 @@
108
109 build_args()
110 {
111 - if [[ "$LIBGL_ALWAYS_INDIRECT" == "1" ]]; then
112 + if [ "$LIBGL_ALWAYS_INDIRECT" == "1" ]; then
113 COMPIZ_OPTIONS="$COMPIZ_OPTIONS --indirect-rendering "
114 fi
115 if [ ! -z "$DESKTOP_AUTOSTART_ID" ]; then
116 COMPIZ_OPTIONS="$COMPIZ_OPTIONS --sm-client-id $DESKTOP_AUTOSTART_ID"
117 fi
118 if ( check_nvidia ); then
119 - if [[ "$LIBGL_ALWAYS_INDIRECT" != "1" ]]; then
120 + if [ "$LIBGL_ALWAYS_INDIRECT" != "1" ]; then
121 COMPIZ_OPTIONS="$COMPIZ_OPTIONS --loose-binding"
122 fi
123 fi
124 @@ -309,7 +301,7 @@
125
126 # In case we are in a mate session, we always want matecompat
127 # plugin loaded (session registering, key bindings).
128 -if [ -f "$PLUGIN_PATH/libmatecompat.so" ] && ( [ "$XDG_CURRENT_DESKTOP" = "MATE" ] || [ -n "$MATE_DESKTOP_SESSION_ID" ] ); then
129 +if [ -f "$PLUGIN_PATH/libmatecompat.so" ] && [ "$XDG_CURRENT_DESKTOP" == "MATE" -o -n "$MATE_DESKTOP_SESSION_ID" ]; then
130 COMPIZ_PLUGINS="$COMPIZ_PLUGINS matecompat"
131 fi
132
133 @@ -317,17 +309,17 @@
134 build_env
135 build_args
136
137 -if [[ "$CM_DRY" == "yes" ]]; then
138 +if [ "$CM_DRY" == "yes" ]; then
139 verbose "Dry run finished: everything should work with regards to Compiz and 3D.\n"
140 verbose "Execute: $COMPIZ_BIN_PATH/$COMPIZ_NAME $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS \n"
141 exit 0
142 fi
143
144 # Start the decorator.
145 -if [ -x "$COMPIZ_BIN_PATH/emerald" ] && [[ "$USE_EMERALD" == "yes" ]]; then
146 +if [ -x "$COMPIZ_BIN_PATH/emerald" -a "$USE_EMERALD" == "yes" ]; then
147 verbose "Starting emerald\n"
148 "$COMPIZ_BIN_PATH/emerald" --replace &
149 -elif [ -x "$COMPIZ_BIN_PATH/mate-window-decorator" ] && ( [[ "$XDG_CURRENT_DESKTOP" == "MATE" ]] || [ ! -z "$MATE_DESKTOP_SESSION_ID" ] ); then
150 +elif [ -x "$COMPIZ_BIN_PATH/mate-window-decorator" ] && [ "$XDG_CURRENT_DESKTOP" == "MATE" -o ! -z "$MATE_DESKTOP_SESSION_ID" ]; then
151 verbose "Starting mate-window-decorator\n"
152 "$COMPIZ_BIN_PATH/mate-window-decorator" --replace &
153 elif [ -x "$COMPIZ_BIN_PATH/gtk-window-decorator" ]; then