-
Notifications
You must be signed in to change notification settings - Fork 0
/
100_overlay_scrollbar_loading.patch
334 lines (305 loc) · 10.6 KB
/
100_overlay_scrollbar_loading.patch
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
322
323
324
325
326
327
328
329
330
331
332
333
334
## Description: enable overlay scrollbars
## Origin/Author: Andrea Cimitan <andrea.cimitan@canonical.com>
=== modified file 'gtk/gtkmain.c'
Index: gtk+2.0-2.24.4/gtk/gtkmain.c
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkmain.c 2011-05-17 22:38:32.790683626 +0200
+++ gtk+2.0-2.24.4/gtk/gtkmain.c 2011-05-17 22:38:33.078685054 +0200
@@ -752,6 +752,9 @@
_gtk_accel_map_init ();
_gtk_rc_init ();
+ ubuntu_gtk_scrolled_window_init ();
+ ubuntu_gtk_hscrollbar_init ();
+ ubuntu_gtk_vscrollbar_init ();
/* Set the 'initialized' flag.
*/
Index: gtk+2.0-2.24.4/gtk/gtkscrolledwindow.c
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkscrolledwindow.c 2011-05-17 22:37:27.946362079 +0200
+++ gtk+2.0-2.24.4/gtk/gtkscrolledwindow.c 2011-05-17 22:39:03.706836932 +0200
@@ -144,6 +144,8 @@
static guint signals[LAST_SIGNAL] = {0};
+static gboolean use_overlay_scrollbar = FALSE;
+
G_DEFINE_TYPE (GtkScrolledWindow, gtk_scrolled_window, GTK_TYPE_BIN)
static void
@@ -1030,7 +1032,7 @@
gtk_widget_style_get (widget, "scrollbars-within-bevel", &scrollbars_within_bevel, NULL);
- if (!scrollbars_within_bevel)
+ if (!scrollbars_within_bevel && use_overlay_scrollbar == FALSE)
{
gtk_scrolled_window_relative_allocation (widget, &relative_allocation);
@@ -1490,7 +1492,7 @@
if (scrolled_window->shadow_type != GTK_SHADOW_NONE)
{
- if (!scrollbars_within_bevel)
+ if (!scrollbars_within_bevel && use_overlay_scrollbar == FALSE)
{
child_allocation.x -= widget->style->xthickness;
child_allocation.width += 2 * widget->style->xthickness;
@@ -1542,7 +1544,7 @@
if (scrolled_window->shadow_type != GTK_SHADOW_NONE)
{
- if (!scrollbars_within_bevel)
+ if (!scrollbars_within_bevel && use_overlay_scrollbar == FALSE)
{
child_allocation.y -= widget->style->ythickness;
child_allocation.height += 2 * widget->style->ythickness;
@@ -1763,6 +1765,58 @@
}
/*
+ * ubuntu_gtk_scrolled_window_init:
+ *
+ * Initialize local use of the overlay-scrollbar module.
+ *
+ * If the module is installed, this code checks both a whitelist
+ * and a blacklist to decide whether to activate the replacement
+ * scrollbars.
+ *
+ * It is possible to force the feature to be disabled by setting
+ * the LIBOVERLAY_SCROLLBAR environment variable to either '0' or an
+ * empty value.
+ */
+void
+ubuntu_gtk_scrolled_window_init (void)
+{
+ static gboolean init_once = FALSE;
+
+ if (init_once == FALSE)
+ {
+ GModule *module = NULL;
+ gpointer symbol = NULL;
+
+ gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR");
+
+ /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value
+ and disable the feature in this case */
+ if (flag != NULL && (*flag == '\0' || *flag == '0'))
+ goto skip_loading;
+
+ /* default extension library to use for this release */
+ gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";
+
+ module = g_module_open (path, G_MODULE_BIND_LOCAL);
+ if (module == NULL)
+ goto skip_loading;
+
+ /* check the blacklist, in all cases */
+ if (g_module_symbol (module, "os_utils_is_blacklisted", &symbol))
+ {
+ gboolean (*os_utils_is_blacklisted) (const gchar*) = symbol;
+ if (os_utils_is_blacklisted (g_get_prgname ()) == TRUE)
+ goto skip_loading;
+ }
+
+ use_overlay_scrollbar = TRUE;
+
+skip_loading:
+ init_once = TRUE;
+ }
+}
+
+/*
* _gtk_scrolled_window_get_spacing:
* @scrolled_window: a scrolled window
*
@@ -1780,6 +1834,9 @@
class = GTK_SCROLLED_WINDOW_GET_CLASS (scrolled_window);
+ if (use_overlay_scrollbar)
+ return 0;
+
if (class->scrollbar_spacing >= 0)
return class->scrollbar_spacing;
else
Index: gtk+2.0-2.24.4/gtk/gtkscrolledwindow.h
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkscrolledwindow.h 2011-05-17 22:37:27.886361784 +0200
+++ gtk+2.0-2.24.4/gtk/gtkscrolledwindow.h 2011-05-17 22:38:33.082685078 +0200
@@ -127,6 +127,7 @@
void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window,
GtkWidget *child);
+void ubuntu_gtk_scrolled_window_init (void);
gint _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window);
Index: gtk+2.0-2.24.4/gtk/gtkhscrollbar.c
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkhscrollbar.c 2011-05-17 22:37:27.978362244 +0200
+++ gtk+2.0-2.24.4/gtk/gtkhscrollbar.c 2011-05-17 22:38:33.082685078 +0200
@@ -32,6 +32,9 @@
#include "gtkintl.h"
#include "gtkalias.h"
+static GtkWidget* (*os_scrollbar_new) (GtkOrientation, GtkAdjustment*) = NULL;
+static gboolean use_overlay_scrollbar = FALSE;
+
G_DEFINE_TYPE (GtkHScrollbar, gtk_hscrollbar, GTK_TYPE_SCROLLBAR)
static void
@@ -61,10 +64,70 @@
g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment),
NULL);
+ if (use_overlay_scrollbar)
+ return os_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
+
return g_object_new (GTK_TYPE_HSCROLLBAR,
"adjustment", adjustment,
NULL);
}
+/*
+ * ubuntu_gtk_hscrollbar_init:
+ *
+ * Initialize local use of the overlay-scrollbar module.
+ *
+ * If the module is installed, this code checks both a whitelist
+ * and a blacklist to decide whether to activate the remplacement
+ * scrollbars.
+ *
+ * It is possible to force the feature to be disabled by setting
+ * the LIBOVERLAY_SCROLLBAR environment variable to either '0' or an
+ * empty value.
+ */
+void
+ubuntu_gtk_hscrollbar_init (void)
+{
+ static gboolean init_once = FALSE;
+
+ if (init_once == FALSE)
+ {
+ GModule *module = NULL;
+ gpointer symbol = NULL;
+
+ gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR");
+
+ /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value
+ and disable the feature in this case */
+ if (flag != NULL && (*flag == '\0' || *flag == '0'))
+ goto skip_loading;
+
+ /* default extension library to use for this release */
+ gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";
+
+ module = g_module_open (path, G_MODULE_BIND_LOCAL);
+ if (module == NULL)
+ goto skip_loading;
+
+ /* check the blacklist, in all cases */
+ if (g_module_symbol (module, "os_utils_is_blacklisted", &symbol))
+ {
+ gboolean (*os_utils_is_blacklisted) (const gchar*) = symbol;
+ if (os_utils_is_blacklisted (g_get_prgname ()) == TRUE)
+ goto skip_loading;
+ }
+
+ /* all controls are positive: the feature can be activated now */
+ if (g_module_symbol (module, "os_scrollbar_new", &symbol))
+ {
+ os_scrollbar_new = symbol;
+ use_overlay_scrollbar = TRUE;
+ }
+
+skip_loading:
+ init_once = TRUE;
+ }
+}
+
#define __GTK_HSCROLLBAR_C__
#include "gtkaliasdef.c"
Index: gtk+2.0-2.24.4/gtk/gtkhscrollbar.h
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkhscrollbar.h 2011-05-17 22:37:27.862361665 +0200
+++ gtk+2.0-2.24.4/gtk/gtkhscrollbar.h 2011-05-17 22:38:33.082685078 +0200
@@ -62,7 +62,7 @@
GType gtk_hscrollbar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_hscrollbar_new (GtkAdjustment *adjustment);
-
+void ubuntu_gtk_hscrollbar_init (void);
G_END_DECLS
Index: gtk+2.0-2.24.4/gtk/gtkvscrollbar.c
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkvscrollbar.c 2011-05-17 22:37:27.906361887 +0200
+++ gtk+2.0-2.24.4/gtk/gtkvscrollbar.c 2011-05-17 22:38:33.082685078 +0200
@@ -32,6 +32,9 @@
#include "gtkintl.h"
#include "gtkalias.h"
+static GtkWidget* (*os_scrollbar_new) (GtkOrientation, GtkAdjustment*) = NULL;
+static gboolean use_overlay_scrollbar = FALSE;
+
/**
* SECTION:gtkvscrollbar
* @Short_description: A vertical scrollbar
@@ -75,10 +78,70 @@
g_return_val_if_fail (adjustment == NULL || GTK_IS_ADJUSTMENT (adjustment),
NULL);
+ if (use_overlay_scrollbar)
+ return os_scrollbar_new (GTK_ORIENTATION_VERTICAL, adjustment);
+
return g_object_new (GTK_TYPE_VSCROLLBAR,
"adjustment", adjustment,
NULL);
}
+/*
+ * ubuntu_gtk_vscrollbar_init:
+ *
+ * Initialize local use of the overlay-scrollbar module.
+ *
+ * If the module is installed, this code checks both a whitelist
+ * and a blacklist to decide whether to activate the remplacement
+ * scrollbars.
+ *
+ * It is possible to force the feature to be disabled by setting
+ * the LIBOVERLAY_SCROLLBAR environment variable to either '0' or an
+ * empty value.
+ */
+void
+ubuntu_gtk_vscrollbar_init (void)
+{
+ static gboolean init_once = FALSE;
+
+ if (init_once == FALSE)
+ {
+ GModule *module = NULL;
+ gpointer symbol = NULL;
+
+ gchar *flag = (gchar*) g_getenv ("LIBOVERLAY_SCROLLBAR");
+
+ /* check if LIBOVERLAY_SCROLLBAR is set to 0 or an empty value
+ and disable the feature in this case */
+ if (flag != NULL && (*flag == '\0' || *flag == '0'))
+ goto skip_loading;
+
+ /* default extension library to use for this release */
+ gchar *path = "/usr/lib/liboverlay-scrollbar-0.2.so.0";
+
+ module = g_module_open (path, G_MODULE_BIND_LOCAL);
+ if (module == NULL)
+ goto skip_loading;
+
+ /* check the blacklist, in all cases */
+ if (g_module_symbol (module, "os_utils_is_blacklisted", &symbol))
+ {
+ gboolean (*os_utils_is_blacklisted) (const gchar*) = symbol;
+ if (os_utils_is_blacklisted (g_get_prgname ()) == TRUE)
+ goto skip_loading;
+ }
+
+ /* all controls are positive: the feature can be activated now */
+ if (g_module_symbol (module, "os_scrollbar_new", &symbol))
+ {
+ os_scrollbar_new = symbol;
+ use_overlay_scrollbar = TRUE;
+ }
+
+skip_loading:
+ init_once = TRUE;
+ }
+}
+
#define __GTK_VSCROLLBAR_C__
#include "gtkaliasdef.c"
Index: gtk+2.0-2.24.4/gtk/gtkvscrollbar.h
===================================================================
--- gtk+2.0-2.24.4.orig/gtk/gtkvscrollbar.h 2011-05-17 22:37:27.958362141 +0200
+++ gtk+2.0-2.24.4/gtk/gtkvscrollbar.h 2011-05-17 22:38:33.082685078 +0200
@@ -68,7 +68,7 @@
GType gtk_vscrollbar_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_vscrollbar_new (GtkAdjustment *adjustment);
-
+void ubuntu_gtk_vscrollbar_init (void);
G_END_DECLS