Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_bindings.h e_config.c e_remote_main.c
Log Message:
TODO items. bugs. start module - its a START. it doesnt work that well. needs
work in the menu code to handle fixing menus to a launch rect.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_bindings.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_bindings.h 30 Apr 2005 05:07:27 -0000 1.7
+++ e_bindings.h 18 May 2005 05:06:04 -0000 1.8
@@ -19,6 +19,7 @@
*/
typedef enum _E_Binding_Modifier
{
+ E_BINDING_MODIFIER_NONE = 0,
E_BINDING_MODIFIER_SHIFT = (1 << 0),
E_BINDING_MODIFIER_CTRL = (1 << 1),
E_BINDING_MODIFIER_ALT = (1 << 2),
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_config.c 13 May 2005 17:21:04 -0000 1.48
+++ e_config.c 18 May 2005 05:06:04 -0000 1.49
@@ -188,6 +188,10 @@
E_Config_Module *em;
em = E_NEW(E_Config_Module, 1);
+ em->name = strdup("start");
+ em->enabled = 1;
+ e_config->modules = evas_list_append(e_config->modules, em);
+ em = E_NEW(E_Config_Module, 1);
em->name = strdup("ibar");
em->enabled = 1;
e_config->modules = evas_list_append(e_config->modules, em);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_remote_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_remote_main.c 13 May 2005 17:21:04 -0000 1.23
+++ e_remote_main.c 18 May 2005 05:06:04 -0000 1.24
@@ -82,8 +82,8 @@
else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |=
E_BINDING_MODIFIER_WIN;
else if (strlen(pp) > 0)
{
- printf("OPT3 moidifier unknonw. Must be or mask of:\n"
- " SHIFT CTRL ALT WIN\n");
+ printf("OPT3 moidifier unknown. Must be or mask of:\n"
+ " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or
ALT|SHIFT|CTRL or ALT or just NONE)\n");
exit(-1);
}
pp = p + 1;
@@ -94,10 +94,11 @@
else if (!strcmp(pp, "CTRL")) eb->modifiers |=
E_BINDING_MODIFIER_CTRL;
else if (!strcmp(pp, "ALT")) eb->modifiers |=
E_BINDING_MODIFIER_ALT;
else if (!strcmp(pp, "WIN")) eb->modifiers |=
E_BINDING_MODIFIER_WIN;
+ else if (!strcmp(pp, "NONE")) eb->modifiers =
E_BINDING_MODIFIER_NONE;
else if (strlen(pp) > 0)
{
- printf("OPT3 moidifier unknonw. Must be or mask of:\n"
- " SHIFT CTRL ALT WIN\n");
+ printf("OPT3 moidifier unknown. Must be or mask of:\n"
+ " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or
ALT|SHIFT|CTRL or ALT or just NONE)\n");
exit(-1);
}
break;
@@ -176,8 +177,8 @@
else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |=
E_BINDING_MODIFIER_WIN;
else if (strlen(pp) > 0)
{
- printf("OPT3 moidifier unknonw. Must be or mask of:\n"
- " SHIFT CTRL ALT WIN\n");
+ printf("OPT3 moidifier unknown. Must be or mask of:\n"
+ " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or
ALT|SHIFT|CTRL or ALT or just NONE)\n");
exit(-1);
}
pp = p + 1;
@@ -188,10 +189,11 @@
else if (!strcmp(pp, "CTRL")) eb->modifiers |=
E_BINDING_MODIFIER_CTRL;
else if (!strcmp(pp, "ALT")) eb->modifiers |=
E_BINDING_MODIFIER_ALT;
else if (!strcmp(pp, "WIN")) eb->modifiers |=
E_BINDING_MODIFIER_WIN;
+ else if (!strcmp(pp, "NONE")) eb->modifiers =
E_BINDING_MODIFIER_NONE;
else if (strlen(pp) > 0)
{
- printf("OPT3 moidifier unknonw. Must be or mask of:\n"
- " SHIFT CTRL ALT WIN\n");
+ printf("OPT3 moidifier unknown. Must be or mask of:\n"
+ " SHIFT CTRL ALT WIN (eg SHIFT|CTRL or
ALT|SHIFT|CTRL or ALT or just NONE)\n");
exit(-1);
}
break;
@@ -987,6 +989,8 @@
if (_mod_buf[0] != 0) strcat(_mod_buf, "|");
strcat(_mod_buf, "WIN");
}
+ if (mod == E_BINDING_MODIFIER_NONE)
+ strcpy(_mod_buf, "NONE");
return _mod_buf;
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
