nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better iconify animation code. now it is time limited even under heavy load or whatever. yay

Browse source
This commit is contained in:
Dana Jansens 2007-05-05 14:36:41 +00:00
parent cf67851d6d
commit 48a4eafb42
2 changed files with 86 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
openbox/frame.c
View file

@ -27,6 +27,7 @@
#include "mainloop.h" #include "mainloop.h"
#include "focus.h" #include "focus.h"
#include "moveresize.h" #include "moveresize.h"
#include "screen.h"
#include "render/theme.h" #include "render/theme.h"
#define PLATE_EVENTMASK (SubstructureRedirectMask | FocusChangeMask) #define PLATE_EVENTMASK (SubstructureRedirectMask | FocusChangeMask)
@ -41,8 +42,8 @@
from the frame. */ from the frame. */
#define INNER_EVENTMASK (ButtonPressMask) #define INNER_EVENTMASK (ButtonPressMask)
#define FRAME_ANIMATE_ICONIFY_STEPS 20 #define FRAME_ANIMATE_ICONIFY_TIME 150000 /* .15 seconds */
#define FRAME_ANIMATE_ICONIFY_TIME (G_USEC_PER_SEC/5) #define FRAME_ANIMATE_ICONIFY_STEP_TIME (G_USEC_PER_SEC / 30) /* 30 Hz */
#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \ #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
f->cbwidth_y) f->cbwidth_y)
@ -480,7 +481,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
self->client->area.height); self->client->area.height);
} }
if (!fake && !self->iconify_animation_step) { if (!fake && !self->iconify_animation_going) {
/* move and resize the top level frame. /* move and resize the top level frame.
shading can change without being moved or resized. shading can change without being moved or resized.
@ -840,7 +841,7 @@ ObFrameContext frame_context(ObClient *client, Window win)
if (client == NULL) return OB_FRAME_CONTEXT_NONE; if (client == NULL) return OB_FRAME_CONTEXT_NONE;
self = client->frame; self = client->frame;
if (self->iconify_animation_step) return OB_FRAME_CONTEXT_NONE; if (self->iconify_animation_going) return OB_FRAME_CONTEXT_NONE;
if (win == client->window) { if (win == client->window) {
/* conceptually, this is the desktop, as far as users are /* conceptually, this is the desktop, as far as users are
@ -1035,13 +1036,28 @@ void frame_flash_stop(ObFrame *self)
self->flashing = FALSE; self->flashing = FALSE;
} }
static gulong frame_animate_iconify_time_left(ObFrame *self,
const GTimeVal *now)
{
glong sec, usec;
sec = self->iconify_animation_end.tv_sec - now->tv_sec;
usec = self->iconify_animation_end.tv_usec - now->tv_usec;
if (usec < 0) {
usec += G_USEC_PER_SEC;
sec--;
}
/* no negative values */
return MAX(sec * G_USEC_PER_SEC + usec, 0);
}
static gboolean frame_animate_iconify(gpointer p) static gboolean frame_animate_iconify(gpointer p)
{ {
ObFrame *self = p; ObFrame *self = p;
gint step = self->iconify_animation_step;
gint absstep, nextstep;
gint x, y, w, h; gint x, y, w, h;
gint iconx, icony, iconw; gint iconx, icony, iconw;
GTimeVal now;
gulong time;
gboolean iconifying;
if (self->client->icon_geometry.width == 0) { if (self->client->icon_geometry.width == 0) {
/* there is no icon geometry set so just go straight down */ /* there is no icon geometry set so just go straight down */
@ -1055,12 +1071,13 @@ static gboolean frame_animate_iconify(gpointer p)
iconw = self->client->icon_geometry.width; iconw = self->client->icon_geometry.width;
} }
if (step >= 0) iconifying = self->iconify_animation_going > 0;
absstep = FRAME_ANIMATE_ICONIFY_STEPS - step + 1;
else
absstep = FRAME_ANIMATE_ICONIFY_STEPS + step + 1;
if (step >= 0) { /* how far do we have left to go ? */
g_get_current_time(&now);
time = frame_animate_iconify_time_left(self, &now);
if (time == 0 || iconifying) {
/* start where the frame is supposed to be */ /* start where the frame is supposed to be */
x = self->area.x; x = self->area.x;
y = self->area.y; y = self->area.y;
@ -1074,61 +1091,85 @@ static gboolean frame_animate_iconify(gpointer p)
h = self->innersize.top; /* just the titlebar */ h = self->innersize.top; /* just the titlebar */
} }
if (step != 0) { if (time > 0) {
gint dx, dy, dw; glong dx, dy, dw;
glong elapsed;
dx = self->area.x - iconx; dx = self->area.x - iconx;
dy = self->area.y - icony; dy = self->area.y - icony;
dw = self->area.width - self->bwidth * 2 - iconw; dw = self->area.width - self->bwidth * 2 - iconw;
/* if restoring, we move in the opposite direction */ /* if restoring, we move in the opposite direction */
if (step < 0) { dx = -dx; dy = -dy; dw = -dw; } if (!iconifying) { dx = -dx; dy = -dy; dw = -dw; }
x = x - dx / FRAME_ANIMATE_ICONIFY_STEPS * absstep;
y = y - dy / FRAME_ANIMATE_ICONIFY_STEPS * absstep; elapsed = FRAME_ANIMATE_ICONIFY_TIME - time;
w = w - dw / FRAME_ANIMATE_ICONIFY_STEPS * absstep; x = x - (dx * elapsed) / FRAME_ANIMATE_ICONIFY_TIME;
y = y - (dy * elapsed) / FRAME_ANIMATE_ICONIFY_TIME;
w = w - (dw * elapsed) / FRAME_ANIMATE_ICONIFY_TIME;
h = self->innersize.top; /* just the titlebar */ h = self->innersize.top; /* just the titlebar */
} }
/* move one step forward */ if (time == 0) {
self->iconify_animation_step = step + (step < 0 ? 1 : (step > 0 ? -1 : 0)); /* call the callback when it's done */
if (self->iconify_animation_cb)
/* call the callback when it's done */
if (step == 0 && self->iconify_animation_cb)
self->iconify_animation_cb(self->iconify_animation_data); self->iconify_animation_cb(self->iconify_animation_data);
/* we're not animating any more ! */
self->iconify_animation_going = 0;
}
/* move to the next spot (after the callback for the animation ending) */ /* move to the next spot (after the callback for the animation ending) */
XMoveResizeWindow(ob_display, self->window, x, y, w, h); XMoveResizeWindow(ob_display, self->window, x, y, w, h);
XFlush(ob_display); XFlush(ob_display);
return step != 0; /* repeat until step is 0 */ return time > 0; /* repeat until we're out of time */
} }
void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying, void frame_begin_iconify_animation(ObFrame *self, gboolean iconifying,
ObFrameIconifyAnimateFunc callback, ObFrameIconifyAnimateFunc callback,
gpointer data) gpointer data)
{ {
if (iconifying) { gulong time;
if (self->iconify_animation_step == 0) /* wasnt doing anything */ gboolean start_timer = TRUE;
self->iconify_animation_step = FRAME_ANIMATE_ICONIFY_STEPS; gboolean set_end = TRUE;
else if (self->iconify_animation_step < 0) /* was deiconifying */ GTimeVal now;
self->iconify_animation_step =
FRAME_ANIMATE_ICONIFY_STEPS + self->iconify_animation_step; /* if there is no titlebar, just don't animate for now
} else { XXX it would be nice tho.. */
if (self->iconify_animation_step == 0) /* wasnt doing anything */ if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR)) {
self->iconify_animation_step = -FRAME_ANIMATE_ICONIFY_STEPS; if (callback) callback(data);
else if (self->iconify_animation_step > 0) /* was iconifying */ return;
self->iconify_animation_step =
-FRAME_ANIMATE_ICONIFY_STEPS + self->iconify_animation_step;
} }
/* get the current time */
g_get_current_time(&now);
/* get how long until the end */
time = FRAME_ANIMATE_ICONIFY_TIME;
if (self->iconify_animation_going) {
if (!!iconifying != (self->iconify_animation_going > 0)) {
/* animation was already going on in the opposite direction */
time = time - frame_animate_iconify_time_left(self, &now);
} else
/* animation was already going in the same direction */
set_end = FALSE;
start_timer = FALSE;
}
self->iconify_animation_going = iconifying ? 1 : -1;
self->iconify_animation_cb = callback; self->iconify_animation_cb = callback;
self->iconify_animation_data = data; self->iconify_animation_data = data;
if (self->iconify_animation_step == FRAME_ANIMATE_ICONIFY_STEPS || /* set the ending time */
self->iconify_animation_step == -FRAME_ANIMATE_ICONIFY_STEPS) if (set_end) {
{ self->iconify_animation_end.tv_sec = now.tv_sec;
self->iconify_animation_end.tv_usec = now.tv_usec;
g_time_val_add(&self->iconify_animation_end, time);
}
if (start_timer) {
ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify, ob_main_loop_timeout_remove_data(ob_main_loop, frame_animate_iconify,
self, FALSE); self, FALSE);
ob_main_loop_timeout_add(ob_main_loop, ob_main_loop_timeout_add(ob_main_loop,
FRAME_ANIMATE_ICONIFY_TIME / FRAME_ANIMATE_ICONIFY_STEP_TIME,
FRAME_ANIMATE_ICONIFY_STEPS,
frame_animate_iconify, self, frame_animate_iconify, self,
g_direct_equal, NULL); g_direct_equal, NULL);
/* do the first step */ /* do the first step */

12
openbox/frame.h
View file

@ -145,14 +145,12 @@ struct _ObFrame
gboolean flash_on; gboolean flash_on;
GTimeVal flash_end; GTimeVal flash_end;
/*! The step which the client is currently in for animating iconify and /*! Is the frame currently in an animation for iconify or restore.
restore. 0 means that it is not animating. > 0 means it is animating an iconify.
0 means that it is not animating. FRAME_ANIMATE_ICONIFY_STEPS is the < 0 means it is animating a restore.
first step for iconifying, and -FRAME_ANIMATE_ICONIFY_STEPS is the
forst step for restoring. It counts towards 0 either way. Visually,
+x == -(FRAME_ANIMATE_ICONIFY_STEPS-x+1)
*/ */
gint iconify_animation_step; gint iconify_animation_going;
GTimeVal iconify_animation_end;
ObFrameIconifyAnimateFunc iconify_animation_cb; ObFrameIconifyAnimateFunc iconify_animation_cb;
gpointer iconify_animation_data; gpointer iconify_animation_data;
}; };