[EGIT] [core/enlightenment] master 01/01: fix constant expression conditional
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=519560ac3fd2f254c0a5e62ef2fbfe274938f48d
commit 519560ac3fd2f254c0a5e62ef2fbfe274938f48d
Author: Mike Blumenkrantz
Date: Sat Mar 14 10:31:36 2015 -0400
fix constant expression conditional
CID 1288498
---
src/modules/conf/e_conf.c | 13 +
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index 3d8ede5..4bc5b7b 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -71,26 +71,15 @@ e_configure_show(E_Comp *comp, const char *params)
if (_e_configure)
{
-E_Zone *z, *z2;
const Eina_List *l;
void *it;
int x = 0;
eco = _e_configure;
ec = e_win_client_get(eco->win);
-z = e_zone_current_get();
-z2 = ec->zone;
evas_object_show(eco->win);
elm_win_raise(eco->win);
-if (e_comp == e_comp)
- e_client_desk_set(ec, e_desk_current_get(z));
-else
- {
- if (!ec->sticky)
- e_desk_show(ec->desk);
- ecore_evas_pointer_warp(e_comp->ee,
- z2->x + (z2->w / 2), z2->y + (z2->h / 2));
- }
+e_client_desk_set(ec, e_desk_current_get(ec->zone));
e_client_unshade(ec, ec->shade_dir);
if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
(e_config->focus_setting == E_FOCUS_NEW_WINDOW))
--
[EGIT] [enlightenment/modules/edgar] master 01/01: Follow changes in E 0.19.99 development
kuuko pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=b1c125a7969d9b641df65765526893daeee403e7 commit b1c125a7969d9b641df65765526893daeee403e7 Author: Kai Huuhko Date: Sat Mar 14 16:40:27 2015 +0200 Follow changes in E 0.19.99 development e_util_zone_current_get(e_manager_current_get()) -> e_zone_current_get() --- src/e_mod_edgar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c index 00416de..bbebfc3 100644 --- a/src/e_mod_edgar.c +++ b/src/e_mod_edgar.c @@ -502,7 +502,7 @@ edgar_mouse_down3_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) E_Menu *m; int x, y; - zone = e_util_zone_current_get(e_manager_current_get()); + zone = e_zone_current_get(); m = e_menu_new(); E_Menu_Item *mi; --
Re: [E-devel] [EGIT] [apps/terminology] master 02/02: fix CSI DECSET 1049. Should fix T725
Hi Bob,
I have an issue with this patch (bisect showed me the path). Here is
the scenario:
Open terminology
Open a file with vi
Split your screen (the orientation doesnt matter)
Come back to vi
The arrow keys don't work anymore. To solve it, I have to ctrl-z vi and
then run fg.
Thank you
Daniel
On Sun, 01 Mar 2015 08:20:44 -0800
Boris Faure wrote:
> billiob pushed a commit to branch master.
>
> http://git.enlightenment.org/apps/terminology.git/commit/?id=b4ba773e17027c160667cd5bd7c9dfaf541ff878
>
> commit b4ba773e17027c160667cd5bd7c9dfaf541ff878
> Author: Boris Faure
> Date: Sun Mar 1 17:18:45 2015 +0100
>
> fix CSI DECSET 1049. Should fix T725
> ---
> src/bin/termpty.c| 3 ---
> src/bin/termptyesc.c | 34 +-
> 2 files changed, 21 insertions(+), 16 deletions(-)
>
> diff --git a/src/bin/termpty.c b/src/bin/termpty.c
> index 1fef59f..f4271a9 100644
> --- a/src/bin/termpty.c
> +++ b/src/bin/termpty.c
> @@ -1101,7 +1101,6 @@ termpty_screen_swap(Termpty *ty)
> {
> Termcell *tmp_screen;
> int tmp_circular_offset;
> - int tmp_appcursor = ty->state.appcursor;
>
> tmp_screen = ty->screen;
> ty->screen = ty->screen2;
> @@ -1116,8 +1115,6 @@ termpty_screen_swap(Termpty *ty)
> ty->circular_offset = ty->circular_offset2;
> ty->circular_offset2 = tmp_circular_offset;
>
> - ty->state.appcursor = tmp_appcursor;
> -
> ty->altbuf = !ty->altbuf;
>
> if (ty->cb.cancel_sel.func)
> diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
> index 56cc215..8452d69 100644
> --- a/src/bin/termptyesc.c
> +++ b/src/bin/termptyesc.c
> @@ -110,6 +110,23 @@ _handle_cursor_control(Termpty *ty, const
> Eina_Unicode *cc) }
>
> static void
> +_switch_to_alternative_screen(Termpty *ty, int mode)
> +{
> + DBG("switch to alternative screen, mode:%d", mode);
> + if (ty->altbuf)
> + {
> +// if we are looking at alt buf now,
> +// clear main buf before we swap it back
> +// into the screen2 save (so save is
> +// clear)
> +_termpty_clear_all(ty);
> + }
> + // swap screen content now
> + if (mode != ty->altbuf)
> + termpty_screen_swap(ty);
> +}
> +
> +static void
> _handle_esc_csi_reset_mode(Termpty *ty, Eina_Unicode cc,
> Eina_Unicode *b) {
> int mode = 0, priv = 0, arg;
> @@ -290,26 +307,17 @@ _handle_esc_csi_reset_mode(Termpty *ty,
> Eina_Unicode cc, Eina_Unicode *b) DBG("Ignored screen mode %i", arg);
> break;
> case 1047:
> - case 1049:
> case 47:
> -DBG("DDD: switch buf");
> -if (ty->altbuf)
> - {
> - // if we are looking at alt buf now,
> - // clear main buf before we swap it back
> - // into the screen2 save (so save is
> - // clear)
> - _termpty_clear_all(ty);
> - }
> -// swap screen content now
> -if (mode != ty->altbuf)
> - termpty_screen_swap(ty);
> +_switch_to_alternative_screen(ty, mode);
> break;
> case 1048:
> + case 1049:
> if (mode)
>_termpty_cursor_copy(&(ty->state),
> &(ty->save)); else
>_termpty_cursor_copy(&(ty->save),
> &(ty->state));
> +if (arg == 1049)
> + _switch_to_alternative_screen(ty, mode);
> break;
> case 2004:
> ty->bracketed_paste = mode;
>
--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [apps/terminology] master 02/02: fix CSI DECSET 1049. Should fix T725
On 15-03-14 18:30, Daniel Zaoui wrote: > Hi Bob, > > I have an issue with this patch (bisect showed me the path). Here is > the scenario: > Open terminology > Open a file with vi > Split your screen (the orientation doesnt matter) > Come back to vi > The arrow keys don't work anymore. To solve it, I have to ctrl-z vi and > then run fg. I can reproduce that issue. I'm on holidays next week and will probably not have time to look into that issue. I've updated the ticket T725 with your scenario. -- Boris Faure Pointer Arithmetician signature.asc Description: Digital signature -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
