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

Remove MINIATURIZE_ANIMATION_DELAY_{Z,F,T} tests

Browse Source 
We know that they are non-zero because we set their
values explicitly in wconfig.h.in, so there is no
point in checking them.
This commit is contained in:
Carlos R. Mafra
2009-10-10 19:22:31 +02:00
parent cda27758bc
commit 87161c5e0c
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/actions.c
View File

@@ -662,11 +662,7 @@ static void animateResizeFlip(WScreen * scr, int x, int y, int w, int h, int fx,
XGrabServer(dpy); XGrabServer(dpy);
XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin); XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin);
XFlush(dpy); XFlush(dpy);
#if (MINIATURIZE_ANIMATION_DELAY_F > 0)
wusleep(MINIATURIZE_ANIMATION_DELAY_F); wusleep(MINIATURIZE_ANIMATION_DELAY_F);
#else
wusleep(10);
#endif
XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin); XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin);
XUngrabServer(dpy); XUngrabServer(dpy);
@@ -729,11 +725,7 @@ animateResizeTwist(WScreen * scr, int x, int y, int w, int h, int fx, int fy, in
XGrabServer(dpy); XGrabServer(dpy);
XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin); XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin);
XFlush(dpy); XFlush(dpy);
#if (MINIATURIZE_ANIMATION_DELAY_T > 0)
wusleep(MINIATURIZE_ANIMATION_DELAY_T); wusleep(MINIATURIZE_ANIMATION_DELAY_T);
#else
wusleep(10);
#endif
XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin); XDrawLines(dpy, scr->root_win, scr->frame_gc, points, 5, CoordModeOrigin);
XUngrabServer(dpy); XUngrabServer(dpy);
@@ -775,11 +767,8 @@ static void animateResizeZoom(WScreen * scr, int x, int y, int w, int h, int fx,
(int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]); (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]);
} }
XFlush(dpy); XFlush(dpy);
#if (MINIATURIZE_ANIMATION_DELAY_Z > 0)
wusleep(MINIATURIZE_ANIMATION_DELAY_Z); wusleep(MINIATURIZE_ANIMATION_DELAY_Z);
#else
wusleep(10);
#endif
for (j = 0; j < FRAMES; j++) { for (j = 0; j < FRAMES; j++) {
XDrawRectangle(dpy, scr->root_win, scr->frame_gc, XDrawRectangle(dpy, scr->root_win, scr->frame_gc,
(int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]); (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]);
@@ -801,11 +790,8 @@ static void animateResizeZoom(WScreen * scr, int x, int y, int w, int h, int fx,
XDrawRectangle(dpy, scr->root_win, scr->frame_gc, (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]); XDrawRectangle(dpy, scr->root_win, scr->frame_gc, (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]);
} }
XFlush(dpy); XFlush(dpy);
#if (MINIATURIZE_ANIMATION_DELAY_Z > 0)
wusleep(MINIATURIZE_ANIMATION_DELAY_Z); wusleep(MINIATURIZE_ANIMATION_DELAY_Z);
#else
wusleep(10);
#endif
for (j = 0; j < FRAMES; j++) { for (j = 0; j < FRAMES; j++) {
XDrawRectangle(dpy, scr->root_win, scr->frame_gc, (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]); XDrawRectangle(dpy, scr->root_win, scr->frame_gc, (int)cx[j], (int)cy[j], (int)cw[j], (int)ch[j]);
} }

3
src/superfluous.c
View File

@@ -242,10 +242,7 @@ void DoKaboom(WScreen * scr, Window win, int x, int y)
} }
XFlush(dpy); XFlush(dpy);
#if (MINIATURIZE_ANIMATION_DELAY_Z > 0)
wusleep(MINIATURIZE_ANIMATION_DELAY_Z * 2); wusleep(MINIATURIZE_ANIMATION_DELAY_Z * 2);
#endif
} }
XFreePixmap(dpy, tmp); XFreePixmap(dpy, tmp);

2
src/wconfig.h.in
View File

@@ -233,7 +233,7 @@
/* max. time to spend doing animations in seconds. If the animation /* max. time to spend doing animations in seconds. If the animation
* time exceeds this value, it is immediately finished. Usefull for * time exceeds this value, it is immediately finished. Usefull for
* moments of high-load. * moments of high-load. DO NOT set *_DELAY_{Z,T,F} to zero!
*/ */
#define MAX_ANIMATION_TIME 1 #define MAX_ANIMATION_TIME 1
/* Zoom animation */ /* Zoom animation */