brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename from _bounce() to _focus().

Browse Source 
Fri May 26 14:55:07 2006  Søren Sandmann  <sandmann@redhat.com>

        * src/c-window.c (meta_comp_window_run_focus): Rename from
        _bounce() to _focus().
This commit is contained in:
Søren Sandmann 2006-05-26 18:59:15 +00:00 committed by Søren Sandmann Pedersen
parent db87abfb19
commit 83f82e5f28
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri May 26 14:55:07 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-window.c (meta_comp_window_run_focus): Rename from
_bounce() to _focus().
2006-05-26 Elijah Newren <newren gmail com> 2006-05-26 Elijah Newren <newren gmail com>
* src/display.c (meta_display_close): Fix a crash on exit/logout * src/display.c (meta_display_close): Fix a crash on exit/logout

40
src/c-window.c
View File

@ -150,7 +150,8 @@ has_counter (MetaCompWindow *comp_window)
g_print ("increasing counter\n"); g_print ("increasing counter\n");
ws_sync_counter_change (counter, 1); ws_sync_counter_change (counter, 1);
g_print ("counter value %lld\n", ws_sync_counter_query_value (counter)); g_print ("counter value %lld\n",
ws_sync_counter_query_value (counter));
} }
else else
{ {
@ -766,18 +767,7 @@ meta_comp_window_explode (MetaCompWindow *comp_window,
ExplodeInfo *info = g_new0 (ExplodeInfo, 1); ExplodeInfo *info = g_new0 (ExplodeInfo, 1);
if (!cm_drawable_node_get_viewable (comp_window->node)) if (!cm_drawable_node_get_viewable (comp_window->node))
{
#if 0
g_print ("%p wasn't even viewable to begin with\n", comp_window->node);
#endif
return; return;
}
else
{
#if 0
g_print ("%p is viewable\n", comp_window->node);
#endif
}
comp_window->animation_in_progress = TRUE; comp_window->animation_in_progress = TRUE;
@ -999,16 +989,16 @@ typedef struct
Model *model; Model *model;
MetaRectangle rect; MetaRectangle rect;
gdouble last_time; gdouble last_time;
} BounceInfo; } FocusInfo;
/* XXX HATE */ /* XXX HATE */
extern void get_patch_points (Model *model, CmPoint points[4][4]); extern void get_patch_points (Model *model, CmPoint points[4][4]);
extern void compute_window_rect (MetaWindow *window, MetaRectangle *rect); extern void compute_window_rect (MetaWindow *window, MetaRectangle *rect);
static gboolean static gboolean
update_bounce (gpointer data) update_focus (gpointer data)
{ {
BounceInfo *info = data; FocusInfo *info = data;
CmDrawableNode *node = (CmDrawableNode *)info->window->node; CmDrawableNode *node = (CmDrawableNode *)info->window->node;
gdouble elapsed = g_timer_elapsed (info->timer, NULL); gdouble elapsed = g_timer_elapsed (info->timer, NULL);
int i; int i;
@ -1036,10 +1026,10 @@ update_bounce (gpointer data)
} }
void void
meta_comp_window_bounce (MetaCompWindow *comp_window, meta_comp_window_run_focus (MetaCompWindow *comp_window,
MetaEffect *effect) MetaEffect *effect)
{ {
BounceInfo *info = g_new0 (BounceInfo, 1); FocusInfo *info = g_new0 (FocusInfo, 1);
MetaWindow *meta_window = MetaWindow *meta_window =
meta_display_lookup_x_window (comp_window->display, meta_display_lookup_x_window (comp_window->display,
WS_RESOURCE_XID (comp_window->drawable)); WS_RESOURCE_XID (comp_window->drawable));
@ -1052,13 +1042,15 @@ meta_comp_window_bounce (MetaCompWindow *comp_window,
compute_window_rect (meta_window, &info->rect); compute_window_rect (meta_window, &info->rect);
info->model = model_new (&info->rect, TRUE); info->model = model_new (&info->rect, TRUE);
g_idle_add (update_bounce, info); g_idle_add (update_focus, info);
} }
#endif void
meta_comp_window_run_restore (MetaCompWindow *comp_window,
#if 0 MetaEffect *effect)
#endif {
meta_effect_end (effect);
}
void void
meta_comp_window_freeze_stack (MetaCompWindow *comp_window) meta_comp_window_freeze_stack (MetaCompWindow *comp_window)
@ -1078,3 +1070,5 @@ meta_comp_window_stack_frozen (MetaCompWindow *comp_window)
return comp_window->stack_freeze_count > 0; return comp_window->stack_freeze_count > 0;
} }
#endif

8
src/c-window.h
View File

@ -50,8 +50,8 @@ void meta_comp_window_shrink (MetaCompWindow *comp_window,
MetaEffect *effect); MetaEffect *effect);
void meta_comp_window_unshrink (MetaCompWindow *comp_window, void meta_comp_window_unshrink (MetaCompWindow *comp_window,
MetaEffect *effect); MetaEffect *effect);
void meta_comp_window_bounce (MetaCompWindow *comp_window, void meta_comp_window_focus (MetaCompWindow *comp_window,
MetaEffect *effect); MetaEffect *effect);
void meta_comp_window_restack (MetaCompWindow *comp_window, void meta_comp_window_restack (MetaCompWindow *comp_window,
MetaCompWindow *above); MetaCompWindow *above);
void meta_comp_window_freeze_stack (MetaCompWindow *comp_window); void meta_comp_window_freeze_stack (MetaCompWindow *comp_window);
@ -59,7 +59,9 @@ void meta_comp_window_thaw_stack (MetaCompWindow *comp_window);
gboolean meta_comp_window_stack_frozen (MetaCompWindow *comp_window); gboolean meta_comp_window_stack_frozen (MetaCompWindow *comp_window);
void meta_comp_window_run_minimize (MetaCompWindow *window, void meta_comp_window_run_minimize (MetaCompWindow *window,
MetaEffect *effect); MetaEffect *effect);
void meta_comp_window_run_restore (MetaCompWindow *comp_window,
MetaEffect *effect);
#if 0 #if 0
void meta_comp_window_set_explode (MetaCompWindow *comp_window, void meta_comp_window_set_explode (MetaCompWindow *comp_window,
double level); double level);

7
src/compositor.c
View File

@ -130,13 +130,12 @@ do_effect (MetaEffect *effect,
meta_comp_window_run_minimize (window, effect); meta_comp_window_run_minimize (window, effect);
break; break;
#if 0
case META_EFFECT_RESTORE: case META_EFFECT_RESTORE:
meta_comp_window_unshrink (window, effect); meta_comp_window_run_restore (window, effect);
break; break;
#endif
case META_EFFECT_FOCUS: case META_EFFECT_FOCUS:
meta_comp_window_bounce (window, effect); meta_comp_window_run_focus (window, effect);
break; break;
case META_EFFECT_CLOSE: case META_EFFECT_CLOSE: