search for: compactionstatetermkey

...tton) - action->state |= CompActionStateTermButton; + if (!(action->edgeMask & d->mouseOnEdge)) + { + if (state & CompActionStateInitButton) + action->state |= CompActionStateTermButton; - if (state & CompActionStateInitKey) - action->state |= CompActionStateTermKey; + if (state & CompActionStateInitKey) + action->state |= CompActionStateTermKey; + } } } @@ -1372,9 +1375,11 @@ scaleDisplayInitOptions (ScaleDisplay *s o->value.action.terminate = scaleTerminate; o->value.action.bell = FALSE; o->value.a...

...tton) - action->state |= CompActionStateTermButton; + if (!(action->edgeMask & d->mouseOnEdge)) + { + if (state & CompActionStateInitButton) + action->state |= CompActionStateTermButton; - if (state & CompActionStateInitKey) - action->state |= CompActionStateTermKey; + if (state & CompActionStateInitKey) + action->state |= CompActionStateTermKey; + } } } @@ -1372,9 +1375,11 @@ scaleDisplayInitOptions (ScaleDisplay *s o->value.action.terminate = scaleTerminate; o->value.action.bell = FALSE; o->value.a...

...; + if (!(action->edgeMask & d->mouseOnEdge)) > + { > + if (state & CompActionStateInitButton) > + action->state |= CompActionStateTermButton; > > - if (state & CompActionStateInitKey) > - action->state |= CompActionStateTermKey; > + if (state & CompActionStateInitKey) > + action->state |= CompActionStateTermKey; > + } > } > } > > @@ -1372,9 +1375,11 @@ scaleDisplayInitOptions (ScaleDisplay *s > o->value.action.terminate = scaleTerminate;...

...ned int modMask = (REAL_MOD_MASK & ~d->ignoredModMask) + | CompNoMask; unsigned int bindMods; if (event->xkey.keycode == d->escapeKeyCode) @@ -438,7 +440,8 @@ triggerKeyReleaseBindings (CompDisplay *d, { CompActionState state = CompActionStateTermKey; CompAction *action; - unsigned int modMask = REAL_MOD_MASK & ~d->ignoredModMask; + unsigned int modMask = (REAL_MOD_MASK & ~d->ignoredModMask) + | CompNoMask; unsigned int bindMods; unsigned int mods...

--- include/compiz.h | 17 ++++++- metadata/core.xml.in | 7 +++ src/display.c | 5 ++- src/event.c | 130 +++++++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 143 insertions(+), 16 deletions(-) diff --git a/include/compiz.h b/include/compiz.h index dd34f00..abb1169 100644 --- a/include/compiz.h +++ b/include/compiz.h @@ -26,7 +26,7 @@ #ifndef

...ext, family, size, slant, weight, + fillColor, strokeColor, strokeWidth); + } + } + } + + return FALSE; + +} + static Bool annoInitiate (CompDisplay *d, CompAction *action, @@ -174,24 +535,28 @@ if (state & CompActionStateInitKey) action->state |= CompActionStateTermKey; - annoLastPointerX = pointerX; - annoLastPointerY = pointerY; + as->startX = annoLastPointerX = pointerX; + as->startY = annoLastPointerY = pointerY; cr = annoCairoContext (s); if (cr) { + as->eraseMode = FALSE; unsigned short *color; ANNO_DISPLAY (s->displa...