commit 480a7c0a6ec6d07625054bb2a83280651a39047f Author: kiwi Date: Wed May 16 12:06:03 2007 +0000 Initial import of News module. News module displays information feeds like Rss or Atom, its not finished yet, but its usable and should be stable too. enjoy =) SVN revision: 30004 diff --git a/ABOUT-NLS b/ABOUT-NLS new file mode 100644 index 0000000..e69de29 diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..9c8a9be --- /dev/null +++ b/AUTHORS @@ -0,0 +1,8 @@ +Laurent 'kiwi' Ghigonis + ooookiwi@gmail.com + http://oooo.zapto.org + irc.freenode.net, #e.fr, kiwi_ + +Thanks to and from #e.fr, and to Juan J. , for their ideas and reports + +Feeds icons are from the respective websites, sometimes a bit modified to look better \ No newline at end of file diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/IDEAS b/IDEAS new file mode 100644 index 0000000..a5ca188 --- /dev/null +++ b/IDEAS @@ -0,0 +1,39 @@ + * Main * + +- take from MacOS X spirit +- take from dEvian + +- fix charset bugs (look at tmsnc) +- fix proxy bugs (config dialog) + +- multiples rss in one rss item, like tabs + general view of all rss feeds wich are inside one item + + * Rss general view * + +- when one has a news, it goes red + when you click/over one, it switches to it +- autoscroll under mouse option +- view mode : icons, icons and text, text + + * Rss headlines view * + +- when youre mouse go over one rss, it set all rss of the source as red +- autoscroll under mouse option +- you can configure the font and font size +- view mode : date, date and text, text + + * Rss content view * + +- popup under the shelf or centered at the middle of the screen +- autoscroll under mouse option +- you can configure the font and font size + + * Rss List * + +- sort by categories + the user can add his feeds in one category +- the user can move up and down a feed in the list, within a category +- he select the category of a feed in the feed config dialog +- many rss already here by default +- display language for each feed \ No newline at end of file diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..f537545 --- /dev/null +++ b/INSTALL @@ -0,0 +1,5 @@ +To install Enlightenment News module, just do + +./autogen.sh +make +make install diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..f769c64 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,8 @@ +MAINTAINERCLEANFILES = Makefile.in + +SUBDIRS = src data + +filesdir = $(datadir) +files_DATA = module.desktop + +pkgdir = $(datadir)/$(MODULE_ARCH) \ No newline at end of file diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..0553389 --- /dev/null +++ b/README @@ -0,0 +1,6 @@ +Enlightenment News Module + +Module to display information feeds like Rss or Atom +on youre Enlightenment desktop + +enjoy =) \ No newline at end of file diff --git a/TODO b/TODO new file mode 100644 index 0000000..76ec0dc --- /dev/null +++ b/TODO @@ -0,0 +1,144 @@ +make install CFLAGS="-g -Wall -Werror -DDEBUG -DDEBUG_MAIN -DDEBUG_CONFIG -DDEBUG_ITEM -DDEBUG_FEED -DDEBUG_PARSE -DDEBUG_BROWSER -DDEBUG_POPUP_WARN -DDEBUG_VIEWER" + +---------------------------------------------------- +BUGS +---------------------------------------------------- + +---------------------------------------------------- +NEEDED (to do more or less in this order) +---------------------------------------------------- + + - feed icons (new file ?) +Evas_Object *news_feed_icon_add(News_Feed *feed) +void news_feed_icon_del(Evas_Object *obj) +void news_feed_icon_refresh(Evas_Object *obj) +evas_object_data_set the feed on the icon +evas_object_event_callback_add(EVAS_CALLBACK_FREE) on the icon, that remove the obj from feed->icons + to get a feeds icon : an edje obj, with icon swallowed + so we can put in menu / item / ilists, to have animated things every where, linked and consistant (state refresh calls news_feed_icon_refresh(feed)) + add an "attached" state, to show that the feed is attached to an item. for example, a circle border aroung the icon ? + enable/disable state changes for each icon, with options on the _icon_add() and "can_..." data attached to the icon's evas_object + so mybe then no feed for news_viewer_feed_refresh() and config_dialog_refresh_feed() ... + - feeds option "icon glint on news" + - news_feed_ilist_get(News_Item *item) + + news_feed_category_ilist_get() + if item is not NULL, get the selected feeds (= feeds of the item) + is NULL, get the whole feeds list (with categories ...) + (implement multi sel everywhere in main dialog, feeds list; usefull for delete feeds) + news_category_ilist_get + - news_viewer_feed_refresh -> refresh label and icon of a feed +news_config_dialog_refresh_feed +news_config_dialog_item_refresh_feed + items_get + while { nth_data_get() == feed } + nth_icon_set + nth_label_set +to avoid refresh the ilist + + --- WAIT FOR FEED ICONS --- + - viewer: dont reselect current feed in viewer when a feed has updated with changes + - viewer: when an article goes to "as read" and "feeds first" option, refresh the feeds list but don't reselect the feed, go on top of the list + - use a "changed" attribute to things, to detect what has to be refresh when refresh() is called. to avoid refresh things for nothing, so avoid user ilists changer for nothing + --- + +[Parse] + - parse html chars (in _item_clean ?) + - reparse infos every time, if changes ... ? + - handle the fact that sometimes we loose feeds (connection timeout ...) so sometimes, keep feeds that are READ, to avoid having feeds marked as unread, but wich where read before + -> compare description of feed just parsed with suspect precedent one +its not that slow (use memcmp, keep description_size) + +[Item] + - show as selected the feed selected in viewer + - mouse over -> bump icon a bit + - unread feeds : glint every /10s ? on a global beat ? + + - unread feeds : put the red color on top if icon alpha = 0 + - item actions on mouse over / left click / wheel, like in photo + - option to have label on each feed icon + - wheel on an item makes the viewer go to next/prev (unread?) article + - loading state + - maybe a BUG with add / remove feeds in an item (MODE_FEED) + it has hang on time, in while(o = e_box_..._first(box)) { unpack } + ... needs testing + +[Config_Dialog] + - e patch for ilist : e_widget_ilist_selected_set, when there are labels, selects the good feed but the view goes at the end of the ilist + - e patch for ilist : (dialog_item/viewer when refresh and dont selected_set after, the view goes up of one item + - when changing order / modify feeds / categories +in the main config panel, make the state of the +config panel as INCHANGED += dont enable "ok" and "apply" + - ? dont allow move categories ? + - ? item: category ilist to quickly find a feed ? + - e_config_dialog_find for all config dialogs ... + it needs E patch + - clean config_dialog_data (use sub structs ...) + - ? news_widget_feeds ? an ilist of feeds, sorted ... other things like that ? + - ? dialog: default button for viewer font, needs rewrite some things ... ? + - ? main/item: show language flag in ilist +e patch : add ability to have a 2nd image on the right of ilist items (we can show module activation in modules list. (raster adreed, go!, and send to ml) ? +is it really usefull ? language offen appears in the name, and we have a language selector ... + +[Viewer] + - appear with sliding animation in option ? + - when refresh viewer, try not to move the ilist view, +cause when you are watching it at the same time, its very anoying + needs e ilist patch ? + - news viewer refresh position function ? + - ? viewer: instead of having 'own lists', get the pos of feeds/articles via going through ilist items (e_widget_ilist_items_get && e_widget_ilist_nth_data_get), counting and looking data field ? + +[Popup_Warn] + - everything + +[Feed] + - patch to ecore_con to avoid segv when ecore_con_server_del on a server wich has not astablished connection yet + - popup an error if the feed doesnt want to refresh +(with a timeout timer on waiting reply ...) + - proxy tests + - add default feeds + - save articles on unload ? + - DIDNT FIND BETTER ... : + rethink the stupid system that _detach, but not really. + linked with the Feed_Ref thing + -> ??? detach feeds, feed refs + when shutdown the module, specify if whe want a real delete (done) + but why is it unsur ? we should be able to know is the shutdown call + comes from my code (->detach) or outside ??? + +[*] + - move some things from .h to .c (private things ...) + - help dialog (mouse on viewer vcontent for example ...) + - fix all TODO and FIXME in the code + +[Parse] + - ? charset ? already ok ? i believe not =) + - display feed language + - images + for items : + , look if its an image + for channels : + -> + for <= 1.0 + favicon.ico + - get the favicon.ico for the feed icon, or set a genereric icon if not + +[Viewer] + - capacitee de suivre des flux d'images, et de sav les images +pour que Photo par exemple les reprenne derriere ds le repertoire oł on a save la photo +"mode images" genre entice, pour voir toutes les images d'un coup (cf ) ? + +[Config Dialog] + - add an auto attach dialog, when you create a new feed +(disable option) + +[Browser] + - possibility to have a little browser window in front of +the shelf, to see a news options to remember, place ... + +---------------------------------------------------- +FUTUR +---------------------------------------------------- + + - think about a new way of interaction with the wm + - search info about getting feeds where youre need to be logged diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..51fe4f5 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +rm -Rf aclocal.m4 autom4te.cache/ ltmain.sh config.log config.status config.cache configure configure.scan libtool Makefile \ + data/Makefile.in data/Makefile \ + data/images/Makefile.in data/images/Makefile \ + data/themes/Makefile.in data/themes/Makefile \ + data/themes/minimal/Makefile.in data/themes/minimal/Makefile \ + src/Makefile src/Makefile.in \ + src/module/Makefile src/module/Makefile.in + +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 +echo "Running autoheader..." ; autoheader || exit 1 +echo "Running autoconf..." ; autoconf || exit 1 +echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 +echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 + +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" +fi diff --git a/configure.in b/configure.in new file mode 100644 index 0000000..fe65019 --- /dev/null +++ b/configure.in @@ -0,0 +1,166 @@ +dnl Process this file with autoconf to produce a configure script. + +# get rid of that stupid cache mechanism +rm -f config.cache + +#news module version +version="0.1.0" + +AC_INIT(configure.in) +AC_CANONICAL_BUILD +AC_CANONICAL_HOST + +AM_INIT_AUTOMAKE(news, $version) +AM_CONFIG_HEADER(config.h) +AC_ISC_POSIX +AC_PROG_CC +AM_PROG_CC_STDC +AC_HEADER_STDC +AC_C_CONST +AM_ENABLE_SHARED +AM_PROG_LIBTOOL + +ALL_LINGUAS="fi it ja ru sv" +AC_SUBST(ALL_LINGUAS) + +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION(0.14) + +MODULE_ARCH="$host_os-$host_cpu" +AC_SUBST(MODULE_ARCH) +AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") +AC_DEFINE_UNQUOTED(MODULE_VERSION, "$version", "Module version") + +if test "x${bindir}" = 'x${exec_prefix}/bin'; then + if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi + else + if test "x${prefix}" = "xNONE"; then + bindir="${ac_default_prefix}/bin"; + else + bindir="${prefix}/bin"; + fi + fi +fi + +if test "x${libdir}" = 'x${exec_prefix}/lib'; then + if test "x${exec_prefix}" = "xNONE"; then + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi + else + if test "x${prefix}" = "xNONE"; then + libdir="${ac_default_prefix}/lib"; + else + libdir="${prefix}/lib"; + fi + fi +fi + +dnl Set PACKAGE_BIN_DIR in config.h. +if test "x${bindir}" = 'xNONE'; then + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin", "Package installed binaries destination") + else + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", "Package installed binaries destination") + fi +else + AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", "Package installed binaries destination") +fi + +dnl Set PACKAGE_LIB_DIR in config.h. +if test "x${libdir}" = 'xNONE'; then + if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib", "Package installed libraries destination") + else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", "Package installed libraries destination") + fi +else + AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", "Package installed libraries destination") +fi + +dnl Set PACKAGE_DATA_DIR in config.h. +if test "x${prefix}" = "xNONE"; then + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") + datadir="${HOME}/.e/e/modules/${PACKAGE}" +else + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") + datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}" +fi + +AC_PREFIX_DEFAULT(${HOME}/.e/e) +if test "x$prefix" = "xNONE"; then + datarootdir=${ac_default_prefix} +else + datarootdir=${prefix}/share +fi +localedir=${datarootdir}/locale +AC_SUBST(LOCALEDIR, "${localedir}") +AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory]) + +#AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) +#AC_SUBST(dlopen_libs) + +AC_ARG_WITH(edje-config, +[ --with-edje-config=EDJE_CONFIG use edje-config specified ], +[ + EDJE_CONFIG=$withval; + echo "using "$EDJE_CONFIG" for edje-config"; +/ +],[ + PROG="edje-config"; + AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) +]) +edje_cflags=`$EDJE_CONFIG --cflags` +edje_libs=`$EDJE_CONFIG --libs` +AC_SUBST(edje_cflags) +AC_SUBST(edje_libs) + +edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" +AC_ARG_WITH(edje-cc, +[ --with-edje-cc=PATH specify a specific path to edje_cc], +[ + v=$withval; + edje_cc=$v + echo " Enlightenment edje_cc explicitly set to "$edje_cc; +],[ + edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" +]) +AC_SUBST(edje_cc) + +AC_ARG_WITH(enlightenment-config, +[ --with-enlightenment-config=E_CONFIG use enlightenment-config specified ], +[ + E_CONFIG=$withval; + echo "using "$E_CONFIG" for enlightenment-config"; +],[ + PROG="enlightenment-config"; + AC_PATH_PROG(E_CONFIG, $PROG, "", $PATH) +]) +e_cflags=`$E_CONFIG --cflags` +e_libs=`$E_CONFIG --libs` +e_modules=`$E_CONFIG --module-dir` +AC_SUBST(e_cflags) +AC_SUBST(e_libs) +AC_SUBST(e_modules) + +AC_OUTPUT([ +e_modules-news.spec +module.desktop +Makefile +data/Makefile +data/images/Makefile +data/images/feeds/Makefile +data/images/categories/Makefile +data/theme/Makefile +src/Makefile +src/module/Makefile +],[ +]) + diff --git a/data/Makefile.am b/data/Makefile.am new file mode 100644 index 0000000..9909286 --- /dev/null +++ b/data/Makefile.am @@ -0,0 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = images theme diff --git a/data/images/Makefile.am b/data/images/Makefile.am new file mode 100644 index 0000000..31f57ea --- /dev/null +++ b/data/images/Makefile.am @@ -0,0 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = feeds categories diff --git a/data/images/categories/Makefile.am b/data/images/categories/Makefile.am new file mode 100644 index 0000000..4839922 --- /dev/null +++ b/data/images/categories/Makefile.am @@ -0,0 +1,6 @@ +MAINTAINERCLEANFILES = Makefile.in + +filesdir = $(datadir)/images/categories +files_DATA = blue.png \ + default.png \ + red.png diff --git a/data/images/categories/blue.png b/data/images/categories/blue.png new file mode 100644 index 0000000..12dfdab Binary files /dev/null and b/data/images/categories/blue.png differ diff --git a/data/images/categories/default.png b/data/images/categories/default.png new file mode 100644 index 0000000..29e9374 Binary files /dev/null and b/data/images/categories/default.png differ diff --git a/data/images/categories/red.png b/data/images/categories/red.png new file mode 100644 index 0000000..c1bf4b4 Binary files /dev/null and b/data/images/categories/red.png differ diff --git a/data/images/feeds/Makefile.am b/data/images/feeds/Makefile.am new file mode 100644 index 0000000..9d8517a --- /dev/null +++ b/data/images/feeds/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in + +filesdir = $(datadir)/images/feeds +files_DATA = afp.png \ + barrapunto.png \ + bbcworld.png \ + bouletcorp.png \ + cnn.png \ + courrierinternational.png \ + default.png \ + digg.png \ + e_cvs.png \ + e_fr.png \ + freshmeat.png \ + futurasciences.png \ + google_fr.png \ + google.png \ + lemonde.png \ + meneame.png \ + news.png \ + osnews.png \ + slashdot.png diff --git a/data/images/feeds/afp.png b/data/images/feeds/afp.png new file mode 100644 index 0000000..8b630c2 Binary files /dev/null and b/data/images/feeds/afp.png differ diff --git a/data/images/feeds/barrapunto.png b/data/images/feeds/barrapunto.png new file mode 100644 index 0000000..cb60edb Binary files /dev/null and b/data/images/feeds/barrapunto.png differ diff --git a/data/images/feeds/bbcworld.png b/data/images/feeds/bbcworld.png new file mode 100644 index 0000000..a474a3a Binary files /dev/null and b/data/images/feeds/bbcworld.png differ diff --git a/data/images/feeds/bouletcorp.png b/data/images/feeds/bouletcorp.png new file mode 100644 index 0000000..dc3bfb4 Binary files /dev/null and b/data/images/feeds/bouletcorp.png differ diff --git a/data/images/feeds/cnn.png b/data/images/feeds/cnn.png new file mode 100644 index 0000000..94b02e2 Binary files /dev/null and b/data/images/feeds/cnn.png differ diff --git a/data/images/feeds/courrierinternational.png b/data/images/feeds/courrierinternational.png new file mode 100644 index 0000000..884f17e Binary files /dev/null and b/data/images/feeds/courrierinternational.png differ diff --git a/data/images/feeds/default.png b/data/images/feeds/default.png new file mode 100644 index 0000000..ca8eafe Binary files /dev/null and b/data/images/feeds/default.png differ diff --git a/data/images/feeds/digg.png b/data/images/feeds/digg.png new file mode 100644 index 0000000..452161c Binary files /dev/null and b/data/images/feeds/digg.png differ diff --git a/data/images/feeds/e_cvs.png b/data/images/feeds/e_cvs.png new file mode 100644 index 0000000..1a6b419 Binary files /dev/null and b/data/images/feeds/e_cvs.png differ diff --git a/data/images/feeds/e_fr.png b/data/images/feeds/e_fr.png new file mode 100644 index 0000000..2b7d1c7 Binary files /dev/null and b/data/images/feeds/e_fr.png differ diff --git a/data/images/feeds/freshmeat.png b/data/images/feeds/freshmeat.png new file mode 100644 index 0000000..6c6ea71 Binary files /dev/null and b/data/images/feeds/freshmeat.png differ diff --git a/data/images/feeds/futurasciences.png b/data/images/feeds/futurasciences.png new file mode 100644 index 0000000..8d337f7 Binary files /dev/null and b/data/images/feeds/futurasciences.png differ diff --git a/data/images/feeds/google.png b/data/images/feeds/google.png new file mode 100644 index 0000000..5ae7eba Binary files /dev/null and b/data/images/feeds/google.png differ diff --git a/data/images/feeds/google_fr.png b/data/images/feeds/google_fr.png new file mode 100644 index 0000000..be871c6 Binary files /dev/null and b/data/images/feeds/google_fr.png differ diff --git a/data/images/feeds/lemonde.png b/data/images/feeds/lemonde.png new file mode 100644 index 0000000..0787e43 Binary files /dev/null and b/data/images/feeds/lemonde.png differ diff --git a/data/images/feeds/meneame.png b/data/images/feeds/meneame.png new file mode 100644 index 0000000..52c28fe Binary files /dev/null and b/data/images/feeds/meneame.png differ diff --git a/data/images/feeds/news.png b/data/images/feeds/news.png new file mode 100644 index 0000000..a3cda13 Binary files /dev/null and b/data/images/feeds/news.png differ diff --git a/data/images/feeds/osnews.png b/data/images/feeds/osnews.png new file mode 100644 index 0000000..7718234 Binary files /dev/null and b/data/images/feeds/osnews.png differ diff --git a/data/images/feeds/slashdot.png b/data/images/feeds/slashdot.png new file mode 100644 index 0000000..1cc2a1f Binary files /dev/null and b/data/images/feeds/slashdot.png differ diff --git a/data/theme/Makefile.am b/data/theme/Makefile.am new file mode 100644 index 0000000..a292ae7 --- /dev/null +++ b/data/theme/Makefile.am @@ -0,0 +1,36 @@ +MAINTAINERCLEANFILES = Makefile.in + +EDJE_CC = @edje_cc@ +EDJE_FLAGS = -v \ + -id images \ + -fd fonts + +EXTRA_DIST = \ +module.edc \ +module_feed.edc \ +module_feed_parts.edc \ +module_feed_programs.edc \ +module_feedone.edc \ +module_feedone_parts.edc \ +module_feedone_programs.edc \ +module_icon.edc \ +module_item.edc \ +module_item_parts.edc \ +module_item_programs.edc \ +module_popw.edc \ +module_popw_parts.edc \ +module_popw_programs.edc \ +module_viewer.edc \ +module_viewer_parts.edc \ +module_viewer_programs.edc + +filesdir = $(datadir) +files_DATA = e-module-news.edj + +e-module-news.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/theme/module.edc \ + $(top_builddir)/data/theme/e-module-news.edj + +clean-local: + rm -f e-module-news.edj diff --git a/data/theme/fonts/Vera.ttf b/data/theme/fonts/Vera.ttf new file mode 100644 index 0000000..a4d30c3 Binary files /dev/null and b/data/theme/fonts/Vera.ttf differ diff --git a/data/theme/fonts/VeraBd.ttf b/data/theme/fonts/VeraBd.ttf new file mode 100644 index 0000000..a2a6b1f Binary files /dev/null and b/data/theme/fonts/VeraBd.ttf differ diff --git a/data/theme/images/article_background_new.png b/data/theme/images/article_background_new.png new file mode 100644 index 0000000..dde5517 Binary files /dev/null and b/data/theme/images/article_background_new.png differ diff --git a/data/theme/images/article_border.png b/data/theme/images/article_border.png new file mode 100644 index 0000000..cfccc34 Binary files /dev/null and b/data/theme/images/article_border.png differ diff --git a/data/theme/images/feed_background_new.png b/data/theme/images/feed_background_new.png new file mode 100644 index 0000000..dde5517 Binary files /dev/null and b/data/theme/images/feed_background_new.png differ diff --git a/data/theme/images/feed_border.png b/data/theme/images/feed_border.png new file mode 100644 index 0000000..cfccc34 Binary files /dev/null and b/data/theme/images/feed_border.png differ diff --git a/data/theme/images/feed_loading_1.png b/data/theme/images/feed_loading_1.png new file mode 100644 index 0000000..4c82ed8 Binary files /dev/null and b/data/theme/images/feed_loading_1.png differ diff --git a/data/theme/images/feed_loading_done.png b/data/theme/images/feed_loading_done.png new file mode 100644 index 0000000..1f5a37e Binary files /dev/null and b/data/theme/images/feed_loading_done.png differ diff --git a/data/theme/images/icon_article_read.png b/data/theme/images/icon_article_read.png new file mode 100644 index 0000000..b64ebe7 Binary files /dev/null and b/data/theme/images/icon_article_read.png differ diff --git a/data/theme/images/icon_article_unread.png b/data/theme/images/icon_article_unread.png new file mode 100644 index 0000000..a631205 Binary files /dev/null and b/data/theme/images/icon_article_unread.png differ diff --git a/data/theme/images/icon_infos.png b/data/theme/images/icon_infos.png new file mode 100644 index 0000000..377216c Binary files /dev/null and b/data/theme/images/icon_infos.png differ diff --git a/data/theme/images/icon_logo.png b/data/theme/images/icon_logo.png new file mode 100644 index 0000000..a3cda13 Binary files /dev/null and b/data/theme/images/icon_logo.png differ diff --git a/data/theme/images/icon_setasread.png b/data/theme/images/icon_setasread.png new file mode 100644 index 0000000..76bb54b Binary files /dev/null and b/data/theme/images/icon_setasread.png differ diff --git a/data/theme/images/icon_update.png b/data/theme/images/icon_update.png new file mode 100644 index 0000000..3ecac91 Binary files /dev/null and b/data/theme/images/icon_update.png differ diff --git a/data/theme/images/icon_viewer.png b/data/theme/images/icon_viewer.png new file mode 100644 index 0000000..5853656 Binary files /dev/null and b/data/theme/images/icon_viewer.png differ diff --git a/data/theme/images/item_border.png b/data/theme/images/item_border.png new file mode 100644 index 0000000..cfccc34 Binary files /dev/null and b/data/theme/images/item_border.png differ diff --git a/data/theme/images/item_feed_back.png b/data/theme/images/item_feed_back.png new file mode 100644 index 0000000..6b8a52e Binary files /dev/null and b/data/theme/images/item_feed_back.png differ diff --git a/data/theme/images/popup_warn_background.png b/data/theme/images/popup_warn_background.png new file mode 100644 index 0000000..f7d3d27 Binary files /dev/null and b/data/theme/images/popup_warn_background.png differ diff --git a/data/theme/images/popup_warn_disable.png b/data/theme/images/popup_warn_disable.png new file mode 100644 index 0000000..43a69a3 Binary files /dev/null and b/data/theme/images/popup_warn_disable.png differ diff --git a/data/theme/images/popup_warn_disable_clicked.png b/data/theme/images/popup_warn_disable_clicked.png new file mode 100644 index 0000000..edf4008 Binary files /dev/null and b/data/theme/images/popup_warn_disable_clicked.png differ diff --git a/data/theme/images/popup_warn_logo_error.png b/data/theme/images/popup_warn_logo_error.png new file mode 100644 index 0000000..6719b1a Binary files /dev/null and b/data/theme/images/popup_warn_logo_error.png differ diff --git a/data/theme/images/popup_warn_logo_info.png b/data/theme/images/popup_warn_logo_info.png new file mode 100644 index 0000000..b03a567 Binary files /dev/null and b/data/theme/images/popup_warn_logo_info.png differ diff --git a/data/theme/images/viewer_background.png b/data/theme/images/viewer_background.png new file mode 100644 index 0000000..a3434b9 Binary files /dev/null and b/data/theme/images/viewer_background.png differ diff --git a/data/theme/module.edc b/data/theme/module.edc new file mode 100644 index 0000000..00b9dbd --- /dev/null +++ b/data/theme/module.edc @@ -0,0 +1,44 @@ +/* Enlightenment News Module theme */ + +images +{ + image: "item_border.png" COMP; + image: "item_feed_back.png" COMP; + + image: "feed_background_new.png" COMP; + image: "feed_border.png" COMP; + + image: "popup_warn_background.png" COMP; + image: "popup_warn_disable_clicked.png" COMP; + image: "popup_warn_disable.png" COMP; + image: "popup_warn_logo_error.png" COMP; + image: "popup_warn_logo_info.png" COMP; + + image: "viewer_background.png" COMP; + + image: "icon_logo.png" COMP; + image: "icon_infos.png" COMP; + image: "icon_viewer.png" COMP; + image: "icon_article_read.png" COMP; + image: "icon_article_unread.png" COMP; + image: "icon_update.png" COMP; + image: "icon_setasread.png" COMP; +} + +fonts +{ + font: "Vera.ttf" "Vera"; + font: "VeraBd.ttf" "VeraBd"; +} + +collections +{ + /* Groups */ + + #include "module_item.edc" + #include "module_feed.edc" + #include "module_feedone.edc" + #include "module_popw.edc" + #include "module_viewer.edc" + #include "module_icon.edc" +} diff --git a/data/theme/module_feed.edc b/data/theme/module_feed.edc new file mode 100644 index 0000000..601c923 --- /dev/null +++ b/data/theme/module_feed.edc @@ -0,0 +1,16 @@ +/* Feed group */ + +group +{ + name: "modules/news/feed"; + + parts + { + #include "module_feed_parts.edc" + } + + programs + { + #include "module_feed_programs.edc" + } +} diff --git a/data/theme/module_feed_parts.edc b/data/theme/module_feed_parts.edc new file mode 100644 index 0000000..334f8f6 --- /dev/null +++ b/data/theme/module_feed_parts.edc @@ -0,0 +1,155 @@ +part +{ + name: "background"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "feed_background_new.png"; + } + } + description + { + state: "new" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } +} + +part +{ + name: "border"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "feed_border.png"; + } + } + description + { + state: "selected" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } +} + +part +{ + name: "icon"; + type: SWALLOW; + mouse_events: 0; + description + { + state: "default" 0.0; + visible: 1; + align: 0.0 0.5; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + rel1 + { + relative: 0.0 0.0; + offset: 3 3; + } + rel2 + { + relative: 1.0 1.0; + offset: -3 -3; + } + } +} + +part +{ + name: "name"; + type: TEXT; + mouse_events: 0; + effect: OUTLINE_SOFT_SHADOW; + description + { + state: "default" 0.0; + visible: 0; + rel1 + { + relative: 0.5 1.0; + offset: 0 0; + } + rel2 + { + relative: 0.5 1.0; + } + text + { + text: "o Ooo Ooo"; + font: "Vera"; + align: 0.0 0.5; + fit: 0 1; + } + } + description + { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1 + { + relative: 0.5 0.5; + } + rel2 + { + relative: 0.5 0.5; + } + } +} + +/* Inout */ + +part +{ + name: "inout"; + type: RECT; + mouse_events: 1; + description + { + state: "default" 0.0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + to: "icon"; + } + rel2 + { + relative: 1.0 1.0; + to: "icon"; + } + + } + +} diff --git a/data/theme/module_feed_programs.edc b/data/theme/module_feed_programs.edc new file mode 100644 index 0000000..35e216f --- /dev/null +++ b/data/theme/module_feed_programs.edc @@ -0,0 +1,61 @@ +/* Init */ + +program +{ + name: "init"; + signal: "load"; + source: ""; + script + { + + } +} + +/* Signals for new state */ + +program +{ + name: "new_set"; + signal: "e,state,new,set"; + source: "e"; + action: STATE_SET "new" 0.0; + target: "background"; + transition: SINUSOIDAL 0.5; +} +program +{ + name: "new_unset"; + signal: "e,state,new,unset"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "background"; + transition: SINUSOIDAL 0.5; +} + +/* Mouse in/out */ + +program +{ + name: "mouse_in"; + signal: "mouse,in"; + source: "inout"; + action: STATE_SET "selected" 0.0; + target: "border"; +} + +program +{ + name: "mouse_out"; + signal: "mouse,out"; + source: "inout"; + action: STATE_SET "default" 0.0; + target: "border"; +} + +program +{ + name: "mouse_down"; + signal: "mouse,down,1"; + source: "inout"; + action: SIGNAL_EMIT "e,action,open" "e"; +} diff --git a/data/theme/module_feedone.edc b/data/theme/module_feedone.edc new file mode 100644 index 0000000..4a81a96 --- /dev/null +++ b/data/theme/module_feedone.edc @@ -0,0 +1,16 @@ +/* Feedone group */ + +group +{ + name: "modules/news/feedone"; + + parts + { + #include "module_feedone_parts.edc" + } + + programs + { + #include "module_feedone_programs.edc" + } +} diff --git a/data/theme/module_feedone_parts.edc b/data/theme/module_feedone_parts.edc new file mode 100644 index 0000000..f1987f0 --- /dev/null +++ b/data/theme/module_feedone_parts.edc @@ -0,0 +1,143 @@ +part +{ + name: "background"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "feed_background_new.png"; + } + } + description + { + state: "new" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } +} + +part +{ + name: "border"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "feed_border.png"; + } + } + description + { + state: "selected" 0.0; + inherit: "default" 0.0; + visible: 1; + color: 255 255 255 255; + } +} + +part +{ + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + rel1 + { + relative: 0.1 0.1; + } + rel2 + { + relative: 0.9 0.9; + } + image + { + normal: "icon_logo.png"; + } + } +} + +part +{ + name: "name"; + type: TEXT; + mouse_events: 0; + effect: OUTLINE_SOFT_SHADOW; + description + { + state: "default" 0.0; + visible: 0; + rel1 + { + relative: 0.5 1.0; + offset: 0 0; + } + rel2 + { + relative: 0.5 1.0; + } + text + { + text: "o Ooo Ooo"; + font: "Vera"; + align: 0.0 0.5; + fit: 0 1; + } + } + description + { + state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + rel1 + { + relative: 0.5 0.5; + } + rel2 + { + relative: 0.5 0.5; + } + } +} + +/* Inout */ + +part +{ + name: "inout"; + type: RECT; + mouse_events: 1; + description + { + state: "default" 0.0; + color: 255 255 255 0; + } + +} diff --git a/data/theme/module_feedone_programs.edc b/data/theme/module_feedone_programs.edc new file mode 100644 index 0000000..bd54ab9 --- /dev/null +++ b/data/theme/module_feedone_programs.edc @@ -0,0 +1,61 @@ +/* Init */ + +program +{ + name: "init"; + signal: "load"; + source: ""; + script + { + + } +} + +/* Signals for new state */ + +program +{ + name: "new_set"; + signal: "e,state,new,set"; + source: "e"; + action: STATE_SET "new" 0.0; + target: "background"; + transition: SINUSOIDAL 0.5; +} +program +{ + name: "new_unset"; + signal: "e,state,new,unset"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "background"; + transition: SINUSOIDAL 0.5; +} + +/* Mouse in/out */ + +program +{ + name: "mouse_in"; + signal: "mouse,in"; + source: "inout"; + action: STATE_SET "selected" 0.0; + target: "border"; +} + +program +{ + name: "mouse_out"; + signal: "mouse,out"; + source: "inout"; + action: STATE_SET "default" 0.0; + target: "border"; +} + +program +{ + name: "mouse_down"; + signal: "mouse,down,1"; + source: "inout"; + action: SIGNAL_EMIT "open" "feed"; +} diff --git a/data/theme/module_icon.edc b/data/theme/module_icon.edc new file mode 100644 index 0000000..e38738c --- /dev/null +++ b/data/theme/module_icon.edc @@ -0,0 +1,169 @@ +/* Icon group */ + +group +{ + name: "icon"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_logo.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/infos"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_infos.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/viewer"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_viewer.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/article_read"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_article_read.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/article_unread"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_article_unread.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/update"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_update.png"; + } + } + } + } +} + +group +{ + name: "modules/news/icon/setasread"; + + parts + { + part + { + name: "icon"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + aspect: 1.0 1.0; + image + { + normal: "icon_setasread.png"; + } + } + } + } +} diff --git a/data/theme/module_item.edc b/data/theme/module_item.edc new file mode 100644 index 0000000..e3c00ea --- /dev/null +++ b/data/theme/module_item.edc @@ -0,0 +1,21 @@ +/* Item group */ + +group +{ + name: "modules/news/item"; + + script + { + + } + + parts + { + #include "module_item_parts.edc" + } + + programs + { + #include "module_item_programs.edc" + } +} diff --git a/data/theme/module_item_parts.edc b/data/theme/module_item_parts.edc new file mode 100644 index 0000000..758e09c --- /dev/null +++ b/data/theme/module_item_parts.edc @@ -0,0 +1,42 @@ +/* Ground */ + +part +{ + name: "ground"; + type: RECT; + mouse_events: 1; + description + { + state: "default" 0.0; + color: 0 0 0 0; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + } +} + +part +{ + name: "view"; + type: SWALLOW; + mouse_events: 1; + description + { + state: "default" 0.0; + rel1 + { + relative: 0.0 0.0; + to: "ground"; + } + rel2 + { + relative: 1.0 1.0; + to: "ground"; + } + } +} diff --git a/data/theme/module_item_programs.edc b/data/theme/module_item_programs.edc new file mode 100644 index 0000000..a7f9b1e --- /dev/null +++ b/data/theme/module_item_programs.edc @@ -0,0 +1,12 @@ +/* Init */ + +program +{ + name: "init"; + signal: "load"; + source: ""; + script + { + + } +} diff --git a/data/theme/module_popw.edc b/data/theme/module_popw.edc new file mode 100644 index 0000000..eb14015 --- /dev/null +++ b/data/theme/module_popw.edc @@ -0,0 +1,52 @@ +/* Popup warn group */ + +#define POPUP_WARN_TYPE_INFO 0 +#define POPUP_WARN_TYPE_ERROR 1 + +#define MSG_RECV_POPUP_WARN_TYPE 1 + +group +{ + name: "modules/news/popw"; + + script + { + public show_disabled; + public popup_type; + public popup_in_update; + + /* Message from C code */ + public message(Msg_Type: type, id, msg) + { + if (id == MSG_RECV_POPUP_WARN_TYPE){ + if (type == MSG_INT){ + set_int(popup_type, getarg(2)); + if (get_int(popup_type) == POPUP_WARN_TYPE_INFO) + { + if (get_int(popup_in_update)) + run_program(PROGRAM:"update_anim_info"); + else + set_state(PART:"logo", "default", 0.0); + } + if (get_int(popup_type) == POPUP_WARN_TYPE_ERROR) + { + if (get_int(popup_in_update)) + run_program(PROGRAM:"update_anim_error"); + else + set_state(PART:"logo", "error", 0.0); + } + } + } + } + } + + parts + { + #include "module_popw_parts.edc" + } + + programs + { + #include "module_popw_programs.edc" + } +} diff --git a/data/theme/module_popw_parts.edc b/data/theme/module_popw_parts.edc new file mode 100644 index 0000000..c771578 --- /dev/null +++ b/data/theme/module_popw_parts.edc @@ -0,0 +1,218 @@ +part +{ + name: "background"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + min: 60 120; + rel1 + { + relative: 0.0 0.0; + } + rel2 + { + relative: 1.0 1.0; + } + image + { + normal: "popup_warn_background.png"; + border: 5 5 5 5; + } + } +} + +part +{ + name: "logo"; + type: IMAGE; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 255; + aspect: 1 1; + rel1 + { + relative: 0.1 0.0; + to_x: "background"; + offset: 0 18; + } + rel2 + { + relative: 0.9 0.0; + to_x: "background"; + offset: 0 78; + } + image + { + normal: "popup_warn_logo_info.png"; + } + } + description{ + state: "error" 0.0; + inherit: "default" 0.0; + image{ + normal: "popup_warn_logo_error.png"; + } + } + description{ + state: "info_hidden" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + image{ + normal: "popup_warn_logo_info.png"; + } + } + description{ + state: "error_hidden" 0.0; + inherit: "default" 0.0; + color: 255 255 255 0; + image{ + normal: "popup_warn_logo_error.png"; + } + } +} + +part +{ + name: "name"; + type: TEXT; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1 + { + relative: 0.0 1.0; + to_x: "background"; + to_y: "logo"; + offset: 6 0; + } + color: 0 0 0 255; + color2: 0 0 0 255; + color3: 255 255 255 255; + text + { + text: "Rss module"; + font: "Vera"; + size: 11; + align: 0.5 0.0; + } + } +} + +part +{ + name: "text"; + type: TEXT; + mouse_events: 0; + description + { + state: "default" 0.0; + rel1 + { + relative: 0.0 0.8; + to: "background"; + offset: 0 10; + } + rel2 + { + relative: 1.0 0.8; + to: "background"; + offset: 0 10; + } + color: 0 0 0 255; + color2: 0 0 0 255; + color3: 255 255 255 255; + text + { + text: "ooOoOo"; + font: "VeraBd"; + size: 11; + min: 1 1; + align: 0.5 0.0; + } + } +} + +part +{ + name: "text_border"; + type: RECT; + mouse_events: 0; + description + { + state: "default" 0.0; + color: 255 255 255 0; + rel1 + { + relative: 0.0 0.0; + to: "text"; + offset: -10 0; + } + rel2 + { + relative: 1.0 1.0; + to: "text"; + offset: 10 0; + } + } +} + +part +{ + name: "disable"; + type: IMAGE; + mouse_events: 1; + description + { + state: "default" 0.0; + visible: 0; + image + { + normal: "popup_warn_disable.png"; + } + } + description + { + state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + visible: 1; + aspect: 1 1; + rel1 + { + relative: 1.0 0.0; + to: "background"; + offset: -32 8; + } + rel2 + { + relative: 1.0 0.0; + to: "background"; + offset: -12 28; + } + } + description + { + state: "clicked" 0.0; + inherit: "visible" 0.0; + visible: 1; + rel1 + { + relative: 0.0 0.0; + offset: 10 10; + } + rel2 + { + relative: 1.0 1.0; + offset: 0 0; + } + image + { + normal: "popup_warn_disable_clicked.png"; + } + } +} diff --git a/data/theme/module_popw_programs.edc b/data/theme/module_popw_programs.edc new file mode 100644 index 0000000..193913e --- /dev/null +++ b/data/theme/module_popw_programs.edc @@ -0,0 +1,96 @@ +program{ + name: "init"; + signal: "load"; + source: ""; + script{ + set_int(popup_type, POPUP_WARN_TYPE_INFO); + set_int(popup_in_update, 0); + } +} + +program +{ + name: "disable_click"; + signal: "mouse,up,1"; + source: "disable"; + script + { + emit("desactivate", "popup"); + } + after: "disable_click_1"; +} + +program +{ + name: "disable_click_1"; + action: STATE_SET "clicked" 0.0; + transition: DECELERATE 1.5; + target: "disable"; + after: "close_click"; +} + +program +{ + name: "close_click"; + signal: "mouse,up,1"; + source: "background"; + script + { + emit("close", "popup"); + } +} + +program{ + name: "update_anim"; + signal: "update"; + source: "devian"; + script{ + if (get_int(popup_in_update) == 0) + { + set_int(popup_in_update, 1); + if (get_int(popup_type) == POPUP_WARN_TYPE_INFO) + run_program(PROGRAM:"update_anim_info"); + if (get_int(popup_type) == POPUP_WARN_TYPE_ERROR) + run_program(PROGRAM:"update_anim_error"); + } + } +} + +program{ + name: "update_anim_info"; + action: STATE_SET "info_hidden" 0.0; + transition: DECELERATE 1; + target: "logo"; + after: "update_anim_info_1"; + after: "update_anim_end"; +} + +program{ + name: "update_anim_info_1"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 1; + target: "logo"; +} + +program{ + name: "update_anim_error"; + action: STATE_SET "error_hidden" 0.0; + transition: DECELERATE 1; + target: "logo"; + after: "update_anim_error_1"; + after: "update_anim_end"; +} + +program{ + name: "update_anim_error_1"; + action: STATE_SET "error" 0.0; + transition: DECELERATE 1; + target: "logo"; +} + +program{ + name: "update_anim_end"; + script{ + set_int(popup_in_update, 0); + } +} diff --git a/data/theme/module_viewer.edc b/data/theme/module_viewer.edc new file mode 100644 index 0000000..5cf5710 --- /dev/null +++ b/data/theme/module_viewer.edc @@ -0,0 +1,21 @@ +/* Viewer group */ + +group +{ + name: "modules/news/viewer"; + + data + { + item: "shaped" "1"; + } + + parts + { + #include "module_viewer_parts.edc" + } + + programs + { + #include "module_viewer_programs.edc" + } +} diff --git a/data/theme/module_viewer_parts.edc b/data/theme/module_viewer_parts.edc new file mode 100644 index 0000000..a41d2df --- /dev/null +++ b/data/theme/module_viewer_parts.edc @@ -0,0 +1,49 @@ + part { + name: "border"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + offset: 0 0; + } + rel2 { + offset: -1 -1; + } + color: 0 0 0 255; + } + } + part { + name: "base"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + offset: 1 1; + to: "border"; + } + rel2 { + offset: -2 -2; + to: "border"; + } + color: 221 221 221 255; + } + } + part { + name: "e.swallow.content"; + type: SWALLOW; + description { + state: "default" 0.0; + align: 0.5 0.5; + color: 0 0 0 0; + rel1 { + offset: 5 5; + to: "base"; + } + rel2 { + offset: -6 -6; + to: "base"; + } + } + } diff --git a/data/theme/module_viewer_programs.edc b/data/theme/module_viewer_programs.edc new file mode 100644 index 0000000..085ee19 --- /dev/null +++ b/data/theme/module_viewer_programs.edc @@ -0,0 +1,10 @@ +program +{ + name: "click_close"; + signal: "mouse,up,1"; + source: "base"; + script + { + emit("close", "viewer"); + } +} diff --git a/e_modules-news.spec.in b/e_modules-news.spec.in new file mode 100644 index 0000000..684eff0 --- /dev/null +++ b/e_modules-news.spec.in @@ -0,0 +1,50 @@ +%define module_name news + +Summary: %{module_name} module for the Enlightenment window manager +Name: e_modules-%{module_name} +Version: @VERSION@ +Release: 0.%(date '+%Y%m%d') +License: BSD +Group: User Interface/Desktops +URL: http://www.enlightenment.org/ +Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{module_name}-%{version}.tar.gz +Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings } +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} +Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} +BuildRequires: ecore-devel, evas-devel, esmart-devel, edje-bin +BuildRequires: edje-devel, eet-devel, enlightenment-devel >= 0.16.999 +Requires: enlightenment >= 0.16.999 +BuildRoot: %{_tmppath}/%{name}-%{version}-root + +%description +%{module_name} module for the Enlightenment window manager. + +%prep +%setup -q -n %{module_name}-%{version} + +%build +%{configure} +%{__make} %{?_smp_mflags} %{?mflags} + +%install +%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install +%{find_lang} %{module_name} || true > %{module_name}.lang + +%clean +test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files -f %{module_name}.lang +%defattr(-, root, root) +%doc AUTHORS ChangeLog COPYING* INSTALL NEWS README +if "%{module_name}" == "emu" +%{_bindir}/%{module_name}* +endif +%{_libdir}/enlightenment/modules/%{module_name}* + +%changelog diff --git a/m4/ac_path_generic.m4 b/m4/ac_path_generic.m4 new file mode 100644 index 0000000..b7a2c13 --- /dev/null +++ b/m4/ac_path_generic.m4 @@ -0,0 +1,138 @@ +dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl +dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS +dnl +dnl The script must support `--cflags' and `--libs' args. +dnl If MINIMUM-VERSION is specified, the script must also support the +dnl `--version' arg. +dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given, +dnl it must also support `--prefix' and `--exec-prefix'. +dnl (In other words, it must be like gtk-config.) +dnl +dnl For example: +dnl +dnl AC_PATH_GENERIC(Foo, 1.0.0) +dnl +dnl would run `foo-config --version' and check that it is at least 1.0.0 +dnl +dnl If so, the following would then be defined: +dnl +dnl FOO_CFLAGS to `foo-config --cflags` +dnl FOO_LIBS to `foo-config --libs` +dnl +dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK) +dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount) +dnl +dnl @author Angus Lees + +AC_DEFUN([AC_PATH_GENERIC], +[dnl +dnl we're going to need uppercase, lowercase and user-friendly versions of the +dnl string `LIBRARY' +pushdef([UP], translit([$1], [a-z], [A-Z]))dnl +pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl + +dnl +dnl Get the cflags and libraries from the LIBRARY-config script +dnl +AC_ARG_WITH(DOWN-prefix, + [ --with-]DOWN[-prefix=PFX Prefix where $1 is installed (optional)], + DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") +AC_ARG_WITH(DOWN-exec-prefix, + [ --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)], + DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") + + if test x$DOWN[]_config_exec_prefix != x ; then + DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix" + if test x${UP[]_CONFIG+set} != xset ; then + UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config + fi + fi + if test x$DOWN[]_config_prefix != x ; then + DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix" + if test x${UP[]_CONFIG+set} != xset ; then + UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config + fi + fi + + AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no) + ifelse([$2], , + AC_MSG_CHECKING(for $1), + AC_MSG_CHECKING(for $1 - version >= $2) + ) + no_[]DOWN="" + if test "$UP[]_CONFIG" = "no" ; then + no_[]DOWN=yes + else + UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`" + UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`" + ifelse([$2], , ,[ + DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'` + DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'` + DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \ + --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'` + DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])" + DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])" + DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])" + + # Compare wanted version to what config script returned. + # If I knew what library was being run, i'd probably also compile + # a test program at this point (which also extracted and tested + # the version in some library-specific way) + if test "$DOWN[]_config_major_version" -lt \ + "$DOWN[]_wanted_major_version" \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -lt \ + "$DOWN[]_wanted_minor_version" \) \ + -o \( "$DOWN[]_config_major_version" -eq \ + "$DOWN[]_wanted_major_version" \ + -a "$DOWN[]_config_minor_version" -eq \ + "$DOWN[]_wanted_minor_version" \ + -a "$DOWN[]_config_micro_version" -lt \ + "$DOWN[]_wanted_micro_version" \) ; then + # older version found + no_[]DOWN=yes + echo -n "*** An old version of $1 " + echo -n "($DOWN[]_config_major_version" + echo -n ".$DOWN[]_config_minor_version" + echo ".$DOWN[]_config_micro_version) was found." + echo -n "*** You need a version of $1 newer than " + echo -n "$DOWN[]_wanted_major_version" + echo -n ".$DOWN[]_wanted_minor_version" + echo ".$DOWN[]_wanted_micro_version." + echo "***" + echo "*** If you have already installed a sufficiently new version, this error" + echo "*** probably means that the wrong copy of the DOWN-config shell script is" + echo "*** being found. The easiest way to fix this is to remove the old version" + echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the" + echo "*** correct copy of DOWN-config. (In this case, you will have to" + echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf" + echo "*** so that the correct libraries are found at run-time)" + fi + ]) + fi + if test "x$no_[]DOWN" = x ; then + AC_MSG_RESULT(yes) + ifelse([$3], , :, [$3]) + else + AC_MSG_RESULT(no) + if test "$UP[]_CONFIG" = "no" ; then + echo "*** The DOWN-config script installed by $1 could not be found" + echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the UP[]_CONFIG environment variable to the" + echo "*** full path to DOWN-config." + fi + UP[]_CFLAGS="" + UP[]_LIBS="" + ifelse([$4], , :, [$4]) + fi + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + + popdef([UP]) + popdef([DOWN]) +]) + diff --git a/module.desktop.in b/module.desktop.in new file mode 100644 index 0000000..72d05c1 --- /dev/null +++ b/module.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Type=Link +Name=News +Icon=e-module-news diff --git a/module.edj b/module.edj new file mode 100644 index 0000000..8a59102 Binary files /dev/null and b/module.edj differ diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..cd87e9a --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,2 @@ +MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = module diff --git a/src/module/Makefile.am b/src/module/Makefile.am new file mode 100644 index 0000000..7fe72a5 --- /dev/null +++ b/src/module/Makefile.am @@ -0,0 +1,51 @@ +INCLUDES = -I. \ + -I$(top_srcdir) \ + -I$(includedir) \ + @e_cflags@ +pkgdir = $(datadir)/$(MODULE_ARCH) + +pkg_LTLIBRARIES = module.la +module_la_SOURCES = e_mod_main.c \ + e_mod_main.h \ + news_config.c \ + news_config_dialog.c \ + news_config_dialog.h \ + news_config_dialog_feeds.c \ + news_config_dialog_feeds.h \ + news_config_dialog_item.c \ + news_config_dialog_item.h \ + news_config_dialog_item_content.c \ + news_config_dialog_item_content.h \ + news_config_dialog_feed.c \ + news_config_dialog_feed.h \ + news_config_dialog_category.c \ + news_config_dialog_category.h \ + news_config_dialog_langs.c \ + news_config_dialog_langs.h \ + news_config.h \ + news_feed.c \ + news_feed.h \ + news_item.c \ + news_item.h \ + news_menu.c \ + news_menu.h \ + news_parse.c \ + news_parse.h \ + news_parse_private.h \ + news_parse_atom.c \ + news_parse_atom.h \ + news_parse_rss.c \ + news_parse_rss.h \ + news_popup_warn.c \ + news_popup_warn.h \ + news_theme.c \ + news_theme.h \ + news_utils.c \ + news_utils.h \ + news_viewer.c \ + news_viewer.h \ + News.h \ + News_includes.h +module_la_LIBADD = @e_libs@ +module_la_LDFLAGS = -module -avoid-version -s +module_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/src/module/News.h b/src/module/News.h new file mode 100644 index 0000000..3ab7820 --- /dev/null +++ b/src/module/News.h @@ -0,0 +1,61 @@ +#ifndef NEWS_H +#define NEWS_H + +/* Enlightenment includes */ +#include +#include + +/* News includes */ +#define E_MOD_NEWS_TYPEDEFS 1 +#include "News_includes.h" +#undef E_MOD_NEWS_TYPEDEFS +#include "News_includes.h" + +/* Debugging things */ +#ifdef DEBUG +# define DD(x) do {printf("DD - %s:%d: ", __FILE__, __LINE__); printf x; printf("\n"); fflush(stdout);} while (0) +#else +# define DD(x) ((void) 0) +#endif +#ifdef DEBUG_MAIN +# define DMAIN(x) do {printf("MAIN - %s:%d: ", __FILE__, __LINE__); printf x; printf("\n"); fflush(stdout);} while (0) +#else +# define DMAIN(x) ((void) 0) +#endif +#ifdef DEBUG_CONFIG +# define DCONF(x) do {printf("CONFIG - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DCONF(x) ((void) 0) +#endif +#ifdef DEBUG_ITEM +# define DITEM(x) do {printf("ITEM - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DITEM(x) ((void) 0) +#endif +#ifdef DEBUG_FEED +# define DFEED(x) do {printf("FEED - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DFEED(x) ((void) 0) +#endif +#ifdef DEBUG_PARSE +# define DPARSE(x) do {printf("PARSE - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DPARSE(x) ((void) 0) +#endif +#ifdef DEBUG_BROWSER +# define DBROWSER(x) do {printf("BROWSER - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DBROWSER(x) ((void) 0) +#endif +#ifdef DEBUG_POPUP_WARN +# define DPOPW(x) do {printf("POPUP WARN - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DPOPW(x) ((void) 0) +#endif +#ifdef DEBUG_VIEWER +# define DVIEWER(x) do {printf("VIEWER - %s:%d: ", __FILE__, __LINE__); printf x; printf ("\n"); fflush(stdout);} while (0) +#else +# define DVIEWER(x) ((void) 0) +#endif + +#endif diff --git a/src/module/News_includes.h b/src/module/News_includes.h new file mode 100644 index 0000000..f0b4a34 --- /dev/null +++ b/src/module/News_includes.h @@ -0,0 +1,20 @@ +#include "e_mod_main.h" + +#include "news_item.h" +#include "news_feed.h" +#include "news_parse.h" +#include "news_parse_rss.h" +#include "news_parse_atom.h" +#include "news_viewer.h" +#include "news_popup_warn.h" +#include "news_menu.h" +#include "news_config.h" +#include "news_config_dialog.h" +#include "news_config_dialog_feeds.h" +#include "news_config_dialog_item.h" +#include "news_config_dialog_item_content.h" +#include "news_config_dialog_feed.h" +#include "news_config_dialog_category.h" +#include "news_config_dialog_langs.h" +#include "news_theme.h" +#include "news_utils.h" diff --git a/src/module/e_mod_main.c b/src/module/e_mod_main.c new file mode 100644 index 0000000..d9d20e6 --- /dev/null +++ b/src/module/e_mod_main.c @@ -0,0 +1,233 @@ +#include "News.h" + +#define E_MOD_INIT_FAIL(m, msg) \ +{ \ +news_util_message_error_show(msg); \ + e_modapi_shutdown(m); \ + return NULL; \ +} + +/* module requirements */ +EAPI E_Module_Api e_modapi = + { + E_MODULE_API_VERSION, + "News" + }; + +/* gadcon requirements */ +static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); +static void _gc_shutdown(E_Gadcon_Client *gcc); +static void _gc_orient(E_Gadcon_Client *gcc); +static char *_gc_label(void); +static Evas_Object *_gc_icon(Evas *evas); +static const E_Gadcon_Client_Class _gadcon_class = + { + GADCON_CLIENT_CLASS_VERSION, + "news", + { + _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon + }, + E_GADCON_CLIENT_STYLE_INSET + }; + +/* + * Module functions + */ + +EAPI void * +e_modapi_init(E_Module *m) +{ + news = E_NEW(News, 1); + news->module = m; + + DMAIN(("Initialisation ...")); + + if (!news_config_init()) E_MOD_INIT_FAIL(m, _("Config init failed")); + if (!news_theme_init()) E_MOD_INIT_FAIL(m, _("Theme init failed")); + if (!news_parse_init()) E_MOD_INIT_FAIL(m, _("Parser init failed")); + if (!news_feed_init()) E_MOD_INIT_FAIL(m, _("Feeds init failed")); + if (!news_viewer_init()) E_MOD_INIT_FAIL(m, _("Viewer init failed")); + if (!news_popup_warn_init()) E_MOD_INIT_FAIL(m, _("Popup warn subsystem init failed")); + + e_gadcon_provider_register((E_Gadcon_Client_Class *)&_gadcon_class); + + DMAIN(("Initialisation END")); + + return m; +} + +EAPI int +e_modapi_shutdown(E_Module *m) +{ + if (!news) return 0; + + DMAIN(("Shutdown")); + + e_gadcon_provider_unregister((E_Gadcon_Client_Class *)&_gadcon_class); + + if (news->config_dialog) + news_config_dialog_hide(); + if (news->config_dialog_feeds) + news_config_dialog_feeds_hide(); + if (news->config_dialog_langs) + news_config_dialog_langs_hide(); + if (news->config_dialog_feed_new) + news_config_dialog_feed_hide(NULL); + if (news->config_dialog_category_new) + news_config_dialog_category_hide(NULL); + + news_popup_warn_shutdown(); + news_viewer_shutdown(); + news_feed_shutdown(); + news_parse_shutdown(); + news_theme_shutdown(); + news_config_shutdown(); + + free(news); + + return 1; +} + +EAPI int +e_modapi_save(E_Module *m) +{ + int ret; + + if (!news) return 0; + DMAIN(("Save")); + ret = news_config_save(); + + return ret; +} + +EAPI int +e_modapi_about(E_Module *m) +{ + news_util_message_show(_("Module to display information feeds
" + "like Rss or Atom, on youre desktop

