Enlightenment CVS committal
Author : atmosphere
Project : misc
Module : elogin
Dir : misc/elogin/src/client
Modified Files:
Makefile.am callbacks.c e_login_config.c e_login_config.h
e_login_session.c e_login_session.h elogin.h events.c intro.c
Log Message:
Bring the rest of elogin upto speed, new parch.jpg
anyone inclined to animate or who may be graphically talented who wants to
mess with the graphics in the session subsystem would be greatly
appreciated.
Something like...
Fade submenu -> move Xsession on a curve to docking point and back again on
same curve after reselection.
Session font color/name and parch configuration to come.
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 21 Jan 2003 18:12:25 -0000 1.4
+++ Makefile.am 23 Jan 2003 15:33:57 -0000 1.5
@@ -14,6 +14,7 @@
e_login_auth.c e_login_auth.h \
e_login_session.c e_login_session.h \
e_login_config.c e_login_config.h \
+ session_bar.c session_bar.h \
events.c events.h \
util.c util.h \
elogin.h \
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- callbacks.c 13 Jan 2003 23:09:42 -0000 1.10
+++ callbacks.c 23 Jan 2003 15:33:58 -0000 1.11
@@ -8,67 +8,6 @@
static void elogin_start_x(E_Login_Session e);
-void
-elogin_select_next_session(E_Login_Session e)
-{
- elogin_select_session(e, e->session_index + 1);
-}
-
-void
-elogin_select_prev_session(E_Login_Session e)
-{
- elogin_select_session(e, e->session_index - 1);
-}
-
-void
-elogin_session_list_clicked(void *session, Evas * evas, Evas_Object * li,
- void *event_info)
-{
- E_Login_Session e = (E_Login_Session) session;
- int i = 0;
- Evas_List *t;
- Evas_Event_Mouse_Up *ev = (Evas_Event_Mouse_Up *) event_info;
-
- if (ev->button != 1)
- return;
-
- /* Find the index of the object that was clicked */
- for (t = e->listitems; t && evas_list_data(t) != li; t = t->next)
- {
- ++i;
- }
-
- if (t)
- elogin_select_session(e, i);
-}
-
-
-void
-elogin_select_session(E_Login_Session e, int s_index)
-{
- int ix, iy;
-
- /* Force within list bounds/wraparound */
- if (s_index >= evas_list_count(e->listitems))
- s_index = 0;
- else if (s_index < 0)
- s_index = evas_list_count(e->listitems) - 1;
-
- /* Update bullet position */
- ix = (e->geom.w - 250) / 2 + 20;
- iy = 120 + (s_index * 30);
- evas_object_move(e->bullet, ix, iy);
-
- /* Update current session */
- e->session_index = s_index;
- e->session = evas_list_nth(e->config->sessions, s_index);
-
-#if ELOGIN_DEBUG
- printf("Session Selected: Name = %s, Path= %s\n", e->session->name,
- e->session->path);
-#endif
-}
-
int
elogin_return_key_cb(E_Login_Session e, char *buffer)
{
@@ -123,26 +62,24 @@
e_login_auth_setup_environment(e->auth);
/* snprintf(buf, PATH_MAX, "%s/.xinitrc", e->auth->pam.pw->pw_dir); */
- if (e->session)
+ if (e->xsession)
{
/* If a path was specified for the session, use that path instead of
passing the session name to Xsession */
- if (e->session->path && strlen(e->session->path))
+ if (e->xsession->path && strlen(e->xsession->path))
{
/* Handle the failsafe session */
- if (!strcmp(e->session->path, "failsafe"))
+ if (!strcmp(e->xsession->path, "failsafe"))
snprintf(buf, PATH_MAX, "/etc/X11/Xsession failsafe");
else
- snprintf(buf, PATH_MAX, "%s", e->session->path);
+ snprintf(buf, PATH_MAX, "%s", e->xsession->path);
}
-
else
- snprintf(buf, PATH_MAX, "/etc/X11/Xsession %s", e->session->name);
+ snprintf(buf, PATH_MAX, "/etc/X11/Xsession %s", e->xsession->name);
}
else
- snprintf(buf, PATH_MAX, "/etc/X11/Xsession"); /* Default
- Session
- */
+ snprintf(buf, PATH_MAX, "/etc/X11/Xsession");
+ /* Default Session */
#if X_TESTING
printf("Would have executed: %s\n", buf);
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/e_login_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_login_config.c 21 Jan 2003 18:12:29 -0000 1.5
+++ e_login_config.c 23 Jan 2003 15:33:58 -0000 1.6
@@ -16,21 +16,17 @@
return (e);
}
-static char*
+static char *
get_hostname(void)
{
- FILE *fp = NULL;
- char *result = NULL;
- char buf[PATH_MAX], buf2[PATH_MAX];
-
- if((fp = fopen("/etc/hostname", "r")))
- {
- int read_bytes = fread(buf, 1, PATH_MAX, fp);
- snprintf(buf2, read_bytes, "%s", buf);
- result = strdup(buf2);
- fclose(fp);
- }
- return(result);
+ char buf[255];
+ char *result = NULL;
+
+ if (!(gethostname(buf, 255)))
+ result = strdup(buf);
+ else
+ result = strdup("Localhost");
+ return (result);
}
static void
@@ -91,15 +87,15 @@
if (!e_db_int_get(db, "/elogin/welcome/font/a", &(e->welcome.font.a)))
e->welcome.font.a = 192;
if (!e_db_float_get(db, "/elogin/welcome/pos/x", &(e->welcome.pos.x)))
- e->welcome.pos.x = 0.0;
+ e->welcome.pos.x = 0.0;
if (!e_db_float_get(db, "/elogin/welcome/pos/y", &(e->welcome.pos.y)))
- e->welcome.pos.x = 0.0;
- if (!e_db_int_get(db, "/elogin/welcome/pos/offset/x",
- &(e->welcome.pos.offset_x)))
- e->welcome.pos.offset_x = 0;
- if (!e_db_int_get(db, "/elogin/welcome/pos/offset/y",
- &(e->welcome.pos.offset_y)))
- e->welcome.pos.offset_y = 0;
+ e->welcome.pos.x = 0.0;
+ if (!e_db_int_get
+ (db, "/elogin/welcome/pos/offset/x", &(e->welcome.pos.offset_x)))
+ e->welcome.pos.offset_x = 0;
+ if (!e_db_int_get
+ (db, "/elogin/welcome/pos/offset/y", &(e->welcome.pos.offset_y)))
+ e->welcome.pos.offset_y = 0;
if (!e_db_int_get
(db, "/elogin/welcome/font/size", &(e->welcome.font.size)))
e->welcome.font.size = 20;
@@ -125,15 +121,15 @@
if (!e_db_int_get(db, "/elogin/passwd/font/size", &(e->passwd.font.size)))
e->passwd.font.size = 20;
if (!e_db_float_get(db, "/elogin/passwd/pos/x", &(e->passwd.pos.x)))
- e->passwd.pos.x = 0.0;
+ e->passwd.pos.x = 0.0;
if (!e_db_float_get(db, "/elogin/passwd/pos/y", &(e->passwd.pos.y)))
- e->passwd.pos.x = 0.0;
- if (!e_db_int_get(db, "/elogin/passwd/pos/offset/x",
- &(e->passwd.pos.offset_x)))
- e->passwd.pos.offset_x = 0;
- if (!e_db_int_get(db, "/elogin/passwd/pos/offset/y",
- &(e->passwd.pos.offset_y)))
- e->passwd.pos.offset_y = 0;
+ e->passwd.pos.x = 0.0;
+ if (!e_db_int_get
+ (db, "/elogin/passwd/pos/offset/x", &(e->passwd.pos.offset_x)))
+ e->passwd.pos.offset_x = 0;
+ if (!e_db_int_get
+ (db, "/elogin/passwd/pos/offset/y", &(e->passwd.pos.offset_y)))
+ e->passwd.pos.offset_y = 0;
if ((str = e_db_str_get(db, "/elogin/greeting/mess")))
e->greeting.mess = str;
else
@@ -153,15 +149,15 @@
if (!e_db_int_get(db, "/elogin/greeting/font/a", &(e->greeting.font.a)))
e->greeting.font.a = 192;
if (!e_db_float_get(db, "/elogin/greeting/pos/x", &(e->greeting.pos.x)))
- e->greeting.pos.x = 0.0;
+ e->greeting.pos.x = 0.0;
if (!e_db_float_get(db, "/elogin/greeting/pos/y", &(e->greeting.pos.y)))
- e->greeting.pos.x = 0.0;
- if (!e_db_int_get(db, "/elogin/greeting/pos/offset/x",
- &(e->greeting.pos.offset_x)))
- e->greeting.pos.offset_x = 0;
- if (!e_db_int_get(db, "/elogin/greeting/pos/offset/y",
- &(e->greeting.pos.offset_y)))
- e->greeting.pos.offset_y = 0;
+ e->greeting.pos.x = 0.0;
+ if (!e_db_int_get
+ (db, "/elogin/greeting/pos/offset/x", &(e->greeting.pos.offset_x)))
+ e->greeting.pos.offset_x = 0;
+ if (!e_db_int_get
+ (db, "/elogin/greeting/pos/offset/y", &(e->greeting.pos.offset_y)))
+ e->greeting.pos.offset_y = 0;
if (!e_db_int_get
(db, "/elogin/greeting/font/size", &(e->greeting.font.size)))
e->greeting.font.size = 20;
@@ -174,13 +170,13 @@
e->display.w = 1;
if (!e_db_int_get(db, "/elogin/xinerama/on/h", &(e->display.h)))
e->display.h = 1;
-
- if((str = get_hostname()))
+
+ if ((str = get_hostname()))
{
- snprintf(buf, PATH_MAX, "%s %s", e->greeting.mess, str);
- free(e->greeting.mess);
- free(str);
- e->greeting.mess = strdup(buf);
+ snprintf(buf, PATH_MAX, "%s %s", e->greeting.mess, str);
+ free(e->greeting.mess);
+ free(str);
+ e->greeting.mess = strdup(buf);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/e_login_config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_login_config.h 21 Jan 2003 18:12:32 -0000 1.5
+++ e_login_config.h 23 Jan 2003 15:33:58 -0000 1.6
@@ -24,9 +24,10 @@
font;
struct
{
- float x, y;
- int offset_x, offset_y;
- } pos;
+ float x, y;
+ int offset_x, offset_y;
+ }
+ pos;
char *mess;
}
welcome, passwd, greeting;
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/e_login_session.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_login_session.c 22 Jan 2003 22:37:02 -0000 1.10
+++ e_login_session.c 23 Jan 2003 15:33:59 -0000 1.11
@@ -44,7 +44,9 @@
}
/**
- * e_login_session_init: Initialize the session by taking over the screen
+ * e_login_session_init: Initialize the session by taking over the screen,
+ * giving us an Evas to play in, If you want to add stuff don't add it
+ * here.
* @e - the E_Login_Session to be initialized
*/
void
@@ -56,9 +58,7 @@
Display *disp;
Window win, ewin;
Evas *evas;
- Evas_List *l;
- Evas_Object *li;
- int iw, ih, ix, iy;
+ int iw = 0, ih = 0;
if (!e)
exit(1);
@@ -112,8 +112,8 @@
XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE |
XEV_KEY);
- evas_image_cache_set(evas, 0);
- evas_font_cache_set(evas, 0);
+ evas_image_cache_set(evas,(1024 * 1024) * 1);
+ evas_font_cache_set(evas, (1024 * 1024) * 2);
evas_font_path_append(evas, PACKAGE_DATA_DIR "/data/fonts/");
ecore_window_show(ewin);
@@ -144,71 +144,6 @@
evas_object_pass_events_set(e->pointer, 1);
evas_object_show(e->pointer);
- /* Session list background image */
- e->listbg = evas_object_image_add(evas);
- evas_object_image_file_set(e->listbg,
- PACKAGE_DATA_DIR "/data/images/parch.png",
- NULL);
- evas_object_image_size_get(e->listbg, &iw, &ih);
- evas_object_resize(e->listbg, iw, ih);
- evas_object_image_fill_set(e->listbg, 0.0, 0.0, (double) iw, (double) ih);
- evas_object_layer_set(e->listbg, 1);
- evas_object_move(e->listbg, (double) (e->geom.w - 250) / 2.0, 40.0);
- evas_object_show(e->listbg);
-
- /* Session list heading */
- e->listhead = evas_object_text_add(evas);
- evas_object_text_font_set(e->listhead, "notepad.ttf", 21.0);
- evas_object_text_text_set(e->listhead, "Select Session");
- evas_object_layer_set(e->listhead, 2);
- evas_object_color_set(e->listhead, 90, 60, 25, 255);
- ix = (e->geom.w - 250) / 2 + 20;
- iy = 80;
- evas_object_move(e->listhead, (double) ix, (double) iy);
- evas_object_show(e->listhead);
-
- /* Build session list */
- ix = (e->geom.w - 250) / 2 + 50;
- iy = 120;
-
- e->listitems = NULL;
- for (l = e->config->sessions; l && iy <= 330; l = l->next)
- {
- char *session_name = ((E_Login_Session_Type *) evas_list_data(l))->name;
-
- li = evas_object_text_add(evas);
- evas_object_text_font_set(li, "notepad.ttf", 16.0);
- evas_object_text_text_set(li, session_name);
- evas_object_layer_set(li, 25);
- evas_object_color_set(li, 0, 0, 0, 255);
- evas_object_resize(li, 180, 30);
- evas_object_move(li, (double) ix, (double) iy);
- evas_object_event_callback_add(li, EVAS_CALLBACK_MOUSE_UP,
- elogin_session_list_clicked, e);
- evas_object_show(li);
- e->listitems = evas_list_append(e->listitems, li);
- iy += 30;
- }
-
- /* Bullet */
- e->bullet = evas_object_image_add(evas);
- evas_object_image_file_set(e->bullet,
- PACKAGE_DATA_DIR "/data/images/bullet.png",
- NULL);
- evas_object_image_size_get(e->bullet, &iw, &ih);
- evas_object_resize(e->bullet, iw, ih);
- evas_object_image_fill_set(e->bullet, 0.0, 0.0, (double) iw, (double) ih);
- evas_object_layer_set(e->bullet, 5);
- evas_object_move(e->bullet, -99999, -99999);
- evas_object_show(e->bullet);
-
- /* Set default session to first in list (for now) */ ;
- l = e->config->sessions;
- if (l)
- e->session = evas_list_data(l);
- else
- e->session = NULL;
- e->session_index = 0;
e->evas = evas;
e->ewin = ewin;
@@ -234,4 +169,24 @@
{
e_login_auth_free(e->auth);
e->auth = e_login_auth_new();
+}
+
+void
+e_login_session_select_xsession_named(E_Login_Session e, const char *name)
+{
+ if (e)
+ {
+ Evas_List *l = NULL;
+ E_Login_Session_Type *t = NULL;
+
+ for (l = e->config->sessions; l; l = l->next)
+ {
+ t = (E_Login_Session_Type *) l->data;
+ if (!(strcmp(t->name, name)))
+ {
+ e->xsession = t;
+ return;
+ }
+ }
+ }
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/e_login_session.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_login_session.h 13 Jan 2003 23:10:04 -0000 1.8
+++ e_login_session.h 23 Jan 2003 15:33:59 -0000 1.9
@@ -24,10 +24,6 @@
{
Evas *evas; /* the evas being used in the X session */
Evas_Object *pointer; /* object for the pointer in the evas */
- Evas_Object *listbg; /* Background for session list */
- Evas_Object *listhead; /* Session List heading */
- Evas_Object *bullet;
- Evas_List *listitems; /* Items in session list */
E_Background bg; /* ebg in the evas */
E_Login_Auth auth; /* encapsulated auth shit */
E_Login_Config config; /* configuration options */
@@ -39,12 +35,8 @@
}
geom; /* the height/width of the evas */
- E_Login_Session_Type *session; /* The
- session
- to
- load
- */
- int session_index;
+ E_Login_Session_Type *xsession;
+ /* The X session to load */
Evas_List *users; /* recent users */
/* find a way to have plugins running */
@@ -58,7 +50,7 @@
int e_login_session_auth_user(E_Login_Session e);
void e_login_session_reset_user(E_Login_Session e);
-void e_login_session_select_session(E_Login_Session e,
- E_Login_Session_Type * t);
+void e_login_session_select_xsession_named(E_Login_Session e,
+ const char *name);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/elogin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- elogin.h 22 Jan 2003 22:37:05 -0000 1.6
+++ elogin.h 23 Jan 2003 15:33:59 -0000 1.7
@@ -1,8 +1,6 @@
#ifndef _ELOGIN_H_
#define _ELOGIN_H_
-#define X_TESTING
-
#include"../config.h"
#include<stdio.h>
#include<stdlib.h>
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/events.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- events.c 21 Jan 2003 05:09:36 -0000 1.9
+++ events.c 23 Jan 2003 15:33:59 -0000 1.10
@@ -114,6 +114,7 @@
if (e->key)
{
int length = 0;
+
length = strlen(e->key);
if (e->mods & ECORE_EVENT_KEY_MODIFIER_CTRL)
{
@@ -149,10 +150,10 @@
{
typebuffer.buf[typebuffer.buf_index++] = ' ';
}
- else if(!(strcmp(e->key, "period")))
- {
- typebuffer.buf[typebuffer.buf_index++] = '.';
- }
+ else if (!(strcmp(e->key, "period")))
+ {
+ typebuffer.buf[typebuffer.buf_index++] = '.';
+ }
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/misc/elogin/src/client/intro.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- intro.c 21 Jan 2003 18:12:35 -0000 1.9
+++ intro.c 23 Jan 2003 15:33:59 -0000 1.10
@@ -2,6 +2,7 @@
#include "e_login_config.h"
#include "callbacks.h"
#include <Estyle.h>
+#include "session_bar.h"
static Evas *evas = NULL;
static E_Login_Config config = NULL;
@@ -54,11 +55,11 @@
evas_output_size_get(evas, &w, &h);
estyle_set_text(o, err_str);
- estyle_geometry(o, NULL, NULL, (int*)&tw, (int*)&th);
- x = ((((w / config->screens.w) -
- tw) * config->welcome.pos.x ) + config->welcome.pos.offset_x);
- y = ((((h / config->screens.h) -
- th) * config->welcome.pos.y ) + config->welcome.pos.offset_y);
+ estyle_geometry(o, NULL, NULL, (int *) &tw, (int *) &th);
+ x = ((((w / config->screens.w) - tw) * config->welcome.pos.x) +
+ config->welcome.pos.offset_x);
+ y = ((((h / config->screens.h) - th) * config->welcome.pos.y) +
+ config->welcome.pos.offset_y);
estyle_move(o, x, y);
estyle_hide(_o_pass_desc);
@@ -83,32 +84,33 @@
evas_output_size_get(evas, &w, &h);
estyle_geometry(o, NULL, NULL, &tw, &th);
-
- x = ((((w / config->screens.w) -
- tw) * config->passwd.pos.x ) + config->passwd.pos.offset_x);
- y = ((((h / config->screens.h) -
- th) * config->passwd.pos.y ) + config->passwd.pos.offset_y + th);
+
+ x = ((((w / config->screens.w) - tw) * config->passwd.pos.x) +
+ config->passwd.pos.offset_x);
+ y = ((((h / config->screens.h) - th) * config->passwd.pos.y) +
+ config->passwd.pos.offset_y + th);
estyle_move(o, x, y);
}
void
elogin_update_time(int val, void *data)
{
- char buf[PATH_MAX], timer[PATH_MAX];
-
- if(data)
- {
- struct tm *current;
- time_t _t = time(NULL);
- current = localtime(&_t);
- if(val)
- strftime(buf, PATH_MAX, "%I:%M %Z", current);
- else
- strftime(buf, PATH_MAX, "%b %e %Y", current);
- estyle_set_text((Estyle*)data, buf);
- snprintf(timer, PATH_MAX, "%s timer", buf);
- ecore_add_event_timer(timer, 1.0, elogin_update_time, val, data);
- }
+ char buf[PATH_MAX], timer[PATH_MAX];
+
+ if (data)
+ {
+ struct tm *current;
+ time_t _t = time(NULL);
+
+ current = localtime(&_t);
+ if (val)
+ strftime(buf, PATH_MAX, "%I:%M %Z", current);
+ else
+ strftime(buf, PATH_MAX, "%b %e %Y", current);
+ estyle_set_text((Estyle *) data, buf);
+ snprintf(timer, PATH_MAX, "%s timer", buf);
+ ecore_add_event_timer(timer, 1.0, elogin_update_time, val, data);
+ }
}
void
@@ -142,35 +144,31 @@
config = e->config;
- /* select a default session */
- elogin_select_session(e, 0);
es = estyle_new(evas, config->welcome.mess, "raised");
estyle_set_color(es, config->welcome.font.r, config->welcome.font.g,
- config->welcome.font.b, config->welcome.font.a);
- estyle_set_font(es, config->welcome.font.name,
- config->welcome.font.size);
+ config->welcome.font.b, config->welcome.font.a);
+ estyle_set_font(es, config->welcome.font.name, config->welcome.font.size);
estyle_geometry(es, NULL, NULL, &tw, &th);
- x = ((((e->geom.w / config->screens.w) - tw) *
- config->welcome.pos.x ) + config->welcome.pos.offset_x);
- y = ((((e->geom.h / config->screens.h) - th) *
- config->welcome.pos.y ) + config->welcome.pos.offset_y);
+ x = ((((e->geom.w / config->screens.w) - tw) * config->welcome.pos.x) +
+ config->welcome.pos.offset_x);
+ y = ((((e->geom.h / config->screens.h) - th) * config->welcome.pos.y) +
+ config->welcome.pos.offset_y);
estyle_move(es, x, y);
estyle_set_layer(es, 5);
estyle_show(es);
_o_text_desc = es;
-
+
/* password description */
es = estyle_new(evas, config->passwd.mess, "raised");
estyle_set_color(es, config->passwd.font.r, config->passwd.font.g,
- config->passwd.font.b, config->passwd.font.a);
- estyle_set_font(es, config->passwd.font.name,
- config->passwd.font.size);
+ config->passwd.font.b, config->passwd.font.a);
+ estyle_set_font(es, config->passwd.font.name, config->passwd.font.size);
estyle_geometry(es, NULL, NULL, &tw, &th);
- x = ((((e->geom.w / config->screens.w) -
- tw) * config->passwd.pos.x ) + config->passwd.pos.offset_x);
- y = ((((e->geom.h / config->screens.h) -
- th) * config->passwd.pos.y ) + config->passwd.pos.offset_y);
+ x = ((((e->geom.w / config->screens.w) - tw) * config->passwd.pos.x) +
+ config->passwd.pos.offset_x);
+ y = ((((e->geom.h / config->screens.h) - th) * config->passwd.pos.y) +
+ config->passwd.pos.offset_y);
estyle_move(es, x, y);
estyle_set_layer(es, 5);
estyle_hide(es);
@@ -179,9 +177,8 @@
/* o_text_entry */
es = estyle_new(evas, "", "raised");
estyle_set_color(es, config->welcome.font.r, config->welcome.font.g,
- config->welcome.font.b, config->welcome.font.a);
- estyle_set_font(es, config->welcome.font.name,
- config->welcome.font.size);
+ config->welcome.font.b, config->welcome.font.a);
+ estyle_set_font(es, config->welcome.font.name, config->welcome.font.size);
estyle_move(es, x, y);
estyle_set_layer(es, 5);
estyle_show(es);
@@ -190,9 +187,8 @@
/* _o_err_str is placed later */
es = estyle_new(evas, "", "raised");
estyle_set_color(es, config->welcome.font.r, config->welcome.font.g,
- config->welcome.font.b, config->welcome.font.a);
- estyle_set_font(es, config->welcome.font.name,
- config->welcome.font.size);
+ config->welcome.font.b, config->welcome.font.a);
+ estyle_set_font(es, config->welcome.font.name, config->welcome.font.size);
estyle_move(es, x, y);
estyle_hide(es);
estyle_set_layer(es, 5);
@@ -201,36 +197,38 @@
/* Greeting Message */
es = estyle_new(evas, config->greeting.mess, "raised");
estyle_set_color(es, config->greeting.font.r, config->greeting.font.g,
- config->greeting.font.b, config->greeting.font.a);
+ config->greeting.font.b, config->greeting.font.a);
estyle_set_font(es, config->greeting.font.name,
- config->greeting.font.size + 8);
+ config->greeting.font.size + 8);
estyle_geometry(es, NULL, NULL, &tw, &th);
- x = ((((e->geom.w / config->screens.w) -
- tw) * config->greeting.pos.x ) + config->greeting.pos.offset_x);
- y = ((((e->geom.h / config->screens.h) -
- th) * config->greeting.pos.y ) + config->greeting.pos.offset_y);
+ x = ((((e->geom.w / config->screens.w) - tw) * config->greeting.pos.x) +
+ config->greeting.pos.offset_x);
+ y = ((((e->geom.h / config->screens.h) - th) * config->greeting.pos.y) +
+ config->greeting.pos.offset_y);
estyle_move(es, x, y);
y += th;
estyle_show(es);
-
+
/* Greeting Date */
es = estyle_new(evas, "", "raised");
estyle_set_color(es, config->greeting.font.r, config->greeting.font.g,
- config->greeting.font.b, config->greeting.font.a);
+ config->greeting.font.b, config->greeting.font.a);
estyle_set_font(es, config->greeting.font.name,
- config->greeting.font.size);
+ config->greeting.font.size);
estyle_move(es, x, y);
y += config->greeting.font.size + 4;
estyle_show(es);
ecore_add_event_timer("timer", 1.0, elogin_update_time, 0, es);
-
+
/* Greeting time */
es = estyle_new(evas, "", "raised");
estyle_set_color(es, config->greeting.font.r, config->greeting.font.g,
- config->greeting.font.b, config->greeting.font.a);
+ config->greeting.font.b, config->greeting.font.a);
estyle_set_font(es, config->greeting.font.name,
- config->greeting.font.size);
+ config->greeting.font.size);
estyle_move(es, x, y);
estyle_show(es);
ecore_add_event_timer("timer2", 1.0, elogin_update_time, 1, es);
+
+ e_login_session_bar_init(e);
}
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
