gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-31 19:12:32 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: remove one level of pointers for the function SlideWindows

Browse Source 
The function does not need to be passed a array of pointer to windows
because it does not change content of the pointers. It is more efficient to
directly use an array of windows as the parameter, and simpler also.

As 'SlideWindow' is also concerned, it can be simplified and turned into
an inlinable function so the compiler can optimise it.

Took opportunity to de-CamelCase the name of the functions to comply with
the project's coding style.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2015-05-08 13:19:06 +02:00
committed by Carlos R. Mafra
parent 8fa16bef00
commit 784f6794e5
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dock.c
View File

@@ -3271,7 +3271,7 @@ void wDockTrackWindowLaunch(WDock *dock, Window window)
XMapWindow(dpy, aicon->icon->core->window);
aicon->launching = 1;
wAppIconPaint(aicon);
SlideWindow(aicon->icon->core->window, x0, y0, icon->x_pos, icon->y_pos);
slide_window(aicon->icon->core->window, x0, y0, icon->x_pos, icon->y_pos);
XUnmapWindow(dpy, aicon->icon->core->window);
wAppIconDestroy(aicon);
}
@@ -3834,15 +3834,15 @@ static void handleDockMove(WDock *dock, WAppIcon *aicon, XEvent *event)
break;
XUngrabPointer(dpy, CurrentTime);
if (dock->type == WM_DRAWER) {
Window *wins[dock->icon_count];
Window wins[dock->icon_count];
for (i = 0; i < dock->max_icons; i++) {
tmpaicon = dock->icon_array[i];
if (tmpaicon == NULL)
continue;
wins[ tmpaicon->xindex + (dock->on_right_side ? dock->icon_count - 1 : 0) ] = &tmpaicon->icon->core->window;
wins[ tmpaicon->xindex + (dock->on_right_side ? dock->icon_count - 1 : 0) ] = tmpaicon->icon->core->window;
}
SlideWindows(wins, dock->icon_count,
slide_windows(wins, dock->icon_count,
(dock->on_right_side ? x - (dock->icon_count - 1) * ICON_SIZE : x),
y,
(dock->on_right_side ? shad_x - (dock->icon_count - 1) * ICON_SIZE : shad_x),
@@ -4665,7 +4665,7 @@ void wSlideAppicons(WAppIcon **appicons, int n, int to_the_left)
{
int i;
int leftmost = -1, min_index = 9999, from_x = -1; // leftmost and from_x initialized to avoid warning
Window *wins[n];
Window wins[n];
WAppIcon *aicon;
if (n < 1)
@@ -4684,10 +4684,10 @@ void wSlideAppicons(WAppIcon **appicons, int n, int to_the_left)
for (i = 0; i < n; i++) {
aicon = appicons[i];
wins[aicon->xindex - min_index] = &aicon->icon->core->window;
wins[aicon->xindex - min_index] = aicon->icon->core->window;
}
aicon = appicons[leftmost];
SlideWindows(wins, n, from_x, aicon->y_pos, aicon->x_pos, aicon->y_pos);
slide_windows(wins, n, from_x, aicon->y_pos, aicon->x_pos, aicon->y_pos);
}