E CVS: apps/e devilhorns

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_int_config_keybindings.c 


Log Message:
Only fetch current manager once and reuse.
Always keep key input window on top of keybinding dialog.
Some formatting.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- e_int_config_keybindings.c	11 Oct 2006 12:14:45 -0000	1.39
+++ e_int_config_keybindings.c	16 Oct 2006 09:44:17 -0000	1.40
@@ -71,6 +71,8 @@
 	Evas_Object *o_binding_list, *o_action_list;
 	Evas_Object *o_params;
      } gui;
+
+   E_Config_Dialog *cfd;
 };
 
 EAPI E_Config_Dialog *
@@ -132,7 +134,7 @@
    E_Config_Dialog_Data *cfdata;
 
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
-
+   cfdata->cfd = cfd;
    _fill_data(cfdata);
 
    return cfdata;
@@ -174,7 +176,7 @@
      {
 	bi = e_config->key_bindings->data;
 	e_bindings_key_del(bi->context, bi->key, bi->modifiers, bi->any_mod, 
-	      bi->action, bi->params);
+			   bi->action, bi->params);
 	e_config->key_bindings =
 	   evas_list_remove_list(e_config->key_bindings, e_config->key_bindings);
 
@@ -202,7 +204,7 @@
 
 	e_config->key_bindings = evas_list_append(e_config->key_bindings, bi);
 	e_bindings_key_add(bi->context, bi->key, bi->modifiers, bi->any_mod,
-	      bi->action, bi->params);
+			   bi->action, bi->params);
      }
    e_managers_keys_grab();
    e_config_save_queue();
@@ -871,9 +873,13 @@
 static void
 _grab_wnd_show(E_Config_Dialog_Data *cfdata)
 {
+   E_Manager *man;
+   
    if (cfdata->locals.bind_win != 0) return;
 
-   cfdata->locals.dia = e_dialog_new(e_container_current_get(e_manager_current_get()),
+   man = e_manager_current_get();
+   
+   cfdata->locals.dia = e_dialog_new(e_container_current_get(man),
 				     "E", "_keybind_getkey_dialog");
    if (!cfdata->locals.dia) return;
    e_dialog_title_set(cfdata->locals.dia, _("Key Binding Sequence"));
@@ -881,11 +887,11 @@
    e_dialog_text_set(cfdata->locals.dia, TEXT_PRESS_KEY_SEQUENCE);
    e_win_centered_set(cfdata->locals.dia->win, 1);
    e_win_borderless_set(cfdata->locals.dia->win, 1);
-
-   cfdata->locals.bind_win = ecore_x_window_input_new(e_manager_current_get()->root, 0, 0, 1, 1);
+   
+   cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, 1, 1);
    ecore_x_window_show(cfdata->locals.bind_win);
    e_grabinput_get(cfdata->locals.bind_win, 0, cfdata->locals.bind_win);
-
+   
    cfdata->locals.handlers = evas_list_append(cfdata->locals.handlers,
 			      ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN,
 				 _grab_key_down_cb, cfdata));
@@ -903,6 +909,7 @@
 				 _grab_mouse_dumb_cb, NULL));
 
    e_dialog_show(cfdata->locals.dia);
+   ecore_x_icccm_transient_for_set(cfdata->locals.dia->win->evas_win, cfdata->cfd->dia->win->evas_win);
 }
 
 static void