]>
Commit | Line | Data |
---|---|---|
cb85dbc1 | 1 | --- wobbly.c 2006-02-16 23:17:25.000000000 +0000 |
2 | +++ plugins/wobbly.c 2006-02-17 14:59:30.000000000 +0000 | |
3 | @@ -1687,6 +1687,7 @@ | |
4 | ||
5 | if (ww->wobbly) | |
6 | { | |
7 | + damagePendingOnScreen (w->screen); //aa | |
8 | if (ww->wobbly & (WobblyInitial | WobblyVelocity)) | |
9 | { | |
10 | model = ww->model; | |
11 | @@ -1958,6 +1959,7 @@ | |
12 | } | |
13 | vertices -= 2; | |
14 | glTexCoordPointer (2, GL_FLOAT, stride, vertices); | |
15 | + damagePendingOnScreen (w->screen); //aa | |
16 | } | |
17 | ||
18 | glDrawElements (GL_QUADS, w->vCount, GL_UNSIGNED_SHORT, w->indices); | |
19 | @@ -1965,7 +1967,7 @@ | |
20 | else | |
21 | { | |
22 | WOBBLY_SCREEN (w->screen); | |
23 | - | |
24 | + damagePendingOnScreen (w->screen); //aa | |
25 | UNWRAP (ws, w->screen, drawWindowGeometry); | |
26 | (*w->screen->drawWindowGeometry) (w); | |
27 | WRAP (ws, w->screen, drawWindowGeometry, wobblyDrawWindowGeometry); | |
28 | @@ -1985,6 +1987,7 @@ | |
29 | ||
30 | if (ww->wobbly) | |
31 | { | |
32 | + damagePendingOnScreen (w->screen); //aa | |
33 | if (mask & PAINT_WINDOW_SOLID_MASK) | |
34 | return FALSE; | |
35 | ||
36 | @@ -2021,6 +2024,7 @@ | |
37 | ||
38 | if (ww->model) | |
39 | { | |
40 | + damagePendingOnScreen (w->screen); //aa | |
41 | modelInitObjects (ww->model, | |
42 | WIN_X (w), WIN_Y (w), WIN_W (w), WIN_H (w)); | |
43 | ||
44 | @@ -2047,6 +2051,7 @@ | |
45 | ||
46 | if (ww->grabbed && ww->model) | |
47 | modelUpdateSnapping (w, ww->model); | |
48 | + damagePendingOnScreen (w->screen); //aa | |
49 | } | |
50 | } | |
51 | } | |
52 | @@ -2067,12 +2072,13 @@ | |
53 | ||
54 | if (ww->grabbed && ww->model) | |
55 | { | |
56 | + damagePendingOnScreen (w->screen); //aa | |
57 | if (modelDisableSnapping (w, ww->model)) | |
58 | { | |
59 | ww->wobbly |= WobblyInitial; | |
60 | ws->wobblyWindows |= ww->wobbly; | |
61 | ||
62 | - damagePendingOnScreen (w->screen); | |
63 | + damagePendingOnScreen (w->screen); | |
64 | } | |
65 | } | |
66 | } | |
67 | @@ -2150,6 +2156,7 @@ | |
68 | region.extents.x2 = ww->model->bottomRight.x + 0.5f; | |
69 | region.extents.y2 = ww->model->bottomRight.y + 0.5f; | |
70 | ||
71 | + damagePendingOnScreen (w->screen); //aa | |
72 | damageScreenRegion (w->screen, ®ion); | |
73 | ||
74 | return TRUE; | |
75 | @@ -2217,10 +2224,11 @@ | |
76 | WIN_X (w), WIN_Y (w), | |
77 | WIN_W (w), WIN_H (w)); | |
78 | ||
79 | - /* | |
80 | + /* | |
81 | ww->wobbly |= WobblyInitial; | |
82 | ws->wobblyWindows |= ww->wobbly; | |
83 | - */ | |
84 | + */ | |
85 | + damagePendingOnScreen (w->screen); //aa | |
86 | } | |
87 | ||
88 | if (ww->model->scale.x != 1.0f || ww->model->scale.y != 1.0f) | |
89 | @@ -2260,6 +2268,7 @@ | |
90 | ||
91 | if (ww->model) | |
92 | { | |
93 | + damagePendingOnScreen (w->screen); //aa | |
94 | if (ww->grabbed) | |
95 | { | |
96 | ww->model->anchorObject->position.x += dx; | |
97 | @@ -2367,6 +2376,7 @@ | |
98 | ww->wobbly |= WobblyInitial; | |
99 | ws->wobblyWindows |= ww->wobbly; | |
100 | ||
101 | + | |
102 | damagePendingOnScreen (w->screen); | |
103 | } | |
104 | ||
105 | @@ -2392,6 +2402,7 @@ | |
106 | if (ws->wobblyWindows) | |
107 | mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK; | |
108 | ||
109 | + damagePendingOnScreen (ws); //aa | |
110 | UNWRAP (ws, s, paintScreen); | |
111 | status = (*s->paintScreen) (s, sAttrib, region, mask); | |
112 | WRAP (ws, s, paintScreen, wobblyPaintScreen); | |
113 | @@ -2461,6 +2472,7 @@ | |
114 | ws->focusEffect = WobblyEffectNone; | |
115 | ||
116 | wobblyScreenInitOptions (ws, s->display->display); | |
117 | + damagePendingOnScreen (ws); //aa | |
118 | ||
119 | WRAP (ws, s, preparePaintScreen, wobblyPreparePaintScreen); | |
120 | WRAP (ws, s, donePaintScreen, wobblyDonePaintScreen); | |
121 | @@ -2487,6 +2499,7 @@ | |
122 | WOBBLY_SCREEN (s); | |
123 | ||
124 | freeWindowPrivateIndex (s, ws->windowPrivateIndex); | |
125 | + damagePendingOnScreen (ws); //aa | |
126 | ||
127 | free (ws->opt[WOBBLY_SCREEN_OPTION_MAP_EFFECT].value.s); | |
128 | free (ws->opt[WOBBLY_SCREEN_OPTION_FOCUS_EFFECT].value.s); | |
129 | @@ -2533,9 +2546,10 @@ | |
130 | CompWindow *w) | |
131 | { | |
132 | WOBBLY_WINDOW (w); | |
133 | - | |
134 | + | |
135 | if (ww->model) | |
136 | { | |
137 | + damagePendingOnScreen (w->screen); //aa | |
138 | free (ww->model->objects); | |
139 | free (ww->model); | |
140 | } |