|
610
|
1 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/configure.ac compiz-fusion-plugins-extra-0.6.0/configure.ac
|
|
|
2 |
--- compiz-fusion-plugins-extra-0.6.0.orig/configure.ac 2007-10-15 13:56:43.000000000 -0400
|
|
|
3 |
+++ compiz-fusion-plugins-extra-0.6.0/configure.ac 2007-10-31 16:15:32.065836169 -0400
|
|
430
|
4 |
@@ -1,6 +1,6 @@
|
|
|
5 |
AC_PREREQ(2.57)
|
|
|
6 |
|
|
|
7 |
-AC_INIT([compiz-fusion-plugins-extra],esyscmd(. ./VERSION;echo -n $VERSION), [[email protected]])
|
|
610
|
8 |
+AC_INIT([compiz-fusion-plugins-extra],esyscmd(. ./VERSION;echo $VERSION | tr -d "\n"), [[email protected]])
|
|
430
|
9 |
|
|
|
10 |
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[Version])
|
|
|
11 |
|
|
610
|
12 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/metadata/addhelper.xml.in compiz-fusion-plugins-extra-0.6.0/metadata/addhelper.xml.in
|
|
|
13 |
--- compiz-fusion-plugins-extra-0.6.0.orig/metadata/addhelper.xml.in 2007-10-15 13:56:43.000000000 -0400
|
|
|
14 |
+++ compiz-fusion-plugins-extra-0.6.0/metadata/addhelper.xml.in 2007-10-31 16:16:43.533035255 -0400
|
|
430
|
15 |
@@ -17,7 +17,7 @@
|
|
|
16 |
<_long>Use this to enable/disable AddHelper on the fly.</_long>
|
|
|
17 |
<allowed key="true"/>
|
|
|
18 |
<default>
|
|
|
19 |
- <key><Super>p</key>
|
|
|
20 |
+ <key><Mod4>p</key>
|
|
|
21 |
</default>
|
|
|
22 |
</option>
|
|
|
23 |
</group>
|
|
610
|
24 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/metadata/bench.xml.in compiz-fusion-plugins-extra-0.6.0/metadata/bench.xml.in
|
|
|
25 |
--- compiz-fusion-plugins-extra-0.6.0.orig/metadata/bench.xml.in 2007-10-15 13:56:43.000000000 -0400
|
|
|
26 |
+++ compiz-fusion-plugins-extra-0.6.0/metadata/bench.xml.in 2007-10-31 16:16:43.534369597 -0400
|
|
430
|
27 |
@@ -12,7 +12,7 @@
|
|
|
28 |
<_long>Start benchmark</_long>
|
|
|
29 |
<allowed key="true"/>
|
|
|
30 |
<default>
|
|
|
31 |
- <key><Super>F12</key>
|
|
|
32 |
+ <key><Mod4>F12</key>
|
|
|
33 |
</default>
|
|
|
34 |
</option>
|
|
|
35 |
<option name="disable_limiter" type="bool">
|
|
610
|
36 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/metadata/firepaint.xml.in compiz-fusion-plugins-extra-0.6.0/metadata/firepaint.xml.in
|
|
|
37 |
--- compiz-fusion-plugins-extra-0.6.0.orig/metadata/firepaint.xml.in 2007-10-15 13:56:43.000000000 -0400
|
|
|
38 |
+++ compiz-fusion-plugins-extra-0.6.0/metadata/firepaint.xml.in 2007-10-31 16:16:43.534099360 -0400
|
|
430
|
39 |
@@ -9,7 +9,7 @@
|
|
|
40 |
<_long>Initiate fire drawing</_long>
|
|
|
41 |
<allowed key="true" button="true"/>
|
|
|
42 |
<default>
|
|
|
43 |
- <button><Super><Shift>Button1</button>
|
|
|
44 |
+ <button><Mod4><Shift>Button1</button>
|
|
|
45 |
</default>
|
|
|
46 |
</option>
|
|
|
47 |
<option type="action" name="clear">
|
|
|
48 |
@@ -17,7 +17,7 @@
|
|
|
49 |
<_long>Clear</_long>
|
|
|
50 |
<allowed key="true" button="true"/>
|
|
|
51 |
<default>
|
|
|
52 |
- <key><Super><Shift>c</key>
|
|
|
53 |
+ <key><Mod4><Shift>c</key>
|
|
|
54 |
</default>
|
|
|
55 |
</option>
|
|
|
56 |
</display>
|
|
610
|
57 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/metadata/group.xml.in compiz-fusion-plugins-extra-0.6.0/metadata/group.xml.in
|
|
|
58 |
--- compiz-fusion-plugins-extra-0.6.0.orig/metadata/group.xml.in 2007-10-15 13:56:43.000000000 -0400
|
|
|
59 |
+++ compiz-fusion-plugins-extra-0.6.0/metadata/group.xml.in 2007-10-31 16:16:43.533869052 -0400
|
|
430
|
60 |
@@ -26,7 +26,7 @@
|
|
|
61 |
<_long>The key for selecting the current window.</_long>
|
|
|
62 |
<allowed key="true"/>
|
|
|
63 |
<default>
|
|
|
64 |
- <key><Super>s</key>
|
|
|
65 |
+ <key><Mod4>s</key>
|
|
|
66 |
</default>
|
|
|
67 |
</option>
|
|
|
68 |
</subgroup>
|
|
|
69 |
@@ -40,7 +40,7 @@
|
|
|
70 |
<_long>The key for grouping windows.</_long>
|
|
|
71 |
<allowed key="true"/>
|
|
|
72 |
<default>
|
|
|
73 |
- <key><Super>g</key>
|
|
|
74 |
+ <key><Mod4>g</key>
|
|
|
75 |
</default>
|
|
|
76 |
</option>
|
|
|
77 |
<option name="ungroup" type="action">
|
|
|
78 |
@@ -48,7 +48,7 @@
|
|
|
79 |
<_long>The key for ungrouping the current group.</_long>
|
|
|
80 |
<allowed key="true"/>
|
|
|
81 |
<default>
|
|
|
82 |
- <key><Super>u</key>
|
|
|
83 |
+ <key><Mod4>u</key>
|
|
|
84 |
</default>
|
|
|
85 |
</option>
|
|
|
86 |
<option name="remove" type="action">
|
|
|
87 |
@@ -56,7 +56,7 @@
|
|
|
88 |
<_long>The key for removing the selected window from its group.</_long>
|
|
|
89 |
<allowed key="true"/>
|
|
|
90 |
<default>
|
|
|
91 |
- <key><Super>r</key>
|
|
|
92 |
+ <key><Mod4>r</key>
|
|
|
93 |
</default>
|
|
|
94 |
</option>
|
|
|
95 |
<option name="close" type="action">
|
|
|
96 |
@@ -64,7 +64,7 @@
|
|
|
97 |
<_long>The key for closing all windows in the group.</_long>
|
|
|
98 |
<allowed key="true"/>
|
|
|
99 |
<default>
|
|
|
100 |
- <key><Super>c</key>
|
|
|
101 |
+ <key><Mod4>c</key>
|
|
|
102 |
</default>
|
|
|
103 |
</option>
|
|
|
104 |
<option name="ignore" type="action">
|
|
|
105 |
@@ -72,7 +72,7 @@
|
|
|
106 |
<_long>The key for ignoring the group. If this key is pressed, you can do actions for a single window in the group only.</_long>
|
|
|
107 |
<allowed key="true"/>
|
|
|
108 |
<default>
|
|
|
109 |
- <key><Super>x</key>
|
|
|
110 |
+ <key><Mod4>x</key>
|
|
|
111 |
</default>
|
|
|
112 |
</option>
|
|
|
113 |
</subgroup>
|
|
|
114 |
@@ -86,7 +86,7 @@
|
|
|
115 |
<_long>The key for toggling the tab mode for the current group.</_long>
|
|
|
116 |
<allowed key="true"/>
|
|
|
117 |
<default>
|
|
|
118 |
- <key><Super>t</key>
|
|
|
119 |
+ <key><Mod4>t</key>
|
|
|
120 |
</default>
|
|
|
121 |
</option>
|
|
|
122 |
<option name="change_tab_left" type="action">
|
|
|
123 |
@@ -94,7 +94,7 @@
|
|
|
124 |
<_long>The key for switching to the tab left of the current one.</_long>
|
|
|
125 |
<allowed key="true"/>
|
|
|
126 |
<default>
|
|
|
127 |
- <key><Super>Left</key>
|
|
|
128 |
+ <key><Mod4>Left</key>
|
|
|
129 |
</default>
|
|
|
130 |
</option>
|
|
|
131 |
<option name="change_tab_right" type="action">
|
|
|
132 |
@@ -102,7 +102,7 @@
|
|
|
133 |
<_long>The key for switching to the tab right of the current one.</_long>
|
|
|
134 |
<allowed key="true"/>
|
|
|
135 |
<default>
|
|
|
136 |
- <key><Super>Right</key>
|
|
|
137 |
+ <key><Mod4>Right</key>
|
|
|
138 |
</default>
|
|
|
139 |
</option>
|
|
|
140 |
</subgroup>
|
|
610
|
141 |
diff -urN compiz-fusion-plugins-extra-0.6.0.orig/src/scalefilter/scalefilter.c compiz-fusion-plugins-extra-0.6.0/src/scalefilter/scalefilter.c
|
|
|
142 |
--- compiz-fusion-plugins-extra-0.6.0.orig/src/scalefilter/scalefilter.c 2007-10-15 13:56:44.000000000 -0400
|
|
|
143 |
+++ compiz-fusion-plugins-extra-0.6.0/src/scalefilter/scalefilter.c 2007-10-31 16:22:01.561972942 -0400
|
|
|
144 |
@@ -34,7 +34,7 @@
|
|
430
|
145 |
#include <locale.h>
|
|
|
146 |
|
|
|
147 |
#include <X11/Xlib.h>
|
|
610
|
148 |
-#include <X11/keysymdef.h>
|
|
|
149 |
+#include <X11/keysym.h>
|
|
430
|
150 |
|
|
|
151 |
#include <compiz.h>
|
|
610
|
152 |
#include <scale.h>
|
|
|
153 |
@@ -464,6 +464,7 @@
|
|
|
154 |
memset (buffer, 0, sizeof (buffer));
|
|
|
155 |
memset (wbuffer, 0, sizeof (wbuffer));
|
|
430
|
156 |
|
|
610
|
157 |
+#ifdef X_HAVE_UTF8_STRING
|
|
430
|
158 |
if (fd->xic)
|
|
|
159 |
{
|
|
610
|
160 |
Status status;
|
|
|
161 |
@@ -473,6 +474,7 @@
|
|
|
162 |
XUnsetICFocus (fd->xic);
|
|
430
|
163 |
}
|
|
|
164 |
else
|
|
610
|
165 |
+#endif
|
|
430
|
166 |
{
|
|
610
|
167 |
count = XLookupString (event, buffer, 9, &ks, NULL);
|
|
|
168 |
}
|