discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=3f53f0aa5e6c4af6152655b729b91c71d48e12f6
commit 3f53f0aa5e6c4af6152655b729b91c71d48e12f6
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Jul 3 11:13:49 2014 -0400
disallow tw popups while terminology popup is present
fix T1290
---
src/bin/main.c | 6 ++++++
src/bin/main.h | 1 +
src/bin/termio.c | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 1c85c2a..90a7bf3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -2347,6 +2347,12 @@ main_term_new(Win *wn, Config *config, const char *cmd,
return term;
}
+Eina_Bool
+main_term_popup_exists(const Term *term)
+{
+ return term->popmedia || term->popmedia_queue;
+}
+
Win *main_term_win_get(Term *term)
{
return term->wn;
diff --git a/src/bin/main.h b/src/bin/main.h
index 290d106..fda5b4c 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -20,6 +20,7 @@ void main_config_sync(const Config *config);
void change_theme(Evas_Object *win, Config *config);
+Eina_Bool main_term_popup_exists(const Term *term);
void main_term_focus(Term *term);
Win *main_term_win_get(Term *term);
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 7f8e6b5..27d625b 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -562,7 +562,8 @@ _update_link(Evas_Object *obj, Termio *sd,
}
if (sd->link.string)
{
- if ((sd->link.string[0] == '/') ||
(link_is_url(sd->link.string)))
+ if ((!main_term_popup_exists(sd->term)) &&
+ ((sd->link.string[0] == '/') ||
(link_is_url(sd->link.string))))
{
Evas_Coord _x = ox, _y = oy;
uint64_t xwin;
--