" + "ooookiwi@gmail.com
" + "http://oooo.zapto.org")); + return 1; +} + +EAPI int +e_modapi_config(E_Module *m) +{ + int ret; + + if (!news) return 0; + ret = news_config_dialog_show(); + + return ret; +} + + +/* + * Gadcon functions + */ + +static E_Gadcon_Client * +_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) +{ + Evas_Object *o; + E_Gadcon_Client *gcc; + News_Item *ni; + + DMAIN(("GCC init")); + + o = edje_object_add(gc->evas); + gcc = e_gadcon_client_new(gc, name, id, style, o); + ni = news_item_new(gcc, o); + gcc->data = ni; + + news->items = evas_list_append(news->items, ni); + + return ni->gcc; +} + +static void +_gc_shutdown(E_Gadcon_Client *gcc) +{ + News_Item *ni; + + ni = gcc->data; + + DMAIN(("GCC shutdown")); + news->items = evas_list_remove(news->items, ni); + news_item_free(ni); +} + +static void +_gc_orient(E_Gadcon_Client *gcc) +{ + News_Item *ni; + int nb_feeds; + int gc_min_w = 16; + int gc_min_h = 16; + int gc_aspect_w = 16; + int gc_aspect_h = 16; + int gc_orient_horiz = 0; + + ni = gcc->data; + + switch (ni->config->view_mode) + { + case NEWS_ITEM_VIEW_MODE_ONE: + nb_feeds = 1; + break; + case NEWS_ITEM_VIEW_MODE_FEED: + nb_feeds = evas_list_count(ni->config->feed_refs); + if (!nb_feeds) nb_feeds = 1; + break; + case NEWS_ITEM_VIEW_MODE_FEED_UNREAD: + nb_feeds = ni->unread_count; + if (!nb_feeds) nb_feeds = 1; + break; + } + + switch (gcc->gadcon->orient) + { + case E_GADCON_ORIENT_FLOAT: + case E_GADCON_ORIENT_HORIZ: + case E_GADCON_ORIENT_TOP: + case E_GADCON_ORIENT_BOTTOM: + case E_GADCON_ORIENT_CORNER_TL: + case E_GADCON_ORIENT_CORNER_TR: + case E_GADCON_ORIENT_CORNER_BL: + case E_GADCON_ORIENT_CORNER_BR: + gc_aspect_w = nb_feeds*16; + gc_orient_horiz = 1; + break; + case E_GADCON_ORIENT_VERT: + case E_GADCON_ORIENT_LEFT: + case E_GADCON_ORIENT_RIGHT: + case E_GADCON_ORIENT_CORNER_LT: + case E_GADCON_ORIENT_CORNER_RT: + case E_GADCON_ORIENT_CORNER_LB: + case E_GADCON_ORIENT_CORNER_RB: + gc_aspect_h = nb_feeds*16; + break; + default: + break; + } + + e_gadcon_client_aspect_set(gcc, gc_aspect_w, gc_aspect_h); + e_gadcon_client_min_size_set(gcc, gc_min_w, gc_min_h); + news_item_orient_set(ni, gc_orient_horiz); +} + +static char * +_gc_label(void) +{ + return _("News"); +} + +static Evas_Object * +_gc_icon(Evas *evas) +{ + Evas_Object *o; + + o = edje_object_add(evas); + edje_object_file_set(o, news->theme, "icon"); + return o; +} diff --git a/src/module/e_mod_main.h b/src/module/e_mod_main.h new file mode 100644 index 0000000..3cd0c86 --- /dev/null +++ b/src/module/e_mod_main.h @@ -0,0 +1,40 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News News; + +#else + +#ifndef E_MOD_MAIN_H_INCLUDED +#define E_MOD_MAIN_H_INCLUDED + +struct _News +{ + E_Module *module; + char *theme; + + News_Config *config; + E_Config_Dialog *config_dialog; + E_Config_Dialog *config_dialog_feeds; + E_Config_Dialog *config_dialog_feed_new; + E_Config_Dialog *config_dialog_category_new; + E_Config_Dialog *config_dialog_langs; + + Evas_List *items; + Evas_List *langs; + Ecore_Timer *feeds_timer; +}; + +News *news; + +EAPI extern E_Module_Api e_modapi; + +EAPI void *e_modapi_init(E_Module *m); +EAPI int e_modapi_shutdown(E_Module *m); +EAPI int e_modapi_save(E_Module *m); +EAPI int e_modapi_info(E_Module *m); +EAPI int e_modapi_about(E_Module *m); +EAPI int e_modapi_config(E_Module *m); + +#endif +#endif + diff --git a/src/module/news_config.c b/src/module/news_config.c new file mode 100644 index 0000000..36e9fd2 --- /dev/null +++ b/src/module/news_config.c @@ -0,0 +1,270 @@ +#include "News.h" + +static E_Config_DD *_news_edd = NULL; +static E_Config_DD *_news_feed_edd = NULL; +static E_Config_DD *_news_feed_ref_edd = NULL; +static E_Config_DD *_news_feed_category_edd = NULL; +static E_Config_DD *_news_feed_lang_edd = NULL; +static E_Config_DD *_news_item_edd = NULL; + + +/* + * Public functions + */ + +int +news_config_init(void) +{ + _news_feed_edd = E_CONFIG_DD_NEW("News_Feed", News_Feed); +#undef T +#undef D +#define T News_Feed +#define D _news_feed_edd + E_CONFIG_VAL(D, T, name, STR); + E_CONFIG_VAL(D, T, name_ovrw, SHORT); + E_CONFIG_VAL(D, T, language, STR); + E_CONFIG_VAL(D, T, language_ovrw, SHORT); + E_CONFIG_VAL(D, T, description, STR); + E_CONFIG_VAL(D, T, description_ovrw, SHORT); + E_CONFIG_VAL(D, T, url_home, STR); + E_CONFIG_VAL(D, T, url_home_ovrw, SHORT); + E_CONFIG_VAL(D, T, url_feed, STR); + E_CONFIG_VAL(D, T, icon, STR); + E_CONFIG_VAL(D, T, icon_ovrw, SHORT); + E_CONFIG_VAL(D, T, urgent, SHORT); + _news_feed_ref_edd = E_CONFIG_DD_NEW("News_Feed_Ref", News_Feed_Ref); +#undef T +#undef D +#define T News_Feed_Ref +#define D _news_feed_ref_edd + E_CONFIG_VAL(D, T, category, STR); + E_CONFIG_VAL(D, T, name, STR); + _news_feed_category_edd = E_CONFIG_DD_NEW("News_Feed_Category", News_Feed_Category); +#undef T +#undef D +#define T News_Feed_Category +#define D _news_feed_category_edd + E_CONFIG_VAL(D, T, name, STR); + E_CONFIG_VAL(D, T, icon, STR); + E_CONFIG_LIST(D, T, feeds, _news_feed_edd); + _news_feed_lang_edd = E_CONFIG_DD_NEW("News_Feed_Lang", News_Feed_Lang); +#undef T +#undef D +#define T News_Feed_Lang +#define D _news_feed_lang_edd + E_CONFIG_VAL(D, T, key, STR); + E_CONFIG_VAL(D, T, name, STR); + _news_item_edd = E_CONFIG_DD_NEW("News_Item", News_Config_Item); +#undef T +#undef D +#define T News_Config_Item +#define D _news_item_edd + E_CONFIG_VAL(D, T, id, STR); + E_CONFIG_LIST(D, T, feed_refs, _news_feed_ref_edd); + E_CONFIG_VAL(D, T, view_mode, SHORT); + E_CONFIG_VAL(D, T, openmethod, SHORT); + E_CONFIG_VAL(D, T, browser_open_home, SHORT); + _news_edd = E_CONFIG_DD_NEW("News", News_Config); +#undef T +#undef D +#define T News_Config +#define D _news_edd + E_CONFIG_VAL(D, T, version, SHORT); + E_CONFIG_LIST(D, T, feed.categories, _news_feed_category_edd); + E_CONFIG_VAL(D, T, feed.timer_m, INT); + E_CONFIG_VAL(D, T, feed.sort_name, INT); + E_CONFIG_LIST(D, T, feed.langs, _news_feed_lang_edd); + E_CONFIG_VAL(D, T, feed.langs_all, SHORT); + E_CONFIG_VAL(D, T, feed.langs_notset, SHORT); + E_CONFIG_VAL(D, T, proxy.enable, SHORT); + E_CONFIG_VAL(D, T, proxy.host, STR); + E_CONFIG_VAL(D, T, proxy.port, INT); + E_CONFIG_VAL(D, T, browser.wich, SHORT); + E_CONFIG_VAL(D, T, browser.own, STR); + E_CONFIG_VAL(D, T, viewer.vfeeds.unread_first, SHORT); + E_CONFIG_VAL(D, T, viewer.varticles.unread_first, SHORT); + E_CONFIG_VAL(D, T, viewer.varticles.sort_date, SHORT); + E_CONFIG_VAL(D, T, viewer.vcontent.font_size, SHORT); + E_CONFIG_VAL(D, T, viewer.vcontent.font_color, STR); + E_CONFIG_VAL(D, T, viewer.vcontent.font_shadow, SHORT); + E_CONFIG_VAL(D, T, viewer.vcontent.font_shadow_color, STR); + E_CONFIG_VAL(D, T, popup_news.active, SHORT); + E_CONFIG_VAL(D, T, popup_news.timer_s, INT); + E_CONFIG_VAL(D, T, popup_other.on_timeout, SHORT); + E_CONFIG_VAL(D, T, popup_other.timer_s, INT); + E_CONFIG_LIST(D, T, items, _news_item_edd); + news->config = e_config_domain_load("module.news", _news_edd); + + if (news->config) + { + if (news->config->version < NEWS_CONFIG_VERSION) + { + news_util_message_show(_("News module : Configuration Upgraded

" + "Your configuration of news module
" + "has been upgraded
" + "Your settings were removed
" + "Sorry for the inconvenience

" + "(%d -> %d)"), news->config->version, NEWS_CONFIG_VERSION); + news->config = NULL; + } + else + { + if (news->config->version > NEWS_CONFIG_VERSION) + { + news_util_message_show(_("News module : Configuration Downgraded

" + "Your configuration of News module
" + "has been downgraded
" + "Your settings were removed
" + "Sorry for the inconvenience

