Author: beatle
Date: 2006-10-09 05:36:17 -0400 (Mon, 09 Oct 2006)
New Revision: 3690
Added:
trunk/app/compiz/debian/patches/010_snap-inverted.patch
trunk/app/compiz/debian/patches/011_snap-by-default.patch
Removed:
trunk/app/compiz/debian/patches/010_snap-by-default.patch
Modified:
trunk/app/compiz/debian/changelog
trunk/app/compiz/debian/patches/series
Log:
Replace the 010_snap-by-default patch by the one taken from upstream git
(010_snap-inverted) and add 011_snap-by-default to enable snapping by default
again.
Modified: trunk/app/compiz/debian/changelog
===================================================================
--- trunk/app/compiz/debian/changelog 2006-10-09 09:24:11 UTC (rev 3689)
+++ trunk/app/compiz/debian/changelog 2006-10-09 09:36:17 UTC (rev 3690)
@@ -5,8 +5,10 @@
+ Drop 012_freedesktop-schema.patch, applied upstream.
* Disable metacity theme support because it needs a version of metacity not
in unstable yet (remove build-dependency on libmetacity-dev).
+ * Replace 010_snap-by-default by the upstream patch 010_snap-inverted and
+ add 011_snap-by-default to enable snapping by default.
- -- Thierry Reding <[EMAIL PROTECTED]> Mon, 9 Oct 2006 11:17:39 +0200
+ -- Thierry Reding <[EMAIL PROTECTED]> Mon, 9 Oct 2006 11:33:48 +0200
compiz (0.0.13+git20060928-4) UNRELEASED; urgency=low
Deleted: trunk/app/compiz/debian/patches/010_snap-by-default.patch
===================================================================
--- trunk/app/compiz/debian/patches/010_snap-by-default.patch 2006-10-09
09:24:11 UTC (rev 3689)
+++ trunk/app/compiz/debian/patches/010_snap-by-default.patch 2006-10-09
09:36:17 UTC (rev 3690)
@@ -1,87 +0,0 @@
-Index: plugins/wobbly.c
-===================================================================
---- plugins/wobbly.c (revision 3581)
-+++ plugins/wobbly.c (working copy)
-@@ -177,7 +177,8 @@
-
- #define WOBBLY_DISPLAY_OPTION_SNAP 0
- #define WOBBLY_DISPLAY_OPTION_SHIVER 1
--#define WOBBLY_DISPLAY_OPTION_NUM 2
-+#define WOBBLY_DISPLAY_OPTION_SNAP_ENABLE 2
-+#define WOBBLY_DISPLAY_OPTION_NUM 3
-
- typedef struct _WobblyDisplay {
- int screenPrivateIndex;
-@@ -2334,6 +2335,7 @@
- XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
- CompAction *action;
- unsigned int mods = 0xffffffff;
-+ Bool snap_enable =
&wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_ENABLE].value.b;
-
- action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
-
-@@ -2341,9 +2343,15 @@
- mods = action->key.modifiers;
-
- if ((stateEvent->mods & mods) == mods)
-- wobblyEnableSnapping (d, NULL, 0, NULL, 0);
-+ if (snap_enable)
-+ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
-+ else
-+ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
- else
-- wobblyDisableSnapping (d, NULL, 0, NULL, 0);
-+ if (snap_enable)
-+ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
-+ else
-+ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
- }
- }
- break;
-@@ -2855,6 +2863,9 @@
- if (setDisplayAction (display, o, value))
- return TRUE;
- break;
-+ case WOBBLY_DISPLAY_OPTION_SNAP_ENABLE:
-+ if (compSetBoolOption(o, value))
-+ return TRUE;
- default:
- break;
- }
-@@ -2894,6 +2905,13 @@
- o->value.action.state |= CompActionStateInitKey;
- o->value.action.state |= CompActionStateInitButton;
- o->value.action.type = 0;
-+
-+ o = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_ENABLE];
-+ o->name = "snap_enable";
-+ o->shortDesc = N_("Snap Enable");
-+ o->longDesc = N_("Default window snapping mode.");
-+ o->type = CompOptionTypeBool;
-+ o->value.b = TRUE;
- }
-
- static Bool
-Index: plugins/compiz.schemas.in
-===================================================================
---- plugins/compiz.schemas.in (revision 3581)
-+++ plugins/compiz.schemas.in (working copy)
-@@ -22738,6 +22738,18 @@
- </schema>
-
- <schema>
-+
<key>/schemas/apps/compiz/plugins/wobbly/allscreens/options/snap_enable</key>
-+
<applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_enable</applyto>
-+ <owner>compiz</owner>
-+ <type>bool</type>
-+ <default>true</default>
-+ <locale name="C">
-+ <short>Snap Enable</short>
-+ <long>Default window snapping mode.</long>
-+ </locale>
-+ </schema>
-+
-+ <schema>
-
<key>/schemas/apps/compiz/plugins/wobbly/screen0/options/friction</key>
-
<applyto>/apps/compiz/plugins/wobbly/screen0/options/friction</applyto>
- <owner>compiz</owner>
Added: trunk/app/compiz/debian/patches/010_snap-inverted.patch
===================================================================
--- trunk/app/compiz/debian/patches/010_snap-inverted.patch
(rev 0)
+++ trunk/app/compiz/debian/patches/010_snap-inverted.patch 2006-10-09
09:36:17 UTC (rev 3690)
@@ -0,0 +1,113 @@
+From: David Reveman <[EMAIL PROTECTED]>
+Date: Tue, 3 Oct 2006 20:17:29 +0000 (-0400)
+Subject: Add snap_inverted option to wobbly plugin.
+X-Git-Url:
http://gitweb.freedesktop.org/?p=xorg/app/compiz.git;a=commitdiff;h=3a90623a209e4b187ffb7387e650a233ef71c071
+
+Add snap_inverted option to wobbly plugin.
+---
+
+--- a/plugins/compiz.schemas.in
++++ b/plugins/compiz.schemas.in
+@@ -24846,6 +24846,18 @@
+ </schema>
+
+ <schema>
++
<key>/schemas/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</key>
++
<applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</applyto>
++ <owner>compiz</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short>Snap Inverted</short>
++ <long>Inverted window snapping</long>
++ </locale>
++ </schema>
++
++ <schema>
+
<key>/schemas/apps/compiz/plugins/wobbly/screen0/options/friction</key>
+
<applyto>/apps/compiz/plugins/wobbly/screen0/options/friction</applyto>
+ <owner>compiz</owner>
+--- a/plugins/wobbly.c
++++ b/plugins/wobbly.c
+@@ -171,13 +171,16 @@ static char *moveWinType[] = {
+
+ #define WOBBLY_SNAP_MODIFIERS_DEFAULT ShiftMask
+
++#define WOBBLY_SNAP_INVERTED_DEFAULT FALSE
++
+ #define WOBBLY_MAXIMIZE_EFFECT_DEFAULT TRUE
+
+ static int displayPrivateIndex;
+
+-#define WOBBLY_DISPLAY_OPTION_SNAP 0
+-#define WOBBLY_DISPLAY_OPTION_SHIVER 1
+-#define WOBBLY_DISPLAY_OPTION_NUM 2
++#define WOBBLY_DISPLAY_OPTION_SNAP 0
++#define WOBBLY_DISPLAY_OPTION_SNAP_INVERTED 1
++#define WOBBLY_DISPLAY_OPTION_SHIVER 2
++#define WOBBLY_DISPLAY_OPTION_NUM 3
+
+ typedef struct _WobblyDisplay {
+ int screenPrivateIndex;
+@@ -2333,17 +2336,29 @@ wobblyHandleEvent (CompDisplay *d,
+ {
+ XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
+ CompAction *action;
++ Bool inverted;
+ unsigned int mods = 0xffffffff;
+
+- action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
++ action = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP].value.action;
++ inverted = wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_INVERTED].value.b;
+
+ if (action->type & CompBindingTypeKey)
+ mods = action->key.modifiers;
+
+ if ((stateEvent->mods & mods) == mods)
+- wobblyEnableSnapping (d, NULL, 0, NULL, 0);
++ {
++ if (inverted)
++ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
++ else
++ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
++ }
+ else
+- wobblyDisableSnapping (d, NULL, 0, NULL, 0);
++ {
++ if (inverted)
++ wobblyEnableSnapping (d, NULL, 0, NULL, 0);
++ else
++ wobblyDisableSnapping (d, NULL, 0, NULL, 0);
++ }
+ }
+ }
+ break;
+@@ -2851,10 +2866,13 @@ wobblySetDisplayOption (CompDisplay
+ if (compSetActionOption (o, value))
+ return TRUE;
+ break;
++ case WOBBLY_DISPLAY_OPTION_SNAP_INVERTED:
++ if (compSetBoolOption (o, value))
++ return TRUE;
++ break;
+ case WOBBLY_DISPLAY_OPTION_SHIVER:
+ if (setDisplayAction (display, o, value))
+ return TRUE;
+- break;
+ default:
+ break;
+ }
+@@ -2881,6 +2899,13 @@ wobblyDisplayInitOptions (WobblyDisplay
+ o->value.action.key.modifiers = WOBBLY_SNAP_MODIFIERS_DEFAULT;
+ o->value.action.key.keycode = 0;
+
++ o = &wd->opt[WOBBLY_DISPLAY_OPTION_SNAP_INVERTED];
++ o->name = "snap_inverted";
++ o->shortDesc = N_("Snap Inverted");
++ o->longDesc = N_("Inverted window snapping");
++ o->type = CompOptionTypeBool;
++ o->value.b = WOBBLY_SNAP_INVERTED_DEFAULT;
++
+ o = &wd->opt[WOBBLY_DISPLAY_OPTION_SHIVER];
+ o->name = "shiver";
+ o->shortDesc = N_("Shiver");
Added: trunk/app/compiz/debian/patches/011_snap-by-default.patch
===================================================================
--- trunk/app/compiz/debian/patches/011_snap-by-default.patch
(rev 0)
+++ trunk/app/compiz/debian/patches/011_snap-by-default.patch 2006-10-09
09:36:17 UTC (rev 3690)
@@ -0,0 +1,22 @@
+--- a/plugins/compiz.schemas.in 2006-10-09 11:28:27.000000000 +0200
++++ b/plugins/compiz.schemas.in 2006-10-09 11:28:53.000000000 +0200
+@@ -24850,7 +24850,7 @@
+
<applyto>/apps/compiz/plugins/wobbly/allscreens/options/snap_inverted</applyto>
+ <owner>compiz</owner>
+ <type>bool</type>
+- <default>false</default>
++ <default>true</default>
+ <locale name="C">
+ <short>Snap Inverted</short>
+ <long>Inverted window snapping</long>
+--- a/plugins/wobbly.c 2006-10-09 11:28:37.000000000 +0200
++++ b/plugins/wobbly.c 2006-10-09 11:29:44.000000000 +0200
+@@ -171,7 +171,7 @@
+
+ #define WOBBLY_SNAP_MODIFIERS_DEFAULT ShiftMask
+
+-#define WOBBLY_SNAP_INVERTED_DEFAULT FALSE
++#define WOBBLY_SNAP_INVERTED_DEFAULT TRUE
+
+ #define WOBBLY_MAXIMIZE_EFFECT_DEFAULT TRUE
+
Modified: trunk/app/compiz/debian/patches/series
===================================================================
--- trunk/app/compiz/debian/patches/series 2006-10-09 09:24:11 UTC (rev
3689)
+++ trunk/app/compiz/debian/patches/series 2006-10-09 09:36:17 UTC (rev
3690)
@@ -1,3 +1,4 @@
002_tfp-server-extension.patch
005_glfinish.patch
-010_snap-by-default.patch -p0
+010_snap-inverted.patch
+011_snap-by-default.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
