[EGIT] [core/elementary] master 01/01: elm_transit: Add missing "EAPI" prefix for elm_transit_smooth_get()
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b2eca34e21e47d1341f6d9e8e858beb43ab38afe commit b2eca34e21e47d1341f6d9e8e858beb43ab38afe Author: Jee-Yong Um Date: Wed Apr 22 15:53:12 2015 +0900 elm_transit: Add missing "EAPI" prefix for elm_transit_smooth_get() Summary: Add "EAPI" prefix for elm_transit_smooth_get() in elm_transit.h Reviewers: Hermet Reviewed By: Hermet Differential Revision: https://phab.enlightenment.org/D2396 --- src/lib/elm_transit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h index cce70d7..90938d5 100644 --- a/src/lib/elm_transit.h +++ b/src/lib/elm_transit.h @@ -713,7 +713,7 @@ EAPI void elm_transit_smooth_set(Elm_Transit *transit, Eina_Bo * @since 1.8 * */ -Eina_Bool elm_transit_smooth_get(const Elm_Transit *transit); +EAPI Eina_Bool elm_transit_smooth_get(const Elm_Transit *transit); /** * Add the Resizing Effect to Elm_Transit. --
[EGIT] [core/elementary] master 01/01: entry: Fix elm_entry_input_panel_layout_get API to return ELM_INPUT_PANEL_LAYOUT_INVALID when it fails.
eunue pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c0ba5ad0f292b1e5871b1d578f69532865387b00
commit c0ba5ad0f292b1e5871b1d578f69532865387b00
Author: Youngbok Shin
Date: Wed Apr 22 15:46:43 2015 +0900
entry: Fix elm_entry_input_panel_layout_get API to return
ELM_INPUT_PANEL_LAYOUT_INVALID when it fails.
Summary:
Even if the given Evas_Object is NULL, API returns
ELM_INPUT_PANEL_LAYOUT_NORMAL.
But, ELM_INPUT_PANEL_LAYOUT_INVALID seems proper in that case.
Test Plan:
Call the following API with NULL.
elm_entry_input_panel_layout_get(NULL);
Reviewers: woohyun, Hermet, eunue
Reviewed By: eunue
Differential Revision: https://phab.enlightenment.org/D2404
---
src/lib/elm_entry.eo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index f1ca920..1f70348 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -446,14 +446,14 @@ class Elm_Entry (Elm_Layout, Elm_Interface_Scrollable,
Evas.Clickable_Interface,
/*@
Get the input panel layout of the entry
-@return layout type
+@return layout type. It returns ELM_INPUT_PANEL_LAYOUT_INVALID(8)
when it fails.
@see elm_entry_input_panel_layout_set
@ingroup Entry */
}
values {
-Elm_Input_Panel_Layout layout; /*@ layout type */
+Elm_Input_Panel_Layout layout(8); /*@ layout type */
}
}
input_panel_return_key_type {
--
[EGIT] [apps/epour] master 01/01: Add I18N support to gui with gettext
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=8fa5289b06db4806b03d152b7b1eea4efd5380e5
commit 8fa5289b06db4806b03d152b7b1eea4efd5380e5
Author: Kai Huuhko
Date: Wed Apr 22 07:31:01 2015 +0300
Add I18N support to gui with gettext
---
epour/gui/Preferences.py | 58 ++---
epour/gui/TorrentProps.py| 32 +--
epour/gui/TorrentSelector.py | 233 +++---
epour/gui/Widgets.py | 12 +-
epour/gui/__init__.py| 94
po/epour.pot | 555 +++
6 files changed, 859 insertions(+), 125 deletions(-)
diff --git a/epour/gui/Preferences.py b/epour/gui/Preferences.py
index 4efeb67..322b1ee 100644
--- a/epour/gui/Preferences.py
+++ b/epour/gui/Preferences.py
@@ -94,7 +94,7 @@ class PreferencesGeneral(PreferencesDialog):
self.session = session
conf = session.conf
PreferencesDialog.__init__(
-self, "Epour General Preferences")
+self, _("Epour General Preferences"))
limits = Limits(self, session)
ports = ListenPorts(self, session)
@@ -108,7 +108,7 @@ class PreferencesGeneral(PreferencesDialog):
)
completed_sel_enabled = Check(
-self, size_hint_align=ALIGN_LEFT, text="Move completed torrents",
+self, size_hint_align=ALIGN_LEFT, text=_("Move completed
torrents"),
)
completed_sel_enabled.state = conf.getboolean(
"Settings", "move_completed_enabled"
@@ -116,7 +116,7 @@ class PreferencesGeneral(PreferencesDialog):
completed_sel = StorageSelector(
self,
-"Completed torrents",
+_("Completed torrents"),
lambda: conf.get("Settings", "move_completed_path"),
lambda x: conf.set("Settings", "move_completed_path", x),
size_hint_weight=EXPAND_HORIZ, size_hint_align=FILL_HORIZ
@@ -145,7 +145,7 @@ class PreferencesGeneral(PreferencesDialog):
chk1 = Check(self)
chk1.size_hint_align = ALIGN_LEFT
-chk1.text = "Delete original .torrent file when added"
+chk1.text = _("Delete original .torrent file when added")
chk1.state = conf.getboolean("Settings", "delete_original")
chk1.callback_changed_add(lambda x: conf.set(
"Settings", "delete_original", str(bool(chk1.state))
@@ -153,7 +153,7 @@ class PreferencesGeneral(PreferencesDialog):
chk2 = Check(self)
chk2.size_hint_align = ALIGN_LEFT
-chk2.text = "Ask for confirmation on exit"
+chk2.text = _("Ask for confirmation on exit")
chk2.state = conf.getboolean("Settings", "confirm_exit")
chk2.callback_changed_add(lambda x: conf.set(
"Settings", "confirm_exit", str(bool(chk2.state))
@@ -162,7 +162,7 @@ class PreferencesGeneral(PreferencesDialog):
chk3 = Check(self)
chk3.size_hint_align = ALIGN_LEFT
chk3.text = (
-"Torrents to be added from dbus or command line open a dialog")
+_("Torrents to be added from dbus or command line open a dialog"))
chk3.state = conf.getboolean("Settings", "add_dialog_enabled")
chk3.callback_changed_add(lambda x: conf.set(
"Settings", "add_dialog_enabled", str(bool(chk3.state))
@@ -197,7 +197,7 @@ class StorageSelector(Frame):
dlsel = FsButton(
self, size_hint_align=FILL_HORIZ, inwin_mode=False,
-text="Change path", folder_only=True, expandable=False
+text=_("Change path"), folder_only=True, expandable=False
)
dlsel.path = read()
@@ -234,7 +234,7 @@ class ListenPorts(Frame):
self.session = session
self.size_hint_align = FILL_HORIZ
-self.text = "Listen port (range)"
+self.text = _("Listen port (range)")
#port = session.listen_port()
@@ -273,16 +273,16 @@ class PreferencesProxy(PreferencesDialog):
def __init__(self, parent, session):
PreferencesDialog.__init__(
-self, "Epour Proxy Preferences")
+self, _("Epour Proxy Preferences"))
proxies = [
-["Proxy for torrent peer connections",
+[_("Proxy for torrent peer connections"),
session.peer_proxy, session.set_peer_proxy],
-["Proxy for torrent web seed connections",
+[_("Proxy for torrent web seed connections"),
session.web_seed_proxy, session.set_web_seed_proxy],
-["Proxy for tracker connections",
+[_("Proxy for tracker connections"),
session.tracker_proxy, session.set_tracker_proxy],
-["Proxy for DHT connections",
+[_("Proxy for DHT connections"),
session.dht_proxy, session.set_dht_proxy],
]
@@ -317,7 +317,7 @@ class ProxyGroup(Frame):
ps = rfunc()
-l = Label(self, text="Prox
[EGIT] [core/elementary] master 01/01: elm_photocam: Fixed T2337, zoom in/out rotated photocam image
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0cc2b7351470bc9a1ad62e807a46d5cdd68cb4bb
commit 0cc2b7351470bc9a1ad62e807a46d5cdd68cb4bb
Author: kabeer khan
Date: Wed Apr 22 13:24:19 2015 +0900
elm_photocam: Fixed T2337, zoom in/out rotated photocam image
Summary:
Currently zoom in/out rotated or flipped image was causing lost of
orientation
and aspect of image is also changed. Fixed that by reloading image on
pan_obj on zoom
@fix
Signed-off-by: kabeer khan
Reviewers: DaveMDS, jpeg, cedric, raster
Subscribers: jpeg
Differential Revision: https://phab.enlightenment.org/D2381
---
src/lib/elm_photocam.c| 9 +
src/lib/elm_widget_photocam.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c
index a05a96f..96e98af 100644
--- a/src/lib/elm_photocam.c
+++ b/src/lib/elm_photocam.c
@@ -728,6 +728,13 @@ _zoom_do(Evas_Object *obj,
sd->show.w = ow;
sd->show.h = oh;
+ if (sd->orientation_changed)
+ {
+evas_object_smart_member_del(sd->img);
+elm_widget_sub_object_del(obj, sd->img);
+evas_object_smart_member_add(sd->img, sd->pan_obj);
+elm_widget_sub_object_add(obj, sd->img);
+ }
ecore_job_del(sd->calc_job);
sd->calc_job = ecore_job_add(_calc_job_cb, obj);
if (t >= 1.0)
@@ -1296,6 +1303,7 @@ _elm_photocam_image_orient_set(Eo *obj, Elm_Photocam_Data
*sd, Evas_Image_Orient
if (sd->orient == orient) return;
+ sd->orientation_changed = EINA_TRUE;
sd->orient = orient;
g = _grid_create(obj);
if (g)
@@ -1543,6 +1551,7 @@ _internal_file_set(Eo *obj, Elm_Photocam_Data *sd, const
char *file, Eina_File *
sd->zoom = 0.0;
elm_photocam_zoom_set(obj, tz);
sd->orient = EVAS_IMAGE_ORIENT_NONE;
+ sd->orientation_changed = EINA_FALSE;
if (ret) *ret = evas_object_image_load_error_get(sd->img);
}
diff --git a/src/lib/elm_widget_photocam.h b/src/lib/elm_widget_photocam.h
index 0b8577f..b255ec1 100644
--- a/src/lib/elm_widget_photocam.h
+++ b/src/lib/elm_widget_photocam.h
@@ -130,6 +130,7 @@ struct _Elm_Photocam_Data
Eina_Boolresized : 1;
Eina_Boolon_hold : 1;
Eina_Boolpaused : 1;
+ Eina_Boolorientation_changed : 1;
};
struct _Elm_Photocam_Pan_Data
--
[EGIT] [apps/rage] master 01/01: and for 0.1.3 - fix albumart thumbnail list
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=b78bffcf1af46c1653081abc44b8cd2cee408d2b
commit b78bffcf1af46c1653081abc44b8cd2cee408d2b
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 22 12:33:40 2015 +0900
and for 0.1.3 - fix albumart thumbnail list
---
src/bin/video.c | 17 +++--
src/bin/videothumb.c | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/bin/video.c b/src/bin/video.c
index 53cf9d1..d6b3f57 100644
--- a/src/bin/video.c
+++ b/src/bin/video.c
@@ -50,10 +50,23 @@ _art_check(Evas_Object *obj)
}
if (sd->doart)
{
-char *thumb = NULL, *realfile;
+char *thumb = NULL, *realfile = NULL;
evas_object_show(sd->o_img);
-realfile = ecore_file_realpath(sd->file);
+if (!strncasecmp(sd->file, "file:/", 6))
+ {
+ Efreet_Uri *uri = efreet_uri_decode(sd->file);
+ if (uri)
+ {
+ realfile = ecore_file_realpath(uri->path);
+ efreet_uri_free(uri);
+ }
+ }
+else if ((!strncasecmp(sd->file, "http:/", 6)) ||
+ (!strncasecmp(sd->file, "https:/", 7)))
+ realfile = strdup(sd->file);
+else
+ realfile = ecore_file_realpath(sd->file);
if (realfile)
{
thumb = albumart_file_get(realfile);
diff --git a/src/bin/videothumb.c b/src/bin/videothumb.c
index 375610e..0dc3c90 100644
--- a/src/bin/videothumb.c
+++ b/src/bin/videothumb.c
@@ -376,7 +376,7 @@ videothumb_file_set(Evas_Object *obj, const char *file,
double pos)
Efreet_Uri *uri = efreet_uri_decode(sd->file);
if (uri)
{
- sd->realpath = strdup(uri->path);
+ sd->realpath = ecore_file_realpath(uri->path);
efreet_uri_free(uri);
}
}
--
[EGIT] [website/www-content] master 01/01: Wiki page download-latest changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=d0d3eea1f6a7258224c201cdb6ab60c3f0eb1803 commit d0d3eea1f6a7258224c201cdb6ab60c3f0eb1803 Author: Raster Date: Tue Apr 21 20:16:28 2015 -0700 Wiki page download-latest changed with summary [] by Raster --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 59e7a0a..8104f8f 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -7,7 +7,7 @@ python_efl_v = 1.13.0 enlightenment_v = 0.19.4 terminology_v = 0.8.0 -rage_v= 0.1.2 +rage_v= 0.1.3 econnman_v= 1.1 epour_v = 0.6.0 --
[EGIT] [apps/rage] master 02/02: rage - 0.1.3 release with fixes for albumart
raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=796684dd2798479880068ad449e323ba2c8335ab commit 796684dd2798479880068ad449e323ba2c8335ab Author: Carsten Haitzler (Rasterman) Date: Wed Apr 22 12:14:39 2015 +0900 rage - 0.1.3 release with fixes for albumart --- Marrakesh.mrk | 4 ++-- README| 2 +- configure.ac | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marrakesh.mrk b/Marrakesh.mrk index 5dcfc87..34d19bb 100644 --- a/Marrakesh.mrk +++ b/Marrakesh.mrk @@ -1,10 +1,10 @@ PROJ: Rage PROJICON: data/icons/rage.png BRIEF: A beautiful video media player -VERSION: 0.1.0 +VERSION: 0.1.2 LICENSE: BSD-2 COPYING: COPYING AUTHORS -NEEDS: 1.11 +NEEDS: 1.13 DOMAIN: rage REPO: http://git.enlightenment.org/apps/rage.git DEVREPO: git+ssh://g...@git.enlightenment.org/apps/rage.git diff --git a/README b/README index c8ee9e1..19988e9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Rage 0.1.2 +Rage 0.1.3 ** diff --git a/configure.ac b/configure.ac index ab6c6b9..6873ee8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([rage], [0.1.2], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([rage], [0.1.3], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) --
[EGIT] [apps/rage] master 01/02: rage - fix albumart fetch if file is a uri
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=abfa9d2360a50c03c62fc54fae9e580fbdfb7755
commit abfa9d2360a50c03c62fc54fae9e580fbdfb7755
Author: Carsten Haitzler (Rasterman)
Date: Wed Apr 22 12:11:35 2015 +0900
rage - fix albumart fetch if file is a uri
---
src/bin/albumart.c | 33 +
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/bin/albumart.c b/src/bin/albumart.c
index a62b793..1e635ae 100644
--- a/src/bin/albumart.c
+++ b/src/bin/albumart.c
@@ -20,6 +20,33 @@ static FILE *fout = NULL;
static Evas_Object *fetchwin = NULL;
static char *
+_inpath(const char *file)
+{
+ char *realpath = NULL;
+
+ if (!strncasecmp(file, "file:/", 6))
+ {
+Efreet_Uri *uri = efreet_uri_decode(file);
+if (uri)
+ {
+ realpath = ecore_file_realpath(uri->path);
+ efreet_uri_free(uri);
+ }
+ }
+ else if ((!strncasecmp(file, "http:/", 6)) ||
+(!strncasecmp(file, "https:/", 7)))
+ realpath = strdup(file);
+ else
+ realpath = ecore_file_realpath(file);
+ if (realpath && (!realpath[0]))
+ {
+free(realpath);
+return NULL;
+ }
+ return realpath;
+}
+
+static char *
_thumbpath(const char *file)
{
char buf_base[PATH_MAX];
@@ -202,7 +229,7 @@ albumart_find(Evas_Object *win, Evas_Object *vid)
{
const char *file, *album, *artist, *title;
Eina_Strbuf *sb;
- char *realfile, *path;
+ char *path;
if (fetchfile)
{
@@ -236,9 +263,7 @@ albumart_find(Evas_Object *win, Evas_Object *vid)
file = video_file_get(vid);
if (!file) return;
- realfile = ecore_file_realpath(file);
- if (!realfile) fetchfile = strdup(file);
- else fetchfile = realfile;
+ fetchfile = _inpath(file);
path = _thumbpath(fetchfile);
if (path)
--
[EGIT] [core/elementary] master 01/01: interface scroll: handle wanted x coordinates in case of mirroring.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=aa93b1071b40d0f2215f2f5703c083a960b7bbc1
commit aa93b1071b40d0f2215f2f5703c083a960b7bbc1
Author: Amitesh Singh
Date: Wed Apr 22 11:41:41 2015 +0900
interface scroll: handle wanted x coordinates in case of mirroring.
Summary:
In case of mirror enabled, wanted x should come from
_elm_scroll_x_mirrored_get().
This defect is visible in case of some fancy effects on scroller (map).
@Fix
Reviewers: raster, Hermet
Subscribers: herdsman, sachin.dev, kimcinoo, eagleeye, seoz
Differential Revision: https://phab.enlightenment.org/D2363
---
src/lib/elm_interface_scrollable.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_interface_scrollable.c
b/src/lib/elm_interface_scrollable.c
index 4a4a988..e52d78e 100644
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -1209,15 +1209,15 @@
_elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
eo_do(sid->obj, elm_interface_scrollable_content_viewport_geometry_get
(NULL, NULL, &sid->ww, &sid->wh));
- if (x < minx)
+ if (x < minx && !sid->is_mirrored)
{
if (!sid->loop_h) sid->wx = minx;
else sid->wx = mx;
}
- else if (!sid->loop_h && (x > mx)) sid->wx = mx;
- else if (sid->loop_h && x >= (sid->ww + mx)) sid->wx = 0;
else if (sid->is_mirrored)
sid->wx = _elm_scroll_x_mirrored_get(sid->obj, x);
+ else if (!sid->loop_h && (x > mx)) sid->wx = mx;
+ else if (sid->loop_h && x >= (sid->ww + mx)) sid->wx = 0;
else sid->wx = x;
if (y < miny)
--
[EGIT] [apps/epour] master 03/03: Add dialog: Convert flags to bool before use, disallow dups by default
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=522959b225bee6b2c4096221541a151d18a9f56b
commit 522959b225bee6b2c4096221541a151d18a9f56b
Author: Kai Huuhko
Date: Wed Apr 22 05:31:26 2015 +0300
Add dialog: Convert flags to bool before use, disallow dups by default
Flags are converted to bool before using them as Check state since
Eina_Bool doesn't accept values >sizeof(uchar)
---
epour/gui/TorrentSelector.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/epour/gui/TorrentSelector.py b/epour/gui/TorrentSelector.py
index 92176e6..197af88 100644
--- a/epour/gui/TorrentSelector.py
+++ b/epour/gui/TorrentSelector.py
@@ -143,6 +143,7 @@ class TorrentSelector(StandardWindow):
self.add_dict["flags"] = \
add_torrent_params_flags_t.flag_apply_ip_filter + \
add_torrent_params_flags_t.flag_update_subscribe + \
+add_torrent_params_flags_t.flag_duplicate_is_error + \
add_torrent_params_flags_t.flag_auto_managed
def option_flag_cb(c, flag):
@@ -154,7 +155,7 @@ class TorrentSelector(StandardWindow):
c = Check(
opt_box, size_hint_align=(0.0, 0.5),
text=" ".join(name.split("_")[1:]).capitalize(),
-state=self.add_dict["flags"] & int(flag)
+state=bool(self.add_dict["flags"] & int(flag))
)
c.callback_changed_add(option_flag_cb, int(flag))
opt_box.pack_end(c)
--
[EGIT] [apps/epour] master 01/03: Use more xdg icon names
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=59b7544370e4c7cf2531a511ab2c5f0eb470f72e
commit 59b7544370e4c7cf2531a511ab2c5f0eb470f72e
Author: Kai Huuhko
Date: Wed Apr 22 05:05:55 2015 +0300
Use more xdg icon names
---
epour/gui/__init__.py | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/epour/gui/__init__.py b/epour/gui/__init__.py
index 98ddcc1..87a131e 100644
--- a/epour/gui/__init__.py
+++ b/epour/gui/__init__.py
@@ -408,9 +408,9 @@ class SessionStatus(Table):
self.uploads_l.text = t
self.listen_l.text = str(self.session.is_listening())
if self.session.is_paused():
-icon = "player_pause"
+icon = "media-playback-pause"
else:
-icon = "player_play"
+icon = "media-playback-play"
try:
self.ses_pause_ic.standard = icon
except Exception as e:
@@ -482,12 +482,18 @@ class TorrentClass(GenlistItemClass):
try:
ic.standard = "up"
except Exception:
-pass
+try:
+ic.standard = "arrow-up"
+except Exception:
+pass
else:
try:
ic.standard = "down"
except Exception:
-pass
+try:
+ic.standard = "arrow-down"
+except Exception:
+pass
except RuntimeError:
log.debug("Setting torrent ic failed")
ic.tooltip_text_set(self.state_str[s.state])
--
[EGIT] [apps/epour] master 02/03: Improve torrent data save location entry in torrent add dialog
kuuko pushed a commit to branch master. http://git.enlightenment.org/apps/epour.git/commit/?id=055a4e86a1ed1c8fdcb5c0eb9bf63bc602000ecb commit 055a4e86a1ed1c8fdcb5c0eb9bf63bc602000ecb Author: Kai Huuhko Date: Wed Apr 22 05:06:46 2015 +0300 Improve torrent data save location entry in torrent add dialog Use fs.path instead of fs.selected for getting the path, allows user to enter the path in the entry widget --- epour/gui/TorrentSelector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epour/gui/TorrentSelector.py b/epour/gui/TorrentSelector.py index 6472c0f..92176e6 100644 --- a/epour/gui/TorrentSelector.py +++ b/epour/gui/TorrentSelector.py @@ -129,7 +129,7 @@ class TorrentSelector(StandardWindow): e.show() def fs_cb(fs, key): -self.add_dict[key] = fs.selected +self.add_dict[key] = fs.path save_path = FsEntry( opt_box, size_hint_align=FILL_HORIZ, text="Save path", --
[EGIT] [core/efl] master 01/01: Edje smart: Add NULL safety
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4ba0227bf4903729cb79ff547cced9c62e80b97e
commit 4ba0227bf4903729cb79ff547cced9c62e80b97e
Author: Jean-Philippe Andre
Date: Wed Apr 22 10:51:25 2015 +0900
Edje smart: Add NULL safety
This case actually happens with E. It's invalid but still happening,
and because Eo doesn't actually check the parent (or its type) fully,
an invalid, non-NULL object was returned.
See T2336 (this is not fixing the root cause!).
---
src/lib/edje/edje_smart.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 97d31b2..7de630d 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -19,6 +19,7 @@ EAPI Evas_Object *
edje_object_add(Evas *evas)
{
Evas_Object *e;
+ EINA_SAFETY_ON_NULL_RETURN_VAL(evas, NULL);
e = eo_add(MY_CLASS, evas);
return e;
}
--
[EGIT] [core/enlightenment] master 01/01: unadjust frame coords when calculating wl surface placement during commit
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0bad7b60252bafa0ea6ca7a8b81fb36dbf10eb93 commit 0bad7b60252bafa0ea6ca7a8b81fb36dbf10eb93 Author: Mike Blumenkrantz Date: Tue Apr 21 16:19:30 2015 -0400 unadjust frame coords when calculating wl surface placement during commit ec->y -> unadjust -> ec->client.y --- src/bin/e_comp_wl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index b1ecb11..4b8be36 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1013,7 +1013,7 @@ _e_comp_wl_surface_state_commit(E_Client *ec, E_Comp_Wl_Surface_State *state) _e_comp_wl_surface_state_size_update(ec, &ec->comp_data->pending); if (ec->changes.pos) - e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &x, &y); + e_comp_object_frame_xy_unadjust(ec->frame, ec->x, ec->y, &x, &y); else x = ec->client.x, y = ec->client.y; --
[EGIT] [core/enlightenment] master 01/01: use pointer hash for wl pixmaps
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f254531182a0a7f1c2c56767e58798fb01f649d3 commit f254531182a0a7f1c2c56767e58798fb01f649d3 Author: Mike Blumenkrantz Date: Tue Apr 21 15:57:18 2015 -0400 use pointer hash for wl pixmaps --- src/bin/e_pixmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index 3abd7fa..0e04bc6 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -239,7 +239,7 @@ e_pixmap_new(E_Pixmap_Type type, ...) } } else - pixmaps[type] = eina_hash_int64_new((Eina_Free_Cb)_e_pixmap_free); + pixmaps[type] = eina_hash_pointer_new((Eina_Free_Cb)_e_pixmap_free); cp = _e_pixmap_new(type); cp->win = id; eina_hash_add(pixmaps[type], &id, cp); --
[EGIT] [core/enlightenment] master 02/02: Revert "build: Remove generated eldbus files during normal clean and not only maintainer-clean"
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0bb444bb21b6f493d7d8fcbf089c1e99f03fd482 commit 0bb444bb21b6f493d7d8fcbf089c1e99f03fd482 Author: Mike Blumenkrantz Date: Tue Apr 21 15:31:21 2015 -0400 Revert "build: Remove generated eldbus files during normal clean and not only maintainer-clean" This reverts commit 95d701207783bcf58034797468024c05fa59ca03. do want in tree --- src/modules/Makefile_geolocation.mk | 2 +- src/modules/Makefile_music_control.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/Makefile_geolocation.mk b/src/modules/Makefile_geolocation.mk index 9990506..6b0966c 100644 --- a/src/modules/Makefile_geolocation.mk +++ b/src/modules/Makefile_geolocation.mk @@ -19,7 +19,7 @@ src/modules/geolocation/eldbus_geo_clue2_manager.c \ src/modules/geolocation/eldbus_geo_clue2_manager.h \ src/modules/geolocation/eldbus_utils.h -CLEANFILES += $(GEO_GEN) +MAINTAINERCLEANFILES += $(GEO_GEN) src/modules/geolocation/e_mod_main.c: $(GEO_GEN) $(GEO_GEN): src/modules/geolocation/org.freedesktop.GeoClue2.xml diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk index 5b1fc2d..bac89ab 100644 --- a/src/modules/Makefile_music_control.mk +++ b/src/modules/Makefile_music_control.mk @@ -14,7 +14,7 @@ src/modules/music-control/eldbus_mpris_media_player2.c \ src/modules/music-control/eldbus_mpris_media_player2.h \ src/modules/music-control/eldbus_utils.h -CLEANFILES += $(MUSIC_GEN) +MAINTAINERCLEANFILES += $(MUSIC_GEN) src/modules/music-control/e_mod_main.c: $(MUSIC_GEN) $(MUSIC_GEN): src/modules/music-control/introspect.xml --
[EGIT] [core/enlightenment] master 01/01: pass surface resource when creating wl surface pixmaps
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f276023e71f83787d35f689c1a6657f29ef16a52
commit f276023e71f83787d35f689c1a6657f29ef16a52
Author: Mike Blumenkrantz
Date: Tue Apr 21 15:41:10 2015 -0400
pass surface resource when creating wl surface pixmaps
---
src/bin/e_comp_wl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 7e3620f..b1ecb11 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1377,7 +1377,7 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client
*client, struct wl_reso
E_Pixmap *ep;
/* try to create new pixmap */
-if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, resource)))
+if (!(ep = e_pixmap_new(E_PIXMAP_TYPE_WL, res)))
{
ERR("Could not create new pixmap");
wl_resource_destroy(res);
--
[EGIT] [core/enlightenment] master 01/02: add explicit includes for elm color class header in colorclass cfd
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c398dbce21539a33dd93ddc1efeab43195174de8 commit c398dbce21539a33dd93ddc1efeab43195174de8 Author: Mike Blumenkrantz Date: Tue Apr 21 15:31:04 2015 -0400 add explicit includes for elm color class header in colorclass cfd --- src/modules/conf_theme/e_int_config_color_classes.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/conf_theme/e_int_config_color_classes.c b/src/modules/conf_theme/e_int_config_color_classes.c index 989fa2c..c5a5568 100644 --- a/src/modules/conf_theme/e_int_config_color_classes.c +++ b/src/modules/conf_theme/e_int_config_color_classes.c @@ -1,4 +1,6 @@ #include "e.h" +#define EFL_BETA_API_SUPPORT +#include static char * _translate(char *str) --
[EGIT] [core/elementary] master 01/01: colorclass: move header behind EFL_BETA_API_SUPPORT
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=1d3253777ab45362d567222385f706c6e639a9c8 commit 1d3253777ab45362d567222385f706c6e639a9c8 Author: Mike Blumenkrantz Date: Tue Apr 21 15:24:41 2015 -0400 colorclass: move header behind EFL_BETA_API_SUPPORT may end up iterating a bit more on this, don't want to be stuck with api --- src/lib/elm_color_class.h | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_color_class.h b/src/lib/elm_color_class.h index 235405e..0baeae8 100644 --- a/src/lib/elm_color_class.h +++ b/src/lib/elm_color_class.h @@ -1,5 +1,6 @@ -#ifndef ELM_COLOR_CLASS_H -# define ELM_COLOR_CLASS_H +#ifdef EFL_BETA_API_SUPPORT +# ifndef ELM_COLOR_CLASS_H +# define ELM_COLOR_CLASS_H /** * @defgroup Elm_Color_Class_Group Color Class Editor @@ -82,4 +83,5 @@ EAPI void elm_color_class_list_cb_set(Elm_Color_Class_List_Cb cb); EAPI Eina_List *elm_color_class_util_edje_file_list(Eina_File *f); /** }@ */ +# endif #endif --
[EGIT] [core/enlightenment] master 02/04: add wl client event callbacks at lower priority
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6e222cede8ab137db9118198d5533ec4a6f84c99 commit 6e222cede8ab137db9118198d5533ec4a6f84c99 Author: Mike Blumenkrantz Date: Tue Apr 21 15:17:56 2015 -0400 add wl client event callbacks at lower priority this ensures that bindings will activate before events are passed to clients --- src/bin/e_comp_wl.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index aca9abd..eacd9a7 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -654,22 +654,22 @@ _e_comp_wl_client_evas_init(E_Client *ec) _e_comp_wl_evas_cb_hide, ec); /* setup input callbacks */ - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_IN, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_IN, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_in, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_OUT, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_OUT, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_out, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_MOVE, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_MOVE, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_move, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_DOWN, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_DOWN, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_down, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_UP, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_UP, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_up, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_MOUSE_WHEEL, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_MOUSE_WHEEL, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_mouse_wheel, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_FOCUS_IN, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_FOCUS_IN, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_focus_in, ec); - evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_FOCUS_OUT, + evas_object_event_callback_priority_add(ec->frame, EVAS_CALLBACK_FOCUS_OUT, EVAS_CALLBACK_PRIORITY_AFTER, _e_comp_wl_evas_cb_focus_out, ec); if (!ec->override) --
[EGIT] [core/enlightenment] master 03/04: wl client pixmaps now use a different method for creating the pixmap id
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=96f07bff8ae46ff5a0daff726aafaa86bd0ef8d4
commit 96f07bff8ae46ff5a0daff726aafaa86bd0ef8d4
Author: Mike Blumenkrantz
Date: Tue Apr 21 15:19:20 2015 -0400
wl client pixmaps now use a different method for creating the pixmap id
---
src/bin/e_comp_wl.c | 116 --
src/bin/e_comp_wl.h | 6 --
src/bin/e_comp_wl_input.c | 6 +-
src/bin/e_pixmap.c| 8 +--
src/bin/e_win.c | 2 +-
src/modules/wl_desktop_shell/e_mod_main.c | 27 +--
6 files changed, 55 insertions(+), 110 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index eacd9a7..7e3620f 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1156,12 +1156,10 @@ _e_comp_wl_surface_cb_destroy(struct wl_client *client
EINA_UNUSED, struct wl_re
static void
_e_comp_wl_surface_cb_attach(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource, struct wl_resource *buffer_resource, int32_t sx, int32_t
sy)
{
- E_Pixmap *ep;
E_Client *ec;
E_Comp_Wl_Buffer *buffer = NULL;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (buffer_resource)
@@ -1184,12 +1182,10 @@ _e_comp_wl_surface_cb_attach(struct wl_client *client
EINA_UNUSED, struct wl_res
static void
_e_comp_wl_surface_cb_damage(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource, int32_t x, int32_t y, int32_t w, int32_t h)
{
- E_Pixmap *ep;
E_Client *ec;
Eina_Rectangle *dmg = NULL;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (!(dmg = eina_rectangle_new(x, y, w, h))) return;
@@ -1213,12 +1209,10 @@ _e_comp_wl_frame_cb_destroy(struct wl_resource
*resource)
static void
_e_comp_wl_surface_cb_frame(struct wl_client *client, struct wl_resource
*resource, uint32_t callback)
{
- E_Pixmap *ep;
E_Client *ec;
struct wl_resource *res;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
/* create frame callback */
@@ -1238,11 +1232,9 @@ _e_comp_wl_surface_cb_frame(struct wl_client *client,
struct wl_resource *resour
static void
_e_comp_wl_surface_cb_opaque_region_set(struct wl_client *client EINA_UNUSED,
struct wl_resource *resource, struct wl_resource *region_resource)
{
- E_Pixmap *ep;
E_Client *ec;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (region_resource)
@@ -1267,11 +1259,9 @@ _e_comp_wl_surface_cb_opaque_region_set(struct wl_client
*client EINA_UNUSED, st
static void
_e_comp_wl_surface_cb_input_region_set(struct wl_client *client EINA_UNUSED,
struct wl_resource *resource, struct wl_resource *region_resource)
{
- E_Pixmap *ep;
E_Client *ec;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (region_resource)
@@ -1293,12 +1283,10 @@ _e_comp_wl_surface_cb_input_region_set(struct wl_client
*client EINA_UNUSED, str
static void
_e_comp_wl_surface_cb_commit(struct wl_client *client EINA_UNUSED, struct
wl_resource *resource)
{
- E_Pixmap *ep;
E_Client *ec, *subc;
Eina_List *l;
- if (!(ep = wl_resource_get_user_data(resource))) return;
- if (!(ec = e_pixmap_client_get(ep))) return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (e_comp_wl_subsurface_commit(ec)) return;
@@ -1338,22 +1326,22 @@ static const struct wl_surface_interface
_e_surface_interface =
};
static void
+_e_comp_wl_surface_render_stop(E_Client *ec)
+{
+ /* FIXME: this may be fine after e_pixmap can create textures for wl
clients? */
+ //if ((!ec->internal) && (!e_comp_gl_get()))
+ ec->dead = ec->hidden = 1;
+ evas_object_hide(ec->frame);
+}
+
+static void
_e_comp_wl_surface_destroy(struct wl_resource *resource)
{
- E_Pixmap *ep;
E_Client *ec;
- if (!(ep = wl_resource_get_user_data(resource))) return;
-
- /* try to get the e_client from this pixmap */
- if (!(ec = e_pixmap_client_get(ep)))
- return;
+ if (!(ec = wl_resource_get_user_data(resource))) return;
- /* FIXME: th
[EGIT] [core/enlightenment] master 01/04: use client geom for comp object centering functions if ec->new_client is set
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b825af34cf2aef4af4359c5c25718410e22793cd commit b825af34cf2aef4af4359c5c25718410e22793cd Author: Mike Blumenkrantz Date: Tue Apr 21 15:05:25 2015 -0400 use client geom for comp object centering functions if ec->new_client is set --- src/bin/e_comp_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index dfd8ea4..923d90a 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2603,7 +2603,7 @@ e_comp_object_util_center(Evas_Object *obj) zone = e_comp_object_util_zone_get(obj); EINA_SAFETY_ON_NULL_RETURN(zone); e_zone_useful_geometry_get(zone, &x, &y, &w, &h); - if (cw && cw->ec->changes.size) + if (cw && (cw->ec->changes.size || cw->ec->new_client)) ow = cw->ec->w, oh = cw->ec->h; else evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); @@ -2620,7 +2620,7 @@ e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) SOFT_ENTRY(); EINA_SAFETY_ON_NULL_RETURN(on); evas_object_geometry_get(on, &x, &y, &w, &h); - if (cw && cw->ec->changes.size) + if (cw && (cw->ec->changes.size || cw->ec->new_client)) ow = cw->ec->w, oh = cw->ec->h; else evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); --
[EGIT] [core/enlightenment] master 04/04: disable client color editor for non-X clients for now
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=e869cb96496562fd83427b8c75d94bd333998945
commit e869cb96496562fd83427b8c75d94bd333998945
Author: Mike Blumenkrantz
Date: Tue Apr 21 15:21:19 2015 -0400
disable client color editor for non-X clients for now
---
src/bin/e_int_client_menu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c
index 2993589..1bc31af 100644
--- a/src/bin/e_int_client_menu.c
+++ b/src/bin/e_int_client_menu.c
@@ -702,7 +702,7 @@ _e_client_menu_cb_application_pre(void *data, E_Menu *m
EINA_UNUSED, E_Menu_Item
e_util_menu_item_theme_icon_set(submi, "preferences-desktop-keyboard");
}
- if (ec->color_editor) return;
+ if (ec->color_editor || (!e_pixmap_is_x(ec->pixmap))) return;
submi = e_menu_item_new(subm);
e_menu_item_label_set(submi, _("Edit Color Scheme"));
e_menu_item_callback_set(submi, _e_client_menu_cb_colors_edit, ec);
--
[EGIT] [core/efl] master 01/01: ecore-drm: Change ecore_drm_fb_set warning level
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=39e380f7542b6f409bae71d66531b88b6b42f590
commit 39e380f7542b6f409bae71d66531b88b6b42f590
Author: Chris Michael
Date: Tue Apr 21 13:58:41 2015 -0400
ecore-drm: Change ecore_drm_fb_set warning level
Summary: This is not actually "critical", it just means that we tried
to set a dumb buffer of the wrong size. Ecore_Evas will call this
function again after the canvas has been resized to the proper size,
so just issue a WRN here.
Signed-off-by: Chris Michael
---
src/lib/ecore_drm/ecore_drm_fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm/ecore_drm_fb.c b/src/lib/ecore_drm/ecore_drm_fb.c
index cfe4168..a3e3b37 100644
--- a/src/lib/ecore_drm/ecore_drm_fb.c
+++ b/src/lib/ecore_drm/ecore_drm_fb.c
@@ -175,7 +175,7 @@ ecore_drm_fb_set(Ecore_Drm_Device *dev, Ecore_Drm_Fb *fb)
if ((fb->w != dev->dumb[0]->w) || (fb->h != dev->dumb[0]->h))
{
/* we need to copy from fb to dev->dumb */
-CRIT("Trying to set a Framebuffer of improper size !!");
+WRN("Trying to set a Framebuffer of improper size !!");
return;
}
--
[EGIT] [core/efl] master 01/01: ecore-evas-drm: Fix issue of fullscreen surfaces not getting focus on show
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=92fc46cc165ba80010d8a05aad4bfaaab9d488d2
commit 92fc46cc165ba80010d8a05aad4bfaaab9d488d2
Author: Chris Michael
Date: Tue Apr 21 13:42:25 2015 -0400
ecore-evas-drm: Fix issue of fullscreen surfaces not getting focus on show
Summary: This fixed T2349 where elm apps would not get initial focus
on show when running via drm. This also addresses the issue of always
sending the state_change event even when not an override.
NB: Thanks to bu5hm4n for reporting ... and even providing a potential fix
;)
@fix
Signed-off-by: Chris Michael
---
.../ecore_evas/engines/drm/ecore_evas_drm.c| 35 ++
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index d602f47..6ee3659 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -698,10 +698,26 @@ static void
_ecore_evas_drm_show(Ecore_Evas *ee)
{
if ((!ee) || (ee->visible)) return;
- evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- ee->prop.withdrawn = EINA_FALSE;
- if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+
+ ee->should_be_visible = 1;
+
+ if (ee->prop.avoid_damage)
+ _ecore_evas_drm_render(ee);
+
+ if (ee->prop.override)
+ {
+ee->prop.withdrawn = EINA_FALSE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+ }
+
+ if (ee->visible) return;
+
ee->visible = 1;
+ if (ee->prop.fullscreen)
+ {
+evas_focus_in(ee->evas);
+if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
+ }
if (ee->func.fn_show) ee->func.fn_show(ee);
}
@@ -709,11 +725,18 @@ static void
_ecore_evas_drm_hide(Ecore_Evas *ee)
{
if ((!ee) || (!ee->visible)) return;
- evas_sync(ee->evas);
- ee->prop.withdrawn = EINA_TRUE;
- if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+
+ if (ee->prop.override)
+ {
+ee->prop.withdrawn = EINA_TRUE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+ }
+
+ if (!ee->visible) return;
+
ee->visible = 0;
ee->should_be_visible = 0;
+ evas_sync(ee->evas);
if (ee->func.fn_hide) ee->func.fn_hide(ee);
}
--
[EGIT] [admin/release-management] master 01/01: distro_version_fetching: Add Fedora rawhide tracking
stefan pushed a commit to branch master.
http://git.enlightenment.org/admin/release-management.git/commit/?id=c427236e41d7c2d00c04db1b468b6e63a02ec960
commit c427236e41d7c2d00c04db1b468b6e63a02ec960
Author: Stefan Schmidt
Date: Tue Apr 21 18:55:59 2015 +0200
distro_version_fetching: Add Fedora rawhide tracking
---
distributions_versions_fetch_script.py | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/distributions_versions_fetch_script.py
b/distributions_versions_fetch_script.py
index 985d00e..d7e2b88 100755
--- a/distributions_versions_fetch_script.py
+++ b/distributions_versions_fetch_script.py
@@ -40,7 +40,13 @@ def main():
,
"https://tracker.debian.org/pkg/terminology";,
"//*[@id=\"dtracker-package-left\"]/div[1]/div[2]/ul/li[2]/div[2]/text()", ""
),
#("Ubuntu in development",
"https://launchpad.net/ubuntu/vivid/amd64/libecore-con1/1.8.6-2.1ubuntu1";,
"//*[@id=\"portlet-details\"]/div/dl[1]/dd/text()", ""),
- #("Fedora in development",
"https://apps.fedoraproject.org/packages/efl";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""),
+ ("Fedora in development",
"https://apps.fedoraproject.org/packages/efl";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""
+ ,
"https://apps.fedoraproject.org/packages/elementary";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""
+ ,
"https://apps.fedoraproject.org/packages//evas-generic-loaders";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""
+ , "", "", ""
+ ,
"https://apps.fedoraproject.org/packages/enlightenment";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""
+ ,
"https://apps.fedoraproject.org/packages/terminology";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""
+ ),
#("Elive",
"http://repository.elivecd.org/pool/efl/libe/libefl/";,
"/html/body/pre/a/text()[starts-with(.,'libefl1_')]", "libefl1_"),
#("Arch",
"https://www.archlinux.org/packages/extra/x86_64/efl/";,
"/html/body/div[@id=\"content\"]/div[@id=\"pkgdetails\"]/h2/text()", "efl "),
#("openSUSE 13.2",
"http://download.opensuse.org/update/13.2/x86_64/";,
"/html/body/pre/a/text()[starts-with(., 'efl-')]", "efl-"),
--
[EGIT] [admin/release-management] master 01/01: distro_version_fetching: Allow for fetching versions for all parts we want tracked
stefan pushed a commit to branch master.
http://git.enlightenment.org/admin/release-management.git/commit/?id=4a7f65ef4873d70abc28607df0e3a4965103e1a7
commit 4a7f65ef4873d70abc28607df0e3a4965103e1a7
Author: Stefan Schmidt
Date: Tue Apr 21 18:41:43 2015 +0200
distro_version_fetching: Allow for fetching versions for all parts we want
tracked
Still work in progress but at least we can now define different urls, etc
for all
the parts we want to keep track of. We also output markdown syntax for the
table
now.
Next step is to fill more distros for the automated fetched and bring the
table in
shape for putting the generated output into the wiki.
---
distributions_versions_fetch_script.py | 123 ++---
1 file changed, 84 insertions(+), 39 deletions(-)
diff --git a/distributions_versions_fetch_script.py
b/distributions_versions_fetch_script.py
index 2ebef53..985d00e 100755
--- a/distributions_versions_fetch_script.py
+++ b/distributions_versions_fetch_script.py
@@ -18,6 +18,8 @@ def grep_version_string(repo_listing, pkg_name_prefix):
return None
def scrap_page(url, xpath, pkg_name_prefix):
+ if url is "":
+ return "-"
html_page = requests.get(url)
tree = html.fromstring(html_page.text)
html_text = tree.xpath(xpath)[0] # use first node
@@ -28,47 +30,90 @@ def main():
print "**Last Updated: " + str(datetime.date.today()) + "**"
distributions_data = [
- #("Debian 6.0.10",
"https://tracker.debian.org/pkg/efl";,
"//*[@id=\"dtracker-package-left\"]/div[1]/div[2]/ul/li[2]/div[2]/text()", ""),
- #("Debian 7.8",
"https://tracker.debian.org/pkg/efl";,
"//*[@id=\"dtracker-package-left\"]/div[1]/div[2]/ul/li[2]/div[2]/text()", ""),
- ("Debian in
development", "https://tracker.debian.org/pkg/efl";,
"//*[@id=\"dtracker-package-left\"]/div[1]/div[2]/ul/li[2]/div[2]/text()", ""),
- #("Ubuntu 14.04 (LTS)",
"https://launchpad.net/ubuntu/vivid/amd64/libecore-con1/1.8.6-2.1ubuntu1";,
"//*[@id=\"portlet-details\"]/div/dl[1]/dd/text()", ""),
- #("Ubuntu 14.10",
"https://launchpad.net/ubuntu/vivid/amd64/libecore-con1/1.8.6-2.1ubuntu1";,
"//*[@id=\"portlet-details\"]/div/dl[1]/dd/text()", ""),
- ("Ubuntu in
development",
"https://launchpad.net/ubuntu/vivid/amd64/libecore-con1/1.8.6-2.1ubuntu1";,
"//*[@id=\"portlet-details\"]/div/dl[1]/dd/text()", ""),
- #("Fedora 21",
"https://apps.fedoraproject.org/packages/efl";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""),
- #("Fedora 22",
"https://apps.fedoraproject.org/packages/efl";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""),
- ("Fedora in
development", "https://apps.fedoraproject.org/packages/efl";,
"//*[@id=\"package-info-bar\"]/div[1]/div[2]/text()", ""),
- #("Bodhi 3.0", "", "",
""),
- #("Bodhi in
development", "", "", ""),
- ("Elive",
"http://repository.elivecd.org/pool/efl/libe/libefl/";,
"/html/body/pre/a/text()[starts-with(.,'libefl1_')]", "libefl1_"),
- ("Arch",
"https://www.archlinux.org/packages/extra/x86_64/efl/";,
"/html/body/div[@id=\"content\"]/div[@id=\"pkgdetails\"]/h2/text()", "efl "),
- #("Arch AUR",
"https://www.archlinux.org/packages/extra/x86_64/efl/";,
"/html/body/div[@id=\"content\"]/div[@id=\"pkgdetails\"]/h2/text()", "efl "),
- #("openSUSE 13.1
(LTS)", "http://download.opensuse.org/ports/update/13.2/aarch64/";,
"/html/body/pre/a/text()[starts-with(., 'efl-')]", "efl-"),
- ("openSUSE 13.2",
"http://download.opensuse.org/ports/update/13.2/aarch64/";,
"/html/body/pre/a/text()[starts-with(., 'efl-')]", "efl-"),
- #("openSUSE
Tumbleweed", "http://download.opensuse.org/ports/update/13.2/aarch64/";,
"/html/body/pre/a/text()[starts-with(., 'efl-')]", "efl-"),
- #("openSUSE
Development", "http://download.opensuse.org/ports/update/13.2/aarch64/";,
"/html/body/pre/a/text()[starts-with(., 'efl-')]", "efl-"),
- #("openSUSE Weekly
Build", "http://download.opensuse.org/por
[EGIT] [core/efl] master 01/01: evas-blend-ops: fix off-by-1 in the C MUL3_SYM "simd" multiplier
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f7fb534562254b887b19029e0380e6da076982cd commit f7fb534562254b887b19029e0380e6da076982cd Author: Chris Michael Date: Tue Apr 21 11:23:28 2015 -0400 evas-blend-ops: fix off-by-1 in the C MUL3_SYM "simd" multiplier Summary: op_blend functions give off-by-1 using NEON intrinsics in C MUL3_SYM, this commit fixes that issue with no ill effects on other platforms. @fix Reviewers: raster, cedric Subscribers: cedric Projects: #efl Differential Revision: https://phab.enlightenment.org/D2394 --- src/lib/evas/include/evas_blend_ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/include/evas_blend_ops.h b/src/lib/evas/include/evas_blend_ops.h index 560236d..99b949e 100644 --- a/src/lib/evas/include/evas_blend_ops.h +++ b/src/lib/evas/include/evas_blend_ops.h @@ -111,7 +111,7 @@ extern const DATA32 ALPHA_256; #define MUL3_SYM(x, y) \ ( ((x) >> 8) & 0xff00) * (((y) >> 16) & 0xff)) + 0xff00) & 0xff) + \ - ((x) & 0xff00) * ((y) & 0xff00)) + 0xff00) >> 16) & 0xff00) + \ + ((x) & 0xff00) * ((y) & 0xff00)) + 0xff) >> 16) & 0xff00) + \ (x) & 0xff) * ((y) & 0xff)) + 0xff) >> 8) ) #define MUL_SYM(a, x) \ --
[EGIT] [core/efl] master 01/01: ecore_imf: init wayland before using wayland calls.
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c77812d8b0cb7664b5925922c66993482d4451df
commit c77812d8b0cb7664b5925922c66993482d4451df
Author: Marcel Hollerbach
Date: Tue Apr 21 10:06:38 2015 -0400
ecore_imf: init wayland before using wayland calls.
Summary:
ecore_imf: init wayland if wayland env var exists
Otherwise ecore-wl functions could return some invalid values. The env var
check to avoid error messages.
@fix
Reviewers: Sergeant_Whitespace, devilhorns
Reviewed By: Sergeant_Whitespace
Subscribers: Sergeant_Whitespace, cedric
Differential Revision: https://phab.enlightenment.org/D2253
---
src/modules/ecore_imf/wayland/wayland_module.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/src/modules/ecore_imf/wayland/wayland_module.c
b/src/modules/ecore_imf/wayland/wayland_module.c
index cfce52b..13d09f2 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -143,6 +143,12 @@ im_module_init(void)
_ecore_imf_wayland_log_dom =
eina_log_domain_register("ecore_imf_wayland", EINA_COLOR_YELLOW);
+ if (!getenv("WAYLAND_DISPLAY"))
+ return EINA_FALSE;
+
+ if (!ecore_wl_init(NULL))
+ return EINA_FALSE;
+
ecore_imf_module_register(&wayland_im_info, im_module_create,
im_module_exit);
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module initalized");
@@ -154,6 +160,7 @@ static void
im_module_shutdown(void)
{
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "im module shutdown");
+ ecore_wl_shutdown();
}
EINA_MODULE_INIT(im_module_init);
--
[EGIT] [core/enlightenment] master 01/01: e-comp-wl: Don't crash if we fail to create a new e_client
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9b7358aa32a44a1b40459358afbc7bf9c0429939
commit 9b7358aa32a44a1b40459358afbc7bf9c0429939
Author: Chris Michael
Date: Tue Apr 21 09:36:00 2015 -0400
e-comp-wl: Don't crash if we fail to create a new e_client
This "should" fix T2344 crashing, however I suppose a better question
is ... why is e_client_new returning NULL when it Does find the client
already in the hash...
Signed-off-by: Chris Michael
---
src/bin/e_comp_wl.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index a671197..aca9abd 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1395,11 +1395,13 @@ _e_comp_wl_compositor_cb_surface_create(struct
wl_client *client, struct wl_reso
}
DBG("\tUsing Pixmap: %p", ep);
- ec = e_client_new(ep, 0, 0);
- ec->new_client = 0;
- e_comp->new_clients--;
- ec->client.w = ec->client.h = 1;
- ec->ignored = 1;
+ if ((ec = e_client_new(ep, 0, 0)))
+ {
+ec->new_client = 0;
+e_comp->new_clients--;
+ec->client.w = ec->client.h = 1;
+ec->ignored = 1;
+ }
/* set reference to pixmap so we can fetch it later */
wl_resource_set_user_data(res, ep);
--
[EGIT] [core/efl] master 10/25: Ector: Fix (probably valid) clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=45b15037ef1e0a1ed10b1d97e6c503a2be0a
commit 45b15037ef1e0a1ed10b1d97e6c503a2be0a
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:02:57 2015 +0900
Ector: Fix (probably valid) clang warning
This time it looks like this is a valid warning.
if (abs(double) <= 0.1f) might too often be true since abs() returns
an int.
---
src/lib/ector/software/ector_software_gradient.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ector/software/ector_software_gradient.c
b/src/lib/ector/software/ector_software_gradient.c
index 5c3bcde..afd4dd3 100644
--- a/src/lib/ector/software/ector_software_gradient.c
+++ b/src/lib/ector/software/ector_software_gradient.c
@@ -217,7 +217,7 @@ fetch_radial_gradient(uint *buffer, Span_Data *data, int y,
int x, int length)
Ector_Renderer_Software_Gradient_Data *g_data = data->gradient;
// avoid division by zero
- if (abs(g_data->radial.a) <= 0.1f)
+ if (fabsf(g_data->radial.a) <= 0.1f)
{
_ector_memfill(buffer, 0, length);
return;
--
[EGIT] [core/efl] master 16/25: Ecore_Con: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a812df731101bf0f2f2afa9ef3baa662d3b7fcfa
commit a812df731101bf0f2f2afa9ef3baa662d3b7fcfa
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:03:33 2015 +0900
Ecore_Con: Fix clang warnings
---
src/lib/ecore_con/ecore_con.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index e8d7ab4..e06a1a3 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -1143,7 +1143,7 @@ ecore_con_event_server_data(Ecore_Con_Server *obj,
unsigned char *buf, int num,
ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e,
_ecore_con_event_server_data_free, NULL);
{
-Ecore_Con_Event_Data_Received event_info = { 0 };
+Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED,
&event_info));
@@ -1250,7 +1250,7 @@ ecore_con_event_client_data(Ecore_Con_Client *obj,
unsigned char *buf, int num,
ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
(Ecore_End_Cb)_ecore_con_event_client_data_free,
cl->host_server);
{
-Ecore_Con_Event_Data_Received event_info = { 0 };
+Ecore_Con_Event_Data_Received event_info = { NULL, 0 };
event_info.data = e->data;
event_info.size = e->size;
eo_do(obj, eo_event_callback_call(ECORE_CON_BASE_EVENT_DATA_RECEIVED,
&event_info));
--
[EGIT] [core/efl] master 12/25: Ethumb: Fix clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8fe89711ee9fcd74989d609edd05fe3f029884e9
commit 8fe89711ee9fcd74989d609edd05fe3f029884e9
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:35:48 2015 +0900
Ethumb: Fix clang warning
Unused function...
---
src/bin/ethumb_client/ethumbd.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/src/bin/ethumb_client/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index 510a7b4..3a86679 100644
--- a/src/bin/ethumb_client/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -878,17 +878,6 @@ _ethumb_table_append(Ethumbd *ed)
return i;
}
-static inline int
-_get_idx_for_path(const char *path)
-{
- int i;
- int n;
- n = sscanf(path, "/org/enlightenment/Ethumb/%d", &i);
- if (!n)
- return -1;
- return i;
-}
-
static void _name_owner_changed_cb(void *context, const char *bus, const char
*old_id, const char *new_id);
static void
--
[EGIT] [core/efl] master 13/25: ETC1: Fix more clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=97fd6614516cf80db57b8cb97c97b03c18724d89
commit 97fd6614516cf80db57b8cb97c97b03c18724d89
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:36:05 2015 +0900
ETC1: Fix more clang warnings
Some of these are a bit pointless (eg. init with {0})
but at least this silences clang and helps reveal more
potentially useful warnings.
---
src/static_libs/rg_etc/rg_etc1.c | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/static_libs/rg_etc/rg_etc1.c b/src/static_libs/rg_etc/rg_etc1.c
index 16f0ef0..d3bc390 100644
--- a/src/static_libs/rg_etc/rg_etc1.c
+++ b/src/static_libs/rg_etc/rg_etc1.c
@@ -1605,7 +1605,6 @@ rg_etc1_solution_coordinates_block_colors_get(const
Etc1_Solution_Coordinates *c
for (i = 0; i < 4; i++)
rg_etc1_color_quad_u8_init(&colors[i], br + pInten_table[i], bg +
pInten_table[i], bb + pInten_table[i], 255);
}
-#endif
static inline void
rg_etc1_pack_params_clear(rg_etc1_pack_params *params)
@@ -1613,6 +1612,7 @@ rg_etc1_pack_params_clear(rg_etc1_pack_params *params)
params->m_quality = rg_etc1_high_quality;
params->m_dithering = EINA_FALSE;
}
+#endif
static const int rg_etc1_default_scan_delta[] = { 0 };
@@ -2115,7 +2115,7 @@
rg_etc1_optimizer_evaluate_solution_fast(rg_etc1_optimizer *optimizer, const Etc
{
if (block_inten[0] > optimizer->m_pSorted_luma[n - 1])
{
- const uint min_error = labs(block_inten[0] -
optimizer->m_pSorted_luma[n - 1]);
+ const uint min_error = labs((long) block_inten[0] - (long)
optimizer->m_pSorted_luma[n - 1]);
if (min_error >= trial_solution->m_error)
continue;
}
@@ -2130,7 +2130,7 @@
rg_etc1_optimizer_evaluate_solution_fast(rg_etc1_optimizer *optimizer, const Etc
{
if (optimizer->m_pSorted_luma[0] > block_inten[3])
{
- const uint min_error = labs(optimizer->m_pSorted_luma[0] -
block_inten[3]);
+ const uint min_error = labs((long)
optimizer->m_pSorted_luma[0] - (long) block_inten[3]);
if (min_error >= trial_solution->m_error)
continue;
}
@@ -2581,9 +2581,9 @@ rg_etc1_pack_block(void* pETC1_block, const unsigned int*
pSrc_pixels_BGRA, rg_e
uint best_use_color4=EINA_FALSE;
uint best_flip=EINA_FALSE;
uint8 best_selectors[2][8];
- rg_etc1_optimizer optimizer = { 0 };
- rg_etc1_optimizer_results best_results[2] = { { 0 } };
- rg_etc1_optimizer_results results[3] = { { 0 } };
+ rg_etc1_optimizer optimizer;
+ rg_etc1_optimizer_results best_results[2];
+ rg_etc1_optimizer_results results[3];
rg_etc1_optimizer_params params;
uint i, flip;
uint8 selectors[3][8];
@@ -2593,6 +2593,10 @@ rg_etc1_pack_block(void* pETC1_block, const unsigned
int* pSrc_pixels_BGRA, rg_e
static const int s_scan_delta_0_to_1[] = { -1, 0, 1 };
static const int s_scan_delta_0[] = { 0 };
+ memset(&optimizer, 0, sizeof(optimizer));
+ memset(&best_results, 0, sizeof(best_results));
+ memset(&results, 0, sizeof(results));
+
#ifdef RG_ETC1_BUILD_DEBUG
// Ensure all alpha values are 0xFF.
for (i = 0; i < 16; i++)
--
[EGIT] [core/efl] master 05/25: Evas render2: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fb812c13b37a348d885f99738611b6021e5b28a1
commit fb812c13b37a348d885f99738611b6021e5b28a1
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:44:41 2015 +0900
Evas render2: Fix clang warnings
More unused functions. Kept around for later debugging.
---
src/lib/evas/canvas/evas_object_main.c | 2 +-
src/lib/evas/canvas/render2/evas_render2.c | 16
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_main.c
b/src/lib/evas/canvas/evas_object_main.c
index d25a460..5f0db50 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -37,7 +37,7 @@ static const Evas_Object_Filter_Data default_filter = {
};
const void * const evas_object_filter_cow_default = &default_filter;
static const Evas_Object_Mask_Data default_mask = {
- NULL, 0, 0, EINA_FALSE
+ NULL, 0, 0, EINA_FALSE, EINA_FALSE, EINA_FALSE, EINA_FALSE
};
Eina_Cow *evas_object_proxy_cow = NULL;
diff --git a/src/lib/evas/canvas/render2/evas_render2.c
b/src/lib/evas/canvas/render2/evas_render2.c
index 04596b9..b4080e4 100644
--- a/src/lib/evas/canvas/render2/evas_render2.c
+++ b/src/lib/evas/canvas/render2/evas_render2.c
@@ -2,7 +2,6 @@
#ifdef EVAS_RENDER_DEBUG_TIMING
#include
-#endif
#ifndef _WIN32
static inline double
@@ -20,23 +19,16 @@ get_time(void)
}
#endif
-
-
-
-
-
-
-
-
-// a list of canvases currently rendering
-static Eina_List *_rendering = NULL;
-
static inline void
out_time(double t)
{
double b = (t * 100.0) / (1.0 / 60.0);
printf("%1.8fs (%1.2f%% 60fps budget)\n", t, b);
}
+#endif
+
+// a list of canvases currently rendering
+static Eina_List *_rendering = NULL;
static void
_always_call(Eo *eo_e, Evas_Callback_Type type, void *event_info)
--
[EGIT] [core/efl] master 17/25: Evas GL common: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8e8444bf35be2ce5af0b3dcdc751cd1a3d5328af
commit 8e8444bf35be2ce5af0b3dcdc751cd1a3d5328af
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:47:44 2015 +0900
Evas GL common: Fix clang warnings
Marrr!
---
src/modules/evas/engines/gl_common/evas_gl_texture.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c
b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index a8f95ed..f65784d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -2,8 +2,6 @@
static const GLenum rgba_fmt = GL_RGBA;
static const GLenum rgba_ifmt = GL_RGBA;
-static const GLenum rgb_fmt= GL_RGBA;
-static const GLenum rgb_ifmt = GL_RGB;
#ifdef GL_GLES
static const GLenum bgra_fmt = GL_BGRA;
@@ -11,6 +9,8 @@ static const GLenum bgra_ifmt = GL_BGRA;
static const GLenum bgr_fmt= GL_BGRA;
static const GLenum bgr_ifmt = GL_BGRA;
#else
+static const GLenum rgb_fmt= GL_RGBA;
+static const GLenum rgb_ifmt = GL_RGB;
static const GLenum bgra_fmt = GL_BGRA;
static const GLenum bgra_ifmt = GL_RGBA;
static const GLenum bgr_fmt= GL_BGRA;
@@ -89,6 +89,8 @@ static const struct {
{ MATCH_ANY, MATCH_ANY, EVAS_COLORSPACE_RGBA_S3TC_DXT5,
&s3tc_rgba_dxt45_fmt, &s3tc_rgba_dxt45_fmt }
};
+#ifdef GL_TEXTURE_INTERNAL_FORMAT
+# ifndef GL_GLES
static const GLenum matching_rgb[] = { GL_RGB4, GL_RGB8, GL_RGB12, GL_RGB16,
0x0 };
static const GLenum matching_rgba[] = { GL_RGBA4, GL_RGBA8, GL_RGBA12,
GL_RGBA16, 0x0 };
static const GLenum matching_alpha[] = { GL_ALPHA4, GL_ALPHA8, GL_ALPHA12,
GL_ALPHA16, 0x0 };
@@ -107,10 +109,6 @@ static const struct {
{ GL_LUMINANCE_ALPHA, matching_luminance_alpha }
};
-#define MATCH(_r, _v) ((_r == MATCH_ANY) || (_v == MATCH_ANY) || (_r == _v))
-
-#ifdef GL_TEXTURE_INTERNAL_FORMAT
-# ifndef GL_GLES
static Eina_Bool
_evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
{
@@ -134,6 +132,8 @@ _evas_gl_texture_match(GLenum intfmt, GLenum intfmtret)
# endif
#endif
+#define MATCH(_r, _v) ((_r == MATCH_ANY) || (_v == MATCH_ANY) || (_r == _v))
+
static int
_evas_gl_texture_search_format(Eina_Bool alpha, Eina_Bool bgra,
Evas_Colorspace cspace)
{
--
[EGIT] [core/efl] master 19/25: Edje edit: Fix clang warning
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=98f56df65715354ce01cf3f84fb4f613243bdfe5 commit 98f56df65715354ce01cf3f84fb4f613243bdfe5 Author: Jean-Philippe Andre Date: Tue Apr 21 20:28:44 2015 +0900 Edje edit: Fix clang warning Remove useless variable --- src/lib/edje/edje_edit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index b751223..e129ef9 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -88,7 +88,6 @@ _alloc(size_t size) /*/ /* Edje_Edit smart! Overloads the edje one adding some more control stuff */ -static const char _edje_edit_type[] = "edje_edit"; typedef struct _Edje_Edit Edje_Edit; struct _Edje_Edit --
[EGIT] [core/efl] master 20/25: Eeze: Silence clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=255e71d83ea7535859fad7ede9356d5519fc
commit 255e71d83ea7535859fad7ede9356d5519fc
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:31:39 2015 +0900
Eeze: Silence clang warning
---
src/bin/eeze/eeze_scanner.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/eeze/eeze_scanner.c b/src/bin/eeze/eeze_scanner.c
index c16447c..416f9ea 100644
--- a/src/bin/eeze/eeze_scanner.c
+++ b/src/bin/eeze/eeze_scanner.c
@@ -398,7 +398,9 @@ static void
sigs_setup(void)
{
sigset_t sigs = {{0}};
- struct sigaction s = {{0}};
+ struct sigaction s;
+
+ memset(&s, 0, sizeof(s));
sigfillset(&sigs);
sigdelset(&sigs, SIGSEGV);
--
[EGIT] [core/efl] master 01/25: Evas: Fix clang warning in generated shaders file
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=20dac6d27a25c139fa69a536a30ebc1428909027
commit 20dac6d27a25c139fa69a536a30ebc1428909027
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:30:58 2015 +0900
Evas: Fix clang warning in generated shaders file
Use const char a[] instead of const char const a[].
---
.../evas/engines/gl_common/evas_gl_shader.c| 2 +-
.../engines/gl_common/shader/evas_gl_shaders.x | 296 ++---
.../evas/engines/gl_common/shader/gen_shaders.sh | 2 +-
.../gl_common/shader_3d/evas_gl_3d_shaders.x | 32 +--
.../engines/gl_common/shader_3d/gen_shaders_3d.sh | 2 +-
5 files changed, 167 insertions(+), 167 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c
b/src/modules/evas/engines/gl_common/evas_gl_shader.c
index c41ca4f..4b87779 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_shader.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c
@@ -393,7 +393,7 @@ evas_gl_common_img_shader_select(Shader_Sampling sam, int
nomul, int afill, int
const char *
evas_gl_common_shader_name_get(Evas_GL_Shader shd)
{
- if ((shd >= 0) && (shd < (sizeof(_shaders_source) /
sizeof(_shaders_source[0]
+ if (shd < (sizeof(_shaders_source) / sizeof(_shaders_source[0])))
return _shaders_source[shd].name;
return "UNKNOWN";
}
diff --git a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
index 38cdc25..a14c527 100644
--- a/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
+++ b/src/modules/evas/engines/gl_common/shader/evas_gl_shaders.x
@@ -3,7 +3,7 @@
#include "../evas_gl_private.h"
-static const char const rect_frag_glsl[] =
+static const char rect_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -27,7 +27,7 @@ Evas_GL_Program_Source shader_rect_frag_src =
NULL, 0
};
-static const char const rect_vert_glsl[] =
+static const char rect_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -46,7 +46,7 @@ Evas_GL_Program_Source shader_rect_vert_src =
NULL, 0
};
-static const char const rect_mask_frag_glsl[] =
+static const char rect_mask_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -73,7 +73,7 @@ Evas_GL_Program_Source shader_rect_mask_frag_src =
NULL, 0
};
-static const char const rect_mask_vert_glsl[] =
+static const char rect_mask_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -96,7 +96,7 @@ Evas_GL_Program_Source shader_rect_mask_vert_src =
NULL, 0
};
-static const char const font_frag_glsl[] =
+static const char font_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -122,7 +122,7 @@ Evas_GL_Program_Source shader_font_frag_src =
NULL, 0
};
-static const char const font_vert_glsl[] =
+static const char font_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -144,7 +144,7 @@ Evas_GL_Program_Source shader_font_vert_src =
NULL, 0
};
-static const char const font_mask_frag_glsl[] =
+static const char font_mask_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -173,7 +173,7 @@ Evas_GL_Program_Source shader_font_mask_frag_src =
NULL, 0
};
-static const char const font_mask_vert_glsl[] =
+static const char font_mask_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -199,7 +199,7 @@ Evas_GL_Program_Source shader_font_mask_vert_src =
NULL, 0
};
-static const char const img_frag_glsl[] =
+static const char img_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -225,7 +225,7 @@ Evas_GL_Program_Source shader_img_frag_src =
NULL, 0
};
-static const char const img_vert_glsl[] =
+static const char img_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -247,7 +247,7 @@ Evas_GL_Program_Source shader_img_vert_src =
NULL, 0
};
-static const char const img_bgra_frag_glsl[] =
+static const char img_bgra_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -273,7 +273,7 @@ Evas_GL_Program_Source shader_img_bgra_frag_src =
NULL, 0
};
-static const char const img_bgra_vert_glsl[] =
+static const char img_bgra_vert_glsl[] =
"#ifdef GL_ES\n"
"precision highp float;\n"
"#endif\n"
@@ -295,7 +295,7 @@ Evas_GL_Program_Source shader_img_bgra_vert_src =
NULL, 0
};
-static const char const img_12_frag_glsl[] =
+static const char img_12_frag_glsl[] =
"#ifdef GL_ES\n"
"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
"precision highp float;\n"
@@ -325,7 +325,7 @@ Evas_GL_Pro
[EGIT] [core/efl] master 14/25: ecore_evas_convert: Fix useless clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2cff6f120545177b4328b8ae11f62e4b6d8744df
commit 2cff6f120545177b4328b8ae11f62e4b6d8744df
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:44:47 2015 +0900
ecore_evas_convert: Fix useless clang warning
---
src/bin/ecore_evas/ecore_evas_convert.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/ecore_evas/ecore_evas_convert.c
b/src/bin/ecore_evas/ecore_evas_convert.c
index d23d357..654668d 100644
--- a/src/bin/ecore_evas/ecore_evas_convert.c
+++ b/src/bin/ecore_evas/ecore_evas_convert.c
@@ -97,7 +97,7 @@ main(int argc, char *argv[])
Eina_Bool compress = 1;
Eina_Bool quit_option = EINA_FALSE;
Eina_Strbuf *flags = NULL;
- struct Save_Job job = {0};
+ struct Save_Job job = { NULL, NULL, NULL, NULL, 0, 0 };
Ecore_Getopt_Value values[] = {
ECORE_GETOPT_VALUE_INT(quality),
--
[EGIT] [core/efl] master 21/25: Efreet: Silence clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6a0d2382f1a1f3e7587450c0decc47a9bd2f8a27
commit 6a0d2382f1a1f3e7587450c0decc47a9bd2f8a27
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:32:54 2015 +0900
Efreet: Silence clang warning
[unsigned - unsigned] is unsigned and might wrap around, the implicit
conversion to int (by calling abs()) saved the game here.
---
src/lib/efreet/efreet_icon.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/efreet/efreet_icon.c b/src/lib/efreet/efreet_icon.c
index 4ad8a6b..89e87f0 100644
--- a/src/lib/efreet/efreet_icon.c
+++ b/src/lib/efreet/efreet_icon.c
@@ -612,7 +612,7 @@ static double
efreet_icon_size_distance(Efreet_Cache_Icon_Element *elem, unsigned int size)
{
if (elem->type == EFREET_ICON_SIZE_TYPE_FIXED)
-return (abs(elem->normal - size));
+return (abs((int) elem->normal - (int) size));
if ((elem->type == EFREET_ICON_SIZE_TYPE_SCALABLE) ||
(elem->type == EFREET_ICON_SIZE_TYPE_THRESHOLD))
--
[EGIT] [core/efl] master 18/25: Evas: Fix clang warning (actually use function)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=de567368f817508b461ba61f04c5666b3290e150
commit de567368f817508b461ba61f04c5666b3290e150
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:14:23 2015 +0900
Evas: Fix clang warning (actually use function)
Those helper functions are barely ever used...
---
src/lib/evas/common/evas_convert_colorspace.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/evas/common/evas_convert_colorspace.c
b/src/lib/evas/common/evas_convert_colorspace.c
index c12952a..77d1cb1 100644
--- a/src/lib/evas/common/evas_convert_colorspace.c
+++ b/src/lib/evas/common/evas_convert_colorspace.c
@@ -77,6 +77,8 @@ evas_common_convert_argb_to(void *data, int w, int h, int
stride, Eina_Bool
{
case EVAS_COLORSPACE_RGB565_A5P:
return evas_common_convert_argb_to_rgb565_a5p(data, w, h, stride,
has_alpha);
+ case EVAS_COLORSPACE_GRY8:
+ return evas_common_convert_argb_to_a8(data, w, h, stride,
has_alpha);
default:
break;
}
--
[EGIT] [core/efl] master 02/25: Eina: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a3897562c565d1b40e2fcb8d0c412da344dbe7db
commit a3897562c565d1b40e2fcb8d0c412da344dbe7db
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:35:45 2015 +0900
Eina: Fix clang warnings
Remove unused static function
---
src/lib/eina/eina_rbtree.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/src/lib/eina/eina_rbtree.c b/src/lib/eina/eina_rbtree.c
index abf4ad0..61de138 100644
--- a/src/lib/eina/eina_rbtree.c
+++ b/src/lib/eina/eina_rbtree.c
@@ -237,12 +237,6 @@ _eina_rbtree_node_init(Eina_Rbtree *node)
node->color = EINA_RBTREE_RED;
}
-static inline Eina_Bool
-_eina_rbtree_is_red(Eina_Rbtree *node)
-{
- return !!node && node->color == EINA_RBTREE_RED;
-}
-
static inline Eina_Rbtree *
_eina_rbtree_inline_single_rotation(Eina_Rbtree *node,
Eina_Rbtree_Direction dir)
--
[EGIT] [core/efl] master 04/25: Eolian: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=92a844fd36bc20b51129bb020d8b4f23a73ff0a8
commit 92a844fd36bc20b51129bb020d8b4f23a73ff0a8
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:41:48 2015 +0900
Eolian: Fix clang warnings
Return proper type (NULL, not bool)
---
src/lib/eolian/database_function_api.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eolian/database_function_api.c
b/src/lib/eolian/database_function_api.c
index fbe1e1c..fd78fef 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -253,7 +253,7 @@ eolian_function_object_is_const(const Eolian_Function *fid)
EAPI const Eolian_Class *
eolian_function_class_get(const Eolian_Function *fid)
{
- EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(fid, NULL);
return fid->klass;
}
--
[EGIT] [core/efl] master 08/25: ETC1/2: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=565a4da138d7094a003acdf51325c19d23e36010
commit 565a4da138d7094a003acdf51325c19d23e36010
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:42:33 2015 +0900
ETC1/2: Fix clang warnings
Unused functions.
I keep them around for reference, for whoever wants to work on
improving the encoder.
There are still some warnings. Clang is just crazy.
---
src/static_libs/rg_etc/etc2_encoder.c | 4
src/static_libs/rg_etc/rg_etc1.c | 29 -
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/src/static_libs/rg_etc/etc2_encoder.c
b/src/static_libs/rg_etc/etc2_encoder.c
index 2ed0936..6f43907 100644
--- a/src/static_libs/rg_etc/etc2_encoder.c
+++ b/src/static_libs/rg_etc/etc2_encoder.c
@@ -36,10 +36,12 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Enable this flag when working on (quality) optimizations
//#define DEBUG
+#ifdef DEBUG
// Weights for the distance (perceptual mode) - sum is ~1024
static const int R_WEIGHT = 299 * 1024 / 1000;
static const int G_WEIGHT = 587 * 1024 / 1000;
static const int B_WEIGHT = 114 * 1024 / 1000;
+#endif
static const int kTargetError[3] = {
5*5*16, // 34 dB
@@ -446,6 +448,7 @@ _etc2_h_mode_header_pack(uint8_t *etc2, Eina_Bool
*swap_colors,
return EINA_TRUE;
}
+#ifdef DEBUG
static inline int
_rgb_distance_percept(uint32_t color1, uint32_t color2)
{
@@ -454,6 +457,7 @@ _rgb_distance_percept(uint32_t color1, uint32_t color2)
int B = B_VAL(color1) - B_VAL(color2);
return (R * R * R_WEIGHT) + (G * G * G_WEIGHT) + (B * B * B_WEIGHT);
}
+#endif
static inline int
_rgb_distance_euclid(uint32_t color1, uint32_t color2)
diff --git a/src/static_libs/rg_etc/rg_etc1.c b/src/static_libs/rg_etc/rg_etc1.c
index 172508e..16f0ef0 100644
--- a/src/static_libs/rg_etc/rg_etc1.c
+++ b/src/static_libs/rg_etc/rg_etc1.c
@@ -540,6 +540,7 @@ rg_etc1_color_quad_set(unsigned int old_color, unsigned int
new_color)
return (new_color & ~A_MASK) | (old_color & A_MASK);
}
+#if 0
static inline void
rg_etc1_color_quad_get(unsigned int color, unsigned char *r, unsigned char *g,
unsigned char *b, unsigned char *alpha)
{
@@ -549,6 +550,7 @@ rg_etc1_color_quad_get(unsigned int color, unsigned char
*r, unsigned char *g, u
if (b) *b = B_VAL_GET(&color);
if (alpha) *alpha = A_VAL_GET(&color);
}
+#endif
#if RG_ETC1_CONSTRAINED_SUBBLOCK
static inline unsigned char
@@ -749,6 +751,7 @@ rg_etc1_vec_scale(float r[3], float s)
r[i] *= s;
}
+#if 0
static inline unsigned char
rg_etc1_block_byte_bits_get(const unsigned char bytes[8], unsigned char
offset, unsigned char num)
{
@@ -767,6 +770,7 @@ rg_etc1_block_byte_bits_set(unsigned char bytes[8],
unsigned char offset, unsign
bytes[byte_offset] &= ~(mask << byte_bit_offset);
bytes[byte_offset] |= (((!!bits) & 0x1) << byte_bit_offset);
}
+#endif
static inline unsigned char
rg_etc1_block_flip_bit_get(const unsigned char bytes[8])
@@ -774,12 +778,14 @@ rg_etc1_block_flip_bit_get(const unsigned char bytes[8])
return (bytes[3] & 1) != 0;
}
+#if 0
static inline void
rg_etc1_block_flip_bit_set(unsigned char bytes[8], unsigned char flip)
{
bytes[3] &= ~1;
bytes[3] |= (!!flip) & 0x1;
}
+#endif
static inline unsigned char
rg_etc1_block_diff_bit_get(const unsigned char bytes[8])
@@ -787,6 +793,7 @@ rg_etc1_block_diff_bit_get(const unsigned char bytes[8])
return (bytes[3] & 2) != 0;
}
+#if 0
static inline void
rg_etc1_block_diff_bit_set(unsigned char bytes[8], unsigned char diff)
{
@@ -862,6 +869,7 @@ rg_etc1_block_selector_set(unsigned char bytes[8], unsigned
char x, unsigned cha
p[-2] &= ~mask;
p[-2] |= (msb << byte_bit_offsets);
}
+#endif
static inline unsigned short
rg_etc_block_base4_color_get(const unsigned char bytes[8], unsigned char idx)
@@ -884,6 +892,7 @@ rg_etc_block_base4_color_get(const unsigned char bytes[8],
unsigned char idx)
return b | (g << 4) | (r << 8);
}
+#if 0
static inline void
rg_etc1_block_base4_color_set(unsigned char bytes[8], unsigned char idx,
unsigned short c)
{
@@ -900,6 +909,7 @@ rg_etc1_block_base4_color_set(unsigned char bytes[8],
unsigned char idx, unsigne
rg_etc1_block_byte_bits_set(bytes, cETC1AbsColor4B1BitOffset, 4, c &
15);
}
}
+#endif
static inline unsigned short
rg_etc1_block_base5_color_get(const unsigned char bytes[8])
@@ -913,6 +923,7 @@ rg_etc1_block_base5_color_get(const unsigned char bytes[8])
return b | (g << 5) | (r << 10);
}
+#if 0
static inline void
rg_etc1_block_base5_color_set(unsigned char bytes[8], unsigned short c)
{
@@ -920,6 +931,7 @@ rg_etc1_block_base5_color_set(unsigned char bytes[8],
unsigned short c)
rg_etc1_block_byte_bits_set(bytes, cETC1BaseColor5GBitOffset, 5, (c >> 5) &
31);
rg_etc1_block_byte_bits_set(bytes, cETC1BaseColor5BBitOffset, 5, c & 31);
}
+#endif
st
[EGIT] [core/efl] master 22/25: Ector: More clang silencing
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=841403e41545a364447aca100c5d16db716fd994
commit 841403e41545a364447aca100c5d16db716fd994
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:40:27 2015 +0900
Ector: More clang silencing
---
src/lib/ector/software/ector_software_rasterizer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ector/software/ector_software_rasterizer.c
b/src/lib/ector/software/ector_software_rasterizer.c
index 495e50f..2c55565 100644
--- a/src/lib/ector/software/ector_software_rasterizer.c
+++ b/src/lib/ector/software/ector_software_rasterizer.c
@@ -412,7 +412,7 @@
ector_software_rasterizer_generate_stroke_rle_data(Software_Rasterizer *rasteriz
SW_FT_Stroker_ParseOutline(rasterizer->stroker, outline, !closePath);
SW_FT_Stroker_GetCounts(rasterizer->stroker,&points, &contors);
- SW_FT_Outline strokeOutline = {0};
+ SW_FT_Outline strokeOutline = { 0, 0, NULL, NULL, NULL, 0 };
strokeOutline.points = (SW_FT_Vector *) calloc(points,
sizeof(SW_FT_Vector));
strokeOutline.tags = (char *) calloc(points, sizeof(char));
strokeOutline.contours = (short *) calloc(contors, sizeof(short));
--
[EGIT] [core/efl] master 24/25: Edje: Silence more clang stuff
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3b35e354f2fb152ffecda05110ffed13817e090c
commit 3b35e354f2fb152ffecda05110ffed13817e090c
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:44:38 2015 +0900
Edje: Silence more clang stuff
And make it explicit that the enum is unsigned
---
src/lib/edje/edje_multisense.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje/edje_multisense.c b/src/lib/edje/edje_multisense.c
index 0efb1e7..da24e0c 100644
--- a/src/lib/edje/edje_multisense.c
+++ b/src/lib/edje/edje_multisense.c
@@ -110,7 +110,7 @@ EAPI void
edje_audio_channel_mute_set(Edje_Channel channel, Eina_Bool mute)
{
#ifdef ENABLE_MULTISENSE
- if ((channel < 0) || (channel > 7)) return;
+ if ((unsigned) channel > 7) return;
_channel_mute_states[channel] = mute;
#else
(void) channel;
@@ -122,7 +122,7 @@ EAPI Eina_Bool
edje_audio_channel_mute_get(Edje_Channel channel)
{
#ifdef ENABLE_MULTISENSE
- if ((channel < 0) || (channel > 7)) return EINA_FALSE;
+ if ((unsigned) channel > 7) return EINA_FALSE;
return _channel_mute_states[channel];
#else
(void) channel;
--
[EGIT] [core/efl] master 23/25: Evas tiler: Remove unused functions (clang)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=02d94f5e5e3eb973e7983a41993870d04d4d47c6
commit 02d94f5e5e3eb973e7983a41993870d04d4d47c6
Author: Jean-Philippe Andre
Date: Tue Apr 21 20:40:41 2015 +0900
Evas tiler: Remove unused functions (clang)
rect_list_add_split_strict is still kept for reference in
eina_tiler.c
---
src/lib/evas/common/evas_tiler.c | 85 +---
1 file changed, 2 insertions(+), 83 deletions(-)
diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c
index d787ec2..2dbe9fd 100644
--- a/src/lib/evas/common/evas_tiler.c
+++ b/src/lib/evas/common/evas_tiler.c
@@ -2,8 +2,8 @@
#define FUZZ 32
#define MAXREG 24
+#define MAX_NODES 1024
-static inline void rect_list_node_pool_set_max(int max);
static inline void rect_list_node_pool_flush(void);
static inline list_node_t *rect_list_node_pool_get(void);
static inline void rect_list_node_pool_put(list_node_t *node);
@@ -16,7 +16,6 @@ static inline list_node_t *rect_list_unlink_next(list_t
*rects, list_node_t *par
static inline void rect_list_del_next(list_t *rects, list_node_t *parent_node);
static inline void rect_list_clear(list_t *rects);
static inline void rect_list_del_split_strict(list_t *rects, const rect_t
del_r);
-static inline void rect_list_add_split_strict(list_t *rects, list_node_t
*node);
static inline list_node_t *rect_list_add_split_fuzzy(list_t *rects,
list_node_t *node, int accepted_error);
static inline void rect_list_merge_rects(list_t *rects, list_t *to_merge, int
accepted_error);
static inline void rect_list_add_split_fuzzy_and_merge(list_t *rects,
list_node_t *node, int split_accepted_error, int merge_accepted_error);
@@ -31,24 +30,7 @@ typedef struct list_node_pool
int max;
} list_node_pool_t;
-static list_node_pool_t list_node_pool = { NULL, 0, 1024 };
-
-static inline void
-rect_list_node_pool_set_max(int max)
-{
- int diff;
-
- diff = list_node_pool.len - max;
- for (; diff > 0 && list_node_pool.node; diff--)
- {
-list_node_t *node = list_node_pool.node;
-list_node_pool.node = node->next;
-list_node_pool.len--;
-free(node);
- }
-
- list_node_pool.max = max;
-}
+static list_node_pool_t list_node_pool = { NULL, 0, MAX_NODES };
static inline void
rect_list_node_pool_flush(void)
@@ -321,69 +303,6 @@ rect_list_del_split_strict(list_t *rects, const rect_t
del_r)
}
static inline void
-rect_list_add_split_strict(list_t *rects, list_node_t *node)
-{
- list_t dirty = list_zeroed;
- list_t new_dirty = list_zeroed;
- list_node_t *cur_node;
-
- if (!rects->head)
- {
-rect_list_append_node(rects, node);
-return;
- }
- rect_list_append_node(&dirty, node);
- cur_node = rects->head;
- while (dirty.head)
- {
-rect_t current;
-
-if (!cur_node)
- {
-rect_list_concat(rects, &dirty);
-break;
- }
-current = ((rect_node_t*)cur_node)->rect;
-while (dirty.head)
- {
-int intra_width, intra_height;
-rect_t r;
-
-r = ((rect_node_t *)dirty.head)->rect;
-_calc_intra_rect_area(r, current, &intra_width, &intra_height);
-if ((intra_width == r.width) && (intra_height == r.height))
- /* .---.cur
- * | .---.r|
- * | | | |
- * | `---' |
- * `---'
- */
- rect_list_del_next(&dirty, NULL);
-else if ((intra_width <= 0) || (intra_height <= 0))
- {
- /* .---.cur .---.r
- * | || |
- * `---+---.r `---+---.cur
- * | || |
- * `---'`---'
- */
- list_node_t *tmp;
- tmp = rect_list_unlink_next(&dirty, NULL);
- rect_list_append_node(&new_dirty, tmp);
- }
-else
- {
- _split_strict(&new_dirty, current, r);
- rect_list_del_next(&dirty, NULL);
- }
- }
-dirty = new_dirty;
-new_dirty = list_zeroed;
-cur_node = cur_node->next;
-}
-}
-
-static inline void
_calc_intra_outer_rect_area(const rect_t a, const rect_t b,
rect_t *intra, rect_t *outer)
{
--
[EGIT] [core/efl] master 25/25: Evas 3d: Fix clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2e49f60f611dee0494850fa5b78880cdbaed2d48
commit 2e49f60f611dee0494850fa5b78880cdbaed2d48
Author: Jean-Philippe Andre
Date: Tue Apr 21 21:08:30 2015 +0900
Evas 3d: Fix clang warning
Unused function
---
src/modules/evas/engines/gl_common/evas_gl_3d.c | 9 -
1 file changed, 9 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c
b/src/modules/evas/engines/gl_common/evas_gl_3d.c
index 7b82859..1de2c64 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -642,15 +642,6 @@ e3d_drawable_format_get(E3D_Drawable *drawable)
return drawable->format;
}
-static inline GLuint
-_texture_id_get(Evas_3D_Texture *texture)
-{
- Evas_3D_Texture_Data *pd = eo_data_scope_get(texture,
EVAS_3D_TEXTURE_CLASS);
- E3D_Texture *tex = (E3D_Texture *)pd->engine_data;
-
- return tex->tex;
-}
-
static inline void
_mesh_frame_find(Evas_3D_Mesh *mesh, int frame,
Eina_List **l, Eina_List **r)
--
[EGIT] [core/efl] master 11/25: Evas/cserve2: Fix clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=25b48463142019fc3ad6c2094f1fc7d17b6143ca
commit 25b48463142019fc3ad6c2094f1fc7d17b6143ca
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:14:12 2015 +0900
Evas/cserve2: Fix clang warning
---
src/lib/evas/cserve2/evas_cs2_client.c | 19 ---
1 file changed, 19 deletions(-)
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c
b/src/lib/evas/cserve2/evas_cs2_client.c
index bdea591..da3b178 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -94,25 +94,6 @@ static unsigned int _glyph_request_server_send(Font_Entry
*fe, Font_Hint_Flags h
#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)NULL)->sun_path)
#endif
-static inline Eina_Bool
-_memory_zero_cmp(void *data, size_t len)
-{
- const int *idata = data;
- const char *cdata;
- int remain;
-
- if (!data || !len) return EINA_TRUE;
-
- for (remain = len / sizeof(idata); remain > 0; --remain)
- if (*idata++ != 0) return EINA_FALSE;
-
- cdata = (const char*) idata;
- for (remain = ((const char*) data + len) - cdata; remain > 0; --remain)
- if (*cdata++ != 0) return EINA_FALSE;
-
- return EINA_TRUE;
-}
-
static void
_file_entry_free(void *data)
{
--
[EGIT] [core/efl] master 09/25: Ector: Fix clang warning
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5bc153c6fb7a5a7b60f021e64e16b533d8cdb09a commit 5bc153c6fb7a5a7b60f021e64e16b533d8cdb09a Author: Jean-Philippe Andre Date: Tue Apr 21 18:58:00 2015 +0900 Ector: Fix clang warning Invalid type used for field and implicit conversions --- src/lib/ector/cairo/ector_renderer_cairo_shape.c | 4 ++-- src/lib/ector/ector_private.h| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.c b/src/lib/ector/cairo/ector_renderer_cairo_shape.c index ceab6c4..2b79e8b 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo_shape.c +++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.c @@ -204,8 +204,8 @@ _ector_renderer_cairo_shape_ector_renderer_generic_base_draw(Eo *obj, Ector_Rend // Set dash, cap and join cairo_set_line_width(pd->parent->cairo, (pd->shape->stroke.width * pd->shape->stroke.scale * 2)); - cairo_set_line_cap(pd->parent->cairo, pd->shape->stroke.cap); - cairo_set_line_join(pd->parent->cairo, pd->shape->stroke.join); + cairo_set_line_cap(pd->parent->cairo, (cairo_line_cap_t) pd->shape->stroke.cap); + cairo_set_line_join(pd->parent->cairo, (cairo_line_join_t) pd->shape->stroke.join); cairo_stroke(pd->parent->cairo); } else diff --git a/src/lib/ector/ector_private.h b/src/lib/ector/ector_private.h index ff97f77..31072d2 100644 --- a/src/lib/ector/ector_private.h +++ b/src/lib/ector/ector_private.h @@ -141,7 +141,7 @@ struct _Ector_Renderer_Generic_Shape_Data unsigned int dash_length; Efl_Gfx_Cap cap; - Efl_Gfx_Cap join; + Efl_Gfx_Join join; } stroke; }; --
[EGIT] [core/efl] master 15/25: Evas 3d: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c98a8eb70aea20e90076d06240c34b77d115b81f
commit c98a8eb70aea20e90076d06240c34b77d115b81f
Author: Jean-Philippe Andre
Date: Tue Apr 21 19:45:19 2015 +0900
Evas 3d: Fix clang warnings
---
src/modules/evas/engines/gl_common/evas_gl_3d.c | 4 ++--
src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c
b/src/modules/evas/engines/gl_common/evas_gl_3d.c
index ec9768c..7b82859 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -1313,7 +1313,7 @@ void _shadowmap_render(E3D_Drawable *drawable,
E3D_Renderer *renderer, Evas_3D_S
Evas_3D_Node *n;
Evas_3D_Shade_Mode shade_mode;
Eina_Bool blend_enabled;
- Evas_Color c = {1.0, 1.0, 1.0};
+ Evas_Color c = {1.0, 1.0, 1.0, 1.0};
Evas_Mat4 matrix_vp;
glEnable(GL_POLYGON_OFFSET_FILL);
@@ -1442,7 +1442,7 @@ e3d_drawable_scene_render_to_texture(E3D_Drawable
*drawable, E3D_Renderer *rende
Eina_Iterator *itmn;
void *ptrmn;
Eina_List *repeat_node = NULL;
- Evas_Color c = {0, 0, 0}, *unic_color = NULL;
+ Evas_Color c = {0, 0, 0, 0}, *unic_color = NULL;
glBindFramebuffer(GL_FRAMEBUFFER, drawable->color_pick_fb_id);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
index a5b4e34..5e41241 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d_renderer.c
@@ -82,6 +82,7 @@ _gl_blend_func_get(Evas_3D_Blend_Func blend_func)
}
}
+#ifndef GL_GLES
static inline GLenum
_gl_comparison_func_get(Evas_3D_Comparison comparison_func)
{
@@ -107,6 +108,7 @@ _gl_comparison_func_get(Evas_3D_Comparison comparison_func)
return GL_ALWAYS;
}
}
+#endif
static inline void
_renderer_vertex_attrib_array_enable(E3D_Renderer *renderer, int index)
--
[EGIT] [core/efl] master 06/25: Evas filters: Fix clang warnings
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6637e7cda96e556c057205bb9efc55dd99242647
commit 6637e7cda96e556c057205bb9efc55dd99242647
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:54:07 2015 +0900
Evas filters: Fix clang warnings
---
src/lib/evas/filters/evas_filter_bump.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/evas/filters/evas_filter_bump.c
b/src/lib/evas/filters/evas_filter_bump.c
index a269145..2d42e6e 100644
--- a/src/lib/evas/filters/evas_filter_bump.c
+++ b/src/lib/evas/filters/evas_filter_bump.c
@@ -137,14 +137,14 @@ _bump_map_cpu_alpha_alpha(Evas_Filter_Command *cmd)
}
// Compute appropriate lx, ly
- if (abs(zangle) >= 90)
+ if (fabsf(zangle) >= 90.f)
{
WRN("Z angle was defined as %.0f, out of range. Defaults to %.0f.",
zangle, DEFAULT_ZANGLE);
zangle = DEFAULT_ZANGLE;
}
- lxy = sin(abs(zangle * M_PI / 180.));
+ lxy = sin(fabs(zangle * M_PI / 180.));
lx = (int) (40.f * (lxy + 1.0) * cos(xyangle * M_PI / 180.));
ly = (int) (40.f * (lxy + 1.0) * sin(xyangle * M_PI / 180.));
INF("Using light vector (%d,%d)", lx, ly);
@@ -266,7 +266,7 @@ _bump_map_cpu_alpha_rgba(Evas_Filter_Command *cmd)
color = cmd->bump.color;
// Compute appropriate lx, ly
- if (abs(zangle) >= 90)
+ if (fabs(zangle) >= 90.)
{
WRN("Z angle was defined as %.0f, out of range. Defaults to %.0f.",
zangle, DEFAULT_ZANGLE);
--
[EGIT] [core/efl] master 07/25: Evas DDS: Fix clang warning
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=64ca10bcf6e4ee23f2a65f970b9f6007619b49a6
commit 64ca10bcf6e4ee23f2a65f970b9f6007619b49a6
Author: Jean-Philippe Andre
Date: Tue Apr 21 18:54:27 2015 +0900
Evas DDS: Fix clang warning
This one was almost a real catch by clang. Too bad we don't actually
support DXT3.
---
src/modules/evas/image_loaders/dds/evas_image_load_dds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
index d0a1c55..f3b133c 100644
--- a/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
+++ b/src/modules/evas/image_loaders/dds/evas_image_load_dds.c
@@ -251,7 +251,7 @@ evas_image_load_file_head_dds(void *loader_data,
case FOURCC('D', 'X', 'T', '3'):
loader->format = EVAS_COLORSPACE_RGBA_S3TC_DXT3;
prop->alpha = EINA_TRUE;
-prop->cspaces = cspaces_s3tc_dxt5;
+prop->cspaces = cspaces_s3tc_dxt3;
break;
case FOURCC('D', 'X', 'T', '4'):
loader->format = EVAS_COLORSPACE_RGBA_S3TC_DXT4;
--
[EGIT] [core/efl] master 03/25: Eina: Fix clang warnings
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=12b562482e5709ea1f82762b5be775b9bd8a24ed commit 12b562482e5709ea1f82762b5be775b9bd8a24ed Author: Jean-Philippe Andre Date: Tue Apr 21 18:38:50 2015 +0900 Eina: Fix clang warnings Use fabs for double values --- src/lib/eina/eina_matrix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eina/eina_matrix.c b/src/lib/eina/eina_matrix.c index 61ee824..468acf5 100644 --- a/src/lib/eina/eina_matrix.c +++ b/src/lib/eina/eina_matrix.c @@ -65,13 +65,13 @@ static inline double const double B = 4/M_PI; const double C = -4/(M_PI*M_PI); - double y = (B * x) + (C * x * fabsf(x)); + double y = (B * x) + (C * x * fabs(x)); #ifdef EXTRA_PRECISION // const float Q = 0.775; const double P = 0.225; - y = P * (y * fabsf(y) - y) + y; // Q * y + P * y * abs(y) + y = P * (y * fabs(y) - y) + y; // Q * y + P * y * abs(y) #endif return y; } --
[EGIT] [core/enlightenment] master 01/01: e_auth: Add suid helper for lokker own-pw checking on FreeBSD
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=90fe5a4d0dc75f25f08459ca5e40bd720cdcd6c0
commit 90fe5a4d0dc75f25f08459ca5e40bd720cdcd6c0
Author: Conrad Meyer
Date: Tue Apr 21 13:11:56 2015 +0100
e_auth: Add suid helper for lokker own-pw checking on FreeBSD
Summary:
PAM on FreeBSD, unlike on Linux, does not allow users to check their own
password. Instead, we need a suid helper to do it for us. Add such a
helper on FreeBSD.
For now, it is limited to checking users in the local password database
(traditional Unix passwd file). This could and should be extended to use
PAM in a later patch.
Test Plan:
Tested empty pw, wrong pw, correct pw at lock screen; observed correct
behavior
in each instance.
Reviewers: q66, zmike
Reviewed By: q66, zmike
Subscribers: cedric, seoz
Differential Revision: https://phab.enlightenment.org/D2355
---
src/bin/.gitignore| 1 +
src/bin/Makefile.mk | 14
src/bin/e_auth.c | 41 +---
src/bin/e_ckpasswd_main.c | 81 +++
4 files changed, 133 insertions(+), 4 deletions(-)
diff --git a/src/bin/.gitignore b/src/bin/.gitignore
index df39011..7addf4d 100644
--- a/src/bin/.gitignore
+++ b/src/bin/.gitignore
@@ -2,6 +2,7 @@
/enlightenment
/enlightenment_alert
/enlightenment_backlight
+/enlightenment_ckpasswd
/enlightenment_fm_op
/enlightenment_filemanager
/enlightenment_imc
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 5afdb4a..ecc6f7b 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -36,6 +36,9 @@ src/bin/enlightenment_static_grabber
if ! HAVE_WAYLAND_ONLY
internal_bin_PROGRAMS += src/bin/enlightenment_alert
endif
+if HAVE_FREEBSD
+internal_bin_PROGRAMS += src/bin/enlightenment_ckpasswd
+endif
ENLIGHTENMENTHEADERS = \
src/bin/e_about.h \
@@ -423,6 +426,14 @@ src/bin/e_backlight_main.c
src_bin_enlightenment_backlight_CPPFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@
src_bin_enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@
+if HAVE_FREEBSD
+src_bin_enlightenment_ckpasswd_SOURCES = \
+src/bin/e_ckpasswd_main.c
+
+src_bin_enlightenment_ckpasswd_CPPFLAGS = @SUID_CFLAGS@
+src_bin_enlightenment_ckpasswd_LDADD = @SUID_LDFLAGS@ -lcrypt
+endif
+
src_bin_enlightenment_alert_SOURCES = \
src/bin/e_alert_main.c
@@ -453,6 +464,9 @@ setuid_root_mode = a=rx,u+xs
enlightenment-sys-install-data-hook:
@chmod $(setuid_root_mode)
$(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
@chmod $(setuid_root_mode)
$(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
+if HAVE_FREEBSD
+ @chmod $(setuid_root_mode)
$(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_ckpasswd$(EXEEXT) || true
+endif
installed_headersdir = $(prefix)/include/enlightenment
installed_headers_DATA = $(ENLIGHTENMENTHEADERS) src/bin/e_fm_shared_types.h
INSTALL_DATA_HOOKS += enlightenment-sys-install-data-hook
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index a85df6b..6d23d8b 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -1,6 +1,6 @@
#include "e.h"
-#ifdef HAVE_PAM
+#if defined(HAVE_PAM) && !defined(__FreeBSD__)
# include
# include
@@ -128,11 +128,44 @@ _auth_pam_init(E_Auth *da)
free(current_host);
return 0;
}
-
-#endif
+#endif // HAVE_PAM && !__FreeBSD__
EAPI int
-#ifdef HAVE_PAM
+#if defined(__FreeBSD__)
+e_auth_begin(char *passwd)
+{
+ char buf[PATH_MAX], *p;
+ Ecore_Exe *exe = NULL;
+ int ret = 0;
+
+ if (strlen(passwd) == 0) goto out;
+
+ snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_ckpasswd",
+e_prefix_lib_get());
+
+ exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
+ if (ecore_exe_send(exe, passwd, strlen(passwd)) != EINA_TRUE) goto out;
+ ecore_exe_close_stdin(exe);
+
+ ret = ecore_exe_pid_get(exe);
+ if (ret == -1)
+ {
+ret = 0;
+goto out;
+ }
+
+ exe = NULL;
+out:
+ if (exe) ecore_exe_free(exe);
+
+ /* security - null out passwd string once we are done with it */
+ for (p = passwd; *p; p++)
+ *p = 0;
+ if (passwd[0] || passwd[3]) fprintf(stderr, "ACK!\n");
+
+ return ret;
+}
+#elif defined(HAVE_PAM)
e_auth_begin(char *passwd)
{
/* child */
diff --git a/src/bin/e_ckpasswd_main.c b/src/bin/e_ckpasswd_main.c
new file mode 100644
index 000..c2508a7
--- /dev/null
+++ b/src/bin/e_ckpasswd_main.c
@@ -0,0 +1,81 @@
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+// Exit codes, per src/modules/lokker/lokker.c:
+// 0: success (unlock)
+// 1-128: PAM error but also unlock (!!!)
+// else: failed.
+
+static char pw[4096];
+struct passwd *pwent;
+
+static void
+zeropw(void)
+{
+ /* security - null out passwd string once we are done with it */
+ memset(pw, 0, sizeof(pw));
+ if (pw[
[EGIT] [admin/release-management] master 01/01: distributions version fetch script: add Mac OS homebrew params, so it's ready for primetime
leif pushed a commit to branch master.
http://git.enlightenment.org/admin/release-management.git/commit/?id=74627ebf36ba4f8ed8ae6c75b6752f6d14437768
commit 74627ebf36ba4f8ed8ae6c75b6752f6d14437768
Author: Leif Middelschulte
Date: Tue Apr 21 12:31:45 2015 +0200
distributions version fetch script: add Mac OS homebrew params, so it's
ready for primetime
---
distributions_versions_fetch_script.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distributions_versions_fetch_script.py
b/distributions_versions_fetch_script.py
index 104e0cd..2ebef53 100755
--- a/distributions_versions_fetch_script.py
+++ b/distributions_versions_fetch_script.py
@@ -53,7 +53,7 @@ def main():
#("Cent OS", "", "",
""),
#("RHEL", "", "", ""),
#("Windows / Win-builds
1.5", "", "", ""),
- #("Mac OSX /
homewbrew", "", "", ""),
+ #("Mac OSX /
homewbrew", "http://braumeister.org/formula/efl";,
"//*[@id=\"basic\"]/h2[1]/div/strong/text()", ""),
("Tizen:Common",
"https://build.tizen.org/package/binaries?package=efl&project=Tizen%3ACommon&repository=x86_64-x11";,
"//*[@id=\"content\"]/div/ul//li/a/text()[starts-with(., 'efl-')]", "efl-"),
("Tizen:Mobile",
"https://build.tizen.org/package/binaries?package=efl&project=Tizen%3AMobile&repository=x86_64-x11";,
"//*[@id=\"content\"]/div/ul//li/a/text()[starts-with(., 'efl-')]", "efl-"),
("Tizen:Wearable",
"https://build.tizen.org/package/binaries?package=efl&project=Tizen%3AWearable&repository=x86_64-x11";,
"//*[@id=\"content\"]/div/ul//li/a/text()[starts-with(., 'efl-')]", "efl-"),
--
[EGIT] [core/enlightenment] master 01/01: Auth: try harder when clearing passwords.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=99b8d84485cd5bc357a73de3af14eecff1734b29
commit 99b8d84485cd5bc357a73de3af14eecff1734b29
Author: Tom Hacohen
Date: Tue Apr 21 10:45:01 2015 +0100
Auth: try harder when clearing passwords.
Based on
http://www.daemonology.net/blog/2014-09-04-how-to-zero-a-buffer.html
Thanks again to Matthew Garrett, for pointing this out on twitter.
---
src/bin/e_utils.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index dc8b220..351c3c2 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1434,8 +1434,10 @@ e_util_evas_objects_above_print_smart(Evas_Object *o)
* This is going to work until link time optimizations are good enough.
* Hopefully by then, we'll be able to properly use memset_s().
*/
+static void *(* const volatile memset_ptr)(void *, int, size_t) = memset;
+
EAPI void
e_util_memclear(void *s, size_t n)
{
- memset(s, 0, n);
+ memset_ptr(s, 0, n);
}
--
[EGIT] [core/enlightenment] master 01/01: Module teamwork: Stop using a deprecated function.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=599eda1a65a5de4192f645e164e8c2fa62f16d10 commit 599eda1a65a5de4192f645e164e8c2fa62f16d10 Author: Tom Hacohen Date: Tue Apr 21 10:29:58 2015 +0100 Module teamwork: Stop using a deprecated function. --- src/modules/teamwork/e_mod_tw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c index 78dde17..f54cfee 100644 --- a/src/modules/teamwork/e_mod_tw.c +++ b/src/modules/teamwork/e_mod_tw.c @@ -727,7 +727,7 @@ tw_media_get(const char *url, unsigned long long timestamp, Eina_Bool *video) img = eet_read(media[*video], url, &size); alias = eet_alias_get(media[*video], url); -buf = eina_binbuf_manage_new_length(img, size); +buf = eina_binbuf_manage_new(img, size, EINA_FALSE); media_cache_update(alias, timestamp, *video); eina_stringshare_del(alias); --
[EGIT] [core/enlightenment] master 01/01: E auth: improve clearing out passwords from memory.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=acfdda6c7fbfdb376613b47b5980642877e1e25c
commit acfdda6c7fbfdb376613b47b5980642877e1e25c
Author: Tom Hacohen
Date: Tue Apr 21 10:07:42 2015 +0100
E auth: improve clearing out passwords from memory.
Optimising compilers (like gcc/clang with -O1 or above) were optimising
out the memset(). Until link time optimisations are good enough, this
will prevent them from doing so. The best solution would be to use
memset_s() (c11), though it's not readily available yet. This is the
first step towards using memset_s() with a fallback for systems who
don't have it. A better solution, is to put it in Eina, to prevent LTO
completely. This will have to be done after the EFL release.
Even this is not entirely safe though, but at least it protects us from
some memory disclosure issues.
This doesn't solve the fact that we may store a copy of the password in
other places, like the input system. We need to address that too.
Thanks to Matthew Garrett for pointing this out or Twitter.
---
src/bin/e_auth.c| 12 +---
src/bin/e_utils.c | 16
src/bin/e_utils.h | 2 ++
src/modules/lokker/lokker.c | 6 ++
4 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
index 7bda8ae..a85df6b 100644
--- a/src/bin/e_auth.c
+++ b/src/bin/e_auth.c
@@ -138,7 +138,7 @@ e_auth_begin(char *passwd)
/* child */
int pamerr;
E_Auth da;
- char *current_user, *p;
+ char *current_user;
struct sigaction action;
_e_auth_child_pid = fork();
@@ -158,8 +158,8 @@ e_auth_begin(char *passwd)
eina_strlcpy(da.user, current_user, sizeof(da.user));
eina_strlcpy(da.passwd, passwd, sizeof(da.passwd));
/* security - null out passwd string once we are done with it */
- for (p = passwd; *p; p++)
- *p = 0;
+ e_util_memclear(passwd, strlen(passwd));
+
da.pam.handle = NULL;
da.pam.conv.conv = NULL;
da.pam.conv.appdata_ptr = NULL;
@@ -173,10 +173,8 @@ e_auth_begin(char *passwd)
pamerr = pam_authenticate(da.pam.handle, 0);
pam_end(da.pam.handle, pamerr);
/* security - null out passwd string once we are done with it */
- memset(da.passwd, 0, sizeof(da.passwd));
- /* break compiler optimization */
- if (da.passwd[0] || da.passwd[3])
- fprintf(stderr, "ACK!\n");
+ e_util_memclear(da.passwd, sizeof(da.passwd));
+
if (pamerr == PAM_SUCCESS)
{
free(current_user);
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 224e890..dc8b220 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1423,3 +1423,19 @@ e_util_evas_objects_above_print_smart(Evas_Object *o)
fprintf(stderr, "[%p] - %s(%s) %s\n", a, evas_object_type_get(a),
evas_object_name_get(a), evas_object_visible_get(a) ? "VISIBLE" : "HIDDEN");
}
}
+
+/*
+ * NOTICE: This function should not be used by external modules!!!
+ *
+ * This function is just a hack to allow us to "securely" clear sensitive
+ * info until memset_s() is readily available, or at least we move this hack
+ * to Eina.
+ *
+ * This is going to work until link time optimizations are good enough.
+ * Hopefully by then, we'll be able to properly use memset_s().
+ */
+EAPI void
+e_util_memclear(void *s, size_t n)
+{
+ memset(s, 0, n);
+}
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 1a99544..b17e2ff 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -63,6 +63,8 @@ EAPI void e_util_evas_objects_above_print_smart(Evas_Object
*o);
EAPI void e_util_string_list_free(Eina_List *l);
+EAPI void e_util_memclear(void *s, size_t n);
+
static inline void
e_util_pointer_center(const E_Client *ec)
{
diff --git a/src/modules/lokker/lokker.c b/src/modules/lokker/lokker.c
index fdc7517..a9ecfbf 100644
--- a/src/modules/lokker/lokker.c
+++ b/src/modules/lokker/lokker.c
@@ -96,10 +96,8 @@ _text_passwd_update(void)
static void
_lokker_null(void)
{
- memset(edd->passwd, 0, sizeof(char) * PASSWD_LEN);
- /* break compiler optimization */
- if (edd->passwd[0] || edd->passwd[3])
- fprintf(stderr, "ACK!\n");
+ e_util_memclear(edd->passwd, PASSWD_LEN);
+
_text_passwd_update();
}
--
[EGIT] [core/efl] master 01/01: Edje: Fix compilation warnings with clang
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=63204da26ad38db418c0b26512789a4be66edea3 commit 63204da26ad38db418c0b26512789a4be66edea3 Author: Jean-Philippe Andre Date: Tue Apr 21 18:07:17 2015 +0900 Edje: Fix compilation warnings with clang Fixes T2343. Thanks for the report. --- src/lib/edje/Edje_Common.h | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index 7d2dab8..4060a87 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h @@ -16,8 +16,13 @@ typedef struct _Edje_Version EAPI extern Edje_Version *edje_version; +#ifndef _EDJE_OBJECT_EO_CLASS_TYPE +#define _EDJE_OBJECT_EO_CLASS_TYPE + typedef Eo Edje_Object; +#endif + /** * @typedef Edje_Color_Class * Type for edje color class --
