rpms/compiz/devel resize-move-keybindings.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 aiglx-defaults.patch, 1.1, 1.2 compiz.spec, 1.18, 1.19 composite-cube-logo.patch, 1.2, 1.3 fbconfig-depth-fix.patch, 1.2, 1.3 fedora-logo.patch, 1.2, 1.3 gl-include-inferiors.patch, 1.2, 1.3 glfinish.patch, 1.1, 1.2 sources, 1.5, 1.6 tfp-server-extension.patch, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Aug 18 01:36:33 UTC 2006
- Previous message (by thread): rpms/xchat/devel xchat-2.6.6-fi.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xchat.spec, 1.54, 1.55 xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch, 1.2, NONE xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch, 1.2, NONE
- Next message (by thread): rpms/compiz/devel sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: krh
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28353
Modified Files:
.cvsignore aiglx-defaults.patch compiz.spec
composite-cube-logo.patch fbconfig-depth-fix.patch
fedora-logo.patch gl-include-inferiors.patch glfinish.patch
sources tfp-server-extension.patch
Added Files:
resize-move-keybindings.patch
Log Message:
* Thu Aug 17 2006 Kristian Høgsberg <krh at redhat.com> - 0.0.13-0.16.20060817git.fc6
- Rebase to latest upstream changes which has the rest of the bindings
rewrite. Add resize-move-keybindings.patch to make move and resize
bindings work like metacity.
- Add back scale plugin.
resize-move-keybindings.patch:
include/compiz.h | 27 +++++---
plugins/move.c | 6 +
plugins/resize.c | 177 ++++++++++++++++++++++++++++++++++++++-----------------
src/display.c | 1
src/event.c | 9 ++
src/screen.c | 21 +++++-
6 files changed, 174 insertions(+), 67 deletions(-)
--- NEW FILE resize-move-keybindings.patch ---
Update keybindings for move and resize to work like metacity.
From: Kristian Høgsberg <krh at redhat.com>
---
include/compiz.h | 27 +++++---
plugins/move.c | 6 ++
plugins/resize.c | 177 ++++++++++++++++++++++++++++++++++++++----------------
src/display.c | 1
src/event.c | 9 ++-
src/screen.c | 21 +++++-
6 files changed, 174 insertions(+), 67 deletions(-)
diff --git a/include/compiz.h b/include/compiz.h
index 87dd6d4..7a8291b 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -280,15 +280,17 @@ typedef enum {
} CompBindingType;
typedef enum {
- CompActionStateInitKey = 1 << 0,
- CompActionStateTermKey = 1 << 1,
- CompActionStateInitButton = 1 << 2,
- CompActionStateTermButton = 1 << 3,
- CompActionStateInitBell = 1 << 4,
- CompActionStateInitEdge = 1 << 5,
- CompActionStateTermEdge = 1 << 6,
- CompActionStateInitEdgeDnd = 1 << 7,
- CompActionStateTermEdgeDnd = 1 << 8
+ CompActionStateInitKey = 1 << 0,
+ CompActionStateTermKey = 1 << 1,
+ CompActionStateInitButton = 1 << 2,
+ CompActionStateTermButton = 1 << 3,
+ CompActionStateInitBell = 1 << 4,
+ CompActionStateInitEdge = 1 << 5,
+ CompActionStateTermEdge = 1 << 6,
+ CompActionStateInitEdgeDnd = 1 << 7,
+ CompActionStateTermEdgeDnd = 1 << 8,
+ CompActionStateCommit = 1 << 9,
+ CompActionStateCancel = 1 << 10
} CompActionState;
typedef struct _CompKeyBinding {
@@ -680,6 +682,7 @@ struct _CompDisplay {
unsigned int ignoredModMask;
KeyCode escapeKeyCode;
+ KeyCode returnKeyCode;
CompOption opt[COMP_DISPLAY_OPTION_NUM];
@@ -1304,7 +1307,6 @@ struct _CompScreen {
CompTexture backgroundTexture;
unsigned int pendingDestroys;
int desktopWindowCount;
- KeyCode escapeKeyCode;
unsigned int mapNum;
unsigned int activeNum;
@@ -1490,6 +1492,11 @@ pushScreenGrab (CompScreen *s,
const char *name);
void
+updateScreenGrab (CompScreen *s,
+ int index,
+ Cursor cursor);
+
+void
removeScreenGrab (CompScreen *s,
int index,
XPoint *restorePointer);
diff --git a/plugins/move.c b/plugins/move.c
index a572103..1bf66cf 100644
--- a/plugins/move.c
+++ b/plugins/move.c
@@ -210,6 +210,12 @@ moveTerminate (CompDisplay *d,
(md->w->screen->windowUngrabNotify) (md->w);
+ if (state & CompActionStateCancel)
+ moveWindow (md->w,
+ md->w->serverX - md->w->attrib.x,
+ md->w->serverY - md->w->attrib.y,
+ TRUE, FALSE);
+
syncWindowPosition (md->w);
if (ms->grabIndex)
diff --git a/plugins/resize.c b/plugins/resize.c
index f838da6..5b079fd 100644
--- a/plugins/resize.c
+++ b/plugins/resize.c
@@ -43,14 +43,16 @@ #define RESIZE_INITIATE_KEY_DEFAULT
#define RESIZE_INITIATE_KEY_MODIFIERS_DEFAULT CompAltMask
struct _ResizeKeys {
- char *name;
- int dx;
- int dy;
+ char *name;
+ int dx;
+ int dy;
+ unsigned int warpMask;
+ unsigned int resizeMask;
} rKeys[] = {
- { "Left", -1, 0 },
- { "Right", 1, 0 },
- { "Up", 0, -1 },
- { "Down", 0, 1 }
+ { "Left", -1, 0, ResizeLeftMask | ResizeRightMask, ResizeLeftMask },
+ { "Right", 1, 0, ResizeLeftMask | ResizeRightMask, ResizeRightMask },
+ { "Up", 0, -1, ResizeUpMask | ResizeDownMask, ResizeUpMask },
+ { "Down", 0, 1, ResizeUpMask | ResizeDownMask, ResizeDownMask }
};
#define NUM_KEYS (sizeof (rKeys) / sizeof (rKeys[0]))
@@ -69,12 +71,13 @@ typedef struct _ResizeDisplay {
int screenPrivateIndex;
HandleEventProc handleEvent;
- CompWindow *w;
- int releaseButton;
- unsigned int mask;
- int width;
- int height;
- KeyCode key[NUM_KEYS];
+ CompWindow *w;
+ XWindowAttributes savedAttrib;
+ int releaseButton;
+ unsigned int mask;
+ int width;
+ int height;
+ KeyCode key[NUM_KEYS];
} ResizeDisplay;
typedef struct _ResizeScreen {
@@ -88,6 +91,8 @@ typedef struct _ResizeScreen {
Cursor downCursor;
Cursor downLeftCursor;
Cursor downRightCursor;
+ Cursor middleCursor;
+ Cursor cursor[NUM_KEYS];
} ResizeScreen;
#define GET_RESIZE_DISPLAY(d) \
@@ -139,10 +144,16 @@ resizeInitiate (CompDisplay *d,
mask = getIntOptionNamed (option, nOption, "direction", 0);
- /* Initiate the resize in the direction suggested by the quarter
- * of the window the mouse is in, eg drag in top left will resize
- * up and to the left. */
- if (!mask)
+ /* Initiate the resize in the direction suggested by the
+ * quarter of the window the mouse is in, eg drag in top left
+ * will resize up and to the left. Keyboard resize starts out
+ * with the cursor in the middle of the window and then starts
+ * resizing the edge corresponding to the next key press. */
+ if (state & CompActionStateInitKey)
+ {
+ mask = 0;
+ }
+ else if (!mask)
{
mask |= ((x - w->attrib.x) < (w->width / 2)) ?
ResizeLeftMask : ResizeRightMask;
@@ -171,10 +182,11 @@ resizeInitiate (CompDisplay *d,
if (w->shaded)
mask &= ~(ResizeUpMask | ResizeDownMask);
- rd->w = w;
- rd->mask = mask;
- rd->width = w->attrib.width;
- rd->height = w->attrib.height;
+ rd->w = w;
+ rd->mask = mask;
+ rd->width = w->attrib.width;
+ rd->height = w->attrib.height;
+ rd->savedAttrib = w->attrib;
lastPointerX = x;
lastPointerY = y;
@@ -183,7 +195,11 @@ resizeInitiate (CompDisplay *d,
{
Cursor cursor;
- if (mask & ResizeLeftMask)
+ if (state & CompActionStateInitKey)
+ {
+ cursor = rs->middleCursor;
+ }
+ else if (mask & ResizeLeftMask)
{
if (mask & ResizeDownMask)
cursor = rs->downLeftCursor;
@@ -251,14 +267,32 @@ resizeTerminate (CompDisplay *d,
(rd->w->screen->windowUngrabNotify) (rd->w);
+ if (state & CompActionStateCancel)
+ {
+ XWindowChanges xwc;
+
+ sendSyncRequest (rd->w);
+
+ xwc.x = rd->savedAttrib.x;
+ xwc.y = rd->savedAttrib.y;
+ xwc.width = rd->savedAttrib.width;
+ xwc.height = rd->savedAttrib.height;
+
+ XConfigureWindow (d->display, rd->w->id,
+ CWX | CWY | CWWidth | CWHeight,
+ &xwc);
+ }
+ else
+ {
+ syncWindowPosition (rd->w);
+ }
+
if (rs->grabIndex)
{
removeScreenGrab (rd->w->screen, rs->grabIndex, NULL);
rs->grabIndex = 0;
}
- syncWindowPosition (rd->w);
-
rd->w = 0;
rd->releaseButton = 0;
}
@@ -363,6 +397,63 @@ #undef CLAMP
*newHeight = height;
}
+
+static void
+resizeHandleKeyEvent (CompScreen *s,
+ KeyCode keycode)
+{
+ RESIZE_SCREEN (s);
+ RESIZE_DISPLAY (s->display);
+
+ if (rs->grabIndex && rd->w)
+ {
+ CompWindow *w;
+ int i, widthInc, heightInc;
+
+ w = rd->w;
+
+ widthInc = w->sizeHints.width_inc;
+ heightInc = w->sizeHints.height_inc;
+
+ if (widthInc < MIN_KEY_WIDTH_INC)
+ widthInc = MIN_KEY_WIDTH_INC;
+
+ if (heightInc < MIN_KEY_HEIGHT_INC)
+ heightInc = MIN_KEY_HEIGHT_INC;
+
+ for (i = 0; i < NUM_KEYS; i++)
+ {
+ if (keycode != rd->key[i])
+ continue;
+
+ if (rd->mask & rKeys[i].warpMask)
+ {
+ XWarpPointer (s->display->display, None, None, 0, 0, 0, 0,
+ rKeys[i].dx * widthInc,
+ rKeys[i].dy * heightInc);
+ }
+ else
+ {
+ int x, y, left, top, width, height;
+
+ left = w->attrib.x - w->input.left;
+ top = w->attrib.y - w->input.top;
+ width = w->input.left + w->attrib.width + w->input.right;
+ height = w->input.top + w->attrib.height + w->input.bottom;
+
+ x = left + width * (rKeys[i].dx + 1) / 2;
+ y = top + height * (rKeys[i].dy + 1) / 2;
+
+ warpPointer (s->display, x - pointerX, y - pointerY);
+ rd->mask = rKeys[i].resizeMask;
+ updateScreenGrab (s, rs->grabIndex, rs->cursor[i]);
+ }
+
+ break;
+ }
+ }
+}
+
static void
resizeHandleMotionEvent (CompScreen *s,
int xRoot,
@@ -416,37 +507,11 @@ resizeHandleEvent (CompDisplay *d,
switch (event->type) {
case KeyPress:
- case KeyRelease:
s = findScreenAtDisplay (d, event->xkey.root);
if (s)
- {
- RESIZE_SCREEN (s);
-
- if (rs->grabIndex && rd->w && event->type == KeyPress)
- {
- int i, widthInc, heightInc;
-
- widthInc = rd->w->sizeHints.width_inc;
- heightInc = rd->w->sizeHints.height_inc;
-
- if (widthInc < MIN_KEY_WIDTH_INC)
- widthInc = MIN_KEY_WIDTH_INC;
-
- if (heightInc < MIN_KEY_HEIGHT_INC)
- heightInc = MIN_KEY_HEIGHT_INC;
-
- for (i = 0; i < NUM_KEYS; i++)
- {
- if (event->xkey.keycode == rd->key[i])
- {
- XWarpPointer (d->display, None, None, 0, 0, 0, 0,
- rKeys[i].dx * widthInc,
- rKeys[i].dy * heightInc);
- break;
- }
- }
- }
- }
+ resizeHandleKeyEvent (s, event->xkey.keycode);
+ break;
+ case KeyRelease:
break;
case ButtonRelease: {
CompAction *action =
@@ -739,6 +804,12 @@ resizeInitScreen (CompPlugin *p,
XC_bottom_left_corner);
rs->downRightCursor = XCreateFontCursor (s->display->display,
XC_bottom_right_corner);
+ rs->middleCursor = XCreateFontCursor (s->display->display, XC_fleur);
+
+ rs->cursor[0] = rs->leftCursor;
+ rs->cursor[1] = rs->rightCursor;
+ rs->cursor[2] = rs->upCursor;
+ rs->cursor[3] = rs->downCursor;
addScreenAction (s, &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action);
diff --git a/src/display.c b/src/display.c
index c44b2a2..cb73719 100644
--- a/src/display.c
+++ b/src/display.c
@@ -2632,6 +2632,7 @@ #endif
compDisplays = d;
d->escapeKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Escape"));
+ d->returnKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Return"));
{
XSetWindowAttributes attr;
diff --git a/src/event.c b/src/event.c
index 8192329..5eb5152 100644
--- a/src/event.c
+++ b/src/event.c
@@ -323,7 +323,13 @@ triggerKeyPressBindings (CompDisplay *d,
unsigned int modMask = REAL_MOD_MASK & ~d->ignoredModMask;
unsigned int bindMods;
+ state = 0;
if (event->xkey.keycode == d->escapeKeyCode)
+ state = CompActionStateCancel;
+ else if (event->xkey.keycode == d->returnKeyCode)
+ state = CompActionStateCommit;
+
+ if (state)
{
while (nOption--)
{
@@ -331,7 +337,7 @@ triggerKeyPressBindings (CompDisplay *d,
{
if (option->value.action.terminate)
(*option->value.action.terminate) (d, &option->value.action,
- 0, NULL, 0);
+ state, NULL, 0);
}
option++;
@@ -340,6 +346,7 @@ triggerKeyPressBindings (CompDisplay *d,
return FALSE;
}
+ state = CompActionStateInitKey;
while (nOption--)
{
if (isInitiateBinding (option, CompBindingTypeKey, state, &action))
diff --git a/src/screen.c b/src/screen.c
index 75c6abc..769a3f1 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -979,9 +979,6 @@ addScreen (CompDisplay *display,
s->wmSnAtom = wmSnAtom;
s->wmSnTimestamp = wmSnTimestamp;
- s->escapeKeyCode = XKeysymToKeycode (display->display,
- XStringToKeysym ("Escape"));
-
s->damageMask = COMP_SCREEN_DAMAGE_ALL_MASK;
s->next = 0;
s->exposeRects = 0;
@@ -1817,6 +1814,24 @@ pushScreenGrab (CompScreen *s,
}
void
+updateScreenGrab (CompScreen *s,
+ int index,
+ Cursor cursor)
+{
+ index--;
+
+#ifdef DEBUG
+ if (index < 0 || index >= s->maxGrab)
+ abort ();
+#endif
+
+ XChangeActivePointerGrab (s->display->display, POINTER_GRAB_MASK,
+ cursor, CurrentTime);
+
+ s->grabs[index].cursor = cursor;
+}
+
+void
removeScreenGrab (CompScreen *s,
int index,
XPoint *restorePointer)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 3 Aug 2006 21:31:21 -0000 1.5
+++ .cvsignore 18 Aug 2006 01:36:27 -0000 1.6
@@ -1,3 +1 @@
-compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-desktop-effects-0.6.tar.gz
-desktop-effects-0.6.1.tar.gz
+compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
aiglx-defaults.patch:
main.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
Index: aiglx-defaults.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/aiglx-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- aiglx-defaults.patch 18 Jul 2006 17:15:07 -0000 1.1
+++ aiglx-defaults.patch 18 Aug 2006 01:36:27 -0000 1.2
@@ -9,10 +9,10 @@
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
-index cf0a5d7..fd7afc3 100644
+index 3d3a9c5..bbafd2b 100644
--- a/src/main.c
+++ b/src/main.c
-@@ -72,8 +72,8 @@ CompWindow *lastFoundWindow = 0;
+@@ -78,8 +78,8 @@ CompWindow *lastFoundWindow = 0;
CompWindow *lastDamagedWindow = 0;
Bool replaceCurrentWm = FALSE;
@@ -23,7 +23,7 @@
static void
usage (void)
-@@ -84,8 +84,10 @@ usage (void)
+@@ -90,8 +90,10 @@ usage (void)
"[--refresh-rate RATE]\n "
"[--fast-filter] "
"[--indirect-rendering] "
@@ -35,7 +35,7 @@
"[--replace] "
"[--sm-disable] "
"[--sm-client-id ID] "
-@@ -176,10 +178,18 @@ main (int argc, char **argv)
+@@ -182,10 +184,18 @@ main (int argc, char **argv)
{
indirectRendering = TRUE;
}
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- compiz.spec 11 Aug 2006 00:17:36 -0000 1.18
+++ compiz.spec 18 Aug 2006 01:36:27 -0000 1.19
@@ -1,7 +1,7 @@
# -*- mode: rpm-spec -*-
-%define sha1 fc6b7773fc52f6104b66a9f86c18395f8a958848
-%define snapshot 20060721
+%define sha1 3173a142efe5e7af83ebb534a074d9d2a0c67a86
+%define snapshot 20060817
%define dialogversion 0.6.1
@@ -10,7 +10,7 @@
License: X11/MIT/GPL
Group: User Interface/Desktops
Version: 0.0.13
-Release: 0.15.%{snapshot}git.fc5.aiglx
+Release: 0.16.%{snapshot}git%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +42,7 @@
Patch105: fedora-logo.patch
Patch106: glfinish.patch
Patch107: desktop-effects-0.6.1-delete-session.patch
-
+Patch108: resize-move-keybindings.patch
%description
Compiz is one of the first OpenGL-accelerated compositing window
@@ -81,6 +81,8 @@
%patch107 -p1 -b .delete-session
popd
+%patch108 -p1 -b .resize-move-keybindings
+
%build
%configure --disable-libsvg-cairo
@@ -141,6 +143,12 @@
%{_includedir}/compiz
%changelog
+* Thu Aug 17 2006 Kristian Høgsberg <krh at redhat.com> - 0.0.13-0.16.20060817git.fc6
+- Rebase to latest upstream changes which has the rest of the bindings
+ rewrite. Add resize-move-keybindings.patch to make move and resize
+ bindings work like metacity.
+- Add back scale plugin.
+
* Thu Aug 10 2006 Ray Strode <rstrode at redhat.com> 0.0.13-0.15.20060721git.fc5.aiglx
- Add Requires: gnome-session 2.15.90-2.fc6 (bug 201473)
- unlink session file on changing wms (bug 201473)
composite-cube-logo.patch:
cube.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+)
Index: composite-cube-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/composite-cube-logo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- composite-cube-logo.patch 21 Jul 2006 18:59:46 -0000 1.2
+++ composite-cube-logo.patch 18 Aug 2006 01:36:27 -0000 1.3
@@ -9,10 +9,10 @@
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/plugins/cube.c b/plugins/cube.c
-index b222685..0576b8d 100644
+index 31edd5c..339d843 100644
--- a/plugins/cube.c
+++ b/plugins/cube.c
-@@ -1204,11 +1204,28 @@ cubePaintTransformedScreen (CompScreen
+@@ -1162,11 +1162,28 @@ cubePaintTransformedScreen (CompScreen
if (cs->invert == 1 && s->size == 4 && cs->texture.name)
{
fbconfig-depth-fix.patch:
screen.c | 10 ++++++++++
1 files changed, 10 insertions(+)
Index: fbconfig-depth-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fbconfig-depth-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fbconfig-depth-fix.patch 21 Jul 2006 18:59:46 -0000 1.2
+++ fbconfig-depth-fix.patch 18 Aug 2006 01:36:27 -0000 1.3
@@ -9,7 +9,7 @@
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/screen.c b/src/screen.c
-index 14e7083..a9f1b99 100644
+index 9ec30d5..75c6abc 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1309,6 +1309,16 @@ addScreen (CompDisplay *display,
fedora-logo.patch:
cube.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
Index: fedora-logo.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fedora-logo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-logo.patch 21 Jul 2006 18:59:46 -0000 1.2
+++ fedora-logo.patch 18 Aug 2006 01:36:27 -0000 1.3
@@ -5,34 +5,11 @@
---
- plugins/compiz.schemas.in.in | 4 ++--
- plugins/cube.c | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
+ plugins/cube.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/plugins/compiz.schemas.in.in b/plugins/compiz.schemas.in.in
-index 899622d..dddbfcd 100644
---- a/plugins/compiz.schemas.in.in
-+++ b/plugins/compiz.schemas.in.in
-@@ -913,7 +913,7 @@
- <applyto>/apps/compiz/plugins/cube/screen0/options/color</applyto>
- <owner>compiz</owner>
- <type>string</type>
-- <default>#efebe7ff</default>
-+ <default>#00194aff</default>
- <locale name="C">
- <short>Cube Color</short>
- <long>
-@@ -956,7 +956,7 @@
- <owner>compiz</owner>
- <type>list</type>
- <list_type>string</list_type>
-- <default>[novell.png]</default>
-+ <default>[/usr/share/pixmaps/fedora-logo.png]</default>
- <locale name="C">
- <short>Image files</short>
- <long>
diff --git a/plugins/cube.c b/plugins/cube.c
-index 0576b8d..e9e8299 100644
+index 339d843..783b408 100644
--- a/plugins/cube.c
+++ b/plugins/cube.c
@@ -44,14 +44,14 @@ #include <X11/Xproto.h>
gl-include-inferiors.patch:
include/compiz.h | 2 ++
src/display.c | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
Index: gl-include-inferiors.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/gl-include-inferiors.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gl-include-inferiors.patch 21 Jul 2006 18:59:46 -0000 1.2
+++ gl-include-inferiors.patch 18 Aug 2006 01:36:27 -0000 1.3
@@ -10,10 +10,10 @@
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/include/compiz.h b/include/compiz.h
-index 920d3ce..2e21d44 100644
+index 282878b..87dd6d4 100644
--- a/include/compiz.h
+++ b/include/compiz.h
-@@ -664,6 +664,8 @@ struct _CompDisplay {
+@@ -668,6 +668,8 @@ struct _CompDisplay {
GLenum textureFilter;
@@ -23,10 +23,10 @@
Window below;
diff --git a/src/display.c b/src/display.c
-index d1a5664..250abb7 100644
+index 60d340e..7cf12e1 100644
--- a/src/display.c
+++ b/src/display.c
-@@ -2021,6 +2021,23 @@ #endif
+@@ -2631,6 +2631,23 @@ #endif
d->escapeKeyCode = XKeysymToKeycode (dpy, XStringToKeysym ("Escape"));
glfinish.patch:
display.c | 2 ++
1 files changed, 2 insertions(+)
Index: glfinish.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/glfinish.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glfinish.patch 21 Jul 2006 18:59:46 -0000 1.1
+++ glfinish.patch 18 Aug 2006 01:36:27 -0000 1.2
@@ -9,10 +9,10 @@
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/display.c b/src/display.c
-index 250abb7..bc9b0bb 100644
+index 7cf12e1..c44b2a2 100644
--- a/src/display.c
+++ b/src/display.c
-@@ -1482,6 +1482,8 @@ eventLoop (void)
+@@ -2079,6 +2079,8 @@ eventLoop (void)
(*s->donePaintScreen) (s);
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 3 Aug 2006 21:31:21 -0000 1.5
+++ sources 18 Aug 2006 01:36:27 -0000 1.6
@@ -1,3 +1 @@
-16382b2db6ffc65161a6edc70559ee67 compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
-101df08c0adb11640e512db33165acf4 desktop-effects-0.6.tar.gz
-85c612c6ad47e31c70f0ba85063882e4 desktop-effects-0.6.1.tar.gz
+ec5b51f98b914af4d51ad53bc832b7e1 compiz-3173a142efe5e7af83ebb534a074d9d2a0c67a86.tar.bz2
tfp-server-extension.patch:
screen.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Index: tfp-server-extension.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/tfp-server-extension.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tfp-server-extension.patch 21 Jul 2006 18:59:46 -0000 1.2
+++ tfp-server-extension.patch 18 Aug 2006 01:36:27 -0000 1.3
@@ -9,7 +9,7 @@
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/screen.c b/src/screen.c
-index b9be10b..14e7083 100644
+index 0941107..9ec30d5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -897,7 +897,7 @@ addScreen (CompDisplay *display,
- Previous message (by thread): rpms/xchat/devel xchat-2.6.6-fi.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch, NONE, 1.1 xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xchat.spec, 1.54, 1.55 xchat-2.0.9-simplify-to-use-gnome-open-for-default-webbrowser.patch, 1.2, NONE xchat-2.0.9-simplify-to-use-htmlview-for-default-webbrowser.patch, 1.2, NONE
- Next message (by thread): rpms/compiz/devel sources,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list