From: Christophe CURIS <christophe.cu...@free.fr>
(merge with 025923a6d80012c21e0fce6232ec18f8c7a9e142)
---
src/moveres.c | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/moveres.c b/src/moveres.c
index 0ad1a52..e00b3ed 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -589,15 +589,16 @@ typedef struct {
int omouseX, omouseY; /* old mouse position */
int mouseX, mouseY; /* last known position of the pointer */
- enum {SNAP_NONE,
- SNAP_LEFT,
- SNAP_RIGHT,
- SNAP_TOP,
- SNAP_BOTTOM,
- SNAP_TOPLEFT,
- SNAP_TOPRIGHT,
- SNAP_BOTTOMLEFT,
- SNAP_BOTTOMRIGHT
+ enum {
+ SNAP_NONE,
+ SNAP_LEFT,
+ SNAP_RIGHT,
+ SNAP_TOP,
+ SNAP_BOTTOM,
+ SNAP_TOPLEFT,
+ SNAP_TOPRIGHT,
+ SNAP_BOTTOMLEFT,
+ SNAP_BOTTOMRIGHT
} snap;
} MoveData;
@@ -1197,7 +1198,7 @@ updateWindowPosition(WWindow * wwin, MoveData * data,
Bool doResistance,
data->realY = newY;
}
-static void drawSnapFrame(WWindow *wwin, int direction)
+static void draw_snap_frame(WWindow *wwin, int direction)
{
WScreen *scr;
@@ -1239,7 +1240,7 @@ static void drawSnapFrame(WWindow *wwin, int direction)
}
}
-static int getSnapDirection(WScreen *scr, int x, int y)
+static int get_snap_direction(WScreen *scr, int x, int y)
{
if (x < 1) {
if (y < 1)
@@ -1262,7 +1263,7 @@ static int getSnapDirection(WScreen *scr, int x, int y)
return SNAP_NONE;
}
-static void doSnap(WWindow *wwin, MoveData *data, Bool opaqueMove)
+static void do_snap(WWindow *wwin, MoveData *data, Bool opaqueMove)
{
int directions;
WScreen *scr;
@@ -1273,7 +1274,7 @@ static void doSnap(WWindow *wwin, MoveData *data, Bool
opaqueMove)
/* erase frames */
if (!opaqueMove)
drawFrames(wwin, scr->selected_windows, data->realX -
wwin->frame_x, data->realY - wwin->frame_y);
- drawSnapFrame(wwin, data->snap);
+ draw_snap_frame(wwin, data->snap);
switch (data->snap) {
case SNAP_NONE:
@@ -1770,15 +1771,15 @@ int wMouseMoveWindow(WWindow * wwin, XEvent * ev)
if (IS_RESIZABLE(wwin) && wPreferences.window_snapping
&& wPreferences.no_autowrap) {
int snap_direction;
- snap_direction = getSnapDirection(scr,
moveData.mouseX, moveData.mouseY);
+ snap_direction = get_snap_direction(scr,
moveData.mouseX, moveData.mouseY);
if (moveData.snap != snap_direction) {
/* erase old frame */
if (moveData.snap)
- drawSnapFrame(wwin,
moveData.snap);
+ draw_snap_frame(wwin,
moveData.snap);
/* draw new frame */
if (snap_direction)
- drawSnapFrame(wwin,
snap_direction);
+ draw_snap_frame(wwin,
snap_direction);
moveData.snap = snap_direction;
}
}
@@ -1786,7 +1787,7 @@ int wMouseMoveWindow(WWindow * wwin, XEvent * ev)
if (started) {
/* erase snap frame */
if (moveData.snap)
- drawSnapFrame(wwin, moveData.snap);
+ draw_snap_frame(wwin, moveData.snap);
updateWindowPosition(wwin, &moveData,
scr->selected_windows ==
NULL
@@ -1795,7 +1796,7 @@ int wMouseMoveWindow(WWindow * wwin, XEvent * ev)
/* redraw snap frame */
if (moveData.snap)
- drawSnapFrame(wwin, moveData.snap);
+ draw_snap_frame(wwin, moveData.snap);
if (!warped && !wPreferences.no_autowrap) {
int oldWorkspace =
scr->current_workspace;
@@ -1886,7 +1887,7 @@ int wMouseMoveWindow(WWindow * wwin, XEvent * ev)
XEvent e;
if (moveData.snap)
- doSnap(wwin, &moveData, opaqueMove);
+ do_snap(wwin, &moveData, opaqueMove);
else if (!opaqueMove) {
drawFrames(wwin, scr->selected_windows,
moveData.realX -
wwin->frame_x, moveData.realY - wwin->frame_y);
--
2.1.1
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
