summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-01-29 13:51:37 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-01-29 13:51:37 +0100
commit6987d74bb42f08badbe3129071379e33e6318c22 (patch)
treeb64395cd6f1a8e08c734a0c28cd941f09d3e82cd
parente5c77b593d0f0f5b062fc507f4ca2e332f958b10 (diff)
hey! I'm a commit, a update stuff and do things
-rwxr-xr-xbench_efl8
-rwxr-xr-xbuild-box.sh10
-rwxr-xr-xbuild-fcts.sh5
-rw-r--r--clang-flags.conf1
-rwxr-xr-xefl-lcov14
-rw-r--r--gtkrc420
6 files changed, 452 insertions, 6 deletions
diff --git a/bench_efl b/bench_efl
new file mode 100755
index 0000000..8e00711
--- /dev/null
+++ b/bench_efl
@@ -0,0 +1,8 @@
1#! /bin/bash
2make || exit 1
3# rm -fr benchmark
4make benchmark 2>/dev/null
5make benchmark 2>/dev/null
6make benchmark 2>/dev/null
7cd benchmark
8for I in *.gnuplot; do gnuplot $I; done
diff --git a/build-box.sh b/build-box.sh
index 4e66ed1..5f38436 100755
--- a/build-box.sh
+++ b/build-box.sh
@@ -35,9 +35,9 @@ function build_tools() {
35 build "tools/elm-theme-viewer" "" 35 build "tools/elm-theme-viewer" ""
36 build "tools/exactness" "" 36 build "tools/exactness" ""
37 build "tools/expedite" "" 37 build "tools/expedite" ""
38 build "tools/erigo" "" 38 build "tools/eflete" "--enable-enventor"
39 build "tools/edi" "" 39 build "tools/edi" ""
40 build "devs/jackdanielz/espion" "" 40 build "tools/erigo" ""
41} 41}
42 42
43function build_games() { 43function build_games() {
@@ -46,14 +46,15 @@ function build_games() {
46} 46}
47 47
48function build_extra() { 48function build_extra() {
49 build "devs/jackdanielz/espion" ""
49 build "devs/rimmed/ewe" "" 50 build "devs/rimmed/ewe" ""
50 build "devs/rimmed/eflete" ""
51 build "libs/esskyuehl" "" 51 build "libs/esskyuehl" ""
52 build "devs/discomfitor/efx" "" 52 build "devs/discomfitor/efx" ""
53} 53}
54 54
55function build_e() { 55function build_e() {
56 build "core/enlightenment" "--sysconfdir=/etc --libexecdir=$PREFIX/lib/enlightenment $E_FLAGS" 56 build "core/enlightenment" "--sysconfdir=/etc --libexecdir=$PREFIX/lib/enlightenment $E_FLAGS"
57 # build "devs/ceolin/epulse" ""
57} 58}
58 59
59function build_modules() { 60function build_modules() {
@@ -82,8 +83,9 @@ function build_all() {
82} 83}
83 84
84function build_base() { 85function build_base() {
85 build "core/efl" "$EFL_FLAGS" 86 build "core/efl" "$EFL_FLAGS"
86 build "core/elementary" "" 87 build "core/elementary" ""
88 build "apps/rage" ""
87 build "apps/terminology" "" 89 build "apps/terminology" ""
88 build "core/enlightenment" "--sysconfdir=/etc --libexecdir=$PREFIX/lib/enlightenment $E_FLAGS" 90 build "core/enlightenment" "--sysconfdir=/etc --libexecdir=$PREFIX/lib/enlightenment $E_FLAGS"
89 efl_ctags 91 efl_ctags
diff --git a/build-fcts.sh b/build-fcts.sh
index b9d2a74..3bd9e00 100755
--- a/build-fcts.sh
+++ b/build-fcts.sh
@@ -35,7 +35,7 @@ BROWN="\033[0;33m"
35PURPLE="\033[0;35m" 35PURPLE="\033[0;35m"
36 36
37export CC=${CC:-"ccache gcc"} 37export CC=${CC:-"ccache gcc"}
38export CFLAGS=${CFLAGS:-"-ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow"} 38export CFLAGS=${CFLAGS:-"-ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow -Wstrict-prototypes"}
39 39
40export PATH=$PREFIX/bin:$PATH 40export PATH=$PREFIX/bin:$PATH
41export LD_LIBRARY_PATH=$PREFIX"/lib" 41export LD_LIBRARY_PATH=$PREFIX"/lib"
@@ -53,11 +53,12 @@ EFL_DBUS_DIR=${EFL_DBUS_DIR:-"/usr/share/dbus-1/services"}
53 53
54EFL_FLAGS="--disable-static --disable-doc" 54EFL_FLAGS="--disable-static --disable-doc"
55EFL_FLAGS+=" --with-api=${EFL_API} --with-tests=${EFL_TESTS} --with-profile=${EFL_PROFILE} --with-dbus-services=${EFL_DBUS_DIR}" 55EFL_FLAGS+=" --with-api=${EFL_API} --with-tests=${EFL_TESTS} --with-profile=${EFL_PROFILE} --with-dbus-services=${EFL_DBUS_DIR}"
56# EFL_FLAGS+=" --with-x11=xlib --with-opengl=none --enable-drm --enable-fb --disable-sdl --disable-tslib"
56EFL_FLAGS+=" --with-x11=xlib --with-opengl=es --enable-drm --enable-egl --enable-gl-drm --enable-wayland --enable-fb --disable-sdl --disable-tslib" 57EFL_FLAGS+=" --with-x11=xlib --with-opengl=es --enable-drm --enable-egl --enable-gl-drm --enable-wayland --enable-fb --disable-sdl --disable-tslib"
57EFL_FLAGS+=" --enable-systemd --enable-harfbuzz" 58EFL_FLAGS+=" --enable-systemd --enable-harfbuzz"
58 59
59E_FLAGS=" --enable-pam --enable-device-udev --enable-mount-udisks --enable-mount-eeze --enable-enotify" 60E_FLAGS=" --enable-pam --enable-device-udev --enable-mount-udisks --enable-mount-eeze --enable-enotify"
60E_FLAGS+=" --enable-wayland-clients --enable-wayland-egl" 61E_FLAGS+=" --enable-wayland --enable-xwayland --enable-wayland-egl"
61 62
62CLEANLEVEL=0 63CLEANLEVEL=0
63for arg in $@; do 64for arg in $@; do
diff --git a/clang-flags.conf b/clang-flags.conf
index 81509c9..3ce50ae 100644
--- a/clang-flags.conf
+++ b/clang-flags.conf
@@ -3,6 +3,7 @@
3USE_BUILD_DIR=1 3USE_BUILD_DIR=1
4CC="ccache clang" 4CC="ccache clang"
5CFLAGS="-g3 -ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow" 5CFLAGS="-g3 -ggdb3 -O2 -march=native -ffast-math -W -Wall -Wextra -Wshadow"
6#CFLAGS="-g3 -ggdb3 -O0"
6CFLAGS+=" -Qunused-arguments -Wno-parentheses-equality -Wno-array-bounds -Wno-unused-const-variable" 7CFLAGS+=" -Qunused-arguments -Wno-parentheses-equality -Wno-array-bounds -Wno-unused-const-variable"
7EFL_TESTS="regular" 8EFL_TESTS="regular"
8 9
diff --git a/efl-lcov b/efl-lcov
new file mode 100755
index 0000000..ddd551b
--- /dev/null
+++ b/efl-lcov
@@ -0,0 +1,14 @@
1#! /bin/bash
2
3export EINA_LOG_LEVEL=2
4export CC="ccache gcc"
5
6./configure --prefix=/opt/efl --with-tests=coverage \
7 --with-opengl=none \
8 --disable-audio \
9 --disable-gstreamer \
10 --disable-physics \
11 $@ && make -j 4 lcov-check
12
13
14# --with-x11=none \
diff --git a/gtkrc b/gtkrc
new file mode 100644
index 0000000..42f42f2
--- /dev/null
+++ b/gtkrc
@@ -0,0 +1,420 @@
1# Set GtkSettings color scheme property.
2# This can be overriden (via an xsetting) with eg. the gnome-appearance-properties.
3gtk_color_scheme = "fg_color:#ffffff\nbg_color:#404040\nbase_color:#303030\ntext_color:#ffffff\nselected_bg_color:#3399ff\nselected_fg_color:#000000\ntooltip_bg_color:#3399ff\ntooltip_fg_color:#000000"
4
5style "clearlooks-default"
6{
7 ########
8 # Style Properties
9 ########
10 GtkButton ::child-displacement-x = 1
11 GtkButton ::child-displacement-y = 1
12 GtkButton ::default-border = { 0, 0, 0, 0 }
13 GtkCheckButton ::indicator-size = 14
14
15 GtkPaned ::handle-size = 6
16
17 GtkRange ::trough-border = 0
18 GtkRange ::slider-width = 15
19 GtkRange ::stepper-size = 15
20
21 GtkScale ::slider-length = 23
22 GtkScale ::trough-side-details = 1
23 GtkScrollbar ::min-slider-length = 30
24
25 GtkMenuBar ::internal-padding = 0
26 GtkExpander ::expander-size = 16
27 GtkToolbar ::internal-padding = 1
28 GtkTreeView ::expander-size = 14
29 GtkTreeView ::vertical-separator = 0
30
31 GtkMenu ::horizontal-padding = 0
32 GtkMenu ::vertical-padding = 0
33
34 # Glow the tasklist by changing the color, instead of overlaying it with a rectangle
35 WnckTasklist ::fade-overlay-rect = 0
36
37 xthickness = 1
38 ythickness = 1
39
40
41 fg[NORMAL] = @fg_color
42 fg[PRELIGHT] = @fg_color
43 fg[SELECTED] = @selected_fg_color
44 fg[ACTIVE] = @fg_color
45 fg[INSENSITIVE] = darker (@bg_color)
46
47 bg[NORMAL] = @bg_color
48 bg[PRELIGHT] = shade (1.02, @bg_color)
49 bg[SELECTED] = @selected_bg_color
50 bg[INSENSITIVE] = @bg_color
51 bg[ACTIVE] = shade (0.9, @bg_color)
52
53 base[NORMAL] = @base_color
54 base[PRELIGHT] = shade (0.95, @bg_color)
55 base[ACTIVE] = shade (0.9, @selected_bg_color)
56 base[SELECTED] = @selected_bg_color
57 base[INSENSITIVE] = @bg_color
58
59 text[NORMAL] = @text_color
60 text[PRELIGHT] = @text_color
61 text[ACTIVE] = @selected_fg_color
62 text[SELECTED] = @selected_fg_color
63 text[INSENSITIVE] = darker (@bg_color)
64
65 engine "clearlooks"
66 {
67 colorize_scrollbar = FALSE
68 reliefstyle = 1
69 menubarstyle = 2 # 0 = flat, 1 = sunken, 2 = flat gradient
70 toolbarstyle = 1 # 0 = flat, 1 = enable effects
71 animation = FALSE
72 style = GUMMY
73
74 # Set a hint to disable backward compatibility fallbacks.
75 hint = "use-hints"
76 }
77}
78
79style "clearlooks-wide"
80{
81 xthickness = 2
82 ythickness = 2
83}
84
85style "clearlooks-wider"
86{
87 xthickness = 3
88 ythickness = 3
89}
90
91style "clearlooks-button"
92{
93 xthickness = 3
94 ythickness = 3
95
96 bg[NORMAL] = shade (1.04, @bg_color) # "#f6f4f1"
97 bg[PRELIGHT] = shade (1.06, @bg_color)
98 bg[ACTIVE] = shade (0.85, @bg_color)
99}
100
101style "clearlooks-notebook-bg"
102{
103 bg[NORMAL] = shade (1.02, @bg_color)
104}
105
106style "clearlooks-notebook" = "clearlooks-notebook-bg"
107{
108 xthickness = 3
109 ythickness = 3
110}
111
112style "clearlooks-tasklist"
113{
114 xthickness = 5
115 ythickness = 3
116}
117
118style "clearlooks-menu"
119{
120 xthickness = 0
121 ythickness = 0
122
123 bg[NORMAL] = shade (1.08, @bg_color)
124
125 # Radius of the menu items (inside menus)
126 engine "clearlooks"
127 {
128 radius = 0.0
129 }
130}
131
132style "clearlooks-menu-item"
133{
134 xthickness = 2
135 ythickness = 3
136
137 fg[PRELIGHT] = @selected_fg_color
138}
139
140style "clearlooks-separator-menu-item"
141{
142 GtkSeparatorMenuItem::horizontal-padding = 0
143 # We are setting the desired height by using wide-separators
144 # There is no other way to get the odd height ...
145 GtkWidget::wide-separators = 1
146 GtkWidget::separator-width = 1
147 GtkWidget::separator-height = 5
148 xthickness = 1
149 ythickness = 0
150}
151
152style "clearlooks-treeview"
153{
154 engine "clearlooks" {
155 hint = "treeview"
156 }
157}
158
159# Based on the default style so that the colors from the button
160# style are overriden again.
161style "clearlooks-treeview-header" = "clearlooks-default"
162{
163 xthickness = 2
164 ythickness = 1
165
166 engine "clearlooks" {
167 hint = "treeview-header"
168 }
169}
170
171style "clearlooks-frame-title"
172{
173 fg[NORMAL] = lighter (@fg_color)
174}
175
176style "clearlooks-tooltips"
177{
178 xthickness = 4
179 ythickness = 4
180
181 bg[NORMAL] = @tooltip_bg_color
182 fg[NORMAL] = @tooltip_fg_color
183}
184
185style "clearlooks-progressbar"
186{
187 xthickness = 1
188 ythickness = 1
189
190 fg[PRELIGHT] = @selected_fg_color
191
192 engine "clearlooks"
193 {
194 # Explicitly set the radius, for progress
195 # bars inside menuitems
196 radius = 3.0
197
198 hint = "progressbar"
199 }
200}
201
202style "clearlooks-statusbar"
203{
204 engine "clearlooks"
205 {
206 hint = "statusbar"
207 }
208}
209
210style "clearlooks-comboboxentry"
211{
212 # NOTE:
213 # If you set the appears-as-list option on comboboxes in the theme
214 # you should set this hint on the combobox instead.
215 engine "clearlooks"
216 {
217 hint = "comboboxentry"
218 }
219}
220
221style "clearlooks-spinbutton"
222{
223 engine "clearlooks"
224 {
225 hint = "spinbutton"
226 }
227}
228
229style "clearlooks-scale"
230{
231 engine "clearlooks"
232 {
233 hint = "scale"
234 }
235}
236
237style "clearlooks-hscale"
238{
239 engine "clearlooks"
240 {
241 hint = "hscale"
242 }
243}
244
245style "clearlooks-vscale"
246{
247 engine "clearlooks"
248 {
249 hint = "vscale"
250 }
251}
252
253style "clearlooks-scrollbar"
254{
255 engine "clearlooks"
256 {
257 hint = "scrollbar"
258 }
259}
260
261style "clearlooks-hscrollbar"
262{
263 engine "clearlooks"
264 {
265 hint = "hscrollbar"
266 }
267}
268
269style "clearlooks-vscrollbar"
270{
271 engine "clearlooks"
272 {
273 hint = "vscrollbar"
274 }
275}
276
277style "clearlooks-menubar"
278{
279 engine "clearlooks"
280 {
281 hint = "menubar"
282 }
283}
284
285style "clearlooks-nautilus-location"
286{
287 bg[NORMAL] = mix(0.60, shade (1.05,@bg_color), @selected_bg_color)
288}
289
290
291#########################################
292# Matches
293#########################################
294
295# Clearlooks default style is applied to every widget
296class "GtkWidget" style "clearlooks-default"
297
298# Increase the x/ythickness in some widgets
299class "GtkToolbar" style "clearlooks-default"
300class "GtkRange" style "clearlooks-wide"
301class "GtkFrame" style "clearlooks-wide"
302class "GtkSeparator" style "clearlooks-wide"
303class "GtkEntry" style "clearlooks-wider"
304
305class "GtkSpinButton" style "clearlooks-spinbutton"
306class "GtkScale" style "clearlooks-scale"
307class "GtkVScale" style "clearlooks-vscale"
308class "GtkHScale" style "clearlooks-hscale"
309class "GtkScrollbar" style "clearlooks-scrollbar"
310class "GtkVScrollbar" style "clearlooks-vscrollbar"
311class "GtkHScrollbar" style "clearlooks-hscrollbar"
312
313# General matching following, the order is choosen so that the right styles override each other
314# eg. progressbar needs to be more important then the menu match.
315
316# This is not perfect, it could be done better
317# (That is modify *every* widget in the notebook, and change those back that
318# we really don't want changed)
319widget_class "*<GtkNotebook>*<GtkEventBox>" style "clearlooks-notebook-bg"
320widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "clearlooks-notebook-bg"
321widget_class "*<GtkNotebook>*<GtkLayout>" style "clearlooks-notebook-bg"
322
323widget_class "*<GtkButton>" style "clearlooks-button"
324widget_class "*<GtkNotebook>" style "clearlooks-notebook"
325widget_class "*<GtkStatusbar>*" style "clearlooks-statusbar"
326
327widget_class "*<GtkComboBoxEntry>*" style "clearlooks-comboboxentry"
328widget_class "*<GtkCombo>*" style "clearlooks-comboboxentry"
329
330widget_class "*<GtkMenuBar>*" style "clearlooks-menubar"
331widget_class "*<GtkMenu>*" style "clearlooks-menu"
332widget_class "*<GtkMenuItem>*" style "clearlooks-menu-item"
333widget_class "*<GtkSeparatorMenuItem>*" style "clearlooks-separator-menu-item"
334
335widget_class "*.<GtkFrame>.<GtkLabel>" style "clearlooks-frame-title"
336widget_class "*.<GtkTreeView>*" style "clearlooks-treeview"
337
338widget_class "*<GtkProgressBar>" style "clearlooks-progressbar"
339
340# Treeview header
341widget_class "*.<GtkTreeView>.<GtkButton>" style "clearlooks-treeview-header"
342widget_class "*.<GtkCTree>.<GtkButton>" style "clearlooks-treeview-header"
343widget_class "*.<GtkList>.<GtkButton>" style "clearlooks-treeview-header"
344widget_class "*.<GtkCList>.<GtkButton>" style "clearlooks-treeview-header"
345
346# Workarounds for Evolution
347widget_class "*.ETable.ECanvas" style "clearlooks-treeview-header"
348widget_class "*.ETree.ECanvas" style "clearlooks-treeview-header"
349
350# The window of the tooltip is called "gtk-tooltip"
351################################
352# FIXME:
353# This will not work if one embeds eg. a button into the tooltip.
354# As far as I can tell right now we will need to rework the theme
355# quite a bit to get this working correctly.
356# (It will involve setting different priorities, etc.)
357################################
358widget "gtk-tooltip*" style "clearlooks-tooltips"
359
360###################################################
361# Special cases and work arounds
362###################################################
363
364# Special case the nautilus-extra-view-widget
365# ToDo: A more generic approach for all applications that have a widget like this.
366widget "*.nautilus-extra-view-widget" style : highest "clearlooks-nautilus-location"
367
368# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
369# Note that the work around assumes that the combobox is _not_ in
370# appears-as-list mode.
371# Similar hack also in the menuitem style.
372# This style does not affect GtkComboBoxEntry, it does have an effect
373# on comboboxes in appears-as-list mode though.
374style "clearlooks-text-is-fg-color-workaround"
375{
376 text[NORMAL] = @fg_color
377 text[PRELIGHT] = @fg_color
378 text[SELECTED] = @selected_fg_color
379 text[ACTIVE] = @fg_color
380 text[INSENSITIVE] = darker (@bg_color)
381}
382widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-text-is-fg-color-workaround"
383
384style "clearlooks-menuitem-text-is-fg-color-workaround"
385{
386 text[NORMAL] = @fg_color
387 text[PRELIGHT] = @selected_fg_color
388 text[SELECTED] = @selected_fg_color
389 text[ACTIVE] = @fg_color
390 text[INSENSITIVE] = darker (@bg_color)
391}
392widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
393
394# Work around the usage of GtkLabel inside GtkListItems to display text.
395# This breaks because the label is shown on a background that is based on the
396# base color set.
397style "clearlooks-fg-is-text-color-workaround"
398{
399 fg[NORMAL] = @text_color
400 fg[PRELIGHT] = @text_color
401 fg[ACTIVE] = @selected_fg_color
402 fg[SELECTED] = @selected_fg_color
403 fg[INSENSITIVE] = darker (@bg_color)
404}
405widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
406# The same problem also exists for GtkCList and GtkCTree
407# Only match GtkCList and not the parent widgets, because that would also change the headers.
408widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
409
410# Work around the evolution "New" button bug by making the toolbar flat.
411# http://bugzilla.gnome.org/show_bug.cgi?id=446953
412# Maybe remove this workaround in unstable releases.
413style "clearlooks-evo-new-button-workaround"
414{
415 engine "clearlooks"
416 {
417 toolbarstyle = 0
418 }
419}
420widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "clearlooks-evo-new-button-workaround"