" + "(%d ->%d)"), news->config->version, NEWS_CONFIG_VERSION); + news->config = NULL; + } + } + } + + if (!news->config) + { + News_Config *c; + char buf[4096]; + + c = E_NEW(News_Config, 1); + news->config = c; + c->version = NEWS_CONFIG_VERSION; + + news_feed_all_restore(); + + c->feed.timer_m = NEWS_FEED_TIMER_DEFAULT; + c->feed.sort_name = NEWS_FEED_SORT_NAME_DEFAULT; + c->feed.langs = news_util_lang_detect(); + c->feed.langs_all = NEWS_FEED_LANG_ALL_DEFAULT; + c->feed.langs_notset = 1; + c->proxy.port = NEWS_FEED_PROXY_PORT_DEFAULT; + + c->browser.wich = NEWS_UTIL_BROWSER_DEFAULT; + + c->viewer.vfeeds.unread_first = NEWS_VIEWER_VFEEDS_UNREAD_FIRST_DEFAULT; + c->viewer.varticles.unread_first = NEWS_VIEWER_VARTICLES_UNREAD_FIRST_DEFAULT; + c->viewer.varticles.sort_date = NEWS_VIEWER_VARTICLES_SORT_DATE_DEFAULT; + c->viewer.vcontent.font_size = NEWS_VIEWER_VCONTENT_FONT_SIZE_DEFAULT; + snprintf(buf, sizeof(buf), "%s", NEWS_VIEWER_VCONTENT_FONT_COLOR_DEFAULT); + c->viewer.vcontent.font_color = evas_stringshare_add(buf); + c->viewer.vcontent.font_shadow = NEWS_VIEWER_VCONTENT_FONT_SHADOW_DEFAULT; + snprintf(buf, sizeof(buf), "%s", NEWS_VIEWER_VCONTENT_FONT_SHADOW_COLOR_DEFAULT); + c->viewer.vcontent.font_shadow_color = evas_stringshare_add(buf); + c->popup_news.active = NEWS_FEED_POPUP_NEWS_ACTIVE_DEFAULT; + c->popup_news.timer_s = NEWS_FEED_POPUP_NEWS_TIMER_S_DEFAULT; + c->popup_other.on_timeout = NEWS_FEED_POPUP_OTHER_ON_TIMEOUT_DEFAULT; + c->popup_other.timer_s = NEWS_FEED_POPUP_OTHER_TIMER_S_DEFAULT; + } + + E_CONFIG_LIMIT(news->config->feed.timer_m, NEWS_FEED_TIMER_MIN, NEWS_FEED_TIMER_MAX); + E_CONFIG_LIMIT(news->config->feed.sort_name, 0, 1); + E_CONFIG_LIMIT(news->config->proxy.enable, 0, 1); + E_CONFIG_LIMIT(news->config->proxy.port, 1024, 65535); + E_CONFIG_LIMIT(news->config->viewer.vfeeds.unread_first, 0, 1); + E_CONFIG_LIMIT(news->config->viewer.varticles.unread_first, 0, 1); + E_CONFIG_LIMIT(news->config->viewer.varticles.sort_date, 0, 1); + E_CONFIG_LIMIT(news->config->viewer.vcontent.font_size, NEWS_VIEWER_VCONTENT_FONT_SIZE_MIN, NEWS_VIEWER_VCONTENT_FONT_SIZE_MAX); + E_CONFIG_LIMIT(news->config->viewer.vcontent.font_shadow, 0, 1); + E_CONFIG_LIMIT(news->config->popup_news.timer_s, NEWS_POPUP_WARN_TIMER_S_MIN, NEWS_POPUP_WARN_TIMER_S_MAX); + E_CONFIG_LIMIT(news->config->popup_other.on_timeout, 0, 1); + E_CONFIG_LIMIT(news->config->popup_other.timer_s, NEWS_POPUP_WARN_TIMER_S_MIN, NEWS_POPUP_WARN_TIMER_S_MAX); + + return 1; +} + +int +news_config_shutdown(void) +{ + News_Config *c; + News_Config_Item *nic; + + c = news->config; + + news_feed_all_delete(); + + news_feed_lang_list_free(news->config->feed.langs); + + if (c->proxy.host) evas_stringshare_del(c->proxy.host); + if (c->browser.own) evas_stringshare_del(c->browser.own); + + while ( (nic = evas_list_data(c->items)) ) + news_config_item_del(nic); + + evas_stringshare_del(c->viewer.vcontent.font_color); + evas_stringshare_del(c->viewer.vcontent.font_shadow_color); + + E_FREE(news->config); + + E_CONFIG_DD_FREE(_news_edd); + E_CONFIG_DD_FREE(_news_feed_edd); + E_CONFIG_DD_FREE(_news_feed_ref_edd); + E_CONFIG_DD_FREE(_news_feed_category_edd); + E_CONFIG_DD_FREE(_news_item_edd); + + return 1; +} + +int +news_config_save(void) +{ + e_config_domain_save("module.news", _news_edd, news->config); + + return 1; +} + +News_Config_Item * +news_config_item_add(const char *id) +{ + News_Config_Item *nic; + Evas_List *l; + + DCONF(("Item new config")); + + /* is there already an item config for this id ? */ + for (l=news->config->items; l; l=evas_list_next(l)) + { + nic = evas_list_data(l); + if (!strcmp(nic->id, id)) + { + DCONF(("config found ! %s", nic->id)); + return nic; + } + } + + DCONF(("config NOT found ! creating new one %s", id)); + /* no, create a new item config */ + nic = E_NEW(News_Config_Item, 1); + + nic->id = evas_stringshare_add(id); + nic->view_mode = NEWS_ITEM_VIEW_MODE_DEFAULT; + nic->openmethod = NEWS_ITEM_OPENMETHOD_DEFAULT; + nic->browser_open_home = NEWS_ITEM_BROWSER_OPEN_HOME_DEFAULT; + + news->config->items = evas_list_append(news->config->items, nic); + + return nic; +} + +void +news_config_item_del(News_Config_Item *nic) +{ + evas_stringshare_del(nic->id); + + while(evas_list_count(nic->feed_refs)) + { + News_Feed_Ref *fr; + fr = evas_list_data(nic->feed_refs); + evas_stringshare_del(fr->name); + nic->feed_refs = evas_list_remove(nic->feed_refs, fr); + } + + news->config->items = evas_list_remove(news->config->items, nic); + free(nic); +} + + +/* + * Private functions + * + */ diff --git a/src/module/news_config.h b/src/module/news_config.h new file mode 100644 index 0000000..e6f4eda --- /dev/null +++ b/src/module/news_config.h @@ -0,0 +1,98 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Config News_Config; +typedef struct _News_Config_Item News_Config_Item; + +#else + +#ifndef NEWS_CONFIG_H_INCLUDED +#define NEWS_CONFIG_H_INCLUDED + +#define NEWS_CONFIG_VERSION 12 + +struct _News_Config +{ + int version; + + struct + { + Evas_List *categories; + int timer_m; + int sort_name; + Evas_List *langs; + int langs_all; + int langs_notset; + } feed; + + struct + { + int enable; + const char *host; + int port; + } proxy; + + struct + { + int wich; + const char *own; + } browser; + + struct + { + struct + { + int unread_first; + } vfeeds; + struct + { + int unread_first; + int sort_date; + } varticles; + struct + { + int font_size; + const char *font_color; + int font_shadow; + const char *font_shadow_color; + } vcontent; + } viewer; + + struct + { + int active; + int timer_s; + } popup_news; + + struct + { + int on_timeout; + int timer_s; + } popup_other; + + Evas_List *items; +}; + +struct _News_Config_Item +{ + const char *id; + + /* list of Feed_Ref */ + Evas_List *feed_refs; + + int view_mode; + int openmethod; + int browser_open_home; + + int apply_to_all; +}; + +int news_config_init(void); +int news_config_shutdown(void); + +int news_config_save(void); + +News_Config_Item *news_config_item_add(const char *id); +void news_config_item_del(News_Config_Item *nic); + +#endif +#endif diff --git a/src/module/news_config_dialog.c b/src/module/news_config_dialog.c new file mode 100644 index 0000000..fb7300b --- /dev/null +++ b/src/module/news_config_dialog.c @@ -0,0 +1,502 @@ +#include "News.h" + +#define DIALOG_CLASS "_e_mod_news_config_dialog" + +struct _E_Config_Dialog_Data +{ + Evas_Object *color_viewer_font; + Evas_Object *color_viewer_font_shadow; + + struct + { + int timer_m; + int sort_name; + } feed; + + struct + { + int enable; + char *host; + char *port; + } proxy; + + struct + { + int wich; + char *own; + } browser; + + struct + { + struct + { + int unread_first; + } vfeeds; + struct + { + int unread_first; + int sort_date; + } varticles; + struct + { + int font_size; + E_Color *font_color; + int font_shadow; + E_Color *font_shadow_color; + int color_changed; + } vcontent; + } viewer; + + struct + { + int active; + int timer_s; + } popup_news; + + struct + { + int on_timeout; + int timer_s; + } popup_other; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +static void _cb_color_viewer_font_change(void *data, Evas_Object *obj); +static void _cb_color_viewer_font_shadow_change(void *data, Evas_Object *obj); + +/* + * Public functions + */ + +int +news_config_dialog_show(void) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + if (e_config_dialog_find("E", DIALOG_CLASS)) + return 0; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _advanced_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Main Configuration"), + "E", DIALOG_CLASS, + news->theme, 0, v, NULL); + + return 1; +} + +void +news_config_dialog_hide(void) +{ + e_object_del(E_OBJECT(news->config_dialog)); + news->config_dialog = NULL; +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + + news->config_dialog = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + free(cfdata->proxy.host); + free(cfdata->browser.own); + + news->config_dialog = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata) +{ + News_Config *c; + + c = news->config; + + cfdata->feed.timer_m = c->feed.timer_m; + cfdata->feed.sort_name = c->feed.sort_name; + + cfdata->proxy.enable = c->proxy.enable; + if (c->proxy.host) + cfdata->proxy.host = strdup(c->proxy.host); + else + cfdata->proxy.host = strdup(""); + if (c->proxy.port) + { + char buf[6]; + snprintf(buf, sizeof(buf), "%d", c->proxy.port); + cfdata->proxy.port = strdup(buf); + } + else + cfdata->proxy.port = strdup(""); + + cfdata->browser.wich = c->browser.wich; + if (c->browser.own) + cfdata->browser.own = strdup(c->browser.own); + else + cfdata->browser.own = strdup(""); + + cfdata->viewer.vfeeds.unread_first = c->viewer.vfeeds.unread_first; + cfdata->viewer.varticles.unread_first = c->viewer.varticles.unread_first; + cfdata->viewer.varticles.sort_date = c->viewer.varticles.sort_date; + cfdata->viewer.vcontent.font_size = c->viewer.vcontent.font_size; + cfdata->viewer.vcontent.font_color = E_NEW(E_Color, 1); + sscanf(c->viewer.vcontent.font_color, "#%2x%2x%2x", + &cfdata->viewer.vcontent.font_color->r, + &cfdata->viewer.vcontent.font_color->g, + &cfdata->viewer.vcontent.font_color->b); + cfdata->viewer.vcontent.font_color->a = 255; + e_color_update_rgb(cfdata->viewer.vcontent.font_color); + cfdata->viewer.vcontent.font_shadow = c->viewer.vcontent.font_shadow; + cfdata->viewer.vcontent.font_shadow_color = E_NEW(E_Color, 1); + sscanf(c->viewer.vcontent.font_shadow_color, "#%2x%2x%2x", + &cfdata->viewer.vcontent.font_shadow_color->r, + &cfdata->viewer.vcontent.font_shadow_color->g, + &cfdata->viewer.vcontent.font_shadow_color->b); + cfdata->viewer.vcontent.font_shadow_color->a = 255; + e_color_update_rgb(cfdata->viewer.vcontent.font_shadow_color); + cfdata->viewer.vcontent.color_changed = 0; + + cfdata->popup_news.active = c->popup_news.active; + cfdata->popup_news.timer_s = c->popup_news.timer_s; + + cfdata->popup_other.on_timeout = c->popup_other.on_timeout; + cfdata->popup_other.timer_s = c->popup_other.timer_s; +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o, *of, *ob; + E_Radio_Group *rg; + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_frametable_add(evas, _("Feeds"), 0); + + ob = e_widget_check_add(evas, _("Sort lists by name"), &(cfdata->feed.sort_name)); + e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 1, 1, 0); + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Browser"), 0); + + rg = e_widget_radio_group_new(&(cfdata->browser.wich)); + ob = e_widget_radio_add(evas, _("Firefox"), NEWS_UTIL_BROWSER_FIREFOX, rg); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Mozilla"), NEWS_UTIL_BROWSER_MOZILLA, rg); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Opera"), NEWS_UTIL_BROWSER_OPERA, rg); + e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Dillo"), NEWS_UTIL_BROWSER_DILLO, rg); + e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("This one"), NEWS_UTIL_BROWSER_OWN, rg); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 1); + ob = e_widget_entry_add(evas, &(cfdata->browser.own)); + e_widget_frametable_object_append(of, ob, 1, 1, 3, 1, 1, 1, 1, 1); + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("News Viewer"), 0); + + ob = e_widget_label_add(evas, _("Font size")); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), NEWS_VIEWER_VCONTENT_FONT_SIZE_MIN, NEWS_VIEWER_VCONTENT_FONT_SIZE_MAX, 1.0, 0, NULL, &(cfdata->viewer.vcontent.font_size), 50); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); + + ob = e_widget_label_add(evas, _("Font color")); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1); + + ob = e_widget_color_well_add(evas, cfdata->viewer.vcontent.font_color, 1); + cfdata->color_viewer_font = ob; + e_widget_on_change_hook_set(ob, _cb_color_viewer_font_change, cfdata); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1); + + e_widget_list_object_append(o, of, 1, 1, 1.0); + + return o; +} + +static Evas_Object * +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o, *o2, *of, *of2, *ob; + E_Radio_Group *rg; + + o = e_widget_table_add(evas, 0); + + o2 = e_widget_list_add(evas, 0, 0); + + of = e_widget_frametable_add(evas, _("Feeds"), 0); + + ob = e_widget_label_add(evas, _("Timer")); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 0); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f min"), + (float)NEWS_FEED_TIMER_MIN, (float)NEWS_FEED_TIMER_MAX, + 1.0, 0, NULL, &(cfdata->feed.timer_m), 70); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 0); + ob = e_widget_check_add(evas, _("Sort lists by name"), &(cfdata->feed.sort_name)); + e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 1, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Browser"), 0); + + rg = e_widget_radio_group_new(&(cfdata->browser.wich)); + ob = e_widget_radio_add(evas, _("Firefox"), NEWS_UTIL_BROWSER_FIREFOX, rg); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Mozilla"), NEWS_UTIL_BROWSER_MOZILLA, rg); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Opera"), NEWS_UTIL_BROWSER_OPERA, rg); + e_widget_frametable_object_append(of, ob, 2, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("Dillo"), NEWS_UTIL_BROWSER_DILLO, rg); + e_widget_frametable_object_append(of, ob, 3, 0, 1, 1, 1, 1, 0, 1); + ob = e_widget_radio_add(evas, _("This one"), NEWS_UTIL_BROWSER_OWN, rg); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 1); + ob = e_widget_entry_add(evas, &(cfdata->browser.own)); + e_widget_frametable_object_append(of, ob, 1, 1, 3, 1, 1, 1, 1, 1); + + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Popup On News"), 0); + + rg = e_widget_radio_group_new(&(cfdata->popup_news.active)); + ob = e_widget_radio_add(evas, _("Never"), + NEWS_FEED_POPUP_NEWS_ACTIVE_NO, rg); + //TODO: NOT IMPLEMENTED YET + e_widget_radio_toggle_set(ob, 0); + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 0); + ob = e_widget_radio_add(evas, _("Only on urgent feeds"), + NEWS_FEED_POPUP_NEWS_ACTIVE_URGENT, rg); + //TODO: NOT IMPLEMENTED YET + e_widget_radio_toggle_set(ob, 0); + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 0); + ob = e_widget_radio_add(evas, _("On all feeds"), + NEWS_FEED_POPUP_NEWS_ACTIVE_ALL, rg); + //TODO: NOT IMPLEMENTED YET + e_widget_radio_toggle_set(ob, 0); + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0); + + ob = e_widget_label_add(evas, _("Timer")); + e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f s"), + (float)NEWS_POPUP_WARN_TIMER_S_MIN, + (float)NEWS_POPUP_WARN_TIMER_S_MAX, + 1.0, 0, NULL, &(cfdata->popup_news.timer_s), 70); + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Popup On Warning / Error"), 0); + + ob = e_widget_check_add(evas, _("Show on timeout ?"), &(cfdata->popup_other.on_timeout)); + e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 0, 1, 0); + + ob = e_widget_label_add(evas, _("Timer")); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 0); + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f s"), + (float)NEWS_POPUP_WARN_TIMER_S_MIN, + (float)NEWS_POPUP_WARN_TIMER_S_MAX, + 1.0, 0, NULL, &(cfdata->popup_other.timer_s), 70); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + e_widget_table_object_append(o, o2, 0, 0, 1, 1, 1, 1, 1, 1); + + + o2 = e_widget_list_add(evas, 0, 0); + + of = e_widget_frametable_add(evas, _("News Viewer"), 0); + + ob = e_widget_check_add(evas, _("Unread feeds first"), &(cfdata->viewer.vfeeds.unread_first)); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); + ob = e_widget_check_add(evas, _("Unread articles first"), &(cfdata->viewer.varticles.unread_first)); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 0, 1, 0); + ob = e_widget_check_add(evas, _("Sort articles by date"), &(cfdata->viewer.varticles.sort_date)); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0); + + of2 = e_widget_frametable_add(evas, _("Font"), 0); + + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), NEWS_VIEWER_VCONTENT_FONT_SIZE_MIN, NEWS_VIEWER_VCONTENT_FONT_SIZE_MAX, 1.0, 0, NULL, &(cfdata->viewer.vcontent.font_size), 70); + e_widget_frametable_object_append(of2, ob, 0, 0, 1, 1, 1, 0, 1, 0); + + ob = e_widget_color_well_add(evas, cfdata->viewer.vcontent.font_color, 1); + cfdata->color_viewer_font = ob; + e_widget_on_change_hook_set(ob, _cb_color_viewer_font_change, cfdata); + e_widget_frametable_object_append(of2, ob, 0, 1, 1, 1, 1, 0, 1, 0); + + ob = e_widget_check_add(evas, _("Font Shadow"), &cfdata->viewer.vcontent.font_shadow); + e_widget_frametable_object_append(of2, ob, 1, 0, 1, 1, 1, 0, 1, 0); + + ob = e_widget_color_well_add(evas, cfdata->viewer.vcontent.font_shadow_color, 1); + cfdata->color_viewer_font_shadow = ob; + e_widget_on_change_hook_set(ob, _cb_color_viewer_font_shadow_change, cfdata); + e_widget_frametable_object_append(of2, ob, 1, 1, 1, 1, 1, 0, 1, 0); + + e_widget_frametable_object_append(of, of2, 0, 2, 2, 1, 1, 0, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 0.0); + + of = e_widget_frametable_add(evas, _("Proxy"), 0); + + ob = e_widget_check_add(evas, _("Enable"), &(cfdata->proxy.enable)); + e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 0, 0, 0); + ob = e_widget_label_add(evas, _("Host")); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 0, 0); + ob = e_widget_entry_add(evas, &(cfdata->proxy.host)); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0); + ob = e_widget_label_add(evas, _("Port")); + e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 0, 0, 0); + ob = e_widget_entry_add(evas, &(cfdata->proxy.port)); + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 1.0); + + e_widget_table_object_append(o, o2, 1, 0, 1, 1, 1, 1, 1, 1); + + return o; +} + +static int +_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + News_Config *c; + + c = news->config; + + if (c->feed.timer_m != cfdata->feed.timer_m) + news_feed_timer_set(cfdata->feed.timer_m); + if (c->feed.sort_name != cfdata->feed.sort_name) + { + c->feed.sort_name = cfdata->feed.sort_name; + if (c->feed.sort_name) + news_feed_lists_refresh(1); + } + + c->proxy.enable = cfdata->proxy.enable; + if (c->proxy.host) + { + evas_stringshare_del(c->proxy.host); + c->proxy.host = NULL; + } + if (cfdata->proxy.host && cfdata->proxy.host[0]) + c->proxy.host = evas_stringshare_add(cfdata->proxy.host); + if (cfdata->proxy.port && cfdata->proxy.port[0]) + sscanf(cfdata->proxy.port, "%d", &c->proxy.port); + + c->browser.wich = cfdata->browser.wich; + if (c->browser.own) + { + evas_stringshare_del(c->browser.own); + c->browser.own = NULL; + } + if (cfdata->browser.own) + c->browser.own = evas_stringshare_add(cfdata->browser.own); + + if ( (c->viewer.vfeeds.unread_first != cfdata->viewer.vfeeds.unread_first) || + (c->viewer.varticles.unread_first != cfdata->viewer.varticles.unread_first) || + (c->viewer.varticles.sort_date != cfdata->viewer.varticles.sort_date) || + (c->viewer.vcontent.font_size != cfdata->viewer.vcontent.font_size) || + (c->viewer.vcontent.font_shadow != cfdata->viewer.vcontent.font_shadow) || + (cfdata->viewer.vcontent.color_changed) ) + { + int recreate = 0; + char buf[8]; + + if ( (c->viewer.vcontent.font_size != cfdata->viewer.vcontent.font_size) || + (c->viewer.vcontent.font_shadow != cfdata->viewer.vcontent.font_shadow) || + (cfdata->viewer.vcontent.color_changed) ) + recreate = 1; + + c->viewer.vfeeds.unread_first = cfdata->viewer.vfeeds.unread_first; + c->viewer.varticles.unread_first = cfdata->viewer.varticles.unread_first; + c->viewer.varticles.sort_date = cfdata->viewer.varticles.sort_date; + c->viewer.vcontent.font_size = cfdata->viewer.vcontent.font_size; + + if (cfdata->viewer.vcontent.font_color->r < 16) cfdata->viewer.vcontent.font_color->r = 16; + if (cfdata->viewer.vcontent.font_color->g < 16) cfdata->viewer.vcontent.font_color->g = 16; + if (cfdata->viewer.vcontent.font_color->b < 16) cfdata->viewer.vcontent.font_color->b = 16; + snprintf(buf, sizeof(buf), "#%x%x%x", + cfdata->viewer.vcontent.font_color->r, + cfdata->viewer.vcontent.font_color->g, + cfdata->viewer.vcontent.font_color->b); + evas_stringshare_del(news->config->viewer.vcontent.font_color); + news->config->viewer.vcontent.font_color = evas_stringshare_add(buf); + + c->viewer.vcontent.font_shadow = cfdata->viewer.vcontent.font_shadow; + + if (cfdata->viewer.vcontent.font_shadow_color->r < 16) cfdata->viewer.vcontent.font_shadow_color->r = 16; + if (cfdata->viewer.vcontent.font_shadow_color->g < 16) cfdata->viewer.vcontent.font_shadow_color->g = 16; + if (cfdata->viewer.vcontent.font_shadow_color->b < 16) cfdata->viewer.vcontent.font_shadow_color->b = 16; + snprintf(buf, sizeof(buf), "#%x%x%x", + cfdata->viewer.vcontent.font_shadow_color->r, + cfdata->viewer.vcontent.font_shadow_color->g, + cfdata->viewer.vcontent.font_shadow_color->b); + evas_stringshare_del(news->config->viewer.vcontent.font_shadow_color); + news->config->viewer.vcontent.font_shadow_color = evas_stringshare_add(buf); + + news_viewer_all_refresh(1, recreate); + cfdata->viewer.vcontent.color_changed = 0; + } + + c->popup_news.active = cfdata->popup_news.active; + c->popup_news.timer_s = cfdata->popup_news.timer_s; + + c->popup_other.on_timeout = cfdata->popup_other.on_timeout; + c->popup_other.timer_s = cfdata->popup_other.timer_s; + + news_config_save(); + return 1; +} + +static void +_cb_color_viewer_font_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + cfdata->viewer.vcontent.color_changed = 1; +} + +static void +_cb_color_viewer_font_shadow_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + cfdata->viewer.vcontent.color_changed = 1; +} diff --git a/src/module/news_config_dialog.h b/src/module/news_config_dialog.h new file mode 100644 index 0000000..aa6036d --- /dev/null +++ b/src/module/news_config_dialog.h @@ -0,0 +1,14 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_H_INCLUDED +#define NEWS_CONFIG_DIALOG_H_INCLUDED + +int news_config_dialog_show(void); +void news_config_dialog_hide(void); + +#endif +#endif diff --git a/src/module/news_config_dialog_category.c b/src/module/news_config_dialog_category.c new file mode 100644 index 0000000..c638cda --- /dev/null +++ b/src/module/news_config_dialog_category.c @@ -0,0 +1,293 @@ +#include "News.h" + + +struct _E_Config_Dialog_Data +{ + struct + { + Evas_Object *button_icon; + Evas_Object *icon; + Evas_Object *icon_sel; + E_Dialog *icon_sel_dia; + } gui; + + News_Feed_Category *cat; + + char *name; + char *icon; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata, News_Feed_Category *cat); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +static void _icon_select(void *data1, void *data2); +static void _icon_select_cb(void *data, Evas_Object *obj); +static void _icon_select_ok(void *data, E_Dialog *dia); +static void _icon_select_cancel(void *data, E_Dialog *dia); +static void _icon_select_changed(void *data); + +/* + * Public functions + */ + +int +news_config_dialog_category_show(News_Feed_Category *fcat) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Category Configuration"), + "E", "_e_mod_news_config_dialog_category", + news->theme, 0, v, fcat); + + return 1; +} + +void +news_config_dialog_category_hide(News_Feed_Category *fcat) +{ + if (fcat) + { + e_object_del(E_OBJECT(fcat->config_dialog)); + fcat->config_dialog = NULL; + } + else + { + e_object_del(E_OBJECT(news->config_dialog_category_new)); + news->config_dialog_category_new = NULL; + } +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + + cat = cfd->data; + + if (cat) cat->config_dialog = cfd; + else news->config_dialog_category_new = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata, cat); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + free(cfdata->name); + free(cfdata->icon); + + if (cfdata->cat) + cfdata->cat->config_dialog = NULL; + else + news->config_dialog_category_new = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata, News_Feed_Category *cat) +{ + char buf[4096]; + + cfdata->cat = cat; + + if (cat) + { + if (cat->name) cfdata->name = strdup(cat->name); + if (cat->icon) cfdata->icon = strdup(cat->icon); + } + else + { + cfdata->name = strdup(""); + snprintf(buf, sizeof(buf), "%s/%s", + e_module_dir_get(news->module), NEWS_FEED_ITEM_CAT_ICON_DEFAULT); + cfdata->icon = strdup(buf); + } +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o, *of, *ob; + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("Icon"), 0); + ob = e_widget_button_add(evas, "", NULL, + _icon_select, cfdata, NULL); + cfdata->gui.button_icon = ob; + if (cfdata->icon) + _icon_select_changed(cfdata); + e_widget_min_size_set(ob, 48, 48); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.0); + + of = e_widget_framelist_add(evas, _("Name"), 0); + ob = e_widget_entry_add(evas, &(cfdata->name)); + e_widget_framelist_object_append(of, ob); + e_widget_list_object_append(o, of, 1, 1, 0.0); + + return o; +} + +static int +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + News_Feed_Category *cat; + + cat = cfdata->cat; + if (cat) + { + if ( !news_feed_category_edit(cat, + cfdata->name, + cfdata->icon) ) + return 0; + } + else + { + cat = news_feed_category_new(cfdata->name, + cfdata->icon); + if (!cat) return 0; + news->config->feed.categories = + evas_list_append(news->config->feed.categories, cat); + + cfdata->cat = cat; + news->config_dialog_category_new = NULL; + cat->config_dialog = cfd; + } + + news_feed_lists_refresh(1); + + return 1; +} + +static void +_icon_select(void *data1, void *data2) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_Data *cfdata; + E_Dialog *dia; + Evas_Object *o; + Evas_Coord mw, mh; + char *dir = NULL; + + cfdata = data1; + + if (cfdata->gui.icon_sel) return; + + if (cfdata->cat) cfd = cfdata->cat->config_dialog; + else cfd = news->config_dialog_category_new; + + dia = e_dialog_new(cfd->con, "E", "_news_category_icon_select_dialog"); + if (!dia) return; + e_dialog_title_set(dia, _("Select an Icon")); + dia->data = cfdata; + + if (cfdata->icon) + dir = ecore_file_get_dir(cfdata->icon); + + if (dir) + { + o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL, + _icon_select_cb, cfdata, + NULL, cfdata, 1); + free(dir); + } + else + { + o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, + _icon_select_cb, cfdata, + NULL, cfdata, 1); + } + evas_object_show(o); + cfdata->gui.icon_sel = o; + e_widget_min_size_get(o, &mw, &mh); + e_dialog_content_set(dia, o, mw, mh); + + /* buttons at the bottom */ + e_dialog_button_add(dia, _("OK"), NULL, _icon_select_ok, cfdata); + e_dialog_button_add(dia, _("Cancel"), NULL, _icon_select_cancel, cfdata); + e_dialog_resizable_set(dia, 1); + e_win_centered_set(dia->win, 1); + e_dialog_show(dia); + e_win_resize(dia->win, 475, 341); + cfdata->gui.icon_sel_dia = dia; +} + +static void +_icon_select_cb(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; +} + +static void +_icon_select_ok(void *data, E_Dialog *dia) +{ + E_Config_Dialog_Data *cfdata; + const char *file; + + cfdata = data; + file = e_widget_fsel_selection_path_get(cfdata->gui.icon_sel); + if (file) + { + if(cfdata->icon) free(cfdata->icon); + cfdata->icon = strdup(file); + + _icon_select_changed(cfdata); + } + + _icon_select_cancel(data, dia); +} + +static void +_icon_select_cancel(void *data, E_Dialog *dia) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + e_object_del(E_OBJECT(dia)); + cfdata->gui.icon_sel = NULL; + cfdata->gui.icon_sel_dia = NULL; +} + +static void +_icon_select_changed(void *data) +{ + E_Config_Dialog_Data *cfdata; + Evas_Object *ic; + + cfdata = data; + + if (!cfdata->icon) return; + + ic = e_icon_add(evas_object_evas_get(cfdata->gui.button_icon)); + e_icon_file_set(ic, cfdata->icon); + e_icon_fill_inside_set(ic, 1); + + if (cfdata->gui.icon) evas_object_del(cfdata->gui.icon); + + e_widget_button_icon_set(cfdata->gui.button_icon, ic); + cfdata->gui.icon = ic; +} diff --git a/src/module/news_config_dialog_category.h b/src/module/news_config_dialog_category.h new file mode 100644 index 0000000..182de0a --- /dev/null +++ b/src/module/news_config_dialog_category.h @@ -0,0 +1,14 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_CATEGORY_H_INCLUDED +#define NEWS_CONFIG_DIALOG_CATEGORY_H_INCLUDED + +int news_config_dialog_category_show(News_Feed_Category *fcat); +void news_config_dialog_category_hide(News_Feed_Category *fcat); + +#endif +#endif diff --git a/src/module/news_config_dialog_feed.c b/src/module/news_config_dialog_feed.c new file mode 100644 index 0000000..722b747 --- /dev/null +++ b/src/module/news_config_dialog_feed.c @@ -0,0 +1,640 @@ +#include "News.h" + +struct _E_Config_Dialog_Data +{ + struct + { + Evas_Object *ilist_categories; + Evas_Object *ilist_langs; + Evas_Object *button_icon; + Evas_Object *icon; + + Evas_Object *icon_sel; + E_Dialog *icon_sel_dia; + + int in_advanced; + } gui; + + char *name; + int name_ovrw; + char *language; + int language_ovrw; + char *description; + int description_ovrw; + char *url_home; + int url_home_ovrw; + char *url_feed; + char *icon; + int icon_ovrw; + int urgent; + News_Feed_Category *category; + + News_Feed *feed; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata, News_Feed *f); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static void _common_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata, Evas_Object *o); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _common_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +static void _cb_lang_change(void *data, Evas_Object *obj); + +static void _cb_category_list(void *data); + +static void _icon_select(void *data1, void *data2); +static void _icon_select_cb(void *data, Evas_Object *obj); +static void _icon_select_ok(void *data, E_Dialog *dia); +static void _icon_select_cancel(void *data, E_Dialog *dia); +static void _icon_select_changed(void *data); + +/* + * Public functions + */ + +int +news_config_dialog_feed_show(News_Feed *feed) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _common_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _common_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Feed Configuration"), + "E", "_e_mod_news_config_dialog_feed", + news->theme, 0, v, feed); + + return 1; +} + +void +news_config_dialog_feed_hide(News_Feed *feed) +{ + if (feed) + { + e_object_del(E_OBJECT(feed->config_dialog)); + feed->config_dialog = NULL; + } + else + { + e_object_del(E_OBJECT(news->config_dialog_feed_new)); + news->config_dialog_feed_new = NULL; + } +} + +void +news_config_dialog_feed_refresh_categories(News_Feed *feed) +{ + E_Config_Dialog_Data *cfdata; + Evas_List *l; + Evas_Object *ilist; + int pos, pos_to_select; + int w; + + if (feed) + { + if (!feed->config_dialog) return; + cfdata = feed->config_dialog->cfdata; + } + else + { + if (!news->config_dialog_feed_new) return; + cfdata = news->config_dialog_feed_new->cfdata; + } + if (cfdata->gui.in_advanced) return; + + ilist = cfdata->gui.ilist_categories; + e_widget_ilist_freeze(ilist); + e_widget_ilist_clear(ilist); + + pos = 0; + pos_to_select = -1; + for(l=news->config->feed.categories; l; l=evas_list_next(l)) + { + Evas_Object *ic = NULL; + News_Feed_Category *fc; + char buf[1024]; + + fc = evas_list_data(l); + + if (fc->icon && fc->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, fc->icon); + } + + snprintf(buf, sizeof(buf), "%s", + fc->name); + + if (cfdata->category == fc) + pos_to_select = pos; + + e_widget_ilist_append(ilist, ic, buf, _cb_category_list, cfdata, NULL); + + pos++; + } + e_widget_ilist_go(ilist); + + if (pos_to_select != -1) + { + e_widget_ilist_selected_set(ilist, pos_to_select); + _cb_category_list(cfdata); + } + + e_widget_min_size_get(ilist, &w, NULL); + e_widget_min_size_set(ilist, w, 110); + + e_widget_ilist_thaw(ilist); +} + +void +news_config_dialog_feed_refresh_langs(News_Feed *feed) +{ + E_Config_Dialog_Data *cfdata; + Evas_Object *ilist; + News_Feed_Lang *lang; + Evas_List *list, *l; + int pos, pos_to_select; + int w; + + if (feed) + { + if (!feed->config_dialog) return; + cfdata = feed->config_dialog->cfdata; + } + else + { + if (!news->config_dialog_feed_new) return; + cfdata = news->config_dialog_feed_new->cfdata; + } + if (cfdata->gui.in_advanced) return; + + ilist = cfdata->gui.ilist_langs; + e_widget_ilist_freeze(ilist); + e_widget_ilist_clear(ilist); + + if (news->config->feed.langs_all) + list = news->langs; + else + list = news->config->feed.langs; + pos = 0; + pos_to_select = -1; + for (l=list; l; l=evas_list_next(l)) + { + lang = l->data; + e_widget_ilist_append(ilist, NULL, lang->name, NULL, lang, NULL); + + if (cfdata->language && !strcmp(cfdata->language, lang->key)) + pos_to_select = pos; + pos++; + } + e_widget_ilist_go(ilist); + + if (pos_to_select != -1) + e_widget_ilist_selected_set(ilist, pos_to_select); + else + e_widget_ilist_selected_set(ilist, 0); + + e_widget_min_size_get(ilist, &w, NULL); + e_widget_min_size_set(ilist, w, 110); + + e_widget_ilist_thaw(ilist); +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + News_Feed *feed; + + feed = cfd->data; + + if (feed) feed->config_dialog = cfd; + else news->config_dialog_feed_new = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata, feed); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + free(cfdata->name); + free(cfdata->language); + free(cfdata->description); + free(cfdata->url_home); + free(cfdata->url_feed); + free(cfdata->icon); + + if (cfdata->gui.icon_sel) + e_object_del(E_OBJECT(cfdata->gui.icon_sel)); + + if (cfdata->feed) + cfdata->feed->config_dialog = NULL; + else + news->config_dialog_feed_new = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata, News_Feed *f) +{ + char buf[4096]; + + cfdata->feed = f; + + if (f) + { + fflush(stdout); + cfdata->name = strdup(f->name); + cfdata->name_ovrw = f->name_ovrw; + cfdata->category = f->category; + if (f->language) cfdata->language = strdup(f->language); + else cfdata->language = strdup(""); + cfdata->language_ovrw = f->language_ovrw; + if (f->description) cfdata->description = strdup(f->description); + else cfdata->description = strdup(""); + cfdata->description_ovrw = f->description_ovrw; + if (f->url_home) cfdata->url_home = strdup(f->url_home); + else cfdata->url_home = strdup(""); + cfdata->url_home_ovrw = f->url_home_ovrw; + cfdata->url_feed = strdup(f->url_feed); + if (f->icon) cfdata->icon = strdup(f->icon); + else + { + snprintf(buf, sizeof(buf), "%s/%s", + e_module_dir_get(news->module), NEWS_FEED_ITEM_FEED_ICON_DEFAULT); + cfdata->icon = strdup(buf); + } + cfdata->icon_ovrw = f->icon_ovrw; + cfdata->urgent = f->urgent; + } + else + { + cfdata->name = strdup(""); + cfdata->name_ovrw = NEWS_FEED_NAME_OVRW_DEFAULT; + cfdata->category = NULL; + cfdata->language = strdup(""); + cfdata->language_ovrw = NEWS_FEED_LANGUAGE_OVRW_DEFAULT; + cfdata->description = strdup(""); + cfdata->description_ovrw = NEWS_FEED_DESCRIPTION_OVRW_DEFAULT; + cfdata->url_home = strdup("http://"); + cfdata->url_home_ovrw = NEWS_FEED_URL_HOME_OVRW_DEFAULT; + cfdata->url_feed = strdup("http://"); + snprintf(buf, sizeof(buf), "%s/%s", + e_module_dir_get(news->module), NEWS_FEED_ITEM_FEED_ICON_DEFAULT); + cfdata->icon = strdup(buf); + cfdata->icon_ovrw = NEWS_FEED_ICON_OVRW_DEFAULT; + } +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o; + Evas_Object *of, *ob; + + cfdata->gui.in_advanced = 0; + + o = e_widget_table_add(evas, 0); + + _common_create_widgets(cfd, evas, cfdata, o); + + of = e_widget_framelist_add(evas, _("Category"), 0); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + cfdata->gui.ilist_categories = ob; + news_config_dialog_feed_refresh_categories(cfdata->feed); + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 0, 1, 1, 1, 1, 1, 1, 1); + + of = e_widget_framelist_add(evas, _("Language"), 0); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + e_widget_on_change_hook_set(ob, _cb_lang_change, cfdata); + cfdata->gui.ilist_langs = ob; + news_config_dialog_feed_refresh_langs(cfdata->feed); + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 1, 1, 1, 1, 1, 1, 1, 1); + + e_dialog_resizable_set(cfd->dia, 1); + + return o; +} + +static void +_common_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata, Evas_Object *o) +{ + Evas_Object *of, *ob; + + of = e_widget_frametable_add(evas, _("Icon"), 0); + + ob = e_widget_button_add(evas, "", NULL, + _icon_select, cfdata, NULL); + cfdata->gui.button_icon = ob; + if (cfdata->icon) + _icon_select_changed(cfdata); + e_widget_min_size_set(ob, 48, 48); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); + + ob = e_widget_check_add(evas, _("Get from the server"), &(cfdata->icon_ovrw)); + //TODO: NOT IMPLEMENTED YET + e_widget_check_checked_set(ob, 0); + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); + + e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 0); + + + of = e_widget_framelist_add(evas, _("Basic informations"), 0); + + ob = e_widget_label_add(evas, _("Name :")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_entry_add(evas, &(cfdata->name)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_label_add(evas, _("Feed url :")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_entry_add(evas, &(cfdata->url_feed)); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_check_add(evas, _("Mark as important feed"), &(cfdata->urgent)); + //TODO: NOT IMPLEMENTED YET + e_widget_disabled_set(ob, 1); + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 0); +} + +static Evas_Object * +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o; + Evas_Object *of, *ob; + + cfdata->gui.in_advanced = 1; + + o = e_widget_table_add(evas, 0); + + _common_create_widgets(cfd, evas, cfdata, o); + + + of = e_widget_framelist_add(evas, _("Advanced informations"), 0); + + ob = e_widget_label_add(evas, _("Description")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_entry_add(evas, &(cfdata->description)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_label_add(evas, _("Home url")); + e_widget_framelist_object_append(of, ob); + ob = e_widget_entry_add(evas, &(cfdata->url_home)); + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 0, 2, 2, 1, 1, 1, 1, 1); + + + of = e_widget_framelist_add(evas, _("Server informations"), 0); + + ob = e_widget_label_add(evas, _("Do allow the server to overwrite the informations you entered ?")); + e_widget_framelist_object_append(of, ob); + + ob = e_widget_check_add(evas, _("Name"), &(cfdata->name_ovrw)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Language"), &(cfdata->language_ovrw)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Description"), &(cfdata->description_ovrw)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Home url"), &(cfdata->url_home_ovrw)); + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 0, 4, 2, 1, 1, 1, 1, 1); + + return o; +} + +static int +_common_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + News_Feed *f; + + f = cfdata->feed; + if (f) + { + News_Feed_Category *old_cat; + + old_cat = f->category; + if ( news_feed_edit(f, + cfdata->name, cfdata->name_ovrw, + cfdata->language, cfdata->language_ovrw, + cfdata->description, cfdata->description_ovrw, + cfdata->url_home, cfdata->url_home_ovrw, + cfdata->url_feed, + cfdata->icon, cfdata->icon_ovrw, + cfdata->urgent, + cfdata->category, 0) ) + { + if (old_cat != cfdata->category) + { + old_cat->feeds = evas_list_remove(old_cat->feeds, f); + f->category->feeds = evas_list_prepend(f->category->feeds, f); + } + if (f->item && f->item->viewer) + news_viewer_refresh(f->item->viewer); + } + else + { + DD(("FAILED to edit feed ! icon %s", cfdata->icon)); + return 0; + } + } + else + { + News_Feed_Category *cat; + + cat = cfdata->category; + + f = news_feed_new(cfdata->name, cfdata->name_ovrw, + cfdata->language, cfdata->language_ovrw, + cfdata->description, cfdata->description_ovrw, + cfdata->url_home, cfdata->url_home_ovrw, + cfdata->url_feed, + cfdata->icon, cfdata->icon_ovrw, + cfdata->urgent, + cfdata->category); + if (!f) + { + DD(("FAILED to create feed !")); + return 0; + } + cat->feeds = evas_list_append(cat->feeds, f); + + cfdata->feed = f; + news->config_dialog_feed_new = NULL; + f->config_dialog = cfd; + } + + news_feed_lists_refresh(1); + + // TODO config dialog to attach to an item + + news_config_save(); + + return 1; +} + +static void +_cb_lang_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Lang *lang; + int pos; + + cfdata = data; + pos = e_widget_ilist_selected_get(cfdata->gui.ilist_langs); + lang = e_widget_ilist_nth_data_get(cfdata->gui.ilist_langs, pos); + + if (cfdata->language) free(cfdata->language); + cfdata->language = strdup(lang->key); +} + +static void +_cb_category_list(void *data) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + + cfdata->category = evas_list_nth(news->config->feed.categories, + e_widget_ilist_selected_get(cfdata->gui.ilist_categories)); +} + +static void +_icon_select(void *data1, void *data2) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_Data *cfdata; + E_Dialog *dia; + Evas_Object *o; + Evas_Coord mw, mh; + char *dir = NULL; + + cfdata = data1; + + if (cfdata->gui.icon_sel) return; + + if (cfdata->feed) cfd = cfdata->feed->config_dialog; + else cfd = news->config_dialog_feed_new; + + dia = e_dialog_new(cfd->con, "E", "_news_feed_icon_select_dialog"); + if (!dia) return; + e_dialog_title_set(dia, _("Select an Icon")); + dia->data = cfdata; + + if (cfdata->icon) + dir = ecore_file_get_dir(cfdata->icon); + + if (dir) + { + o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL, + _icon_select_cb, cfdata, + NULL, cfdata, 1); + free(dir); + } + else + { + o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, + _icon_select_cb, cfdata, + NULL, cfdata, 1); + } + evas_object_show(o); + cfdata->gui.icon_sel = o; + e_widget_min_size_get(o, &mw, &mh); + e_dialog_content_set(dia, o, mw, mh); + + /* buttons at the bottom */ + e_dialog_button_add(dia, _("OK"), NULL, _icon_select_ok, cfdata); + e_dialog_button_add(dia, _("Cancel"), NULL, _icon_select_cancel, cfdata); + e_dialog_resizable_set(dia, 1); + e_win_centered_set(dia->win, 1); + e_dialog_show(dia); + e_win_resize(dia->win, 475, 341); + cfdata->gui.icon_sel_dia = dia; +} + +static void +_icon_select_cb(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; +} + +static void +_icon_select_ok(void *data, E_Dialog *dia) +{ + E_Config_Dialog_Data *cfdata; + const char *file; + + cfdata = data; + file = e_widget_fsel_selection_path_get(cfdata->gui.icon_sel); + if (file) + { + if(cfdata->icon) free(cfdata->icon); + cfdata->icon = strdup(file); + + _icon_select_changed(cfdata); + } + + _icon_select_cancel(data, dia); +} + +static void +_icon_select_cancel(void *data, E_Dialog *dia) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + e_object_del(E_OBJECT(dia)); + cfdata->gui.icon_sel = NULL; + cfdata->gui.icon_sel_dia = NULL; +} + +static void +_icon_select_changed(void *data) +{ + E_Config_Dialog_Data *cfdata; + Evas_Object *ic; + + cfdata = data; + + if (!cfdata->icon) return; + + ic = e_icon_add(evas_object_evas_get(cfdata->gui.button_icon)); + e_icon_file_set(ic, cfdata->icon); + e_icon_fill_inside_set(ic, 1); + + if (cfdata->gui.icon) evas_object_del(cfdata->gui.icon); + + e_widget_button_icon_set(cfdata->gui.button_icon, ic); + cfdata->gui.icon = ic; +} diff --git a/src/module/news_config_dialog_feed.h b/src/module/news_config_dialog_feed.h new file mode 100644 index 0000000..fd3cf71 --- /dev/null +++ b/src/module/news_config_dialog_feed.h @@ -0,0 +1,17 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_FEED_H_INCLUDED +#define NEWS_CONFIG_DIALOG_FEED_H_INCLUDED + +int news_config_dialog_feed_show(News_Feed *feed); +void news_config_dialog_feed_hide(News_Feed *feed); + +void news_config_dialog_feed_refresh_categories(News_Feed *feed); +void news_config_dialog_feed_refresh_langs(News_Feed *feed); + +#endif +#endif diff --git a/src/module/news_config_dialog_feeds.c b/src/module/news_config_dialog_feeds.c new file mode 100644 index 0000000..592aeb2 --- /dev/null +++ b/src/module/news_config_dialog_feeds.c @@ -0,0 +1,760 @@ +#include "News.h" + +#define DIALOG_CLASS "_e_mod_news_config_dialog_feeds" + +struct _E_Config_Dialog_Data +{ + Evas_Object *ilist_feeds; + Evas_Object *ilist_categories; + Evas_Object *textblock_feed_infos; + News_Feed *selected_feed; + News_Feed_Category *selected_category; + Evas_Object *button_feed_del; + Evas_Object *button_feed_conf; + Evas_Object *button_cat_del; + Evas_Object *button_cat_conf; + Evas_Object *button_langs; + + E_Confirm_Dialog *cd; + + int langs_all; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +static void _cb_feed_up(void *data, void *data2); +static void _cb_feed_down(void *data, void *data2); + +static void _cb_feed_list(void *data); +static void _cb_feed_add(void *data, void *data2); +static void _cb_feed_del(void *data, void *data2); +static void _cb_feed_config(void *data, void *data2); + +static void _cb_category_up(void *data, void *data2); +static void _cb_category_down(void *data, void *data2); + +static void _cb_category_list(void *data); +static void _cb_category_add(void *data, void *data2); +static void _cb_category_del(void *data, void *data2); +static void _cb_category_config(void *data, void *data2); + +static void _cb_langs_all_change(void *data, Evas_Object *obj); +static void _cb_langs_config(void *data, void *data2); + +static void _cb_empty(void *data, void *data2); +static void _cb_empty_yes(void *data); +static void _cb_reset(void *data, void *data2); +static void _cb_reset_yes(void *data); +static void _cb_confirm_dialog_destroy(void *data); + +/* + * Public functions + */ + +int +news_config_dialog_feeds_show(void) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + if (e_config_dialog_find("E", DIALOG_CLASS)) + return 0; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Feeds Configuration"), + "E", DIALOG_CLASS, + news->theme, 0, v, NULL); + + if (news->config->feed.langs_notset) + { + news_config_dialog_langs_show(); + news->config->feed.langs_notset = 0; + news_config_save(); + } + + return 1; +} + +void +news_config_dialog_feeds_hide(void) +{ + e_object_del(E_OBJECT(news->config_dialog_feeds)); + news->config_dialog_feeds = NULL; +} + +void +news_config_dialog_feeds_refresh_feeds(void) +{ + E_Config_Dialog_Data *cfdata; + Evas_List *l, *lcat; + Evas_Object *ilist; + int pos, pos_to_select; + + if (!news->config_dialog_feeds) return; + cfdata = news->config_dialog_feeds->cfdata; + + ilist = cfdata->ilist_feeds; + e_widget_ilist_freeze(ilist); + + e_widget_ilist_clear(ilist); + if (cfdata->button_feed_del) + e_widget_disabled_set(cfdata->button_feed_del, 1); + if (cfdata->button_feed_conf) + e_widget_disabled_set(cfdata->button_feed_conf, 1); + + pos = -1; + pos_to_select = -1; + for (lcat=news->config->feed.categories; lcat; lcat=evas_list_next(lcat)) + { + News_Feed_Category *cat; + Evas_Object *iccat = NULL; + + cat = evas_list_data(lcat); + + if (!cat->feeds_visible) + continue; + + if (cat->icon) + { + iccat = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(iccat, cat->icon); + } + + e_widget_ilist_header_append(ilist, iccat, cat->name); + pos++; + + for (l=cat->feeds_visible; l; l=evas_list_next(l)) + { + Evas_Object *ic = NULL; + News_Feed *f; + char buf[1024]; + + f = evas_list_data(l); + + if (f->icon && f->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, f->icon); + } + + snprintf(buf, sizeof(buf), "%s", f->name); + // TODO : better display of each feed + + e_widget_ilist_append(ilist, ic, buf, _cb_feed_list, f, NULL); + pos++; + + if (cfdata->selected_feed == f) + pos_to_select = pos; + } + } + e_widget_ilist_go(ilist); + + /* select a feed */ + if (pos_to_select != -1) + { + e_widget_ilist_selected_set(ilist, pos_to_select); + _cb_feed_list(cfdata->selected_feed); + } + + /* ilist size */ + if (pos == -1) + e_widget_min_size_set(ilist, 165, 120); + else + { + int wmw, wmh; + e_widget_min_size_get(ilist, &wmw, &wmh); + e_widget_min_size_set(ilist, wmw, 180); + } + + e_widget_ilist_thaw(ilist); +} + +void +news_config_dialog_feeds_refresh_categories(void) +{ + E_Config_Dialog_Data *cfdata; + Evas_List *l; + Evas_Object *ilist; + int pos, pos_to_select; + + if (!news->config_dialog_feeds) return; + cfdata = news->config_dialog_feeds->cfdata; + + ilist = cfdata->ilist_categories; + e_widget_ilist_freeze(ilist); + + e_widget_ilist_clear(ilist); + if (cfdata->button_cat_del) + e_widget_disabled_set(cfdata->button_cat_del, 1); + if (cfdata->button_cat_conf) + e_widget_disabled_set(cfdata->button_cat_conf, 1); + + pos = -1; + pos_to_select = -1; + for (l=news->config->feed.categories; l; l=evas_list_next(l)) + { + Evas_Object *ic = NULL; + News_Feed_Category *fc; + char buf[1024]; + + fc = evas_list_data(l); + + if (fc->icon && fc->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, fc->icon); + } + + snprintf(buf, sizeof(buf), "%s", fc->name); + // TODO : better display of each category + + e_widget_ilist_append(ilist, ic, buf, _cb_category_list, fc, NULL); + pos++; + + if (cfdata->selected_category == fc) + pos_to_select = pos; + } + + if (pos_to_select != -1) + { + e_widget_ilist_selected_set(ilist, pos_to_select); + _cb_category_list(cfdata->selected_category); + } + + if (pos == -1) + e_widget_min_size_set(ilist, 165, 120); + else + { + int wmw, wmh; + e_widget_min_size_get(ilist, &wmw, &wmh); + e_widget_min_size_set(ilist, wmw, 120); + } + + e_widget_ilist_go(ilist); + e_widget_ilist_thaw(ilist); +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + + news->config_dialog_feeds = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + if (cfdata->cd) e_object_del(E_OBJECT(cfdata->cd)); + + news->config_dialog_feeds = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata) +{ + News_Config *c; + + c = news->config; + + cfdata->langs_all = c->feed.langs_all; +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o, *o2, *o3, *o4; + Evas_Object *of, *ob; + int wmw, wmh; + + o = e_widget_list_add(evas, 1, 1); + + o2 = e_widget_list_add(evas, 0, 0); + + of = e_widget_frametable_add(evas, _("Categories"), 0); + + cfdata->selected_category = NULL; + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + cfdata->ilist_categories = ob; + news_config_dialog_feeds_refresh_categories(); + e_widget_frametable_object_append(of, ob, 1, 0, 3, 4, 1, 1, 1, 1); + + if (!news->config->feed.sort_name) + { + ob = e_widget_button_add(evas, "", "widget/up_arrow", _cb_category_up, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 4, 1, 1, 1, 0, 0, 0, 0); + ob = e_widget_button_add(evas, "", "widget/down_arrow", _cb_category_down, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 4, 2, 1, 1, 0, 0, 0, 0); + } + + ob = e_widget_button_add(evas, _("Add"), NULL, _cb_category_add, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 1, 4, 1, 1, 1, 0, 1, 0); + ob = e_widget_button_add(evas, _("Delete"), NULL, _cb_category_del, cfdata, NULL); + e_widget_disabled_set(ob, 1); + cfdata->button_cat_del = ob; + e_widget_frametable_object_append(of, ob, 2, 4, 1, 1, 1, 0, 1, 0); + ob = e_widget_button_add(evas, _("Configure"), NULL, _cb_category_config, cfdata, NULL); + e_widget_disabled_set(ob, 1); + cfdata->button_cat_conf = ob; + e_widget_frametable_object_append(of, ob, 3, 4, 1, 1, 1, 0, 1, 0); + + e_widget_list_object_append(o2, of, 1, 1, 0.5); + + o3 = e_widget_list_add(evas, 0, 1); + + of = e_widget_framelist_add(evas, _("Languages"), 1); + + ob = e_widget_check_add(evas, _("All"), &(cfdata->langs_all)); + e_widget_on_change_hook_set(ob, _cb_langs_all_change, cfdata); + e_widget_framelist_object_append(of, ob); + ob = e_widget_button_add(evas, _("Select"), NULL, _cb_langs_config, cfdata, NULL); + if (cfdata->langs_all) + e_widget_disabled_set(ob, 1); + cfdata->button_langs = ob; + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o3, of, 1, 0, 0.5); + + o4 = e_widget_list_add(evas, 0, 0); + + ob = e_widget_button_add(evas, _("Empty the lists"), "enlightenment/e", _cb_empty, cfdata, NULL); + e_widget_list_object_append(o4, ob, 1, 0, 0.5); + + ob = e_widget_button_add(evas, _("Restore default lists"), "enlightenment/e", _cb_reset, cfdata, NULL); + e_widget_list_object_append(o4, ob, 1, 0, 0.5); + + e_widget_list_object_append(o3, o4, 1, 1, 0.5); + + e_widget_list_object_append(o2, o3, 0, 0, 0.5); + + e_widget_list_object_append(o, o2, 1, 1, 0.5); + + of = e_widget_frametable_add(evas, _("Feeds"), 0); + + ob = e_widget_textblock_add(evas); + cfdata->textblock_feed_infos = ob; + e_widget_min_size_get(ob, &wmw, &wmh); + e_widget_min_size_set(ob, wmw, 40); + e_widget_frametable_object_append(of, ob, 0, 0, 4, 1, 1, 1, 0, 0); + + cfdata->selected_feed = NULL; + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + cfdata->ilist_feeds = ob; + news_config_dialog_feeds_refresh_feeds(); + e_widget_frametable_object_append(of, ob, 0, 1, 3, 4, 1, 1, 1, 1); + + ob = e_widget_button_add(evas, _("Add"), NULL, _cb_feed_add, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0); + ob = e_widget_button_add(evas, _("Delete"), NULL, _cb_feed_del, cfdata, NULL); + e_widget_disabled_set(ob, 1); + cfdata->button_feed_del = ob; + e_widget_frametable_object_append(of, ob, 1, 5, 1, 1, 1, 0, 1, 0); + ob = e_widget_button_add(evas, _("Configure"), NULL, _cb_feed_config, cfdata, NULL); + e_widget_disabled_set(ob, 1); + cfdata->button_feed_conf = ob; + e_widget_frametable_object_append(of, ob, 2, 5, 1, 1, 1, 0, 1, 0); + + if (!news->config->feed.sort_name) + { + ob = e_widget_button_add(evas, "", "widget/up_arrow", _cb_feed_up, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 3, 2, 1, 1, 0, 0, 0, 0); + ob = e_widget_button_add(evas, "", "widget/down_arrow", _cb_feed_down, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 3, 3, 1, 1, 0, 0, 0, 0); + } + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + e_dialog_resizable_set(cfd->dia, 1); + + return o; +} + +static int +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + news_config_save(); + return 1; +} + +static void +_cb_feed_up(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + News_Feed *f, *f_prev; + Evas_List *l, *l_prev; + + if (news->config->feed.sort_name) return; + + cfdata = data; + + f = cfdata->selected_feed; + cat = f->category; + + l = evas_list_find_list(cat->feeds_visible, f); + l_prev = evas_list_prev(l); + f_prev = evas_list_data(l_prev); + if (!l_prev) return; + + cat->feeds = evas_list_remove(cat->feeds, f); + cat->feeds = evas_list_prepend_relative(cat->feeds, f, f_prev); + + news_feed_lists_refresh(0); +} + +static void +_cb_feed_down(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + News_Feed *f, *f_next; + Evas_List *l, *l_next; + + if (news->config->feed.sort_name) return; + + cfdata = data; + + f = cfdata->selected_feed; + cat = f->category; + + l = evas_list_find_list(cat->feeds, f); + l_next = evas_list_next(l); + f_next = evas_list_data(l_next); + if (!l_next) return; + + cat->feeds = evas_list_remove(cat->feeds, f); + cat->feeds = evas_list_append_relative(cat->feeds, f, f_next); + + news_feed_lists_refresh(0); +} + +static void +_cb_feed_list(void *data) +{ + E_Config_Dialog_Data *cfdata; + News_Feed *f; + char buf[4096]; + + f = data; + cfdata = news->config_dialog_feeds->cfdata; + + if (cfdata->button_feed_del) + e_widget_disabled_set(cfdata->button_feed_del, 0); + if (cfdata->button_feed_conf) + e_widget_disabled_set(cfdata->button_feed_conf, 0); + + cfdata->selected_feed = f; + + snprintf(buf, sizeof(buf), + "%s", + f->description ? f->description : "No description for the selected feed"); + + e_widget_textblock_markup_set(cfdata->textblock_feed_infos, buf); +} + +static void +_cb_feed_add(void *data, void *data2) +{ + if (news->config_dialog_feed_new) return; + + news_config_dialog_feed_show(NULL); +} + +static void +_cb_feed_del(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + News_Feed *f; + News_Viewer *nv = NULL; + int pos; + + cfdata = data; + f = cfdata->selected_feed; + if (!f) return; + if (f->item && f->item->viewer) + nv = f->item->viewer; + + cat = f->category; + cat->feeds = evas_list_remove(cat->feeds, f); + news_feed_free(f); + cfdata->selected_feed = NULL; + + pos = e_widget_ilist_selected_get(cfdata->ilist_feeds); + news_feed_lists_refresh(0); + /* trick to call the callback in selected_set */ + e_widget_ilist_selector_set(cfdata->ilist_feeds, 0); + e_widget_ilist_selected_set(cfdata->ilist_feeds, pos); + e_widget_ilist_selector_set(cfdata->ilist_feeds, 1); + if (nv) news_viewer_refresh(nv); + + news_config_save(); +} + +static void +_cb_feed_config(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed *f; + + cfdata = data; + f = cfdata->selected_feed; + if (!f) return; + if (f->config_dialog) return; + + news_config_dialog_feed_show(f); +} + +static void +_cb_category_up(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + Evas_List *l, *l_prev; + + if (news->config->feed.sort_name) return; + + cfdata = data; + + cat = cfdata->selected_category; + if (!cat) return; + l = evas_list_find_list(news->config->feed.categories, cat); + l_prev = evas_list_prev(l); + if (!l_prev) return; + + news->config->feed.categories = + evas_list_remove_list(news->config->feed.categories, l); + news->config->feed.categories = + evas_list_prepend_relative_list(news->config->feed.categories, cat, l_prev); + + news_feed_lists_refresh(0); +} + +static void +_cb_category_down(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *cat; + Evas_List *l, *l_next; + + if (news->config->feed.sort_name) return; + + cfdata = data; + + cat = cfdata->selected_category; + if (!cat) return; + l = evas_list_find_list(news->config->feed.categories, cat); + l_next = evas_list_next(l); + if (!l_next) return; + + news->config->feed.categories = + evas_list_remove_list(news->config->feed.categories, l); + news->config->feed.categories = + evas_list_append_relative_list(news->config->feed.categories, cat, l_next); + + news_feed_lists_refresh(0); +} + +static void +_cb_category_list(void *data) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *c; + const char *label; + int pos; + + c = data; + cfdata = news->config_dialog_feeds->cfdata; + + if (cfdata->button_cat_del) + e_widget_disabled_set(cfdata->button_cat_del, 0); + if (cfdata->button_cat_conf) + e_widget_disabled_set(cfdata->button_cat_conf, 0); + + cfdata->selected_category = c; + + /* select the first feed in this category */ + if (c->feeds_visible) + { + pos = 0; + while ((label = e_widget_ilist_nth_label_get(cfdata->ilist_feeds, pos))) + { + if (e_widget_ilist_nth_is_header(cfdata->ilist_feeds, pos)) + { + if (!strcmp(label, c->name)) + { + /* trick to call the callback in selected_set */ + e_widget_ilist_selector_set(cfdata->ilist_feeds, 0); + e_widget_ilist_selected_set(cfdata->ilist_feeds, pos+1); + e_widget_ilist_selector_set(cfdata->ilist_feeds, 1); + break; + } + } + pos++; + } + } +} + +static void +_cb_category_add(void *data, void *data2) +{ + if (news->config_dialog_category_new) return; + + news_config_dialog_category_show(NULL); +} + +static void +_cb_category_del(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *c; + int pos; + + cfdata = data; + c = cfdata->selected_category; + if (!c) return; + if (c->feeds && evas_list_count(c->feeds)) + { + news_util_message_error_show(_("There are feeds in this category.
" + "You have to remove them first")); + return; + } + + news_feed_category_free(c); + news->config->feed.categories = evas_list_remove(news->config->feed.categories, c); + cfdata->selected_category = NULL; + + pos = e_widget_ilist_selected_get(cfdata->ilist_categories); + news_feed_lists_refresh(1); + /* trick to call the callback in selected_set */ + e_widget_ilist_selector_set(cfdata->ilist_categories, 0); + e_widget_ilist_selected_set(cfdata->ilist_categories, pos); + e_widget_ilist_selector_set(cfdata->ilist_categories, 1); + + news_config_save(); +} + +static void +_cb_category_config(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Category *c; + + cfdata = data; + c = cfdata->selected_category; + if (!c) return; + if (c->config_dialog) return; + + news_config_dialog_category_show(c); +} + +static void +_cb_langs_all_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + news->config->feed.langs_all = cfdata->langs_all; + + if (news->config->feed.langs_all) + e_widget_disabled_set(cfdata->button_langs, 1); + else + e_widget_disabled_set(cfdata->button_langs, 0); + + /* refreshes ! */ + news_feed_lang_list_refresh(); + news_feed_lists_refresh(0); +} + +static void +_cb_langs_config(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + news_config_dialog_langs_show(); +} + +static void +_cb_empty(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + E_Confirm_Dialog *cd = NULL; + + cfdata = data; + if (cfdata->cd) return; + cd = e_confirm_dialog_show(_("News Module - Are you sure ?"), "enlightenment/e", + "Empty the lists
" + "It will delete all the categories and feeds

