1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
|
diff --git a/gtk/window-decorator/decorator.c b/gtk/window-decorator/decorator.c
index a119795..3c56880 100644
--- a/gtk/window-decorator/decorator.c
+++ b/gtk/window-decorator/decorator.c
@@ -216,13 +216,7 @@ update_event_windows (WnckWindow *win)
WNCK_WINDOW_ACTION_CLOSE,
WNCK_WINDOW_ACTION_MAXIMIZE,
WNCK_WINDOW_ACTION_MINIMIZE,
- 0,
- WNCK_WINDOW_ACTION_SHADE,
- WNCK_WINDOW_ACTION_ABOVE,
- WNCK_WINDOW_ACTION_STICK,
- WNCK_WINDOW_ACTION_UNSHADE,
- WNCK_WINDOW_ACTION_ABOVE,
- WNCK_WINDOW_ACTION_UNSTICK
+ 0
};
/* Pixmap mode - if a box was set and we no longer need it unmap its window */
@@ -1061,7 +1055,7 @@ populate_frame_actions (decor_t *d)
return frame_actions;
WnckWindowActions win_actions = wnck_window_get_actions (d->win);
- const unsigned int n_action_bits = 16;
+ const unsigned int n_action_bits = 10;
unsigned int i;
struct typestrings {
unsigned int decor_flag;
@@ -1077,13 +1071,7 @@ populate_frame_actions (decor_t *d)
{ DECOR_WINDOW_ACTION_MAXIMIZE_VERT, WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY },
{ DECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ, WNCK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY },
{ DECOR_WINDOW_ACTION_UNMAXIMIZE_VERT, WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY },
- { DECOR_WINDOW_ACTION_SHADE, WNCK_WINDOW_ACTION_SHADE },
- { DECOR_WINDOW_ACTION_UNSHADE, WNCK_WINDOW_ACTION_UNSHADE },
- { DECOR_WINDOW_ACTION_STICK, WNCK_WINDOW_ACTION_STICK },
- { DECOR_WINDOW_ACTION_UNSTICK, WNCK_WINDOW_ACTION_UNSTICK },
- { DECOR_WINDOW_ACTION_FULLSCREEN, WNCK_WINDOW_ACTION_FULLSCREEN },
- { DECOR_WINDOW_ACTION_ABOVE, WNCK_WINDOW_ACTION_ABOVE },
- { DECOR_WINDOW_ACTION_BELOW, WNCK_WINDOW_ACTION_BELOW },
+ { DECOR_WINDOW_ACTION_FULLSCREEN, WNCK_WINDOW_ACTION_FULLSCREEN }
};
for (i = 0; i < n_action_bits; ++i)
diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index 5752176..be7d545 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -276,140 +276,6 @@ menu_button_event (WnckWindow *win,
}
}
-void
-shade_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_SHADE];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_SHADE, 1, _("Shade"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- {
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_shade (win);
- }
- break;
- default:
- break;
- }
-}
-
-void
-above_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_ABOVE];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_ABOVE, 1, _("Make Above"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_make_above (win);
- break;
- default:
- break;
- }
-}
-
-void
-stick_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_STICK];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_STICK, 1, _("Stick"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_stick (win);
- break;
- default:
- break;
- }
-}
-
-void
-unshade_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_UNSHADE];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_UNSHADE, 1, _("Unshade"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_unshade (win);
- break;
- default:
- break;
- }
-}
-
-void
-unabove_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_UNABOVE];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_UNABOVE, 1, _("Unmake Above"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_unmake_above (win);
- break;
- default:
- break;
- }
-}
-
-void
-unstick_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type)
-{
- decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
- guint state = d->button_states[BUTTON_UNSTICK];
-
- common_button_event (win, gtkwd_event, gtkwd_type,
- BUTTON_UNSTICK, 1, _("Unstick"));
-
- switch (gtkwd_type) {
- case GButtonRelease:
- if (gtkwd_event->button == 1)
- if (state == BUTTON_EVENT_ACTION_STATE)
- wnck_window_unstick (win);
- break;
- default:
- break;
- }
-}
-
static void
handle_title_button_event (WnckWindow *win,
int action,
diff --git a/gtk/window-decorator/gtk-window-decorator.h b/gtk/window-decorator/gtk-window-decorator.h
index b7d579b..6bf5d31 100644
--- a/gtk/window-decorator/gtk-window-decorator.h
+++ b/gtk/window-decorator/gtk-window-decorator.h
@@ -130,13 +130,7 @@ extern struct _cursor cursor[3][3];
#define BUTTON_MAX 1
#define BUTTON_MIN 2
#define BUTTON_MENU 3
-#define BUTTON_SHADE 4
-#define BUTTON_ABOVE 5
-#define BUTTON_STICK 6
-#define BUTTON_UNSHADE 7
-#define BUTTON_UNABOVE 8
-#define BUTTON_UNSTICK 9
-#define BUTTON_NUM 10
+#define BUTTON_NUM 4
struct _pos {
int x, y, w, h;
@@ -540,35 +534,6 @@ menu_button_event (WnckWindow *win,
decor_event_type gtkwd_type);
void
-shade_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-
-void
-above_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-
-void
-stick_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-void
-unshade_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-
-void
-unabove_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-
-void
-unstick_button_event (WnckWindow *win,
- decor_event *gtkwd_event,
- decor_event_type gtkwd_type);
-
-void
title_event (WnckWindow *win,
decor_event *gtkwd_event,
decor_event_type gtkwd_type);
diff --git a/gtk/window-decorator/gwd-theme-cairo.c b/gtk/window-decorator/gwd-theme-cairo.c
index e6da481..85f4202 100644
--- a/gtk/window-decorator/gwd-theme-cairo.c
+++ b/gtk/window-decorator/gwd-theme-cairo.c
@@ -495,12 +495,6 @@ button_present (decor_t *decor,
break;
case BUTTON_MENU:
- case BUTTON_SHADE:
- case BUTTON_ABOVE:
- case BUTTON_STICK:
- case BUTTON_UNSHADE:
- case BUTTON_UNABOVE:
- case BUTTON_UNSTICK:
break;
default:
diff --git a/gtk/window-decorator/gwd-theme-metacity.c b/gtk/window-decorator/gwd-theme-metacity.c
index 4ec5277..a0bc39c 100644
--- a/gtk/window-decorator/gwd-theme-metacity.c
+++ b/gtk/window-decorator/gwd-theme-metacity.c
@@ -95,18 +95,6 @@ meta_button_state_for_button_type (decor_t *decor,
return meta_button_state (decor->button_states[BUTTON_MIN]);
case META_BUTTON_TYPE_MENU:
return meta_button_state (decor->button_states[BUTTON_MENU]);
- case META_BUTTON_TYPE_SHADE:
- return meta_button_state (decor->button_states[BUTTON_SHADE]);
- case META_BUTTON_TYPE_ABOVE:
- return meta_button_state (decor->button_states[BUTTON_ABOVE]);
- case META_BUTTON_TYPE_STICK:
- return meta_button_state (decor->button_states[BUTTON_STICK]);
- case META_BUTTON_TYPE_UNSHADE:
- return meta_button_state (decor->button_states[BUTTON_UNSHADE]);
- case META_BUTTON_TYPE_UNABOVE:
- return meta_button_state (decor->button_states[BUTTON_UNABOVE]);
- case META_BUTTON_TYPE_UNSTICK:
- return meta_button_state (decor->button_states[BUTTON_UNSTICK]);
default:
break;
}
@@ -553,18 +541,6 @@ button_type_to_meta_button_type (gint button_type)
return META_BUTTON_TYPE_MAXIMIZE;
case BUTTON_CLOSE:
return META_BUTTON_TYPE_CLOSE;
- case BUTTON_SHADE:
- return META_BUTTON_TYPE_SHADE;
- case BUTTON_ABOVE:
- return META_BUTTON_TYPE_ABOVE;
- case BUTTON_STICK:
- return META_BUTTON_TYPE_STICK;
- case BUTTON_UNSHADE:
- return META_BUTTON_TYPE_UNSHADE;
- case BUTTON_UNABOVE:
- return META_BUTTON_TYPE_UNABOVE;
- case BUTTON_UNSTICK:
- return META_BUTTON_TYPE_UNSTICK;
default:
break;
}
diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
index cc43f65..4ac1483 100644
--- a/gtk/window-decorator/wnck.c
+++ b/gtk/window-decorator/wnck.c
@@ -667,13 +667,7 @@ window_opened (WnckScreen *screen,
close_button_event,
max_button_event,
min_button_event,
- menu_button_event,
- shade_button_event,
- above_button_event,
- stick_button_event,
- unshade_button_event,
- unabove_button_event,
- unstick_button_event
+ menu_button_event
};
d = calloc (1, sizeof (decor_t));
|