diff --git a/data/fonts/ARTWIZ.txt b/data/fonts/ARTWIZ.txt new file mode 100644 index 00000000..961f66d0 --- /dev/null +++ b/data/fonts/ARTWIZ.txt @@ -0,0 +1,382 @@ +The following fonts are artwiz fonts: + +anorexia.pcf +aqui.pcf +cure.pcf +cursor.pcf +drift.pcf +edges.pcf +fkp.pcf +gelly.pcf +glisp-bold.pcf +glisp.pcf +kates.pcf +lime.pcf +mints-mild.pcf +mints-strong.pcf +nu.pcf +smoothansi.pcf +snap.pcf + +From the artwiz pkg AUTHORS: + +Oliwier Ptak + +DESCRIPTION +------------------------------------------------------------------------------- +This is set of (improved) artwiz fonts. +The ultimate solution to your all problems with artwiz fonts. +Screenshots: http://artwizaleczapka.sourceforge.net/images/shots/ + +PROJECT +------------------------------------------------------------------------------- +artwiz-aleczapka is released under the terms of GNU General Public License +(GPL) version 2. Read file 'COPYING' for detailed info. + +The project homepage is: http://artwizaleczapka.sourceforge.net + +CONTACT +------------------------------------------------------------------------------- +If you have any questions, bug reports, bug fixes or valid credit card number +you might want to share write to: Oliwier Ptak . + + 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/data/fonts/Makefile.am b/data/fonts/Makefile.am index b122eded..0358fa41 100644 --- a/data/fonts/Makefile.am +++ b/data/fonts/Makefile.am @@ -1,6 +1,23 @@ MAINTAINERCLEANFILES = Makefile.in filesdir = $(pkgdatadir)/fonts files_DATA = \ -nex6x10.pcf +anorexia.pcf \ +aqui.pcf \ +cure.pcf \ +cursor.pcf \ +drift.pcf \ +edges.pcf \ +fkp.pcf \ +gelly.pcf \ +glisp-bold.pcf \ +glisp.pcf \ +kates.pcf \ +lime.pcf \ +mints-mild.pcf \ +mints-strong.pcf \ +nex6x10.pcf \ +nu.pcf \ +smoothansi.pcf \ +snap.pcf EXTRA_DIST = $(files_DATA) diff --git a/data/fonts/anorexia.pcf b/data/fonts/anorexia.pcf new file mode 100644 index 00000000..d27abfd4 Binary files /dev/null and b/data/fonts/anorexia.pcf differ diff --git a/data/fonts/aqui.pcf b/data/fonts/aqui.pcf new file mode 100644 index 00000000..2e5b3b7c Binary files /dev/null and b/data/fonts/aqui.pcf differ diff --git a/data/fonts/cure.pcf b/data/fonts/cure.pcf new file mode 100644 index 00000000..f9b3ed4f Binary files /dev/null and b/data/fonts/cure.pcf differ diff --git a/data/fonts/cursor.pcf b/data/fonts/cursor.pcf new file mode 100644 index 00000000..24235fcc Binary files /dev/null and b/data/fonts/cursor.pcf differ diff --git a/data/fonts/drift.pcf b/data/fonts/drift.pcf new file mode 100644 index 00000000..6a319616 Binary files /dev/null and b/data/fonts/drift.pcf differ diff --git a/data/fonts/edges.pcf b/data/fonts/edges.pcf new file mode 100644 index 00000000..67d432e4 Binary files /dev/null and b/data/fonts/edges.pcf differ diff --git a/data/fonts/fkp.pcf b/data/fonts/fkp.pcf new file mode 100644 index 00000000..675e091f Binary files /dev/null and b/data/fonts/fkp.pcf differ diff --git a/data/fonts/gelly.pcf b/data/fonts/gelly.pcf new file mode 100644 index 00000000..52621e16 Binary files /dev/null and b/data/fonts/gelly.pcf differ diff --git a/data/fonts/glisp-bold.pcf b/data/fonts/glisp-bold.pcf new file mode 100644 index 00000000..588d4289 Binary files /dev/null and b/data/fonts/glisp-bold.pcf differ diff --git a/data/fonts/glisp.pcf b/data/fonts/glisp.pcf new file mode 100644 index 00000000..67cb281d Binary files /dev/null and b/data/fonts/glisp.pcf differ diff --git a/data/fonts/kates.pcf b/data/fonts/kates.pcf new file mode 100644 index 00000000..c6827c1d Binary files /dev/null and b/data/fonts/kates.pcf differ diff --git a/data/fonts/lime.pcf b/data/fonts/lime.pcf new file mode 100644 index 00000000..3b165e54 Binary files /dev/null and b/data/fonts/lime.pcf differ diff --git a/data/fonts/mints-mild.pcf b/data/fonts/mints-mild.pcf new file mode 100644 index 00000000..02b21d62 Binary files /dev/null and b/data/fonts/mints-mild.pcf differ diff --git a/data/fonts/mints-strong.pcf b/data/fonts/mints-strong.pcf new file mode 100644 index 00000000..0f9f1abe Binary files /dev/null and b/data/fonts/mints-strong.pcf differ diff --git a/data/fonts/nu.pcf b/data/fonts/nu.pcf new file mode 100644 index 00000000..d0f53740 Binary files /dev/null and b/data/fonts/nu.pcf differ diff --git a/data/fonts/smoothansi.pcf b/data/fonts/smoothansi.pcf new file mode 100644 index 00000000..c92378da Binary files /dev/null and b/data/fonts/smoothansi.pcf differ diff --git a/data/fonts/snap.pcf b/data/fonts/snap.pcf new file mode 100644 index 00000000..feab6dfa Binary files /dev/null and b/data/fonts/snap.pcf differ diff --git a/data/themes/default.edc b/data/themes/default.edc index cc6fc012..065795e2 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -39,6 +39,43 @@ collections { aspect_preference: HORIZONTAL; } } + part { name: "terminology.options"; type: SWALLOW; + description { state: "default" 0.0; + fixed: 1 1; + min: 120 120; + align: 0.0 0.5; + rel1 { + relative: 1.0 0.02; + offset: 8 8; + } + rel2 { + relative: 1.0 0.98; + offset: 8 -9; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + align: 1.0 0.5; + rel1.offset: -9 8; + rel2.offset: -9 -9; + } + } + programs { + program { name: "op_show"; + signal: "options,show"; + source: "terminology"; + action: STATE_SET "visible" 0.0; + transition: DECELERATE 0.5; + target: "terminology.options"; + } + program { name: "op_hide"; + signal: "options,hide"; + source: "terminology"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.5; + target: "terminology.options"; + } + } } } group { name: "terminology/cursor"; diff --git a/src/bin/main.c b/src/bin/main.c index d6498f01..e120c5fa 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -5,6 +5,10 @@ const char *cmd = NULL; static Evas_Object *win, *bg, *term; +static Evas_Object + *op_frame, *op_box, *op_toolbar, *op_opbox, + *op_fontslider, *op_fontllist; +static Eina_Bool op_out = EINA_FALSE; static void _cb_focus_in(void *data, Evas_Object *obj, void *event) @@ -39,6 +43,214 @@ _cb_size_hint(void *data, Evas *e, Evas_Object *obj, void *event) } } +typedef struct _Font Font; + +struct _Font +{ + const char *name; + Eina_Bool bitmap : 1; +}; + +static Eina_List *fonts = NULL; +static Eina_Hash *fonthash = NULL; + +static void +_cb_op_font_sel(void *data, Evas_Object *obj, void *event) +{ + Font *f = data; + if ((config->font.name) && (!strcmp(f->name, config->font.name))) + return; + if (config->font.name) eina_stringshare_del(config->font.name); + config->font.name = eina_stringshare_add(f->name); + config->font.bitmap = f->bitmap; + evas_object_data_del(term, "sizedone"); + termio_config_update(term); +} + +static void +_cb_op_fontsize_sel(void *data, Evas_Object *obj, void *event) +{ + int size =elm_slider_value_get(obj) + 0.5; + + if (config->font.size == size) return; + config->font.size = size; + evas_object_data_del(term, "sizedone"); + termio_config_update(term); +} + +static int +_cb_op_font_sort(const void *d1, const void *d2) +{ + return strcasecmp(d1, d2); +} + +static void +_cb_op_font(void *data, Evas_Object *obj, void *event) +{ + Evas_Object *o; + char buf[4096], *file, *fname, *s; + Eina_List *files, *fontlist, *l; + Font *f; + + EINA_LIST_FREE(fonts, f) + { + eina_stringshare_del(f->name); + free(f); + } + if (fonthash) + { + eina_hash_free(fonthash); + fonthash = NULL; + } + elm_box_clear(op_opbox); + + op_fontslider = o = elm_slider_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_slider_span_size_set(o, 160); + elm_slider_unit_format_set(o, "%1.0f"); + elm_slider_indicator_format_set(o, "%1.0f"); + elm_slider_min_max_set(o, 5, 45); + elm_slider_value_set(o, config->font.size); + elm_box_pack_end(op_opbox, o); + evas_object_show(o); + + evas_object_smart_callback_add(o, "delay,changed", + _cb_op_fontsize_sel, NULL); + + o = elm_list_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); + + evas_event_freeze(evas_object_evas_get(win)); + edje_freeze(); + + snprintf(buf, sizeof(buf), "%s/fonts", elm_app_data_dir_get()); + files = ecore_file_ls(buf); + EINA_LIST_FREE(files, file) + { + f = calloc(1, sizeof(Font)); + f->name = eina_stringshare_add(file); + f->bitmap = EINA_TRUE; + fonts = eina_list_append(fonts, f); + elm_list_item_append(o, f->name, NULL, NULL, _cb_op_font_sel, f); + free(file); + } + + fontlist = evas_font_available_list(evas_object_evas_get(win)); + fonthash = eina_hash_string_superfast_new(NULL); + + fontlist = eina_list_sort(fontlist, eina_list_count(fontlist), + _cb_op_font_sort); + EINA_LIST_FOREACH(fontlist, l, fname) + { + snprintf(buf, sizeof(buf), "%s", fname); + s = strchr(buf, ':'); + if (s) *s = 0; + fname = buf; + if (!eina_hash_find(fonthash, fname)) + { + f = calloc(1, sizeof(Font)); + f->name = eina_stringshare_add(fname); + f->bitmap = EINA_FALSE; + eina_hash_add(fonthash, fname, f); + fonts = eina_list_append(fonts, f); + elm_list_item_append(o, f->name, NULL, NULL, _cb_op_font_sel, f); + } + } + if (fontlist) + evas_font_available_list_free(evas_object_evas_get(win), fontlist); + + elm_list_go(o); + + edje_thaw(); + evas_event_thaw(evas_object_evas_get(win)); + + elm_box_pack_end(op_opbox, o); + evas_object_show(o); +} + +static void +_cb_op_theme(void *data, Evas_Object *obj, void *event) +{ + Evas_Object *o; + + elm_box_clear(op_opbox); +} + +static void +_cb_op_behavior(void *data, Evas_Object *obj, void *event) +{ + Evas_Object *o; + + elm_box_clear(op_opbox); +} + +static void +_cb_options(void *data, Evas_Object *obj, void *event) +{ + Evas_Object *o; + + if (!op_frame) + { + Elm_Object_Item *it_fn, *it_th, *it_bh; + + op_frame = o = elm_frame_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(o, "Options"); + + op_box = o = elm_box_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_object_content_set(op_frame, o); + evas_object_show(o); + + op_toolbar = o = elm_toolbar_add(win); + elm_object_style_set(o, "item_horizontal"); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); + elm_toolbar_icon_size_set(o, 16); + elm_toolbar_shrink_mode_set(o, ELM_TOOLBAR_SHRINK_NONE); + elm_toolbar_select_mode_set(o, ELM_OBJECT_SELECT_MODE_DEFAULT); + elm_toolbar_menu_parent_set(o, win); + elm_toolbar_homogeneous_set(o, EINA_FALSE); + + it_fn = elm_toolbar_item_append(o, "preferences-desktop-font", "Font", + _cb_op_font, NULL); + it_th = elm_toolbar_item_append(o, "preferences-desktop-theme", "Theme", + _cb_op_theme, NULL); + it_bh = elm_toolbar_item_append(o, "system-run", "Behavior", + _cb_op_behavior, NULL); + + elm_box_pack_end(op_box, o); + evas_object_show(o); + + op_opbox = o = elm_box_add(win); + evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_box_pack_end(op_box, o); + evas_object_show(o); + + elm_toolbar_item_selected_set(it_fn, EINA_TRUE); + + evas_smart_objects_calculate(evas_object_evas_get(win)); + edje_object_part_swallow(bg, "terminology.options", op_frame); + evas_object_show(o); + } + if (!op_out) + { + edje_object_signal_emit(bg, "options,show", "terminology"); + op_out = EINA_TRUE; + } + else + { + edje_object_signal_emit(bg, "options,hide", "terminology"); + op_out = EINA_FALSE; + elm_object_focus_set(term, EINA_TRUE); + } +} + EAPI_MAIN int elm_main(int argc, char **argv) { @@ -79,6 +291,7 @@ elm_main(int argc, char **argv) evas_object_event_callback_add(o, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _cb_size_hint, win); edje_object_part_swallow(bg, "terminology.content", o); + evas_object_smart_callback_add(o, "options", _cb_options, NULL); evas_object_show(o); evas_object_smart_callback_add(win, "focus,in", _cb_focus_in, term); diff --git a/src/bin/termio.c b/src/bin/termio.c index 300aba85..3ff1facd 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -252,14 +252,17 @@ _smart_apply(Evas_Object *obj) } static void -_smart_size(Evas_Object *obj, int w, int h) +_smart_size(Evas_Object *obj, int w, int h, Eina_Bool force) { Termio *sd = evas_object_smart_data_get(obj); if (!sd) return; if (w < 1) w = 1; if (h < 1) h = 1; - if ((w == sd->grid.w) && (h == sd->grid.h)) return; + if (!force) + { + if ((w == sd->grid.w) && (h == sd->grid.h)) return; + } evas_event_freeze(evas_object_evas_get(obj)); if (sd->grid.array) @@ -337,7 +340,7 @@ _smart_cb_delayed_size(void *data) w = ow / sd->font.chw; h = oh / sd->font.chh; - _smart_size(obj, w, h); + _smart_size(obj, w, h, EINA_FALSE); return EINA_FALSE; } @@ -606,9 +609,7 @@ _smart_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event) else if (ev->button == 2) _paste_selection(data); else if (ev->button == 3) - { - // XXX: popup config panel - } + evas_object_smart_callback_call(data, "options", NULL); } static void @@ -954,7 +955,6 @@ _smart_pty_cancel_sel(void *data) if (sd->cur.sel) { sd->cur.sel = 0; - _clear_selection(data); sd->cur.makesel = 0; if (sd->job) ecore_job_del(sd->job); sd->job = ecore_job_add(_smart_cb_change, data); @@ -987,15 +987,14 @@ termio_add(Evas_Object *parent, const char *cmd, int w, int h) sd->pty->cb.set_icon.data = obj; sd->pty->cb.cancel_sel.func = _smart_pty_cancel_sel; sd->pty->cb.cancel_sel.data = obj; - _smart_size(obj, w, h); + _smart_size(obj, w, h, EINA_FALSE); return obj; } void termio_win_set(Evas_Object *obj, Evas_Object *win) { - Termio *sd; - sd = evas_object_smart_data_get(obj); + Termio *sd = evas_object_smart_data_get(obj); if (!sd) return; sd->win = win; } @@ -1003,8 +1002,7 @@ termio_win_set(Evas_Object *obj, Evas_Object *win) char * termio_selection_get(Evas_Object *obj, int c1x, int c1y, int c2x, int c2y) { - Termio *sd; - sd = evas_object_smart_data_get(obj); + Termio *sd = evas_object_smart_data_get(obj); Eina_Strbuf *sb; char *s, txt[8]; int x, y; @@ -1082,3 +1080,38 @@ termio_selection_get(Evas_Object *obj, int c1x, int c1y, int c2x, int c2y) eina_strbuf_free(sb); return s; } + +void +termio_config_update(Evas_Object *obj) +{ + Termio *sd = evas_object_smart_data_get(obj); + Evas_Object *o; + Evas_Coord w, h; + char buf[4096]; + + if (!sd) return; + + if (sd->font.name) eina_stringshare_del(sd->font.name); + sd->font.name = NULL; + + if (config->font.bitmap) + { + snprintf(buf, sizeof(buf), "%s/fonts/%s", + elm_app_data_dir_get(), config->font.name); + sd->font.name = eina_stringshare_add(buf); + } + else + sd->font.name = eina_stringshare_add(config->font.name); + sd->font.size = config->font.size; + + o = evas_object_text_add(evas_object_evas_get(obj)); + evas_object_text_font_set(o, sd->font.name, sd->font.size); + evas_object_text_text_set(o, "X"); + evas_object_geometry_get(o, NULL, NULL, &w, &h); + evas_object_del(o); + if (w < 1) w = 1; + if (h < 1) h = 1; + sd->font.chw = w; + sd->font.chh = h; + _smart_size(obj, sd->grid.w, sd->grid.h, EINA_TRUE); +} diff --git a/src/bin/termio.h b/src/bin/termio.h index 333b36c3..2faaa429 100644 --- a/src/bin/termio.h +++ b/src/bin/termio.h @@ -1,3 +1,4 @@ Evas_Object *termio_add(Evas_Object *parent, const char *cmd, int w, int h); void termio_win_set(Evas_Object *obj, Evas_Object *win); char *termio_selection_get(Evas_Object *obj, int c1x, int c1y, int c2x, int c2y); +void termio_config_update(Evas_Object *obj);