Enlightenment CVS committal
Author : azundris
Project : misc
Module : erss
Dir : misc/erss/src
Modified Files:
erss.c parse.c parse_config.c parse_config.h
Log Message:
2003-02-03 Azundris <[EMAIL PROTECTED]>
* clicking the title (site-name) now takes you to the site
* <clock> can now also be used in ~/.erssrc; if non-empty,
it will override the setting in the site-specific config-
file ("global override")
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/erss.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- erss.c 29 Jan 2004 13:07:14 -0000 1.28
+++ erss.c 3 Feb 2004 14:41:10 -0000 1.29
@@ -173,7 +173,7 @@
ewd_list_remove (list);
list = NULL;
}
-
+
item = NULL;
list = ewd_list_new ();
@@ -187,10 +187,10 @@
ecore_con_server_send (server, c, strlen (c));
snprintf (c, sizeof (c), "Host: %s\r\n", cfg->hostname);
ecore_con_server_send (server, c, strlen (c));
- snprintf (c, sizeof (c), "User-Agent: %s/%s\r\n\r\n",
- PACKAGE, VERSION);
- ecore_con_server_send (server, c, strlen (c));
-
+ snprintf (c, sizeof (c), "User-Agent: %s/%s\r\n\r\n",
+ PACKAGE, VERSION);
+ ecore_con_server_send (server, c, strlen (c));
+
waiting_for_reply = TRUE;
return 1;
@@ -303,15 +303,15 @@
void erss_mouse_click_item (void *data, Evas_Object *o, const char *sig,
const char *src)
{
- Erss_Article *item = data;
- char c[1024];
-
+ char *url = data;
+ char c[1024];
+printf("clicked: %s\n",url);
if (!rc->browser) {
fprintf (stderr, "%s error: you have not defined any browser in your
config file setting /usr/bin/mozilla as default\n", PACKAGE);
rc->browser = strdup ("mozilla");
}
- snprintf (c, sizeof (c), "%s \"%s\"", rc->browser, item->url);
+ snprintf (c, sizeof (c), "%s \"%s\"", rc->browser, url);
ecore_exe_run (c, NULL);
}
@@ -549,7 +549,7 @@
ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, width, height);
win = ecore_evas_software_x11_window_get(ee);
- ecore_x_window_prop_window_type_desktop_set(win);
+ ecore_x_window_prop_window_type_desktop_set(win);
if (!ee)
return -1;
@@ -617,10 +617,20 @@
edje_object_part_text_set (header, "header", cfg->header);
evas_object_show (header);
+ evas_object_event_callback_add (header,
+ EVAS_CALLBACK_MOUSE_IN,
erss_mouse_in_cursor_change, NULL);
+ evas_object_event_callback_add (header,
+ EVAS_CALLBACK_MOUSE_OUT,
erss_mouse_out_cursor_change, NULL);
+
+ edje_object_signal_callback_add (header, "exec*", "*",
+ erss_mouse_click_item, cfg->hostname);
+ edje_object_signal_emit (header, "mouse,in", "article");
+ edje_object_signal_emit (header, "mouse,out", "article");
+
e_container_element_append(cont, header);
}
- if (cfg->clock) {
+ if ((rc->clock==1)||((cfg->clock==1)&&(rc->clock!=0))) {
tid = edje_object_add (evas);
edje_object_file_set (tid, cfg->theme, "erss_clock");
edje_object_part_text_set (tid, "clock", "");
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/parse.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- parse.c 24 Jan 2004 18:04:57 -0000 1.22
+++ parse.c 3 Feb 2004 14:41:10 -0000 1.23
@@ -10,9 +10,9 @@
void erss_story_new ()
{
item = malloc (sizeof (Erss_Article));
- item->description = NULL;
- item->url = NULL;
- memset(item, 0, sizeof (Erss_Article));
+ item->description = NULL;
+ item->url = NULL;
+ memset(item, 0, sizeof (Erss_Article));
}
void erss_story_end ()
@@ -70,7 +70,7 @@
item->url = strdup (str);
edje_object_signal_callback_add (item->obj, "exec*",
"*",
- erss_mouse_click_item, item);
+ erss_mouse_click_item, item->url);
edje_object_signal_emit (item->obj, "mouse,in",
"article");
edje_object_signal_emit (item->obj, "mouse,out",
"article");
@@ -117,7 +117,7 @@
cur = cur->xmlChildrenNode;
while (cur != NULL) {
- if (ewd_list_nodes (list) >= cfg->num_stories)
+ if (ewd_list_nodes (list) >= cfg->num_stories)
return;
if (cfg->item_root) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/parse_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- parse_config.c 24 Jan 2004 18:05:20 -0000 1.2
+++ parse_config.c 3 Feb 2004 14:41:10 -0000 1.3
@@ -16,11 +16,13 @@
snprintf (file, PATH_MAX, "%s/.erssrc", getenv ("HOME"));
rc = malloc (sizeof (Erss_Rc_Config));
- memset(rc, 0, sizeof (Erss_Rc_Config));
-
if (!rc)
return FALSE;
+ memset(rc, 0, sizeof (Erss_Rc_Config));
+
+ rc->clock=-1;
+
doc = xmlParseFile (file);
if (doc) {
@@ -48,6 +50,10 @@
str = xmlNodeListGetString(doc, cur->xmlChildrenNode,
1);
if (str)
rc->proxy_port = atoi (str);
+ } else if (!strcmp(cur->name, "clock")) {
+ str = xmlNodeListGetString(doc, cur->xmlChildrenNode,
1);
+ if (str)
+ rc->clock = atoi (str);
} else if (!strcmp(cur->name, "tooltip_delay")) {
str = xmlNodeListGetString(doc, cur->xmlChildrenNode,
1);
if (str)
===================================================================
RCS file: /cvsroot/enlightenment/misc/erss/src/parse_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- parse_config.h 24 Jan 2004 18:05:20 -0000 1.2
+++ parse_config.h 3 Feb 2004 14:41:10 -0000 1.3
@@ -33,6 +33,7 @@
char *browser;
char *proxy;
int proxy_port;
+ int clock;
double tooltip_delay;
};
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
