summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/resize.c
diff options
context:
space:
mode:
authorkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-02 16:26:33 +0000
committerkristian <kristian@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-12-02 16:26:33 +0000
commitc31c5e2d5c6b525350c2f807095f8b2819a59bd5 (patch)
treead9bf35f3a435cdb444fff636424005fb608b4ce /beryl-plugins/src/resize.c
parentd85d0131318217e03b20d15639fced7af7957eb5 (diff)
downloadmarex-dev-c31c5e2d5c6b525350c2f807095f8b2819a59bd5.tar.gz
marex-dev-c31c5e2d5c6b525350c2f807095f8b2819a59bd5.tar.bz2
indent -i8 -kr . All whitespace-changes.
See man indent for details of what -kr does. git-svn-id: file:///beryl/trunk@1499 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/resize.c')
-rw-r--r--beryl-plugins/src/resize.c1008
1 files changed, 530 insertions, 478 deletions
diff --git a/beryl-plugins/src/resize.c b/beryl-plugins/src/resize.c
index 53077e4..28e1abf 100644
--- a/beryl-plugins/src/resize.c
+++ b/beryl-plugins/src/resize.c
@@ -61,16 +61,19 @@
#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, ResizeLeftMask | ResizeRightMask, ResizeLeftMask },
- { "Right", 1, 0, ResizeLeftMask | ResizeRightMask, ResizeRightMask },
- { "Up", 0, -1, ResizeUpMask | ResizeDownMask, ResizeUpMask },
- { "Down", 0, 1, ResizeUpMask | ResizeDownMask, ResizeDownMask }
+ {
+ "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]))
@@ -91,8 +94,7 @@ struct _ResizeKeys {
static int displayPrivateIndex;
/* Order is important. In code, we check for > Stretch. */
-typedef enum _ResizeMode
-{
+typedef enum _ResizeMode {
ResizeModeNormal,
ResizeModeStretch,
ResizeModeOutline,
@@ -115,16 +117,16 @@ char *resizeModes[] = {
typedef struct _ResizeDisplay {
CompOption opt[RESIZE_DISPLAY_OPTION_NUM];
- int screenPrivateIndex;
+ int screenPrivateIndex;
HandleEventProc handleEvent;
- CompWindow *w;
+ CompWindow *w;
XWindowAttributes savedAttrib;
- int releaseButton;
- unsigned int mask;
- int width;
- int height;
- KeyCode key[NUM_KEYS];
+ int releaseButton;
+ unsigned int mask;
+ int width;
+ int height;
+ KeyCode key[NUM_KEYS];
int lastWidth;
int lastHeight;
@@ -182,45 +184,50 @@ typedef struct _ResizeScreen {
#define NUM_OPTIONS(d) (sizeof ((d)->opt) / sizeof (CompOption))
-static void resizeUpdateWindowRealSize (CompDisplay *d, int move_only)
+static void resizeUpdateWindowRealSize(CompDisplay * d, int move_only)
{
RESIZE_DISPLAY(d);
XWindowChanges xwc;
- unsigned int xwcm = 0;
+ unsigned int xwcm = 0;
if (!rd->w || rd->w->syncWait)
return;
if (move_only) {
- moveWindow(rd->w, rd->currentX-rd->w->attrib.x, rd->currentY-rd->w->attrib.y, TRUE, FALSE);
- syncWindowPosition(rd->w);
+ moveWindow(rd->w, rd->currentX - rd->w->attrib.x,
+ rd->currentY - rd->w->attrib.y, TRUE, FALSE);
+ syncWindowPosition(rd->w);
} else {
- if (rd->currentX != rd->w->serverX) xwcm |= CWX;
- if (rd->currentY != rd->w->serverY) xwcm |= CWY;
- if (rd->currentWidth != rd->w->serverWidth) xwcm |= CWWidth;
- if (rd->currentHeight != rd->w->serverHeight) xwcm |= CWHeight;
-
- xwc.x = rd->currentX;
- xwc.y = rd->currentY;
- xwc.width = rd->currentWidth;
- xwc.height = rd->currentHeight;
-
- if (rd->resizeMode == ResizeModeNormal
- && rd->opt[RESIZE_DISPLAY_OPTION_SYNC_WINDOW].value.b)
- sendSyncRequest (rd->w);
-
- configureXWindow(rd->w, xwcm, &xwc);
- if (rd->resizeMode != ResizeModeNormal)
- resizeWindow(rd->w, rd->currentX, rd->currentY, rd->currentWidth,
- rd->currentHeight, rd->w->attrib.border_width);
- }
+ if (rd->currentX != rd->w->serverX)
+ xwcm |= CWX;
+ if (rd->currentY != rd->w->serverY)
+ xwcm |= CWY;
+ if (rd->currentWidth != rd->w->serverWidth)
+ xwcm |= CWWidth;
+ if (rd->currentHeight != rd->w->serverHeight)
+ xwcm |= CWHeight;
+
+ xwc.x = rd->currentX;
+ xwc.y = rd->currentY;
+ xwc.width = rd->currentWidth;
+ xwc.height = rd->currentHeight;
+
+ if (rd->resizeMode == ResizeModeNormal
+ && rd->opt[RESIZE_DISPLAY_OPTION_SYNC_WINDOW].value.b)
+ sendSyncRequest(rd->w);
+
+ configureXWindow(rd->w, xwcm, &xwc);
+ if (rd->resizeMode != ResizeModeNormal)
+ resizeWindow(rd->w, rd->currentX, rd->currentY,
+ rd->currentWidth, rd->currentHeight,
+ rd->w->attrib.border_width);
+ }
}
-static void resizeConstrainMinMax (CompWindow *w,
- int width,
- int height,
- int *newWidth,
- int *newHeight)
+static void resizeConstrainMinMax(CompWindow * w,
+ int width,
+ int height,
+ int *newWidth, int *newHeight)
{
const XSizeHints *hints = &w->sizeHints;
int min_width = 0;
@@ -243,34 +250,34 @@ static void resizeConstrainMinMax (CompWindow *w,
max_width = hints->max_width;
max_height = hints->max_height;
}
-
#define CLAMP(v, min, max) ((v) <= (min) ? (min) : (v) >= (max) ? (max) : (v))
/* clamp width and height to min and max values */
- width = CLAMP (width, min_width, max_width);
- height = CLAMP (height, min_height, max_height);
+ width = CLAMP(width, min_width, max_width);
+ height = CLAMP(height, min_height, max_height);
#undef CLAMP
- *newWidth = width;
+ *newWidth = width;
*newHeight = height;
}
-static void resizeApply(CompDisplay *d)
+static void resizeApply(CompDisplay * d)
{
- int move_only = 0, cw, ch;
- RESIZE_DISPLAY (d);
+ int move_only = 0, cw, ch;
+ RESIZE_DISPLAY(d);
- if ((!rd->dx_to_apply && !rd->dy_to_apply) ||
- rd->w->syncWait)
+ if ((!rd->dx_to_apply && !rd->dy_to_apply) || rd->w->syncWait)
return;
/* Move window by delta if resizing from left/top */
- if (rd->mask & ResizeLeftMask && rd->width_to_apply != rd->currentWidth)
- rd->currentX+= rd->dx_to_apply;
+ if (rd->mask & ResizeLeftMask
+ && rd->width_to_apply != rd->currentWidth)
+ rd->currentX += rd->dx_to_apply;
- if (rd->mask & ResizeUpMask && rd->height_to_apply != rd->currentHeight)
- rd->currentY+= rd->dy_to_apply;
+ if (rd->mask & ResizeUpMask
+ && rd->height_to_apply != rd->currentHeight)
+ rd->currentY += rd->dy_to_apply;
cw = rd->currentWidth = rd->width_to_apply;
ch = rd->currentHeight = rd->height_to_apply;
@@ -278,7 +285,7 @@ static void resizeApply(CompDisplay *d)
rd->dx_to_apply = rd->dy_to_apply = 0;
constrainNewWindowSize(rd->w, rd->currentWidth, rd->currentHeight,
- &cw, &ch);
+ &cw, &ch);
if (rd->mask & ResizeLeftMask)
rd->currentX = rd->right_edge - cw;
@@ -290,24 +297,24 @@ static void resizeApply(CompDisplay *d)
rd->currentHeight = ch;
switch (rd->resizeMode) {
- case ResizeModeStretch:
- move_only = 1;
- case ResizeModeNormal:
- resizeUpdateWindowRealSize(d, move_only);
+ case ResizeModeStretch:
+ move_only = 1;
+ case ResizeModeNormal:
+ resizeUpdateWindowRealSize(d, move_only);
}
}
-static void resizeUpdateWindowSize (CompDisplay *d, int dx, int dy)
+static void resizeUpdateWindowSize(CompDisplay * d, int dx, int dy)
{
int w, h, new_height, new_width;
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
if (!rd->w)
return;
if (rd->resizeMode != ResizeModeNormal)
- damageScreen (rd->w->screen);
+ damageScreen(rd->w->screen);
if (rd->w->state & CompWindowStateMaximizedVertMask)
rd->currentHeight = rd->w->serverHeight;
@@ -316,7 +323,7 @@ static void resizeUpdateWindowSize (CompDisplay *d, int dx, int dy)
rd->currentWidth = rd->w->serverWidth;
if (rd->w->state & CompWindowStateMaximizedVertMask &&
- rd->w->state & CompWindowStateMaximizedHorzMask)
+ rd->w->state & CompWindowStateMaximizedHorzMask)
return;
w = rd->currentWidth;
@@ -332,37 +339,36 @@ static void resizeUpdateWindowSize (CompDisplay *d, int dx, int dy)
/* Apply the width/height modifications */
if (rd->mask & ResizeLeftMask)
- w-= dx;
+ w -= dx;
else if (rd->mask & ResizeRightMask)
- w+= dx;
+ w += dx;
if (rd->mask & ResizeUpMask)
- h-= dy;
+ h -= dy;
else if (rd->mask & ResizeDownMask)
- h+= dy;
+ h += dy;
/* Apply constraints */
new_width = w;
new_height = h;
- resizeConstrainMinMax (rd->w, w, h, &new_width, &new_height);
+ resizeConstrainMinMax(rd->w, w, h, &new_width, &new_height);
- if ((w != new_width) || (h != new_height))
- {
- /* if the resizing hit constraints, move the mouse
- pointer to the new border to avoid desynchronization */
- int pointerAdjustX = 0, pointerAdjustY = 0;
+ if ((w != new_width) || (h != new_height)) {
+ /* if the resizing hit constraints, move the mouse
+ pointer to the new border to avoid desynchronization */
+ int pointerAdjustX = 0, pointerAdjustY = 0;
- if (rd->mask & ResizeRightMask)
- pointerAdjustX = new_width - w;
- else if (rd->mask & ResizeLeftMask)
- pointerAdjustX = w - new_width;
+ if (rd->mask & ResizeRightMask)
+ pointerAdjustX = new_width - w;
+ else if (rd->mask & ResizeLeftMask)
+ pointerAdjustX = w - new_width;
- if (rd->mask & ResizeDownMask)
- pointerAdjustY = new_height - h;
- else if (rd->mask & ResizeUpMask)
- pointerAdjustY = h - new_height;
+ if (rd->mask & ResizeDownMask)
+ pointerAdjustY = new_height - h;
+ else if (rd->mask & ResizeUpMask)
+ pointerAdjustY = h - new_height;
- warpPointer (d, pointerAdjustX, pointerAdjustY);
+ warpPointer(d, pointerAdjustX, pointerAdjustY);
}
dx -= new_width - w;
@@ -388,43 +394,42 @@ static void resizeUpdateWindowSize (CompDisplay *d, int dx, int dy)
resizeApply(d);
}
-static Bool resizeInitiate (CompDisplay *d,
- CompAction *action,
- CompActionState state,
- CompOption *option,
- int nOption)
+static Bool resizeInitiate(CompDisplay * d,
+ CompAction * action,
+ CompActionState state,
+ CompOption * option, int nOption)
{
CompWindow *w;
ResizeScreen *rs;
- Window xid;
+ Window xid;
unsigned int mods;
unsigned int mask;
- int x, y;
- int button;
+ int x, y;
+ int button;
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
- xid = getIntOptionNamed (option, nOption, "window", 0);
+ xid = getIntOptionNamed(option, nOption, "window", 0);
- w = findWindowAtDisplay (d, xid);
+ w = findWindowAtDisplay(d, xid);
if (!w)
- return FALSE;
+ return FALSE;
rs = GET_RESIZE_SCREEN(w->screen);
rd->dx_to_apply = rd->dy_to_apply = 0;
- mods = getIntOptionNamed (option, nOption, "modifiers", 0);
+ mods = getIntOptionNamed(option, nOption, "modifiers", 0);
- x = getIntOptionNamed (option, nOption, "x",
- w->attrib.x + (w->width / 2));
- y = getIntOptionNamed (option, nOption, "y",
- w->attrib.y + (w->height / 2));
+ x = getIntOptionNamed(option, nOption, "x",
+ w->attrib.x + (w->width / 2));
+ y = getIntOptionNamed(option, nOption, "y",
+ w->attrib.y + (w->height / 2));
- button = getIntOptionNamed (option, nOption, "button", -1);
+ button = getIntOptionNamed(option, nOption, "button", -1);
- mask = getIntOptionNamed (option, nOption, "direction", 0);
+ 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
@@ -435,21 +440,21 @@ static Bool resizeInitiate (CompDisplay *d,
mask = 0;
else if (!mask) {
mask |= ((x - w->attrib.x) < (w->width / 2)) ?
- ResizeLeftMask : ResizeRightMask;
+ ResizeLeftMask : ResizeRightMask;
mask |= ((y - w->attrib.y) < (w->height / 2)) ?
- ResizeUpMask : ResizeDownMask;
+ ResizeUpMask : ResizeDownMask;
}
- if (otherScreenGrabExist (w->screen, "resize", 0))
+ if (otherScreenGrabExist(w->screen, "resize", 0))
return FALSE;
if (rd->w)
return FALSE;
if (w->type & (CompWindowTypeDesktopMask |
- CompWindowTypeDockMask |
- CompWindowTypeFullscreenMask))
+ CompWindowTypeDockMask |
+ CompWindowTypeFullscreenMask))
return FALSE;
if (w->attrib.override_redirect)
@@ -461,21 +466,21 @@ static Bool resizeInitiate (CompDisplay *d,
if (w->shaded)
mask &= ~(ResizeUpMask | ResizeDownMask);
- rd->w = w;
- rd->mask = mask;
- rd->currentWidth = rd->width = w->serverWidth;
- rd->currentHeight = rd->height = w->serverHeight;
- rd->currentX = w->attrib.x;
- rd->currentY = w->attrib.y;
+ rd->w = w;
+ rd->mask = mask;
+ rd->currentWidth = rd->width = w->serverWidth;
+ rd->currentHeight = rd->height = w->serverHeight;
+ rd->currentX = w->attrib.x;
+ rd->currentY = w->attrib.y;
rd->savedAttrib = w->attrib;
rd->right_edge = rd->currentX + rd->currentWidth;
rd->bottom_edge = rd->currentY + rd->currentHeight;
- rd->xdelta = rd->ydelta = 0;
+ rd->xdelta = rd->ydelta = 0;
if (rd->resizeMode != ResizeModeNormal)
rd->lastWidth = rd->lastHeight = 0.0f;
else
- addWindowDamage (rd->w);
+ addWindowDamage(rd->w);
d->lastPointerX = x;
d->lastPointerY = y;
@@ -504,58 +509,68 @@ static Bool resizeInitiate (CompDisplay *d,
else
cursor = rs->downCursor;
- rs->grabIndex = pushScreenGrab (w->screen, cursor, "resize");
+ rs->grabIndex =
+ pushScreenGrab(w->screen, cursor, "resize");
}
if (rs->grabIndex) {
int mods_sought = virtualToRealModMask(d,
- rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action.button.modifiers);
- int button_sought = rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action.button.button;
+ rd->
+ opt
+ [RESIZE_DISPLAY_OPTION_INITIATE].
+ value.action.button.
+ modifiers);
+ int button_sought =
+ rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action.
+ button.button;
rd->releaseButton = button;
(w->screen->windowGrabNotify) (w, x, y, state,
- CompWindowGrabResizeMask |
- CompWindowGrabButtonMask);
+ CompWindowGrabResizeMask |
+ CompWindowGrabButtonMask);
if (state & CompActionStateInitKey) {
- x = w->attrib.x + (w->width / 2);
+ x = w->attrib.x + (w->width / 2);
y = w->attrib.y + (w->height / 2);
- warpPointer (d, x - d->pointerX, y - d->pointerY);
+ warpPointer(d, x - d->pointerX, y - d->pointerY);
} else if ((mods & WARP_IGNORE_MASK) == mods_sought &&
button == button_sought &&
- rd->opt[RESIZE_DISPLAY_OPTION_WARP_POINTER].value.b) {
+ rd->opt[RESIZE_DISPLAY_OPTION_WARP_POINTER].
+ value.b) {
/* May warp if initiated with mouse combo */
- x = w->attrib.x - w->input.left +
- ((mask & ResizeLeftMask) ? 0 : rd->width+w->input.left+w->input.right);
- y = w->attrib.y - w->input.top +
- ((mask & ResizeUpMask) ? 0 : rd->height+w->input.top+w->input.bottom);
- warpPointer (d, x - d->pointerX, y - d->pointerY);
+ x = w->attrib.x - w->input.left +
+ ((mask & ResizeLeftMask) ? 0 : rd->width +
+ w->input.left + w->input.right);
+ y = w->attrib.y - w->input.top +
+ ((mask & ResizeUpMask) ? 0 : rd->height +
+ w->input.top + w->input.bottom);
+ warpPointer(d, x - d->pointerX, y - d->pointerY);
}
- rd->xdelta = (x - rd->currentX);
- if (rd->mask & ResizeRightMask)
- rd->xdelta = rd->width - rd->xdelta;
+ rd->xdelta = (x - rd->currentX);
+ if (rd->mask & ResizeRightMask)
+ rd->xdelta = rd->width - rd->xdelta;
- rd->ydelta = (y - rd->currentY);
- if (rd->mask & ResizeDownMask)
- rd->ydelta = rd->height - rd->ydelta;
+ rd->ydelta = (y - rd->currentY);
+ if (rd->mask & ResizeDownMask)
+ rd->ydelta = rd->height - rd->ydelta;
}
return FALSE;
}
-static Bool resizeTerminate (CompDisplay *d,
- CompAction *action,
- CompActionState state,
- CompOption *option,
- int nOption)
+static Bool resizeTerminate(CompDisplay * d,
+ CompAction * action,
+ CompActionState state,
+ CompOption * option, int nOption)
{
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
ResizeScreen *rs;
- action->state &= ~(CompActionStateTermKey | CompActionStateTermButton);
+ action->state &=
+ ~(CompActionStateTermKey | CompActionStateTermButton);
if (!rd->w)
return FALSE;
@@ -565,42 +580,45 @@ static Bool resizeTerminate (CompDisplay *d,
if (state & CompActionStateCancel) {
XWindowChanges xwc;
- sendSyncRequest (rd->w);
+ sendSyncRequest(rd->w);
- xwc.x = rd->savedAttrib.x;
- xwc.y = rd->savedAttrib.y;
- xwc.width = rd->savedAttrib.width;
+ xwc.x = rd->savedAttrib.x;
+ xwc.y = rd->savedAttrib.y;
+ xwc.width = rd->savedAttrib.width;
xwc.height = rd->savedAttrib.height;
- configureXWindow (rd->w, CWX | CWY | CWWidth | CWHeight, &xwc);
- resizeWindow (rd->w, rd->savedAttrib.x, rd->savedAttrib.y, rd->savedAttrib.width, rd->savedAttrib.height, rd->w->attrib.border_width);
+ configureXWindow(rd->w, CWX | CWY | CWWidth | CWHeight,
+ &xwc);
+ resizeWindow(rd->w, rd->savedAttrib.x, rd->savedAttrib.y,
+ rd->savedAttrib.width, rd->savedAttrib.height,
+ rd->w->attrib.border_width);
} else if (rd->resizeMode != ResizeModeNormal)
- resizeUpdateWindowRealSize (d, 0);
+ resizeUpdateWindowRealSize(d, 0);
else
- syncWindowPosition (rd->w);
+ syncWindowPosition(rd->w);
(rd->w->screen->windowUngrabNotify) (rd->w);
if (rs->grabIndex) {
- removeScreenGrab (rd->w->screen, rs->grabIndex, NULL);
+ removeScreenGrab(rd->w->screen, rs->grabIndex, NULL);
rs->grabIndex = 0;
}
- addWindowDamage (rd->w);
+ addWindowDamage(rd->w);
if (rd->resizeMode != ResizeModeNormal)
- damageScreen (rd->w->screen);
+ damageScreen(rd->w->screen);
- rd->w = 0;
+ rd->w = 0;
rd->releaseButton = 0;
return FALSE;
}
-static void resizeHandleKeyEvent (CompScreen *s, KeyCode keycode)
+static void resizeHandleKeyEvent(CompScreen * s, KeyCode keycode)
{
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
if (rs->grabIndex && rd->w) {
CompWindow *w;
@@ -608,7 +626,7 @@ static void resizeHandleKeyEvent (CompScreen *s, KeyCode keycode)
w = rd->w;
- widthInc = w->sizeHints.width_inc;
+ widthInc = w->sizeHints.width_inc;
heightInc = w->sizeHints.height_inc;
if (widthInc < MIN_KEY_WIDTH_INC)
@@ -619,37 +637,46 @@ static void resizeHandleKeyEvent (CompScreen *s, KeyCode keycode)
for (i = 0; i < NUM_KEYS; i++) {
if (keycode != rd->key[i])
- continue;
+ 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);
+ 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->serverWidth + w->input.right;
- height = w->input.top + w->serverHeight + w->input.bottom;
+ left = w->attrib.x - w->input.left;
+ top = w->attrib.y - w->input.top;
+ width =
+ w->input.left + w->serverWidth +
+ w->input.right;
+ height =
+ w->input.top + w->serverHeight +
+ w->input.bottom;
- x = left + width * (rKeys[i].dx + 1) / 2;
- y = top + height * (rKeys[i].dy + 1) / 2;
+ x = left + width * (rKeys[i].dx + 1) / 2;
+ y = top + height * (rKeys[i].dy + 1) / 2;
rd->mask = rKeys[i].resizeMask;
/* recalculate delta */
rd->xdelta = (x - rd->currentX);
if (rd->mask & ResizeRightMask)
- rd->xdelta = rd->width - rd->xdelta;
+ rd->xdelta =
+ rd->width - rd->xdelta;
rd->ydelta = (y - rd->currentY);
if (rd->mask & ResizeDownMask)
- rd->ydelta = rd->height - rd->ydelta;
-
- warpPointer (s->display, x - s->display->pointerX, y - s->display->pointerY);
- updateScreenGrab (s, rs->grabIndex, rs->cursor[i]);
+ rd->ydelta =
+ rd->height - rd->ydelta;
+
+ warpPointer(s->display,
+ x - s->display->pointerX,
+ y - s->display->pointerY);
+ updateScreenGrab(s, rs->grabIndex,
+ rs->cursor[i]);
}
break;
@@ -657,22 +684,24 @@ static void resizeHandleKeyEvent (CompScreen *s, KeyCode keycode)
}
}
-static void resizeHandleMotionEvent (CompScreen *s, int xRoot, int yRoot)
+static void resizeHandleMotionEvent(CompScreen * s, int xRoot, int yRoot)
{
int pointerDx, pointerDy;
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
if (!rs->grabIndex)
return;
- if (rd->mask == 0 && rd->w)
- {
- rd->mask = ((xRoot - rd->w->attrib.x) < (rd->w->width / 2)) ?
- ResizeLeftMask : ResizeRightMask;
- rd->mask |= ((yRoot - rd->w->attrib.y) < (rd->w->height / 2)) ?
- ResizeUpMask : ResizeDownMask;
+ if (rd->mask == 0 && rd->w) {
+ rd->mask =
+ ((xRoot - rd->w->attrib.x) <
+ (rd->w->width /
+ 2)) ? ResizeLeftMask : ResizeRightMask;
+ rd->mask |=
+ ((yRoot - rd->w->attrib.y) <
+ (rd->w->height / 2)) ? ResizeUpMask : ResizeDownMask;
}
pointerDx = xRoot - rd->currentX;
@@ -694,39 +723,37 @@ static void resizeHandleMotionEvent (CompScreen *s, int xRoot, int yRoot)
if (!pointerDx && !pointerDy)
return;
- resizeUpdateWindowSize (s->display, pointerDx, pointerDy);
+ resizeUpdateWindowSize(s->display, pointerDx, pointerDy);
}
-static void resizeHandleMoveResizeMessage(CompDisplay *d, XEvent *event)
+static void resizeHandleMoveResizeMessage(CompDisplay * d, XEvent * event)
{
CompWindow *w;
CompOption o[6];
CompAction *action;
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
if (event->xclient.data.l[2] > WmMoveResizeSizeLeft &&
event->xclient.data.l[2] != WmMoveResizeSizeKeyboard)
return;
- w = findWindowAtDisplay (d, event->xclient.window);
+ w = findWindowAtDisplay(d, event->xclient.window);
if (!w)
return;
action = &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action;
- o[0].type = CompOptionTypeInt;
- o[0].name = "window";
+ o[0].type = CompOptionTypeInt;
+ o[0].name = "window";
o[0].value.i = event->xclient.window;
if (event->xclient.data.l[2] == WmMoveResizeSizeKeyboard) {
- o[1].type = CompOptionTypeInt;
- o[1].name = "button";
+ o[1].type = CompOptionTypeInt;
+ o[1].name = "button";
o[1].value.i = 0;
- resizeInitiate (d, action,
- CompActionStateInitKey,
- o, 2);
+ resizeInitiate(d, action, CompActionStateInitKey, o, 2);
} else {
static unsigned int mask[] = {
ResizeUpMask | ResizeLeftMask,
@@ -739,99 +766,102 @@ static void resizeHandleMoveResizeMessage(CompDisplay *d, XEvent *event)
ResizeLeftMask,
};
unsigned int mods;
- Window root, child;
- int xRoot, yRoot, i;
+ Window root, child;
+ int xRoot, yRoot, i;
- XQueryPointer (d->display, w->screen->root,
- &root, &child, &xRoot, &yRoot,
- &i, &i, &mods);
+ XQueryPointer(d->display, w->screen->root,
+ &root, &child, &xRoot, &yRoot,
+ &i, &i, &mods);
/* TODO: not only button 1 */
if (mods & Button1Mask) {
- o[1].type = CompOptionTypeInt;
- o[1].name = "modifiers";
+ o[1].type = CompOptionTypeInt;
+ o[1].name = "modifiers";
o[1].value.i = mods;
- o[2].type = CompOptionTypeInt;
- o[2].name = "x";
+ o[2].type = CompOptionTypeInt;
+ o[2].name = "x";
o[2].value.i = event->xclient.data.l[0];
- o[3].type = CompOptionTypeInt;
- o[3].name = "y";
+ o[3].type = CompOptionTypeInt;
+ o[3].name = "y";
o[3].value.i = event->xclient.data.l[1];
- o[4].type = CompOptionTypeInt;
- o[4].name = "direction";
+ o[4].type = CompOptionTypeInt;
+ o[4].name = "direction";
o[4].value.i = mask[event->xclient.data.l[2]];
- o[5].type = CompOptionTypeInt;
- o[5].name = "button";
+ o[5].type = CompOptionTypeInt;
+ o[5].name = "button";
o[5].value.i = event->xclient.data.l[3] ?
- event->xclient.data.l[3] : -1;
+ event->xclient.data.l[3] : -1;
- resizeInitiate (d,
- action,
- CompActionStateInitButton,
- o, 6);
+ resizeInitiate(d,
+ action,
+ CompActionStateInitButton, o, 6);
- resizeHandleMotionEvent (w->screen, xRoot, yRoot);
+ resizeHandleMotionEvent(w->screen, xRoot, yRoot);
}
}
}
-static void resizeHandleEvent (CompDisplay *d, XEvent *event)
+static void resizeHandleEvent(CompDisplay * d, XEvent * event)
{
CompScreen *s;
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
switch (event->type) {
case KeyPress:
- s = findScreenAtDisplay (d, event->xkey.root);
+ s = findScreenAtDisplay(d, event->xkey.root);
if (s)
- resizeHandleKeyEvent (s, event->xkey.keycode);
+ resizeHandleKeyEvent(s, event->xkey.keycode);
break;
case KeyRelease:
break;
case ButtonPress:
- s = findScreenAtDisplay (d, event->xbutton.root);
- if (s)
- {
- RESIZE_SCREEN (s);
-
- if (rs->grabIndex)
- {
- resizeTerminate (d,
- &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action,
- 0, NULL, 0);
+ s = findScreenAtDisplay(d, event->xbutton.root);
+ if (s) {
+ RESIZE_SCREEN(s);
+
+ if (rs->grabIndex) {
+ resizeTerminate(d,
+ &rd->
+ opt
+ [RESIZE_DISPLAY_OPTION_INITIATE].
+ value.action, 0, NULL, 0);
}
}
- break;
-
- case ButtonRelease: {
- CompAction *action =
- &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action;
+ break;
- if (action->state & CompActionStateTermButton &&
- (rd->releaseButton == -1 ||
- event->xbutton.button == rd->releaseButton))
- resizeTerminate (d, action, CompActionStateTermButton,
- NULL, 0);
+ case ButtonRelease:{
+ CompAction *action =
+ &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.
+ action;
+
+ if (action->state & CompActionStateTermButton &&
+ (rd->releaseButton == -1 ||
+ event->xbutton.button == rd->releaseButton))
+ resizeTerminate(d, action,
+ CompActionStateTermButton,
+ NULL, 0);
}
break;
case MotionNotify:
- s = findScreenAtDisplay (d, event->xmotion.root);
+ s = findScreenAtDisplay(d, event->xmotion.root);
if (s)
- resizeHandleMotionEvent (s, d->pointerX, d->pointerY);
+ resizeHandleMotionEvent(s, d->pointerX,
+ d->pointerY);
break;
case EnterNotify:
case LeaveNotify:
- s = findScreenAtDisplay (d, event->xcrossing.root);
+ s = findScreenAtDisplay(d, event->xcrossing.root);
if (s)
- resizeHandleMotionEvent (s, d->pointerX, d->pointerY);
+ resizeHandleMotionEvent(s, d->pointerX,
+ d->pointerY);
break;
case ClientMessage:
if (event->xclient.message_type == d->wmMoveResizeAtom)
@@ -840,19 +870,22 @@ static void resizeHandleEvent (CompDisplay *d, XEvent *event)
case DestroyNotify:
if (rd->w && rd->w->id == event->xdestroywindow.window) {
CompAction *action =
- &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action;
- resizeTerminate (d, action, 0, NULL, 0);
+ &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.
+ action;
+ resizeTerminate(d, action, 0, NULL, 0);
}
break;
case UnmapNotify:
if (rd->w && rd->w->id == event->xunmap.window) {
CompAction *action =
- &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action;
- resizeTerminate (d, action, 0, NULL, 0);
+ &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.
+ action;
+ resizeTerminate(d, action, 0, NULL, 0);
}
break;
default:
- if (event->type == d->syncEvent + XSyncAlarmNotify && rd->w) {
+ if (event->type == d->syncEvent + XSyncAlarmNotify
+ && rd->w) {
XSyncAlarmNotifyEvent *sa;
sa = (XSyncAlarmNotifyEvent *) event;
@@ -863,75 +896,80 @@ static void resizeHandleEvent (CompDisplay *d, XEvent *event)
break;
}
- UNWRAP (rd, d, handleEvent);
+ UNWRAP(rd, d, handleEvent);
(*d->handleEvent) (d, event);
- WRAP (rd, d, handleEvent, resizeHandleEvent);
+ WRAP(rd, d, handleEvent, resizeHandleEvent);
}
-static void resizePreparePaintScreen (CompScreen * s, int msSinceLastPaint)
+static void resizePreparePaintScreen(CompScreen * s, int msSinceLastPaint)
{
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
if (rd->w && rd->resizeMode > ResizeModeNormal &&
- (rd->lastWidth != rd->currentWidth ||
- rd->lastHeight != rd->currentHeight)) {
- damageScreen (s);
+ (rd->lastWidth != rd->currentWidth ||
+ rd->lastHeight != rd->currentHeight)) {
+ damageScreen(s);
}
- UNWRAP (rs, s, preparePaintScreen);
+ UNWRAP(rs, s, preparePaintScreen);
(*s->preparePaintScreen) (s, msSinceLastPaint);
- WRAP (rs, s, preparePaintScreen, resizePreparePaintScreen);
+ WRAP(rs, s, preparePaintScreen, resizePreparePaintScreen);
}
-static Bool resizePaintWindow (CompWindow * w,
- const WindowPaintAttrib * attrib,
- Region region, unsigned int mask)
+static Bool resizePaintWindow(CompWindow * w,
+ const WindowPaintAttrib * attrib,
+ Region region, unsigned int mask)
{
WindowPaintAttrib sAttrib;
CompScreen *s = w->screen;
Bool status;
- RESIZE_SCREEN (s);
+ RESIZE_SCREEN(s);
if (rs->grabIndex) {
- RESIZE_DISPLAY (s->display);
+ RESIZE_DISPLAY(s->display);
- if (rd->w == w) {
- sAttrib = *attrib;
+ if (rd->w == w) {
+ sAttrib = *attrib;
- if (rd->resizeMode != ResizeModeNormal)
- mask |= PAINT_WINDOW_TRANSFORMED_MASK;
+ if (rd->resizeMode != ResizeModeNormal)
+ mask |= PAINT_WINDOW_TRANSFORMED_MASK;
- if (rd->resizeMode == ResizeModeStretch)
- {
- sAttrib.xScale = (float) (rd->currentWidth) / (float) (rd->w->serverWidth);
- sAttrib.yScale = (float) (rd->currentHeight) / (float) (rd->w->serverHeight);
- }
+ if (rd->resizeMode == ResizeModeStretch) {
+ sAttrib.xScale =
+ (float) (rd->currentWidth) /
+ (float) (rd->w->serverWidth);
+ sAttrib.yScale =
+ (float) (rd->currentHeight) /
+ (float) (rd->w->serverHeight);
+ }
- if (rd->resizeOpacity != OPAQUE
- && sAttrib.opacity >= rd->opacifyMinOpacity) {
- sAttrib.opacity = (sAttrib.opacity * rd->resizeOpacity) >> 16;
+ if (rd->resizeOpacity != OPAQUE
+ && sAttrib.opacity >= rd->opacifyMinOpacity) {
+ sAttrib.opacity =
+ (sAttrib.opacity *
+ rd->resizeOpacity) >> 16;
+ }
+ attrib = &sAttrib;
}
- attrib = &sAttrib;
- }
}
- UNWRAP (rs, s, paintWindow);
+ UNWRAP(rs, s, paintWindow);
status = (*s->paintWindow) (w, attrib, region, mask);
- WRAP (rs, s, paintWindow, resizePaintWindow);
+ WRAP(rs, s, paintWindow, resizePaintWindow);
return status;
}
-static Bool resizePaintScreen (CompScreen * s,
- const ScreenPaintAttrib * sAttrib,
- Region region, int output, unsigned int mask)
+static Bool resizePaintScreen(CompScreen * s,
+ const ScreenPaintAttrib * sAttrib,
+ Region region, int output, unsigned int mask)
{
Bool status = FALSE;
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
int x1 = 0, x2 = 0, y1 = 0, y2 = 0;
if (rd->resizeMode != ResizeModeNormal && rd->w)
@@ -939,175 +977,182 @@ static Bool resizePaintScreen (CompScreen * s,
rs->wasTransformed = FALSE;
- UNWRAP (rs, s, paintScreen);
+ UNWRAP(rs, s, paintScreen);
status = (*s->paintScreen) (s, sAttrib, region, output, mask);
- WRAP (rs, s, paintScreen, resizePaintScreen);
+ WRAP(rs, s, paintScreen, resizePaintScreen);
if (rd->resizeMode > ResizeModeStretch && rd->w &&
- !rs->wasTransformed &&
- !(rd->w->state & (CompWindowStateMaximizedVertMask |
- CompWindowStateMaximizedHorzMask))) {
+ !rs->wasTransformed &&
+ !(rd->w->state & (CompWindowStateMaximizedVertMask |
+ CompWindowStateMaximizedHorzMask))) {
x1 = rd->currentX - rd->w->input.left;
x2 = rd->currentX + rd->currentWidth + rd->w->input.right;
y1 = rd->currentY - rd->w->input.top;
- y2 = rd->currentY + rd->currentHeight + rd->w->input.bottom;
+ y2 = rd->currentY + rd->currentHeight +
+ rd->w->input.bottom;
- glPushMatrix ();
+ glPushMatrix();
prepareXCoords(s, output, -DEFAULT_Z_CAMERA);
- glDisableClientState (GL_TEXTURE_COORD_ARRAY);
- glEnable (GL_BLEND);
+ glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+ glEnable(GL_BLEND);
if (rd->resizeMode == ResizeModeFilled) {
- glColor4usv (rd->opt[RESIZE_DISPLAY_OPTION_FILL_COLOR].value.c);
- glRecti (x1, y2, x2, y1);
+ glColor4usv(rd->
+ opt[RESIZE_DISPLAY_OPTION_FILL_COLOR].
+ value.c);
+ glRecti(x1, y2, x2, y1);
}
/* This section draws the outline */
- glColor4usv (rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR].value.c);
- glLineWidth (2.0);
- glBegin (GL_LINE_LOOP);
- glVertex2i (x1, y1);
- glVertex2i (x2, y1);
- glVertex2i (x2, y2);
- glVertex2i (x1, y2);
- glEnd ();
+ glColor4usv(rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR].
+ value.c);
+ glLineWidth(2.0);
+ glBegin(GL_LINE_LOOP);
+ glVertex2i(x1, y1);
+ glVertex2i(x2, y1);
+ glVertex2i(x2, y2);
+ glVertex2i(x1, y2);
+ glEnd();
/* Clean up */
- glColor4usv (defaultColor);
- glDisable (GL_BLEND);
- glEnableClientState (GL_TEXTURE_COORD_ARRAY);
- glPopMatrix ();
+ glColor4usv(defaultColor);
+ glDisable(GL_BLEND);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+ glPopMatrix();
}
return status;
}
static void
-resizePaintTransformedScreen (CompScreen * s, const ScreenPaintAttrib * sa,
- Region region, int output, unsigned int mask)
+resizePaintTransformedScreen(CompScreen * s, const ScreenPaintAttrib * sa,
+ Region region, int output, unsigned int mask)
{
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
int x1 = 0, x2 = 0, y1 = 0, y2 = 0;
- UNWRAP (rs, s, paintTransformedScreen);
+ UNWRAP(rs, s, paintTransformedScreen);
(*s->paintTransformedScreen) (s, sa, region, output, mask);
- WRAP (rs, s, paintTransformedScreen, resizePaintTransformedScreen);
+ WRAP(rs, s, paintTransformedScreen, resizePaintTransformedScreen);
if (rd->resizeMode > ResizeModeStretch && rd->w &&
- !(rd->w->state & (CompWindowStateMaximizedVertMask |
- CompWindowStateMaximizedHorzMask))) {
+ !(rd->w->state & (CompWindowStateMaximizedVertMask |
+ CompWindowStateMaximizedHorzMask))) {
rs->wasTransformed = TRUE;
x1 = rd->currentX - rd->w->input.left;
x2 = rd->currentX + rd->currentWidth + rd->w->input.right;
y1 = rd->currentY - rd->w->input.top;
- y2 = rd->currentY + rd->currentHeight + rd->w->input.bottom;
+ y2 = rd->currentY + rd->currentHeight +
+ rd->w->input.bottom;
- glPushMatrix ();
+ glPushMatrix();
glLoadIdentity();
(s->applyScreenTransform) (s, sa, output);
prepareXCoords(s, output, -sa->zTranslate);
- glDisableClientState (GL_TEXTURE_COORD_ARRAY);
- glEnable (GL_BLEND);
+ glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+ glEnable(GL_BLEND);
if (rd->resizeMode == ResizeModeFilled) {
- glColor4usv (rd->opt[RESIZE_DISPLAY_OPTION_FILL_COLOR].value.c);
- glRecti (x1, y2, x2, y1);
+ glColor4usv(rd->
+ opt[RESIZE_DISPLAY_OPTION_FILL_COLOR].
+ value.c);
+ glRecti(x1, y2, x2, y1);
}
/* This section draws the outline */
- glColor4usv (rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR].value.c);
- glLineWidth (2.0);
- glBegin (GL_LINE_LOOP);
- glVertex2i (x1, y1);
- glVertex2i (x2, y1);
- glVertex2i (x2, y2);
- glVertex2i (x1, y2);
- glEnd ();
+ glColor4usv(rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR].
+ value.c);
+ glLineWidth(2.0);
+ glBegin(GL_LINE_LOOP);
+ glVertex2i(x1, y1);
+ glVertex2i(x2, y1);
+ glVertex2i(x2, y2);
+ glVertex2i(x1, y2);
+ glEnd();
/* Clean up */
- glColor4usv (defaultColor);
- glDisable (GL_BLEND);
- glEnableClientState (GL_TEXTURE_COORD_ARRAY);
- glPopMatrix ();
+ glColor4usv(defaultColor);
+ glDisable(GL_BLEND);
+ glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+ glPopMatrix();
}
}
-static void resizeDonePaintScreen (CompScreen * s)
+static void resizeDonePaintScreen(CompScreen * s)
{
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
if (rd->resizeMode != ResizeModeNormal && rd->w) {
rd->lastWidth = rd->currentWidth;
rd->lastHeight = rd->currentHeight;
}
- UNWRAP (rs, s, donePaintScreen);
+ UNWRAP(rs, s, donePaintScreen);
(*s->donePaintScreen) (s);
- WRAP (rs, s, donePaintScreen, resizeDonePaintScreen);
+ WRAP(rs, s, donePaintScreen, resizeDonePaintScreen);
}
-static Bool resizeSetDisplayOption (CompDisplay *display,
- char *name,
- CompOptionValue *value)
+static Bool resizeSetDisplayOption(CompDisplay * display,
+ char *name, CompOptionValue * value)
{
CompOption *o;
int index;
- RESIZE_DISPLAY (display);
+ RESIZE_DISPLAY(display);
- o = compFindOption (rd->opt, NUM_OPTIONS (rd), name, &index);
+ o = compFindOption(rd->opt, NUM_OPTIONS(rd), name, &index);
if (!o)
- return FALSE;
+ return FALSE;
switch (index) {
case RESIZE_DISPLAY_OPTION_INITIATE:
- if (setDisplayAction (display, o, value))
+ if (setDisplayAction(display, o, value))
return TRUE;
break;
case RESIZE_DISPLAY_OPTION_OPACITY:
- if (compSetIntOption (o, value))
- {
+ if (compSetIntOption(o, value)) {
rd->resizeOpacity = (o->value.i * OPAQUE) / 100;
return TRUE;
}
break;
case RESIZE_DISPLAY_OPTION_OPACIFY_MIN_OPACITY:
- if (compSetIntOption (o, value))
- {
- rd->opacifyMinOpacity = (o->value.i * OPAQUE) / 100;
+ if (compSetIntOption(o, value)) {
+ rd->opacifyMinOpacity =
+ (o->value.i * OPAQUE) / 100;
return TRUE;
}
break;
case RESIZE_DISPLAY_OPTION_SYNC_WINDOW:
- if (compSetBoolOption (o, value))
+ if (compSetBoolOption(o, value))
return TRUE;
break;
case RESIZE_DISPLAY_OPTION_WARP_POINTER:
- if (compSetBoolOption (o, value))
+ if (compSetBoolOption(o, value))
return TRUE;
break;
case RESIZE_DISPLAY_OPTION_MODE:
- if (compSetStringOption (o, value)) {
+ if (compSetStringOption(o, value)) {
int i;
for (i = 0; i < o->rest.s.nString; i++)
- if (strcmp (resizeModes[i], o->value.s) == 0)
+ if (strcmp(resizeModes[i], o->value.s) ==
+ 0)
rd->resizeMode = (ResizeMode) i;
}
break;
case RESIZE_DISPLAY_OPTION_BORDER_COLOR:
case RESIZE_DISPLAY_OPTION_FILL_COLOR:
- compSetColorOption (o, value);
+ compSetColorOption(o, value);
break;
default:
break;
@@ -1116,16 +1161,16 @@ static Bool resizeSetDisplayOption (CompDisplay *display,
return FALSE;
}
-static void resizeDisplayInitOptions (ResizeDisplay *rd)
+static void resizeDisplayInitOptions(ResizeDisplay * rd)
{
CompOption *o;
o = &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE];
o->name = "initiate";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Initiate Window Resize");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Initiate Window Resize");
o->longDesc = N_("Start resizing window");
o->type = CompOptionTypeAction;
o->value.action.initiate = resizeInitiate;
@@ -1135,31 +1180,35 @@ o->shortDesc = N_("Initiate Window Resize");
o->value.action.type = CompBindingTypeButton;
o->value.action.state = CompActionStateInitButton;
o->value.action.button.modifiers =
- RESIZE_INITIATE_BUTTON_MODIFIERS_DEFAULT;
+ RESIZE_INITIATE_BUTTON_MODIFIERS_DEFAULT;
o->value.action.button.button = RESIZE_INITIATE_BUTTON_DEFAULT;
o->value.action.type |= CompBindingTypeKey;
o->value.action.state |= CompActionStateInitKey;
- o->value.action.key.modifiers = RESIZE_INITIATE_KEY_MODIFIERS_DEFAULT;
+ o->value.action.key.modifiers =
+ RESIZE_INITIATE_KEY_MODIFIERS_DEFAULT;
o->value.action.key.keysym =
- XStringToKeysym (RESIZE_INITIATE_KEY_DEFAULT);
+ XStringToKeysym(RESIZE_INITIATE_KEY_DEFAULT);
o = &rd->opt[RESIZE_DISPLAY_OPTION_WARP_POINTER];
o->name = "warp_pointer";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Warp pointer when starting a resize with mouse initiate combo.");
- o->longDesc = N_("If this is set, the pointer will be warped to the "
- "closest corner when you press start a resize.");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc =
+ N_
+ ("Warp pointer when starting a resize with mouse initiate combo.");
+ o->longDesc =
+ N_("If this is set, the pointer will be warped to the "
+ "closest corner when you press start a resize.");
o->type = CompOptionTypeBool;
o->value.b = RESIZE_WARP_POINTER_DEFAULT;
o = &rd->opt[RESIZE_DISPLAY_OPTION_OPACITY];
o->name = "opacity";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Opacity");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Opacity");
o->longDesc = N_("Opacity level of resizing windows");
o->type = CompOptionTypeInt;
o->value.i = RESIZE_OPACITY_DEFAULT;
@@ -1168,12 +1217,13 @@ o->shortDesc = N_("Opacity");
o = &rd->opt[RESIZE_DISPLAY_OPTION_OPACIFY_MIN_OPACITY];
o->name = "opacify_min_opacity";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Minimum opacity for opacify");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Minimum opacity for opacify");
o->longDesc =
- N_("Opacify only windows whose opacity is higher than this value");
+ N_
+ ("Opacify only windows whose opacity is higher than this value");
o->type = CompOptionTypeInt;
o->value.i = RESIZE_OPACIFY_MIN_OPACITY_DEFAULT;
o->rest.i.min = RESIZE_OPACIFY_MIN_OPACITY_MIN;
@@ -1181,36 +1231,39 @@ o->shortDesc = N_("Minimum opacity for opacify");
o = &rd->opt[RESIZE_DISPLAY_OPTION_SYNC_WINDOW];
o->name = "sync_window";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Repaints the window on each resize step");
- o->longDesc = N_("If this is set to true the window will repaint itself "
- "during resize, which may cause some lag.");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Repaints the window on each resize step");
+ o->longDesc =
+ N_("If this is set to true the window will repaint itself "
+ "during resize, which may cause some lag.");
o->type = CompOptionTypeBool;
o->value.b = RESIZE_SYNC_WINDOW_DEFAULT;
o = &rd->opt[RESIZE_DISPLAY_OPTION_MODE];
o->name = "resize_mode";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Resize Display Mode");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Resize Display Mode");
o->longDesc =
- N_("Select between normal, stretched texture, outline and filled "
- "outline mode.");
+ N_
+ ("Select between normal, stretched texture, outline and filled "
+ "outline mode.");
o->type = CompOptionTypeString;
- o->value.s = strdup (resizeModes[RESIZE_MODE_DEFAULT]);
+ o->value.s = strdup(resizeModes[RESIZE_MODE_DEFAULT]);
o->rest.s.string = resizeModes;
o->rest.s.nString = NUM_RESIZE_MODES;
o = &rd->opt[RESIZE_DISPLAY_OPTION_BORDER_COLOR];
o->name = "border_color";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Outline Color");
- o->longDesc = N_("Outline color for outline and filled outline mode");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Outline Color");
+ o->longDesc =
+ N_("Outline color for outline and filled outline mode");
o->type = CompOptionTypeColor;
o->value.c[0] = 0x2fff;
o->value.c[1] = 0x2fff;
@@ -1219,10 +1272,10 @@ o->shortDesc = N_("Outline Color");
o = &rd->opt[RESIZE_DISPLAY_OPTION_FILL_COLOR];
o->name = "fill_color";
- o->group=N_("");
-o->subGroup=N_("");
-o->displayHints="";
-o->shortDesc = N_("Fill Color");
+ o->group = N_("");
+ o->subGroup = N_("");
+ o->displayHints = "";
+ o->shortDesc = N_("Fill Color");
o->longDesc = N_("Fill color for filled outline mode");
o->type = CompOptionTypeColor;
o->value.c[0] = 0x2fff;
@@ -1231,156 +1284,156 @@ o->shortDesc = N_("Fill Color");
o->value.c[3] = 0x4fff;
}
-static CompOption *resizeGetDisplayOptions (CompDisplay * display, int *count)
+static CompOption *resizeGetDisplayOptions(CompDisplay * display,
+ int *count)
{
if (display) {
- RESIZE_DISPLAY (display);
+ RESIZE_DISPLAY(display);
- *count = NUM_OPTIONS (rd);
+ *count = NUM_OPTIONS(rd);
return rd->opt;
} else {
- ResizeDisplay * rd = malloc(sizeof(ResizeDisplay));
+ ResizeDisplay *rd = malloc(sizeof(ResizeDisplay));
resizeDisplayInitOptions(rd);
- *count = NUM_OPTIONS (rd);
+ *count = NUM_OPTIONS(rd);
return rd->opt;
}
}
-static Bool resizeInitDisplay (CompPlugin *p, CompDisplay *d)
+static Bool resizeInitDisplay(CompPlugin * p, CompDisplay * d)
{
ResizeDisplay *rd;
- int i;
+ int i;
- rd = malloc (sizeof (ResizeDisplay));
+ rd = malloc(sizeof(ResizeDisplay));
if (!rd)
return FALSE;
- rd->screenPrivateIndex = allocateScreenPrivateIndex (d);
+ rd->screenPrivateIndex = allocateScreenPrivateIndex(d);
if (rd->screenPrivateIndex < 0) {
- free (rd);
+ free(rd);
return FALSE;
}
rd->resizeMode = ResizeModeNormal;
rd->resizeOpacity = (RESIZE_OPACITY_DEFAULT * OPAQUE) / 100;
rd->opacifyMinOpacity =
- (RESIZE_OPACIFY_MIN_OPACITY_DEFAULT * OPAQUE) / 100;
+ (RESIZE_OPACIFY_MIN_OPACITY_DEFAULT * OPAQUE) / 100;
- resizeDisplayInitOptions (rd);
+ resizeDisplayInitOptions(rd);
rd->w = 0;
rd->releaseButton = 0;
for (i = 0; i < NUM_KEYS; i++)
- rd->key[i] = XKeysymToKeycode (d->display,
- XStringToKeysym (rKeys[i].name));
+ rd->key[i] = XKeysymToKeycode(d->display,
+ XStringToKeysym(rKeys[i].
+ name));
- WRAP (rd, d, handleEvent, resizeHandleEvent);
+ WRAP(rd, d, handleEvent, resizeHandleEvent);
d->privates[displayPrivateIndex].ptr = rd;
return TRUE;
}
-static void
-resizeFiniDisplay (CompPlugin *p,
- CompDisplay *d)
+static void resizeFiniDisplay(CompPlugin * p, CompDisplay * d)
{
- RESIZE_DISPLAY (d);
+ RESIZE_DISPLAY(d);
- freeScreenPrivateIndex (d, rd->screenPrivateIndex);
+ freeScreenPrivateIndex(d, rd->screenPrivateIndex);
- UNWRAP (rd, d, handleEvent);
+ UNWRAP(rd, d, handleEvent);
- free (rd);
+ free(rd);
}
-static Bool
-resizeInitScreen (CompPlugin *p,
- CompScreen *s)
+static Bool resizeInitScreen(CompPlugin * p, CompScreen * s)
{
ResizeScreen *rs;
- RESIZE_DISPLAY (s->display);
+ RESIZE_DISPLAY(s->display);
- rs = malloc (sizeof (ResizeScreen));
+ rs = malloc(sizeof(ResizeScreen));
if (!rs)
- return FALSE;
+ return FALSE;
rs->grabIndex = 0;
- rs->leftCursor = XCreateFontCursor (s->display->display, XC_left_side);
- rs->rightCursor = XCreateFontCursor (s->display->display, XC_right_side);
- rs->upCursor = XCreateFontCursor (s->display->display,
- XC_top_side);
- rs->upLeftCursor = XCreateFontCursor (s->display->display,
- XC_top_left_corner);
- rs->upRightCursor = XCreateFontCursor (s->display->display,
- XC_top_right_corner);
- rs->downCursor = XCreateFontCursor (s->display->display,
- XC_bottom_side);
- rs->downLeftCursor = XCreateFontCursor (s->display->display,
- XC_bottom_left_corner);
- rs->downRightCursor = XCreateFontCursor (s->display->display,
- XC_bottom_right_corner);
- rs->middleCursor = XCreateFontCursor (s->display->display, XC_fleur);
+ rs->leftCursor =
+ XCreateFontCursor(s->display->display, XC_left_side);
+ rs->rightCursor =
+ XCreateFontCursor(s->display->display, XC_right_side);
+ rs->upCursor = XCreateFontCursor(s->display->display, XC_top_side);
+ rs->upLeftCursor = XCreateFontCursor(s->display->display,
+ XC_top_left_corner);
+ rs->upRightCursor = XCreateFontCursor(s->display->display,
+ XC_top_right_corner);
+ rs->downCursor = XCreateFontCursor(s->display->display,
+ XC_bottom_side);
+ rs->downLeftCursor = XCreateFontCursor(s->display->display,
+ 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);
+ addScreenAction(s,
+ &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.
+ action);
- WRAP (rs, s, paintWindow, resizePaintWindow);
- WRAP (rs, s, preparePaintScreen, resizePreparePaintScreen);
- WRAP (rs, s, paintScreen, resizePaintScreen);
- WRAP (rs, s, paintTransformedScreen, resizePaintTransformedScreen);
- WRAP (rs, s, donePaintScreen, resizeDonePaintScreen);
+ WRAP(rs, s, paintWindow, resizePaintWindow);
+ WRAP(rs, s, preparePaintScreen, resizePreparePaintScreen);
+ WRAP(rs, s, paintScreen, resizePaintScreen);
+ WRAP(rs, s, paintTransformedScreen, resizePaintTransformedScreen);
+ WRAP(rs, s, donePaintScreen, resizeDonePaintScreen);
s->privates[rd->screenPrivateIndex].ptr = rs;
return TRUE;
}
-static void
-resizeFiniScreen (CompPlugin *p,
- CompScreen *s)
+static void resizeFiniScreen(CompPlugin * p, CompScreen * s)
{
- RESIZE_SCREEN (s);
- RESIZE_DISPLAY (s->display);
+ RESIZE_SCREEN(s);
+ RESIZE_DISPLAY(s->display);
- UNWRAP (rs, s, paintWindow);
- UNWRAP (rs, s, preparePaintScreen);
- UNWRAP (rs, s, paintScreen);
- UNWRAP (rs, s, paintTransformedScreen);
- UNWRAP (rs, s, donePaintScreen);
+ UNWRAP(rs, s, paintWindow);
+ UNWRAP(rs, s, preparePaintScreen);
+ UNWRAP(rs, s, paintScreen);
+ UNWRAP(rs, s, paintTransformedScreen);
+ UNWRAP(rs, s, donePaintScreen);
- removeScreenAction (s, &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.action);
+ removeScreenAction(s,
+ &rd->opt[RESIZE_DISPLAY_OPTION_INITIATE].value.
+ action);
- free (rs);
+ free(rs);
}
-static Bool
-resizeInit (CompPlugin *p)
+static Bool resizeInit(CompPlugin * p)
{
- displayPrivateIndex = allocateDisplayPrivateIndex ();
+ displayPrivateIndex = allocateDisplayPrivateIndex();
if (displayPrivateIndex < 0)
- return FALSE;
+ return FALSE;
return TRUE;
}
-static void
-resizeFini (CompPlugin *p)
+static void resizeFini(CompPlugin * p)
{
if (displayPrivateIndex >= 0)
- freeDisplayPrivateIndex (displayPrivateIndex);
+ freeDisplayPrivateIndex(displayPrivateIndex);
}
CompPluginFeature resizeFeatures[] = {
- {"resize"}
+ {"resize"}
};
CompPluginVTable resizeVTable = {
@@ -1393,22 +1446,21 @@ CompPluginVTable resizeVTable = {
resizeFiniDisplay,
resizeInitScreen,
resizeFiniScreen,
- 0, /* InitWindow */
- 0, /* FiniWindow */
+ 0, /* InitWindow */
+ 0, /* FiniWindow */
resizeGetDisplayOptions,
resizeSetDisplayOption,
- 0, /* GetScreenOptions */
- 0, /* SetScreenOption */
+ 0, /* GetScreenOptions */
+ 0, /* SetScreenOption */
NULL,
0,
- resizeFeatures,
- sizeof (resizeFeatures) / sizeof (resizeFeatures[0]),
+ resizeFeatures,
+ sizeof(resizeFeatures) / sizeof(resizeFeatures[0]),
BERYL_ABI_INFO,
"beryl-plugins"
};
-CompPluginVTable *
-getCompPluginInfo (void)
+CompPluginVTable *getCompPluginInfo(void)
{
return &resizeVTable;
}