From: <enl...@li...> - 2005-04-27 03:28:20
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/evoak Modified Files: autogen.sh Log Message: update more autogens to support $NOCONFIGURE =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/evoak/autogen.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -3 -r1.1.1.1 -r1.2 --- autogen.sh 31 Aug 2004 04:45:05 -0000 1.1.1.1 +++ autogen.sh 27 Apr 2005 03:28:03 -0000 1.2 @@ -9,5 +9,6 @@ && echo "Running libtoolize..."; libtoolize --automake \ && echo "Running automake..."; automake --add-missing --copy --gnu -### If you want this, uncomment it. -./configure "$@" +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" +fi |
From: <enl...@li...> - 2005-04-29 02:54:44
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/exml Modified Files: configure.in Log Message: stop running exit since its bad form ... use AC_MSG_ERROR instead =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/exml/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 24 Sep 2004 16:07:54 -0000 1.2 +++ configure.in 29 Apr 2005 02:54:37 -0000 1.3 @@ -63,8 +63,7 @@ if [ test -z $ECORE_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi ecore_cflags=`$ECORE_CONFIG --cflags` ecore_libs=`$ECORE_CONFIG --libs` @@ -76,8 +75,7 @@ if [ test -z $XML2_CONFIG ]; then echo $PROG " is not in your \$PATH. Please ensure it is."; echo "Read the manual page for you shell as to how to extend your path."; - echo "FATAL ERROR. ABORT."; - exit -1; + AC_MSG_ERROR(Cannot find $PROG) fi xml2_cflags=`$XML2_CONFIG --cflags` xml2_libs=`$XML2_CONFIG --libs` |
From: <enl...@li...> - 2005-04-29 02:55:16
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/evoak Modified Files: configure.in Log Message: stop running exit since its bad form ... use AC_MSG_ERROR instead =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/evoak/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 5 Jan 2005 05:05:30 -0000 1.2 +++ configure.in 29 Apr 2005 02:54:37 -0000 1.3 @@ -115,8 +115,7 @@ VM="0.9.9" VVM=`vser $VM` if test $VV -lt $VVM; then - echo "Error. Eet is not at least "$VM". It is "$V". Abort." - exit -1 + AC_MSG_ERROR(Eet is not at least "$VM". It is "$V".) fi V=`$EVAS_CONFIG --version` @@ -124,8 +123,7 @@ VM="1.0.0_pre13" VVM=`vser $VM` if test $VV -lt $VVM; then - echo "Error. Evas is not at least "$VM". It is "$V". Abort." - exit -1 + AC_MSG_ERROR(Evas is not at least "$VM". It is "$V".) fi my_cflags=`$EVAS_CONFIG --cflags`" "`$ECORE_CONFIG --cflags`" "`$EDJE_CONFIG --cflags`" "`$EET_CONFIG --cflags`" "`$EMBRYO_CONFIG --cflags` |
From: <enl...@li...> - 2005-10-06 02:24:57
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_colorpicker.c Log Message: initialize the .a member =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_colorpicker.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_colorpicker.c 1 Oct 2005 16:29:45 -0000 1.1 +++ etk_colorpicker.c 6 Oct 2005 02:24:39 -0000 1.2 @@ -187,6 +187,7 @@ if (!cp) { Etk_Color black; + black.a = 0; black.r = 0; black.g = 0; black.b = 0; |
From: <enl...@li...> - 2005-10-06 02:39:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/src/lib Added Files: .cvsignore Log Message: ignore generated files |
From: <enl...@li...> - 2005-10-27 07:08:08
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy Modified Files: autogen.sh Log Message: use simpler autogen.sh script =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- autogen.sh 24 Oct 2005 05:20:01 -0000 1.3 +++ autogen.sh 27 Oct 2005 07:07:57 -0000 1.4 @@ -1,124 +1,16 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. rm -rf autom4te.cache -rm -f aclocal.m4 +rm -f aclocal.m4 ltmain.sh -srcdir=`dirname $0` -PKG_NAME="ENTROPY" +touch README -DIE=0 +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 -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { -# (libtoolize --version) < /dev/null > /dev/null 2>&1 || { - LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize glibtoolize" - for i in $LIBTOOLIZE_CHOICES ; do - $i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break - done - [ "x$LIBTOOLIZE" = "x" ] && { - echo - echo "**Error**: You must have \`libtool' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.7.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.7.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - - - -echo " - -******************************************************************************* -******************************************************************************* -******************************************************************************* - -" - - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` - ( cd $dr - aclocalinclude="$ACLOCAL_FLAGS" - for k in $macrodirs; do - if test -d $k; then - aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." - fi - done - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - $LIBTOOLIZE --force --copy - fi - echo "Running aclocal $aclocalinclude ..." - aclocal -I m4 $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" -else - echo Skipping configure process. +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" fi |
From: <enl...@li...> - 2005-10-27 07:15:03
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy Modified Files: configure.in Log Message: remove old line =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in 26 Oct 2005 21:40:07 -0000 1.5 +++ configure.in 27 Oct 2005 07:14:57 -0000 1.6 @@ -2,7 +2,6 @@ rm -f config.cache -# AC_INIT(acinclude.m4) AC_INIT(configure.in) AC_DEFINE_UNQUOTED([CONFIGURED_WITH], "$*", [what options were given to configure]) |
From: <enl...@li...> - 2005-10-27 07:15:57
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: entropy.h Log Message: add more includes/config prototypes to get rid of warnings =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/include/entropy.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entropy.h 20 Oct 2005 08:45:54 -0000 1.1 +++ entropy.h 27 Oct 2005 07:15:47 -0000 1.2 @@ -10,6 +10,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <stdlib.h> #include <unistd.h> #include "entropy_generic.h" @@ -71,6 +72,8 @@ /*Config functions*/ char* entropy_core_home_dir_get(entropy_core* core); char* entropy_thumbnail_dir_get(entropy_core* core); +int entropy_config_int_get(char* module, char* key); +void entropy_config_int_set(char* module, char* key, int value); /*Global layout object functions*/ entropy_gui_component_instance* entropy_core_global_layout_get(entropy_core* core); |
From: <enl...@li...> - 2005-10-27 07:17:04
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: layout_ewl_simple.c Log Message: make sure we handle the error case if a layout wasnt found =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- layout_ewl_simple.c 24 Oct 2005 06:22:18 -0000 1.7 +++ layout_ewl_simple.c 27 Oct 2005 07:16:55 -0000 1.8 @@ -530,7 +530,8 @@ gui->iconbox_viewer->plugin = plugin; iconbox = EWL_WIDGET(gui->iconbox_viewer->gui_object); } else { - //printf("No visual component found! *****\n"); + fprintf(stderr, "No visual component found! *****\n"); + return NULL; } |
From: <enl...@li...> - 2005-10-27 07:17:24
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_mime_engine.c Log Message: fix while() test to get rid of warnings =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_mime_engine.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entropy_mime_engine.c 20 Oct 2005 08:45:54 -0000 1.1 +++ entropy_mime_engine.c 27 Oct 2005 07:17:16 -0000 1.2 @@ -11,7 +11,7 @@ /*printf("Identifying a file..\n"); */ ecore_list_goto_first(mime_plugins); - while (plugin = ecore_list_next(mime_plugins)) { + while ((plugin = ecore_list_next(mime_plugins)) != NULL) { /*printf ("Querying '%s' for MIME\n", plugin->filename);*/ entropy_mime_plugin_identify_file = dlsym(plugin->dl_ref, "entropy_mime_plugin_identify_file"); type = (*entropy_mime_plugin_identify_file)(file->path, file->filename); |
From: <enl...@li...> - 2005-10-27 07:17:32
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: ewl_icon_local_viewer.c Log Message: make sure we declare the return type =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_icon_local_viewer.c 24 Oct 2005 14:22:51 -0000 1.13 +++ ewl_icon_local_viewer.c 27 Oct 2005 07:17:26 -0000 1.14 @@ -518,6 +518,7 @@ } +void ewl_icon_local_viewer_remove_icon(entropy_gui_component_instance* comp, entropy_generic_file* list_item ) { entropy_icon_viewer* view = comp->data; gui_file* gui_object; |
From: <enl...@li...> - 2005-10-27 07:16:44
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: thumbnail_generic.c Log Message: get rid of unused variables =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/thumbnail_generic.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- thumbnail_generic.c 20 Oct 2005 08:45:54 -0000 1.1 +++ thumbnail_generic.c 27 Oct 2005 07:16:35 -0000 1.2 @@ -84,7 +84,6 @@ entropy_thumbnail* entropy_thumbnail_create(entropy_generic_file* e_file) { Imlib_Image image; Imlib_Image thumbnail; - Imlib_Load_Error error; png_infop info_ptr; png_structp png_ptr; png_text *text_ptr = NULL; |
From: <enl...@li...> - 2005-10-27 07:16:45
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: notification_engine.c entropy_config.c Log Message: get rid of unused variables =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/notification_engine.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- notification_engine.c 20 Oct 2005 08:45:54 -0000 1.1 +++ notification_engine.c 27 Oct 2005 07:16:35 -0000 1.2 @@ -242,9 +242,7 @@ void entropy_notify_event_commit(entropy_notification_engine* engine, entropy_notify_event* ev) { - int rc = pthread_mutex_lock(&engine->op_queue_mutex); - - + pthread_mutex_lock(&engine->op_queue_mutex); ecore_list_append(engine->op_queue, ev); pthread_mutex_unlock(&engine->op_queue_mutex); =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- entropy_config.c 20 Oct 2005 08:45:54 -0000 1.1 +++ entropy_config.c 27 Oct 2005 07:16:35 -0000 1.2 @@ -49,7 +49,6 @@ void entropy_config_int_set(char* module, char* key, int value) { int i = (strlen(module) * sizeof(char)) + sizeof(char) + (strlen(key)*sizeof(char)) + 1; - int val; char* tmp = entropy_malloc( i); snprintf(tmp, i, "%s.%s", module,key); @@ -74,7 +73,6 @@ void entropy_config_str_set(char* module, char* key, char* value) { int i = (strlen(module) * sizeof(char)) + sizeof(char) + (strlen(key)*sizeof(char)) + 1; - int val; char* tmp = entropy_malloc( i); snprintf(tmp, i, "%s.%s", module,key); |
From: <enl...@li...> - 2005-10-27 07:24:10
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: layout_ewl_simple.c Log Message: clean up broken whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- layout_ewl_simple.c 27 Oct 2005 07:16:55 -0000 1.8 +++ layout_ewl_simple.c 27 Oct 2005 07:24:00 -0000 1.9 @@ -16,16 +16,16 @@ typedef struct entropy_layout_gui entropy_layout_gui; struct entropy_layout_gui { entropy_gui_component_instance* iconbox_viewer; - entropy_gui_component_instance* structure_viewer; + entropy_gui_component_instance* structure_viewer; Ewl_Widget* tree; Ecore_List* current_folder; /*Random things*/ - + /*Tmp*/ Ewl_Widget* samba_radio; Ewl_Widget* posix_radio; - + Ewl_Widget* location_add_window; Ewl_Widget* location_add_name; Ewl_Widget* location_add_path; @@ -48,7 +48,7 @@ entropy_layout_gui* viewer = instance->data; char new_uri[2048]; - + char* display_name = ewl_text_text_get(EWL_TEXT(viewer->location_add_name)); char* path = ewl_text_text_get(EWL_TEXT(viewer->location_add_path)); char* server = ewl_text_text_get(EWL_TEXT(viewer->location_add_server)); @@ -66,9 +66,9 @@ snprintf(new_uri, 2048, "posix://%s", path); printf("New URI is: '%s'\n", new_uri); layout_ewl_simple_add_header(instance, display_name, new_uri); - + layout_ewl_simple_add_config_location(instance, display_name, new_uri); - + } else if (ewl_checkbutton_is_checked(EWL_CHECKBUTTON(viewer->samba_radio))) { if (server) { if (username && password) { @@ -90,8 +90,8 @@ } ewl_widget_destroy(viewer->location_add_window); - - + + } @@ -101,14 +101,13 @@ void location_add_cb(Ewl_Widget *main_win, void *ev_data, void *user_data) { entropy_gui_component_instance* instance = (entropy_gui_component_instance*)user_data; - + Ewl_Widget* window; Ewl_Widget* label; Ewl_Widget* vbox, *vbox2; Ewl_Widget* hbox; Ewl_Widget* button; - window = ewl_window_new(); ((entropy_layout_gui*)instance->data)->location_add_window = window; ewl_window_title_set(EWL_WINDOW(window),"Add Location"); @@ -116,13 +115,12 @@ vbox = ewl_vbox_new(); ewl_widget_show(vbox); ewl_container_child_append(EWL_CONTAINER(window), vbox); - /*-------*/ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Filesystem Type"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -138,7 +136,7 @@ ewl_button_label_set(EWL_BUTTON(((entropy_layout_gui*)instance->data)->posix_radio), "Standard Local Posix"); ewl_container_child_append(EWL_CONTAINER(vbox2), ((entropy_layout_gui*)instance->data)->posix_radio); ewl_widget_show(((entropy_layout_gui*)instance->data)->posix_radio); - + ((entropy_layout_gui*)instance->data)->samba_radio = ewl_radiobutton_new(); ewl_button_label_set(EWL_BUTTON(((entropy_layout_gui*)instance->data)->samba_radio), "Samba"); ewl_radiobutton_chain_set(EWL_RADIOBUTTON(((entropy_layout_gui*)instance->data)->samba_radio), EWL_RADIOBUTTON(((entropy_layout_gui*)instance->data)->posix_radio)); @@ -153,7 +151,7 @@ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Display Name"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -170,7 +168,7 @@ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Server/Host"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -181,13 +179,13 @@ ewl_widget_show(((entropy_layout_gui*)instance->data)->location_add_server); /*-----------------------*/ - + /*-------*/ /*"Path"*/ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Path"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -203,7 +201,7 @@ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Username"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -219,7 +217,7 @@ hbox = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(vbox), hbox); ewl_widget_show(hbox); - + label = ewl_label_new(); ewl_label_text_set(EWL_LABEL(label), "Password"); ewl_container_child_append(EWL_CONTAINER(hbox), label); @@ -241,14 +239,13 @@ ewl_container_child_append(EWL_CONTAINER(hbox), button); ewl_callback_append(button, EWL_CALLBACK_CLICKED, location_add_execute_cb, instance); ewl_widget_show(button); - + button = ewl_button_new(); ewl_button_label_set(EWL_BUTTON(button), "Cancel"); ewl_object_maximum_h_set(EWL_OBJECT(button), 15); ewl_container_child_append(EWL_CONTAINER(hbox), button); ewl_callback_append(button, EWL_CALLBACK_CLICKED, location_add_cancel_cb, window); ewl_widget_show(button); - ewl_object_custom_size_set(EWL_OBJECT(window), 400, 250); ewl_widget_show(window); @@ -259,11 +256,9 @@ char* current_uri = entropy_config_str_get("layout_ewl_simple", "structure_bar"); char new_uri[2048]; - snprintf(new_uri, 2048, "%s|%s;%s", current_uri, name, uri); entropy_config_str_set("layout_ewl_simple", "structure_bar", new_uri); - - + entropy_free(current_uri); } @@ -283,72 +278,67 @@ void layout_ewl_simple_add_header(entropy_gui_component_instance* instance, char* name, char* uri) { - - - Ewl_Widget* hbox; - Ewl_Widget* image; - Ewl_Widget* row; - Ewl_Widget* children[2]; - entropy_plugin* structure; - void* (*structure_plugin_init)(entropy_core* core, entropy_gui_component_instance*, void* data); - - - - entropy_layout_gui* gui = ((entropy_layout_gui*)instance->data); - Ewl_Widget* label = ewl_text_new(); - Ewl_Widget* tree= gui->tree; - - - printf("Add URI: %s\n", uri); - - ewl_text_text_set(EWL_TEXT(label), name); - image = ewl_image_new(); - ewl_image_file_set(EWL_IMAGE(image), "../icons/chardevice.png", NULL); - hbox = ewl_hbox_new(); - ewl_container_child_append(EWL_CONTAINER(hbox), image); - ewl_container_child_append(EWL_CONTAINER(hbox), label); - - ewl_widget_show(label); - ewl_widget_show(image); - ewl_widget_show(hbox); - children[0] = hbox; - children[1] = NULL; - row = ewl_tree_row_add(EWL_TREE(tree), NULL, children); - ewl_object_fill_policy_set(EWL_OBJECT(row), EWL_FLAG_FILL_VSHRINK ); - - ewl_widget_show(row); - - - /*Now attach an object to it*/ - structure = entropy_plugins_type_get_first(instance->core->plugin_list, ENTROPY_PLUGIN_GUI_COMPONENT, ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW); - - if (structure) { - Ewl_Widget* children[2]; - Ewl_Widget* visual; - Ewl_Widget* srow; - - entropy_generic_file* file = entropy_core_parse_uri(uri); - - //printf("***** Adding structure viewer\n"); - - /*Main drive viewer*/ - { - structure_plugin_init = dlsym(structure->dl_ref, "entropy_plugin_init"); - gui->structure_viewer = (*structure_plugin_init)(instance->core,instance,file); - gui->structure_viewer->plugin = structure; - visual = EWL_WIDGET(gui->structure_viewer->gui_object); - if (!visual) printf("Alert! - Visual component not found\n"); - else {} // printf("Visual component found\n"); - children[0] = EWL_WIDGET(visual); - children[1] = NULL; - srow= ewl_tree_row_add(EWL_TREE(tree), EWL_ROW(row), children); - ewl_object_fill_policy_set(EWL_OBJECT(srow), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL ); - ewl_object_fill_policy_set(EWL_OBJECT(visual), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL); - ewl_widget_show(srow); - } - } - + Ewl_Widget* hbox; + Ewl_Widget* image; + Ewl_Widget* row; + Ewl_Widget* children[2]; + entropy_plugin* structure; + void* (*structure_plugin_init)(entropy_core* core, entropy_gui_component_instance*, void* data); + + entropy_layout_gui* gui = ((entropy_layout_gui*)instance->data); + Ewl_Widget* label = ewl_text_new(); + Ewl_Widget* tree= gui->tree; + + + printf("Add URI: %s\n", uri); + ewl_text_text_set(EWL_TEXT(label), name); + image = ewl_image_new(); + ewl_image_file_set(EWL_IMAGE(image), "../icons/chardevice.png", NULL); + hbox = ewl_hbox_new(); + ewl_container_child_append(EWL_CONTAINER(hbox), image); + ewl_container_child_append(EWL_CONTAINER(hbox), label); + + ewl_widget_show(label); + ewl_widget_show(image); + ewl_widget_show(hbox); + children[0] = hbox; + children[1] = NULL; + row = ewl_tree_row_add(EWL_TREE(tree), NULL, children); + ewl_object_fill_policy_set(EWL_OBJECT(row), EWL_FLAG_FILL_VSHRINK ); + ewl_widget_show(row); + + + /*Now attach an object to it*/ + structure = entropy_plugins_type_get_first(instance->core->plugin_list, ENTROPY_PLUGIN_GUI_COMPONENT, ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW); + + if (structure) { + Ewl_Widget* children[2]; + Ewl_Widget* visual; + Ewl_Widget* srow; + + entropy_generic_file* file = entropy_core_parse_uri(uri); + + //printf("***** Adding structure viewer\n"); + + /*Main drive viewer*/ + { + structure_plugin_init = dlsym(structure->dl_ref, "entropy_plugin_init"); + gui->structure_viewer = (*structure_plugin_init)(instance->core,instance,file); + gui->structure_viewer->plugin = structure; + visual = EWL_WIDGET(gui->structure_viewer->gui_object); + if (!visual) + printf("Alert! - Visual component not found\n"); + else + ;// printf("Visual component found\n"); + children[0] = EWL_WIDGET(visual); + children[1] = NULL; + srow = ewl_tree_row_add(EWL_TREE(tree), EWL_ROW(row), children); + ewl_object_fill_policy_set(EWL_OBJECT(srow), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL ); + ewl_object_fill_policy_set(EWL_OBJECT(visual), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL); + ewl_widget_show(srow); + } + } } Ecore_Hash* layout_ewl_simple_parse_config(entropy_gui_component_instance* instance, char* config) { @@ -357,7 +347,7 @@ if (!strstr(config, "|")) { char* name; char* uri; - + //printf("Simple case - only one object...\n"); name = strtok(config, ";"); @@ -366,16 +356,16 @@ //printf("Name/uri is %s %s\n", name,uri); layout_ewl_simple_add_header(instance, name,uri); - + /*Cut the obj up by semicolon;*/ - + } else { Ecore_List* objects = ecore_list_new(); char* object; char* name; char* uri; - + //printf("Complex case, multiple objects...\n"); object = strtok(config, "|"); @@ -397,8 +387,6 @@ } ecore_list_destroy(objects); - - } return ret; @@ -406,18 +394,13 @@ void - __resize_homedir(Ewl_Widget *obj, void *ev_data, void *user_data) - { +__resize_homedir(Ewl_Widget *obj, void *ev_data, void *user_data) { int h; + //ewl_callback_del_type(EWL_WIDGET(obj), EWL_CALLBACK_CONFIGURE); - - - //ewl_callback_del_type(EWL_WIDGET(obj), EWL_CALLBACK_CONFIGURE); - - h = ewl_object_current_h_get(EWL_OBJECT(obj)); - //ewl_object_custom_h_set(EWL_WIDGET(user_data), h); - + h = ewl_object_current_h_get(EWL_OBJECT(obj)); + //ewl_object_custom_h_set(EWL_WIDGET(user_data), h); //ewl_callback_append(EWL_WIDGET(obj), EWL_CALLBACK_CONFIGURE, __resize_homedir, EWL_WIDGET(user_data)); //printf("\n\n\n\n\nResize called, set to %d\n\n\n\n\n", h); @@ -425,37 +408,32 @@ void - __destroy_main_window(Ewl_Widget *main_win, void *ev_data, void *user_data) - { +__destroy_main_window(Ewl_Widget *main_win, void *ev_data, void *user_data) { entropy_core* core = (entropy_core*)user_data; - - ewl_widget_destroy(main_win); - ewl_main_quit(); + ewl_widget_destroy(main_win); + ewl_main_quit(); entropy_core_destroy(core); - - exit(0); - } + exit(0); +} void -contract_cb(Ewl_Widget *main_win, void *ev_data, void *user_data) - { +contract_cb(Ewl_Widget *main_win, void *ev_data, void *user_data) { Ewl_Box* box = EWL_BOX(user_data); ewl_object_maximum_w_set(EWL_OBJECT(box), 15); - } +} void -expand_cb(Ewl_Widget *main_win, void *ev_data, void *user_data) - { +expand_cb(Ewl_Widget *main_win, void *ev_data, void *user_data) { Ewl_Box* box = EWL_BOX(user_data); ewl_object_minimum_w_set(EWL_OBJECT(box), 150); - } +} int entropy_plugin_type_get() { - return ENTROPY_PLUGIN_GUI_LAYOUT; + return ENTROPY_PLUGIN_GUI_LAYOUT; } char* entropy_plugin_identify() { @@ -491,25 +469,25 @@ entropy_gui_component_instance* layout; entropy_layout_gui* gui; char* tmp = NULL; - - - /*EWL Stuff -----------------*/ + + + /*EWL Stuff -----------------*/ void* (*entropy_plugin_init)(entropy_core* core, entropy_gui_component_instance*); void* (*structure_plugin_init)(entropy_core* core, entropy_gui_component_instance*, void* data); - - Ewl_Widget* paned; - Ewl_Widget* box; - Ewl_Widget* tree; - Ewl_Widget* vbox; - Ewl_Widget* hbox; - Ewl_Widget* contract_button; - Ewl_Widget* expand_button; - Ewl_Widget* scrollpane; - Ewl_Widget* add_button; - - entropy_plugin* plugin; - Ewl_Widget* iconbox; + + Ewl_Widget* paned; + Ewl_Widget* box; + Ewl_Widget* tree; + Ewl_Widget* vbox; + Ewl_Widget* hbox; + Ewl_Widget* contract_button; + Ewl_Widget* expand_button; + Ewl_Widget* scrollpane; + Ewl_Widget* add_button; + + entropy_plugin* plugin; + Ewl_Widget* iconbox; layout = entropy_malloc(sizeof(entropy_gui_component_instance)); gui = entropy_malloc(sizeof(entropy_layout_gui)); @@ -520,8 +498,8 @@ /*Register this layout container with the core, so our children can get events*/ entropy_core_layout_register(core, layout); - /*---------------------------*/ - /*HACK - get the iconbox - this should be configurable */ + /*---------------------------*/ + /*HACK - get the iconbox - this should be configurable */ plugin = entropy_plugins_type_get_first(core->plugin_list, ENTROPY_PLUGIN_GUI_COMPONENT, ENTROPY_PLUGIN_GUI_COMPONENT_LOCAL_VIEW); if (plugin) { //printf("Plugin: %s\n", plugin->filename); @@ -534,37 +512,35 @@ return NULL; } - //printf("Initialising simple EWL layout manager...\n"); - /*EWL Setup*/ - win= ewl_window_new(); - box = ewl_vbox_new(); - vbox = ewl_vbox_new(); + /*EWL Setup*/ + win= ewl_window_new(); + box = ewl_vbox_new(); + vbox = ewl_vbox_new(); hbox = ewl_hbox_new(); - + scrollpane = ewl_scrollpane_new(); contract_button = ewl_button_new(); ewl_button_label_set(EWL_BUTTON(contract_button), "<"); expand_button = ewl_button_new(); ewl_button_label_set(EWL_BUTTON(expand_button), ">"); - - tree = ewl_tree_new(1); + tree = ewl_tree_new(1); gui->tree = tree; - paned = ewl_hpaned_new(); - ewl_window_title_set(EWL_WINDOW(win), "Entropy"); - ewl_window_name_set(EWL_WINDOW(win), "Entropy"); - ewl_window_class_set(EWL_WINDOW(win), "Entropy"); - ewl_object_size_request(EWL_OBJECT(win), 800,600); + paned = ewl_hpaned_new(); + ewl_window_title_set(EWL_WINDOW(win), "Entropy"); + ewl_window_name_set(EWL_WINDOW(win), "Entropy"); + ewl_window_class_set(EWL_WINDOW(win), "Entropy"); + ewl_object_size_request(EWL_OBJECT(win), 800,600); ewl_object_maximum_size_set(EWL_OBJECT(contract_button), 20, 10); ewl_object_maximum_size_set(EWL_OBJECT(expand_button), 20, 10); ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_VSHRINK); - + ewl_container_child_append(EWL_CONTAINER(hbox), expand_button); ewl_container_child_append(EWL_CONTAINER(hbox), contract_button); @@ -579,16 +555,16 @@ add_button = ewl_button_new(); ewl_button_label_set(EWL_BUTTON(add_button), "Add Location"); ewl_container_child_append(EWL_CONTAINER(paned), add_button); - + ewl_object_maximum_h_set(EWL_OBJECT(add_button), 20); ewl_object_minimum_w_set(EWL_OBJECT(add_button), 250); - + ewl_callback_append(EWL_WIDGET(add_button), EWL_CALLBACK_CLICKED, location_add_cb, layout); ewl_widget_show(add_button); /*--------------------------*/ - - ewl_container_child_append(EWL_CONTAINER(box),paned); + + ewl_container_child_append(EWL_CONTAINER(box),paned); //ewl_container_child_append(EWL_CONTAINER(scrollpane), tree); ewl_container_child_append(EWL_CONTAINER(paned), tree); ewl_paned_active_area_set(EWL_PANED(paned), EWL_POSITION_RIGHT); @@ -596,14 +572,14 @@ /*This is cheating - break OO convention by accessing the internals of the struct.. but it doesn't work without this*/ - ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->second), EWL_FLAG_FILL_NORMAL); - ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->first), EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL ); + ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->second), EWL_FLAG_FILL_NORMAL); + ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->first), EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL ); //ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL); - ewl_object_fill_policy_set(EWL_OBJECT(paned), EWL_FLAG_FILL_NORMAL); - //ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_FILL | EWL_FLAG_FILL_HSHRINK); + ewl_object_fill_policy_set(EWL_OBJECT(paned), EWL_FLAG_FILL_NORMAL); + //ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_FILL | EWL_FLAG_FILL_HSHRINK); //ewl_object_fill_policy_set(EWL_OBJECT(scrollpane), EWL_FLAG_FILL_NORMAL); - + if (!(tmp = entropy_config_str_get("layout_ewl_simple", "structure_bar"))) { //printf ("Creating initial view for ewl_simple layout..\n"); layout_ewl_simple_config_create(core); @@ -616,34 +592,26 @@ entropy_free(tmp); - - - /*ewl_tree_node_expand(row);*/ - - //printf("Showing widgets..\n"); - - ewl_widget_show(box); - ewl_widget_show(vbox); - ewl_widget_show(hbox); - ewl_widget_show(contract_button); - ewl_widget_show(expand_button); - ewl_widget_show(scrollpane); - - ewl_widget_show(paned); - ewl_widget_show(tree); - - ewl_object_fill_policy_set(EWL_OBJECT(win), EWL_FLAG_FILL_ALL); - ewl_container_child_append(EWL_CONTAINER(win), box); - - - - ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, - __destroy_main_window, core); + /*ewl_tree_node_expand(row);*/ + //printf("Showing widgets..\n"); + ewl_widget_show(box); + ewl_widget_show(vbox); + ewl_widget_show(hbox); + ewl_widget_show(contract_button); + ewl_widget_show(expand_button); + ewl_widget_show(scrollpane); + ewl_widget_show(paned); + ewl_widget_show(tree); + + ewl_object_fill_policy_set(EWL_OBJECT(win), EWL_FLAG_FILL_ALL); + ewl_container_child_append(EWL_CONTAINER(win), box); - ewl_container_child_resize(EWL_WIDGET(EWL_PANED(paned)->first), 80, EWL_ORIENTATION_HORIZONTAL); + ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, + __destroy_main_window, core); + ewl_container_child_resize(EWL_WIDGET(EWL_PANED(paned)->first), 80, EWL_ORIENTATION_HORIZONTAL); - layout->gui_object = win; - return layout; + layout->gui_object = win; + return layout; } |
From: <enl...@li...> - 2005-10-27 07:29:19
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk Modified Files: autogen.sh Log Message: add error checking =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- autogen.sh 16 Oct 2005 00:05:57 -0000 1.2 +++ autogen.sh 27 Oct 2005 07:29:08 -0000 1.3 @@ -1,16 +1,17 @@ #!/bin/sh rm -rf autom4te.cache -rm -f aclocal.m4 +rm -f aclocal.m4 ltmain.sh touch README -echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \ -&& echo "Running autoheader..."; autoheader \ -&& echo "Running autoconf..."; autoconf \ -&& echo "Running libtoolize..."; (libtoolize --copy --automake || glibtoolize --automake) \ -&& echo "Running automake..."; automake --add-missing --copy --gnu \ -&& echo "Generating gettext etk.pot template"; \ +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 + +echo "Generating gettext etk.pot template"; \ xgettext \ -n \ -C \ |
From: <enl...@li...> - 2005-10-27 07:33:08
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/enterminus Modified Files: autogen.sh Log Message: use simpler autogen script =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enterminus/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 24 Jan 2005 10:57:26 -0000 1.1 +++ autogen.sh 27 Oct 2005 07:33:00 -0000 1.2 @@ -1,148 +1,16 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -PKG_NAME="enterminus" +rm -rf autom4te.cache +rm -f aclocal.m4 ltmain.sh -DIE=0 +touch README -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} +echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || 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 -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && { - grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \ - (gettext --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`gettext' installed." - echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` - ( cd $dr - aclocalinclude="$ACLOCAL_FLAGS" - for k in $macrodirs; do - if test -d $k; then - aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." - fi - done - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then - if grep "sed.*POTFILES" configure.in >/dev/null; then - : do nothing -- we still have an old unmodified configure.in - else - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - fi - if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - echo "no" | gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME -else - echo Skipping configure process. +if [ -z "$NOCONFIGURE" ]; then + ./configure "$@" fi |
From: <enl...@li...> - 2005-10-27 07:33:17
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/enterminus Modified Files: configure.in Log Message: build with warnings enabled =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enterminus/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 16 Aug 2005 09:59:40 -0000 1.2 +++ configure.in 27 Oct 2005 07:33:11 -0000 1.3 @@ -88,6 +88,8 @@ AC_SUBST(my_includes) AC_SUBST(my_libs) +CFLAGS="-Wall $CFLAGS" + AC_OUTPUT([ Makefile src/Makefile |
From: <enl...@li...> - 2005-10-27 07:33:48
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/enterminus/src/bin Modified Files: term.h Log Message: include math.h since we use math functions =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/term.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- term.h 12 Jun 2005 11:03:51 -0000 1.14 +++ term.h 27 Oct 2005 07:33:43 -0000 1.15 @@ -4,6 +4,7 @@ #include <ctype.h> #include <assert.h> #include <signal.h> +#include <math.h> #include <pwd.h> #include <sys/ioctl.h> #include <sys/time.h> |
From: <enl...@li...> - 2005-10-27 07:34:33
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/enterminus/src/bin Modified Files: term.c Log Message: remove unused variable =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/term.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- term.c 12 Jun 2005 11:03:51 -0000 1.19 +++ term.c 27 Oct 2005 07:34:16 -0000 1.20 @@ -41,7 +41,6 @@ term_tcanvas_glyph_push(Term *term, char c) { Term_TGlyph *gl; - int j; int pos; pos = term->tcanvas->pos + term->cur_row; |
From: <enl...@li...> - 2005-10-27 07:34:55
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/enterminus/src/bin Modified Files: handlers.c Log Message: update evas api evas_key_modifier_is_set_get -> evas_key_modifier_is_set =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/handlers.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- handlers.c 28 Feb 2005 12:34:32 -0000 1.13 +++ handlers.c 27 Oct 2005 07:34:46 -0000 1.14 @@ -551,17 +551,17 @@ /* extra stuff, clean up later */ - if (evas_key_modifier_is_set_get(ev->modifiers, "Shift")) + if (evas_key_modifier_is_set(ev->modifiers, "Shift")) key_modifiers |= TERM_KEY_MODIFIER_SHIFT; - else if (evas_key_modifier_is_set_get(ev->modifiers, "Alt")) + else if (evas_key_modifier_is_set(ev->modifiers, "Alt")) key_modifiers |= TERM_KEY_MODIFIER_ALT; - else if (evas_key_modifier_is_set_get(ev->modifiers, "Control")) + else if (evas_key_modifier_is_set(ev->modifiers, "Control")) key_modifiers |= TERM_KEY_MODIFIER_CTRL; - else if (evas_key_modifier_is_set_get(ev->modifiers, "Meta")) + else if (evas_key_modifier_is_set(ev->modifiers, "Meta")) key_modifiers |= TERM_KEY_MODIFIER_MOD; - else if (evas_key_modifier_is_set_get(ev->modifiers, "Super")) + else if (evas_key_modifier_is_set(ev->modifiers, "Super")) key_modifiers |= TERM_KEY_MODIFIER_WIN; - else if (evas_key_modifier_is_set_get(ev->modifiers, "Hyper")) + else if (evas_key_modifier_is_set(ev->modifiers, "Hyper")) key_modifiers |= TERM_KEY_MODIFIER_WIN; /* fixup the space char */ |
From: <enl...@li...> - 2005-10-27 07:46:19
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk Modified Files: autogen.sh Log Message: dont need to touch README =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- autogen.sh 27 Oct 2005 07:29:08 -0000 1.3 +++ autogen.sh 27 Oct 2005 07:46:14 -0000 1.4 @@ -3,8 +3,6 @@ rm -rf autom4te.cache rm -f aclocal.m4 ltmain.sh -touch README - echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 |
From: <enl...@li...> - 2005-10-27 07:46:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/po Added Files: .cvsignore Log Message: .cvsignore |
From: <enl...@li...> - 2005-10-27 07:46:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: .cvsignore Log Message: .cvsignore =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 6 Oct 2005 02:39:21 -0000 1.1 +++ .cvsignore 27 Oct 2005 07:46:19 -0000 1.2 @@ -3,3 +3,5 @@ .libs *.lo *.la +Makefile +Makefile.in |
From: <enl...@li...> - 2005-10-27 07:46:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/src Added Files: .cvsignore Log Message: .cvsignore |
From: <enl...@li...> - 2005-10-27 07:46:26
|
Enlightenment CVS committal Author : vapier Project : e17 Module : proto Dir : e17/proto/etk/src/bin Added Files: .cvsignore Log Message: .cvsignore |