Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
EvasTextEntry.c EvasTextEntry.h entrance.h entrance_auth.c
entrance_session.c entrance_session.h
Log Message:
ran indent to make upcoming commits more clear
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/EvasTextEntry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- EvasTextEntry.c 19 Oct 2003 19:41:02 -0000 1.3
+++ EvasTextEntry.c 21 Oct 2003 22:36:06 -0000 1.4
@@ -5,396 +5,422 @@
#include <stdlib.h>
#include "EvasTextEntry.h"
-static Evas_Smart* evas_text_entry_smart_get(void);
-static void evas_text_entry_text_fix(Evas_Object *o);
+static Evas_Smart *evas_text_entry_smart_get(void);
+static void evas_text_entry_text_fix(Evas_Object * o);
Evas_Object *
-evas_text_entry_new(Evas *e)
+evas_text_entry_new(Evas * e)
{
- Evas_Object *o = NULL;
- o = evas_object_smart_add(e, evas_text_entry_smart_get());
- return(o);
+ Evas_Object *o = NULL;
+
+ o = evas_object_smart_add(e, evas_text_entry_smart_get());
+ return (o);
}
int
-evas_text_entry_is_focused(Evas_Object *o)
+evas_text_entry_is_focused(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- if((e = evas_object_smart_data_get(o)))
- {
- return(evas_object_focus_get(e->base));
- }
- return(0);
+ Evas_Text_Entry *e = NULL;
+
+ if ((e = evas_object_smart_data_get(o)))
+ {
+ return (evas_object_focus_get(e->base));
+ }
+ return (0);
}
+
void
-evas_text_entry_focus_set(Evas_Object *o, int val)
+evas_text_entry_focus_set(Evas_Object * o, int val)
{
- Evas_Text_Entry *e = NULL;
- if((e = evas_object_smart_data_get(o)))
- {
- evas_object_focus_set(e->base, val);
- }
+ Evas_Text_Entry *e = NULL;
+
+ if ((e = evas_object_smart_data_get(o)))
+ {
+ evas_object_focus_set(e->base, val);
+ }
}
char *
-evas_text_entry_string_get(Evas_Object *o)
+evas_text_entry_string_get(Evas_Object * o)
{
- char *result = NULL;
- Evas_Text_Entry *e = NULL;
- if((e = evas_object_smart_data_get(o)))
- {
- if(e->buf.text) result = strdup(e->buf.text);
- }
- return(result);
+ char *result = NULL;
+ Evas_Text_Entry *e = NULL;
+
+ if ((e = evas_object_smart_data_get(o)))
+ {
+ if (e->buf.text)
+ result = strdup(e->buf.text);
+ }
+ return (result);
}
void
-evas_text_entry_is_password_set(Evas_Object *o, int val)
+evas_text_entry_is_password_set(Evas_Object * o, int val)
{
- Evas_Text_Entry *e = NULL;
- if((e = evas_object_smart_data_get(o)))
- {
- e->passwd = val;
- }
-
+ Evas_Text_Entry *e = NULL;
+
+ if ((e = evas_object_smart_data_get(o)))
+ {
+ e->passwd = val;
+ }
+
}
void
-evas_text_entry_edje_part_set(Evas_Object *o, Evas_Object *edje, char *part)
+evas_text_entry_edje_part_set(Evas_Object * o, Evas_Object * edje, char *part)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- if(e->edje.o) evas_object_del(e->edje.o);
- e->edje.o = edje;
- if(e->edje.part) free(e->edje.part);
- e->edje.part = strdup(part);
-}
-
-void
-evas_text_entry_return_key_callback_set(
- Evas_Object *o,
- void (*func)(void *data, const char *str),
- void *data)
-{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- e->return_key.func = func;
- e->return_key.arg = data;
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ if (e->edje.o)
+ evas_object_del(e->edje.o);
+ e->edje.o = edje;
+ if (e->edje.part)
+ free(e->edje.part);
+ e->edje.part = strdup(part);
}
+
void
-evas_text_entry_max_chars_set(Evas_Object *o, int max)
+evas_text_entry_return_key_callback_set(Evas_Object * o,
+ void (*func) (void *data,
+ const char *str),
+ void *data)
+{
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ e->return_key.func = func;
+ e->return_key.arg = data;
+}
+
+void
+evas_text_entry_max_chars_set(Evas_Object * o, int max)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- if(max < PATH_MAX)
- {
- char buf[PATH_MAX];
- snprintf(buf, PATH_MAX, "%s", e->buf.text);
- free(e->buf.text);
- e->buf.size = max;
- e->buf.text = (char*)malloc((sizeof(char) * e->buf.size) + 1);
- memset(e->buf.text, 0, sizeof(e->buf.text));
- snprintf(e->buf.text, strlen(buf), "%s", buf);
- }
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ if (max < PATH_MAX)
+ {
+ char buf[PATH_MAX];
+
+ snprintf(buf, PATH_MAX, "%s", e->buf.text);
+ free(e->buf.text);
+ e->buf.size = max;
+ e->buf.text = (char *) malloc((sizeof(char) * e->buf.size) + 1);
+ memset(e->buf.text, 0, sizeof(e->buf.text));
+ snprintf(e->buf.text, strlen(buf), "%s", buf);
+ }
}
void
-evas_text_entry_text_set(Evas_Object *o, const char *str)
+evas_text_entry_text_set(Evas_Object * o, const char *str)
{
- Evas_Text_Entry *e = NULL;
- if((e = evas_object_smart_data_get(o)))
- {
- if(str)
- snprintf(e->buf.text, e->buf.size, "%s", str);
- else
- {
- memset(e->buf.text, 0, e->buf.size);
- }
- e->buf.index = strlen(e->buf.text);
- evas_text_entry_text_fix(o);
- }
+ Evas_Text_Entry *e = NULL;
+
+ if ((e = evas_object_smart_data_get(o)))
+ {
+ if (str)
+ snprintf(e->buf.text, e->buf.size, "%s", str);
+ else
+ {
+ memset(e->buf.text, 0, e->buf.size);
+ }
+ e->buf.index = strlen(e->buf.text);
+ evas_text_entry_text_fix(o);
+ }
}
+
/*========================================================================*/
static void
-evas_text_entry_buffer_char_append(Evas_Object *o, char c)
+evas_text_entry_buffer_char_append(Evas_Object * o, char c)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+
+ if (e->buf.index < e->buf.size)
+ e->buf.text[e->buf.index++] = c;
+ e->buf.text[e->buf.index] = 0;
+ evas_text_entry_text_fix(o);
+}
+static void
+evas_text_entry_buffer_backspace(Evas_Object * o)
+{
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
- if(e->buf.index < e->buf.size)
- e->buf.text[e->buf.index++] = c;
- e->buf.text[e->buf.index] = 0;
- evas_text_entry_text_fix(o);
-}
-static void
-evas_text_entry_buffer_backspace(Evas_Object *o)
-{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
-
- if(e->buf.index > 0)
- e->buf.text[--e->buf.index] = 0;
- evas_text_entry_text_fix(o);
-}
-static void
-evas_text_entry_text_fix(Evas_Object *o)
-{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- if(e->passwd)
- {
- int i, len;
- char buf[e->buf.size];
-
- len = strlen(e->buf.text);
- memset(buf, 0, e->buf.size);
- for(i = 0; i < len; i++) buf[i] = '*';
- edje_object_part_text_set(e->edje.o, e->edje.part, buf);
- }
- else
- edje_object_part_text_set(e->edje.o, e->edje.part, e->buf.text);
-}
-static void
-_key_down_cb(void *data, Evas *e, Evas_Object *o, void *ev)
-{
- if(ecore_event_current_type_get() == ECORE_X_EVENT_KEY_DOWN)
- {
- Ecore_X_Event_Key_Down *evx= NULL;
-
- if((evx = (Ecore_X_Event_Key_Down*)ecore_event_current_event_get()))
- {
- if(
- (!strcmp(evx->keyname, "Control_L")) ||
- (!strcmp(evx->keyname, "Control_R")) ||
- (!strcmp(evx->keyname, "Shift_R")) ||
- (!strcmp(evx->keyname, "Shift_L")))
- {
- evas_key_modifier_on(e, evx->keyname);
- }
- }
- }
-}
-static void
-_key_up_cb(void *data, Evas *e, Evas_Object *o, void *ev)
-{
- Evas_Event_Key_Up *up = NULL;
- Evas_Text_Entry *entry = NULL;
-
- entry = evas_object_smart_data_get(data);
- up = (Evas_Event_Key_Up*)ev;
-
- if(ecore_event_current_type_get() == ECORE_X_EVENT_KEY_UP)
- {
- Ecore_X_Event_Key_Up *evx= NULL;
-
- if((evx = (Ecore_X_Event_Key_Up*)ecore_event_current_event_get()))
- {
- if(evas_key_modifier_is_set_get(up->modifiers, evx->keyname))
- evas_key_modifier_off(e, evx->keyname);
- else if(evas_key_modifier_is_set_get(up->modifiers, "Control_L") ||
- evas_key_modifier_is_set_get(up->modifiers, "Control_R"))
- {
- switch((int)evx->keyname[0])
- {
- case 117:
- evas_text_entry_text_set(data, "");
- break;
- default:
+ if (e->buf.index > 0)
+ e->buf.text[--e->buf.index] = 0;
+ evas_text_entry_text_fix(o);
+}
+static void
+evas_text_entry_text_fix(Evas_Object * o)
+{
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ if (e->passwd)
+ {
+ int i, len;
+ char buf[e->buf.size];
+
+ len = strlen(e->buf.text);
+ memset(buf, 0, e->buf.size);
+ for (i = 0; i < len; i++)
+ buf[i] = '*';
+ edje_object_part_text_set(e->edje.o, e->edje.part, buf);
+ }
+ else
+ edje_object_part_text_set(e->edje.o, e->edje.part, e->buf.text);
+}
+static void
+_key_down_cb(void *data, Evas * e, Evas_Object * o, void *ev)
+{
+ if (ecore_event_current_type_get() == ECORE_X_EVENT_KEY_DOWN)
+ {
+ Ecore_X_Event_Key_Down *evx = NULL;
+
+ if ((evx = (Ecore_X_Event_Key_Down *) ecore_event_current_event_get()))
+ {
+ if ((!strcmp(evx->keyname, "Control_L"))
+ || (!strcmp(evx->keyname, "Control_R"))
+ || (!strcmp(evx->keyname, "Shift_R"))
+ || (!strcmp(evx->keyname, "Shift_L")))
+ {
+ evas_key_modifier_on(e, evx->keyname);
+ }
+ }
+ }
+}
+static void
+_key_up_cb(void *data, Evas * e, Evas_Object * o, void *ev)
+{
+ Evas_Event_Key_Up *up = NULL;
+ Evas_Text_Entry *entry = NULL;
+
+ entry = evas_object_smart_data_get(data);
+ up = (Evas_Event_Key_Up *) ev;
+
+ if (ecore_event_current_type_get() == ECORE_X_EVENT_KEY_UP)
+ {
+ Ecore_X_Event_Key_Up *evx = NULL;
+
+ if ((evx = (Ecore_X_Event_Key_Up *) ecore_event_current_event_get()))
+ {
+ if (evas_key_modifier_is_set_get(up->modifiers, evx->keyname))
+ evas_key_modifier_off(e, evx->keyname);
+ else if (evas_key_modifier_is_set_get(up->modifiers, "Control_L")
+ || evas_key_modifier_is_set_get(up->modifiers, "Control_R"))
+ {
+ switch ((int) evx->keyname[0])
+ {
+ case 117:
+ evas_text_entry_text_set(data, "");
+ break;
+ default:
#if 0
- fprintf(stderr, "(%d) is the key value\n", (int)evx->keyname[0]);
+ fprintf(stderr, "(%d) is the key value\n",
+ (int) evx->keyname[0]);
#endif
- break;
- }
-
- }
- else if((strlen(evx->keyname) > 1) &&
- (!evx->key_compose ||
- (strlen(evx->key_compose) > 1)))
- {
- if(!strcmp(evx->keyname, "BackSpace"))
- {
- evas_text_entry_buffer_backspace(data);
- }
- else
- {
- fprintf(stderr, "Unknown string %s\n", evx->keyname);
- }
- }
- else
- {
- switch((int)evx->key_compose[0])
- {
- case 127: /* Delete */
- case 9: /* Backspace */
- break;
- case 8: /* \t */
- evas_text_entry_buffer_backspace(data);
- break;
- case 13: /* \r */
- if(entry->return_key.func)
- entry->return_key.func(entry->return_key.arg,
- entry->buf.text);
- break;
- default:
- evas_text_entry_buffer_char_append(data, evx->key_compose[0]);
-#if 0
- fprintf(stderr, "(%d) is the key_compose value\n",
(int)evx->key_compose[0]);
+ break;
+ }
+
+ }
+ else if ((strlen(evx->keyname) > 1)
+ && (!evx->key_compose || (strlen(evx->key_compose) > 1)))
+ {
+ if (!strcmp(evx->keyname, "BackSpace"))
+ {
+ evas_text_entry_buffer_backspace(data);
+ }
+ else
+ {
+ fprintf(stderr, "Unknown string %s\n", evx->keyname);
+ }
+ }
+ else
+ {
+ switch ((int) evx->key_compose[0])
+ {
+ case 127: /* Delete */
+ case 9: /* Backspace */
+ break;
+ case 8: /* \t */
+ evas_text_entry_buffer_backspace(data);
+ break;
+ case 13: /* \r */
+ if (entry->return_key.func)
+ entry->return_key.func(entry->return_key.arg,
+ entry->buf.text);
+ break;
+ default:
+ evas_text_entry_buffer_char_append(data,
+ evx->key_compose[0]);
+#if 0
+ fprintf(stderr, "(%d) is the key_compose value\n",
+ (int) evx->key_compose[0]);
#endif
- break;
- }
- }
- }
- }
- evas_text_entry_text_fix(data);
+ break;
+ }
+ }
+ }
+ }
+ evas_text_entry_text_fix(data);
}
static void
-evas_text_entry_add(Evas_Object *o)
+evas_text_entry_add(Evas_Object * o)
{
- Evas_Text_Entry *entry = NULL;
+ Evas_Text_Entry *entry = NULL;
+
+ entry = (Evas_Text_Entry *) malloc(sizeof(Evas_Text_Entry));
+ memset(entry, 0, sizeof(Evas_Text_Entry));
+ entry->buf.size = 128;
+ entry->buf.text = (char *) malloc((sizeof(char) * 128) + 1);
+ memset(entry->buf.text, 0, 128);
- entry = (Evas_Text_Entry*)malloc(sizeof(Evas_Text_Entry));
- memset(entry, 0, sizeof(Evas_Text_Entry));
- entry->buf.size = 128;
- entry->buf.text = (char*)malloc((sizeof(char) * 128) + 1);
- memset(entry->buf.text, 0, 128);
+ evas_object_smart_data_set(o, entry);
- evas_object_smart_data_set(o, entry);
+ evas_key_modifier_add(evas_object_evas_get(o), "Control_L");
+ evas_key_modifier_add(evas_object_evas_get(o), "Control_R");
+ evas_key_modifier_add(evas_object_evas_get(o), "Shift_L");
+ evas_key_modifier_add(evas_object_evas_get(o), "Shift_R");
- evas_key_modifier_add(evas_object_evas_get(o), "Control_L");
- evas_key_modifier_add(evas_object_evas_get(o), "Control_R");
- evas_key_modifier_add(evas_object_evas_get(o), "Shift_L");
- evas_key_modifier_add(evas_object_evas_get(o), "Shift_R");
-
- entry->clip = evas_object_rectangle_add(evas_object_evas_get(o));
- evas_object_layer_set(entry->clip, 0);
+ entry->clip = evas_object_rectangle_add(evas_object_evas_get(o));
+ evas_object_layer_set(entry->clip, 0);
- entry->base = evas_object_rectangle_add(evas_object_evas_get(o));
- evas_object_layer_set(entry->base, 0);
- evas_object_color_set(entry->base, 255, 255, 255, 0);
- evas_object_clip_set(entry->base, entry->clip);
- evas_object_event_callback_add(entry->base, EVAS_CALLBACK_KEY_DOWN,
- _key_down_cb, o);
- evas_object_event_callback_add(entry->base, EVAS_CALLBACK_KEY_UP,
- _key_up_cb, o);
+ entry->base = evas_object_rectangle_add(evas_object_evas_get(o));
+ evas_object_layer_set(entry->base, 0);
+ evas_object_color_set(entry->base, 255, 255, 255, 0);
+ evas_object_clip_set(entry->base, entry->clip);
+ evas_object_event_callback_add(entry->base, EVAS_CALLBACK_KEY_DOWN,
+ _key_down_cb, o);
+ evas_object_event_callback_add(entry->base, EVAS_CALLBACK_KEY_UP,
+ _key_up_cb, o);
- evas_object_show(entry->base);
+ evas_object_show(entry->base);
}
static void
-evas_text_entry_del(Evas_Object *o)
+evas_text_entry_del(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_del(e->base);
- evas_object_del(e->clip);
- free(e->buf.text);
- free(e);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_del(e->base);
+ evas_object_del(e->clip);
+ free(e->buf.text);
+ free(e);
}
static void
-evas_text_entry_layer_set(Evas_Object *o, int l)
+evas_text_entry_layer_set(Evas_Object * o, int l)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_layer_set(e->base, l);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_layer_set(e->base, l);
}
static void
-evas_text_entry_raise(Evas_Object *o)
+evas_text_entry_raise(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_raise(e->base);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_raise(e->base);
}
static void
-evas_text_entry_lower(Evas_Object *o)
+evas_text_entry_lower(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_lower(e->base);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_lower(e->base);
}
static void
-evas_text_entry_stack_above(Evas_Object *o, Evas_Object *above)
+evas_text_entry_stack_above(Evas_Object * o, Evas_Object * above)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_stack_above(e->base, above);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_stack_above(e->base, above);
}
static void
-evas_text_entry_stack_below(Evas_Object *o, Evas_Object *below)
+evas_text_entry_stack_below(Evas_Object * o, Evas_Object * below)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_stack_below(e->base, below);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_stack_below(e->base, below);
}
static void
-evas_text_entry_move(Evas_Object *o, Evas_Coord x, Evas_Coord y)
+evas_text_entry_move(Evas_Object * o, Evas_Coord x, Evas_Coord y)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_move(e->clip, x, y);
- evas_object_move(e->base, x, y);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_move(e->clip, x, y);
+ evas_object_move(e->base, x, y);
}
static void
-evas_text_entry_resize(Evas_Object *o, Evas_Coord w, Evas_Coord h)
+evas_text_entry_resize(Evas_Object * o, Evas_Coord w, Evas_Coord h)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_resize(e->clip, w, h);
- evas_object_resize(e->base, w, h);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_resize(e->clip, w, h);
+ evas_object_resize(e->base, w, h);
}
static void
-evas_text_entry_show(Evas_Object *o)
+evas_text_entry_show(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_show(e->clip);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_show(e->clip);
}
static void
-evas_text_entry_hide(Evas_Object *o)
+evas_text_entry_hide(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_hide(e->clip);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_hide(e->clip);
}
static void
-evas_text_entry_color_set(Evas_Object *o, int r, int g, int b, int a)
+evas_text_entry_color_set(Evas_Object * o, int r, int g, int b, int a)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
}
static void
-evas_text_entry_clip_set(Evas_Object *o, Evas_Object *clip)
+evas_text_entry_clip_set(Evas_Object * o, Evas_Object * clip)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_clip_set(e->clip, clip);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_clip_set(e->clip, clip);
}
static void
-evas_text_entry_clip_unset(Evas_Object *o)
+evas_text_entry_clip_unset(Evas_Object * o)
{
- Evas_Text_Entry *e = NULL;
- e = evas_object_smart_data_get(o);
- evas_object_clip_unset(e->clip);
+ Evas_Text_Entry *e = NULL;
+
+ e = evas_object_smart_data_get(o);
+ evas_object_clip_unset(e->clip);
}
-static Evas_Smart*
+static Evas_Smart *
evas_text_entry_smart_get(void)
{
- Evas_Smart *s = NULL;
-
- s = evas_smart_new ("Text Entry",
- evas_text_entry_add,
- evas_text_entry_del,
- evas_text_entry_layer_set,
- evas_text_entry_raise,
- evas_text_entry_lower,
- evas_text_entry_stack_above,
- evas_text_entry_stack_below,
- evas_text_entry_move,
- evas_text_entry_resize,
- evas_text_entry_show,
- evas_text_entry_hide,
- evas_text_entry_color_set,
- evas_text_entry_clip_set,
- evas_text_entry_clip_unset,
- NULL);
- return(s);
+ Evas_Smart *s = NULL;
+
+ s = evas_smart_new("Text Entry", evas_text_entry_add, evas_text_entry_del,
+ evas_text_entry_layer_set, evas_text_entry_raise,
+ evas_text_entry_lower, evas_text_entry_stack_above,
+ evas_text_entry_stack_below, evas_text_entry_move,
+ evas_text_entry_resize, evas_text_entry_show,
+ evas_text_entry_hide, evas_text_entry_color_set,
+ evas_text_entry_clip_set, evas_text_entry_clip_unset,
+ NULL);
+ return (s);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/EvasTextEntry.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- EvasTextEntry.h 25 Jul 2003 05:20:02 -0000 1.1
+++ EvasTextEntry.h 21 Oct 2003 22:36:06 -0000 1.2
@@ -7,43 +7,46 @@
struct _Evas_Text_Entry
{
- Evas_Object *clip;
- Evas_Object *base;
- struct {
- int size;
- char *text;
- int index;
- } buf;
- struct {
- Evas_Object *o;
- char *part;
- } edje;
- struct {
- void (*func)(void *data, const char *str);
- void *arg;
- } return_key;
- int passwd;
+ Evas_Object *clip;
+ Evas_Object *base;
+ struct
+ {
+ int size;
+ char *text;
+ int index;
+ } buf;
+ struct
+ {
+ Evas_Object *o;
+ char *part;
+ } edje;
+ struct
+ {
+ void (*func) (void *data, const char *str);
+ void *arg;
+ } return_key;
+ int passwd;
};
typedef struct _Evas_Text_Entry Evas_Text_Entry;
/* create a new text entry */
-Evas_Object *evas_text_entry_new(Evas *e);
+Evas_Object *evas_text_entry_new(Evas * e);
-void evas_text_entry_text_set(Evas_Object *o, const char *str);
-void evas_text_entry_is_password_set(Evas_Object *o, int val);
-void evas_text_entry_focus_set(Evas_Object *o, int val);
-int evas_text_entry_is_focused(Evas_Object *o);
-void evas_text_entry_max_chars_set(Evas_Object *o, int max);
-void
-evas_text_entry_edje_part_set(Evas_Object *o, Evas_Object *edje, char *part);
+void evas_text_entry_text_set(Evas_Object * o, const char *str);
+void evas_text_entry_is_password_set(Evas_Object * o, int val);
+void evas_text_entry_focus_set(Evas_Object * o, int val);
+int evas_text_entry_is_focused(Evas_Object * o);
+void evas_text_entry_max_chars_set(Evas_Object * o, int max);
+void evas_text_entry_edje_part_set(Evas_Object * o, Evas_Object * edje,
+ char *part);
/* you've gotta free this resut */
//char * evas_text_entry_string_get(Evas_Object *o)
-void evas_text_entry_return_key_callback_set(
- Evas_Object *o,
- void (*func)(void *data, const char *str),
- void *data);
+void evas_text_entry_return_key_callback_set(Evas_Object * o,
+ void (*func) (void *data,
+ const char *str),
+ void *data);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- entrance.h 26 Jul 2003 15:15:01 -0000 1.4
+++ entrance.h 21 Oct 2003 22:36:06 -0000 1.5
@@ -11,6 +11,6 @@
#include "util.h"
#include "entrance_session.h"
-#define X_TESTING 0
+#define X_TESTING 1
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_auth.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entrance_auth.c 14 Oct 2003 17:40:11 -0000 1.5
+++ entrance_auth.c 21 Oct 2003 22:36:06 -0000 1.6
@@ -110,15 +110,14 @@
e->pam.handle = NULL;
if ((pamerr =
- /* NB NB NB: if we use "entrance" as the unique pam auth type */
- /* you need to make a new file in /etc/pam.d of that same name */
- /* (ie entrance). you can quickly do this by: */
- /* */
- /* cd /etc/pam.d */
- /* cp xdm entrance */
- /* */
- /* but for ease of use we masquerade as xdm */
-
+ /* NB NB NB: if we use "entrance" as the unique pam auth type */
+ /* you need to make a new file in /etc/pam.d of that same name */
+ /* (ie entrance). you can quickly do this by: */
+ /* */
+ /* cd /etc/pam.d */
+ /* cp xdm entrance */
+ /* */
+ /* but for ease of use we masquerade as xdm */
pam_start("xdm", e->user, &(e->pam.conv),
&(e->pam.handle))) != PAM_SUCCESS)
{
@@ -169,7 +168,7 @@
{
int result = 0;
int pamerr;
-
+
if (_entrance_auth_pam_initialize(e) != E_SUCCESS)
return ERROR_NO_PAM_INIT;
@@ -182,7 +181,7 @@
else
{
pamerr = pam_setcred(e->pam.handle, 0);
-
+
if (pamerr == PAM_SUCCESS)
result = AUTH_SUCCESS;
else
@@ -202,7 +201,7 @@
}
else
result = ERROR_BAD_PASS;
-
+
syslog(LOG_CRIT, "PAM: %s.", pam_strerror(e->pam.handle, pamerr));
return result;
@@ -214,23 +213,24 @@
{
char *encrypted;
char *correct = e->pw->pw_passwd;
+
#if HAVE_SHADOW
struct spwd *sp;
-
+
if (cfg->auth == ENTRANCE_USE_SHADOW)
{
sp = getspnam(e->pw->pw_name);
endspent();
- if (sp)
+ if (sp)
correct = sp->sp_pwdp;
}
#endif
if (!correct || !correct[0])
return AUTH_SUCCESS;
-
+
encrypted = crypt(e->pass, correct);
-
+
return (strcmp(encrypted, correct)) ? ERROR_BAD_PASS : AUTH_SUCCESS;
}
@@ -273,8 +273,8 @@
}
else
result = 1;
-
- endpwent();
+
+ endpwent();
}
return (result);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- entrance_session.c 21 Oct 2003 22:09:46 -0000 1.14
+++ entrance_session.c 21 Oct 2003 22:36:06 -0000 1.15
@@ -195,13 +195,12 @@
if (e->session)
free(e->session);
e->session = strdup(key);
- old_o = edje_object_part_swallow_get(e->edje,
- "EntranceSession");
- if(old_o)
- {
- edje_object_part_unswallow(e->edje, old_o);
- evas_object_del(old_o);
- }
+ old_o = edje_object_part_swallow_get(e->edje, "EntranceSession");
+ if (old_o)
+ {
+ edje_object_part_unswallow(e->edje, old_o);
+ evas_object_del(old_o);
+ }
edje_object_part_swallow(e->edje, "EntranceSession", o);
}
}
@@ -212,8 +211,9 @@
{
char *str = NULL;
char buf[PATH_MAX];
-
- if(!e || !key) return;
+
+ if (!e || !key)
+ return;
if ((str = evas_hash_find(e->config->sessions, key)))
{
@@ -226,7 +226,7 @@
}
else
{
- fprintf(stderr, "Unable to find %s\n", key);
+ fprintf(stderr, "Unable to find %s\n", key);
}
}
@@ -235,7 +235,8 @@
{
if (e)
{
- if(e->edje) evas_object_del(e->edje);
+ if (e->edje)
+ evas_object_del(e->edje);
e->edje = obj;
}
}
@@ -301,7 +302,7 @@
snprintf(buf, PATH_MAX, "%s/images/sessions/default.png",
PACKAGE_DATA_DIR);
result = evas_object_image_add(evas_object_evas_get(o));
- evas_object_image_file_set(result, buf, NULL);
+ evas_object_image_file_set(result, buf, NULL);
}
}
evas_object_move(result, -999, -999);
@@ -314,7 +315,7 @@
static Evas_Object *
_entrance_session_load_session(Entrance_Session e, char *key)
{
- int result = 0;
+ int result = 0;
char *icon = NULL;
char buf[PATH_MAX];
Evas_Object *o = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/client/entrance_session.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- entrance_session.h 21 Oct 2003 10:19:10 -0000 1.5
+++ entrance_session.h 21 Oct 2003 22:36:06 -0000 1.6
@@ -38,7 +38,7 @@
void entrance_session_reset_user(Entrance_Session e);
void entrance_session_start_user_session(Entrance_Session e);
void entrance_session_xsession_set(Entrance_Session e, char *xsession);
-void entrance_session_edje_object_set(Entrance_Session e, Evas_Object *obj);
+void entrance_session_edje_object_set(Entrance_Session e, Evas_Object * obj);
void entrance_session_list_add(Entrance_Session e);
#endif
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