" + "Confirm ?", + NULL, NULL, _cb_empty_yes, NULL, NULL, NULL, + _cb_confirm_dialog_destroy, cfdata); + if (!cd) return; + cfdata->cd = cd; +} + +static void +_cb_empty_yes(void *data) +{ + news_feed_all_delete(); + news_viewer_all_refresh(0, 0); +} + +static void +_cb_reset(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + E_Confirm_Dialog *cd = NULL; + + cfdata = data; + if (cfdata->cd) return; + cd = e_confirm_dialog_show(_("News Module - Are you sure ?"), "enlightenment/e", + "Restore default lists
" + "It will delete all the categories and feeds,
" + "and restore the default ones

" + "Confirm ?", + NULL, NULL, _cb_reset_yes, NULL, NULL, NULL, + _cb_confirm_dialog_destroy, cfdata); + if (!cd) return; + cfdata->cd = cd; +} + +static void +_cb_reset_yes(void *data) +{ + news_feed_all_restore(); + news_viewer_all_refresh(0, 0); +} + +static void +_cb_confirm_dialog_destroy(void *data) +{ + E_Config_Dialog_Data *cfdata; + + cfdata = data; + cfdata->cd = NULL; +} diff --git a/src/module/news_config_dialog_feeds.h b/src/module/news_config_dialog_feeds.h new file mode 100644 index 0000000..386da99 --- /dev/null +++ b/src/module/news_config_dialog_feeds.h @@ -0,0 +1,17 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_FEEDS_H_INCLUDED +#define NEWS_CONFIG_DIALOG_FEEDS_H_INCLUDED + +int news_config_dialog_feeds_show(void); +void news_config_dialog_feeds_hide(void); + +void news_config_dialog_feeds_refresh_feeds(void); +void news_config_dialog_feeds_refresh_categories(void); + +#endif +#endif diff --git a/src/module/news_config_dialog_item.c b/src/module/news_config_dialog_item.c new file mode 100644 index 0000000..0f3efc8 --- /dev/null +++ b/src/module/news_config_dialog_item.c @@ -0,0 +1,177 @@ +#include "News.h" + +#define DIALOG_CLASS "_e_mod_news_config_dialog_item" + +struct _E_Config_Dialog_Data +{ + int view_mode; + int openmethod; + int browser_open_home; + + int apply_to_all; + + News_Item *ni; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata, News_Item *pi); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +/* + * Public functions + */ + +int +news_config_dialog_item_show(News_Item *ni) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Gadget Configuration"), + "E", DIALOG_CLASS, + news->theme, 0, v, ni); + + return 1; +} + +void +news_config_dialog_item_hide(News_Item *ni) +{ + e_object_del(E_OBJECT(ni->config_dialog)); + ni->config_dialog = NULL; +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + News_Item *ni; + + ni = cfd->data; + + ni->config_dialog = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata, ni); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + cfdata->ni->config_dialog = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata, News_Item *ni) +{ + News_Config_Item *nic; + + nic = ni->config; + cfdata->ni = ni; + cfdata->view_mode = nic->view_mode; + cfdata->openmethod = nic->openmethod; + cfdata->browser_open_home = nic->browser_open_home; + cfdata->apply_to_all = nic->apply_to_all; +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o; + Evas_Object *of, *ob; + E_Radio_Group *rg; + + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("View Mode"), 0); + + rg = e_widget_radio_group_new(&(cfdata->view_mode)); + ob = e_widget_radio_add(evas, _("Show one icon for all feeds"), NEWS_ITEM_VIEW_MODE_ONE, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Show each feed"), NEWS_ITEM_VIEW_MODE_FEED, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("Show unread feeds only"), NEWS_ITEM_VIEW_MODE_FEED_UNREAD, rg); + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o, of, 1, 1, 0.0); + + of = e_widget_framelist_add(evas, _("Feed open in"), 0); + + rg = e_widget_radio_group_new(&(cfdata->openmethod)); + ob = e_widget_radio_add(evas, _("the feed viewer"), NEWS_ITEM_OPENMETHOD_VIEWER, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _("my favorite browser"), NEWS_ITEM_OPENMETHOD_BROWSER, rg); + e_widget_framelist_object_append(of, ob); + ob = e_widget_check_add(evas, _("Browser opens home url"), &(cfdata->browser_open_home)); + e_widget_framelist_object_append(of, ob); + ob = e_widget_label_add(evas, _("instead of feed url")); + e_widget_framelist_object_append(of, ob); + + e_widget_list_object_append(o, of, 1, 1, 0.0); + + ob = e_widget_label_add(evas, _("")); + e_widget_list_object_append(o, ob, 1, 1, 0.0); + ob = e_widget_check_add(evas, _("Apply this to all News gadgets"), &(cfdata->apply_to_all)); + e_widget_list_object_append(o, ob, 1, 1, 0.0); + + return o; +} + +static int +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + News_Config_Item *nic, *nic2; + News_Item *ni, *ni2; + Evas_List *l; + + ni = cfdata->ni; + nic = ni->config; + + if (!cfdata->apply_to_all) + { + nic->openmethod = cfdata->openmethod; + nic->browser_open_home = cfdata->browser_open_home; + if (nic->view_mode != cfdata->view_mode) + { + nic->view_mode = cfdata->view_mode; + news_item_refresh(ni, 1, 0, 1); + } + } + else + { + for (l=news->items; l; l=evas_list_next(l)) + { + ni2 = l->data; + nic2 = ni2->config; + nic2->openmethod = cfdata->openmethod; + nic2->browser_open_home = cfdata->browser_open_home; + if (nic2->view_mode != cfdata->view_mode) + { + nic2->view_mode = cfdata->view_mode; + news_item_refresh(ni2, 1, 0, 1); + } + } + } + nic->apply_to_all = cfdata->apply_to_all; + + news_config_save(); + return 1; +} diff --git a/src/module/news_config_dialog_item.h b/src/module/news_config_dialog_item.h new file mode 100644 index 0000000..3450937 --- /dev/null +++ b/src/module/news_config_dialog_item.h @@ -0,0 +1,14 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_ITEM_H_INCLUDED +#define NEWS_CONFIG_DIALOG_ITEM_H_INCLUDED + +int news_config_dialog_item_show(News_Item *ni); +void news_config_dialog_item_hide(News_Item *ni); + +#endif +#endif diff --git a/src/module/news_config_dialog_item_content.c b/src/module/news_config_dialog_item_content.c new file mode 100644 index 0000000..f3615b3 --- /dev/null +++ b/src/module/news_config_dialog_item_content.c @@ -0,0 +1,490 @@ +#include "News.h" + +#define DIALOG_CLASS "_e_mod_news_config_dialog_item_content" + +struct _E_Config_Dialog_Data +{ + Evas_Object *ilist_feeds; + Evas_List *ilist_feeds_sel; + Evas_Object *ilist_selected_feeds; + Evas_List *ilist_selected_feeds_sel; + int ilist_selected_feeds_inrefresh; + Evas_Object *button_add; + Evas_Object *button_rem; + + News_Item *ni; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata, News_Item *pi); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); + +static void _cb_feed_up(void *data, void *data2); +static void _cb_feed_down(void *data, void *data2); + +static void _cb_feed_add(void *data, void *data2); +static void _cb_feed_remove(void *data, void *data2); + +static void _cb_feed_change(void *data, Evas_Object *obj); +static void _cb_selected_feed_change(void *data, Evas_Object *obj); + +/* + * Public functions + */ + +int +news_config_dialog_item_content_show(News_Item *ni) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Gadget Content Configuration"), + "E", DIALOG_CLASS, + news->theme, 0, v, ni); + + if (news->config->feed.langs_notset) + { + news_config_dialog_langs_show(); + news->config->feed.langs_notset = 0; + news_config_save(); + } + + return 1; +} + +void +news_config_dialog_item_content_hide(News_Item *ni) +{ + e_object_del(E_OBJECT(ni->config_dialog_content)); + ni->config_dialog_content = NULL; +} + +void +news_config_dialog_item_content_refresh_feeds(News_Item *ni) +{ + E_Config_Dialog_Data *cfdata; + Evas_List *l, *l2; + Evas_Object *ilist; + int pos; + int iw, ih; + + if (!ni->config_dialog_content) return; + cfdata = ni->config_dialog_content->cfdata; + + ilist = cfdata->ilist_feeds; + e_widget_ilist_freeze(ilist); + /* disable the callback until we finish to refresh the list */ + e_widget_on_change_hook_set(ilist, NULL, NULL); + + e_widget_ilist_clear(ilist); + if (cfdata->button_add) + e_widget_disabled_set(cfdata->button_add, 1); + + pos = -1; + for(l=news->config->feed.categories; l; l=evas_list_next(l)) + { + News_Feed_Category *cat; + Evas_Object *iccat = NULL; + + cat = evas_list_data(l); + + if (!cat->feeds_visible) + continue; + + if (cat->icon) + { + iccat = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(iccat, cat->icon); + } + + e_widget_ilist_header_append(ilist, iccat, cat->name); + pos++; + + for(l2=cat->feeds_visible; l2; l2=evas_list_next(l2)) + { + Evas_Object *ic = NULL; + News_Feed *f; + char buf[1024]; + + f = evas_list_data(l2); + + if (f->icon && f->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, f->icon); + } + + snprintf(buf, sizeof(buf), "%s", f->name); + // TODO : better display of each feed + + e_widget_ilist_append(ilist, ic, buf, NULL, f, NULL); + pos++; + + if (evas_list_find(cfdata->ilist_feeds_sel, f)) + e_widget_ilist_multi_select(ilist, pos); + } + } + + e_widget_min_size_get(ilist, &iw, &ih); + if (iw < 200) iw = 200; + e_widget_min_size_set(ilist, iw, 250); + + e_widget_ilist_go(ilist); + _cb_feed_change(cfdata, NULL); + e_widget_ilist_thaw(ilist); + /* restore the callback */ + e_widget_on_change_hook_set(ilist, _cb_feed_change, cfdata); +} + +void +news_config_dialog_item_content_refresh_selected_feeds(News_Item *ni) +{ + E_Config_Dialog_Data *cfdata; + Evas_Object *ilist; + int pos, iw, ih; + + if (!ni->config_dialog_content) return; + cfdata = ni->config_dialog_content->cfdata; + + ilist = cfdata->ilist_selected_feeds; + e_widget_ilist_freeze(ilist); + /* disable the callback until we finish to refresh the list */ + e_widget_on_change_hook_set(ilist, NULL, NULL); + + e_widget_ilist_clear(ilist); + if (cfdata->button_rem) + e_widget_disabled_set(cfdata->button_rem, 1); + + cfdata->ilist_selected_feeds_inrefresh = 1; + pos = -1; + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + { + Evas_Object *ic = NULL; + char buf[1024]; + + if (_feed->icon && _feed->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, _feed->icon); + } + + snprintf(buf, sizeof(buf), "%s", _feed->name); + // TODO : better display of each feed + + e_widget_ilist_append(ilist, ic, buf, NULL, _feed, NULL); + pos++; + + if (evas_list_find(cfdata->ilist_selected_feeds_sel, _feed)) + e_widget_ilist_multi_select(ilist, pos); + } + NEWS_ITEM_FEEDS_FOREACH_END(); + cfdata->ilist_selected_feeds_inrefresh = 0; + + e_widget_min_size_get(ilist, &iw, &ih); + if (iw < 200) iw = 200; + e_widget_min_size_set(ilist, iw, 250); + + e_widget_ilist_go(ilist); + _cb_selected_feed_change(cfdata, NULL); + e_widget_ilist_thaw(ilist); + /* restore the callback */ + e_widget_on_change_hook_set(ilist, _cb_selected_feed_change, cfdata); +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + News_Item *ni; + + ni = cfd->data; + + ni->config_dialog_content = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata, ni); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + if (cfdata->ilist_feeds_sel) + evas_list_free(cfdata->ilist_feeds_sel); + if (cfdata->ilist_selected_feeds_sel) + evas_list_free(cfdata->ilist_selected_feeds_sel); + + cfdata->ni->config_dialog_content = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata, News_Item *ni) +{ + News_Config_Item *nic; + + nic = ni->config; + cfdata->ni = ni; +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *o; + Evas_Object *of, *ob; + + o = e_widget_list_add(evas, 0, 1); + + of = e_widget_frametable_add(evas, _("Avalaible Feeds"), 0); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_multi_select_set(ob, 1); + cfdata->ilist_feeds = ob; + news_config_dialog_item_content_refresh_feeds(cfdata->ni); + e_widget_on_change_hook_set(ob, _cb_feed_change, cfdata); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); + + ob = e_widget_button_add(evas, _("Add this Feed"), NULL, _cb_feed_add, cfdata, NULL); + e_widget_disabled_set(ob, 1); + cfdata->button_add = ob; + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 0); + + e_widget_list_object_append(o, of, 1, 1, 0.0); + + of = e_widget_frametable_add(evas, _("Selected Feeds"), 0); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_multi_select_set(ob, 1); + cfdata->ilist_selected_feeds = ob; + news_config_dialog_item_content_refresh_selected_feeds(cfdata->ni); + e_widget_on_change_hook_set(ob, _cb_selected_feed_change, cfdata); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 4, 1, 1, 1, 1); + + ob = e_widget_button_add(evas, "", "widget/up_arrow", _cb_feed_up, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 0, 0, 0, 0); + ob = e_widget_button_add(evas, "", "widget/down_arrow", _cb_feed_down, cfdata, NULL); + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 0, 0, 0, 0); + + ob = e_widget_button_add(evas, _("Remove this Feed"), NULL, _cb_feed_remove, cfdata, NULL); + cfdata->button_rem = ob; + e_widget_disabled_set(ob, 1); + e_widget_frametable_object_append(of, ob, 0, 5, 1, 4, 1, 1, 1, 0); + + e_widget_list_object_append(o, of, 1, 1, 1.0); + + e_dialog_resizable_set(cfd->dia, 1); + + return o; +} + +static int +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + news_config_save(); + return 1; +} + +static void +_cb_feed_up(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed *f; + News_Item *ni; + News_Feed_Ref *ref; + Evas_List *sel, *l, *lf; + + cfdata = data; + ni = cfdata->ni; + + for (sel = cfdata->ilist_selected_feeds_sel; sel; sel=evas_list_next(sel)) + { + f = sel->data; + ref = news_feed_ref_find(f, ni); + if (!ref) return; + + l = evas_list_find_list(ni->config->feed_refs, ref); + lf = evas_list_prev(l); + if (!lf) return; + + ni->config->feed_refs = evas_list_remove_list(ni->config->feed_refs, l); + ni->config->feed_refs = evas_list_prepend_relative_list(ni->config->feed_refs, + ref, lf); + } + + news_item_refresh(ni, 1, 0, 0); + news_config_dialog_item_content_refresh_selected_feeds(ni); +} + +static void +_cb_feed_down(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Feed *f; + News_Item *ni; + News_Feed_Ref *ref; + Evas_List *sel, *l, *lf; + + cfdata = data; + ni = cfdata->ni; + + for (sel=evas_list_last(cfdata->ilist_selected_feeds_sel); sel; sel=evas_list_prev(sel)) + { + f = sel->data; + ref = news_feed_ref_find(f, ni); + if (!ref) return; + + l = evas_list_find_list(ni->config->feed_refs, ref); + lf = evas_list_next(l); + if (!lf) return; + + ni->config->feed_refs = evas_list_remove_list(ni->config->feed_refs, l); + ni->config->feed_refs = evas_list_append_relative_list(ni->config->feed_refs, + ref, lf); + } + + news_item_refresh(ni, 1, 0, 0); + news_config_dialog_item_content_refresh_selected_feeds(ni); +} + +static void +_cb_feed_add(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Item *ni; + News_Feed *f; + Evas_List *l; + + cfdata = data; + ni = cfdata->ni; + + for (l=cfdata->ilist_feeds_sel; l; l=evas_list_next(l)) + { + f = l->data; + if (f->item) continue; + + if (news_feed_attach(f, NULL, ni)) + news_feed_obj_refresh(f, 1, 1); + + /* dont reselect this feed */ + cfdata->ilist_feeds_sel = evas_list_remove(cfdata->ilist_feeds_sel, f); + } + + news_item_refresh(ni, 1, 0, 0); + news_feed_list_ui_refresh(); + news_viewer_refresh(ni->viewer); + + news_config_save(); +} + +static void +_cb_feed_remove(void *data, void *data2) +{ + E_Config_Dialog_Data *cfdata; + News_Item *ni; + News_Feed *f; + Evas_List *l; + + cfdata = data; + ni = cfdata->ni; + + for (l=cfdata->ilist_selected_feeds_sel; l; l=evas_list_next(l)) + { + f = l->data; + news_feed_detach(f, 1); + } + + news_item_refresh(ni, 1, 0, 0); + news_config_dialog_item_content_refresh_selected_feeds(ni); + news_viewer_refresh(ni->viewer); + + news_config_save(); +} + +static void +_cb_feed_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + E_Ilist_Item *item; + News_Feed *feed; + Evas_List *sel, *items, *l; + int i; + + cfdata = data; + + if (cfdata->ilist_feeds_sel) evas_list_free(cfdata->ilist_feeds_sel); + sel = NULL; + items = e_widget_ilist_items_get(cfdata->ilist_feeds); + for (l=items, i=0; l; l=evas_list_next(l), i++) + { + item = l->data; + if (item->header) continue; + if (!item->selected) continue; + feed = e_widget_ilist_nth_data_get(cfdata->ilist_feeds, i); + sel = evas_list_append(sel, feed); + } + cfdata->ilist_feeds_sel = sel; + + if (e_widget_ilist_selected_get(cfdata->ilist_feeds) >= 0) + { + if (cfdata->button_add) + e_widget_disabled_set(cfdata->button_add, 0); + } + else + { + if (cfdata->button_add) + e_widget_disabled_set(cfdata->button_add, 1); + } +} + +static void +_cb_selected_feed_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + E_Ilist_Item *item; + News_Feed *feed; + Evas_List *sel, *items, *l; + int i; + + cfdata = data; + if (cfdata->ilist_selected_feeds_inrefresh) return; + + if (cfdata->ilist_selected_feeds_sel) evas_list_free(cfdata->ilist_selected_feeds_sel); + sel = NULL; + items = e_widget_ilist_items_get(cfdata->ilist_selected_feeds); + for (l=items, i=0; l; l=evas_list_next(l), i++) + { + item = l->data; + if (item->header) continue; + if (!item->selected) continue; + feed = e_widget_ilist_nth_data_get(cfdata->ilist_selected_feeds, i); + sel = evas_list_append(sel, feed); + } + cfdata->ilist_selected_feeds_sel = sel; + + if (e_widget_ilist_selected_get(cfdata->ilist_selected_feeds) >= 0) + { + if (cfdata->button_rem) + e_widget_disabled_set(cfdata->button_rem, 0); + } + else + { + if (cfdata->button_rem) + e_widget_disabled_set(cfdata->button_rem, 1); + } +} diff --git a/src/module/news_config_dialog_item_content.h b/src/module/news_config_dialog_item_content.h new file mode 100644 index 0000000..bc4e7b6 --- /dev/null +++ b/src/module/news_config_dialog_item_content.h @@ -0,0 +1,17 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_ITEM_CONTENT_H_INCLUDED +#define NEWS_CONFIG_DIALOG_ITEM_CONTENT_H_INCLUDED + +int news_config_dialog_item_content_show(News_Item *ni); +void news_config_dialog_item_content_hide(News_Item *ni); + +void news_config_dialog_item_content_refresh_feeds(News_Item *ni); +void news_config_dialog_item_content_refresh_selected_feeds(News_Item *ni); + +#endif +#endif diff --git a/src/module/news_config_dialog_langs.c b/src/module/news_config_dialog_langs.c new file mode 100644 index 0000000..1808d37 --- /dev/null +++ b/src/module/news_config_dialog_langs.c @@ -0,0 +1,194 @@ +#include "News.h" + +struct _Lang_Choice +{ + News_Feed_Lang *lang; + Evas_Object *check; + int ok; +}; + +typedef struct _Lang_Choice Lang_Choice; + +struct _E_Config_Dialog_Data +{ + Evas_List *choices; +}; + +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static void _cb_lang_change(void *data, Evas_Object *obj); + +/* + * Public functions + */ + +int +news_config_dialog_langs_show(void) +{ + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), + _("News Feeds Language Configuration"), + "E", "_e_mod_news_config_dialog_langs", + news->theme, 0, v, NULL); + return 1; +} + +void +news_config_dialog_langs_hide() +{ + e_object_del(E_OBJECT(news->config_dialog_langs)); + news->config_dialog_langs = NULL; +} + +/* + * Private functions + * + */ + +static void * +_create_data(E_Config_Dialog *cfd) +{ + E_Config_Dialog_Data *cfdata; + + news->config_dialog_langs = cfd; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); + _fill_data(cfdata); + cfd->cfdata = cfdata; + return cfdata; +} + +static void +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +{ + Lang_Choice *ch; + + while ((ch = evas_list_data(cfdata->choices))) + { + free(ch); + cfdata->choices = evas_list_remove_list(cfdata->choices, cfdata->choices); + } + + news->config_dialog_langs = NULL; + free(cfdata); +} + +static void +_fill_data(E_Config_Dialog_Data *cfdata) +{ + News_Feed_Lang *lang; + Lang_Choice *choice; + Evas_List *l; + + for (l=news->langs; l; l=evas_list_next(l)) + { + lang = l->data; + choice = E_NEW(Lang_Choice, 1); + choice->lang = lang; + choice->ok = news_feed_lang_selected_is(lang->key); + cfdata->choices = evas_list_append(cfdata->choices, choice); + } +} + +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +{ + Evas_Object *ol, *of, *o; + Evas_Object *ob; + Lang_Choice *choice; + Evas_List *l; + char buf[4096]; + int line; + int count; + + o = e_widget_list_add(evas, 0, 0); + + if (news->config->feed.langs_notset) + { + ob = e_widget_label_add(evas, _("Welcome to News Module !")); + e_widget_list_object_append(o, ob, 1, 1, 0.5); + ob = e_widget_label_add(evas, _("Please select the languages that you are able to read")); + e_widget_list_object_append(o, ob, 1, 1, 0.0); + ob = e_widget_label_add(evas, _("")); + e_widget_list_object_append(o, ob, 1, 1, 0.0); + } + + l = cfdata->choices; + line = 0; + of = e_widget_framelist_add(evas, _("Languages"), 1); + ol = e_widget_list_add(evas, 0, 0); + for (l=cfdata->choices; l; l=evas_list_next(l)) + { + choice = l->data; + + count = 0; + + NEWS_FEED_FOREACH_BEG(); + if (!strncmp(_feed->language, choice->lang->key, 2)) + count++; + NEWS_FEED_FOREACH_END(); + + if (count) + snprintf(buf, sizeof(buf), "%s (%d)", choice->lang->name, count); + else + snprintf(buf, sizeof(buf), "%s", choice->lang->name); + ob = e_widget_check_add(evas, buf, &(choice->ok)); + e_widget_on_change_hook_set(ob, _cb_lang_change, cfdata); + e_widget_list_object_append(ol, ob, 1, 1, 0.0); + + line++; + if (line > 10) + { + e_widget_framelist_object_append(of, ol); + ol = e_widget_list_add(evas, 0, 0); + line = 0; + } + } + e_widget_framelist_object_append(of, ol); + + e_widget_list_object_append(o, of, 1, 1, 0.0); + + return o; +} + +static void +_cb_lang_change(void *data, Evas_Object *obj) +{ + E_Config_Dialog_Data *cfdata; + News_Feed_Lang *lang; + Lang_Choice *choice; + Evas_List *list, *l; + + cfdata = data; + + news_feed_lang_list_free(news->config->feed.langs); + list = NULL; + for (l=cfdata->choices; l; l=evas_list_next(l)) + { + choice = l->data; + if (choice->ok) + { + lang = E_NEW(News_Feed_Lang, 1); + lang->key = evas_stringshare_add(choice->lang->key); + lang->name = evas_stringshare_add(choice->lang->name); + list = evas_list_append(list, lang); + } + } + news->config->feed.langs = list; + + /* refreshes ! */ + news_feed_lang_list_refresh(); + news_feed_lists_refresh(0); + + news_config_save(); +} diff --git a/src/module/news_config_dialog_langs.h b/src/module/news_config_dialog_langs.h new file mode 100644 index 0000000..cc4cf6f --- /dev/null +++ b/src/module/news_config_dialog_langs.h @@ -0,0 +1,14 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_CONFIG_DIALOG_LANGS_H_INCLUDED +#define NEWS_CONFIG_DIALOG_LANGS_H_INCLUDED + +int news_config_dialog_langs_show(void); +void news_config_dialog_langs_hide(void); + +#endif +#endif diff --git a/src/module/news_feed.c b/src/module/news_feed.c new file mode 100644 index 0000000..00b47bc --- /dev/null +++ b/src/module/news_feed.c @@ -0,0 +1,1373 @@ +#include "News.h" + +#define CFG_CAT_ADD(id, icon) \ + { \ + snprintf(buf, sizeof(buf), "%s/%s", \ + e_module_dir_get(news->module), icon); \ + cat = news_feed_category_new(id, buf); \ + c->feed.categories = evas_list_append(c->feed.categories, cat); \ + } +#define CFG_FEED_ADD(id, icon) \ + { \ + snprintf(buf, sizeof(buf), "%s/%s", \ + e_module_dir_get(news->module), icon); \ + feed = news_feed_new(id, buf, 1, 0, cat); \ + cat->feeds = evas_list_append(cat->feeds, feed); \ + } + +static int _feed_activate(News_Feed *f); +static void _feed_deactivate(News_Feed *f); +static News_Feed *_feed_find(News_Feed_Category *cat, char *name); +static News_Feed_Category *_feed_category_find(char *name); +static char *_get_host_from_url(const char *url); +static char *_get_file_from_url(const char *url); +static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _cb_feed_open(void *data, Evas_Object *obj, const char *emission, const char *source); +static int _cb_feed_server_add(void *data, int type, void *event); +static int _cb_feed_server_del(void *data, int type, void *event); +static int _cb_feed_server_data(void *data, int type, void *event); +static void _cb_feed_parse(News_Feed_Document *doc, News_Parse_Error error, int changes); +static int _cb_feeds_timer(void *data); +static int _cb_sort_cats(void *d1, void *d2); +static int _cb_sort_feeds(void *d1, void *d2); + +static const News_Feed_Lang _feed_langs[] = { + {"ca", "Catalan"}, + {"zh", "Chinese"}, + {"cs", "Czech"}, + {"nl", "Dutch"}, + {"da", "Danish"}, + {"de", "German"}, + {"en", "English"}, + {"fi", "Finnish"}, + {"fr", "French"}, + {"hu", "Hungarian"}, + {"it", "Italian"}, + {"ja", "Japanese"}, + {"ko", "Korean"}, + {"pl", "Polish"}, + {"pt", "Portuguese"}, + {"ru", "Russian"}, + {"sk", "Slovak"}, + {"sl", "Slovenian"}, + {"es", "Spanish"}, + {"sv", "Swedish"}, + {NULL, NULL} +}; + +/* + * Public functions + */ + +int +news_feed_init(void) +{ + News_Feed_Lang *lang; + Evas_List *l; + int i; + + /* create dynamic languages list from static one + we create thislist so its accessible from everywhere */ + l = NULL; + i = 0; + while (_feed_langs[i].key) + { + lang = E_NEW(News_Feed_Lang, 1); + lang->key = evas_stringshare_add(_feed_langs[i].key); + lang->name = evas_stringshare_add(_feed_langs[i].name); + l = evas_list_append(l, lang); + i++; + } + news->langs = l; + + /* validate each feed (+ create host and file strings + attach to category) */ + NEWS_FEED_FOREACH_BEG(); + if (!news_feed_edit(_feed, + (char *)_feed->name, _feed->name_ovrw, + (char *)_feed->language, _feed->language_ovrw, + (char *)_feed->description, _feed->description_ovrw, + (char *)_feed->url_home, _feed->url_home_ovrw, + (char *)_feed->url_feed, + (char *)_feed->icon, _feed->icon_ovrw, + _feed->urgent, + _cat, 1)) + _cat->feeds = evas_list_remove_list(_cat->feeds, _l_cats); + NEWS_FEED_FOREACH_END(); + + /* create 'feeds_visible' lists in categories */ + news_feed_lists_refresh(0); + + /* set the update timer */ + news_feed_timer_set(news->config->feed.timer_m); + + return 1; +} + +void +news_feed_shutdown(void) +{ + /* destroy dynamic languages list */ + news_feed_lang_list_free(news->langs); + + /* delete the update timer */ + news_feed_timer_set(0); +} + +void +news_feed_all_delete(void) +{ + News_Config *c; + News_Feed *f; + News_Feed_Category *cat; + + c = news->config; + while (c->feed.categories) + { + cat = c->feed.categories->data; + while (cat->feeds) + { + f = cat->feeds->data; + cat->feeds = evas_list_remove_list(cat->feeds, cat->feeds); + news_feed_free(f); + } + c->feed.categories = evas_list_remove_list(c->feed.categories, + c->feed.categories); + news_feed_category_free(cat); + } + + news_feed_lists_refresh(0); +} + +void +news_feed_all_restore(void) +{ + News_Config *c; + News_Feed_Category *cat; + News_Feed *feed; + char buf[4096]; + + c = news->config; + news_feed_all_delete(); + + /* FEED_ADD uses the cat created by CAT_ADD */ + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_COMICS, NEWS_FEED_ITEM_CAT_ICON_COMICS ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_BOULETCORP, NEWS_FEED_ITEM_FEED_ICON_BOULETCORP ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_COMPUTERS, NEWS_FEED_ITEM_CAT_ICON_COMPUTERS ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_FRESHMEAT, NEWS_FEED_ITEM_FEED_ICON_FRESHMEAT ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_OSNEWS, NEWS_FEED_ITEM_FEED_ICON_OSNEWS ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_ENLIGHTENMENT, NEWS_FEED_ITEM_CAT_ICON_ENLIGHTENMENT ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_E_CVS, NEWS_FEED_ITEM_FEED_ICON_E_CVS ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_E_FR, NEWS_FEED_ITEM_FEED_ICON_E_FR ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_NEWS, NEWS_FEED_ITEM_FEED_ICON_NEWS ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_NEWS, NEWS_FEED_ITEM_CAT_ICON_NEWS ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_AFP_EN, NEWS_FEED_ITEM_FEED_ICON_AFP_EN ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_BBC_WORLD, NEWS_FEED_ITEM_FEED_ICON_BBC_WORLD ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_CNN, NEWS_FEED_ITEM_FEED_ICON_CNN ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_COURRIERINTERNATIONAL, NEWS_FEED_ITEM_FEED_ICON_COURRIERINTERNATIONAL ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_GOOGLE, NEWS_FEED_ITEM_FEED_ICON_GOOGLE ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_GOOGLE_FR, NEWS_FEED_ITEM_FEED_ICON_GOOGLE_FR ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_LEMONDE_UNE, NEWS_FEED_ITEM_FEED_ICON_LEMONDE ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_SCIENCES, NEWS_FEED_ITEM_CAT_ICON_SCIENCES ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_FUTURASCIENCES, NEWS_FEED_ITEM_FEED_ICON_FUTURASCIENCES ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_TEST, NEWS_FEED_ITEM_CAT_ICON_TEST ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_TEST, NEWS_FEED_ITEM_FEED_ICON_TEST ); + CFG_CAT_ADD( NEWS_FEED_ITEM_CAT_VARIOUS, NEWS_FEED_ITEM_CAT_ICON_VARIOUS ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_BARRAPUNTO, NEWS_FEED_ITEM_FEED_ICON_BARRAPUNTO ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_DIGG, NEWS_FEED_ITEM_FEED_ICON_DIGG ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_MENEAME, NEWS_FEED_ITEM_FEED_ICON_MENEAME ); + CFG_FEED_ADD( NEWS_FEED_ITEM_FEED_SLASHDOT, NEWS_FEED_ITEM_FEED_ICON_SLASHDOT ); + + news_feed_lists_refresh(0); +} + +void +news_feed_lists_refresh(int sort) +{ + Evas_List *l, *l2, *list; + News_Feed_Category *cat; + News_Feed *f; + int list_free; + + /* 1. sort by name */ + + if (sort && news->config->feed.sort_name) + { + list = news->config->feed.categories; + list = evas_list_sort(list, evas_list_count(list), _cb_sort_cats); + news->config->feed.categories = list; + + for (l=news->config->feed.categories; l; l=evas_list_next(l)) + { + cat = l->data; + list = cat->feeds; + list = evas_list_sort(list, evas_list_count(list), _cb_sort_feeds); + cat->feeds = list; + } + } + + /* 2. create "feeds_visible" in categories */ + + for (l=news->config->feed.categories; l; l=evas_list_next(l)) + { + cat = l->data; + list = NULL; + list_free = 0; + if (news->config->feed.langs_all) + { + list = cat->feeds; + } + else + { + for (l2=cat->feeds; l2; l2=evas_list_next(l2)) + { + f = l2->data; + if (news_feed_lang_selected_is(f->language)) + list = evas_list_append(list, f); + } + list_free = 1; + } + + if (cat->feeds_visible_free && cat->feeds_visible) + evas_list_free(cat->feeds_visible); + + cat->feeds_visible = list; + cat->feeds_visible_free = list_free; + } + + /* 3. refresh ui */ + + news_feed_category_list_ui_refresh(); +} + +void +news_feed_timer_set(int time) +{ + if (news->feeds_timer) + { + ecore_timer_del(news->feeds_timer); + news->feeds_timer = NULL; + } + if (!time) return; + + news->config->feed.timer_m = time; + news->feeds_timer = ecore_timer_add(time * 60, + _cb_feeds_timer, NULL); +} + +News_Feed * +news_feed_new(char *name, int name_ovrw, char *language, int language_ovrw, char *description, int description_ovrw, char *url_home, int url_home_ovrw, char *url_feed, char *icon, int icon_ovrw, int urgent, News_Feed_Category *category) +{ + News_Feed *f; + + f = E_NEW(News_Feed, 1); + + if (!news_feed_edit(f, + name, name_ovrw, + language, language_ovrw, + description, description_ovrw, + url_home, url_home_ovrw, + url_feed, + icon, icon_ovrw, + urgent, + category, 0)) + { + free(f); + return NULL; + } + + return f; +} + +int +news_feed_edit(News_Feed *f, char *name, int name_ovrw, char *language, int language_ovrw, char *description, int description_ovrw, char *url_home, int url_home_ovrw, char *url_feed, char *icon, int icon_ovrw, int urgent, News_Feed_Category *category, int check_only) +{ + News_Feed *f2; + char *host, *file; + int update = 0; + + if ( !name || !name[0] ) + { + news_util_message_error_show(_("The name you entered is not correct")); + return 0; + } + if (!category) + { + news_util_message_error_show(_("The need to select a category.")); + return 0; + } + f2 = _feed_find(category, name); + if ( f2 && (f != f2) ) + { + news_util_message_error_show(_("A feed with the name %s already exists
" + "in the %s category

" + "Its not possible to have feeds with the same name
" + "in one category."), + f->name, f->category->name); + return 0; + } + if (!language || !language[0]) + { + news_util_message_error_show(_("You need to select a language.")); + return 0; + } + if ( !url_feed || !url_feed[0] || + !(host = _get_host_from_url(url_feed)) || + !(file = _get_file_from_url(url_feed)) ) + { + news_util_message_error_show(_("The url you specified is not correct")); + if (host) free(host); + return 0; + } + + if (!check_only) + { + if (f->name != name) + { + if (f->name) evas_stringshare_del(f->name); + f->name = evas_stringshare_add(name); + } + f->name_ovrw = name_ovrw; + + if (f->language != language) + { + char lang[3]; + + if (f->language) evas_stringshare_del(f->language); + snprintf(lang, sizeof(lang), "%2s", language); + if (language) f->language = evas_stringshare_add(lang); + } + f->language_ovrw = language_ovrw; + + if (f->description != description) + { + if (f->description) evas_stringshare_del(f->description); + if (description) f->description = evas_stringshare_add(description); + } + f->description_ovrw = description_ovrw; + + if (f->url_home != url_home) + { + if (f->url_home) evas_stringshare_del(f->url_home); + if (url_home) f->url_home = evas_stringshare_add(url_home); + } + f->url_home_ovrw = url_home_ovrw; + + if ( (f->url_feed != url_feed) && + (!f->url_feed || strcmp(f->url_feed, url_feed)) ) + { + if (f->url_feed) evas_stringshare_del(f->url_feed); + f->url_feed = evas_stringshare_add(url_feed); + update = 1; + } + + if (f->icon != icon) + { + if ( f->icon && + !(icon && !strcmp(f->icon, icon)) ) + { + evas_stringshare_del(f->icon); + f->icon = NULL; + if (f->obj_icon) + { + evas_object_del(f->obj_icon); + f->obj_icon = NULL; + } + } + if (icon && !f->icon) f->icon = evas_stringshare_add(icon); + } + f->icon_ovrw = icon_ovrw; + + f->urgent = urgent; + + f->category = category; + + if (f->item) + { + News_Feed_Ref *ref; + + if ((f->item->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED) + && + (f->icon && !f->obj_icon)) + { + news_feed_obj_refresh(f, 1, 1); + } + + /* Feed Ref update */ + ref = news_feed_ref_find(f, f->item); + if (ref) + { + if (ref->name) evas_stringshare_del(ref->name); + ref->name = evas_stringshare_add(f->name); + if (ref->category) evas_stringshare_del(ref->category); + ref->category = evas_stringshare_add(f->category->name); + } + } + + news_config_save(); + } + else + { + f->category = category; + } + + E_FREE(f->host); + f->host = host; + E_FREE(f->file); + f->file = file; + + //FIXME: update only if attached to an item + if (update) news_feed_update(f); + + return 1; +} + +void +news_feed_free(News_Feed *f) +{ + News_Item *ni; + + ni = f->item; + if (ni) + { + news_feed_detach(f, 1); + news_item_refresh(ni, 1, 0, 0); + news_viewer_refresh(ni->viewer); + } + if (f->doc) _feed_deactivate(f); + + if (f->config_dialog) news_config_dialog_feed_hide(f); + if (f->menu) news_menu_feed_hide(f); + if (f->obj_icon) evas_object_del(f->obj_icon); + + if (f->name) evas_stringshare_del(f->name); + if (f->language) evas_stringshare_del(f->language); + if (f->description) evas_stringshare_del(f->description); + if (f->url_home) evas_stringshare_del(f->url_home); + if (f->url_feed) evas_stringshare_del(f->url_feed); + if (f->icon) evas_stringshare_del(f->icon); + + if (f->host) free(f->host); + if (f->file) free(f->file); + + free(f); +} + +/* + * Attach a feed to an item + * + * You can give the feed or the feed ref + */ +int +news_feed_attach(News_Feed *f, News_Feed_Ref *ref, News_Item *ni) +{ + if (!f) + { + News_Feed_Category *cat; + News_Feed *f_look; + Evas_List *l, *l2; + + for (l=news->config->feed.categories; l; l=evas_list_next(l)) + { + cat = evas_list_data(l); + if (!strcmp(cat->name, ref->category)) + { + for (l2=cat->feeds; l2; l2=evas_list_next(l2)) + { + f_look = evas_list_data(l2); + if (!strcmp(f_look->name, ref->name)) + { + f = f_look; + l = NULL; + break; + } + } + } + } + if (!f) return 0; + } + + if (!ref) + { + ref = E_NEW(News_Feed_Ref, 1); + ref->category = evas_stringshare_add(f->category->name); + ref->name = evas_stringshare_add(f->name); + ref->feed = f; + ni->config->feed_refs = evas_list_append(ni->config->feed_refs, ref); + } + else + { + ref->feed = f; + } + + f->item = ni; + if (f->doc) + { + if (f->doc->unread_count) + news_item_unread_count_change(f->item, +1); + } + else + { + _feed_activate(f); + news_feed_update(f); + } + + return 1; +} + +/* + * Detach a feed from the item wich its attached to + * + * If @p really is 0, only detach the feed from the item, but keep feed ref + * If @p really is 1, remove the feed ref too + */ +void +news_feed_detach(News_Feed *f, int really) +{ + News_Item *ni; + + /* 1. delete the feed reference from items to feed */ + ni = f->item; + if (ni) + { + News_Feed_Ref *ref; + + ref = news_feed_ref_find(f, ni); + if (ref) + { + if (really) + { + DITEM(("feed detach : delete feed ref (%s)", ref->feed->name)); + ni->config->feed_refs = evas_list_remove(ni->config->feed_refs, ref); + evas_stringshare_del(ref->category); + evas_stringshare_del(ref->name); + free(ref); + } + else + ref->feed = NULL; + } + } + + /* 2. gui items */ + if (f->obj) + { + evas_object_del(f->obj); + f->obj = NULL; + } + if (f->obj_icon) + { + evas_object_del(f->obj_icon); + f->obj_icon = NULL; + } + + /* 3. unread count */ + if (f->doc && f->doc->unread_count) + news_item_unread_count_change(f->item, -1); + + /* 4. misc cleanups */ + if (ni && ni->viewer) + { + if (ni->viewer->vfeeds.selected == f) + ni->viewer->vfeeds.selected = NULL; + } + + /* 5. delete reference from feed to item */ + f->item = NULL; + + /* 6. the feed will be deactivated on next feed_update :) + we wait until that because _detach is also called when there + is a gadcon change (like size) */ +} + +int +news_feed_update(News_Feed *f) +{ + News_Feed_Document *doc; + + /* if the feed is not attached to an item + it means that it was detached and never reattached, + so deactivate the feed */ + if (!f->item) + { + _feed_deactivate(f); + return 0; + } + + doc = f->doc; + + if (doc->server.buffer) + { + free(doc->server.buffer); + doc->server.buffer = NULL; + } + doc->server.buffer_size = 0; + + if (doc->server.conn) + { + //FIXME: segfault appears if i delete the server when connection has not been created yet (needs e patch) + if (doc->server.waiting_reply) + { + //news_util_debug("Forced feed dl with waiting_replay of 1 !
ecore_con_server_del !
(%d tries)", doc->server.nb_tries); + ecore_con_server_del(doc->server.conn); + doc->server.waiting_reply = 0; + } + if (doc->server.nb_tries >= NEWS_FEED_NB_TRIES_MAX) + return 0; + doc->server.nb_tries++; + doc->server.conn = NULL; + //TODO: popup to warn that we are at at the nb_tries try =) + } + else + doc->server.nb_tries = 1; + + if (news->config->proxy.enable && + news->config->proxy.port && + news->config->proxy.host && news->config->proxy.host[0]) + doc->server.conn = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, + news->config->proxy.host, + news->config->proxy.port, + doc); + else + doc->server.conn = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, + f->host, + 80, + doc); + + if (!doc->server.conn) + { + //TODO: popup, if proxy, tell it + DFEED(("Could not start connection to %s", + f->host)); + return 0; + } + DFEED(("Trying to update feed %s", f->host)); + + if (f->item && !f->item->loading_state) + news_item_loadingstate_refresh(f->item); + + if (f->item && f->item->viewer && + (f->item->viewer->vfeeds.selected == f)) + news_viewer_feed_selected_infos_refresh(f->item->viewer); + + return 1; +} + +/* + * Refresh the object showed in item + */ +void +news_feed_obj_refresh(News_Feed *f, int changed_content, int changed_state) +{ + News_Item *ni; + Evas_Object *obj; + + obj = f->obj; + ni = f->item; + + if (!ni) return; + + /* base obj */ + + if (!f->obj) + { + obj = edje_object_add(ni->gcc->gadcon->evas); + news_theme_edje_set(obj, NEWS_THEME_FEED); + evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, + _cb_mouse_down, f); + evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_OUT, + _cb_mouse_out, f); + edje_object_signal_callback_add(obj, "e,action,open", "e", + _cb_feed_open, f); + evas_object_propagate_events_set(obj, 0); + evas_object_show(obj); + } + + if (!f->obj || changed_state) + { + if (f->doc && f->doc->unread_count) + edje_object_signal_emit(obj, "e,state,new,set", "e"); + else + edje_object_signal_emit(obj, "e,state,new,unset", "e"); + } + + if (!f->obj || changed_content) + { + edje_object_part_text_set(obj, "name", f->name); + } + + /* icon */ + + if (f->obj_icon && changed_content) + { + evas_object_del(f->obj_icon); + f->obj_icon = NULL; + } + + if (!f->obj_icon && f->icon && f->icon[0]) + { + Evas_Object *icon; + + DFEED(("Refresh view obj icon of feed %s : %s", f->name, f->icon)); + icon = e_icon_add(ni->gcc->gadcon->evas); + e_icon_file_set(icon, f->icon); + e_icon_fill_inside_set(icon, 1); + edje_object_part_swallow(obj, "icon", icon); + evas_object_show(icon); + f->obj_icon = icon; + } + + f->obj = obj; +} + + +News_Feed_Ref * +news_feed_ref_find(News_Feed *f, News_Item *ni) +{ + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + if (_feed == f) + return _ref; + NEWS_ITEM_FEEDS_FOREACH_END(); + + return NULL; +} + +void +news_feed_read_set(News_Feed *feed) +{ + Evas_List *l; + News_Feed_Article *art; + + if (!feed->doc) return; + if (!feed->doc->unread_count) return; + + for (l=feed->doc->articles; l; l=evas_list_next(l)) + { + art = l->data; + if (art->unread) + news_feed_article_unread_set(art, 0); + } +} + +void +news_feed_unread_count_change(News_Feed *feed, int nb) +{ + int was_empty = 0; + + if (!nb) return; + if (!feed->doc->unread_count) + was_empty = 1; + feed->doc->unread_count += nb; + if (was_empty || !feed->doc->unread_count) + { + if (nb > 0) + news_item_unread_count_change(feed->item, 1); + else + news_item_unread_count_change(feed->item, -1); + + if (feed->item->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED) + news_feed_obj_refresh(feed, 0, 1); + else if (feed->item->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_UNREAD) + news_item_refresh(feed->item, 1, 0, 1); + + if (feed->item->viewer) + news_viewer_refresh(feed->item->viewer); + } + + DFEED(("%s: UNREADcount = %d", feed->name, feed->doc->unread_count)); +} + +void +news_feed_list_ui_refresh(void) +{ + Evas_List *l; + + if (news->config_dialog_feeds) + news_config_dialog_feeds_refresh_feeds(); + + for (l=news->items; l; l=evas_list_next(l)) + { + News_Item *ni; + + ni = evas_list_data(l); + if (ni->config_dialog_content) + { + news_config_dialog_item_content_refresh_feeds(ni); + news_config_dialog_item_content_refresh_selected_feeds(ni); + } + } +} + +void +news_feed_article_del(News_Feed_Article *art) +{ + News_Feed_Document *doc; + + doc = art->doc; + if (art->title) free(art->title); + if (art->url) free(art->url); + if (art->description) free(art->description); + if (art->image) evas_object_del(art->image); + + if (doc->feed->item && doc->feed->item->viewer) + { + if (doc->feed->item->viewer->varticles.selected == art) + doc->feed->item->viewer->varticles.selected = NULL; + } + + if (doc->feed->item && art->unread) + news_feed_unread_count_change(doc->feed, -1); + + doc->articles = evas_list_remove(doc->articles, art); + + free(art); +} + +void +news_feed_article_unread_set(News_Feed_Article *art, int unread) +{ + /* check already in that state */ + if (unread == art->unread) return; + + art->unread = unread; + if (art->doc->feed->item->viewer) + news_viewer_article_state_refresh(art->doc->feed->item->viewer, art); + + if (unread) + news_feed_unread_count_change(art->doc->feed, 1); + else + news_feed_unread_count_change(art->doc->feed, -1); +} + +News_Feed_Category * +news_feed_category_new(char *name, char *icon) +{ + News_Feed_Category *cat; + + cat = E_NEW(News_Feed_Category, 1); + + if (!news_feed_category_edit(cat, name, icon)) + { + free(cat); + return NULL; + } + + return cat; +} + +int +news_feed_category_edit(News_Feed_Category *cat, char *name, char *icon) +{ + News_Feed_Category *cat2; + + if (!name || !name[0]) + { + news_util_message_error_show(_("You need to enter a name !")); + return 0; + } + + /* that name already exists ? */ + cat2 = _feed_category_find(name); + if (cat2 && (cat2 != cat)) + { + news_util_message_error_show(_("The name you entered is already used
" + "by another category")); + return 0; + } + + if (cat->name != name) + { + if (cat->name) evas_stringshare_del(cat->name); + cat->name = evas_stringshare_add(name); + } + + if (cat->icon != icon) + { + if (cat->icon) evas_stringshare_del(cat->icon); + if (icon) cat->icon = evas_stringshare_add(icon); + } + + return 1; +} + +void +news_feed_category_free(News_Feed_Category *cat) +{ + if (cat->feeds && evas_list_count(cat->feeds)) return; + + if (cat->name) evas_stringshare_del(cat->name); + if (cat->icon) evas_stringshare_del(cat->icon); + if (cat->feeds_visible_free && cat->feeds_visible) + evas_list_free(cat->feeds_visible); + if (cat->config_dialog) news_config_dialog_category_hide(cat); + + free(cat); +} + +void +news_feed_category_list_ui_refresh(void) +{ + if (news->config_dialog_feeds) + news_config_dialog_feeds_refresh_categories(); + if (news->config_dialog_feed_new) + news_config_dialog_feed_refresh_categories(NULL); + + NEWS_FEED_FOREACH_BEG(); + if (_feed->config_dialog) + news_config_dialog_feed_refresh_categories(_feed); + NEWS_FEED_FOREACH_END(); + + news_feed_list_ui_refresh(); +} + +void +news_feed_lang_list_refresh(void) +{ + if (news->config_dialog_feed_new) + news_config_dialog_feed_refresh_langs(NULL); + + NEWS_FEED_FOREACH_BEG(); + if (_feed->config_dialog) + news_config_dialog_feed_refresh_langs(_feed); + NEWS_FEED_FOREACH_END(); +} + +void +news_feed_lang_list_free(Evas_List *list) +{ + News_Feed_Lang *lang; + + while ((lang = evas_list_data(list))) + { + if (lang->key) evas_stringshare_del(lang->key); + if (lang->name) evas_stringshare_del(lang->name); + list = evas_list_remove_list(list, list); + free(lang); + } +} + +const char * +news_feed_lang_name_get(const char *key) +{ + int i; + + i = 0; + while (_feed_langs[i].key) + { + if (!strncmp(_feed_langs[i].key, key, 2)) + return _feed_langs[i].name; + i++; + } + return NULL; +} + +int +news_feed_lang_selected_is(const char *key) +{ + News_Feed_Lang *lang; + Evas_List *l; + + for (l=news->config->feed.langs; l; l=evas_list_next(l)) + { + lang = l->data; + if (!strncmp(lang->key, key, 2)) + return 1; + } + return 0; +} + +/* + * Private functions + * + */ + +static int +_feed_activate(News_Feed *f) +{ + News_Feed_Document *doc; + + doc = E_NEW(News_Feed_Document, 1); + + doc->feed = f; + f->doc = doc; + + doc->ui_needrefresh = 1; + + doc->server.handler_add = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, + _cb_feed_server_add, doc); + doc->server.handler_del = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, + _cb_feed_server_del, doc); + doc->server.handler_data = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, + _cb_feed_server_data, doc); + + doc->parse.type = NEWS_FEED_TYPE_UNKNOWN; + + return 1; +} + +static void +_feed_deactivate(News_Feed *f) +{ + News_Feed_Document *doc; + + doc = f->doc; + if (!doc) return; + + DFEED(("Feed %s deactivate", f->name)); + + if (doc->parse.parser) news_parse_stop(doc); + + if (doc->parse.meta_article) evas_stringshare_del(doc->parse.meta_article); + if (doc->parse.meta_channel) evas_stringshare_del(doc->parse.meta_channel); + if (doc->parse.meta_date) evas_stringshare_del(doc->parse.meta_date); + if (doc->parse.charset) evas_stringshare_del(doc->parse.charset); + + //FIXME: segfault appears if i delete the server ... + if (doc->server.conn && doc->server.waiting_reply) ecore_con_server_del(doc->server.conn); + ecore_event_handler_del(doc->server.handler_add); + ecore_event_handler_del(doc->server.handler_del); + ecore_event_handler_del(doc->server.handler_data); + if (doc->server.buffer) free(doc->server.buffer); + + if (doc->articles) + { + News_Feed_Article *article; + + while(doc->articles) + { + article = doc->articles->data; + news_feed_article_del(article); + } + } + + if (doc->popw) news_popup_warn_del(doc->popw); + + f->doc = NULL; + free(doc); +} + +static News_Feed * +_feed_find(News_Feed_Category *cat, char *name) +{ + News_Feed *f; + Evas_List *l; + + for (l=cat->feeds; l; l=evas_list_next(l)) + { + f = l->data; + if (!strcmp(f->name, name)) + return f; + } + + return NULL; +} + +static News_Feed_Category * +_feed_category_find(char *name) +{ + Evas_List *l; + + for (l=news->config->feed.categories; l; l=evas_list_next(l)) + { + News_Feed_Category *cat; + + cat = evas_list_data(l); + if (!strcmp(cat->name, name)) + return cat; + } + + return NULL; +} + +static char * +_get_host_from_url(const char *url) +{ + char *host; + char *tmp, *p; + + if (strncmp(url, "http://", 7)) + return NULL; + tmp = strdup(url + 7); + p = strchr(tmp, '/'); + if (!p) + { + free(tmp); + return NULL; + } + *p = '\0'; + host = strdup(tmp); + free(tmp); + + return host; +} + +static char * +_get_file_from_url(const char *url) +{ + char *file; + char *p; + + p = strstr(url, "://"); + if (!p) + return NULL; + p += 3; + p = strstr(p, "/"); + if (!p) + return NULL; + + file = strdup(p); + + return file; +} + +static void +_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + News_Feed *f; + Evas_Event_Mouse_Down *ev; + + f = data; + ev = event_info; + + DFEED(("Mouse down %d", ev->button)); + + switch(ev->button) + { + int cx, cy, cw, ch; + + case 3: + if (f->menu) break; + + news_menu_feed_show(f); + + e_gadcon_canvas_zone_geometry_get(f->item->gcc->gadcon, + &cx, &cy, &cw, &ch); + e_menu_activate_mouse(f->menu, + e_util_zone_current_get(e_manager_current_get()), + cx + ev->output.x, cy + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up(f->item->gcc->gadcon->evas, ev->button, + EVAS_BUTTON_NONE, ev->timestamp, NULL); + break; + } +} + +static void +_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + News_Item *ni; + Evas_Event_Mouse_Out *ev; + + ni = data; + ev = event_info; + + DITEM(("Mouse out")); + +} + +static void +_cb_feed_open(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + News_Item *ni; + News_Feed *f; + + f = data; + ni = f->item; + + DITEM(("Cb feed %s open", f->name)); + + /* if the object is not loaded yet, abort */ + if (!f->doc) return; + + switch (f->doc->feed->item->config->openmethod) + { + case NEWS_ITEM_OPENMETHOD_VIEWER: + if (ni->viewer) + { + if (ni->viewer->vfeeds.selected == f) + news_viewer_destroy(ni->viewer); + else + news_viewer_feed_select(ni->viewer, f); + } + else + { + news_viewer_create(ni); + news_viewer_feed_select(ni->viewer, f); + } + break; + case NEWS_ITEM_OPENMETHOD_BROWSER: + if (ni->config->browser_open_home) + news_util_browser_open(f->url_home); + else + news_util_browser_open(f->url_feed); + news_feed_read_set(f); + break; + } +} + +static int +_cb_feed_server_add(void *data, int type, void *event) +{ + News_Feed_Document *doc; + Ecore_Con_Event_Server_Add *ev; + char buf[4096]; + + doc = data; + ev = event; + + /* check if the event is our event */ + if (doc->server.conn != ev->server) + return 1; + + DFEED(("Connection established after %d tries, sending request", doc->server.nb_tries)); + + snprintf(buf, sizeof(buf), "GET %s HTTP/1.0\r\n", doc->feed->file); + ecore_con_server_send(doc->server.conn, buf, strlen(buf)); + snprintf(buf, sizeof(buf), "Host: %s\r\n", doc->feed->host); + ecore_con_server_send(doc->server.conn, buf, strlen(buf)); + snprintf(buf, sizeof(buf), "User-Agent: %s/v%d\r\n\r\n", "Enlightenment News module", news->config->version); + ecore_con_server_send(doc->server.conn, buf, strlen(buf)); + + doc->server.waiting_reply = 1; + + return 1; +} + +static int +_cb_feed_server_del(void *data, int type, void *event) +{ + News_Feed_Document *doc; + Ecore_Con_Event_Server_Del *ev; + + ev = event; + doc = data; + + /* check if the event is our event */ + if (doc->server.conn != ev->server) + return 1; + + ecore_con_server_del(doc->server.conn); + doc->server.conn = NULL; + + DFEED(("Connection end")); + + if (!doc->server.buffer || !doc->server.buffer_size) + { + // TODO: error popup + if (doc->feed->item) + news_item_loadingstate_refresh(doc->feed->item); + return 1; + } + + doc->server.buffer_size++; + doc->server.buffer = realloc(doc->server.buffer, + doc->server.buffer_size); + doc->server.buffer[doc->server.buffer_size - 1] = '\0'; + + doc->server.waiting_reply = 0; + + news_parse_go(doc, _cb_feed_parse); + + return 1; +} + +static int +_cb_feed_server_data(void *data, int type, void *event) +{ + News_Feed_Document *doc; + Ecore_Con_Event_Server_Data *ev; + + ev = event; + doc = data; + + DFEED(("Received %d octets !", ev->size)); + + /* check if the event is our event */ + if (doc->server.conn != ev->server) + return 1; + + doc->server.buffer = realloc(doc->server.buffer, + doc->server.buffer_size + ev->size); + memcpy(doc->server.buffer + doc->server.buffer_size, ev->data, ev->size); + doc->server.buffer_size += ev->size; + + return 1; +} + +static void +_cb_feed_parse(News_Feed_Document *doc, News_Parse_Error error, int changes) +{ + News_Item *ni; + + ni = doc->feed->item; + + free(doc->server.buffer); + doc->server.nb_tries = 0; + doc->server.buffer = NULL; + doc->server.buffer_size = 0; + doc->parse.last_time = ecore_time_get(); + + //TODO with popups + switch(error) + { + case NEWS_PARSE_ERROR_NO: + break; + case NEWS_PARSE_ERROR_BROKEN_FEED: + break; + case NEWS_PARSE_ERROR_TYPE_UNKNOWN: + break; + case NEWS_PARSE_ERROR_NOT_IMPLEMENTED: + break; + } + + if (changes) + { + //TODO: popup + + doc->ui_needrefresh = 1; + + if (ni) + { + if (ni->viewer) + news_viewer_refresh(ni->viewer); + } + } + else + { + if (ni && ni->viewer && + (ni->viewer->vfeeds.selected == doc->feed)) + news_viewer_feed_selected_infos_refresh(ni->viewer); + } +} + +static int +_cb_feeds_timer(void *data) +{ + NEWS_FEED_FOREACH_BEG(); + if (_feed->doc) + news_feed_update(_feed); + NEWS_FEED_FOREACH_END(); + + return 1; +} + +static int +_cb_sort_cats(void *d1, void *d2) +{ + News_Feed_Category *c1, *c2; + + c1 = d1; + c2 = d2; + + return strcmp(c1->name, c2->name); +} + +static int +_cb_sort_feeds(void *d1, void *d2) +{ + News_Feed *f1, *f2; + + f1 = d1; + f2 = d2; + + return strcmp(f1->name, f2->name); +} diff --git a/src/module/news_feed.h b/src/module/news_feed.h new file mode 100644 index 0000000..7deb1c2 --- /dev/null +++ b/src/module/news_feed.h @@ -0,0 +1,358 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Feed News_Feed; +typedef struct _News_Feed_Ref News_Feed_Ref; +typedef struct _News_Feed_Category News_Feed_Category; +typedef struct _News_Feed_Document News_Feed_Document; +typedef struct _News_Feed_Article News_Feed_Article; + +typedef struct _News_Feed_Lang News_Feed_Lang; + +typedef enum _News_Feed_Type + { + NEWS_FEED_TYPE_UNKNOWN, + NEWS_FEED_TYPE_RSS, + NEWS_FEED_TYPE_ATOM + } News_Feed_Type; + +typedef enum _News_Feed_Popup_News_Active + { + NEWS_FEED_POPUP_NEWS_ACTIVE_NO, + NEWS_FEED_POPUP_NEWS_ACTIVE_URGENT, + NEWS_FEED_POPUP_NEWS_ACTIVE_ALL + } News_Feed_Popup_News_Active; + +#else + +#ifndef NEWS_FEED_H_INCLUDED +#define NEWS_FEED_H_INCLUDED + +#define NEWS_FEED_TIMER_DEFAULT 20 +#define NEWS_FEED_TIMER_MIN 1 +#define NEWS_FEED_TIMER_MAX 60 + +#define NEWS_FEED_SORT_NAME_DEFAULT 0 + +#define NEWS_FEED_LANG_ALL_DEFAULT 0 + +#define NEWS_FEED_NB_TRIES_MAX 30 + +#define NEWS_FEED_PROXY_PORT_DEFAULT 8080 + +#define NEWS_FEED_UNREAD_COUNT_MAX 150 + +#define NEWS_FEED_POPUP_NEWS_ACTIVE_DEFAULT NEWS_FEED_POPUP_NEWS_ACTIVE_ALL +#define NEWS_FEED_POPUP_NEWS_TIMER_S_DEFAULT 8 + +#define NEWS_FEED_POPUP_OTHER_ON_TIMEOUT_DEFAULT 1 +#define NEWS_FEED_POPUP_OTHER_TIMER_S_DEFAULT 3 + +#define NEWS_FEED_NAME_OVRW_DEFAULT 0 +#define NEWS_FEED_LANGUAGE_OVRW_DEFAULT 1 +#define NEWS_FEED_DESCRIPTION_OVRW_DEFAULT 1 +#define NEWS_FEED_URL_HOME_OVRW_DEFAULT 1 +#define NEWS_FEED_ICON_OVRW_DEFAULT 1 + +#define NEWS_FEED_ITEM_CAT_COMICS "Comics" +#define NEWS_FEED_ITEM_CAT_COMPUTERS "Computers" +#define NEWS_FEED_ITEM_CAT_ENLIGHTENMENT "Enlightenment" +#define NEWS_FEED_ITEM_CAT_NEWS "News" +#define NEWS_FEED_ITEM_CAT_SCIENCES "Science" +#define NEWS_FEED_ITEM_CAT_TEST "Test" +#define NEWS_FEED_ITEM_CAT_VARIOUS "Various" +#define NEWS_FEED_ITEM_CAT_ICON_DEFAULT "/images/categories/default.png" +#define NEWS_FEED_ITEM_CAT_ICON_COMICS NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_COMPUTERS NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_ENLIGHTENMENT NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_NEWS NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_SCIENCES NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_TEST NEWS_FEED_ITEM_CAT_ICON_DEFAULT +#define NEWS_FEED_ITEM_CAT_ICON_VARIOUS NEWS_FEED_ITEM_CAT_ICON_DEFAULT + +#define NEWS_FEED_ITEM_FEED_ \ +"", 1, "fr", 1, "", 1, \ +"", 1, \ +"" +#define NEWS_FEED_ITEM_FEED_AFP_EN \ +"Afp", 1, "en", 1, "The News / wire stories", 1, \ +"http://www.afp.com/english/", 1, \ +"http://www.afp.com/english/rss/stories.xml" +#define NEWS_FEED_ITEM_FEED_BARRAPUNTO \ +"Barrapunto", 1, "es", 1, "La información que te interesa", 1, \ +"http://barrapunto.com", 1, \ +"http://barrapunto.com/barrapunto.rss" +#define NEWS_FEED_ITEM_FEED_BBC_WORLD \ +"BBC world", 1, "en", 1, "Visit BBC News for up-to-the-minute news, breaking news, video, audio and feature stories. BBC News provides trusted World and UK news as well as local and regional perspectives. Also entertainment, business, science, technology and health news.", 1, \ +"http://www.bbc.co.uk", 1, \ +"http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml" +#define NEWS_FEED_ITEM_FEED_BOULETCORP \ +"bouletcorp - le blog", 0, "fr", 1, "Le blog de boulet", 0, \ +"http://www.bouletcorp.com/blog/", 1, \ +"http://www.bouletcorp.com/blog/fill_rss.php5" +#define NEWS_FEED_ITEM_FEED_CNN \ +"Cnn", 1, "en", 1, "CNN.com delivers up-to-the-minute news and information on the latest top stories, weather, entertainment, politics and more.", 1, \ +"http://www.cnn.com", 1, \ +"http://rss.cnn.com/rss/cnn_topstories.rss" +#define NEWS_FEED_ITEM_FEED_COURRIERINTERNATIONAL \ +"Courrierinternational", 1, "fr", 1, "Courrier international : hebdomadaire franēais d'information internationale. Sur Internet, les journalistes de Courrier international réalisent une revue de presse quotidienne.", 1, \ +"http://www.courrierinternational.com", 1, \ +"http://www.courrierinternational.com/rss/rss_a_la_une.xml" +#define NEWS_FEED_ITEM_FEED_DIGG \ +"digg", 1, "en", 1, "digg", 1, \ +"http://www.digg.com", 1, \ +"http://digg.com/rss/index.xml" +#define NEWS_FEED_ITEM_FEED_E_CVS \ +"E Cvs", 1, "en", 1, "Enlightenment is a completely themeable, highly configurable Window Manager for the X Window System, traditionally used in Unix environments.", 1, \ +"http://www.enlightenment.org", 1, \ +"http://cia.navi.cx/stats/project/e/.rss?ver=2&medium=plaintext&limit=" +#define NEWS_FEED_ITEM_FEED_E_FR \ +"Enlightenment-fr", 1, "fr", 1, "", 1, \ +"http://fr.enlightenment.org/", 1, \ +"http://fr.enlightenment.org/feed/" +#define NEWS_FEED_ITEM_FEED_FRESHMEAT \ +"Freshmeat", 1, "en", 1, "The last 24 hours worth of freshmeat.net releases", 1, \ +"http://www.freshmeat.net", 1, \ +"http://rss.freshmeat.net/freshmeat/feeds/fm-releases-global" +#define NEWS_FEED_ITEM_FEED_FUTURASCIENCES \ +"Futura-Sciences", 0, "fr", 1, "L'actualité quotidienne des sciences et technologies sur Futura-Sciences !", 1, \ +"http://www.futura-sciences.com/", 1, \ +"http://feeds.feedburner.com/packfs" +#define NEWS_FEED_ITEM_FEED_GOOGLE \ +"Google feed", 1, "en", 1, "Google News", 1, \ +"http://news.google.com", 1, \ +"http://news.google.com/?output=rss" +#define NEWS_FEED_ITEM_FEED_GOOGLE_FR \ +"Google Fr feed", 1, "fr", 1, "Google News France", 1, \ +"http://news.google.fr", 1, \ +"http://news.google.fr/?output=rss" +#define NEWS_FEED_ITEM_FEED_LEMONDE_UNE \ +"Le monde (la une)", 1, "fr", 1, "Toute l'actualité au moment de la connexion", 1, \ +"http://www.lemonde.fr", 1, \ +"http://www.lemonde.fr/rss/sequence/0,2-3208,1-0,0.xml" +#define NEWS_FEED_ITEM_FEED_MENEAME \ +"Menéame: publicadas", 1, "es", 1, "Sitio colaborativo de publicación y comunicación entre blogs", 1, \ +"http://meneame.net/", 1, \ +"http://feeds.feedburner.com/meneame/published" +#define NEWS_FEED_ITEM_FEED_NEWS \ +"News module svn", 1, "en", 1, "Enlightenment News module developement feed, to follow subversion commits (svn://oooo.zapto.org/News)", 1, \ +"http://oooo.zapto.org?page=projets/news", 1, \ +"http://oooo.zapto.org/projets/news/rss/" +#define NEWS_FEED_ITEM_FEED_OSNEWS \ +"Osnews", 1, "en", 1, "Exploring the Future of Computing", 1, \ +"http://www.osnews.com", 1, \ +"http://www.osnews.com/files/recent.rdf" +#define NEWS_FEED_ITEM_FEED_SLASHDOT \ +"Slashdot", 1, "en", 1, "News for nerds, stuff that matters", 1, \ +"http://www.slashdot.org", 1, \ +"http://rss.slashdot.org/Slashdot/slashdot" +#define NEWS_FEED_ITEM_FEED_TEST \ +"Test feed", 1, "en", 1, "", 1, \ +"http://oooo.zapto.org", 1, \ +"http://oooo.zapto.org/test.rss" +#define NEWS_FEED_ITEM_FEED_ICON_DEFAULT "/images/feeds/default.png" +#define NEWS_FEED_ITEM_FEED_ICON_AFP_EN "images/feeds/afp.png" +#define NEWS_FEED_ITEM_FEED_ICON_BARRAPUNTO "images/feeds/barrapunto.png" +#define NEWS_FEED_ITEM_FEED_ICON_BBC_WORLD "images/feeds/bbcworld.png" +#define NEWS_FEED_ITEM_FEED_ICON_BOULETCORP "images/feeds/bouletcorp.png" +#define NEWS_FEED_ITEM_FEED_ICON_CNN "images/feeds/cnn.png" +#define NEWS_FEED_ITEM_FEED_ICON_COURRIERINTERNATIONAL "images/feeds/courrierinternational.png" +#define NEWS_FEED_ITEM_FEED_ICON_DIGG "images/feeds/digg.png" +#define NEWS_FEED_ITEM_FEED_ICON_E_CVS "images/feeds/e_cvs.png" +#define NEWS_FEED_ITEM_FEED_ICON_E_FR "images/feeds/e_fr.png" +#define NEWS_FEED_ITEM_FEED_ICON_FRESHMEAT "images/feeds/freshmeat.png" +#define NEWS_FEED_ITEM_FEED_ICON_FUTURASCIENCES "images/feeds/futurasciences.png" +#define NEWS_FEED_ITEM_FEED_ICON_GOOGLE "images/feeds/google.png" +#define NEWS_FEED_ITEM_FEED_ICON_GOOGLE_FR "images/feeds/google_fr.png" +#define NEWS_FEED_ITEM_FEED_ICON_LEMONDE "images/feeds/lemonde.png" +#define NEWS_FEED_ITEM_FEED_ICON_MENEAME "images/feeds/meneame.png" +#define NEWS_FEED_ITEM_FEED_ICON_NEWS "images/feeds/news.png" +#define NEWS_FEED_ITEM_FEED_ICON_OSNEWS "images/feeds/osnews.png" +#define NEWS_FEED_ITEM_FEED_ICON_SLASHDOT "images/feeds/slashdot.png" +#define NEWS_FEED_ITEM_FEED_ICON_TEST NEWS_FEED_ITEM_FEED_ICON_DEFAULT + +#define NEWS_FEED_FOREACH_BEG() \ +{ \ +Evas_List *_l_feeds, *_l_cats; \ +News_Feed_Category *_cat; \ +News_Feed *_feed; \ +\ +for (_l_feeds=news->config->feed.categories; _l_feeds; _l_feeds=evas_list_next(_l_feeds)) \ +{ \ + _cat = _l_feeds->data; \ + for (_l_cats=_cat->feeds; _l_cats; _l_cats=evas_list_next(_l_cats)) \ + { \ + _feed = _l_cats->data; +#define NEWS_FEED_FOREACH_END() \ + } \ +} \ +} + +struct _News_Feed +{ + /* not saved */ + News_Item *item; + News_Feed_Category *category; + + /* saved */ + const char *name; + int name_ovrw; + const char *language; + int language_ovrw; + const char *description; + int description_ovrw; + const char *url_home; + int url_home_ovrw; + const char *url_feed; + const char *icon; + int icon_ovrw; + int urgent; + + /* not saved */ + E_Config_Dialog *config_dialog; + E_Menu *menu; + + News_Feed_Document *doc; + + Evas_Object *obj; + Evas_Object *obj_icon; + + char *host; + char *file; +}; + +struct _News_Feed_Ref +{ + /* saved */ + const char *category; + const char *name; + + /* not saved */ + News_Feed *feed; +}; + +struct _News_Feed_Category +{ + /* saved */ + const char *name; + const char *icon; + + Evas_List *feeds; + + /* not saved */ + /* temporary list of categories */ + /* this list is sorted and contains only the feeds + of the languages selected by user + it regenerated via news_feed_lists_refresh */ + Evas_List *feeds_visible; + int feeds_visible_free; + E_Config_Dialog *config_dialog; +}; + +struct _News_Feed_Document +{ + News_Feed *feed; + + News_Popup_Warn *popw; + Evas_List *articles; + int unread_count; + int ui_needrefresh : 1; + + struct + { + Ecore_Con_Server *conn; + Ecore_Event_Handler *handler_add; + Ecore_Event_Handler *handler_del; + Ecore_Event_Handler *handler_data; + + int waiting_reply : 1; + int nb_tries; + char *buffer; + int buffer_size; + } server; + + struct + { + News_Feed_Type type; + float version; + const char *meta_article; + const char *meta_channel; + const char *meta_date; + const char *charset; + + News_Parse *parser; + int got_infos : 1; + time_t last_time; + } parse; +}; + +struct _News_Feed_Article +{ + News_Feed_Document *doc; + + int unread : 1; + int reused : 1; + + char *title; + char *url; + char *description; + struct tm date; + Evas_Object *image; +}; + +struct _News_Feed_Lang +{ + const char *key; + const char *name; +}; + +int news_feed_init(void); +void news_feed_shutdown(void); +void news_feed_all_delete(void); +void news_feed_all_restore(void); +void news_feed_lists_refresh(int sort); +void news_feed_timer_set(int time); + +News_Feed *news_feed_new(char *name, int name_ovrw, + char *language, int language_ovrw, + char *description, int description_ovrw, + char *url_home, int url_home_ovrw, + char *url_feed, + char *icon, int icon_ovrw, + int urgent, + News_Feed_Category *category); +int news_feed_edit(News_Feed *f, + char *name, int name_ovrw, + char *language, int language_ovrw, + char *description, int description_ovrw, + char *url_home, int url_home_ovrw, + char *url_feed, + char *icon, int icon_ovrw, + int urgent, + News_Feed_Category *category, + int check_only); +void news_feed_free(News_Feed *f); + +int news_feed_attach(News_Feed *f, News_Feed_Ref *ref, News_Item *ni); +void news_feed_detach(News_Feed *f, int really); +int news_feed_update(News_Feed *f); +void news_feed_obj_refresh(News_Feed *f, int changed_content, int changed_state); +News_Feed_Ref *news_feed_ref_find(News_Feed *f, News_Item *ni); +void news_feed_read_set(News_Feed *feed); +void news_feed_unread_count_change(News_Feed *feed, int nb); +void news_feed_list_ui_refresh(void); + +void news_feed_article_del(News_Feed_Article *art); +void news_feed_article_unread_set(News_Feed_Article *art, int unread); + +News_Feed_Category *news_feed_category_new(char *name, char *icon); +int news_feed_category_edit(News_Feed_Category *cat, char *name, char *icon); +void news_feed_category_free(News_Feed_Category *cat); +void news_feed_category_list_ui_refresh(void); + +void news_feed_lang_list_refresh(void); +void news_feed_lang_list_free(Evas_List *l); +const char *news_feed_lang_name_get(const char *key); +int news_feed_lang_selected_is(const char *key); + +#endif +#endif diff --git a/src/module/news_item.c b/src/module/news_item.c new file mode 100644 index 0000000..a760fa8 --- /dev/null +++ b/src/module/news_item.c @@ -0,0 +1,358 @@ +#include "News.h" + +static void _item_refresh_mode_one(News_Item *ni, int changed_order, int changed_state); +static void _item_refresh_mode_feed(News_Item *ni, int unread_only, int changed_order, int changed_content, int changed_state); +static Evas_List *_feedrefs_sort_unreadonly_list_get(News_Item *ni); +static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); + + +/* + * Public functions + */ + +News_Item * +news_item_new(E_Gadcon_Client *gcc, Evas_Object *obj) +{ + News_Item *ni; + News_Config_Item *nic; + Evas_Object *view; + Evas_List *l; + + ni = E_NEW(News_Item, 1); + + news_theme_edje_set(obj, NEWS_THEME_ITEM); + + nic = news_config_item_add(gcc->id); + ni->gcc = gcc; + ni->obj = obj; + ni->config = nic; + + evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_DOWN, + _cb_mouse_down, ni); + evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_OUT, + _cb_mouse_out, ni); + + /* attach feeds */ + for (l=nic->feed_refs; l; l=evas_list_next(l)) + { + News_Feed_Ref *ref; + + ref = evas_list_data(l); + news_feed_attach(NULL, ref, ni); + } + news_feed_list_ui_refresh(); + + /* main view */ + view = e_box_add(gcc->gadcon->evas); + e_box_homogenous_set(view, 1); + e_box_orientation_set(view, 1); + edje_object_part_swallow(ni->obj, "view", view); + evas_object_show(view); //FIXME: not needed + ni->view.box = view; + + news_item_refresh(ni, 1, 1, 1); + + return ni; +} + +void +news_item_free(News_Item *ni) +{ + DITEM(("Item del")); + + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + news_feed_detach(_feed, 0); + NEWS_ITEM_FEEDS_FOREACH_END(); + + news_feed_list_ui_refresh(); + + if (ni->config_dialog) news_config_dialog_item_hide(ni); + if (ni->config_dialog_content) news_config_dialog_item_content_hide(ni); + if (ni->menu) news_menu_item_hide(ni); + if (ni->menu_browser) news_menu_browser_hide(ni); + + if (ni->view.box) evas_object_del(ni->view.box); + if (ni->view.obj_mode_one) evas_object_del(ni->view.obj_mode_one); + + if (ni->viewer) news_viewer_destroy(ni->viewer); + + if (ni->obj) evas_object_del(ni->obj); + + free(ni); +} + +/* + * need to be called when + * view orientation + * view item size + * a feed has been added OR remove to/from an item + * has changed + */ +void +news_item_refresh(News_Item *ni, int changed_order, int changed_content, int changed_state) +{ + Evas_Object *box; + int mode; + + box = ni->view.box; + e_box_freeze(box); + + if (changed_order) + { + Evas_Object *o; + + while ((o = e_box_pack_object_first(box))) + { + e_box_unpack(o); + evas_object_hide(o); + } + } + + if (!evas_list_count(ni->config->feed_refs)) + mode = NEWS_ITEM_VIEW_MODE_ONE; + else + mode = ni->config->view_mode; + + switch (mode) + { + case NEWS_ITEM_VIEW_MODE_ONE: + _item_refresh_mode_one(ni, changed_order, changed_state); + break; + case NEWS_ITEM_VIEW_MODE_FEED: + _item_refresh_mode_feed(ni, 0, changed_order, changed_content, changed_state); + break; + case NEWS_ITEM_VIEW_MODE_FEED_UNREAD: + _item_refresh_mode_feed(ni, 1, changed_order, changed_content, changed_state); + break; + } + + e_box_thaw(box); + + /* resize the gadcon */ + if (changed_order && ni->gcc->client_class) + ni->gcc->client_class->func.orient(ni->gcc); +} + +void +news_item_orient_set(News_Item *ni, int horizontal) +{ + e_box_orientation_set(ni->view.box, horizontal); + + e_box_align_set(ni->view.box, 0.5, 0.5); +} + +void +news_item_loadingstate_refresh(News_Item *ni) +{ + // TODO +} + +void +news_item_unread_count_change(News_Item *ni, int nb) +{ + int was_empty = 0; + + if (!nb) return; + if (!ni->unread_count) + was_empty = 1; + ni->unread_count += nb; + if (was_empty || !ni->unread_count) + { + if (ni->config->view_mode == NEWS_ITEM_VIEW_MODE_FEED_UNREAD) + news_item_refresh(ni, 1, 0, 1); + else + news_item_refresh(ni, 0, 0, 1); + + if (ni->viewer) + news_viewer_refresh(ni->viewer); + } + + DFEED(("UNREAD count = %d", ni->unread_count)); +} + +/* + * Private functions + */ + +static void +_item_refresh_mode_one(News_Item *ni, int changed_order, int changed_state) +{ + Evas_Object *box; + Evas_Object *obj; + + box = ni->view.box; + obj = ni->view.obj_mode_one; + + /* create obj */ + + if (!obj) + { + obj = edje_object_add(ni->gcc->gadcon->evas); + news_theme_edje_set(obj, NEWS_THEME_FEEDONE); + } + + if (!ni->view.obj_mode_one || changed_order) + { + e_box_pack_end(box, obj); + e_box_pack_options_set(obj, + 1, 1, /* fill */ + 1, 1, /* expand */ + 0, 0, /* align */ + 0, 0, + -1, -1 + ); + evas_object_show(obj); + } + + /* state */ + + if (!ni->view.obj_mode_one || changed_state) + { + if (ni->unread_count) + edje_object_signal_emit(obj, "e,state,new,set", "e"); + else + edje_object_signal_emit(obj, "e,state,new,unset", "e"); + } + + ni->view.obj_mode_one = obj; +} + +static void +_item_refresh_mode_feed(News_Item *ni, int unread_only, int changed_order, int changed_content, int changed_state) +{ + Evas_Object *box; + Evas_Object *obj; + Evas_List *feed_refs; + int feed_refs_free = 0; + + if (!evas_list_count(ni->config->feed_refs)) return; + + box = ni->view.box; + + if (unread_only) + { + feed_refs = _feedrefs_sort_unreadonly_list_get(ni); + feed_refs_free = 1; + } + else + feed_refs = ni->config->feed_refs; + + NEWS_ITEM_FEEDS_FOREACH_BEG_LIST(feed_refs); + { + obj = _feed->obj; + + DITEM(("refresh : feed %s", _feed->name)); + + if (!_feed->obj || changed_content || changed_state) + { + news_feed_obj_refresh(_feed, changed_content, changed_state); + obj = _feed->obj; + } + + if (!_feed->obj || changed_order) + { + /* insert in the box */ + + e_box_pack_end(box, obj); + e_box_pack_options_set(obj, + 1, 1, /* fill */ + 1, 1, /* expand */ + 0, 0, /* align */ + 0, 0, + -1, -1 + ); + evas_object_show(obj); + } + + _feed->obj = obj; + } + NEWS_ITEM_FEEDS_FOREACH_END(); + + if (feed_refs_free) + evas_list_free(feed_refs); +} + +static Evas_List * +_feedrefs_sort_unreadonly_list_get(News_Item *ni) +{ + Evas_List *feed_refs; + + feed_refs = NULL; + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + if (_feed->doc && _feed->doc->unread_count) + feed_refs = evas_list_append(feed_refs, _ref); + NEWS_ITEM_FEEDS_FOREACH_END(); + + return feed_refs; +} + +static void +_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + News_Item *ni; + Evas_Event_Mouse_Down *ev; + + ni = data; + ev = event_info; + + DITEM(("Mouse down %d", ev->button)); + + switch(ev->button) + { + int cx, cy, cw, ch; + + case 1: + switch (ni->config->openmethod) + { + case NEWS_ITEM_OPENMETHOD_VIEWER: + if (!ni->viewer) + news_viewer_create(ni); + else + news_viewer_destroy(ni->viewer); + break; + case NEWS_ITEM_OPENMETHOD_BROWSER: + /* if we are not in view mode one, + we assume its an error click */ + if (ni->config->view_mode != NEWS_ITEM_VIEW_MODE_ONE) + break; + news_menu_browser_show(ni); + e_gadcon_canvas_zone_geometry_get(ni->gcc->gadcon, + &cx, &cy, &cw, &ch); + e_menu_activate_mouse(ni->menu_browser, + e_util_zone_current_get(e_manager_current_get()), + cx + ev->output.x, cy + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up(ni->gcc->gadcon->evas, ev->button, + EVAS_BUTTON_NONE, ev->timestamp, NULL); + break; + } + break; + + case 3: + if (ni->menu) break; + news_menu_item_show(ni); + e_gadcon_canvas_zone_geometry_get(ni->gcc->gadcon, + &cx, &cy, &cw, &ch); + e_menu_activate_mouse(ni->menu, + e_util_zone_current_get(e_manager_current_get()), + cx + ev->output.x, cy + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up(ni->gcc->gadcon->evas, ev->button, + EVAS_BUTTON_NONE, ev->timestamp, NULL); + break; + } +} + +static void +_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + News_Item *ni; + Evas_Event_Mouse_Out *ev; + + ni = data; + ev = event_info; + + DITEM(("Mouse out")); + +} diff --git a/src/module/news_item.h b/src/module/news_item.h new file mode 100644 index 0000000..12464bf --- /dev/null +++ b/src/module/news_item.h @@ -0,0 +1,95 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Item News_Item; + +typedef enum _News_Item_View_Mode + { + NEWS_ITEM_VIEW_MODE_ONE, + NEWS_ITEM_VIEW_MODE_FEED, + NEWS_ITEM_VIEW_MODE_FEED_UNREAD + } News_Item_View_Mode; + +typedef enum _News_Item_Openmethod + { + NEWS_ITEM_OPENMETHOD_VIEWER, + NEWS_ITEM_OPENMETHOD_BROWSER, + } News_Item_View_Openmethod; + + +#else + +#ifndef NEWS_ITEM_H_INCLUDED +#define NEWS_ITEM_H_INCLUDED + +#define NEWS_ITEM_VIEW_MODE_DEFAULT NEWS_ITEM_VIEW_MODE_FEED +#define NEWS_ITEM_OPENMETHOD_DEFAULT NEWS_ITEM_OPENMETHOD_VIEWER +#define NEWS_ITEM_BROWSER_OPEN_HOME_DEFAULT 0 + +#define NEWS_ITEM_FEEDS_FOREACH_BEG(item) \ +{ \ +Evas_List *_l_feeds; \ +News_Feed_Ref *_ref; \ +News_Feed *_feed; \ +\ +for (_l_feeds=item->config->feed_refs; _l_feeds; _l_feeds=evas_list_next(_l_feeds)) \ +{ \ + _ref = _l_feeds->data; \ + _feed = _ref->feed; \ + if (!_feed) continue; +#define NEWS_ITEM_FEEDS_FOREACH_BEG_LIST(list) \ +{ \ +Evas_List *_l_feeds; \ +News_Feed_Ref *_ref; \ +News_Feed *_feed; \ +\ +for (_l_feeds=list; _l_feeds; _l_feeds=evas_list_next(_l_feeds)) \ +{ \ + _ref = _l_feeds->data; \ + _feed = _ref->feed; \ + if (!_feed) continue; +#define NEWS_ITEM_FEEDS_FOREACH_END() \ +} \ +} + +struct _News_Item +{ + E_Gadcon_Client *gcc; + Evas_Object *obj; + + News_Config_Item *config; + E_Config_Dialog *config_dialog; + E_Config_Dialog *config_dialog_content; + E_Menu *menu; + E_Menu *menu_browser; + + struct + { + Evas_Object *box; + Evas_Object *obj_mode_one; + } view; + + /* TODO: a counter from 10 to 0 incremented every retry + for any feed linked to this item. + when it reaches 0, we look at the feed(s) wich failed + and we alert the user via a popup + (if all feeds have failed, special popup "connection pb") */ + int loading_state; + + int unread_count; + + News_Viewer *viewer; +}; + + +News_Item *news_item_new(E_Gadcon_Client *gcc, Evas_Object *obj); +void news_item_free(News_Item *ni); + +void news_item_refresh(News_Item *ni, int changed_order, int changed_content, int changed_state); +void news_item_orient_set(News_Item *ni, int horizontal); + +void news_item_loadingstate_refresh(News_Item *ni); + +void news_item_unread_count_change(News_Item *ni, int nb); + +#endif +#endif diff --git a/src/module/news_menu.c b/src/module/news_menu.c new file mode 100644 index 0000000..a04aa13 --- /dev/null +++ b/src/module/news_menu.c @@ -0,0 +1,301 @@ +#include "News.h" + +static void _menu_append(E_Menu *mn, News_Item *ni); + +static void _cb_configure_feed(void *data, E_Menu *m, E_Menu_Item *mi); +static void _cb_configure_item(void *data, E_Menu *m, E_Menu_Item *mi); +static void _cb_configure_item_content(void *data, E_Menu *m, E_Menu_Item *mi); +static void _cb_configure_main(void *data, E_Menu *m, E_Menu_Item *mi); +static void _cb_configure_feeds(void *data, E_Menu *m, E_Menu_Item *mi); + +static void _cb_item_deactivate_post(void *data, E_Menu *m); +static void _cb_item_setasread(void *data, E_Menu *m, E_Menu_Item *mi); +static void _cb_item_update(void *data, E_Menu *m, E_Menu_Item *mi); + +static void _cb_feed_deactivate_post(void *data, E_Menu *m); + +static void _cb_browser_deactivate_post(void *data, E_Menu *m); +static void _cb_browser_feed(void *data, E_Menu *m, E_Menu_Item *mi); + +/* + * Public functions + */ + +int +news_menu_item_show(News_Item *ni) +{ + E_Menu *mn; + + mn = e_menu_new(); + e_menu_post_deactivate_callback_set(mn, _cb_item_deactivate_post, ni); + + _menu_append(mn, ni); + + ni->menu = mn; + + return 1; +} + +void +news_menu_item_hide(News_Item *ni) +{ + e_menu_post_deactivate_callback_set(ni->menu, NULL, NULL); + _cb_item_deactivate_post(ni, ni->menu); +} + +int +news_menu_feed_show(News_Feed *f) +{ + E_Menu *mn; + E_Menu_Item *mi; + + mn = e_menu_new(); + e_menu_post_deactivate_callback_set(mn, _cb_feed_deactivate_post, f); + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Configure this feed")); + if (f->icon && f->icon[0]) + e_menu_item_icon_file_set(mi, f->icon); + e_menu_item_callback_set(mi, _cb_configure_feed, f); + + mi = e_menu_item_new(mn); + e_menu_item_separator_set(mi, 1); + + _menu_append(mn, f->item); + + f->menu = mn; + + return 1; +} + +void +news_menu_feed_hide(News_Feed *f) +{ + e_menu_post_deactivate_callback_set(f->menu, NULL, NULL); + _cb_feed_deactivate_post(f, f->menu); +} + +int +news_menu_browser_show(News_Item *ni) +{ + E_Menu *mn; + E_Menu_Item *mi; + char buf[4096]; + + mn = e_menu_new(); + e_menu_post_deactivate_callback_set(mn, _cb_browser_deactivate_post, ni); + + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + if (!_feed->doc) continue; + mi = e_menu_item_new(mn); + if (_feed->doc->unread_count) + snprintf(buf, sizeof(buf), "[UNREAD] %s", _feed->name); + else + snprintf(buf, sizeof(buf), "%s", _feed->name); + e_menu_item_label_set(mi, buf); + if (_feed->icon && _feed->icon[0]) + e_menu_item_icon_file_set(mi, _feed->icon); + e_menu_item_callback_set(mi, _cb_browser_feed, _feed); + NEWS_ITEM_FEEDS_FOREACH_END(); + + ni->menu_browser = mn; + + return 1; +} + +void +news_menu_browser_hide(News_Item *ni) +{ + e_menu_post_deactivate_callback_set(ni->menu_browser, NULL, NULL); + _cb_browser_deactivate_post(ni, ni->menu_browser); +} + + +/* + * Private functions + * + */ + +static void +_menu_append(E_Menu *mn, News_Item *ni) +{ + E_Menu *mn_conf; + E_Menu_Item *mi; + + if (ni->config->feed_refs) + { + if (ni->unread_count) + { + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Set all feeds as read")); + news_theme_menu_icon_set(mi, NEWS_THEME_ICON_SETASREAD); + e_menu_item_callback_set(mi, _cb_item_setasread, ni); + } + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Update all feeds")); + news_theme_menu_icon_set(mi, NEWS_THEME_ICON_UPDATE); + e_menu_item_callback_set(mi, _cb_item_update, ni); + + mi = e_menu_item_new(mn); + e_menu_item_separator_set(mi, 1); + } + + mn_conf = e_menu_new(); + + mi = e_menu_item_new(mn_conf); + e_menu_item_label_set(mi, _("Configure gadget")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); + e_menu_item_callback_set(mi, _cb_configure_item, ni); + mi = e_menu_item_new(mn_conf); + e_menu_item_label_set(mi, _("Configure gadget content")); + news_theme_menu_icon_set(mi, "icon"); + e_menu_item_callback_set(mi, _cb_configure_item_content, ni); + mi = e_menu_item_new(mn_conf); + e_menu_item_label_set(mi, _("Main Configuration")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); + e_menu_item_callback_set(mi, _cb_configure_main, NULL); + mi = e_menu_item_new(mn_conf); + e_menu_item_label_set(mi, _("Feeds Configuration")); + news_theme_menu_icon_set(mi, "icon"); + e_menu_item_callback_set(mi, _cb_configure_feeds, NULL); + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Configuration")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); + e_menu_item_submenu_set(mi, mn_conf); + + e_gadcon_client_util_menu_items_append(ni->gcc, mn, 0); +} + +static void +_cb_configure_feed(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Feed *f; + + f = data; + if (!f) return; + if (f->config_dialog) return; + + news_config_dialog_feed_show(f); +} + +static void +_cb_configure_item(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Item *ni; + + ni = data; + if (!ni) return; + if (ni->config_dialog) return; + + news_config_dialog_item_show(ni); +} + +static void +_cb_configure_item_content(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Item *ni; + + ni = data; + if (!ni) return; + if (ni->config_dialog_content) return; + + news_config_dialog_item_content_show(ni); +} + +static void +_cb_configure_main(void *data, E_Menu *m, E_Menu_Item *mi) +{ + if (!news) return; + if (news->config_dialog) return; + + news_config_dialog_show(); +} + +static void +_cb_configure_feeds(void *data, E_Menu *m, E_Menu_Item *mi) +{ + if (!news) return; + if (news->config_dialog_feeds) return; + + news_config_dialog_feeds_show(); +} + +static void +_cb_item_deactivate_post(void *data, E_Menu *m) +{ + News_Item *ni; + + ni = data; + if (!ni) return; + if (!ni->menu) return; + + e_object_del(E_OBJECT(ni->menu)); + ni->menu = NULL; +} + +static void +_cb_item_setasread(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Item *ni; + + ni = data; + + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + news_feed_read_set(_feed); + NEWS_ITEM_FEEDS_FOREACH_END(); +} + +static void +_cb_item_update(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Item *ni; + + ni = data; + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + news_feed_update(_feed); + NEWS_ITEM_FEEDS_FOREACH_END(); +} + +static void +_cb_feed_deactivate_post(void *data, E_Menu *m) +{ + News_Feed *f; + + f = data; + if (!f) return; + if (!f->menu) return; + + e_object_del(E_OBJECT(f->menu)); + f->menu = NULL; +} + +static void +_cb_browser_deactivate_post(void *data, E_Menu *m) +{ + News_Item *ni; + + ni = data; + if (!ni) return; + if (!ni->menu_browser) return; + + e_object_del(E_OBJECT(ni->menu_browser)); + ni->menu_browser = NULL; +} + +static void +_cb_browser_feed(void *data, E_Menu *m, E_Menu_Item *mi) +{ + News_Feed *feed; + News_Item *ni; + + feed = data; + ni = feed->item; + if (!ni) return; + + if (ni->config->browser_open_home) + news_util_browser_open(feed->url_home); + else + news_util_browser_open(feed->url_feed); +} + diff --git a/src/module/news_menu.h b/src/module/news_menu.h new file mode 100644 index 0000000..fa477a2 --- /dev/null +++ b/src/module/news_menu.h @@ -0,0 +1,20 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + + + +#else + +#ifndef NEWS_MENU_H_INCLUDED +#define NEWS_MENU_H_INCLUDED + +int news_menu_item_show(News_Item *ni); +void news_menu_item_hide(News_Item *ni); + +int news_menu_feed_show(News_Feed *f); +void news_menu_feed_hide(News_Feed *f); + +int news_menu_browser_show(News_Item *ni); +void news_menu_browser_hide(News_Item *ni); + +#endif +#endif diff --git a/src/module/news_parse.c b/src/module/news_parse.c new file mode 100644 index 0000000..99e3c59 --- /dev/null +++ b/src/module/news_parse.c @@ -0,0 +1,384 @@ +#include "News.h" +#include "news_parse_private.h" + +static Evas_List *_parsers; + +static int _parse_type(News_Feed_Document *doc); +static void _update_doc(News_Parse *parser); + +/* + * Public functions + */ + +int +news_parse_init(void) +{ + _parsers = NULL; + + return 1; +} + +void +news_parse_shutdown(void) +{ + News_Parse *p; + + while (_parsers) + { + p = _parsers->data; + news_parse_stop(p->doc); + _parsers = evas_list_remove_list(_parsers, _parsers); + } +} + +void +news_parse_go(News_Feed_Document *doc, + void (cb_func) (News_Feed_Document *doc, News_Parse_Error error, int changes)) +{ + News_Parse *parser; + + if (doc->parse.parser) return; + + if (!_parse_type(doc)) + { + if (doc->articles && evas_list_count(doc->articles)) + cb_func(doc, NEWS_PARSE_ERROR_TYPE_UNKNOWN, 0); + else + cb_func(doc, NEWS_PARSE_ERROR_TYPE_UNKNOWN, 1); + return; + } + + parser = E_NEW(News_Parse, 1); + parser->doc = doc; + parser->cb_func = cb_func; + parser->buffer_pos = parser->doc->server.buffer; + + doc->parse.parser = parser; + _parsers = evas_list_append(_parsers, parser); + + switch (doc->parse.type) + { + case NEWS_FEED_TYPE_RSS: + news_parse_rss_go(parser); + break; + case NEWS_FEED_TYPE_ATOM: + news_parse_atom_go(parser); + break; + case NEWS_FEED_TYPE_UNKNOWN: + break; + } +} + +void +news_parse_stop(News_Feed_Document *doc) +{ + if (!doc->parse.parser) return; + + DPARSE(("Parse STOP")); + + news_parse_free(doc->parse.parser); + _parsers = evas_list_remove(_parsers, + doc->parse.parser); + doc->parse.parser = NULL; +} + + +/* + * Functions avalaible to parse files only + */ + +char * +news_parse_meta_block_find(char **buf) +{ + char *p1, *p2; + + if (!buf || !(*buf) || !(**buf)) return NULL; + + p1 = *buf; + while (p1 && (*p1 != '>')) p1++; + if ( !p1 || !(*p1) || (*(p1-1) == '/') || !(*(p1+1)) ) return NULL; + p1++; + *buf = p1; + + p2 = news_parse_meta_block_end(*buf, 0, 1); + if (!p2) return NULL; + + return p2; +} + +char * +news_parse_meta_block_end(char *buf, int beg_before, int end_before) +{ + char *p; + int layer; + + if (!buf || !(*buf)) return NULL; + + p = buf; + layer = 0; + + DPARSE(("Looking for end meta block (%20.20s)", p)); + + if (beg_before) + { + /* Looking for autoclosing meta */ + while (*p && (*p != '>')) p++; + if (*(p-1) == '/') + { + DPARSE(("Searching end of an autoclosing meta !")); + return buf; + } + p++; + } + + while (*p) + { + /* look for meta */ + while (*p && (*p != '<')) + p++; + if (*(p + 1)) + { + /* closing meta */ + if (*(p + 1) == '/') + { + if (!layer) goto done; + layer--; + } + else + { + /* cdata meta, direct skip + * because it cant include another one */ + if (*(p + 1) == '!') + { + if (!strncmp(p + 1, "![CDATA", 7)) + { + p = strstr(p + 1, "]>"); + if (!p) + return NULL; + p++; + } + } + else + { + /* looking for autoclosing meta */ + while (*p && (*p != '>')) + p++; + if (*(p-1) == '/') + ; /* skip meta */ + else + layer++; /* opening meta */ + } + } + } + /* next char */ + p++; + } + + DPARSE(("End meta NOT found, prematurate end of doc !")); + return NULL; + + done: + + DPARSE(("End meta found here %15.15s", p)); + + if (end_before) + { + while ( (*p != '<') ) p--; + } + else + { + while ( *p && (*p != '>') ) p++; + if ( !(*p) || !(*(p+1)) ) return NULL; + p++; + } + + return p; +} + +void +news_parse_finished(News_Parse *parser) +{ + News_Feed_Document *doc; + + doc = parser->doc; + + DPARSE(("Parse finished ! %d articles", evas_list_count(parser->articles))); + + if ( (parser->error != NEWS_PARSE_ERROR_TYPE_UNKNOWN) && + (parser->error != NEWS_PARSE_ERROR_NOT_IMPLEMENTED)) + { + _update_doc(parser); + } + + parser->cb_func(doc, parser->error, parser->changes); + parser->idler = NULL; + parser->doc->parse.parser = NULL; + + _parsers = evas_list_remove(_parsers, parser); + news_parse_free(parser); +} + +void +news_parse_free(News_Parse *parser) +{ + if (parser->doc) parser->doc->parse.parser = NULL; + + while (parser->articles) + { + News_Parse_Article *a; + + a = parser->articles->data; + news_parse_article_free(a); + parser->articles = evas_list_remove_list(parser->articles, + parser->articles); + } + if (parser->idler) ecore_idler_del(parser->idler); + if (parser->art) news_parse_article_free(parser->art); + + free(parser); +} + +void +news_parse_article_free(News_Parse_Article *a) +{ + E_FREE(a->title); + E_FREE(a->url); + //E_FREE(a->image); //TODO + E_FREE(a->description); + + free(a); +} + + +/* + * Private functions + */ + +static int +_parse_type(News_Feed_Document *doc) +{ + char *buf, *p; + + buf = doc->server.buffer; + + p = strstr(buf, "parse.type = NEWS_FEED_TYPE_RSS; + sscanf(p + 9, "%f", &doc->parse.version); + return 1; + } + + p = strstr(buf, "parse.type = NEWS_FEED_TYPE_RSS; + doc->parse.version = 1.0; + return 1; + } + + p = strstr(buf, "parse.type = NEWS_FEED_TYPE_ATOM; + doc->parse.version = 1.0; + } + + doc->parse.type = NEWS_FEED_TYPE_UNKNOWN; + doc->parse.version = 0.0; + + return 0; +} + +static void +_update_doc(News_Parse *parser) +{ + News_Parse_Article *pa; + News_Feed_Article *fa; + Evas_List *list, *l; + int pos; + + list = NULL; + + /* create a list of new articles */ + + for (l=parser->articles; l; l=evas_list_next(l)) + { + pa = evas_list_data(l); + if (!pa->article) + { + /* create a brand new article */ + parser->changes = 1; + DPARSE(("** New articles list, create fa %s", pa->title)); + fa = E_NEW(News_Feed_Article, 1); + fa->doc = parser->doc; + fa->title = pa->title; + pa->title = NULL; + fa->url = pa->url; + pa->url = NULL; + fa->description = pa->description; + pa->description = NULL; + + //TODO : call news_util_image_get (get image) + + memcpy(&fa->date, &pa->date, sizeof(fa->date)); + + /* set as unread if its not first parse */ + if (parser->doc->parse.last_time) + news_feed_article_unread_set(fa, 1); + } + else + { + /* remove the article reused from old list */ + DPARSE(("** New articles list, reused fa %s", pa->article->title)); + fa = pa->article; + fa->reused = 0; + parser->doc->articles = evas_list_remove(parser->doc->articles, fa); + } + news_parse_article_free(pa); + + list = evas_list_append(list, fa); + } + evas_list_free(parser->articles); + parser->articles = NULL; + + /* remove old articles, + * except unread articles, we keep them */ + pos = evas_list_count(parser->doc->articles) - 1; + while ((fa = evas_list_nth(parser->doc->articles, pos))) + { + if (!fa->unread || + (parser->doc->unread_count > NEWS_FEED_UNREAD_COUNT_MAX)) + { + news_feed_article_del(fa); + parser->changes = 1; + } + pos--; + } + + /* append the old articles list to the new one */ + for (l=parser->doc->articles; l; l=evas_list_next(l)) + { + fa = l->data; + list = evas_list_append(list, fa); + } + /* and replace the old list by the new one */ + evas_list_free(parser->doc->articles); + parser->doc->articles = list; + + /* DEBUG : list the articles */ + DPARSE(("-- New articles list for feed %s", parser->doc->feed->name)); + for (l=parser->doc->articles; l; l=evas_list_next(l)) + { + fa = evas_list_data(l); + DPARSE(("- %s", fa->title)); + } + DPARSE(("---------")); + + /* + FIXME: + if sorting, no need to KEEP THE ORDER upper, so can optimize + */ +} diff --git a/src/module/news_parse.h b/src/module/news_parse.h new file mode 100644 index 0000000..59667e3 --- /dev/null +++ b/src/module/news_parse.h @@ -0,0 +1,26 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Parse News_Parse; + +typedef enum _News_Parse_Error + { + NEWS_PARSE_ERROR_NO, + NEWS_PARSE_ERROR_BROKEN_FEED, + NEWS_PARSE_ERROR_TYPE_UNKNOWN, + NEWS_PARSE_ERROR_NOT_IMPLEMENTED + } News_Parse_Error; + +#else + +#ifndef NEWS_PARSE_H_INCLUDED +#define NEWS_PARSE_H_INCLUDED + +int news_parse_init(void); +void news_parse_shutdown(void); + +void news_parse_go(News_Feed_Document *doc, + void (cb_func) (News_Feed_Document *doc, News_Parse_Error error, int changes)); +void news_parse_stop(News_Feed_Document *doc); + +#endif +#endif diff --git a/src/module/news_parse_atom.c b/src/module/news_parse_atom.c new file mode 100644 index 0000000..dcfc7ad --- /dev/null +++ b/src/module/news_parse_atom.c @@ -0,0 +1,22 @@ +#include "News.h" +#include "news_parse_private.h" + + +/* + * Public functions + */ + +void +news_parse_atom_go(News_Parse *parser) +{ + //TODO + + parser->error = NEWS_PARSE_ERROR_NOT_IMPLEMENTED; + news_parse_finished(parser); +} + + +/* + * Private functions + * + */ diff --git a/src/module/news_parse_atom.h b/src/module/news_parse_atom.h new file mode 100644 index 0000000..c432a55 --- /dev/null +++ b/src/module/news_parse_atom.h @@ -0,0 +1,11 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +#else + +#ifndef NEWS_PARSE_ATOM_H_INCLUDED +#define NEWS_PARSE_ATOM_H_INCLUDED + +void news_parse_atom_go(News_Parse *parser); + +#endif +#endif diff --git a/src/module/news_parse_private.h b/src/module/news_parse_private.h new file mode 100644 index 0000000..3fca913 --- /dev/null +++ b/src/module/news_parse_private.h @@ -0,0 +1,65 @@ +#ifndef NEWS_PARSE_PRIVATE_H_INCLUDED +#define NEWS_PARSE_PRIVATE_H_INCLUDED + +typedef enum News_Parse_Oc + { + NEWS_PARSE_OC_DETECT_METAS, + NEWS_PARSE_OC_INFOS, + NEWS_PARSE_OC_ARTICLE_BEG, + NEWS_PARSE_OC_ITEM_TITLE, + NEWS_PARSE_OC_ITEM_TITLE_CLEAN, + NEWS_PARSE_OC_ITEM_DATE, + NEWS_PARSE_OC_ITEM_IMAGE, + NEWS_PARSE_OC_ITEM_LINK, + NEWS_PARSE_OC_ITEM_LINK_CLEAN, + NEWS_PARSE_OC_ARTICLE_EXISTS, + NEWS_PARSE_OC_ITEM_DESCRIPTION, + NEWS_PARSE_OC_ITEM_DESCRIPTION_CLEAN, + NEWS_PARSE_OC_ARTICLE_END, + NEWS_PARSE_OC_END + } News_Parse_Oc; + +typedef struct _News_Parse_Oc_Actions News_Parse_Oc_Actions; +typedef struct _News_Parse_Article News_Parse_Article; + +struct _News_Parse_Oc_Actions +{ + News_Parse_Oc action; + News_Parse_Oc after; +}; + +struct _News_Parse +{ + News_Feed_Document *doc; + void (*cb_func) (News_Feed_Document *doc, News_Parse_Error error, int changes); + char *buffer_pos; + + News_Parse_Oc_Actions oc; + Evas_List *articles; + Ecore_Idler *idler; + News_Parse_Article *art; + int error; + int changes : 1; +}; + +struct _News_Parse_Article +{ + News_Feed_Article *article; + + char *pos_end; + + char *title; + char *url; + char *image; + char *description; + struct tm date; +}; + +char *news_parse_meta_block_find(char **buf); +char *news_parse_meta_block_end(char *buf, int beg_before, int end_before); + +void news_parse_finished(News_Parse *parser); +void news_parse_free(News_Parse *parser); +void news_parse_article_free(News_Parse_Article *a); + +#endif diff --git a/src/module/news_parse_rss.c b/src/module/news_parse_rss.c new file mode 100644 index 0000000..f890535 --- /dev/null +++ b/src/module/news_parse_rss.c @@ -0,0 +1,692 @@ +#include "News.h" +#include "news_parse_private.h" + +static int _idler(void *data); +static const char * _parse_infos_item(News_Parse *parser, char *meta, const char *prev, int *edit); + +static News_Parse_Error _parse_detect_metas(News_Parse *parser); +static News_Parse_Error _parse_infos(News_Parse *parser); +static News_Parse_Error _parse_article_init(News_Parse *parser); +static News_Parse_Error _parse_article_exists(News_Parse *parser); +static News_Parse_Error _parse_article_end(News_Parse *parser); +static News_Parse_Error _parse_item_title(News_Parse *parser); +static News_Parse_Error _parse_item_date(News_Parse *parser); +static News_Parse_Error _parse_item_image(News_Parse *parser); +static News_Parse_Error _parse_item_link(News_Parse *parser); +static News_Parse_Error _parse_item_description(News_Parse *parser); +static News_Parse_Error _parse_item_clean(News_Parse *parser); + +/* + * Public functions + */ + +void +news_parse_rss_go(News_Parse *parser) +{ + parser->articles = NULL; + parser->oc.action = NEWS_PARSE_OC_DETECT_METAS; + parser->idler = ecore_idler_add(_idler, parser); +} + + +/* + * Private functions + * + */ + +static int +_idler(void *data) +{ + News_Parse *parser; + News_Parse_Error err; + + parser = data; + + switch(parser->oc.action) + { + case NEWS_PARSE_OC_DETECT_METAS: + err = _parse_detect_metas(parser); + parser->oc.action = NEWS_PARSE_OC_INFOS; + break; + case NEWS_PARSE_OC_INFOS: + err = _parse_infos(parser); + parser->oc.action = NEWS_PARSE_OC_ARTICLE_BEG; + break; + case NEWS_PARSE_OC_ARTICLE_BEG: + err = _parse_article_init(parser); + if (parser->oc.action == NEWS_PARSE_OC_END) break; + parser->oc.action = NEWS_PARSE_OC_ITEM_TITLE; + break; + case NEWS_PARSE_OC_ARTICLE_END: + err = _parse_article_end(parser); + parser->oc.action = NEWS_PARSE_OC_ARTICLE_BEG; + break; + case NEWS_PARSE_OC_ITEM_TITLE: + err = _parse_item_title(parser); + parser->oc.action = NEWS_PARSE_OC_ITEM_TITLE_CLEAN; + parser->oc.after = NEWS_PARSE_OC_ITEM_DATE; + break; + case NEWS_PARSE_OC_ITEM_DATE: + err = _parse_item_date(parser); + parser->oc.action = NEWS_PARSE_OC_ITEM_LINK; + break; + case NEWS_PARSE_OC_ITEM_LINK: + err = _parse_item_link(parser); + parser->oc.action = NEWS_PARSE_OC_ITEM_LINK_CLEAN; + parser->oc.after = NEWS_PARSE_OC_ARTICLE_EXISTS; + break; + case NEWS_PARSE_OC_ARTICLE_EXISTS: + err = _parse_article_exists(parser); + if (parser->oc.action == NEWS_PARSE_OC_ARTICLE_END) break; + parser->oc.action = NEWS_PARSE_OC_ITEM_IMAGE; + break; + case NEWS_PARSE_OC_ITEM_IMAGE: + err = _parse_item_image(parser); + parser->oc.action = NEWS_PARSE_OC_ITEM_DESCRIPTION; + break; + case NEWS_PARSE_OC_ITEM_DESCRIPTION: + err = _parse_item_description(parser); + parser->oc.action = NEWS_PARSE_OC_ITEM_DESCRIPTION_CLEAN; + parser->oc.after = NEWS_PARSE_OC_ARTICLE_END; + break; + case NEWS_PARSE_OC_ITEM_TITLE_CLEAN: + case NEWS_PARSE_OC_ITEM_LINK_CLEAN: + case NEWS_PARSE_OC_ITEM_DESCRIPTION_CLEAN: + err = _parse_item_clean(parser); + parser->oc.action = parser->oc.after; + break; + case NEWS_PARSE_OC_END: + news_parse_finished(parser); + return 0; + } + + /* error returned */ + if (err) + { + parser->error = err; + parser->oc.action = NEWS_PARSE_OC_END; + } + + return 1; +} + +static const char * +_parse_infos_item(News_Parse *parser, char *meta, const char *prev, int *edit) +{ + const char *item; + char *ibeg, *iend; + int ilen; + char buf[8192]; + + item = prev; + ibeg = strstr(parser->buffer_pos, meta); + if ( ibeg && + (ibeg < (parser->doc->server.buffer + parser->doc->server.buffer_size)) && + (iend = news_parse_meta_block_find(&ibeg)) ) + { + ilen = iend - ibeg; + if ( !prev || (prev && strncmp(ibeg, prev, ilen)) ) + { + memcpy(buf, ibeg, ilen); + buf[ilen] = '\0'; + item = evas_stringshare_add(buf); + *edit = 1; + } + } + + return item; +} + +static News_Parse_Error +_parse_detect_metas(News_Parse *parser) +{ + News_Feed *feed; + News_Feed_Document *doc; + int ver; + + doc = parser->doc; + feed = doc->feed; + ver = doc->parse.version; + + /* already done in a previous update ? */ + if (doc->parse.meta_channel) return NEWS_PARSE_ERROR_NO; + + if (ver == 1.0) + { + if (strstr(doc->server.buffer, "parse.meta_article = evas_stringshare_add("parse.meta_article = evas_stringshare_add(""); + + if (strstr(doc->server.buffer, "parse.meta_channel = evas_stringshare_add("parse.meta_channel = evas_stringshare_add(""); + + doc->parse.meta_date = evas_stringshare_add(" 0.0) && (ver <= 2.0)) + { + doc->parse.meta_article = evas_stringshare_add(""); + doc->parse.meta_channel = evas_stringshare_add(""); + doc->parse.meta_date = evas_stringshare_add("parse.meta_channel) + return NEWS_PARSE_ERROR_TYPE_UNKNOWN; + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_infos(News_Parse *parser) +{ + News_Feed *feed; + const char *name, *language, *description, *url_home, *icon; + int edit = 0; + + /* already done in a previous update ? */ + if (parser->doc->parse.got_infos) return NEWS_PARSE_ERROR_NO; + + feed = parser->doc->feed; + name = feed->name; + language = feed->language; + description = feed->description; + url_home = feed->url_home; + icon = feed->icon; + + if (feed->name_ovrw) + name = _parse_infos_item(parser, "name, &edit); + if (feed->language_ovrw) + language = _parse_infos_item(parser, "language, &edit); + if (feed->description_ovrw) + description = _parse_infos_item(parser, "description, &edit); + if (feed->url_home_ovrw) + url_home = _parse_infos_item(parser, "url_home, &edit); + //TODO handle feed image from server + /*if (feed->icon_ovrw) + icon = _parse_infos_item(parser, "icon, &edit); */ + + if (edit) + { + news_feed_edit(feed, + (char *)name, feed->name_ovrw, + (char *)language, feed->language_ovrw, + (char *)description, feed->description_ovrw, + (char *)url_home, feed->url_home_ovrw, + (char *)feed->url_feed, + (char *)icon, feed->icon_ovrw, + feed->urgent, + feed->category, + 0); + if (feed->item && feed->item->viewer) + news_viewer_refresh(feed->item->viewer); + news_feed_lists_refresh(1); + } + + parser->doc->parse.got_infos = 1; + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_article_init(News_Parse *parser) +{ + News_Parse_Article *art; + char *pos; + char *p1, *p2; + + pos = parser->buffer_pos; + + if (pos >= (parser->doc->server.buffer + parser->doc->server.buffer_size)) + { + parser->oc.action = NEWS_PARSE_OC_END; + return NEWS_PARSE_ERROR_NO; + } + + p1 = strstr(pos, parser->doc->parse.meta_article); // FIXME: valgrind says "Invalid read of size 1" ... ??? maybe valgrind is lost + if (!p1) + { + if (evas_list_count(parser->articles)) + { + parser->oc.action = NEWS_PARSE_OC_END; + return NEWS_PARSE_ERROR_NO; + } + return NEWS_PARSE_ERROR_BROKEN_FEED; + } + p2 = news_parse_meta_block_end(p1, 1, 1); + if (!p2) return NEWS_PARSE_ERROR_BROKEN_FEED; + + art = E_NEW(News_Parse_Article, 1); + art->pos_end = p2; + + parser->art = art; + parser->buffer_pos = p1; + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_article_exists(News_Parse *parser) +{ + News_Parse_Article *art; + News_Feed_Article *a; + Evas_List *l; + + art = parser->art; + + if (!parser->doc->articles || + !evas_list_count(parser->doc->articles)) + return NEWS_PARSE_ERROR_NO; + + DPARSE(("ALREADY EXISTS : Go %s %s", + art->url, art->title)); + for (l=parser->doc->articles; l; l=evas_list_next(l)) + { + a = l->data; + + if ( + ( !a->reused ) + && + ( !news_util_datecmp(&art->date, &a->date) ) + && + ( ( (art->title && a->title) && + !strcmp(art->title, a->title) ) || + (!art->title && !a->title) ) + ) + { + art->article = a; + a->reused = 1; + parser->oc.action = NEWS_PARSE_OC_ARTICLE_END; + DPARSE(("ALREADY EXISTS : MATCH !!!")); + return NEWS_PARSE_ERROR_NO; + } + DD(("ALREADY EXISTS : NO Match %s %s", + a->url, a->title)); + } + + DPARSE(("ALREADY_EXISTS : DOES NOT exists")); + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_article_end(News_Parse *parser) +{ + parser->articles = evas_list_append(parser->articles, + parser->art); + parser->buffer_pos = parser->art->pos_end; + DPARSE(("Parse article %s end", parser->art->title)); + parser->art = NULL; + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_title(News_Parse *parser) +{ + News_Parse_Article *art; + char *pos; + char *p1, *p2; + int len; + + art = parser->art; + pos = parser->buffer_pos; + + p1 = strstr(pos, "pos_end) + { + len = p2 - p1; + art->title = E_NEW(char, len+1); + memcpy(art->title, p1, len); + art->title[len] = '\0'; + } + else + { + art->title = strdup("No title"); + } + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_date(News_Parse *parser) +{ + News_Parse_Article *art; + char *pos, *date; + char *p1, *p2; + int len, i; + struct tm *tm; + + art = parser->art; + pos = parser->buffer_pos; + + p1 = strstr(pos, parser->doc->parse.meta_date); + p2 = news_parse_meta_block_find(&p1); + if (!p2) return NEWS_PARSE_ERROR_BROKEN_FEED; + if (p2 >= art->pos_end) return NEWS_PARSE_ERROR_BROKEN_FEED; + + len = p2 - p1; + date = p1; + tm = &art->date; + DD(("DATE LEN %d", len)); + + if ((parser->doc->parse.version == 1.0) && + (len >= 22)) + { + sscanf(date, "%4d", &i); + tm->tm_year = i - 1900; + sscanf(date+5, "%2d", &tm->tm_mon); + tm->tm_mon--; /* tm works with 0-11 */ + sscanf(date+8, "%2d", &tm->tm_mday); + sscanf(date+11, "%2d", &tm->tm_hour); + sscanf(date+14, "%2d", &tm->tm_min); + if (date[16] == ':') /* seconds are precised ? */ + sscanf(date+17, "%2d", &tm->tm_sec); + else + tm->tm_sec = 0; + DD(("DATE seconds %d", tm->tm_sec)); + } + else if (len >= 25) + { + sscanf(date+5, "%2d", &tm->tm_mday); + if (!strncmp(date+8, "Jan", 3)) tm->tm_mon = 0; + else if (!strncmp(date+8, "Feb", 3)) tm->tm_mon = 1; + else if (!strncmp(date+8, "Mar", 3)) tm->tm_mon = 2; + else if (!strncmp(date+8, "Apr", 3)) tm->tm_mon = 3; + else if (!strncmp(date+8, "May", 3)) tm->tm_mon = 4; + else if (!strncmp(date+8, "Jun", 3)) tm->tm_mon = 5; + else if (!strncmp(date+8, "Jul", 3)) tm->tm_mon = 6; + else if (!strncmp(date+8, "Aug", 3)) tm->tm_mon = 7; + else if (!strncmp(date+8, "Sep", 3)) tm->tm_mon = 8; + else if (!strncmp(date+8, "Oct", 3)) tm->tm_mon = 9; + else if (!strncmp(date+8, "Nov", 3)) tm->tm_mon = 10; + else if (!strncmp(date+8, "Dec", 3)) tm->tm_mon = 11; + else tm->tm_mon = 0; + sscanf(date+12, "%4d", &i); + tm->tm_year = i - 1900; + sscanf(date+17, "%2d", &tm->tm_hour); + sscanf(date+20, "%2d", &tm->tm_min); + sscanf(date+23, "%2d", &tm->tm_sec); + } + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_image(News_Parse *parser) +{ + // TODO parse and ecore_download + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_link(News_Parse *parser) +{ + News_Parse_Article *art; + char *pos; + char *p1, *p2; + int len; + + art = parser->art; + pos = parser->buffer_pos; + + p1 = strstr(pos, "pos_end) + { + len = p2 - p1; + art->url = E_NEW(char, len+1); + memcpy(art->url, p1, len); + art->url[len] = '\0'; + } + else + { + art->url = strdup("No link"); + } + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_description(News_Parse *parser) +{ + News_Parse_Article *art; + char *pos; + char *p1, *p2; + int len; + + art = parser->art; + pos = parser->buffer_pos; + + p1 = strstr(pos, "pos_end) + { + len = p2 - p1; + art->description = E_NEW(char, len+1); + memcpy(art->description, p1, len); + art->description[len] = '\0'; + } + else + { + art->description = strdup("No content"); + } + + return NEWS_PARSE_ERROR_NO; +} + +static News_Parse_Error +_parse_item_clean(News_Parse *parser) +{ + char *buf, *p; + char **buf_org; + int size; + int new_size; /* future size, to avoid realloc on each memmove */ + + switch (parser->oc.action) + { + case NEWS_PARSE_OC_ITEM_TITLE_CLEAN: + buf_org = &parser->art->title; + break; + case NEWS_PARSE_OC_ITEM_LINK_CLEAN: + buf_org = &parser->art->url; + break; + case NEWS_PARSE_OC_ITEM_DESCRIPTION_CLEAN: + buf_org = &parser->art->description; + break; + default: + return NEWS_PARSE_ERROR_NO; + } + + buf = *buf_org; + if (!buf) return NEWS_PARSE_ERROR_NO; /* nothing to clean, ok */ + p = buf; + size = strlen(buf) + 1; + new_size = size; + + while (*p) + { + //DPARSE(("%d %d ------\n%30.30s", size, new_size, p)); + /* skip metas inside text */ + if (*p == '<') + { + char *p2; + + /* skip cfdata */ + if (*(p + 1) == '!') + { + if (!strncmp(p, ") */ + if (*p2 == '&') + { + if (!strncmp(p2 + 1, "gt;", 3)) + { + p2 += 3; + break; + } + } + } + while (*p2 && (*p2 != '>')); + if (*p2) + { + memmove(p, p2 + 1, strlen(p2 + 1) + 1); + new_size -= ((p2 + 1) - p); + } + else + { + *p = '\0'; + new_size -= (p2 - p); + } + } + } + else if (*p == ']') /* skip end cfdata */ + { + if (!strncmp(p + 1, "]>", 2)) + { + memmove(p, p + 3, strlen(p + 3) + 1); + new_size -= 3; + } + else + p++; /* next char */ + } + else if (*p == 0xa) /* \n */ + { + if (parser->oc.action == NEWS_PARSE_OC_ITEM_TITLE) + { + memmove(p, p + 1, strlen(p + 1) + 1); + new_size -= 1; + } + else + { + new_size += 3; + if (new_size > size) + { + int diff; + + diff = p - buf; + size = new_size; + buf = realloc(buf, size); + p = buf + diff; + } + DPARSE(("buf %p p %p new_size %d strlen(buf) %d strlen(p) %d\np :\n%30.30s\n", buf, p, new_size, (int)strlen(buf), (int)strlen(p), p )); + memmove(p + 3, p, strlen(p) + 1); + *p = '<'; + *(p + 1) = 'b'; + *(p + 2) = 'r'; + *(p + 3) = '>'; + p = p + 4; + } + } + else if (*p == 0x9) /* \t */ + { + if (parser->oc.action == NEWS_PARSE_OC_ITEM_TITLE) + { + memmove(p, p + 1, strlen(p + 1) + 1); //FIXME : strlen(p) ? EVERYWHERE ? + new_size -= 1; + } + else + { + new_size += 4; + if (new_size > size) + { + int diff; + + diff = p - buf; + size = new_size; + buf = realloc(buf, size); + p = buf + diff; + } + memmove(p + 4, p, strlen(p) + 1); + *p = '<'; + *(p + 1) = 't'; + *(p + 2) = 'a'; + *(p + 3) = 'b'; + *(p + 4) = '>'; + p = p + 5; + } + } + else if (*p == 0xd) /* \??? (newline) to nothing */ + { + memmove(p, p + 1, strlen(p + 1) + 1); + new_size -= 1; + } + else if (*p == '&') /* html codes */ + { + /* < convertion to < + * > is checked when skipping meta */ + if (!strncmp(p + 1, "lt;", 3)) + { + memmove(p + 1, p + 4, strlen(p + 4) + 1); + new_size -= 3; + *p = '<'; + } + else if (0) /* TODO: add html chars convertion */ + { + + } + else if (*(p + 1) == '#') /* ascii hexadecimal char */ + { + char b[4]; + unsigned int i; + int len; + char *p2 = p + 2; + + /* dec->hex */ + //TODO: FIX ! + while (*p2 != ';') + p2++; + p2++; + if (((p2 - p) == 3) || (p2 - p) > 6) + p = p2; /* next char */ + else //TODO: STOPPED HERE + { + if (!sscanf(p + 2, "%d", &i)) + p = p2 + 1; /* next char */ + else + { + snprintf(b, sizeof(b), "%c", i); + len = strlen(b); + memmove(p + 1, p2, strlen(p2) + 1); + new_size -= (p2 - p - 1); + memcpy(p, b, len); + } + } + } + else + p++; /* next char */ + } + else + p++; /* nothing interesting :) next char */ + } + + + DPARSE(("Item clean: size: %d new_size: %d", size, new_size)); + + buf = realloc(buf, new_size); + *buf_org = buf; + + return NEWS_PARSE_ERROR_NO; +} diff --git a/src/module/news_parse_rss.h b/src/module/news_parse_rss.h new file mode 100644 index 0000000..893d0af --- /dev/null +++ b/src/module/news_parse_rss.h @@ -0,0 +1,11 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +#else + +#ifndef NEWS_PARSE_RSS_H_INCLUDED +#define NEWS_PARSE_RSS_H_INCLUDED + +void news_parse_rss_go(News_Parse *parser); + +#endif +#endif diff --git a/src/module/news_popup_warn.c b/src/module/news_popup_warn.c new file mode 100644 index 0000000..d6e963f --- /dev/null +++ b/src/module/news_popup_warn.c @@ -0,0 +1,235 @@ +#include "News.h" + +static Evas_List *_popups_warn; + +static void _check_overlap(int *px, int *py, int *pw, int *ph, int tries, int org_x, int org_y); +static void _try_close(News_Popup_Warn *popw); + +static int _cb_timer(void *data); +static void _cb_edje_close(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _cb_edje_desactivate(void *data, Evas_Object *obj, const char *emission, const char *source); +/* + * Public functions + */ + +int +news_popup_warn_init(void) +{ + _popups_warn = NULL; + + return 1; +} + +void +news_popup_warn_shutdown(void) +{ + Evas_List *l; + + for (l = _popups_warn; l; l = evas_list_next(l)) + { + News_Popup_Warn *p; + p = evas_list_data(l); + news_popup_warn_del(p); + } + evas_list_free(_popups_warn); + _popups_warn = NULL; +} + +News_Popup_Warn * +news_popup_warn_add(int type, const char *title, const char *text, int timer, int (*func_close) (News_Popup_Warn *popw, void *data), void (func_desactivate) (News_Popup_Warn *popw, void *data), void *data) +{ + E_Zone *zone; + News_Popup_Warn *popw; + int fw, fh; + int ecanvas_w, ecanvas_h; + + popw = E_NEW(News_Popup_Warn, 1); + + popw->type = type; + popw->timer_org = timer; + + zone = e_util_zone_current_get(e_manager_current_get()); + news_util_ecanvas_geometry_get(&ecanvas_w, &ecanvas_h); + + /* pop */ + popw->pop = e_popup_new(zone, 0, 0, 1, 1); + if (!popw->pop) + { + news_popup_warn_del(popw); + return 0; + } + evas_event_freeze(popw->pop->evas); + e_popup_layer_set(popw->pop, 255); + + + /* face and tb */ + popw->face = edje_object_add(popw->pop->evas); + news_theme_edje_set(popw->face, NEWS_THEME_POPW); + edje_object_signal_callback_add(popw->face, "close", "popup", + _cb_edje_close, popw); + edje_object_signal_callback_add(popw->face, "desactivate", "popup", + _cb_edje_desactivate, popw); + // TODO + + /* log */ + // TODO + + /* update times */ + // TODO + + /* type */ + edje_object_message_send(popw->face, EDJE_MESSAGE_INT, + NEWS_POPUP_WARN_EDJE_MESSAGE_TYPE, + &type); + + /* pos */ + popw->x = ecanvas_w - (fw + 20);; + popw->y = ecanvas_h - (fh + 20);; + popw->w = fw; + popw->h = fh; + + /* timer */ + if (timer) + popw->timer = ecore_timer_add(timer, _cb_timer, popw); + + /* close and desactivate functions */ + popw->func_close = func_close; + if (func_desactivate) + { + int show_desactivate = 1; + + popw->func_desactivate = func_desactivate; + edje_object_message_send(popw->face, EDJE_MESSAGE_INT, + NEWS_POPUP_WARN_EDJE_MESSAGE_SHOW_DESACTIVATE, + &show_desactivate); + } + + /* attach data */ + popw->data = data; + + /* check for popup overlaps */ + _check_overlap(&popw->x, &popw->y, &popw->w, &popw->h, 0, popw->x, popw->y); + e_popup_move_resize(popw->pop, popw->x, popw->y, popw->w, popw->h); + DPOPW(("New: %dx%d : %dx%d", popw->x, popw->y, popw->w, popw->h)); + DPOPW(("New face: %dx%d", fw, fh)); + + /* go ! */ + evas_object_show(popw->face); + e_popup_edje_bg_object_set(popw->pop, popw->face); + evas_event_thaw(popw->pop->evas); + e_popup_show(popw->pop); + + _popups_warn = evas_list_append(_popups_warn, popw); + + return popw; +} + +void +news_popup_warn_del(News_Popup_Warn *popw) +{ + if (popw->timer) + ecore_timer_del(popw->timer); + if (popw->tb) + evas_object_del(popw->tb); + if (popw->face) + evas_object_del(popw->face); + if (popw->pop) + e_object_del(E_OBJECT(popw->pop)); + + _popups_warn = evas_list_remove(_popups_warn, popw); + + free(popw); +} + + +/* + * Private functions + * + */ + +static void +_check_overlap(int *px, int *py, int *pw, int *ph, int tries, int org_x, int org_y) +{ + Evas_List *l; + News_Popup_Warn *p; + int pxw, pyh; + int p_xw, p_yh; + + pxw = *px + *pw; + pyh = *py + *ph; + for (l = _popups_warn; l; l = evas_list_next(l)) + { + p = evas_list_data(l); + p_xw = p->x + p->w; + p_yh = p->y + p->h; + if (((p->x >= *px) && (p->x <= pxw) && + (p->y >= *py) && (p->y <= pyh)) + || + ((*px >= p->x) && (*px <= p_xw) && + (*py >= p->y) && (*py <= p_yh))) + { + /* overlap ! correct coords */ + /* try upper, and then on the left */ + /* TODO...: try down and right, maybe placement policy ? */ + DPOPW(("Overlap !")); + *py = p->y - (*ph + NEWS_POPUP_WARN_OVERLAP_BORDER); + if (*py < 0) + { + *py = org_y; + *px = *px - (*px + NEWS_POPUP_WARN_OVERLAP_BORDER); + if (*px < 0) break; + } + tries++; + if (tries > NEWS_POPUP_WARN_OVERLAP_CHECK_MAX) + return; + else + _check_overlap(px, py, pw, ph, tries, org_x, org_y); + break; + } + } +} + +static void +_try_close(News_Popup_Warn *popw) +{ + int del = 1; + + if (popw->func_close) + { + if (!popw->func_close(popw, popw->data)) + del = 0; + } + + if (del) + news_popup_warn_del(popw); +} + +static int +_cb_timer(void *data) +{ + News_Popup_Warn *popw; + + popw = data; + _try_close(popw); + + return 0; +} + +static void +_cb_edje_close(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + News_Popup_Warn *popw; + + popw = data; + _try_close(popw); +} + +static void +_cb_edje_desactivate(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + News_Popup_Warn *popw; + + popw = data; + if (popw->func_desactivate) + popw->func_desactivate(popw, popw->data); +} diff --git a/src/module/news_popup_warn.h b/src/module/news_popup_warn.h new file mode 100644 index 0000000..151e7f3 --- /dev/null +++ b/src/module/news_popup_warn.h @@ -0,0 +1,57 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Popup_Warn News_Popup_Warn; + +typedef enum _News_Popup_Warn_Active + { + NEWS_POPUP_WARN_ACTIVE_NO, + NEWS_POPUP_WARN_ACTIVE_SUM, + NEWS_POPUP_WARN_ACTIVE_VERBOSE + } News_Popup_Warn_Active; + +typedef enum _News_Popup_Warn_Type + { + NEWS_POPUP_WARN_TYPE_NEWS, + NEWS_POPUP_WARN_TYPE_INFO, + NEWS_POPUP_WARN_TYPE_ERROR + } News_Popup_Warn_Type; + +#else + +#ifndef NEWS_POPUP_WARN_H_INCLUDED +#define NEWS_POPUP_WARN_H_INCLUDED + +#define NEWS_POPUP_WARN_TIMER_S_MIN 2 +#define NEWS_POPUP_WARN_TIMER_S_MAX 60 + +#define NEWS_POPUP_WARN_EDJE_MESSAGE_SHOW_DESACTIVATE 0 +#define NEWS_POPUP_WARN_EDJE_MESSAGE_TYPE 1 + +#define NEWS_POPUP_WARN_OVERLAP_BORDER 15 +#define NEWS_POPUP_WARN_OVERLAP_CHECK_MAX 50 + +struct _News_Popup_Warn +{ + News_Popup_Warn_Type type; + E_Popup *pop; + Evas_Object *face; + Evas_Object *tb; + Evas_List *log; /* 2 consecutive strings for each popup */ + + Ecore_Timer *timer; + int (*func_close) (News_Popup_Warn *popw, void *data); + void (*func_desactivate) (News_Popup_Warn *popw, void *data); + void *data; + + int timer_org; + int x, y, w, h; +}; + +int news_popup_warn_init(void); +void news_popup_warn_shutdown(void); + +News_Popup_Warn *news_popup_warn_add(int type, const char *title, const char *text, int timer, int (*func_close) (News_Popup_Warn *popw, void *data), void (func_desactivate) (News_Popup_Warn *popw, void *data), void *data); +void news_popup_warn_del(News_Popup_Warn *popw); + +#endif +#endif diff --git a/src/module/news_theme.c b/src/module/news_theme.c new file mode 100644 index 0000000..b6bed85 --- /dev/null +++ b/src/module/news_theme.c @@ -0,0 +1,61 @@ +#include "News.h" + + +/* + * Public functions + */ + +int +news_theme_init(void) +{ + const char *path; + char buf[4096]; + + path = e_theme_edje_file_get(NEWS_THEME_IN_E, NEWS_THEME_ITEM); + if (path && path[0]) + news->theme = NULL; + else + { + snprintf(buf, sizeof(buf), "%s/e-module-news.edj", e_module_dir_get(news->module)); + news->theme = strdup(buf); + } + + return 1; +} + +void +news_theme_shutdown(void) +{ + E_FREE(news->theme); +} + +void +news_theme_edje_set(Evas_Object *obj, char *key) +{ + if (!news->theme) + e_theme_edje_object_set(obj, NEWS_THEME_IN_E, key); + else + edje_object_file_set(obj, news->theme, key); +} + +void +news_theme_icon_set(Evas_Object *ic, char *key) +{ + if (!news->theme) + e_util_edje_icon_set(ic, key); + else + e_icon_file_edje_set(ic, news->theme, key); +} + +void +news_theme_menu_icon_set(E_Menu_Item *mi, char *key) +{ + if (!news->theme) + e_util_menu_item_edje_icon_set(mi, key); + else + e_menu_item_icon_edje_set(mi, news->theme, key); +} + +/* + * Private functions + */ diff --git a/src/module/news_theme.h b/src/module/news_theme.h new file mode 100644 index 0000000..2251cf9 --- /dev/null +++ b/src/module/news_theme.h @@ -0,0 +1,33 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +#else + +#ifndef NEWS_THEME_H_INCLUDED +#define NEWS_THEME_H_INCLUDED + +#define NEWS_THEME_IN_E "base/theme/modules/news" + +#define NEWS_THEME_ITEM "modules/news/item" +#define NEWS_THEME_FEED "modules/news/feed" +#define NEWS_THEME_FEEDONE "modules/news/feedone" +#define NEWS_THEME_ARTICLE "modules/news/article" +#define NEWS_THEME_VIEWER "modules/news/viewer" +#define NEWS_THEME_POPW "modules/news/popw" +#define NEWS_THEME_ICON_LOGO "modules/news/icon/logo" +#define NEWS_THEME_ICON_INFOS "modules/news/icon/infos" +#define NEWS_THEME_ICON_VIEWER "modules/news/icon/viewer" +#define NEWS_THEME_ICON_ARTICLE_READ "modules/news/icon/article_read" +#define NEWS_THEME_ICON_ARTICLE_UNREAD "modules/news/icon/article_unread" +#define NEWS_THEME_ICON_UPDATE "modules/news/icon/update" +#define NEWS_THEME_ICON_SETASREAD "modules/news/icon/setasread" + + +int news_theme_init(void); +void news_theme_shutdown(void); + +void news_theme_edje_set(Evas_Object *obj, char *key); +void news_theme_icon_set(Evas_Object *ic, char *key); +void news_theme_menu_icon_set(E_Menu_Item *mi, char *key); + +#endif +#endif diff --git a/src/module/news_utils.c b/src/module/news_utils.c new file mode 100644 index 0000000..6077738 --- /dev/null +++ b/src/module/news_utils.c @@ -0,0 +1,124 @@ +#include "News.h" + + +/* + * Public functions + */ + +int +news_url_image_get(char *url, void (*func_cb) (News_Feed_Document *doc, int error)) +{ + // TODO + + return 0; +} + +int +news_util_ecanvas_geometry_get(int *canvas_w, int *canvas_h) +{ + E_Container *c; + + c = e_container_current_get(e_manager_current_get()); + evas_output_viewport_get(c->bg_evas, + NULL, NULL, + canvas_w, canvas_h); + + return 1; +} + +int +news_util_datecmp(struct tm *t1, struct tm *t2) +{ + if (t1->tm_year != t2->tm_year) + return (t1->tm_year - t2->tm_year); + if (t1->tm_mon != t2->tm_mon) + return (t1->tm_mon - t2->tm_mon); + if (t1->tm_mday != t2->tm_mday) + return (t1->tm_mday - t2->tm_mday); + if (t1->tm_hour != t2->tm_hour) + return (t1->tm_hour - t2->tm_hour); + if (t1->tm_min != t2->tm_min) + return (t1->tm_min - t2->tm_min); + if (t1->tm_sec != t2->tm_sec) + return (t1->tm_sec - t2->tm_sec); + return 0; +} + +int +news_util_browser_open(const char *url) +{ + News_Config *c = news->config; + Ecore_Exe *exe; + char cmd[4096]; + char buf[4096]; + + if (!url) return 0; + + switch(c->browser.wich) + { + case NEWS_UTIL_BROWSER_FIREFOX: + snprintf(cmd, sizeof(cmd), "%s", "firefox -new-window"); + break; + case NEWS_UTIL_BROWSER_MOZILLA: + snprintf(cmd, sizeof(cmd), "%s", "mozilla"); + break; + case NEWS_UTIL_BROWSER_OPERA: + snprintf(cmd, sizeof(cmd), "%s", "opera"); + break; + case NEWS_UTIL_BROWSER_DILLO: + snprintf(cmd, sizeof(cmd), "%s", "dillo"); + break; + case NEWS_UTIL_BROWSER_OWN: + snprintf(cmd, sizeof(cmd), "%s", c->browser.own); + break; + } + + DBROWSER(("Exec %s with %s command", url, cmd)); + snprintf(buf, sizeof(buf), "%s \"%s\"", cmd, url); + exe = ecore_exe_pipe_run(buf, ECORE_EXE_USE_SH, NULL); + if (exe > 0) + ecore_exe_free(exe); + else + { + news_util_message_error_show(_("Error when executing the command" + "for youre browser :

" + "%s"), cmd); + return 0; + } + + return 1; +} + +Evas_List * +news_util_lang_detect(void) +{ + Evas_List *list = NULL; + News_Feed_Lang *lang; + const char *key, *name; + + lang = E_NEW(News_Feed_Lang, 1); + lang->key = evas_stringshare_add("en"); + lang->name = evas_stringshare_add("English"); + list = evas_list_append(list, lang); + + //FIXME is that get from env correct ? + key = getenv("LC_MESSAGES"); + if (!key) key = getenv("LANGUAGE"); + if (!key) key = getenv("LC_ALL"); + if (!key) key = getenv("LANG"); + if (key && strncmp(key, "en", 2) && + (name = news_feed_lang_name_get(key))) + { + lang = E_NEW(News_Feed_Lang, 1); + lang->key = evas_stringshare_add(key); + lang->name = evas_stringshare_add(name); + list = evas_list_append(list, lang); + } + + return list; +} + +/* + * Private functions + * + */ diff --git a/src/module/news_utils.h b/src/module/news_utils.h new file mode 100644 index 0000000..4ebccd3 --- /dev/null +++ b/src/module/news_utils.h @@ -0,0 +1,50 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef enum _News_Util_Browser + { + NEWS_UTIL_BROWSER_FIREFOX, + NEWS_UTIL_BROWSER_MOZILLA, + NEWS_UTIL_BROWSER_OPERA, + NEWS_UTIL_BROWSER_DILLO, + NEWS_UTIL_BROWSER_OWN + } News_Util_Browser; + +#else + +#ifndef NEWS_UTILS_H_INCLUDED +#define NEWS_UTILS_H_INCLUDED + +#define NEWS_UTIL_BROWSER_DEFAULT NEWS_UTIL_BROWSER_FIREFOX + +#define news_util_debug(args...) \ +{ \ + char __tmpbuf[4096]; \ + \ + snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \ + e_module_dialog_show(news->module, _("News Module DEBUG DEBUG DEBUG DEBUG"), __tmpbuf); \ +} +#define news_util_message_show(args...) \ +{ \ + char __tmpbuf[4096]; \ + \ + snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \ + e_module_dialog_show(news->module, _("News Module"), __tmpbuf); \ +} +#define news_util_message_error_show(args...) \ +{ \ + char __tmpbuf[4096]; \ + \ + snprintf(__tmpbuf, sizeof(__tmpbuf), ##args); \ + e_module_dialog_show(news->module, _("News Module Error"), __tmpbuf); \ +} + +int news_util_url_image_get(char *url, void (*func_cb) (News_Feed_Document *doc, int error)); +int news_util_ecanvas_geometry_get(int *canvas_w, int *canvas_h); +const char *news_util_convert_locale_to_utf8(char *txt); +const char *news_util_convert_utf8_to_locale(char *txt); +int news_util_datecmp(struct tm *t1, struct tm *t2); +int news_util_browser_open(const char *url); +Evas_List *news_util_lang_detect(void); + +#endif +#endif diff --git a/src/module/news_viewer.c b/src/module/news_viewer.c new file mode 100644 index 0000000..b0cd461 --- /dev/null +++ b/src/module/news_viewer.c @@ -0,0 +1,1013 @@ +#include "News.h" + +#define VIEWER_CREATE_FAIL(nv, msg) \ +{ \ + news_util_message_error_show(msg); \ + news_viewer_destroy(nv); \ + return 0; \ +} + +static int _dialog_create(News_Viewer *nv); +static void _dialog_destroy(News_Viewer *nv); +static void _dialog_geometry_update(News_Viewer *nv); +static int _dialog_content_create(News_Viewer *nv); +static void _dialog_content_destroy(News_Viewer *nv); +static void _dialog_cb_feed_selected(void *data); +static void _dialog_cb_article_selected(void *data); +static void _dialog_cb_del(void *obj); +static void _dialog_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event); + +static void _vfeeds_buttons_state_refresh(News_Viewer *nv); +static void _vfeeds_cb_button_feed(void *data, void *data2); +static void _vfeeds_cb_button_refresh(void *data, void *data2); +static void _vfeeds_cb_button_setasread(void *data, void *data2); +static void _varticles_refresh(News_Viewer *nv); +static void _vcontent_text_set(News_Viewer *nv, char *text); +static void _vcontent_feed_infos_set(News_Viewer *nv); +static void _vcontent_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); + +static Evas_Object *_article_icon_get(News_Feed_Article *art, Evas *evas); +static Evas_List *_sort_feedrefs_unreadfirst_list_get(News_Item *ni); +static Evas_List *_sort_articles_unreadfirst_list_get(News_Feed *f); +static Evas_List *_sort_articles_unreadfirst(Evas_List *articles); +static Evas_List *_sort_articles_date_list_get(News_Feed *f); +static int _sort_articles_date_list_cb(void *d1, void *d2); + +static Evas_List *_viewers; + + +/* + * Public functions + */ + +int +news_viewer_init(void) +{ + _viewers = NULL; + + return 1; +} + +void +news_viewer_shutdown(void) +{ + News_Viewer *nv; + + while (_viewers) + { + nv = _viewers->data; + news_viewer_destroy(nv); + _viewers = evas_list_remove_list(_viewers, _viewers); + } +} + +void +news_viewer_all_refresh(int force, int recreate) +{ + News_Viewer *nv; + int pos, count, counter; + + pos = 0; + counter = 0; + count = evas_list_count(_viewers); + while (counter < count) + { + nv = evas_list_nth(_viewers, pos); + if (force) + { + NEWS_ITEM_FEEDS_FOREACH_BEG(nv->item); + if (!_feed->doc) continue; + _feed->doc->ui_needrefresh = 1; + NEWS_ITEM_FEEDS_FOREACH_END(); + } + if (recreate) + { + News_Item *ni; + + ni = nv->item; + news_viewer_destroy(nv); + news_viewer_create(ni); + } + else + { + news_viewer_refresh(nv); + pos++; + } + counter++; + } +} + + +int +news_viewer_create(News_Item *ni) +{ + News_Viewer *nv; + + if (ni->viewer) return 0; + + nv = E_NEW(News_Viewer, 1); + nv->item = ni; + + if (!_dialog_create(nv)) + VIEWER_CREATE_FAIL(nv, "Could not create viewer dialog"); + if (!_dialog_content_create(nv)) + VIEWER_CREATE_FAIL(nv, "Could not create viewer dialog content"); + _dialog_geometry_update(nv); + e_win_raise(nv->dialog.dia->win); + + ni->viewer = nv; + _viewers = evas_list_append(_viewers, nv); + + news_viewer_refresh(nv); + + return 1; +} + +void +news_viewer_destroy(News_Viewer *nv) +{ + _dialog_content_destroy(nv); + _dialog_destroy(nv); + + nv->item->viewer = NULL; + _viewers = evas_list_remove(_viewers, nv); + free(nv); +} + +void +news_viewer_refresh(News_Viewer *nv) +{ + Evas_Object *ilist; + Evas_List *feed_refs; + int feed_refs_own = 0; + int pos, toselect_pos; + + if (!nv) return; + + ilist = nv->vfeeds.ilist; + e_widget_ilist_freeze(ilist); + e_widget_ilist_clear(ilist); + if (!evas_list_count(nv->item->config->feed_refs)) + { + nv->vfeeds.selected = NULL; + nv->varticles.selected = NULL; + e_widget_button_icon_set(nv->vfeeds.button_feed, NULL); + e_widget_ilist_clear(nv->varticles.ilist); + _vcontent_text_set(nv, ""); + } + + if (news->config->viewer.vfeeds.unread_first) + { + feed_refs = _sort_feedrefs_unreadfirst_list_get(nv->item); + feed_refs_own = 1; + } + else + feed_refs = nv->item->config->feed_refs; + + DD(("feed_refs_own = %d", feed_refs_own)); + + /* refresh the list of feeds */ + pos = 0; + toselect_pos = -1; + NEWS_ITEM_FEEDS_FOREACH_BEG_LIST(feed_refs); + { + Evas_Object *ic = NULL; + char buf[4096]; + + if (!_feed->doc) continue; + DD(("UI NEED REFRESH = %d (%s)", + _feed->doc->ui_needrefresh, _feed->name)); + + /* add the ui item in the feeds list */ + if (_feed->icon && _feed->icon[0]) + { + ic = e_icon_add(evas_object_evas_get(ilist)); + e_icon_file_set(ic, _feed->icon); + } + //FIXME better unread state display (wait for feed icons) + //FIXME show if its an important feed + if (_feed->doc && _feed->doc->unread_count) + snprintf(buf, sizeof(buf), "[UNREAD] %s", _feed->name); + else + snprintf(buf, sizeof(buf), "%s", _feed->name); + e_widget_ilist_append(ilist, ic, buf, _dialog_cb_feed_selected, _feed, NULL); + if (nv->vfeeds.selected == _feed) + toselect_pos = pos; + + pos++; + } + NEWS_ITEM_FEEDS_FOREACH_END(); + e_widget_ilist_go(ilist); + + /* select a feed */ + if (toselect_pos != -1) + { + e_widget_ilist_selected_set(ilist, toselect_pos); + if ((nv->vfeeds.selected->doc && nv->vfeeds.selected->doc->ui_needrefresh) || + !nv->varticles.selected) + _dialog_cb_feed_selected(nv->vfeeds.selected); + } + else if (!nv->vfeeds.selected && pos) + { + NEWS_ITEM_FEEDS_FOREACH_BEG_LIST(feed_refs); + e_widget_ilist_selected_set(ilist, 0); + _dialog_cb_feed_selected(_feed); + break; + NEWS_ITEM_FEEDS_FOREACH_END(); + } + + if (nv->vfeeds.list_own) + { + if (nv->vfeeds.list) + { + DD(("LIST OWN free !!")); + evas_list_free(nv->vfeeds.list); + nv->vfeeds.list = NULL; + } + nv->vfeeds.list_own = 0; + } + nv->vfeeds.list = feed_refs; + nv->vfeeds.list_own = feed_refs_own; + + _vfeeds_buttons_state_refresh(nv); + + e_widget_ilist_thaw(ilist); +} + +int +news_viewer_feed_select(News_Viewer *nv, News_Feed *feed) +{ + int pos; + int found; + + if (nv->vfeeds.selected == feed) return 1; + + pos = 0; + found = 0; + NEWS_ITEM_FEEDS_FOREACH_BEG_LIST(nv->vfeeds.list); + if (feed == _feed) + { + found = 1; + break; + } + pos++; + NEWS_ITEM_FEEDS_FOREACH_END(); + if (!found) return 0; + + e_widget_ilist_selected_set(nv->vfeeds.ilist, pos); + _dialog_cb_feed_selected(feed); + + return 1; +} + +void +news_viewer_feed_selected_infos_refresh(News_Viewer *nv) +{ + if (!nv->varticles.selected) + _vcontent_feed_infos_set(nv); +} + +void +news_viewer_article_state_refresh(News_Viewer *nv, News_Feed_Article *art) +{ + Evas_List *l; + News_Feed *f; + News_Feed_Article *a; + int pos; + + f = art->doc->feed; + if (nv->vfeeds.selected != f) return; + + pos = 0; + for (l=nv->varticles.list; l; l=evas_list_next(l)) + { + a = l->data; + if (art == a) break; + pos++; + } + if (!l) return; + + e_widget_ilist_nth_icon_set(nv->varticles.ilist, pos, + _article_icon_get(art,evas_object_evas_get(nv->varticles.ilist))); +} + +/* + * Private functions + */ + +static int +_dialog_create(News_Viewer *nv) +{ + Evas_Modifier_Mask mask; + E_Dialog *dia; + char buf[4096]; + + snprintf(buf, sizeof(buf), "_e_mod_news_viewer_%c", nv->item->gcc->id[0]); + dia = e_dialog_new(e_container_current_get(e_manager_current_get()), + "E", buf); + if (!dia) return 0; + + dia->data = nv; + e_object_del_attach_func_set(E_OBJECT(dia), _dialog_cb_del); + + e_dialog_title_set(dia, "News Viewer"); + e_dialog_resizable_set(dia, 1); + e_win_sticky_set(dia->win, 1); + //e_win_layer_set(dia->win, ECORE_X_WINDOW_LAYER_ABOVE); + + mask = 0; + evas_object_key_grab(dia->event_object, "Escape", mask, ~mask, 0); + evas_object_event_callback_add(dia->event_object, EVAS_CALLBACK_KEY_DOWN, _dialog_cb_key_down, nv); + + nv->dialog.dia = dia; + + return 1; +} + +static void +_dialog_destroy(News_Viewer *nv) +{ + if (nv->dialog.dia) + { + nv->dialog.dia->data = NULL; + e_object_del(E_OBJECT(nv->dialog.dia)); + nv->dialog.dia = NULL; + } +} + +static void +_dialog_geometry_update(News_Viewer *nv) +{ + int dia_x, dia_y; + int tab_w, tab_h; + int canvas_w, canvas_h; + + if (!nv->dialog.dia) return; + + /* dialog position : compute dia_x and dia_y */ + e_widget_min_size_get(nv->dialog.tab, &tab_w, &tab_h); + news_util_ecanvas_geometry_get(&canvas_w, &canvas_h); + dia_x = (canvas_w - tab_w) / 2; + dia_y = (canvas_h - tab_h) / 2; + DVIEWER(("diax: %d diay : %d", dia_x, dia_y)); + + /* apply ! */ + e_win_move(nv->dialog.dia->win, dia_x, dia_y); + nv->dialog.x = dia_x; + nv->dialog.y = dia_y; + e_dialog_show(nv->dialog.dia); + e_dialog_border_icon_set(nv->dialog.dia, news->theme); +} + +static int +_dialog_content_create(News_Viewer *nv) +{ + Evas_Textblock_Style *tb_style; + Evas *evas; + Evas_Object *o, *ob, *of, *icon; + char buf[4096]; + char buf2[1024] = ""; + int w, h; + + evas = evas_object_evas_get(nv->dialog.dia->bg_object); + + o = e_widget_table_add(evas, 0); + nv->dialog.tab = o; + + of = e_widget_frametable_add(evas, _("Feeds in this gadget"), 0); + nv->dialog.ftab_feeds = of; + + ob = e_widget_button_add(evas, "", NULL, _vfeeds_cb_button_feed, nv, NULL); + e_widget_min_size_set(ob, 60, 60); + nv->vfeeds.button_feed = ob; + e_widget_frametable_object_append(of, ob, 0, 0, 1, 2, 0, 0, 0, 0); + + ob = e_widget_button_add(evas, "Update", "", _vfeeds_cb_button_refresh, nv, NULL); + icon = e_icon_add(evas); + news_theme_icon_set(icon, NEWS_THEME_ICON_UPDATE); + e_icon_fill_inside_set(icon, 1); + e_widget_button_icon_set(ob, icon); + nv->vfeeds.button_refresh = ob; + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 0, 0, 0); + + ob = e_widget_button_add(evas, "Set as read", "", _vfeeds_cb_button_setasread, nv, NULL); + icon = e_icon_add(evas); + news_theme_icon_set(icon, NEWS_THEME_ICON_SETASREAD); + e_icon_fill_inside_set(icon, 1); + e_widget_button_icon_set(ob, icon); + nv->vfeeds.button_setasread = ob; + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 0, 0, 0, 0); + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + e_widget_min_size_set(ob, 100, 70); + nv->vfeeds.ilist = ob; + e_widget_frametable_object_append(of, ob, 0, 2, 2, 1, 1, 1, 1, 1); + + e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 0); + + of = e_widget_framelist_add(evas, _("Articles in selected feed"), 0); + nv->dialog.ftab_articles = of; + + ob = e_widget_ilist_add(evas, 16, 16, NULL); + e_widget_ilist_selector_set(ob, 1); + e_widget_min_size_set(ob, 250, 140); + nv->varticles.ilist = ob; + e_widget_framelist_object_append(of, ob); + + e_widget_table_object_append(o, of, 0, 1, 2, 1, 1, 1, 1, 1); + + ob = evas_object_textblock_add(evas_object_evas_get(nv->dialog.dia->bg_object)); + tb_style = evas_textblock_style_new(); + if (news->config->viewer.vcontent.font_shadow) + { + snprintf(buf2, sizeof(buf2), " style=soft_shadow shadow_color=%s", + news->config->viewer.vcontent.font_shadow_color); + } + snprintf(buf, sizeof(buf), + "DEFAULT='font=Vera font_size=%d align=left color=%s%s wrap=word'" "br='\n'", + news->config->viewer.vcontent.font_size, + news->config->viewer.vcontent.font_color, + buf2); + evas_textblock_style_set(tb_style, buf); + evas_object_textblock_style_set(ob, tb_style); + evas_textblock_style_free(tb_style); + evas_object_event_callback_add(ob, EVAS_CALLBACK_MOUSE_DOWN, + _vcontent_cb_mouse_down, nv); + nv->vcontent.tb = ob; + + ob = e_widget_scrollframe_simple_add(evas, nv->vcontent.tb); + e_widget_min_size_set(ob, 290, 200); + evas_object_event_callback_add(ob, EVAS_CALLBACK_MOUSE_DOWN, + _vcontent_cb_mouse_down, nv); + nv->vcontent.scrollframe = ob; + + e_widget_table_object_append(o, ob, 1, 0, 1, 1, 1, 1, 1, 1); + + /* apply */ + e_widget_min_size_get(o, &w, &h); + e_dialog_content_set(nv->dialog.dia, o, w, h); + + return 1; +} + +static void +_dialog_content_destroy(News_Viewer *nv) +{ + if (nv->dialog.tab) + { + evas_object_del(nv->dialog.tab); + nv->dialog.tab = NULL; + } + + if (nv->dialog.ftab_feeds) + { + evas_object_del(nv->dialog.ftab_feeds); + nv->dialog.ftab_feeds = NULL; + } + if (nv->dialog.ftab_articles) + { + evas_object_del(nv->dialog.ftab_articles); + nv->dialog.ftab_articles = NULL; + } + if (nv->vfeeds.list_own && nv->vfeeds.list) + { + evas_list_free(nv->vfeeds.list); + nv->vfeeds.list = NULL; + } + if (nv->vfeeds.ilist) + { + evas_object_del(nv->vfeeds.ilist); + nv->vfeeds.ilist = NULL; + nv->vfeeds.selected = NULL; + } + if (nv->vfeeds.button_feed) + { + evas_object_del(nv->vfeeds.button_feed); + nv->vfeeds.button_feed = NULL; + } + if (nv->vfeeds.button_feed_icon) + { + evas_object_del(nv->vfeeds.button_feed_icon); + nv->vfeeds.button_feed_icon = NULL; + } + if (nv->vfeeds.button_refresh) + { + evas_object_del(nv->vfeeds.button_refresh); + nv->vfeeds.button_refresh = NULL; + } + if (nv->vfeeds.button_setasread) + { + evas_object_del(nv->vfeeds.button_setasread); + nv->vfeeds.button_setasread = NULL; + } + + if (nv->varticles.list_own && nv->varticles.list) + { + evas_list_free(nv->varticles.list); + nv->varticles.list = NULL; + nv->varticles.list_own = 0; + } + if (nv->varticles.ilist) + { + evas_object_del(nv->varticles.ilist); + nv->varticles.ilist = NULL; + nv->varticles.selected = NULL; + } + + if (nv->vcontent.tb) + { + evas_object_del(nv->vcontent.tb); + nv->vcontent.tb = NULL; + } + if (nv->vcontent.scrollframe) + { + evas_object_del(nv->vcontent.scrollframe); + nv->vcontent.scrollframe = NULL; + } +} + +static void +_dialog_cb_feed_selected(void *data) +{ + News_Viewer *nv; + News_Feed *feed; + int changed = 0; + + feed = data; + if (!feed) return; + nv = feed->item->viewer; + DD(("TRIGGERED cb feed ilist (%s)", feed->name)); + + if ((nv->vfeeds.selected == feed) && + !feed->doc->ui_needrefresh) + { + /* show feed infos in vcontent */ + _vcontent_feed_infos_set(nv); + _vfeeds_buttons_state_refresh(nv); + if (nv->varticles.selected) + { + e_widget_ilist_unselect(nv->varticles.ilist); + nv->varticles.selected = NULL; + } + return; + } + + if (nv->vfeeds.selected != feed) + { + changed = 1; + nv->vfeeds.selected = feed; + } + if (feed->icon && feed->icon[0]) + { + Evas_Object *ic; + + ic = e_icon_add(evas_object_evas_get(nv->vfeeds.ilist)); + e_icon_file_set(ic, feed->icon); + e_icon_fill_inside_set(ic, 1); + if (nv->vfeeds.button_feed_icon) + evas_object_del(nv->vfeeds.button_feed_icon); + e_widget_button_icon_set(nv->vfeeds.button_feed, ic); + nv->vfeeds.button_feed_icon = ic; + } + _vfeeds_buttons_state_refresh(nv); + + if (changed) + nv->varticles.selected = NULL; + _varticles_refresh(nv); +} + +static void +_dialog_cb_article_selected(void *data) +{ + News_Viewer *nv; + News_Feed_Article *art; + char buf[4096]; + char buf_date[4096] = "Not dated"; + + art = data; + if (!art) return; + nv = art->doc->feed->item->viewer; + DD(("TRIGGERED cb article ilist (%s)", art->title)); + nv->varticles.selected = art; + + strftime(buf_date, sizeof(buf_date), "%Y-%m-%d %H:%M:%S", &art->date); + snprintf(buf, sizeof(buf), + "%s
" + "%s

" + "%s

", + news->config->viewer.vcontent.font_color, + (art->title && art->title[0]) ? art->title : "No title", + buf_date, + (art->description && art->description[0])? art->description : "No description text"); + _vcontent_text_set(nv, buf); + + if (art->unread) + news_feed_article_unread_set(art, 0); +} + +static void +_dialog_cb_del(void *obj) +{ + E_Dialog *dia; + News_Viewer *nv; + + dia = obj; + nv = dia->data; + if (!nv) return; + + nv->dialog.dia = NULL; + news_viewer_destroy(nv); +} + +static void +_dialog_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event) +{ + Evas_Event_Key_Down *ev; + News_Viewer *nv; + + ev = event; + nv = data; + if (!strcmp(ev->keyname, "Escape")) + { + news_viewer_destroy(nv); + } +} + +static void +_vfeeds_buttons_state_refresh(News_Viewer *nv) +{ + News_Feed *f; + + f = nv->vfeeds.selected; + if (nv->vfeeds.button_feed) + { + if (f && f->url_home && f->url_home[0]) + e_widget_disabled_set(nv->vfeeds.button_feed, 0); + else + e_widget_disabled_set(nv->vfeeds.button_feed, 1); + } + if (nv->vfeeds.button_refresh) + { + if (f) + e_widget_disabled_set(nv->vfeeds.button_refresh, 0); + else + e_widget_disabled_set(nv->vfeeds.button_refresh, 1); + } + if (nv->vfeeds.button_setasread) + { + if (f && f->doc && f->doc->unread_count) + e_widget_disabled_set(nv->vfeeds.button_setasread, 0); + else + e_widget_disabled_set(nv->vfeeds.button_setasread, 1); + } +} + +static void +_vfeeds_cb_button_feed(void *data, void *data2) +{ + News_Viewer *nv; + + nv = data; + if (!nv->vfeeds.selected) return; + if (nv->vfeeds.selected->config_dialog) return; + + news_util_browser_open(nv->vfeeds.selected->url_home); +} + +static void +_vfeeds_cb_button_refresh(void *data, void *data2) +{ + News_Viewer *nv; + News_Feed *f; + + nv = data; + f = nv->vfeeds.selected; + if (!f || !f->doc) return; + + news_feed_update(f); +} + +static void +_vfeeds_cb_button_setasread(void *data, void *data2) +{ + News_Viewer *nv; + News_Feed *f; + + nv = data; + f = nv->vfeeds.selected; + if (!f || !f->doc) return; + + news_feed_read_set(f); +} + + +static void +_varticles_refresh(News_Viewer *nv) +{ + News_Feed *feed; + Evas_Object *ilist; + Evas_List *articles, *l; + int articles_own = 0; + int pos, toselect_pos; + + ilist = nv->varticles.ilist; + e_widget_ilist_clear(ilist); + + feed = nv->vfeeds.selected; + if (!feed || !feed->doc) return; + e_widget_ilist_freeze(ilist); + + if (news->config->viewer.varticles.unread_first) + { + if (news->config->viewer.varticles.sort_date) + { + Evas_List *tmp; + + tmp = _sort_articles_date_list_get(feed); + articles = _sort_articles_unreadfirst(tmp); + evas_list_free(tmp); + } + else + articles = _sort_articles_unreadfirst_list_get(feed); + articles_own = 1; + } + else if (news->config->viewer.varticles.sort_date) + { + articles = _sort_articles_date_list_get(feed); + articles_own = 1; + } + else articles = feed->doc->articles; + + pos = 0; + toselect_pos = -1; + if (evas_list_count(articles)) + { + for (l=articles; l; l=evas_list_next(l)) + { + News_Feed_Article *art; + char label[4096]; + char buf_date[4096] = "-- --:--"; + + art = l->data; + /* append the article to the article ilist */ + strftime(buf_date, sizeof(buf_date), "%d %H:%M", &art->date); + snprintf(label, sizeof(label), "%s %s", buf_date, art->title); + e_widget_ilist_append(ilist, + _article_icon_get(art, evas_object_evas_get(ilist)), label, + _dialog_cb_article_selected, art, NULL); + if (nv->varticles.selected == art) + toselect_pos = pos; + + pos++; + } + } + e_widget_ilist_go(ilist); + + /* select a feed, + of if no articles are selected + show feed informations in vcontent */ + if (toselect_pos != -1) + { + e_widget_ilist_selected_set(ilist, toselect_pos); + _dialog_cb_article_selected(nv->varticles.selected); + } + else if (!nv->varticles.selected) + _vcontent_feed_infos_set(nv); + + if (nv->varticles.list_own) + { + evas_list_free(nv->varticles.list); + nv->varticles.list = NULL; + nv->varticles.list_own = 0; + } + nv->varticles.list = articles; + nv->varticles.list_own = articles_own; + + e_widget_ilist_thaw(ilist); + feed->doc->ui_needrefresh = 0; +} + +static void +_vcontent_text_set(News_Viewer *nv, char *text) +{ + int w, h, sw, sh; + + evas_object_geometry_get(nv->vcontent.scrollframe, NULL, NULL, &sw, &sh); + evas_object_resize(nv->vcontent.tb, sw-20, sh-20); + + evas_object_textblock_clear(nv->vcontent.tb); + if (text) + evas_object_textblock_text_markup_set(nv->vcontent.tb, text); + + evas_object_textblock_size_formatted_get(nv->vcontent.tb, &w, &h); + if (h < sh - 20) h = sh - 20; + if (w > sw - 20) w = sw - 20; + evas_object_resize(nv->vcontent.tb, w, h); +} + +static void +_vcontent_feed_infos_set(News_Viewer *nv) +{ + News_Feed *f; + char buf_infos[1024] = ""; + char buf_conn[200] = ""; + char buf_unread[1024] = "No unread articles"; + char buf[4096]; + + evas_object_textblock_clear(nv->vcontent.tb); + f = nv->vfeeds.selected; + if (!f) return; + + if (f->doc) + { + if (f->doc->parse.last_time) + { + char buf_mtime[200]; + char *type; + + switch (f->doc->parse.type) + { + case NEWS_FEED_TYPE_RSS: + type = "RSS"; break; + case NEWS_FEED_TYPE_ATOM: + type = "ATOM"; break; + default: + type = "UNKNOWN"; + } + snprintf(buf_mtime, sizeof(buf_mtime), + "Last check of the feed : %s", + ctime(&f->doc->parse.last_time)); + buf_mtime[strlen(buf_mtime)-1] = '\0'; + snprintf(buf_infos, sizeof(buf_infos), + "%s
Type: %s, Version %.2f
", + buf_mtime, type, f->doc->parse.version); + } + if (f->doc->server.conn) + { + if (f->doc->server.nb_tries > 1) + snprintf(buf_conn, sizeof(buf_conn), + "Trying to update the feed ... (%d)
", + f->doc->server.nb_tries); + else + snprintf(buf_conn, sizeof(buf_conn), + "Trying to update the feed ...
"); + } + if (f->doc->unread_count) + { + snprintf(buf_unread, sizeof(buf_unread), "%d unread articles%s", + f->doc->unread_count, + (f->doc->unread_count >= NEWS_FEED_UNREAD_COUNT_MAX) ? "
" + "Its the maximum number of articles a feed can have.
" + "The oldest articles you didn't red are not keeped anymore." + : ""); + } + } + snprintf(buf, sizeof(buf), + "%s in %s
" + "%s

" + "%s%s
" + "%s", + news->config->viewer.vcontent.font_color, + f->name, + f->category->name, + (f->description && f->description[0]) ? f->description : "No description for this feed", + buf_infos, buf_conn, + buf_unread); + _vcontent_text_set(nv, buf); +} + +static void +_vcontent_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + News_Viewer *nv; + Evas_Event_Mouse_Down *ev; + + nv = data; + ev = event_info; + + if (ev->flags == EVAS_BUTTON_DOUBLE_CLICK) + { + if (nv->varticles.selected) + { + if (nv->varticles.selected->url) + news_util_browser_open(nv->varticles.selected->url); + } + else if (nv->vfeeds.selected) + { + if (nv->vfeeds.selected->url_home) + news_util_browser_open(nv->vfeeds.selected->url_home); + } + } + +} + +static Evas_Object * +_article_icon_get(News_Feed_Article *art, Evas *evas) +{ + Evas_Object *ic; + + ic = e_icon_add(evas); + e_icon_fill_inside_set(ic, 1); + if (art->unread) + news_theme_icon_set(ic, NEWS_THEME_ICON_ARTICLE_UNREAD); + else + news_theme_icon_set(ic, NEWS_THEME_ICON_ARTICLE_READ); + + return ic; +} + +static Evas_List * +_sort_feedrefs_unreadfirst_list_get(News_Item *ni) +{ + Evas_List *list, *reads, *l; + News_Feed_Ref *ref; + + list = NULL; + reads = NULL; + NEWS_ITEM_FEEDS_FOREACH_BEG(ni); + if (_feed->doc && _feed->doc->unread_count) + list = evas_list_append(list, _ref); + else + reads = evas_list_append(reads, _ref); + NEWS_ITEM_FEEDS_FOREACH_END(); + + for (l=reads; l; l=evas_list_next(l)) + { + ref = l->data; + list = evas_list_append(list, ref); + } + evas_list_free(reads); + + return list; +} + +static Evas_List * +_sort_articles_unreadfirst_list_get(News_Feed *f) +{ + Evas_List *list; + + if (!f->doc) return NULL; + list = _sort_articles_unreadfirst(f->doc->articles); + + return list; +} + +static Evas_List * +_sort_articles_unreadfirst(Evas_List *articles) +{ + Evas_List *list, *reads, *l; + News_Feed_Article *art; + + list = NULL; + reads = NULL; + for (l=articles; l; l=evas_list_next(l)) + { + art = l->data; + + if (art->unread) + list = evas_list_append(list, art); + else + reads = evas_list_append(reads, art); + } + + for (l=reads; l; l=evas_list_next(l)) + { + art = l->data; + list = evas_list_append(list, art); + } + evas_list_free(reads); + + return list; +} + +static Evas_List * +_sort_articles_date_list_get(News_Feed *f) +{ + Evas_List *list, *l; + News_Feed_Article *art; + + if (!f->doc) return NULL; + + list = NULL; + for (l=f->doc->articles; l; l=evas_list_next(l)) + { + art = l->data; + list = evas_list_append(list, art); + } + list = evas_list_sort(list, evas_list_count(list), _sort_articles_date_list_cb); + + return list; +} + +static int +_sort_articles_date_list_cb(void *d1, void *d2) +{ + News_Feed_Article *a1, *a2; + + a1 = d1; + a2 = d2; + + /* sort reverse order : more recent (greater) first */ + return - (news_util_datecmp(&a1->date, &a2->date)); +} diff --git a/src/module/news_viewer.h b/src/module/news_viewer.h new file mode 100644 index 0000000..e127376 --- /dev/null +++ b/src/module/news_viewer.h @@ -0,0 +1,78 @@ +#ifdef E_MOD_NEWS_TYPEDEFS + +typedef struct _News_Viewer News_Viewer; + +#else + +#ifndef NEWS_VIEWER_H_INCLUDED +#define NEWS_VIEWER_H_INCLUDED + +#define NEWS_VIEWER_VFEEDS_UNREAD_FIRST_DEFAULT 1 +#define NEWS_VIEWER_VARTICLES_UNREAD_FIRST_DEFAULT 1 +#define NEWS_VIEWER_VARTICLES_SORT_DATE_DEFAULT 1 +#define NEWS_VIEWER_VCONTENT_FONT_SIZE_DEFAULT 10 +#define NEWS_VIEWER_VCONTENT_FONT_SIZE_MIN 3 +#define NEWS_VIEWER_VCONTENT_FONT_SIZE_MAX 20 +#define NEWS_VIEWER_VCONTENT_FONT_COLOR_DEFAULT "#000000" +#define NEWS_VIEWER_VCONTENT_FONT_SHADOW_DEFAULT 1 +#define NEWS_VIEWER_VCONTENT_FONT_SHADOW_COLOR_DEFAULT "#EBEBEB" + +struct _News_Viewer +{ + News_Item *item; + News_Feed_Document *doc; + + /* main dialog */ + struct + { + E_Dialog *dia; + + Evas_Object *tab; + Evas_Object *ftab_feeds, *ftab_articles, *ftab_content; + + int x, y, w, h; + } dialog; + + /* view of the feeds list */ + struct + { + Evas_List *list; + int list_own; + Evas_Object *ilist; + News_Feed *selected; + Evas_Object *button_feed; + Evas_Object *button_feed_icon; + Evas_Object *button_refresh; + Evas_Object *button_setasread; + } vfeeds; + + /* view of the articles list */ + struct + { + Evas_List *list; + int list_own; + Evas_Object *ilist; + News_Feed_Article *selected; + } varticles; + + /* view of article content */ + struct + { + Evas_Object *scrollframe; + Evas_Object *tb; + } vcontent; +}; + +int news_viewer_init(void); +void news_viewer_shutdown(void); +void news_viewer_all_refresh(int force, int recreate); + +int news_viewer_create(News_Item *ni); +void news_viewer_destroy(News_Viewer *nv); +void news_viewer_refresh(News_Viewer *nv); +int news_viewer_feed_select(News_Viewer *nv, News_Feed *feed); +void news_viewer_feed_selected_infos_refresh(News_Viewer *nv); +void news_viewer_article_state_refresh(News_Viewer *nv, News_Feed_Article *art); + +#endif +#endif