remove upstreamed patches
This commit is contained in:
parent
ca683e10e8
commit
a81ac8bbb0
@ -1,11 +0,0 @@
|
||||
diff -upNr compiz-0.8.6.orign/include/compiz-core.h compiz-0.8.6/include/compiz-core.h
|
||||
--- compiz-0.8.6.orign/include/compiz-core.h 2010-03-28 14:15:35.000000000 +0200
|
||||
+++ compiz-0.8.6/include/compiz-core.h 2010-03-30 14:48:59.055172395 +0200
|
||||
@@ -27,6 +27,7 @@
|
||||
#define _COMPIZ_CORE_H
|
||||
|
||||
#include <compiz-plugin.h>
|
||||
+#include <dlfcn.h>
|
||||
|
||||
#define CORE_ABIVERSION 20091102
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,14 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/plugins/place.c compiz-0.8.8/plugins/place.c
|
||||
--- compiz-0.8.8-orig/plugins/place.c 2010-10-18 07:56:02.000000000 +0200
|
||||
+++ compiz-0.8.8/plugins/place.c 2012-09-26 11:19:31.056809174 +0200
|
||||
@@ -16,8 +16,8 @@
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
- * 02111-1307, USA.
|
||||
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
||||
+ * 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <math.h>
|
1144
compiz-aarch64.patch
1144
compiz-aarch64.patch
File diff suppressed because it is too large
Load Diff
@ -1,49 +0,0 @@
|
||||
Author: Sebastien Bacher <seb128@canonical.com>
|
||||
Description: Fix decorator crash when ARGB isn't enabled
|
||||
Fix gtk-window-decorator crash when ARGB isn't enabled and only
|
||||
that, in this case window-decoration are invisible
|
||||
Origin: vendor, ubuntu (1:0.3.6-1ubuntu9)
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/94140
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/82205
|
||||
--- a/gtk/window-decorator/gtk-window-decorator.c
|
||||
+++ b/gtk/window-decorator/gtk-window-decorator.c
|
||||
@@ -1912,10 +1912,8 @@ meta_draw_window_decoration (decor_t *d)
|
||||
|
||||
size = MAX (fgeom.top_height, fgeom.bottom_height);
|
||||
|
||||
- if (rect.width && size)
|
||||
+ if (rect.width && size && (pixmap = create_pixmap (rect.width, size)))
|
||||
{
|
||||
- pixmap = create_pixmap (rect.width, size);
|
||||
-
|
||||
cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
|
||||
gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha);
|
||||
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
|
||||
@@ -2014,10 +2012,8 @@ meta_draw_window_decoration (decor_t *d)
|
||||
|
||||
size = MAX (fgeom.left_width, fgeom.right_width);
|
||||
|
||||
- if (size && rect.height)
|
||||
+ if (size && rect.height && (pixmap = create_pixmap (size, rect.height)))
|
||||
{
|
||||
- pixmap = create_pixmap (size, rect.height);
|
||||
-
|
||||
cr = gdk_cairo_create (GDK_DRAWABLE (pixmap));
|
||||
gdk_cairo_set_source_color_alpha (cr, &bg_color, bg_alpha);
|
||||
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
|
||||
@@ -3289,9 +3285,12 @@ update_window_decoration_icon (WnckWindo
|
||||
g_object_ref (G_OBJECT (d->icon_pixbuf));
|
||||
|
||||
d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf);
|
||||
- cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
|
||||
- d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
|
||||
- cairo_destroy (cr);
|
||||
+ if (d->icon_pixmap)
|
||||
+ {
|
||||
+ cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
|
||||
+ d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
|
||||
+ cairo_destroy (cr);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
82
compiz.spec
82
compiz.spec
@ -35,47 +35,8 @@ Source13: compiz-plugins-main_plugin-matecompat.svg
|
||||
Source14: emerald-decorator.svg
|
||||
Source15: gtk-decorator.svg
|
||||
|
||||
# build for aarch64
|
||||
Patch0: compiz-aarch64.patch
|
||||
# usage of matecompat plugin and marco for gtk-windows-decorator
|
||||
Patch1: compiz_new_mate.patch
|
||||
# Patches that are not upstream
|
||||
Patch2: compiz_disable_gdk_disable_deprecated.patch
|
||||
Patch3: compiz_composite-cube-logo.patch
|
||||
Patch4: compiz_fedora-logo.patch
|
||||
Patch5: compiz_redhat-logo.patch
|
||||
Patch6: compiz-0.8.6-wall.patch
|
||||
Patch7: compiz-0.8.6-new_unloadpluginfix.patch
|
||||
Patch8: compiz-0.8.8_incorrect-fsf-address.patch
|
||||
Patch9: compiz_new_add-cursor-theme-support.patch
|
||||
Patch10: compiz-fix-gtk-window-decorator-no-argb-crash.patch
|
||||
Patch11: compiz_fix-no-border-window-shadow.patch
|
||||
Patch12: compiz_draw_dock_shadows_on_desktop.patch
|
||||
Patch13: compiz_optional-fbo.patch
|
||||
Patch14: compiz_call_glxwaitx_before_drawing.patch
|
||||
Patch15: compiz_always_unredirect_screensaver_on_nvidia.patch
|
||||
Patch16: compiz_fullscreen_stacking_fixes.patch
|
||||
Patch17: compiz_damage-report-non-empty.patch
|
||||
Patch18: compiz_stacking.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=909657
|
||||
Patch19: compiz_primary-is-control.patch
|
||||
# those patches belongs together, removal of keybindings, mate-windows-settings
|
||||
# kde, gconf/mateconf, dbus, glib and old metacity checks
|
||||
Patch20: compiz_new_remove-keybindings-and-mate-windows-settings-files.patch
|
||||
Patch21: compiz_new_remove-kde.patch
|
||||
# gtk-windows-decorator
|
||||
Patch22: compiz_new_remove_mateconf_dbus_glib.patch
|
||||
Patch23: compiz_clean_potfiles.patch
|
||||
Patch24: compiz_new_remove_old_metacity_checks.patch
|
||||
Patch25: compiz_commandline_options_for_button_layout_and_titlebar_font.patch
|
||||
# new patch series
|
||||
Patch26: compiz_get_smclient-id_from_DESKTOP-AUTOSTART-ID.patch
|
||||
Patch27: compiz_automake-1.13.patch
|
||||
Patch28: compiz_cube-set-opacity-during-rotation-to-70-as-default.patch
|
||||
# clean dbus
|
||||
#Patch28: compiz_remove-rest-of-dbus-code.patch
|
||||
# clean gconf/mateconf code in gtk-windows-decorator
|
||||
#Patch29: compiz_new_removal-gconf.patch
|
||||
# fedora specific
|
||||
Patch0: compiz_fedora-logo.patch
|
||||
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libdrm-devel
|
||||
@ -169,40 +130,8 @@ Compiz with emerald.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .aarch64
|
||||
%patch1 -p1 -b .mate
|
||||
%patch2 -p1 -b .disable_deprecated
|
||||
%patch3 -p1 -b .composite-cube-logo
|
||||
%if 0%{?fedora}
|
||||
%patch4 -p1 -b .fedora-logo
|
||||
%else
|
||||
%patch5 -p1 -b .redhat-logo
|
||||
%endif
|
||||
%patch6 -p1 -b .wall
|
||||
%patch7 -p1 -b .unloadfix
|
||||
%patch8 -p1 -b .incorrect-fsf-address
|
||||
%patch9 -p1 -b .cursor-theme-support
|
||||
%patch10 -p1 -b .gtk-window-decorator-no-argb-crash
|
||||
%patch11 -p1 -b .no-border-window-shadow
|
||||
%patch12 -p1 -b .draw_dock_shadows
|
||||
%patch13 -p1 -b .fbo
|
||||
%patch14 -p1 -b .glxwaitx_before_drawing
|
||||
%patch15 -p1 -b .always_unredirect_screensaver
|
||||
%patch16 -p1 -b .fullscreen_stacking
|
||||
%patch17 -p1 -b .damage-report
|
||||
%patch18 -p1 -b .stacking
|
||||
%patch19 -p1 -b .primary-is-control
|
||||
%patch20 -p1 -b .remove_keybindings
|
||||
%patch21 -p1 -b .remove_kde
|
||||
%patch22 -p1 -b .remove_mateconf_dbus_glib
|
||||
%patch23 -p1 -b .potfiles
|
||||
%patch24 -p1 -b .old_metacity_checks
|
||||
%patch25 -p1 -b .commandline_options
|
||||
%patch26 -p1 -b .get_smclient-id
|
||||
%patch27 -p1 -b .automake
|
||||
%patch28 -p1 -b .rotation
|
||||
#%patch28 -p1 -b .compiz_remove-rest-of-dbus-code.patch
|
||||
#%patch29 -p1 -b .gconf
|
||||
|
||||
%patch0 -p1 -b .fedora-logo
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
@ -334,7 +263,8 @@ fi
|
||||
%changelog
|
||||
* Fri Nov 06 2015 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1:0.8.9-1
|
||||
- update to 0.8.9
|
||||
- new upstream is at https://github.com/raveit65/compiz-bcop
|
||||
- new upstream is at https://github.com/raveit65/compiz
|
||||
- remove upstreamed patches
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.8.8-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
@ -1,32 +0,0 @@
|
||||
Author: Travis Watkins <amaranth@ubuntu.com>
|
||||
Description: Always unredirect mate-screensaver when using nvidia
|
||||
Workaround for LP #160264 while still disabling unredirect fullscreen
|
||||
windows for nvidia users
|
||||
Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu4)
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/160264
|
||||
--- a/src/paint.c
|
||||
+++ b/src/paint.c
|
||||
@@ -262,6 +262,7 @@ paintOutputRegion (CompScreen *sc
|
||||
CompTransform vTransform;
|
||||
int offX, offY;
|
||||
Region clip = region;
|
||||
+ int dontcare;
|
||||
|
||||
if (!tmpRegion)
|
||||
{
|
||||
@@ -341,8 +342,14 @@ paintOutputRegion (CompScreen *sc
|
||||
XSubtractRegion (tmpRegion, w->region, tmpRegion);
|
||||
|
||||
/* unredirect top most fullscreen windows. */
|
||||
+ /* if the fullscreen window is mate-screensaver and we're
|
||||
+ on nvidia we want to always unredirect even if this
|
||||
+ option is disabled to work around LP #160264 */
|
||||
if (count == 0 &&
|
||||
- screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b)
|
||||
+ (screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b ||
|
||||
+ (w->resName && !strcmp(w->resName, "mate-screensaver") &&
|
||||
+ XQueryExtension (screen->display->display, "NV-GLX",
|
||||
+ &dontcare, &dontcare, &dontcare))))
|
||||
{
|
||||
if (XEqualRegion (w->region, &screen->region) &&
|
||||
!REGION_NOT_EMPTY (tmpRegion))
|
@ -1,49 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/gtk/window-decorator/Makefile.am compiz-0.8.8/gtk/window-decorator/Makefile.am
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/Makefile.am 2013-05-26 00:46:26.115813000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/Makefile.am 2013-05-26 00:48:40.157154237 +0200
|
||||
@@ -16,7 +16,7 @@ gtk_window_decorator_SOURCES = \
|
||||
gtk_window_decorator_program = gtk-window-decorator
|
||||
endif
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
@GTK_WINDOW_DECORATOR_CFLAGS@ \
|
||||
@MARCO_CFLAGS@ \
|
||||
diff -uprN compiz-0.8.8-orig/libdecoration/Makefile.am compiz-0.8.8/libdecoration/Makefile.am
|
||||
--- compiz-0.8.8-orig/libdecoration/Makefile.am 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/libdecoration/Makefile.am 2013-05-26 00:49:02.710379771 +0200
|
||||
@@ -4,9 +4,9 @@ libdecoration_la_LIBADD = @DECORATION_L
|
||||
libdecoration_la_LDFLAGS = -no-undefined
|
||||
libdecoration_la_SOURCES = decoration.c
|
||||
|
||||
-INCLUDES = @DECORATION_CFLAGS@ -I$(top_srcdir)/include
|
||||
+AM_CPPFLAGS = @DECORATION_CFLAGS@ -I$(top_srcdir)/include
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libdecoration.pc
|
||||
|
||||
-EXTRA_DIST = libdecoration.pc.in
|
||||
\ Kein Zeilenumbruch am Dateiende.
|
||||
+EXTRA_DIST = libdecoration.pc.in
|
||||
diff -uprN compiz-0.8.8-orig/plugins/Makefile.am compiz-0.8.8/plugins/Makefile.am
|
||||
--- compiz-0.8.8-orig/plugins/Makefile.am 2013-05-26 00:46:26.118813000 +0200
|
||||
+++ compiz-0.8.8/plugins/Makefile.am 2013-05-26 00:49:31.336666036 +0200
|
||||
@@ -107,7 +107,7 @@ libfs_la_SOURCES = fuse.c
|
||||
libfs_module = libfs.la
|
||||
endif
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
@COMPIZ_CFLAGS@ \
|
||||
@LIBPNG_CFLAGS@ \
|
||||
@LIBRSVG_CFLAGS@ \
|
||||
diff -uprN compiz-0.8.8-orig/src/Makefile.am compiz-0.8.8/src/Makefile.am
|
||||
--- compiz-0.8.8-orig/src/Makefile.am 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/src/Makefile.am 2013-05-26 00:49:56.542918101 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
@COMPIZ_CFLAGS@ \
|
||||
@GL_CFLAGS@ \
|
||||
-I$(top_srcdir)/include \
|
@ -1,17 +0,0 @@
|
||||
Author: Travis Watkins <amaranth@ubuntu.com>
|
||||
Description: Call glXWaitX before we start drawing
|
||||
Call glXWaitX before we start drawing to make sure X is done
|
||||
handling rendering calls. Suggested by Michel Dänzer to ensure
|
||||
we don't have any rendering glitches.
|
||||
Origin: vendor, ubuntu (1:0.8.3+git20090917-0ubuntu3)
|
||||
--- a/src/display.c
|
||||
+++ b/src/display.c
|
||||
@@ -1537,6 +1537,8 @@ eventLoop (void)
|
||||
timeDiff = 0;
|
||||
|
||||
makeScreenCurrent (s);
|
||||
+ /* make sure X is ready for us to draw */
|
||||
+ glXWaitX ();
|
||||
|
||||
if (s->slowAnimations)
|
||||
{
|
@ -1,30 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/po/POTFILES.in compiz-0.8.8/po/POTFILES.in
|
||||
--- compiz-0.8.8-orig/po/POTFILES.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/po/POTFILES.in 2013-04-18 09:59:41.902123875 +0200
|
||||
@@ -1,9 +1,4 @@
|
||||
-gtk/mate/50-compiz-desktop-key.xml.in
|
||||
-gtk/mate/50-compiz-key.xml.in
|
||||
gtk/mate/compiz.desktop.in
|
||||
-gtk/mate/compiz-window-manager.c
|
||||
-gtk/mate/compiz-wm.desktop.in
|
||||
-gtk/window-decorator/gwd.schemas.in
|
||||
gtk/window-decorator/gtk-window-decorator.c
|
||||
metadata/annotate.xml.in
|
||||
metadata/blur.xml.in
|
||||
@@ -11,16 +6,12 @@ metadata/clone.xml.in
|
||||
metadata/commands.xml.in
|
||||
metadata/core.xml.in.in
|
||||
metadata/cube.xml.in
|
||||
-metadata/dbus.xml.in
|
||||
metadata/decoration.xml.in
|
||||
metadata/fade.xml.in
|
||||
metadata/fs.xml.in
|
||||
-metadata/mateconf.xml.in
|
||||
-metadata/glib.xml.in
|
||||
metadata/matecompat.xml.in
|
||||
metadata/ini.xml.in
|
||||
metadata/inotify.xml.in
|
||||
-metadata/kconfig.xml.in
|
||||
metadata/minimize.xml.in
|
||||
metadata/move.xml.in
|
||||
metadata/obs.xml.in
|
@ -1,60 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2013-04-18 20:00:33.060716000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2013-04-18 20:12:32.808023855 +0200
|
||||
@@ -6883,6 +6883,7 @@ main (int argc, char *argv[])
|
||||
|
||||
#ifdef USE_MARCO
|
||||
char *meta_theme = NULL;
|
||||
+ char *marco_button_layout = "menu:minimize,maximize,close";
|
||||
#endif
|
||||
|
||||
program_name = argv[0];
|
||||
@@ -6914,6 +6915,11 @@ main (int argc, char *argv[])
|
||||
}
|
||||
cmdline_options |= CMDLINE_BLUR;
|
||||
}
|
||||
+ else if (strcmp (argv[i], "--titlebar-font") == 0)
|
||||
+ {
|
||||
+ if (argc > ++i)
|
||||
+ titlebar_font = pango_font_description_from_string (argv[i]);
|
||||
+ }
|
||||
|
||||
#ifdef USE_MARCO
|
||||
else if (strcmp (argv[i], "--opacity") == 0)
|
||||
@@ -6944,6 +6950,11 @@ main (int argc, char *argv[])
|
||||
meta_theme = argv[i];
|
||||
cmdline_options |= CMDLINE_THEME;
|
||||
}
|
||||
+ else if (strcmp (argv[i], "--button-layout") == 0)
|
||||
+ {
|
||||
+ if (argc > ++i)
|
||||
+ marco_button_layout = argv[i];
|
||||
+ }
|
||||
#endif
|
||||
|
||||
else if (strcmp (argv[i], "--help") == 0)
|
||||
@@ -6952,6 +6963,7 @@ main (int argc, char *argv[])
|
||||
"[--minimal] "
|
||||
"[--replace] "
|
||||
"[--blur none|titlebar|all] "
|
||||
+ "[--titlebar-font FONT] "
|
||||
|
||||
#ifdef USE_MARCO
|
||||
"[--opacity OPACITY] "
|
||||
@@ -6959,6 +6971,7 @@ main (int argc, char *argv[])
|
||||
"[--active-opacity OPACITY] "
|
||||
"[--no-active-opacity-shade] "
|
||||
"[--marco-theme THEME] "
|
||||
+ "[--button-layout LAYOUT] "
|
||||
#endif
|
||||
|
||||
"[--help]"
|
||||
@@ -6985,6 +6998,8 @@ main (int argc, char *argv[])
|
||||
theme_update_border_extents = meta_update_border_extents;
|
||||
theme_get_event_window_position = meta_get_event_window_position;
|
||||
theme_get_button_position = meta_get_button_position;
|
||||
+ meta_update_button_layout(marco_button_layout);
|
||||
+ meta_button_layout_set = TRUE;
|
||||
}
|
||||
}
|
||||
#endif
|
@ -1,31 +0,0 @@
|
||||
diff -up compiz-0ec3ec/plugins/cube.c~ compiz-0ec3ec/plugins/cube.c
|
||||
--- compiz-0ec3ec/plugins/cube.c~ 2007-07-23 16:20:42.000000000 -0400
|
||||
+++ compiz-0ec3ec/plugins/cube.c 2007-08-15 17:45:18.000000000 -0400
|
||||
@@ -1272,11 +1272,27 @@ cubePaintTop (CompScreen *s,
|
||||
|
||||
if (cs->invert == 1 && size == 4 && cs->texture.name)
|
||||
{
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
|
||||
+
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
|
||||
+
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS);
|
||||
+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
|
||||
+
|
||||
enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD);
|
||||
glTexCoordPointer (2, GL_FLOAT, 0, cs->tc);
|
||||
glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nVertices >> 1);
|
||||
disableTexture (s, &cs->texture);
|
||||
glDisableClientState (GL_TEXTURE_COORD_ARRAY);
|
||||
+
|
||||
+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
||||
}
|
||||
else
|
||||
{
|
@ -1,12 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/cube.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/cube.xml.in 2014-02-16 17:03:02.206250377 +0100
|
||||
@@ -161,7 +161,7 @@
|
||||
<option name="active_opacity" type="float">
|
||||
<_short>Opacity During Rotation</_short>
|
||||
<_long>Opacity of desktop window during rotation.</_long>
|
||||
- <default>100.0</default>
|
||||
+ <default>70.0</default>
|
||||
<min>0.0</min>
|
||||
<max>100.0</max>
|
||||
<precision>1.0</precision>
|
@ -1,83 +0,0 @@
|
||||
Author: Michael Vogt <michael.vogt@ubuntu.com>
|
||||
Description: Workaround for problems with damage extension and refresh
|
||||
Add workaround patch by Aaron Plattner to fix problems with the damage
|
||||
extension and refresh (LP: #269904)
|
||||
Origin: vendor, ubuntu (1:0.7.8-0ubuntu4)
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/269904
|
||||
--- a/src/event.c
|
||||
+++ b/src/event.c
|
||||
@@ -2315,32 +2315,50 @@ handleEvent (CompDisplay *d,
|
||||
|
||||
if (w)
|
||||
{
|
||||
+ XserverRegion parts = XFixesCreateRegion(de->display, NULL, 0);
|
||||
+ XRectangle *rects;
|
||||
+ int nRects;
|
||||
+
|
||||
w->texture->oldMipmaps = TRUE;
|
||||
|
||||
+ // Get the damage region
|
||||
+ XDamageSubtract(de->display, de->damage, None, parts);
|
||||
+ rects = XFixesFetchRegion(de->display, parts, &nRects);
|
||||
+ XFixesDestroyRegion(de->display, parts);
|
||||
+
|
||||
if (w->syncWait)
|
||||
{
|
||||
- if (w->nDamage == w->sizeDamage)
|
||||
+ int i;
|
||||
+
|
||||
+ if (w->nDamage + nRects - 1 >= w->sizeDamage)
|
||||
{
|
||||
w->damageRects = realloc (w->damageRects,
|
||||
- (w->sizeDamage + 1) *
|
||||
+ (w->sizeDamage + nRects) *
|
||||
sizeof (XRectangle));
|
||||
- w->sizeDamage += 1;
|
||||
+ w->sizeDamage += nRects;
|
||||
}
|
||||
|
||||
- w->damageRects[w->nDamage].x = de->area.x;
|
||||
- w->damageRects[w->nDamage].y = de->area.y;
|
||||
- w->damageRects[w->nDamage].width = de->area.width;
|
||||
- w->damageRects[w->nDamage].height = de->area.height;
|
||||
- w->nDamage++;
|
||||
+ for (i = 0; i < nRects; i++)
|
||||
+ {
|
||||
+ w->damageRects[w->nDamage] = rects[i];
|
||||
+ w->nDamage++;
|
||||
+ }
|
||||
}
|
||||
else
|
||||
{
|
||||
- handleWindowDamageRect (w,
|
||||
- de->area.x,
|
||||
- de->area.y,
|
||||
- de->area.width,
|
||||
- de->area.height);
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < nRects; i++)
|
||||
+ {
|
||||
+ handleWindowDamageRect (w,
|
||||
+ rects[i].x,
|
||||
+ rects[i].y,
|
||||
+ rects[i].width,
|
||||
+ rects[i].height);
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ XFree(rects);
|
||||
}
|
||||
}
|
||||
else if (d->shapeExtension &&
|
||||
--- a/src/window.c
|
||||
+++ b/src/window.c
|
||||
@@ -2207,7 +2207,7 @@ addWindow (CompScreen *screen,
|
||||
XUnionRegion (&rect, w->region, w->region);
|
||||
|
||||
w->damage = XDamageCreate (d->display, id,
|
||||
- XDamageReportRawRectangles);
|
||||
+ XDamageReportNonEmpty);
|
||||
|
||||
/* need to check for DisplayModal state on all windows */
|
||||
w->state = getWindowState (d, w->id);
|
@ -1,18 +0,0 @@
|
||||
Stop breaking on deprecated GTK_WIDGET_VISIBLE.
|
||||
--- a/gtk/window-decorator/gtk-window-decorator.c
|
||||
+++ b/gtk/window-decorator/gtk-window-decorator.c
|
||||
@@ -31,14 +31,6 @@
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/Xregion.h>
|
||||
|
||||
-#ifndef GDK_DISABLE_DEPRECATED
|
||||
-#define GDK_DISABLE_DEPRECATED
|
||||
-#endif
|
||||
-
|
||||
-#ifndef GTK_DISABLE_DEPRECATED
|
||||
-#define GTK_DISABLE_DEPRECATED
|
||||
-#endif
|
||||
-
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
#include <glib/gi18n.h>
|
@ -1,85 +0,0 @@
|
||||
Author: Travis Watkins <amaranth@ubuntu.com>
|
||||
Description: Change decoration plugin dock shadow drawing behavior
|
||||
change decoration plugin to draw dock shadows only on the
|
||||
desktop window instead of on top of all other windows
|
||||
Origin: vendor, ubuntu (1:0.8.2-0ubuntu16)
|
||||
--- a/plugins/decoration.c
|
||||
+++ b/plugins/decoration.c
|
||||
@@ -190,6 +190,11 @@ decorDrawWindow (CompWindow *w,
|
||||
status = (*w->screen->drawWindow) (w, transform, attrib, region, mask);
|
||||
WRAP (ds, w->screen, drawWindow, decorDrawWindow);
|
||||
|
||||
+ /* we wait to draw dock shadows until we get to the lowest
|
||||
+ desktop window in the stack */
|
||||
+ if (w->type & CompWindowTypeDockMask)
|
||||
+ return status;
|
||||
+
|
||||
if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
|
||||
region = &infiniteRegion;
|
||||
|
||||
@@ -226,6 +231,65 @@ decorDrawWindow (CompWindow *w,
|
||||
attrib, mask);
|
||||
}
|
||||
|
||||
+ if (w->type & CompWindowTypeDesktopMask)
|
||||
+ {
|
||||
+ /* we only want to draw on the lowest desktop window, find it and see
|
||||
+ if we the window we have is it */
|
||||
+ CompWindow *window = w->screen->windows;
|
||||
+ for (window = w->screen->windows; window; window = window->next)
|
||||
+ {
|
||||
+ if (window->type & CompWindowTypeDesktopMask)
|
||||
+ {
|
||||
+ if (window == w)
|
||||
+ break;
|
||||
+ else
|
||||
+ return status;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* drawing dock shadows now */
|
||||
+ for (window = w->screen->windows; window; window = window->next)
|
||||
+ {
|
||||
+ if (window->type & CompWindowTypeDockMask && !window->destroyed && !window->invisible)
|
||||
+ {
|
||||
+ DECOR_WINDOW (window);
|
||||
+
|
||||
+ if (dw->wd && region->numRects)
|
||||
+ {
|
||||
+ WindowDecoration *wd = dw->wd;
|
||||
+ REGION box;
|
||||
+ int i;
|
||||
+
|
||||
+ mask |= PAINT_WINDOW_BLEND_MASK;
|
||||
+
|
||||
+ box.rects = &box.extents;
|
||||
+ box.numRects = 1;
|
||||
+
|
||||
+ window->vCount = window->indexCount = 0;
|
||||
+
|
||||
+ for (i = 0; i < wd->nQuad; i++)
|
||||
+ {
|
||||
+ box.extents = wd->quad[i].box;
|
||||
+
|
||||
+ if (box.extents.x1 < box.extents.x2 &&
|
||||
+ box.extents.y1 < box.extents.y2)
|
||||
+ {
|
||||
+ (*window->screen->addWindowGeometry) (window,
|
||||
+ &wd->quad[i].matrix, 1,
|
||||
+ &box,
|
||||
+ region);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (window->vCount)
|
||||
+ (*window->screen->drawWindowTexture) (window,
|
||||
+ &wd->decor->texture->texture,
|
||||
+ attrib, mask);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
return status;
|
||||
}
|
||||
|
@ -1,21 +0,0 @@
|
||||
From abf9d0b9c431f56e3fe88cb5a22b2f5e7b41e92e Mon Sep 17 00:00:00 2001
|
||||
From: Nicolas Bruguier <gandalfn@mithrandir.(none)>
|
||||
Date: Tue, 12 Dec 2006 22:59:22 +0100
|
||||
Subject: [PATCH] Fix no border window shadow
|
||||
---
|
||||
libdecoration/decoration.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
--- a/libdecoration/decoration.c
|
||||
+++ b/libdecoration/decoration.c
|
||||
@@ -1243,7 +1243,9 @@ decor_shadow_create (Display *xdisp
|
||||
}
|
||||
|
||||
/* create pixmap for temporary decorations */
|
||||
- d_pixmap = XCreatePixmap (xdisplay, xroot, d_width, d_height, 32);
|
||||
+ d_pixmap = XCreatePixmap (xdisplay, xroot,
|
||||
+ (d_width % 32) ? d_width : d_width + 1,
|
||||
+ d_height, 32);
|
||||
if (!d_pixmap)
|
||||
{
|
||||
XFreePixmap (xdisplay, pixmap);
|
@ -1,17 +0,0 @@
|
||||
Author: Travis Watkins <amaranth@ubuntu.com>
|
||||
Description: keep window on top of fullscreen windows during move
|
||||
Origin: vendor, ubuntu (1:0.7.2-0ubuntu2)
|
||||
--- a/plugins/move.c
|
||||
+++ b/plugins/move.c
|
||||
@@ -124,6 +124,11 @@ moveInitiate (CompDisplay *d,
|
||||
xid = getIntOptionNamed (option, nOption, "window", 0);
|
||||
|
||||
w = findWindowAtDisplay (d, xid);
|
||||
+
|
||||
+ /* make window stay above fullscreen windows while moving */
|
||||
+ if (w)
|
||||
+ updateWindowAttributes (w, CompStackingUpdateModeAboveFullscreen);
|
||||
+
|
||||
if (w && (w->actions & CompWindowActionMoveMask))
|
||||
{
|
||||
XRectangle workArea;
|
@ -1,16 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/src/main.c compiz-0.8.8/src/main.c
|
||||
--- compiz-0.8.8-orig/src/main.c 2013-05-09 19:35:11.326618000 +0200
|
||||
+++ compiz-0.8.8/src/main.c 2013-05-09 19:50:49.446073959 +0200
|
||||
@@ -394,6 +394,12 @@ main (int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
+ if (!clientId)
|
||||
+ {
|
||||
+ clientId = getenv ("DESKTOP_AUTOSTART_ID");
|
||||
+ }
|
||||
+
|
||||
+
|
||||
if (refreshRateArg)
|
||||
{
|
||||
ctx.refreshRateData = malloc (strlen (refreshRateArg) + 256);
|
File diff suppressed because it is too large
Load Diff
@ -1,404 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
|
||||
--- compiz-0.8.8-orig/configure.ac 2013-04-19 10:34:23.593756000 +0200
|
||||
+++ compiz-0.8.8/configure.ac 2013-04-19 10:36:57.465302146 +0200
|
||||
@@ -243,20 +243,6 @@ if test "x$use_gtk" = "xyes"; then
|
||||
pangocairo,
|
||||
[use_gtk=yes], [use_gtk=no])
|
||||
if test "x$use_gtk" = "xyes"; then
|
||||
- save_CFLAGS="$CFLAGS"
|
||||
- save_LIBS="$LIBS"
|
||||
- CFLAGS="$CFLAGS $GTK_WINDOW_DECORATOR_CFLAGS"
|
||||
- LIBS="$LIBS $GTK_WINDOW_DECORATOR_LIBS"
|
||||
- AC_CHECK_FUNCS(matewnck_window_has_name)
|
||||
- CFLAGS="$save_CFLAGS"
|
||||
- LIBS="$save_LIBS"
|
||||
-
|
||||
- PKG_CHECK_EXISTS(libmatewnck-1.0 >= 2.18.1,
|
||||
- [have_libmatewnck_2_18_1=yes], [have_libmatewnck_2_18_1=no])
|
||||
-
|
||||
- PKG_CHECK_EXISTS(libmatewnck-1.0 >= 2.19.4,
|
||||
- [have_libmatewnck_2_19_4=yes], [have_libmatewnck_2_19_4=no])
|
||||
-
|
||||
if test "x$use_marco" = "xyes"; then
|
||||
PKG_CHECK_MODULES(MARCO, libmarco-private,
|
||||
[use_marco=yes], [use_marco=no])
|
||||
@@ -273,14 +259,6 @@ fi
|
||||
AM_CONDITIONAL(USE_GTK, test "x$use_gtk" = "xyes")
|
||||
if test "$use_gtk" = yes; then
|
||||
AC_DEFINE(USE_GTK, 1, [Build gtk window decorator])
|
||||
- if test "$have_libmatewnck_2_18_1" = yes; then
|
||||
- AC_DEFINE(HAVE_LIBMATEWNCK_2_18_1, 1,
|
||||
- [Define to 1 if libmatewnck version >= 2_18_1])
|
||||
- fi
|
||||
- if test "$have_libmatewnck_2_19_4" = yes; then
|
||||
- AC_DEFINE(HAVE_LIBMATEWNCK_2_19_4, 1,
|
||||
- [Define to 1 if libmatewnck version >= 2_19_4])
|
||||
- fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(USE_MARCO, test "x$use_marco" = "xyes")
|
||||
diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2013-04-19 10:34:23.596756000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2013-04-19 10:54:42.299020150 +0200
|
||||
@@ -36,14 +36,9 @@
|
||||
#include <gdk/gdkx.h>
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
-#define MATEWNCK_I_KNOW_THIS_IS_UNSTABLE
|
||||
#include <libmatewnck/libmatewnck.h>
|
||||
#include <libmatewnck/window-action-menu.h>
|
||||
|
||||
-#ifndef HAVE_LIBMATEWNCK_2_19_4
|
||||
-#define matewnck_window_get_client_window_geometry matewnck_window_get_geometry
|
||||
-#endif
|
||||
-
|
||||
#include <cairo.h>
|
||||
#include <cairo-xlib.h>
|
||||
|
||||
@@ -3068,21 +3056,11 @@ update_event_windows (MatewnckWindow *wi
|
||||
MATEWNCK_WINDOW_ACTION_MINIMIZE,
|
||||
0,
|
||||
MATEWNCK_WINDOW_ACTION_SHADE,
|
||||
-
|
||||
-#ifdef HAVE_LIBMATEWNCK_2_18_1
|
||||
MATEWNCK_WINDOW_ACTION_ABOVE,
|
||||
MATEWNCK_WINDOW_ACTION_STICK,
|
||||
MATEWNCK_WINDOW_ACTION_UNSHADE,
|
||||
MATEWNCK_WINDOW_ACTION_ABOVE,
|
||||
MATEWNCK_WINDOW_ACTION_UNSTICK
|
||||
-#else
|
||||
- 0,
|
||||
- 0,
|
||||
- 0,
|
||||
- 0,
|
||||
- 0
|
||||
-#endif
|
||||
-
|
||||
};
|
||||
|
||||
if (button_actions[i] && !(actions & button_actions[i]))
|
||||
@@ -3106,14 +3084,11 @@ update_event_windows (MatewnckWindow *wi
|
||||
gdk_error_trap_pop ();
|
||||
}
|
||||
|
||||
-#ifdef HAVE_MATEWNCK_WINDOW_HAS_NAME
|
||||
static const char *
|
||||
-matewnck_window_get_real_name (MatewnckWindow *win)
|
||||
+wnck_window_get_real_name (MatewnckWindow *win)
|
||||
{
|
||||
return matewnck_window_has_name (win) ? matewnck_window_get_name (win) : NULL;
|
||||
}
|
||||
-#define matewnck_window_get_name matewnck_window_get_real_name
|
||||
-#endif
|
||||
|
||||
static gint
|
||||
max_window_name_width (MatewnckWindow *win)
|
||||
@@ -3131,7 +3106,7 @@ max_window_name_width (MatewnckWindow *w
|
||||
pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
|
||||
}
|
||||
|
||||
- name = matewnck_window_get_name (win);
|
||||
+ name = wnck_window_get_real_name (win);
|
||||
if (!name)
|
||||
return 0;
|
||||
|
||||
@@ -3160,7 +3135,7 @@ update_window_decoration_name (MatewnckW
|
||||
d->name = NULL;
|
||||
}
|
||||
|
||||
- name = matewnck_window_get_name (win);
|
||||
+ name = wnck_window_get_real_name (win);
|
||||
if (name && (name_length = strlen (name)))
|
||||
{
|
||||
gint w;
|
||||
@@ -3603,7 +3578,7 @@ update_switcher_window (MatewnckWindow *
|
||||
d->name = NULL;
|
||||
}
|
||||
|
||||
- name = matewnck_window_get_name (selected_win);
|
||||
+ name = wnck_window_get_real_name (selected_win);
|
||||
if (name && (name_length = strlen (name)))
|
||||
{
|
||||
if (!d->layout)
|
||||
@@ -4478,11 +4453,6 @@ action_menu_map (MatewnckWindow *win,
|
||||
return;
|
||||
case MATEWNCK_WINDOW_NORMAL:
|
||||
case MATEWNCK_WINDOW_DIALOG:
|
||||
-
|
||||
-#ifndef HAVE_LIBMATEWNCK_2_19_4
|
||||
- case MATEWNCK_WINDOW_MODAL_DIALOG:
|
||||
-#endif
|
||||
-
|
||||
case MATEWNCK_WINDOW_TOOLBAR:
|
||||
case MATEWNCK_WINDOW_MENU:
|
||||
case MATEWNCK_WINDOW_UTILITY:
|
||||
@@ -4572,11 +4542,6 @@ above_button_event (MatewnckWindow *win,
|
||||
{
|
||||
if (state == BUTTON_EVENT_ACTION_STATE)
|
||||
{
|
||||
-
|
||||
-#ifdef HAVE_LIBMATEWNCK_2_18_1
|
||||
- matewnck_window_make_above (win);
|
||||
-#endif
|
||||
-
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4638,11 +4603,7 @@ unabove_button_event (MatewnckWindow *wi
|
||||
{
|
||||
if (state == BUTTON_EVENT_ACTION_STATE)
|
||||
{
|
||||
-
|
||||
-#ifdef HAVE_LIBMATEWNCK_2_18_1
|
||||
matewnck_window_unmake_above (win);
|
||||
-#endif
|
||||
-
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -5006,7 +4967,7 @@ show_force_quit_dialog (MatewnckWindow *
|
||||
if (d->force_quit_dialog)
|
||||
return;
|
||||
|
||||
- tmp = g_markup_escape_text (matewnck_window_get_name (win), -1);
|
||||
+ tmp = g_markup_escape_text (wnck_window_get_real_name (win), -1);
|
||||
str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp);
|
||||
|
||||
g_free (tmp);
|
||||
@@ -6534,139 +6495,6 @@ value_changed (MateConfClient *client,
|
||||
if (changed)
|
||||
decorations_changed (data);
|
||||
}
|
||||
-
|
||||
-#elif USE_DBUS_GLIB
|
||||
-
|
||||
-static DBusHandlerResult
|
||||
-dbus_handle_message (DBusConnection *connection,
|
||||
- DBusMessage *message,
|
||||
- void *user_data)
|
||||
-{
|
||||
- MatewnckScreen *screen = user_data;
|
||||
- char **path;
|
||||
- const char *interface, *member;
|
||||
- DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
-
|
||||
- interface = dbus_message_get_interface (message);
|
||||
- member = dbus_message_get_member (message);
|
||||
-
|
||||
- (void) connection;
|
||||
-
|
||||
- if (!interface || !member)
|
||||
- return result;
|
||||
-
|
||||
- if (!dbus_message_is_signal (message, interface, member))
|
||||
- return result;
|
||||
-
|
||||
- if (strcmp (member, "changed"))
|
||||
- return result;
|
||||
-
|
||||
- if (!dbus_message_get_path_decomposed (message, &path))
|
||||
- return result;
|
||||
-
|
||||
- if (!path[0] || !path[1] || !path[2] || !path[3] || !path[4] || !path[5])
|
||||
- {
|
||||
- dbus_free_string_array (path);
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- if (!strcmp (path[0], "org") &&
|
||||
- !strcmp (path[1], "freedesktop") &&
|
||||
- !strcmp (path[2], "compiz") &&
|
||||
- !strcmp (path[3], "decoration") &&
|
||||
- !strcmp (path[4], "allscreens"))
|
||||
- {
|
||||
- result = DBUS_HANDLER_RESULT_HANDLED;
|
||||
-
|
||||
- if (strcmp (path[5], "shadow_radius") == 0)
|
||||
- {
|
||||
- dbus_message_get_args (message, NULL,
|
||||
- DBUS_TYPE_DOUBLE, &shadow_radius,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- }
|
||||
- else if (strcmp (path[5], "shadow_opacity") == 0)
|
||||
- {
|
||||
- dbus_message_get_args (message, NULL,
|
||||
- DBUS_TYPE_DOUBLE, &shadow_opacity,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- }
|
||||
- else if (strcmp (path[5], "shadow_color") == 0)
|
||||
- {
|
||||
- DBusError error;
|
||||
- char *str;
|
||||
-
|
||||
- dbus_error_init (&error);
|
||||
-
|
||||
- dbus_message_get_args (message, &error,
|
||||
- DBUS_TYPE_STRING, &str,
|
||||
- DBUS_TYPE_INVALID);
|
||||
-
|
||||
- if (!dbus_error_is_set (&error))
|
||||
- {
|
||||
- int c[4];
|
||||
-
|
||||
- if (sscanf (str, "#%2x%2x%2x%2x",
|
||||
- &c[0], &c[1], &c[2], &c[3]) == 4)
|
||||
- {
|
||||
- shadow_color[0] = c[0] << 8 | c[0];
|
||||
- shadow_color[1] = c[1] << 8 | c[1];
|
||||
- shadow_color[2] = c[2] << 8 | c[2];
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- dbus_error_free (&error);
|
||||
- }
|
||||
- else if (strcmp (path[5], "shadow_x_offset") == 0)
|
||||
- {
|
||||
- dbus_message_get_args (message, NULL,
|
||||
- DBUS_TYPE_INT32, &shadow_offset_x,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- }
|
||||
- else if (strcmp (path[5], "shadow_y_offset") == 0)
|
||||
- {
|
||||
- dbus_message_get_args (message, NULL,
|
||||
- DBUS_TYPE_INT32, &shadow_offset_y,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- }
|
||||
-
|
||||
- decorations_changed (screen);
|
||||
- }
|
||||
-
|
||||
- dbus_free_string_array (path);
|
||||
-
|
||||
- return result;
|
||||
-}
|
||||
-
|
||||
-static DBusMessage *
|
||||
-send_and_block_for_shadow_option_reply (DBusConnection *connection,
|
||||
- char *path)
|
||||
-{
|
||||
- DBusMessage *message;
|
||||
-
|
||||
- message = dbus_message_new_method_call (NULL,
|
||||
- path,
|
||||
- DBUS_INTERFACE,
|
||||
- DBUS_METHOD_GET);
|
||||
- if (message)
|
||||
- {
|
||||
- DBusMessage *reply;
|
||||
- DBusError error;
|
||||
-
|
||||
- dbus_message_set_destination (message, DBUS_DEST);
|
||||
-
|
||||
- dbus_error_init (&error);
|
||||
- reply = dbus_connection_send_with_reply_and_block (connection,
|
||||
- message, -1,
|
||||
- &error);
|
||||
- dbus_message_unref (message);
|
||||
-
|
||||
- if (!dbus_error_is_set (&error))
|
||||
- return reply;
|
||||
- }
|
||||
-
|
||||
- return NULL;
|
||||
-}
|
||||
-
|
||||
#endif
|
||||
|
||||
static gboolean
|
||||
@@ -6708,96 +6536,6 @@ init_settings (MatewnckScreen *screen)
|
||||
screen);
|
||||
|
||||
cursor_theme_changed(mateconf);
|
||||
-
|
||||
-#elif USE_DBUS_GLIB
|
||||
- DBusConnection *connection;
|
||||
- DBusMessage *reply;
|
||||
- DBusError error;
|
||||
-
|
||||
- dbus_error_init (&error);
|
||||
-
|
||||
- connection = dbus_bus_get (DBUS_BUS_SESSION, &error);
|
||||
- if (!dbus_error_is_set (&error))
|
||||
- {
|
||||
- dbus_bus_add_match (connection, "type='signal'", &error);
|
||||
-
|
||||
- dbus_connection_add_filter (connection,
|
||||
- dbus_handle_message,
|
||||
- screen, NULL);
|
||||
-
|
||||
- dbus_connection_setup_with_g_main (connection, NULL);
|
||||
- }
|
||||
-
|
||||
- reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
|
||||
- "/shadow_radius");
|
||||
- if (reply)
|
||||
- {
|
||||
- dbus_message_get_args (reply, NULL,
|
||||
- DBUS_TYPE_DOUBLE, &shadow_radius,
|
||||
- DBUS_TYPE_INVALID);
|
||||
-
|
||||
- dbus_message_unref (reply);
|
||||
- }
|
||||
-
|
||||
- reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
|
||||
- "/shadow_opacity");
|
||||
- if (reply)
|
||||
- {
|
||||
- dbus_message_get_args (reply, NULL,
|
||||
- DBUS_TYPE_DOUBLE, &shadow_opacity,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- dbus_message_unref (reply);
|
||||
- }
|
||||
-
|
||||
- reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
|
||||
- "/shadow_color");
|
||||
- if (reply)
|
||||
- {
|
||||
- DBusError error;
|
||||
- char *str;
|
||||
-
|
||||
- dbus_error_init (&error);
|
||||
-
|
||||
- dbus_message_get_args (reply, &error,
|
||||
- DBUS_TYPE_STRING, &str,
|
||||
- DBUS_TYPE_INVALID);
|
||||
-
|
||||
- if (!dbus_error_is_set (&error))
|
||||
- {
|
||||
- int c[4];
|
||||
-
|
||||
- if (sscanf (str, "#%2x%2x%2x%2x", &c[0], &c[1], &c[2], &c[3]) == 4)
|
||||
- {
|
||||
- shadow_color[0] = c[0] << 8 | c[0];
|
||||
- shadow_color[1] = c[1] << 8 | c[1];
|
||||
- shadow_color[2] = c[2] << 8 | c[2];
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- dbus_error_free (&error);
|
||||
-
|
||||
- dbus_message_unref (reply);
|
||||
- }
|
||||
-
|
||||
- reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
|
||||
- "/shadow_x_offset");
|
||||
- if (reply)
|
||||
- {
|
||||
- dbus_message_get_args (reply, NULL,
|
||||
- DBUS_TYPE_INT32, &shadow_offset_x,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- dbus_message_unref (reply);
|
||||
- }
|
||||
-
|
||||
- reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
|
||||
- "/shadow_y_offset");
|
||||
- if (reply)
|
||||
- {
|
||||
- dbus_message_get_args (reply, NULL,
|
||||
- DBUS_TYPE_INT32, &shadow_offset_y,
|
||||
- DBUS_TYPE_INVALID);
|
||||
- dbus_message_unref (reply);
|
||||
- }
|
||||
#endif
|
||||
|
||||
style_window = gtk_window_new (GTK_WINDOW_POPUP);
|
@ -1,257 +0,0 @@
|
||||
Author: Sebastien Bacher <seb128@canonical.com>
|
||||
Description: add cursor theme and size support
|
||||
Origin: vendor, ubuntu (1:0.3.6-1ubuntu4)
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/86184
|
||||
|
||||
Author: Jasmine Hassan <jasmine.aura@gmail.com>
|
||||
Description: Updated to migrate to Mate Desktop
|
||||
Origin: <other>, build for LMDE/Debian Testing
|
||||
Last-Updated: 2012-10-09
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -125,6 +125,7 @@ COMPIZ_REQUIRES="x11 \
|
||||
xdamage \
|
||||
xrandr \
|
||||
xinerama \
|
||||
+ xcursor \
|
||||
ice \
|
||||
sm \
|
||||
libxml-2.0 \
|
||||
@@ -301,6 +302,7 @@ AC_ARG_ENABLE(mate-keybindings,
|
||||
if test "x$use_gtk" = "xyes"; then
|
||||
PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR,
|
||||
xrender >= 0.8.4 \
|
||||
+ xcursor \
|
||||
gtk+-2.0 >= 2.8.0 \
|
||||
libwnck-1.0 \
|
||||
pangocairo,
|
||||
--- a/gtk/window-decorator/gtk-window-decorator.c
|
||||
+++ b/gtk/window-decorator/gtk-window-decorator.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <X11/cursorfont.h>
|
||||
#include <X11/extensions/Xrender.h>
|
||||
#include <X11/Xregion.h>
|
||||
+#include <X11/Xcursor/Xcursor.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
@@ -75,6 +76,14 @@
|
||||
#include <marco-private/theme.h>
|
||||
#endif
|
||||
|
||||
+#define MATE_MOUSE_DIR "/desktop/mate/peripherals/mouse"
|
||||
+
|
||||
+#define MATE_CURSOR_THEME_KEY \
|
||||
+ MATE_MOUSE_DIR "/cursor_theme"
|
||||
+
|
||||
+#define MATE_CURSOR_SIZE_KEY \
|
||||
+ MATE_MOUSE_DIR "/cursor_size"
|
||||
+
|
||||
#define MARCO_MATECONF_DIR "/apps/marco/general"
|
||||
|
||||
#define COMPIZ_USE_SYSTEM_FONT_KEY \
|
||||
@@ -138,6 +147,13 @@
|
||||
#define WHEEL_ACTION_KEY \
|
||||
MATECONF_DIR "/mouse_wheel_action"
|
||||
|
||||
+#define COMPIZ_MATECONF_DIR2 "/apps/compiz/general/allscreens/options"
|
||||
+#define COMPIZ_CURSOR_THEME_KEY \
|
||||
+ COMPIZ_MATECONF_DIR2 "/cursor_theme"
|
||||
+
|
||||
+#define COMPIZ_CURSOR_SIZE_KEY \
|
||||
+ COMPIZ_MATECONF_DIR2 "/cursor_size"
|
||||
+
|
||||
#define DBUS_DEST "org.freedesktop.compiz"
|
||||
#define DBUS_PATH "/org/freedesktop/compiz/decoration/allscreens"
|
||||
#define DBUS_INTERFACE "org.freedesktop.compiz"
|
||||
@@ -6462,6 +6478,44 @@ button_layout_changed (MateConfClient *c
|
||||
}
|
||||
|
||||
static void
|
||||
+cursor_theme_changed (MateConfClient *client)
|
||||
+{
|
||||
+ gchar *theme;
|
||||
+ gint size;
|
||||
+
|
||||
+ theme = mateconf_client_get_string(client, MATE_CURSOR_THEME_KEY, NULL);
|
||||
+ size = mateconf_client_get_int(client, MATE_CURSOR_SIZE_KEY, NULL);
|
||||
+
|
||||
+ mateconf_client_set_string(client, COMPIZ_CURSOR_THEME_KEY, theme, NULL);
|
||||
+
|
||||
+ mateconf_client_set_int(client, COMPIZ_CURSOR_SIZE_KEY, size, NULL);
|
||||
+
|
||||
+ if (theme && strlen(theme))
|
||||
+ {
|
||||
+ gint i, j;
|
||||
+ GdkDisplay *gdkdisplay = gdk_display_get_default ();
|
||||
+ Display *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
|
||||
+
|
||||
+
|
||||
+ XcursorSetTheme (xdisplay, theme);
|
||||
+ XcursorSetDefaultSize (xdisplay, size);
|
||||
+
|
||||
+ for (i = 0; i < 3; i++)
|
||||
+ {
|
||||
+ for (j = 0; j < 3; j++)
|
||||
+ {
|
||||
+ if (cursor[i][j].shape != XC_left_ptr)
|
||||
+ {
|
||||
+ XFreeCursor (xdisplay, cursor[i][j].cursor);
|
||||
+ cursor[i][j].cursor =
|
||||
+ XCreateFontCursor (xdisplay, cursor[i][j].shape);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
value_changed (MateConfClient *client,
|
||||
const gchar *key,
|
||||
MateConfValue *value,
|
||||
@@ -6539,6 +6593,11 @@ value_changed (MateConfClient *client,
|
||||
if (theme_opacity_changed (client))
|
||||
changed = TRUE;
|
||||
}
|
||||
+ else if (strcmp (key, MATE_CURSOR_THEME_KEY) == 0 ||
|
||||
+ strcmp (key, MATE_CURSOR_SIZE_KEY) == 0)
|
||||
+ {
|
||||
+ cursor_theme_changed (client);
|
||||
+ }
|
||||
|
||||
if (changed)
|
||||
decorations_changed (data);
|
||||
@@ -6702,6 +6761,11 @@ init_settings (WnckScreen *screen)
|
||||
NULL);
|
||||
|
||||
mateconf_client_add_dir (mateconf,
|
||||
+ MATE_MOUSE_DIR,
|
||||
+ MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
+ NULL);
|
||||
+
|
||||
+ mateconf_client_add_dir (mateconf,
|
||||
COMPIZ_MATECONF_DIR1,
|
||||
MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
NULL);
|
||||
@@ -6710,6 +6774,9 @@ init_settings (WnckScreen *screen)
|
||||
"value_changed",
|
||||
G_CALLBACK (value_changed),
|
||||
screen);
|
||||
+
|
||||
+ cursor_theme_changed(mateconf);
|
||||
+
|
||||
#elif USE_DBUS_GLIB
|
||||
DBusConnection *connection;
|
||||
DBusMessage *reply;
|
||||
--- a/metadata/core.xml.in.in
|
||||
+++ b/metadata/core.xml.in.in
|
||||
@@ -35,6 +35,18 @@
|
||||
<min>0</min>
|
||||
<max>10000</max>
|
||||
</option>
|
||||
+ <option name="cursor_theme" type="string">
|
||||
+ <_short>Cursor theme</_short>
|
||||
+ <_long>Cursor theme name</_long>
|
||||
+ <default></default>
|
||||
+ </option>
|
||||
+ <option name="cursor_size" type="int">
|
||||
+ <_short>Cursor size</_short>
|
||||
+ <_long>Size of the cursor</_long>
|
||||
+ <default>18</default>
|
||||
+ <min>8</min>
|
||||
+ <max>128</max>
|
||||
+ </option>
|
||||
<option name="ping_delay" type="int">
|
||||
<_short>Ping Delay</_short>
|
||||
<_long>Interval between ping messages</_long>
|
||||
--- a/src/display.c
|
||||
+++ b/src/display.c
|
||||
@@ -41,6 +41,8 @@
|
||||
#include <X11/extensions/Xcomposite.h>
|
||||
#include <X11/extensions/Xrandr.h>
|
||||
#include <X11/extensions/shape.h>
|
||||
+#include <X11/Xcursor/Xcursor.h>
|
||||
+#include <X11/cursorfont.h>
|
||||
|
||||
#include <compiz-core.h>
|
||||
|
||||
@@ -474,6 +476,32 @@ shade (CompDisplay *d,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
+static void
|
||||
+compDisplaySetCursorTheme (CompDisplay *display)
|
||||
+{
|
||||
+ char *theme = display->opt[COMP_DISPLAY_OPTION_CURSOR_THEME].value.s;
|
||||
+ int size = display->opt[COMP_DISPLAY_OPTION_CURSOR_SIZE].value.i;
|
||||
+
|
||||
+ if (theme && strlen(theme))
|
||||
+ {
|
||||
+ CompScreen *s;
|
||||
+
|
||||
+ XcursorSetTheme (display->display, theme);
|
||||
+ XcursorSetDefaultSize (display->display, size);
|
||||
+ for (s = display->screens; s; s = s->next)
|
||||
+ {
|
||||
+ XFreeCursor (display->display, s->normalCursor);
|
||||
+ s->busyCursor = XCreateFontCursor (display->display, XC_watch);
|
||||
+ XFlush (display->display);
|
||||
+
|
||||
+ XFreeCursor (display->display, s->normalCursor);
|
||||
+ s->normalCursor = XCreateFontCursor (display->display, XC_left_ptr);
|
||||
+ XDefineCursor (display->display, s->root, s->normalCursor);
|
||||
+ XFlush (display->display);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
const CompMetadataOptionInfo coreDisplayOptionInfo[COMP_DISPLAY_OPTION_NUM] = {
|
||||
{ "abi", "int", 0, 0, 0 },
|
||||
{ "active_plugins", "list", "<type>string</type>", 0, 0 },
|
||||
@@ -510,7 +538,9 @@ const CompMetadataOptionInfo coreDisplay
|
||||
{ "toggle_window_shaded_key", "key", 0, shade, 0 },
|
||||
{ "ignore_hints_when_maximized", "bool", 0, 0, 0 },
|
||||
{ "ping_delay", "int", "<min>1000</min>", 0, 0 },
|
||||
- { "edge_delay", "int", "<min>0</min>", 0, 0 }
|
||||
+ { "edge_delay", "int", "<min>0</min>", 0, 0 },
|
||||
+ { "cursor_theme", "string", 0, 0, 0 },
|
||||
+ { "cursor_size", "int", 0, 0, 0 }
|
||||
};
|
||||
|
||||
CompOption *
|
||||
@@ -661,6 +691,20 @@ setDisplayOption (CompPlugin *plugin,
|
||||
return TRUE;
|
||||
}
|
||||
break;
|
||||
+ case COMP_DISPLAY_OPTION_CURSOR_THEME:
|
||||
+ if (compSetStringOption(o, value))
|
||||
+ {
|
||||
+ compDisplaySetCursorTheme(display);
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ break;
|
||||
+ case COMP_DISPLAY_OPTION_CURSOR_SIZE:
|
||||
+ if (compSetIntOption(o, value))
|
||||
+ {
|
||||
+ compDisplaySetCursorTheme(display);
|
||||
+ return TRUE;
|
||||
+ }
|
||||
+ break;
|
||||
default:
|
||||
if (compSetDisplayOption (display, o, value))
|
||||
return TRUE;
|
||||
--- a/include/compiz-core.h
|
||||
+++ b/include/compiz-core.h
|
||||
@@ -776,7 +776,10 @@ removeFileWatch (CompFileWatchHandle han
|
||||
#define COMP_DISPLAY_OPTION_IGNORE_HINTS_WHEN_MAXIMIZED 31
|
||||
#define COMP_DISPLAY_OPTION_PING_DELAY 32
|
||||
#define COMP_DISPLAY_OPTION_EDGE_DELAY 33
|
||||
-#define COMP_DISPLAY_OPTION_NUM 34
|
||||
+#define COMP_DISPLAY_OPTION_CURSOR_THEME 34
|
||||
+#define COMP_DISPLAY_OPTION_CURSOR_SIZE 35
|
||||
+#define COMP_DISPLAY_OPTION_NUM 36
|
||||
+
|
||||
|
||||
typedef void (*HandleEventProc) (CompDisplay *display,
|
||||
XEvent *event);
|
19012
compiz_new_mate.patch
19012
compiz_new_mate.patch
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,844 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
|
||||
--- compiz-0.8.8-orig/configure.ac 2014-02-16 14:11:06.698095000 +0100
|
||||
+++ compiz-0.8.8/configure.ac 2014-02-16 14:28:05.084172227 +0100
|
||||
@@ -292,13 +292,9 @@ AC_ARG_ENABLE(marco,
|
||||
[use_marco=$enableval], [use_marco=yes])
|
||||
|
||||
AC_ARG_ENABLE(mate,
|
||||
- [ --disable-mate Disable mate settings module],
|
||||
+ [ --disable-mate Disable mate compatibility plugin],
|
||||
[use_mate=$enableval], [use_mate=yes])
|
||||
|
||||
-AC_ARG_ENABLE(mate-keybindings,
|
||||
- [ --disable-mate-keybindings Disable mate keybindings],
|
||||
- [use_mate_keybindings=$enableval], [use_mate_keybindings=yes])
|
||||
-
|
||||
if test "x$use_gtk" = "xyes"; then
|
||||
PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR,
|
||||
xrender >= 0.8.4 \
|
||||
@@ -332,21 +328,6 @@ if test "x$use_gtk" = "xyes"; then
|
||||
PKG_CHECK_EXISTS(libmarco-private >= 2.23.2,
|
||||
[have_marco_2_23_2=yes], [have_marco_2_23_2=no])
|
||||
fi
|
||||
-
|
||||
- if test "x$use_mate" = "xyes"; then
|
||||
- PKG_CHECK_MODULES(MATE_WINDOW_SETTINGS,
|
||||
- mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0,
|
||||
- [use_mate=yes], [use_mate=no])
|
||||
- fi
|
||||
-
|
||||
- if test "x$use_mate_keybindings" = "xyes"; then
|
||||
- PKG_CHECK_MODULES(MATE_KEY_BINDINGS,
|
||||
- mate-keybindings,
|
||||
- [use_mate_keybindings=yes], [use_mate_keybindings=no])
|
||||
- fi
|
||||
-
|
||||
- windowsettingsdatadir=`pkg-config --variable=prefix mate-window-settings-2.0`/share
|
||||
- windowsettingslibdir=`pkg-config --variable=libdir mate-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir mate-keybindings`
|
||||
else
|
||||
use_marco="no"
|
||||
use_mate="no"
|
||||
@@ -356,10 +337,6 @@ else
|
||||
use_mate="no"
|
||||
fi
|
||||
|
||||
-AC_SUBST(windowsettingsdatadir)
|
||||
-AC_SUBST(windowsettingslibdir)
|
||||
-AC_SUBST(keybindingsdir)
|
||||
-
|
||||
AM_CONDITIONAL(USE_GTK, test "x$use_gtk" = "xyes")
|
||||
if test "$use_gtk" = yes; then
|
||||
AC_DEFINE(USE_GTK, 1, [Build gtk window decorator])
|
||||
@@ -392,12 +369,7 @@ fi
|
||||
|
||||
AM_CONDITIONAL(USE_MATE, test "x$use_mate" = "xyes")
|
||||
if test "$use_mate" = yes; then
|
||||
- AC_DEFINE(USE_MATE, 1, [Build mate settings module])
|
||||
-fi
|
||||
-
|
||||
-AM_CONDITIONAL(USE_MATE_KEYBINDINGS, test "x$use_mate_keybindings" = "xyes")
|
||||
-if test "$use_mate_keybindings" = yes; then
|
||||
- AC_DEFINE(USE_MATE_KEYBINDINGS, 1, [Install custom keybindings])
|
||||
+ AC_DEFINE(USE_MATE, 1, [Build mate compatibility plugin])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(kde,
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in
|
||||
--- compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in 2014-02-16 14:11:06.631094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in 2014-02-16 14:13:23.474729118 +0100
|
||||
@@ -1,16 +0,0 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/main_menu_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_screenshot_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_window_screenshot_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_terminal_key"/>
|
||||
-
|
||||
-</KeyListEntries>
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-key.xml.in
|
||||
--- compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in 2014-02-16 14:11:06.632094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in 2014-02-16 14:13:44.649989404 +0100
|
||||
@@ -1,25 +0,0 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<KeyListEntries _name="Window Management" wm_name="compiz" package="compiz">
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/close_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/raise_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/lower_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/maximize_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/unmaximize_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_horizontally_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_vertically_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_shaded_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/general/allscreens/options/window_menu_key"/>
|
||||
-
|
||||
- <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
|
||||
-</KeyListEntries>
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c
|
||||
--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2014-02-16 14:11:06.632094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2014-02-16 14:14:19.707412176 +0100
|
||||
@@ -1,559 +0,0 @@
|
||||
-/*
|
||||
- * Copyright © 2005 Novell, Inc.
|
||||
- *
|
||||
- * Permission to use, copy, modify, distribute, and sell this software
|
||||
- * and its documentation for any purpose is hereby granted without
|
||||
- * fee, provided that the above copyright notice appear in all copies
|
||||
- * and that both that copyright notice and this permission notice
|
||||
- * appear in supporting documentation, and that the name of
|
||||
- * Novell, Inc. not be used in advertising or publicity pertaining to
|
||||
- * distribution of the software without specific, written prior permission.
|
||||
- * Novell, Inc. makes no representations about the suitability of this
|
||||
- * software for any purpose. It is provided "as is" without express or
|
||||
- * implied warranty.
|
||||
- *
|
||||
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
|
||||
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
- *
|
||||
- * Author: David Reveman <davidr@novell.com>
|
||||
- */
|
||||
-
|
||||
-#include <config.h>
|
||||
-#include <sys/types.h>
|
||||
-#include <dirent.h>
|
||||
-#include <string.h>
|
||||
-#include <mateconf/mateconf-client.h>
|
||||
-#include <glib/gi18n.h>
|
||||
-
|
||||
-#include "compiz-window-manager.h"
|
||||
-
|
||||
-#define COMPIZ_CLICK_TO_FOCUS_KEY \
|
||||
- "/apps/compiz/general/allscreens/options/click_to_focus"
|
||||
-
|
||||
-#define COMPIZ_AUTORAISE_KEY \
|
||||
- "/apps/compiz/general/allscreens/options/autoraise"
|
||||
-
|
||||
-#define COMPIZ_AUTORAISE_DELAY_KEY \
|
||||
- "/apps/compiz/general/allscreens/options/autoraise_delay"
|
||||
-
|
||||
-#define COMPIZ_MOUSE_MOVE_KEY \
|
||||
- "/apps/compiz/plugins/move/allscreens/options/initiate_button"
|
||||
-
|
||||
-#define MATECONF_DIR "/apps/marco/general"
|
||||
-
|
||||
-#define COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY \
|
||||
- MATECONF_DIR "/action_double_click_titlebar"
|
||||
-
|
||||
-#define COMPIZ_USE_SYSTEM_FONT_KEY \
|
||||
- MATECONF_DIR "/titlebar_uses_system_font"
|
||||
-
|
||||
-#define COMPIZ_TITLEBAR_FONT_KEY \
|
||||
- MATECONF_DIR "/titlebar_font"
|
||||
-
|
||||
-#define COMPIZ_THEME_KEY \
|
||||
- MATECONF_DIR "/theme"
|
||||
-
|
||||
-enum {
|
||||
- DOUBLE_CLICK_NONE,
|
||||
- DOUBLE_CLICK_SHADE,
|
||||
- DOUBLE_CLICK_MAXIMIZE,
|
||||
- DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY,
|
||||
- DOUBLE_CLICK_MAXIMIZE_VERTICALLY,
|
||||
- DOUBLE_CLICK_MINIMIZE,
|
||||
- DOUBLE_CLICK_RAISE,
|
||||
- DOUBLE_CLICK_LOWER,
|
||||
- DOUBLE_CLICK_MENU
|
||||
-};
|
||||
-
|
||||
-static const struct {
|
||||
- unsigned int action;
|
||||
- const char *value;
|
||||
-} double_click_actions [] = {
|
||||
- { DOUBLE_CLICK_NONE, "none" },
|
||||
- { DOUBLE_CLICK_SHADE, "toggle_shade" },
|
||||
- { DOUBLE_CLICK_MAXIMIZE, "toggle_maximize" },
|
||||
- { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, "toggle_maximize_horizontally" },
|
||||
- { DOUBLE_CLICK_MAXIMIZE_VERTICALLY, "toggle_maximize_vertically" },
|
||||
- { DOUBLE_CLICK_MINIMIZE, "minimize" },
|
||||
- { DOUBLE_CLICK_RAISE, "raise" },
|
||||
- { DOUBLE_CLICK_LOWER, "lower" },
|
||||
- { DOUBLE_CLICK_MENU, "menu" }
|
||||
-};
|
||||
-
|
||||
-static MateWindowManagerClass *parent_class;
|
||||
-
|
||||
-struct _CompizWindowManagerPrivate {
|
||||
- MateConfClient *mateconf;
|
||||
- gchar *font;
|
||||
- gchar *theme;
|
||||
- gchar *mouse_modifier;
|
||||
-};
|
||||
-
|
||||
-static void
|
||||
-value_changed (MateConfClient *client,
|
||||
- const gchar *key,
|
||||
- MateConfValue *value,
|
||||
- void *data)
|
||||
-{
|
||||
- CompizWindowManager *wm;
|
||||
-
|
||||
- wm = COMPIZ_WINDOW_MANAGER (data);
|
||||
-
|
||||
- mate_window_manager_settings_changed (MATE_WINDOW_MANAGER (wm));
|
||||
-}
|
||||
-
|
||||
-/* this function is called when the shared lib is loaded */
|
||||
-GObject *
|
||||
-window_manager_new (int expected_interface_version)
|
||||
-{
|
||||
- GObject *wm;
|
||||
-
|
||||
- if (expected_interface_version != MATE_WINDOW_MANAGER_INTERFACE_VERSION)
|
||||
- {
|
||||
- g_warning ("Compiz window manager module wasn't compiled with the "
|
||||
- "current version of mate-control-center");
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- wm = g_object_new (compiz_window_manager_get_type (), NULL);
|
||||
-
|
||||
- return wm;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_change_settings (MateWindowManager *wm,
|
||||
- const MateWMSettings *settings)
|
||||
-{
|
||||
- CompizWindowManager *cwm;
|
||||
-
|
||||
- cwm = COMPIZ_WINDOW_MANAGER (wm);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_FONT)
|
||||
- mateconf_client_set_string (cwm->p->mateconf,
|
||||
- COMPIZ_TITLEBAR_FONT_KEY,
|
||||
- settings->font, NULL);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_MOUSE_FOCUS)
|
||||
- mateconf_client_set_bool (cwm->p->mateconf,
|
||||
- COMPIZ_CLICK_TO_FOCUS_KEY,
|
||||
- settings->focus_follows_mouse == FALSE,
|
||||
- NULL);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_AUTORAISE)
|
||||
- mateconf_client_set_bool (cwm->p->mateconf,
|
||||
- COMPIZ_AUTORAISE_KEY,
|
||||
- settings->autoraise, NULL);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_AUTORAISE_DELAY)
|
||||
- mateconf_client_set_int (cwm->p->mateconf,
|
||||
- COMPIZ_AUTORAISE_DELAY_KEY,
|
||||
- settings->autoraise_delay, NULL);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER)
|
||||
- {
|
||||
- char *value;
|
||||
-
|
||||
- value = g_strdup_printf ("<%s>Button1", settings->mouse_move_modifier);
|
||||
- mateconf_client_set_string (cwm->p->mateconf,
|
||||
- COMPIZ_MOUSE_MOVE_KEY,
|
||||
- value, NULL);
|
||||
- g_free (value);
|
||||
- }
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_THEME)
|
||||
- mateconf_client_set_string (cwm->p->mateconf,
|
||||
- COMPIZ_THEME_KEY,
|
||||
- settings->theme, NULL);
|
||||
-
|
||||
- if (settings->flags & MATE_WM_SETTING_DOUBLE_CLICK_ACTION)
|
||||
- {
|
||||
- const char *action = NULL;
|
||||
- unsigned int i;
|
||||
-
|
||||
- for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++)
|
||||
- {
|
||||
- if (settings->double_click_action ==
|
||||
- double_click_actions[i].action)
|
||||
- {
|
||||
- action = double_click_actions[i].value;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (action)
|
||||
- mateconf_client_set_string (cwm->p->mateconf,
|
||||
- COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
|
||||
- action, NULL);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_get_settings (MateWindowManager *wm,
|
||||
- MateWMSettings *settings)
|
||||
-{
|
||||
- CompizWindowManager *cwm;
|
||||
- int to_get;
|
||||
-
|
||||
- cwm = COMPIZ_WINDOW_MANAGER (wm);
|
||||
-
|
||||
- to_get = settings->flags;
|
||||
- settings->flags = 0;
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_FONT)
|
||||
- {
|
||||
- char *str;
|
||||
-
|
||||
- str = mateconf_client_get_string (cwm->p->mateconf,
|
||||
- COMPIZ_TITLEBAR_FONT_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (!str)
|
||||
- str = g_strdup ("Sans Bold 12");
|
||||
-
|
||||
- if (cwm->p->font)
|
||||
- g_free (cwm->p->font);
|
||||
-
|
||||
- cwm->p->font = str;
|
||||
-
|
||||
- settings->font = cwm->p->font;
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_FONT;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_MOUSE_FOCUS)
|
||||
- {
|
||||
- settings->focus_follows_mouse =
|
||||
- mateconf_client_get_bool (cwm->p->mateconf,
|
||||
- COMPIZ_CLICK_TO_FOCUS_KEY, NULL) == FALSE;
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_MOUSE_FOCUS;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_AUTORAISE)
|
||||
- {
|
||||
- settings->autoraise = mateconf_client_get_bool (cwm->p->mateconf,
|
||||
- COMPIZ_AUTORAISE_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_AUTORAISE;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_AUTORAISE_DELAY)
|
||||
- {
|
||||
- settings->autoraise_delay =
|
||||
- mateconf_client_get_int (cwm->p->mateconf,
|
||||
- COMPIZ_AUTORAISE_DELAY_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_AUTORAISE_DELAY;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER)
|
||||
- {
|
||||
- const char *new;
|
||||
- char *str;
|
||||
-
|
||||
- str = mateconf_client_get_string (cwm->p->mateconf,
|
||||
- COMPIZ_MOUSE_MOVE_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (str == NULL)
|
||||
- str = g_strdup ("<Super>");
|
||||
-
|
||||
- if (strncmp (str, "<Super>", 7) == 0)
|
||||
- new = "Super";
|
||||
- else if (strncmp (str, "<Alt>", 5) == 0)
|
||||
- new = "Alt";
|
||||
- else if (strncmp (str, "<Meta>", 6) == 0)
|
||||
- new = "Meta";
|
||||
- else if (strncmp (str, "<Hyper>", 7) == 0)
|
||||
- new = "Hyper";
|
||||
- else if (strncmp (str, "<Control>", 9) == 0)
|
||||
- new = "Control";
|
||||
- else
|
||||
- new = NULL;
|
||||
-
|
||||
- if (cwm->p->mouse_modifier)
|
||||
- g_free (cwm->p->mouse_modifier);
|
||||
-
|
||||
- cwm->p->mouse_modifier = g_strdup (new ? new : "");
|
||||
-
|
||||
- g_free (str);
|
||||
-
|
||||
- settings->mouse_move_modifier = cwm->p->mouse_modifier;
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_MOUSE_MOVE_MODIFIER;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_THEME)
|
||||
- {
|
||||
- char *str;
|
||||
-
|
||||
- str = mateconf_client_get_string (cwm->p->mateconf,
|
||||
- COMPIZ_THEME_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (str == NULL)
|
||||
- str = g_strdup ("Atlanta");
|
||||
-
|
||||
- g_free (cwm->p->theme);
|
||||
- cwm->p->theme = str;
|
||||
- settings->theme = cwm->p->theme;
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_THEME;
|
||||
- }
|
||||
-
|
||||
- if (to_get & MATE_WM_SETTING_DOUBLE_CLICK_ACTION)
|
||||
- {
|
||||
- char *str;
|
||||
-
|
||||
- settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
|
||||
-
|
||||
- str = mateconf_client_get_string (cwm->p->mateconf,
|
||||
- COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (str)
|
||||
- {
|
||||
- unsigned int i;
|
||||
-
|
||||
- for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++)
|
||||
- {
|
||||
- if (strcmp (str, double_click_actions[i].value) == 0)
|
||||
- {
|
||||
- settings->double_click_action =
|
||||
- double_click_actions[i].action;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- settings->flags |= MATE_WM_SETTING_DOUBLE_CLICK_ACTION;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static int
|
||||
-compiz_get_settings_mask (MateWindowManager *wm)
|
||||
-{
|
||||
- return MATE_WM_SETTING_MASK;
|
||||
-}
|
||||
-
|
||||
-static GList *
|
||||
-add_themes_from_dir (GList *current_list,
|
||||
- const char *path)
|
||||
-{
|
||||
- DIR *theme_dir;
|
||||
- struct dirent *entry;
|
||||
- char *theme_file_path;
|
||||
- GList *node;
|
||||
- gboolean found = FALSE;
|
||||
-
|
||||
- if (!(g_file_test (path, G_FILE_TEST_EXISTS) &&
|
||||
- g_file_test (path, G_FILE_TEST_IS_DIR)))
|
||||
- {
|
||||
- return current_list;
|
||||
- }
|
||||
-
|
||||
- theme_dir = opendir (path);
|
||||
-
|
||||
- /* If this is NULL, then we couldn't open ~/.themes. The test above
|
||||
- * only checks existence, not wether we can really read it.*/
|
||||
- if (theme_dir == NULL)
|
||||
- return current_list;
|
||||
-
|
||||
- for (entry = readdir (theme_dir); entry; entry = readdir (theme_dir))
|
||||
- {
|
||||
- theme_file_path =
|
||||
- g_build_filename (path, entry->d_name,
|
||||
- "metacity-1/metacity-theme-1.xml", NULL);
|
||||
-
|
||||
- if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS))
|
||||
- {
|
||||
-
|
||||
- for (node = current_list; node && !found; node = node->next)
|
||||
- found = strcmp (node->data, entry->d_name) == 0;
|
||||
-
|
||||
- if (!found)
|
||||
- current_list = g_list_prepend (current_list,
|
||||
- g_strdup (entry->d_name));
|
||||
- }
|
||||
-
|
||||
- found = FALSE;
|
||||
-
|
||||
- g_free (theme_file_path);
|
||||
- }
|
||||
-
|
||||
- closedir (theme_dir);
|
||||
-
|
||||
- return current_list;
|
||||
-}
|
||||
-
|
||||
-static GList *
|
||||
-compiz_get_theme_list (MateWindowManager *wm)
|
||||
-{
|
||||
- GList *themes = NULL;
|
||||
- char *home_dir_themes;
|
||||
-
|
||||
- home_dir_themes = g_build_filename (g_get_home_dir (), ".themes", NULL);
|
||||
-
|
||||
- themes = add_themes_from_dir (themes, MARCO_THEME_DIR);
|
||||
- themes = add_themes_from_dir (themes, "/usr/share/themes");
|
||||
- themes = add_themes_from_dir (themes, home_dir_themes);
|
||||
-
|
||||
- g_free (home_dir_themes);
|
||||
-
|
||||
- return themes;
|
||||
-}
|
||||
-
|
||||
-static char *
|
||||
-compiz_get_user_theme_folder (MateWindowManager *wm)
|
||||
-{
|
||||
- return g_build_filename (g_get_home_dir (), ".themes", NULL);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_get_double_click_actions (MateWindowManager *wm,
|
||||
- const MateWMDoubleClickAction **actions_p,
|
||||
- int *n_actions_p)
|
||||
-{
|
||||
- static gboolean initialized = FALSE;
|
||||
- static MateWMDoubleClickAction actions[] = {
|
||||
- { DOUBLE_CLICK_NONE, N_("None") },
|
||||
- { DOUBLE_CLICK_SHADE, N_("Shade") },
|
||||
- { DOUBLE_CLICK_MAXIMIZE, N_("Maximize") },
|
||||
- { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Horizontally") },
|
||||
- { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Vertically") },
|
||||
- { DOUBLE_CLICK_MINIMIZE, N_("Minimize") },
|
||||
- { DOUBLE_CLICK_RAISE, N_("Raise") },
|
||||
- { DOUBLE_CLICK_LOWER, N_("Lower") },
|
||||
- { DOUBLE_CLICK_MENU, N_("Window Menu") }
|
||||
- };
|
||||
-
|
||||
- if (!initialized)
|
||||
- {
|
||||
- unsigned int i;
|
||||
-
|
||||
- for (i = 0; i < G_N_ELEMENTS (actions); i++)
|
||||
- actions[i].human_readable_name = _(actions[i].human_readable_name);
|
||||
-
|
||||
- initialized = TRUE;
|
||||
- }
|
||||
-
|
||||
- *actions_p = actions;
|
||||
- *n_actions_p = (int) G_N_ELEMENTS (actions);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_window_manager_init (CompizWindowManager *cwm,
|
||||
- CompizWindowManagerClass *class)
|
||||
-{
|
||||
- cwm->p = g_new0 (CompizWindowManagerPrivate, 1);
|
||||
- cwm->p->mateconf = mateconf_client_get_default ();
|
||||
- cwm->p->mouse_modifier = NULL;
|
||||
- cwm->p->font = NULL;
|
||||
- cwm->p->theme = NULL;
|
||||
-
|
||||
- mateconf_client_add_dir (cwm->p->mateconf,
|
||||
- "/apps/compiz",
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
- mateconf_client_add_dir (cwm->p->mateconf,
|
||||
- MATECONF_DIR,
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
-
|
||||
- g_signal_connect (G_OBJECT (cwm->p->mateconf),
|
||||
- "value_changed",
|
||||
- G_CALLBACK (value_changed),
|
||||
- cwm);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_window_manager_finalize (GObject *object)
|
||||
-{
|
||||
- CompizWindowManager *cwm;
|
||||
-
|
||||
- g_return_if_fail (object != NULL);
|
||||
- g_return_if_fail (IS_COMPIZ_WINDOW_MANAGER (object));
|
||||
-
|
||||
- cwm = COMPIZ_WINDOW_MANAGER (object);
|
||||
-
|
||||
- g_signal_handlers_disconnect_by_func (G_OBJECT (cwm->p->mateconf),
|
||||
- G_CALLBACK (value_changed),
|
||||
- cwm);
|
||||
-
|
||||
- if (cwm->p->mouse_modifier)
|
||||
- g_free (cwm->p->mouse_modifier);
|
||||
-
|
||||
- if (cwm->p->font)
|
||||
- g_free (cwm->p->font);
|
||||
-
|
||||
- if (cwm->p->theme)
|
||||
- g_free (cwm->p->theme);
|
||||
-
|
||||
- g_object_unref (G_OBJECT (cwm->p->mateconf));
|
||||
- g_free (cwm->p);
|
||||
-
|
||||
- G_OBJECT_CLASS (parent_class)->finalize (object);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-compiz_window_manager_class_init (CompizWindowManagerClass *class)
|
||||
-{
|
||||
- GObjectClass *object_class;
|
||||
- MateWindowManagerClass *wm_class;
|
||||
-
|
||||
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
|
||||
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
- textdomain (GETTEXT_PACKAGE);
|
||||
-
|
||||
- object_class = G_OBJECT_CLASS (class);
|
||||
- wm_class = MATE_WINDOW_MANAGER_CLASS (class);
|
||||
-
|
||||
- object_class->finalize = compiz_window_manager_finalize;
|
||||
-
|
||||
- wm_class->change_settings = compiz_change_settings;
|
||||
- wm_class->get_settings = compiz_get_settings;
|
||||
- wm_class->get_settings_mask = compiz_get_settings_mask;
|
||||
- wm_class->get_user_theme_folder = compiz_get_user_theme_folder;
|
||||
- wm_class->get_theme_list = compiz_get_theme_list;
|
||||
- wm_class->get_double_click_actions = compiz_get_double_click_actions;
|
||||
-
|
||||
- parent_class = g_type_class_peek_parent (class);
|
||||
-}
|
||||
-
|
||||
-GType
|
||||
-compiz_window_manager_get_type (void)
|
||||
-{
|
||||
- static GType compiz_window_manager_type = 0;
|
||||
-
|
||||
- if (!compiz_window_manager_type)
|
||||
- {
|
||||
- static GTypeInfo compiz_window_manager_info = {
|
||||
- sizeof (CompizWindowManagerClass),
|
||||
- NULL,
|
||||
- NULL,
|
||||
- (GClassInitFunc) compiz_window_manager_class_init,
|
||||
- NULL,
|
||||
- NULL,
|
||||
- sizeof (CompizWindowManager),
|
||||
- 0,
|
||||
- (GInstanceInitFunc) compiz_window_manager_init,
|
||||
- NULL
|
||||
- };
|
||||
-
|
||||
- compiz_window_manager_type =
|
||||
- g_type_register_static (mate_window_manager_get_type (),
|
||||
- "CompizWindowManager",
|
||||
- &compiz_window_manager_info, 0);
|
||||
- }
|
||||
-
|
||||
- return compiz_window_manager_type;
|
||||
-}
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h compiz-0.8.8/gtk/mate/compiz-window-manager.h
|
||||
--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h 2014-02-16 14:11:06.632094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/compiz-window-manager.h 2014-02-16 14:14:33.122571569 +0100
|
||||
@@ -1,39 +0,0 @@
|
||||
-#ifndef COMPIZ_WINDOW_MANAGER_H
|
||||
-#define COMPIZ_WINDOW_MANAGER_H
|
||||
-
|
||||
-#include <glib-object.h>
|
||||
-
|
||||
-#include "mate-window-manager.h"
|
||||
-
|
||||
-#define COMPIZ_WINDOW_MANAGER(obj) \
|
||||
- G_TYPE_CHECK_INSTANCE_CAST (obj, compiz_window_manager_get_type (), \
|
||||
- CompizWindowManager)
|
||||
-
|
||||
-#define COMPIZ_WINDOW_MANAGER_CLASS(klass) \
|
||||
- G_TYPE_CHECK_CLASS_CAST (klass, compiz_window_manager_get_type (), \
|
||||
- MarcoWindowManagerClass)
|
||||
-
|
||||
-#define IS_COMPIZ_WINDOW_MANAGER(obj) \
|
||||
- G_TYPE_CHECK_INSTANCE_TYPE (obj, compiz_window_manager_get_type ())
|
||||
-
|
||||
-
|
||||
-typedef struct _CompizWindowManager CompizWindowManager;
|
||||
-typedef struct _CompizWindowManagerClass CompizWindowManagerClass;
|
||||
-typedef struct _CompizWindowManagerPrivate CompizWindowManagerPrivate;
|
||||
-
|
||||
-struct _CompizWindowManager {
|
||||
- MateWindowManager parent;
|
||||
- CompizWindowManagerPrivate *p;
|
||||
-};
|
||||
-
|
||||
-struct _CompizWindowManagerClass {
|
||||
- MateWindowManagerClass klass;
|
||||
-};
|
||||
-
|
||||
-GType
|
||||
-compiz_window_manager_get_type (void);
|
||||
-
|
||||
-GObject *
|
||||
-window_manager_new (int expected_interface_version);
|
||||
-
|
||||
-#endif
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in compiz-0.8.8/gtk/mate/compiz-wm.desktop.in
|
||||
--- compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in 2014-02-16 14:11:06.632094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in 2014-02-16 14:14:50.331774101 +0100
|
||||
@@ -1,17 +0,0 @@
|
||||
-[Desktop Entry]
|
||||
-Type=Application
|
||||
-Encoding=UTF-8
|
||||
-_Name=Compiz
|
||||
-Exec=compiz
|
||||
-# name of loadable control center module
|
||||
-X-MATE-WMSettingsModule=compiz
|
||||
-# autostart phase
|
||||
-X-MATE-Autostart-Phase=WindowManager
|
||||
-X-MATE-Provides=windowmanager
|
||||
-# name we put on the WM spec check window
|
||||
-X-MATE-WMName=compiz
|
||||
-# back compat only
|
||||
-X-MateWMSettingsLibrary=compiz
|
||||
-
|
||||
-[Window Manager]
|
||||
-SessionManaged=false
|
||||
diff -uprN compiz-0.8.8-orig/gtk/mate/Makefile.am compiz-0.8.8/gtk/mate/Makefile.am
|
||||
--- compiz-0.8.8-orig/gtk/mate/Makefile.am 2014-02-16 14:11:06.633094000 +0100
|
||||
+++ compiz-0.8.8/gtk/mate/Makefile.am 2014-02-16 14:18:40.226337544 +0100
|
||||
@@ -1,97 +1,27 @@
|
||||
-moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
|
||||
-
|
||||
-if USE_MATE
|
||||
-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
|
||||
-libcompiz_la_LIBADD = @MATE_WINDOW_SETTINGS_LIBS@
|
||||
-libcompiz_la_SOURCES = \
|
||||
- compiz-window-manager.c \
|
||||
- compiz-window-manager.h
|
||||
-libcompiz_module = libcompiz.la
|
||||
-
|
||||
desktopfilesdir = $(DESTDIR)$(datadir)/applications
|
||||
desktopfiles_in_files = compiz.desktop.in
|
||||
desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
|
||||
|
||||
-wmpropertiesdir = $(DESTDIR)$(windowsettingsdatadir)/mate/wm-properties
|
||||
-wmproperties_in_files = compiz-wm.desktop.in
|
||||
-wmproperties_files = $(wmproperties_in_files:.desktop.in=.desktop)
|
||||
-
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
-if USE_MATE_KEYBINDINGS
|
||||
-
|
||||
-xmldir = $(DESTDIR)$(keybindingsdir)
|
||||
-xml_in_files = 50-compiz-desktop-key.xml.in 50-compiz-key.xml.in
|
||||
-xml_files = $(xml_in_files:.xml.in=.xml)
|
||||
-
|
||||
-@INTLTOOL_XML_NOMERGE_RULE@
|
||||
-
|
||||
-endif
|
||||
-
|
||||
-install-exec-local:
|
||||
- if mkdir -p $(moduledir) && test -w $(moduledir); then ( \
|
||||
- $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
|
||||
- $(moduledir) \
|
||||
- ); \
|
||||
- fi
|
||||
-
|
||||
install-data-local:
|
||||
if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \
|
||||
$(INSTALL) -m 644 $(desktopfiles_files) \
|
||||
$(desktopfilesdir) \
|
||||
); \
|
||||
fi
|
||||
- if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \
|
||||
- $(INSTALL) -m 644 $(wmproperties_files) \
|
||||
- $(wmpropertiesdir) \
|
||||
- ); \
|
||||
- fi
|
||||
-
|
||||
-if USE_MATE_KEYBINDINGS
|
||||
- if mkdir -p $(xmldir) && test -w $(xmldir); then ( \
|
||||
- $(INSTALL) -m 644 $(xml_files) \
|
||||
- $(xmldir) \
|
||||
- ); \
|
||||
- fi
|
||||
-endif
|
||||
|
||||
uninstall-local:
|
||||
- if test -w $(moduledir); then ( \
|
||||
- rm -f $(moduledir)/libcompiz.* \
|
||||
- ); \
|
||||
- fi
|
||||
if test -w $(desktopfilesdir); then ( \
|
||||
rm -f $(desktopfilesdir)/compiz.desktop \
|
||||
); \
|
||||
fi
|
||||
- if test -w $(wmpropertiesdir); then ( \
|
||||
- rm -f $(wmpropertiesdir)/compiz-wm.desktop \
|
||||
- ); \
|
||||
- fi
|
||||
-if USE_MATE_KEYBINDINGS
|
||||
- if test -w $(xmldir); then ( \
|
||||
- rm -f $(xmldir)/50-compiz*key.xml \
|
||||
- ); \
|
||||
- fi
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
-INCLUDES = @MATE_WINDOW_SETTINGS_CFLAGS@ \
|
||||
- -DMARCO_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
|
||||
- -DLOCALEDIR="\"@datadir@/locale"\"
|
||||
-
|
||||
-noinst_LTLIBRARIES = \
|
||||
- $(libcompiz_module)
|
||||
|
||||
noinst_DATA = \
|
||||
- $(desktopfiles_files) \
|
||||
- $(wmproperties_files) \
|
||||
- $(xml_files)
|
||||
+ $(desktopfiles_files)
|
||||
|
||||
EXTRA_DIST = \
|
||||
- $(desktopfiles_in_files) \
|
||||
- $(wmproperties_in_files) \
|
||||
- $(xml_in_files)
|
||||
+ $(desktopfiles_in_files)
|
||||
|
||||
DISTCLEANFILES = \
|
||||
$(noinst_DATA)
|
File diff suppressed because it is too large
Load Diff
@ -1,277 +0,0 @@
|
||||
diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
|
||||
--- compiz-0.8.8-orig/configure.ac 2013-04-19 14:12:09.341857000 +0200
|
||||
+++ compiz-0.8.8/configure.ac 2013-04-19 14:19:14.618100294 +0200
|
||||
@@ -260,12 +260,6 @@ if test "x$use_gtk" = "xyes"; then
|
||||
if test "x$use_marco" = "xyes"; then
|
||||
PKG_CHECK_MODULES(MARCO, libmarco-private,
|
||||
[use_marco=yes], [use_marco=no])
|
||||
- PKG_CHECK_EXISTS(libmarco-private >= 2.15.21,
|
||||
- [have_marco_2_15_21=yes], [have_marco_2_15_21=no])
|
||||
- PKG_CHECK_EXISTS(libmarco-private >= 2.17.0,
|
||||
- [have_marco_2_17_0=yes], [have_marco_2_17_0=no])
|
||||
- PKG_CHECK_EXISTS(libmarco-private >= 2.23.2,
|
||||
- [have_marco_2_23_2=yes], [have_marco_2_23_2=no])
|
||||
fi
|
||||
else
|
||||
use_marco="no"
|
||||
@@ -292,18 +286,6 @@ fi
|
||||
AM_CONDITIONAL(USE_MARCO, test "x$use_marco" = "xyes")
|
||||
if test "$use_marco" = yes; then
|
||||
AC_DEFINE(USE_MARCO, 1, [Build marco theme support])
|
||||
- if test "$have_marco_2_15_21" = yes; then
|
||||
- AC_DEFINE(HAVE_MARCO_2_15_21, 1,
|
||||
- [Define to 1 if marco version >= 2.15.21])
|
||||
- fi
|
||||
- if test "$have_marco_2_17_0" = yes; then
|
||||
- AC_DEFINE(HAVE_MARCO_2_17_0, 1,
|
||||
- [Define to 1 if marco version >= 2.17.0])
|
||||
- fi
|
||||
- if test "$have_marco_2_23_2" = yes; then
|
||||
- AC_DEFINE(HAVE_MARCO_2_23_2, 1,
|
||||
- [Define to 1 if marco version >= 2.23.2])
|
||||
- fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(USE_MATE, test "x$use_mate" = "xyes")
|
||||
diff -uprN compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2013-04-19 14:12:09.342857000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2013-04-19 14:28:30.521589122 +0200
|
||||
@@ -1327,19 +1327,10 @@ meta_get_corner_radius (const MetaFrameG
|
||||
int *bottom_left_radius,
|
||||
int *bottom_right_radius)
|
||||
{
|
||||
-
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
*top_left_radius = fgeom->top_left_corner_rounded_radius;
|
||||
*top_right_radius = fgeom->top_right_corner_rounded_radius;
|
||||
*bottom_left_radius = fgeom->bottom_left_corner_rounded_radius;
|
||||
*bottom_right_radius = fgeom->bottom_right_corner_rounded_radius;
|
||||
-#else
|
||||
- *top_left_radius = fgeom->top_left_corner_rounded ? 5 : 0;
|
||||
- *top_right_radius = fgeom->top_right_corner_rounded ? 5 : 0;
|
||||
- *bottom_left_radius = fgeom->bottom_left_corner_rounded ? 5 : 0;
|
||||
- *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0;
|
||||
-#endif
|
||||
-
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -1548,8 +1539,6 @@ meta_function_to_type (MetaButtonFunctio
|
||||
return META_BUTTON_TYPE_MAXIMIZE;
|
||||
case META_BUTTON_FUNCTION_CLOSE:
|
||||
return META_BUTTON_TYPE_CLOSE;
|
||||
-
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
case META_BUTTON_FUNCTION_SHADE:
|
||||
return META_BUTTON_TYPE_SHADE;
|
||||
case META_BUTTON_FUNCTION_ABOVE:
|
||||
@@ -1562,7 +1551,6 @@ meta_function_to_type (MetaButtonFunctio
|
||||
return META_BUTTON_TYPE_UNABOVE;
|
||||
case META_BUTTON_FUNCTION_UNSTICK:
|
||||
return META_BUTTON_TYPE_UNSTICK;
|
||||
-#endif
|
||||
|
||||
default:
|
||||
break;
|
||||
@@ -1606,8 +1594,6 @@ meta_button_state_for_button_type (decor
|
||||
return meta_button_state (d->button_states[BUTTON_MIN]);
|
||||
case META_BUTTON_TYPE_MENU:
|
||||
return meta_button_state (d->button_states[BUTTON_MENU]);
|
||||
-
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
case META_BUTTON_TYPE_SHADE:
|
||||
return meta_button_state (d->button_states[BUTTON_SHADE]);
|
||||
case META_BUTTON_TYPE_ABOVE:
|
||||
@@ -1620,7 +1606,6 @@ meta_button_state_for_button_type (decor
|
||||
return meta_button_state (d->button_states[BUTTON_UNABOVE]);
|
||||
case META_BUTTON_TYPE_UNSTICK:
|
||||
return meta_button_state (d->button_states[BUTTON_UNSTICK]);
|
||||
-#endif
|
||||
|
||||
default:
|
||||
break;
|
||||
@@ -1708,10 +1693,8 @@ meta_get_decoration_geometry (decor_t *
|
||||
if (d->state & WNCK_WINDOW_STATE_SHADED)
|
||||
*flags |= META_FRAME_SHADED;
|
||||
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
if (d->state & WNCK_WINDOW_STATE_ABOVE)
|
||||
*flags |= META_FRAME_ABOVE;
|
||||
-#endif
|
||||
|
||||
meta_theme_get_frame_borders (theme,
|
||||
META_FRAME_TYPE_NORMAL,
|
||||
@@ -1808,7 +1791,6 @@ meta_draw_window_decoration (decor_t *d)
|
||||
bg_color = style->bg[GTK_STATE_NORMAL];
|
||||
bg_alpha = 1.0;
|
||||
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
if (frame_style->window_background_color)
|
||||
{
|
||||
meta_color_spec_render (frame_style->window_background_color,
|
||||
@@ -1817,7 +1799,6 @@ meta_draw_window_decoration (decor_t *d)
|
||||
|
||||
bg_alpha = frame_style->window_background_alpha / 255.0;
|
||||
}
|
||||
-#endif
|
||||
|
||||
cairo_destroy (cr);
|
||||
|
||||
@@ -2844,12 +2825,7 @@ meta_get_button_position (decor_t *d,
|
||||
MetaFrameFlags flags;
|
||||
MetaTheme *theme;
|
||||
GdkRectangle clip;
|
||||
-
|
||||
-#ifdef HAVE_MARCO_2_15_21
|
||||
MetaButtonSpace *space;
|
||||
-#else
|
||||
- GdkRectangle *space;
|
||||
-#endif
|
||||
|
||||
if (!d->context)
|
||||
{
|
||||
@@ -2890,7 +2866,6 @@ meta_get_button_position (decor_t *d,
|
||||
space = &fgeom.close_rect;
|
||||
break;
|
||||
|
||||
-#if defined (HAVE_MARCO_2_17_0) && defined (HAVE_LIBWNCK_2_18_1)
|
||||
case BUTTON_SHADE:
|
||||
if (!meta_button_present (&button_layout, META_BUTTON_FUNCTION_SHADE))
|
||||
return FALSE;
|
||||
@@ -2927,13 +2902,11 @@ meta_get_button_position (decor_t *d,
|
||||
|
||||
space = &fgeom.unstick_rect;
|
||||
break;
|
||||
-#endif
|
||||
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
-#ifdef HAVE_MARCO_2_15_21
|
||||
if (!space->clickable.width && !space->clickable.height)
|
||||
return FALSE;
|
||||
|
||||
@@ -2941,15 +2914,6 @@ meta_get_button_position (decor_t *d,
|
||||
*y = space->clickable.y;
|
||||
*w = space->clickable.width;
|
||||
*h = space->clickable.height;
|
||||
-#else
|
||||
- if (!space->width && !space->height)
|
||||
- return FALSE;
|
||||
-
|
||||
- *x = space->x;
|
||||
- *y = space->y;
|
||||
- *w = space->width;
|
||||
- *h = space->height;
|
||||
-#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -5763,8 +5727,6 @@ meta_button_function_from_string (const
|
||||
return META_BUTTON_FUNCTION_MAXIMIZE;
|
||||
else if (strcmp (str, "close") == 0)
|
||||
return META_BUTTON_FUNCTION_CLOSE;
|
||||
-
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
else if (strcmp (str, "shade") == 0)
|
||||
return META_BUTTON_FUNCTION_SHADE;
|
||||
else if (strcmp (str, "above") == 0)
|
||||
@@ -5777,8 +5739,6 @@ meta_button_function_from_string (const
|
||||
return META_BUTTON_FUNCTION_UNABOVE;
|
||||
else if (strcmp (str, "unstick") == 0)
|
||||
return META_BUTTON_FUNCTION_UNSTICK;
|
||||
-#endif
|
||||
-
|
||||
else
|
||||
return META_BUTTON_FUNCTION_LAST;
|
||||
}
|
||||
@@ -5788,7 +5748,6 @@ meta_button_opposite_function (MetaButto
|
||||
{
|
||||
switch (ofwhat)
|
||||
{
|
||||
-#ifdef HAVE_MARCO_2_17_0
|
||||
case META_BUTTON_FUNCTION_SHADE:
|
||||
return META_BUTTON_FUNCTION_UNSHADE;
|
||||
case META_BUTTON_FUNCTION_UNSHADE:
|
||||
@@ -5803,7 +5762,6 @@ meta_button_opposite_function (MetaButto
|
||||
return META_BUTTON_FUNCTION_UNSTICK;
|
||||
case META_BUTTON_FUNCTION_UNSTICK:
|
||||
return META_BUTTON_FUNCTION_STICK;
|
||||
-#endif
|
||||
|
||||
default:
|
||||
return META_BUTTON_FUNCTION_LAST;
|
||||
@@ -5819,10 +5777,8 @@ meta_initialize_button_layout (MetaButto
|
||||
{
|
||||
layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST;
|
||||
layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST;
|
||||
-#ifdef HAVE_MARCO_2_23_2
|
||||
layout->left_buttons_has_spacer[i] = FALSE;
|
||||
layout->right_buttons_has_spacer[i] = FALSE;
|
||||
-#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5853,7 +5809,6 @@ meta_update_button_layout (const char *v
|
||||
while (buttons[b] != NULL)
|
||||
{
|
||||
f = meta_button_function_from_string (buttons[b]);
|
||||
-#ifdef HAVE_MARCO_2_23_2
|
||||
if (i > 0 && strcmp("spacer", buttons[b]) == 0)
|
||||
{
|
||||
new_layout.left_buttons_has_spacer[i - 1] = TRUE;
|
||||
@@ -5863,7 +5818,6 @@ meta_update_button_layout (const char *v
|
||||
new_layout.left_buttons_has_spacer[i - 2] = TRUE;
|
||||
}
|
||||
else
|
||||
-#endif
|
||||
{
|
||||
if (f != META_BUTTON_FUNCTION_LAST && !used[f])
|
||||
{
|
||||
@@ -5900,7 +5854,6 @@ meta_update_button_layout (const char *v
|
||||
while (buttons[b] != NULL)
|
||||
{
|
||||
f = meta_button_function_from_string (buttons[b]);
|
||||
-#ifdef HAVE_MARCO_2_23_2
|
||||
if (i > 0 && strcmp("spacer", buttons[b]) == 0)
|
||||
{
|
||||
new_layout.right_buttons_has_spacer[i - 1] = TRUE;
|
||||
@@ -5909,7 +5862,6 @@ meta_update_button_layout (const char *v
|
||||
new_layout.right_buttons_has_spacer[i - 2] = TRUE;
|
||||
}
|
||||
else
|
||||
-#endif
|
||||
{
|
||||
if (f != META_BUTTON_FUNCTION_LAST && !used[f])
|
||||
{
|
||||
@@ -5953,14 +5905,12 @@ meta_update_button_layout (const char *v
|
||||
for (j = 0; j < i; j++)
|
||||
{
|
||||
rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1];
|
||||
-#ifdef HAVE_MARCO_2_23_2
|
||||
if (j == 0)
|
||||
rtl_layout.right_buttons_has_spacer[i - 1] =
|
||||
new_layout.left_buttons_has_spacer[i - j - 1];
|
||||
else
|
||||
rtl_layout.right_buttons_has_spacer[j - 1] =
|
||||
new_layout.left_buttons_has_spacer[i - j - 1];
|
||||
-#endif
|
||||
}
|
||||
|
||||
i = 0;
|
||||
@@ -5970,14 +5920,12 @@ meta_update_button_layout (const char *v
|
||||
for (j = 0; j < i; j++)
|
||||
{
|
||||
rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1];
|
||||
-#ifdef HAVE_MARCO_2_23_2
|
||||
if (j == 0)
|
||||
rtl_layout.left_buttons_has_spacer[i - 1] =
|
||||
new_layout.right_buttons_has_spacer[i - j - 1];
|
||||
else
|
||||
rtl_layout.left_buttons_has_spacer[j - 1] =
|
||||
new_layout.right_buttons_has_spacer[i - j - 1];
|
||||
-#endif
|
||||
}
|
||||
|
||||
new_layout = rtl_layout;
|
@ -1,55 +0,0 @@
|
||||
Author: David Nusinow <dnusinow@debian.org>
|
||||
Description: Add a command-line option for disabling the use of FBOs
|
||||
This is to work around buggy drivers. Add the --no-fbo option to
|
||||
command-line to compiz.
|
||||
Origin: vendor, debian (0.3.6-1)
|
||||
--- a/include/compiz-core.h
|
||||
+++ b/include/compiz-core.h
|
||||
@@ -219,6 +219,7 @@ extern Bool useCow;
|
||||
extern Bool noDetection;
|
||||
extern Bool useDesktopHints;
|
||||
extern Bool onlyCurrentScreen;
|
||||
+extern Bool noFBO;
|
||||
|
||||
extern char **initialPlugins;
|
||||
extern int nInitialPlugins;
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -66,6 +66,7 @@ Bool strictBinding = TRUE;
|
||||
Bool noDetection = FALSE;
|
||||
Bool useDesktopHints = FALSE;
|
||||
Bool onlyCurrentScreen = FALSE;
|
||||
+Bool noFBO = FALSE;
|
||||
static Bool debugOutput = FALSE;
|
||||
|
||||
#ifdef USE_COW
|
||||
@@ -87,6 +88,7 @@ usage (void)
|
||||
"[--keep-desktop-hints] "
|
||||
"[--loose-binding] "
|
||||
"[--replace]\n "
|
||||
+ "[--no-fbo] "
|
||||
"[--sm-disable] "
|
||||
"[--sm-client-id ID] "
|
||||
"[--only-current-screen]\n "
|
||||
@@ -346,6 +348,10 @@ main (int argc, char **argv)
|
||||
{
|
||||
onlyCurrentScreen = TRUE;
|
||||
}
|
||||
+ else if (!strcmp (argv[i], "--no-fbo"))
|
||||
+ {
|
||||
+ noFBO = TRUE;
|
||||
+ }
|
||||
|
||||
#ifdef USE_COW
|
||||
else if (!strcmp (argv[i], "--use-root-window"))
|
||||
--- a/src/screen.c
|
||||
+++ b/src/screen.c
|
||||
@@ -2183,7 +2183,7 @@ addScreen (CompDisplay *display,
|
||||
s->generateMipmap = NULL;
|
||||
|
||||
s->fbo = 0;
|
||||
- if (strstr (glExtensions, "GL_EXT_framebuffer_object"))
|
||||
+ if (!noFBO && strstr (glExtensions, "GL_EXT_framebuffer_object"))
|
||||
{
|
||||
s->genFramebuffers = (GLGenFramebuffersProc)
|
||||
getProcAddress (s, "glGenFramebuffersEXT");
|
@ -1,162 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/metadata/core.xml.in compiz-0.8.8/metadata/core.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/core.xml.in 2011-03-30 11:41:22.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/core.xml.in 2013-02-10 22:26:48.439117129 +0100
|
||||
@@ -108,7 +108,7 @@
|
||||
<option name="raise_window_button" type="button">
|
||||
<_short>Raise Window</_short>
|
||||
<_long>Raise window above other windows</_long>
|
||||
- <default><Control>Button6</default>
|
||||
+ <default><Primary>Button6</default>
|
||||
</option>
|
||||
<option name="lower_window_key" type="key">
|
||||
<_short>Lower Window</_short>
|
||||
@@ -159,7 +159,7 @@
|
||||
<option name="show_desktop_key" type="key">
|
||||
<_short>Show Desktop</_short>
|
||||
<_long>Hide all windows and focus desktop</_long>
|
||||
- <default><Control><Alt>d</default>
|
||||
+ <default><Primary><Alt>d</default>
|
||||
</option>
|
||||
<option name="show_desktop_edge" type="edge">
|
||||
<_short>Show Desktop</_short>
|
||||
@@ -185,7 +185,7 @@
|
||||
<option name="toggle_window_shaded_key" type="key">
|
||||
<_short>Toggle Window Shaded</_short>
|
||||
<_long>Toggle active window shaded</_long>
|
||||
- <default><Control><Alt>s</default>
|
||||
+ <default><Primary><Alt>s</default>
|
||||
</option>
|
||||
<option name="slow_animations_key" type="key">
|
||||
<_short>Slow Animations</_short>
|
||||
diff -upr compiz-0.8.8-orig/metadata/core.xml.in.in compiz-0.8.8/metadata/core.xml.in.in
|
||||
--- compiz-0.8.8-orig/metadata/core.xml.in.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/core.xml.in.in 2013-02-10 23:22:41.956567990 +0100
|
||||
@@ -108,7 +120,7 @@
|
||||
<option name="raise_window_button" type="button">
|
||||
<_short>Raise Window</_short>
|
||||
<_long>Raise window above other windows</_long>
|
||||
- <default><Control>Button6</default>
|
||||
+ <default><Primary>Button6</default>
|
||||
</option>
|
||||
<option name="lower_window_key" type="key">
|
||||
<_short>Lower Window</_short>
|
||||
@@ -159,7 +171,7 @@
|
||||
<option name="show_desktop_key" type="key">
|
||||
<_short>Show Desktop</_short>
|
||||
<_long>Hide all windows and focus desktop</_long>
|
||||
- <default><Control><Alt>d</default>
|
||||
+ <default><Primary><Alt>d</default>
|
||||
</option>
|
||||
<option name="show_desktop_edge" type="edge">
|
||||
<_short>Show Desktop</_short>
|
||||
@@ -185,7 +197,7 @@
|
||||
<option name="toggle_window_shaded_key" type="key">
|
||||
<_short>Toggle Window Shaded</_short>
|
||||
<_long>Toggle active window shaded</_long>
|
||||
- <default><Control><Alt>s</default>
|
||||
+ <default><Primary><Alt>s</default>
|
||||
</option>
|
||||
<option name="slow_animations_key" type="key">
|
||||
<_short>Slow Animations</_short>
|
||||
diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/cube.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/cube.xml.in 2013-02-10 22:27:17.001397970 +0100
|
||||
@@ -16,7 +16,7 @@
|
||||
<option name="unfold_key" type="key">
|
||||
<_short>Unfold</_short>
|
||||
<_long>Unfold cube</_long>
|
||||
- <default><Control><Alt>Down</default>
|
||||
+ <default><Primary><Alt>Down</default>
|
||||
</option>
|
||||
<option name="next_slide_key" type="key">
|
||||
<_short>Next Slide</_short>
|
||||
diff -upr compiz-0.8.8-orig/metadata/rotate.xml.in compiz-0.8.8/metadata/rotate.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/rotate.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/rotate.xml.in 2013-02-10 22:30:15.244159968 +0100
|
||||
@@ -46,12 +46,12 @@
|
||||
<option name="initiate_button" type="button">
|
||||
<_short>Initiate</_short>
|
||||
<_long>Start Rotation</_long>
|
||||
- <default><Control><Alt>Button1</default>
|
||||
+ <default><Primary><Alt>Button1</default>
|
||||
</option>
|
||||
<option name="rotate_left_key" type="key">
|
||||
<_short>Rotate Left</_short>
|
||||
<_long>Rotate left</_long>
|
||||
- <default><Control><Alt>Left</default>
|
||||
+ <default><Primary><Alt>Left</default>
|
||||
</option>
|
||||
<option name="rotate_left_button" type="button">
|
||||
<_short>Rotate Left</_short>
|
||||
@@ -60,7 +60,7 @@
|
||||
<option name="rotate_right_key" type="key">
|
||||
<_short>Rotate Right</_short>
|
||||
<_long>Rotate right</_long>
|
||||
- <default><Control><Alt>Right</default>
|
||||
+ <default><Primary><Alt>Right</default>
|
||||
</option>
|
||||
<option name="rotate_right_button" type="button">
|
||||
<_short>Rotate Right</_short>
|
||||
@@ -69,7 +69,7 @@
|
||||
<option name="rotate_left_window_key" type="key">
|
||||
<_short>Rotate Left with Window</_short>
|
||||
<_long>Rotate left and bring active window along</_long>
|
||||
- <default><Control><Alt><Shift>Left</default>
|
||||
+ <default><Primary><Alt><Shift>Left</default>
|
||||
</option>
|
||||
<option name="rotate_left_window_button" type="button">
|
||||
<_short>Rotate Left with Window</_short>
|
||||
@@ -78,7 +78,7 @@
|
||||
<option name="rotate_right_window_key" type="key">
|
||||
<_short>Rotate Right with Window</_short>
|
||||
<_long>Rotate right and bring active window along</_long>
|
||||
- <default><Control><Alt><Shift>Right</default>
|
||||
+ <default><Primary><Alt><Shift>Right</default>
|
||||
</option>
|
||||
<option name="rotate_right_window_button" type="button">
|
||||
<_short>Rotate Right with Window</_short>
|
||||
diff -upr compiz-0.8.8-orig/metadata/switcher.xml.in compiz-0.8.8/metadata/switcher.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/switcher.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/switcher.xml.in 2013-02-10 22:31:03.864642625 +0100
|
||||
@@ -31,7 +31,7 @@
|
||||
<option name="next_all_key" type="key">
|
||||
<_short>Next window (All windows)</_short>
|
||||
<_long>Popup switcher if not visible and select next window out of all windows</_long>
|
||||
- <default><Control><Alt>Tab</default>
|
||||
+ <default><Primary><Alt>Tab</default>
|
||||
</option>
|
||||
<option name="prev_all_button" type="button">
|
||||
<_short>Prev window (All windows)</_short>
|
||||
@@ -40,7 +40,7 @@
|
||||
<option name="prev_all_key" type="key">
|
||||
<_short>Prev window (All windows)</_short>
|
||||
<_long>Popup switcher if not visible and select previous window out of all windows</_long>
|
||||
- <default><Shift><Control><Alt>Tab</default>
|
||||
+ <default><Shift><Primary><Alt>Tab</default>
|
||||
</option>
|
||||
<option name="next_no_popup_button" type="button">
|
||||
<_short>Next window (No popup)</_short>
|
||||
diff -upr compiz-0.8.8-orig/metadata/water.xml.in compiz-0.8.8/metadata/water.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/water.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/water.xml.in 2013-02-10 22:31:20.369806613 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
<option name="initiate_key" type="key">
|
||||
<_short>Initiate</_short>
|
||||
<_long>Enable pointer water effects</_long>
|
||||
- <default><Control><Super></default>
|
||||
+ <default><Primary><Super></default>
|
||||
</option>
|
||||
<option name="toggle_rain_key" type="key">
|
||||
<_short>Toggle rain</_short>
|
||||
diff -upr compiz-0.8.8-orig/src/option.c compiz-0.8.8/src/option.c
|
||||
--- compiz-0.8.8-orig/src/option.c 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/src/option.c 2013-02-10 17:54:28.257428457 +0100
|
||||
@@ -36,7 +36,7 @@ struct _Modifier {
|
||||
int modifier;
|
||||
} modifiers[] = {
|
||||
{ "<Shift>", ShiftMask },
|
||||
- { "<Control>", ControlMask },
|
||||
+ { "<Primary>", ControlMask },
|
||||
{ "<Mod1>", Mod1Mask },
|
||||
{ "<Mod2>", Mod2Mask },
|
||||
{ "<Mod3>", Mod3Mask },
|
@ -1,25 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/metadata/cube.xml.in compiz-0.8.8/metadata/cube.xml.in
|
||||
--- compiz-0.8.8-orig/metadata/cube.xml.in 2010-05-21 13:18:14.000000000 +0200
|
||||
+++ compiz-0.8.8/metadata/cube.xml.in 2012-05-16 12:13:09.000000000 +0200
|
||||
@@ -92,9 +92,9 @@
|
||||
<_short>Cube Color</_short>
|
||||
<_long>Color of top and bottom sides of the cube</_long>
|
||||
<default>
|
||||
- <red>0xfefe</red>
|
||||
- <green>0xffff</green>
|
||||
- <blue>0xc7c7</blue>
|
||||
+ <red>0x8888</red>
|
||||
+ <green>0x0000</green>
|
||||
+ <blue>0x0000</blue>
|
||||
</default>
|
||||
</option>
|
||||
<subgroup>
|
||||
@@ -110,7 +110,7 @@
|
||||
<type>string</type>
|
||||
<hints>file;image;</hints>
|
||||
<default>
|
||||
- <value>freedesktop</value>
|
||||
+ <value>/usr/share/pixmaps/redhat/shadowman-transparent</value>
|
||||
</default>
|
||||
</option>
|
||||
<option name="adjust_image" type="bool">
|
@ -1,570 +0,0 @@
|
||||
diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c
|
||||
--- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2013-05-25 13:46:27.717322000 +0200
|
||||
+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2013-05-25 13:53:44.084731952 +0200
|
||||
@@ -5607,82 +5607,6 @@ get_titlebar_font (void)
|
||||
return titlebar_font;
|
||||
}
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
-static void
|
||||
-titlebar_font_changed (MateConfClient *client)
|
||||
-{
|
||||
- gchar *str;
|
||||
-
|
||||
- str = mateconf_client_get_string (client,
|
||||
- COMPIZ_TITLEBAR_FONT_KEY,
|
||||
- NULL);
|
||||
- if (!str)
|
||||
- str = g_strdup ("Sans Bold 12");
|
||||
-
|
||||
- if (titlebar_font)
|
||||
- pango_font_description_free (titlebar_font);
|
||||
-
|
||||
- titlebar_font = pango_font_description_from_string (str);
|
||||
-
|
||||
- g_free (str);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-titlebar_click_action_changed (MateConfClient *client,
|
||||
- const gchar *key,
|
||||
- int *action_value,
|
||||
- int default_value)
|
||||
-{
|
||||
- gchar *action;
|
||||
-
|
||||
- *action_value = default_value;
|
||||
-
|
||||
- action = mateconf_client_get_string (client, key, NULL);
|
||||
- if (action)
|
||||
- {
|
||||
- if (strcmp (action, "toggle_shade") == 0)
|
||||
- *action_value = CLICK_ACTION_SHADE;
|
||||
- else if (strcmp (action, "toggle_maximize") == 0)
|
||||
- *action_value = CLICK_ACTION_MAXIMIZE;
|
||||
- else if (strcmp (action, "toggle_maximize_horizontally") == 0)
|
||||
- *action_value = CLICK_ACTION_MAXIMIZE_HORZ;
|
||||
- else if (strcmp (action, "toggle_maximize_vertically") == 0)
|
||||
- *action_value = CLICK_ACTION_MAXIMIZE_VERT;
|
||||
- else if (strcmp (action, "minimize") == 0)
|
||||
- *action_value = CLICK_ACTION_MINIMIZE;
|
||||
- else if (strcmp (action, "raise") == 0)
|
||||
- *action_value = CLICK_ACTION_RAISE;
|
||||
- else if (strcmp (action, "lower") == 0)
|
||||
- *action_value = CLICK_ACTION_LOWER;
|
||||
- else if (strcmp (action, "menu") == 0)
|
||||
- *action_value = CLICK_ACTION_MENU;
|
||||
- else if (strcmp (action, "none") == 0)
|
||||
- *action_value = CLICK_ACTION_NONE;
|
||||
-
|
||||
- g_free (action);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-wheel_action_changed (MateConfClient *client)
|
||||
-{
|
||||
- gchar *action;
|
||||
-
|
||||
- wheel_action = WHEEL_ACTION_DEFAULT;
|
||||
-
|
||||
- action = mateconf_client_get_string (client, WHEEL_ACTION_KEY, NULL);
|
||||
- if (action)
|
||||
- {
|
||||
- if (strcmp (action, "shade") == 0)
|
||||
- wheel_action = WHEEL_ACTION_SHADE;
|
||||
- else if (strcmp (action, "none") == 0)
|
||||
- wheel_action = WHEEL_ACTION_NONE;
|
||||
-
|
||||
- g_free (action);
|
||||
- }
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
#ifdef USE_MARCO
|
||||
static MetaButtonFunction
|
||||
meta_button_function_from_string (const char *str)
|
||||
@@ -6039,401 +5963,6 @@ style_changed (GtkWidget *widget)
|
||||
decorations_changed (screen);
|
||||
}
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
-static gboolean
|
||||
-shadow_settings_changed (MateConfClient *client)
|
||||
-{
|
||||
- double radius, opacity;
|
||||
- int offset;
|
||||
- gchar *color;
|
||||
- gboolean changed = FALSE;
|
||||
-
|
||||
- radius = mateconf_client_get_float (client,
|
||||
- COMPIZ_SHADOW_RADIUS_KEY,
|
||||
- NULL);
|
||||
- radius = MAX (0.0, MIN (radius, 48.0));
|
||||
- if (shadow_radius != radius)
|
||||
- {
|
||||
- shadow_radius = radius;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- opacity = mateconf_client_get_float (client,
|
||||
- COMPIZ_SHADOW_OPACITY_KEY,
|
||||
- NULL);
|
||||
- opacity = MAX (0.0, MIN (opacity, 6.0));
|
||||
- if (shadow_opacity != opacity)
|
||||
- {
|
||||
- shadow_opacity = opacity;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- color = mateconf_client_get_string (client,
|
||||
- COMPIZ_SHADOW_COLOR_KEY,
|
||||
- NULL);
|
||||
- if (color)
|
||||
- {
|
||||
- int c[4];
|
||||
-
|
||||
- if (sscanf (color, "#%2x%2x%2x%2x", &c[0], &c[1], &c[2], &c[3]) == 4)
|
||||
- {
|
||||
- shadow_color[0] = c[0] << 8 | c[0];
|
||||
- shadow_color[1] = c[1] << 8 | c[1];
|
||||
- shadow_color[2] = c[2] << 8 | c[2];
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- g_free (color);
|
||||
- }
|
||||
-
|
||||
- offset = mateconf_client_get_int (client,
|
||||
- COMPIZ_SHADOW_OFFSET_X_KEY,
|
||||
- NULL);
|
||||
- offset = MAX (-16, MIN (offset, 16));
|
||||
- if (shadow_offset_x != offset)
|
||||
- {
|
||||
- shadow_offset_x = offset;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- offset = mateconf_client_get_int (client,
|
||||
- COMPIZ_SHADOW_OFFSET_Y_KEY,
|
||||
- NULL);
|
||||
- offset = MAX (-16, MIN (offset, 16));
|
||||
- if (shadow_offset_y != offset)
|
||||
- {
|
||||
- shadow_offset_y = offset;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- return changed;
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
-blur_settings_changed (MateConfClient *client)
|
||||
-{
|
||||
- gchar *type;
|
||||
- int new_type = blur_type;
|
||||
-
|
||||
- if (cmdline_options & CMDLINE_BLUR)
|
||||
- return FALSE;
|
||||
-
|
||||
- type = mateconf_client_get_string (client,
|
||||
- BLUR_TYPE_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (type)
|
||||
- {
|
||||
- if (strcmp (type, "titlebar") == 0)
|
||||
- new_type = BLUR_TYPE_TITLEBAR;
|
||||
- else if (strcmp (type, "all") == 0)
|
||||
- new_type = BLUR_TYPE_ALL;
|
||||
- else if (strcmp (type, "none") == 0)
|
||||
- new_type = BLUR_TYPE_NONE;
|
||||
-
|
||||
- g_free (type);
|
||||
- }
|
||||
-
|
||||
- if (new_type != blur_type)
|
||||
- {
|
||||
- blur_type = new_type;
|
||||
- return TRUE;
|
||||
- }
|
||||
-
|
||||
- return FALSE;
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
-theme_changed (MateConfClient *client)
|
||||
-{
|
||||
-
|
||||
-#ifdef USE_MARCO
|
||||
- gboolean use_meta_theme;
|
||||
-
|
||||
- if (cmdline_options & CMDLINE_THEME)
|
||||
- return FALSE;
|
||||
-
|
||||
- use_meta_theme = mateconf_client_get_bool (client,
|
||||
- USE_META_THEME_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (use_meta_theme)
|
||||
- {
|
||||
- gchar *theme;
|
||||
-
|
||||
- theme = mateconf_client_get_string (client,
|
||||
- META_THEME_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (theme)
|
||||
- {
|
||||
- meta_theme_set_current (theme, TRUE);
|
||||
- if (!meta_theme_get_current ())
|
||||
- use_meta_theme = FALSE;
|
||||
-
|
||||
- g_free (theme);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- use_meta_theme = FALSE;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (use_meta_theme)
|
||||
- {
|
||||
- theme_draw_window_decoration = meta_draw_window_decoration;
|
||||
- theme_calc_decoration_size = meta_calc_decoration_size;
|
||||
- theme_update_border_extents = meta_update_border_extents;
|
||||
- theme_get_event_window_position = meta_get_event_window_position;
|
||||
- theme_get_button_position = meta_get_button_position;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- theme_draw_window_decoration = draw_window_decoration;
|
||||
- theme_calc_decoration_size = calc_decoration_size;
|
||||
- theme_update_border_extents = update_border_extents;
|
||||
- theme_get_event_window_position = get_event_window_position;
|
||||
- theme_get_button_position = get_button_position;
|
||||
- }
|
||||
-
|
||||
- return TRUE;
|
||||
-#else
|
||||
- theme_draw_window_decoration = draw_window_decoration;
|
||||
- theme_calc_decoration_size = calc_decoration_size;
|
||||
- theme_update_border_extents = update_border_extents;
|
||||
- theme_get_event_window_position = get_event_window_position;
|
||||
- theme_get_button_position = get_button_position;
|
||||
-
|
||||
- return FALSE;
|
||||
-#endif
|
||||
-
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
-theme_opacity_changed (MateConfClient *client)
|
||||
-{
|
||||
-
|
||||
-#ifdef USE_MARCO
|
||||
- gboolean shade_opacity, changed = FALSE;
|
||||
- gdouble opacity;
|
||||
-
|
||||
- opacity = mateconf_client_get_float (client,
|
||||
- META_THEME_OPACITY_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (!(cmdline_options & CMDLINE_OPACITY) &&
|
||||
- opacity != meta_opacity)
|
||||
- {
|
||||
- meta_opacity = opacity;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- if (opacity < 1.0)
|
||||
- {
|
||||
- shade_opacity = mateconf_client_get_bool (client,
|
||||
- META_THEME_SHADE_OPACITY_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (!(cmdline_options & CMDLINE_OPACITY_SHADE) &&
|
||||
- shade_opacity != meta_shade_opacity)
|
||||
- {
|
||||
- meta_shade_opacity = shade_opacity;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- opacity = mateconf_client_get_float (client,
|
||||
- META_THEME_ACTIVE_OPACITY_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (!(cmdline_options & CMDLINE_ACTIVE_OPACITY) &&
|
||||
- opacity != meta_active_opacity)
|
||||
- {
|
||||
- meta_active_opacity = opacity;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
-
|
||||
- if (opacity < 1.0)
|
||||
- {
|
||||
- shade_opacity =
|
||||
- mateconf_client_get_bool (client,
|
||||
- META_THEME_ACTIVE_SHADE_OPACITY_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (!(cmdline_options & CMDLINE_ACTIVE_OPACITY_SHADE) &&
|
||||
- shade_opacity != meta_active_shade_opacity)
|
||||
- {
|
||||
- meta_active_shade_opacity = shade_opacity;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return changed;
|
||||
-#else
|
||||
- return FALSE;
|
||||
-#endif
|
||||
-
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
-button_layout_changed (MateConfClient *client)
|
||||
-{
|
||||
-
|
||||
-#ifdef USE_MARCO
|
||||
- gchar *button_layout;
|
||||
-
|
||||
- button_layout = mateconf_client_get_string (client,
|
||||
- META_BUTTON_LAYOUT_KEY,
|
||||
- NULL);
|
||||
-
|
||||
- if (button_layout)
|
||||
- {
|
||||
- meta_update_button_layout (button_layout);
|
||||
-
|
||||
- meta_button_layout_set = TRUE;
|
||||
-
|
||||
- g_free (button_layout);
|
||||
-
|
||||
- return TRUE;
|
||||
- }
|
||||
-
|
||||
- if (meta_button_layout_set)
|
||||
- {
|
||||
- meta_button_layout_set = FALSE;
|
||||
- return TRUE;
|
||||
- }
|
||||
-#endif
|
||||
-
|
||||
- return FALSE;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-cursor_theme_changed (MateConfClient *client)
|
||||
-{
|
||||
- gchar *theme;
|
||||
- gint size;
|
||||
-
|
||||
- theme = mateconf_client_get_string(client, MATE_CURSOR_THEME_KEY, NULL);
|
||||
- size = mateconf_client_get_int(client, MATE_CURSOR_SIZE_KEY, NULL);
|
||||
-
|
||||
- mateconf_client_set_string(client, COMPIZ_CURSOR_THEME_KEY, theme, NULL);
|
||||
-
|
||||
- mateconf_client_set_int(client, COMPIZ_CURSOR_SIZE_KEY, size, NULL);
|
||||
-
|
||||
- if (theme && strlen(theme))
|
||||
- {
|
||||
- gint i, j;
|
||||
- GdkDisplay *gdkdisplay = gdk_display_get_default ();
|
||||
- Display *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
|
||||
-
|
||||
-
|
||||
- XcursorSetTheme (xdisplay, theme);
|
||||
- XcursorSetDefaultSize (xdisplay, size);
|
||||
-
|
||||
- for (i = 0; i < 3; i++)
|
||||
- {
|
||||
- for (j = 0; j < 3; j++)
|
||||
- {
|
||||
- if (cursor[i][j].shape != XC_left_ptr)
|
||||
- {
|
||||
- XFreeCursor (xdisplay, cursor[i][j].cursor);
|
||||
- cursor[i][j].cursor =
|
||||
- XCreateFontCursor (xdisplay, cursor[i][j].shape);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-value_changed (MateConfClient *client,
|
||||
- const gchar *key,
|
||||
- MateConfValue *value,
|
||||
- void *data)
|
||||
-{
|
||||
- gboolean changed = FALSE;
|
||||
-
|
||||
- if (strcmp (key, COMPIZ_USE_SYSTEM_FONT_KEY) == 0)
|
||||
- {
|
||||
- if (mateconf_client_get_bool (client,
|
||||
- COMPIZ_USE_SYSTEM_FONT_KEY,
|
||||
- NULL) != use_system_font)
|
||||
- {
|
||||
- use_system_font = !use_system_font;
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- }
|
||||
- else if (strcmp (key, COMPIZ_TITLEBAR_FONT_KEY) == 0)
|
||||
- {
|
||||
- titlebar_font_changed (client);
|
||||
- changed = !use_system_font;
|
||||
- }
|
||||
- else if (strcmp (key, COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY) == 0)
|
||||
- {
|
||||
- titlebar_click_action_changed (client, key,
|
||||
- &double_click_action,
|
||||
- DOUBLE_CLICK_ACTION_DEFAULT);
|
||||
- }
|
||||
- else if (strcmp (key, COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY) == 0)
|
||||
- {
|
||||
- titlebar_click_action_changed (client, key,
|
||||
- &middle_click_action,
|
||||
- MIDDLE_CLICK_ACTION_DEFAULT);
|
||||
- }
|
||||
- else if (strcmp (key, COMPIZ_RIGHT_CLICK_TITLEBAR_KEY) == 0)
|
||||
- {
|
||||
- titlebar_click_action_changed (client, key,
|
||||
- &right_click_action,
|
||||
- RIGHT_CLICK_ACTION_DEFAULT);
|
||||
- }
|
||||
- else if (strcmp (key, WHEEL_ACTION_KEY) == 0)
|
||||
- {
|
||||
- wheel_action_changed (client);
|
||||
- }
|
||||
- else if (strcmp (key, COMPIZ_SHADOW_RADIUS_KEY) == 0 ||
|
||||
- strcmp (key, COMPIZ_SHADOW_OPACITY_KEY) == 0 ||
|
||||
- strcmp (key, COMPIZ_SHADOW_OFFSET_X_KEY) == 0 ||
|
||||
- strcmp (key, COMPIZ_SHADOW_OFFSET_Y_KEY) == 0 ||
|
||||
- strcmp (key, COMPIZ_SHADOW_COLOR_KEY) == 0)
|
||||
- {
|
||||
- if (shadow_settings_changed (client))
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- else if (strcmp (key, BLUR_TYPE_KEY) == 0)
|
||||
- {
|
||||
- if (blur_settings_changed (client))
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- else if (strcmp (key, USE_META_THEME_KEY) == 0 ||
|
||||
- strcmp (key, META_THEME_KEY) == 0)
|
||||
- {
|
||||
- if (theme_changed (client))
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- else if (strcmp (key, META_BUTTON_LAYOUT_KEY) == 0)
|
||||
- {
|
||||
- if (button_layout_changed (client))
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- else if (strcmp (key, META_THEME_OPACITY_KEY) == 0 ||
|
||||
- strcmp (key, META_THEME_SHADE_OPACITY_KEY) == 0 ||
|
||||
- strcmp (key, META_THEME_ACTIVE_OPACITY_KEY) == 0 ||
|
||||
- strcmp (key, META_THEME_ACTIVE_SHADE_OPACITY_KEY) == 0)
|
||||
- {
|
||||
- if (theme_opacity_changed (client))
|
||||
- changed = TRUE;
|
||||
- }
|
||||
- else if (strcmp (key, MATE_CURSOR_THEME_KEY) == 0 ||
|
||||
- strcmp (key, MATE_CURSOR_SIZE_KEY) == 0)
|
||||
- {
|
||||
- cursor_theme_changed (client);
|
||||
- }
|
||||
-
|
||||
- if (changed)
|
||||
- decorations_changed (data);
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
static gboolean
|
||||
init_settings (MatewnckScreen *screen)
|
||||
{
|
||||
@@ -6442,39 +5971,6 @@ init_settings (MatewnckScreen *screen)
|
||||
GdkColormap *colormap;
|
||||
AtkObject *switcher_label_obj;
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
- MateConfClient *mateconf;
|
||||
-
|
||||
- mateconf = mateconf_client_get_default ();
|
||||
-
|
||||
- mateconf_client_add_dir (mateconf,
|
||||
- MATECONF_DIR,
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
- mateconf_client_add_dir (mateconf,
|
||||
- MARCO_MATECONF_DIR,
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
- mateconf_client_add_dir (mateconf,
|
||||
- MATE_MOUSE_DIR,
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
- mateconf_client_add_dir (mateconf,
|
||||
- COMPIZ_MATECONF_DIR1,
|
||||
- MATECONF_CLIENT_PRELOAD_ONELEVEL,
|
||||
- NULL);
|
||||
-
|
||||
- g_signal_connect (G_OBJECT (mateconf),
|
||||
- "value_changed",
|
||||
- G_CALLBACK (value_changed),
|
||||
- screen);
|
||||
-
|
||||
- cursor_theme_changed(mateconf);
|
||||
-#endif
|
||||
-
|
||||
style_window = gtk_window_new (GTK_WINDOW_POPUP);
|
||||
|
||||
gdkscreen = gdk_display_get_default_screen (gdk_display_get_default ());
|
||||
@@ -6504,41 +6000,10 @@ init_settings (MatewnckScreen *screen)
|
||||
|
||||
pango_context = gtk_widget_create_pango_context (style_window);
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
- use_system_font = mateconf_client_get_bool (mateconf,
|
||||
- COMPIZ_USE_SYSTEM_FONT_KEY,
|
||||
- NULL);
|
||||
- theme_changed (mateconf);
|
||||
- theme_opacity_changed (mateconf);
|
||||
- button_layout_changed (mateconf);
|
||||
-#endif
|
||||
-
|
||||
update_style (style_window);
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
- titlebar_font_changed (mateconf);
|
||||
-#endif
|
||||
-
|
||||
update_titlebar_font ();
|
||||
|
||||
-#ifdef USE_MATECONF
|
||||
- titlebar_click_action_changed (mateconf,
|
||||
- COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
|
||||
- &double_click_action,
|
||||
- DOUBLE_CLICK_ACTION_DEFAULT);
|
||||
- titlebar_click_action_changed (mateconf,
|
||||
- COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY,
|
||||
- &middle_click_action,
|
||||
- MIDDLE_CLICK_ACTION_DEFAULT);
|
||||
- titlebar_click_action_changed (mateconf,
|
||||
- COMPIZ_RIGHT_CLICK_TITLEBAR_KEY,
|
||||
- &right_click_action,
|
||||
- RIGHT_CLICK_ACTION_DEFAULT);
|
||||
- wheel_action_changed (mateconf);
|
||||
- shadow_settings_changed (mateconf);
|
||||
- blur_settings_changed (mateconf);
|
||||
-#endif
|
||||
-
|
||||
(*theme_update_border_extents) (text_height);
|
||||
|
||||
update_shadow ();
|
@ -1,16 +0,0 @@
|
||||
Author: Michael Vogt <michael.vogt@ubuntu.com>
|
||||
Description: map windows with focus_on_map=FALSE in the background
|
||||
map windows with focus_on_map=FALSE in the background (just like metacity)
|
||||
Origin: vendor, ubuntu (1:0.8.2-0ubuntu6)
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/333284
|
||||
--- a/src/event.c
|
||||
+++ b/src/event.c
|
||||
@@ -2075,7 +2075,7 @@ handleEvent (CompDisplay *d,
|
||||
focus = allowWindowFocus (w, NO_FOCUS_MASK,
|
||||
w->screen->x, w->screen->y, 0);
|
||||
|
||||
- if (focus == CompFocusDenied)
|
||||
+ if ((focus == CompFocusDenied || focus == CompFocusPrevent) && (w->type & ~NO_FOCUS_MASK))
|
||||
stackingMode = CompStackingUpdateModeInitialMapDeniedFocus;
|
||||
else
|
||||
stackingMode = CompStackingUpdateModeInitialMap;
|
Loading…
Reference in New Issue
Block a user