E CVS: apps/e onefang

[Enlightenment CVS]

Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : apps/e

Dir : e17/apps/e


Modified Files:
TODO xnest.sh 


Log Message:
TODO--

===
RCS file: /cvs/e/e17/apps/e/TODO,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -3 -r1.442 -r1.443
--- TODO10 Sep 2006 07:07:55 -  1.442
+++ TODO12 Sep 2006 06:48:30 -  1.443
@@ -8,11 +8,6 @@
   BUGS / FIXES
 ---
 
-* BUG: exe and options split doesnt do things quite right - it should empty
-  out %u/U/f whatever (parts and conver them to empty strings) but keep other
-  cmd-line options (eg my exe is "xterm -e mutt" should nto strip off the
-  options) so "exe %u" -> "exe ", "exe -f %u" -> "exe -f ",
-  "exe -f" -> "exe -f"
 * BUG: adding app using "applications" dialog to a bar dir ends up with blank
   icons in the bar dir in the apps dialog - until a restart
 * BUG: smart placement seems to screw up if a shelf is at the top of the screen
===
RCS file: /cvs/e/e17/apps/e/xnest.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- xnest.sh27 Jan 2006 04:44:42 -  1.2
+++ xnest.sh12 Sep 2006 06:48:30 -  1.3
@@ -8,7 +8,9 @@
 sleep 2   # Someone reported that it starts E before X has started properly.
 
 # Comment out all but one of these.
-DISPLAY=:1 ; enlightenment &   # Just run it.
+#DISPLAY=:1 ; enlightenment   # Just run it.
 #DISPLAY=:1 ; xterm -e gdb -x gdb.txt enlightenment   # Run it with the text 
based debugger.
+DISPLAY=:1 ; gdb -x gdb.txt enlightenment   # Run it with the text based 
debugger.
 #DISPLAY=:1 ; ddd -geometry 550x450+5+25 enlightenment &   # Run it with the 
GUI debugger.
-#DISPLAY=:1 ; valgrind --tool=memcheck --log-file=valgrind_log enlightenment & 
  # Run it with valgrind.
+#DISPLAY=:1 ; valgrind --tool=memcheck --log-file=valgrind_log enlightenment   
 # Run it with valgrind.
+#DISPLAY=:1 ; valgrind --tool=memcheck --leak-check=yes --show-reachable=yes 
--log-file=valgrind_log enlightenment# Run it with valgrind and leak 
checking.



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl titan

[Enlightenment CVS]

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
Makefile.am Ewl.h 
Added Files:
ewl_shadow.c ewl_shadow.h 


Log Message:
Add the shadow widget to ewl. The shadow widget is a container which has a 
shadow for depth. It looks good with rectangular images.. However if you have 
any alpha stuff it doesn't look good at the moment. Thats on the way.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- Makefile.am 11 Sep 2006 20:51:41 -  1.33
+++ Makefile.am 12 Sep 2006 05:07:12 -  1.34
@@ -72,6 +72,7 @@
ewl_scrollpane.h \
ewl_seeker.h \
ewl_separator.h \
+   ewl_shadow.h \
ewl_spacer.h \
ewl_spectrum.h \
ewl_spinner.h \
@@ -147,6 +148,7 @@
ewl_scrollpane.c \
ewl_seeker.c \
ewl_separator.c \
+   ewl_shadow.c \
ewl_spacer.c \
ewl_spectrum.c \
ewl_spinner.c \
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Ewl.h   11 Sep 2006 20:51:41 -  1.10
+++ Ewl.h   12 Sep 2006 05:07:12 -  1.11
@@ -341,7 +341,8 @@
 #include 
 #include 
 #include 
-
+#include 
+   
 #ifdef __cplusplus
 }
 #endif



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl titan

[Enlightenment CVS]

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/data/themes/e17/bits


Added Files:
shadow-groups.edc 


Log Message:
Add the shadow widget to ewl. The shadow widget is a container which has a 
shadow for depth. It looks good with rectangular images.. However if you have 
any alpha stuff it doesn't look good at the moment. Thats on the way.




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl titan

[Enlightenment CVS]

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/data/themes


Modified Files:
Makefile.am e17.edc 


Log Message:
Add the shadow widget to ewl. The shadow widget is a container which has a 
shadow for depth. It looks good with rectangular images.. However if you have 
any alpha stuff it doesn't look good at the moment. Thats on the way.

===
RCS file: /cvs/e/e17/libs/ewl/data/themes/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- Makefile.am 10 Aug 2006 08:57:48 -  1.18
+++ Makefile.am 12 Sep 2006 05:07:13 -  1.19
@@ -20,6 +20,7 @@
e17/bits/scrollpane-groups.edc \
e17/bits/selection-groups.edc \
e17/bits/separator-groups.edc \
+   e17/bits/shadow-groups.edc \
e17/bits/spacer-groups.edc \
e17/bits/spinner-groups.edc \
e17/bits/stock-groups.edc \
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17.edc,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e17.edc 11 Sep 2006 04:21:42 -  1.49
+++ e17.edc 12 Sep 2006 05:07:13 -  1.50
@@ -22,6 +22,7 @@
 #include "e17/bits/progressbar-groups.edc"
 #include "e17/bits/scrollbar-groups.edc"
 #include "e17/bits/selection-groups.edc"
+#include "e17/bits/shadow-groups.edc"
 #include "e17/bits/spacer-groups.edc"
 #include "e17/bits/spinner-groups.edc"
 #include "e17/bits/stock-groups.edc"
@@ -160,6 +161,7 @@
item, "/tooltip/group" "window";
 
item, "/window/group" "window";
+item, "/shadow/group" "widget/shadow";
 
item, "/theme/name" "e17";
item, "/theme/author" "dj2 (www.everburning.com)";



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
evas_engine_xrender.c 


Log Message:


#ifdef the 1 bit transform stuff.

===
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas_engine_xrender.c   11 Sep 2006 15:24:54 -  1.16
+++ evas_engine_xrender.c   12 Sep 2006 00:03:53 -  1.17
@@ -8,6 +8,12 @@
 #include "Evas_Engine_XRender_X11.h"
 #include 
 
+/* this is a work around broken xrender - when/if this ever gets fixed in xorg
+ * we can comment this out and one day remove it - for now keep it until such
+ * a fix is spotted in the wild
+ */
+#define BROKEN_XORG_XRENDER 1
+
 Xrender_Surface *
 _xr_render_surface_new(Ximage_Info *xinf, int w, int h, XRenderPictFormat 
*fmt, int alpha)
 {
@@ -492,6 +498,7 @@

if ((w <= 0) || (h <= 0) || (!srs) || (!drs)) return;
 
+#ifdef BROKEN_XORG_XRENDER   
/* FIXME: why do we need to change the identity matrix ifthe src surface
 * is 1 bit deep?
 */
@@ -501,7 +508,7 @@
xf.matrix[0][0] = xf.matrix[1][1] = xf.matrix[2][2] = 1;
XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf);
  }
-
+#endif

att.clip_mask = None;
XRenderChangePicture(srs->xinf->disp, srs->pic, CPClipMask, &att);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir : e17/libs/evas


Modified Files:
configure.in 


Log Message:


svg fallback fixed

===
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -3 -r1.178 -r1.179
--- configure.in11 Sep 2006 03:43:56 -  1.178
+++ configure.in11 Sep 2006 23:53:27 -  1.179
@@ -936,7 +936,7 @@
svg_libs="$SVG_LIBS $CAIRO_SVG_LIBS"
 ],
 [ 
-PKG_CHECK_MODULES(CAIRO_SVG, libsvg-cairo,
+PKG_CHECK_MODULES(LIBCAIRO_SVG, libsvg-cairo,
   [ 
  have_svg="yes"
  svg_cflags="$SVG_CFLAGS $LIBSVG_CAIRO_CFLAGS"



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore onefang

[Enlightenment CVS]

Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore_desktop


Modified Files:
Ecore_Desktop.h ecore_desktop.c 


Log Message:
Expand FDO command arguments and allow other argument parsing again.

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- Ecore_Desktop.h 7 Sep 2006 13:16:21 -   1.24
+++ Ecore_Desktop.h 11 Sep 2006 21:40:17 -  1.25
@@ -47,6 +47,7 @@
char   *exec;
char   *exec_params;
char   *icon;
+   char   *original_icon;
char   *icon_class;
char   *icon_path;
char   *path;
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ecore_desktop.c 10 Sep 2006 11:11:54 -  1.28
+++ ecore_desktop.c 11 Sep 2006 21:40:17 -  1.29
@@ -293,6 +293,8 @@
 
   result->icon =
  (char *)ecore_hash_get(result->group, "Icon");
+  if (result->icon)
+ result->original_icon = strdup(result->icon);
   result->icon_class =
  (char *)ecore_hash_get(result->group, 
"X-Enlightenment-IconClass");
   value =
@@ -664,6 +666,8 @@
   free(desktop->original_lang);
if (desktop->eap_name)
   free(desktop->eap_name);
+   if (desktop->original_icon)
+  free(desktop->original_icon);
if (desktop->icon_class)
   free(desktop->icon_class);
if (desktop->window_class)
@@ -710,8 +714,121 @@
 
if (fill && (desktop->exec_params))
   {
- /* FIXME: Handle the fdo %x replacable params.  Some should be 
stripped, some should be expanded. */
  params = strdup(desktop->exec_params);
+if (params)
+   {
+   Ecore_DList *command;
+
+   command = ecore_dlist_new();
+   if (command)
+  {
+char *p, *t, buf[PATH_MAX + 10];
+int len = 0;
+
+ecore_dlist_set_free_cb(command, free);
+t = params;
+for (p = params; *p; p++)
+   {
+  if (*p == '%')
+ {
+*p = '\0';
+ecore_dlist_append(command, strdup(t));
+*p = '%';
+t = p;
+ }
+   }
+if (t < p)
+{
+   ecore_dlist_append(command, strdup(t));
+}
+if (!ecore_dlist_is_empty(command))
+   {
+  ecore_dlist_goto_first(command);
+  while ((p = ecore_dlist_next(command)) != NULL)
+ {
+t = NULL;
+ /* FIXME: implement the rest of these when 
EFM can pass us files. */
+if (p[0] == '%')
+   switch (p[1])
+  {
+ case 'f' :  /* Single file name, 
multiple invokations if multiple files.  If the file is on the net, download 
first and point to temp file. */
+break;
+
+ case 'u' :  /* Single URL, multiple 
invokations if multiple URLs. */
+break;
+
+ case 'c' :  /* Translated Name field 
frem .desktop file. */
+t = desktop->name;
+break;
+
+ case 'k' :  /* Location of the 
.desktop file, may be a URL, or empty. */
+t = desktop->original_path;
+break;
+
+ case 'F' :  /* Multiple file names.  
If the files are on the net, download first and point to temp files. */
+break;
+
+ case 'U' :  /* Multiple URLs. */
+break;
+
+ case 'd' :  /* Directory of the file 
in %f. */
+break;
+
+ case 'D' :  /* Directories of the 
f

E CVS: apps/e onefang

[Enlightenment CVS]

Enlightenment CVS committal

Author  : onefang
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_apps.c 


Log Message:
Fix a typo I thought I had already fixed.  Some more clean up.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -3 -r1.180 -r1.181
--- e_apps.c10 Sep 2006 10:34:17 -  1.180
+++ e_apps.c11 Sep 2006 21:37:18 -  1.181
@@ -1237,7 +1237,7 @@
   if (desktop->comment)  a->comment = 
evas_stringshare_add(desktop->comment);
 
   if (desktop->exec)  a->exe = evas_stringshare_add(desktop->exec);
-  if (desktop->exec_params)  a->exe = 
evas_stringshare_add(desktop->exec_params);
+  if (desktop->exec_params)  a->exe_params = 
evas_stringshare_add(desktop->exec_params);
   if (desktop->icon_class)  a->icon_class = 
evas_stringshare_add(desktop->icon_class);
   if (desktop->icon_path)  a->icon_path = 
evas_stringshare_add(desktop->icon_path);
   if (desktop->window_class)  a->win_class = 
evas_stringshare_add(desktop->window_class);
@@ -1301,7 +1301,6 @@
 }
   eet_close(ef);
}
-
 }
 
 static char *
@@ -1520,6 +1519,7 @@
if (a->win_class) evas_stringshare_del(a->win_class);
if (a->win_title) evas_stringshare_del(a->win_title);
if (a->win_role) evas_stringshare_del(a->win_role);
+   a->desktop = NULL;
a->name = NULL;
a->generic = NULL;
a->comment = NULL;
@@ -2276,6 +2276,7 @@
  }
 
dst->orig = src;
+   dst->desktop = src->desktop;
 
dst->name = src->name;
dst->generic = src->generic;



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto codewarrior

[Enlightenment CVS]

Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : proto

Dir : e17/proto/extrackt


Modified Files:
configure.in 


Log Message:
HAVE_ET -> HAVE_EET, thanks chris.

===
RCS file: /cvs/e/e17/proto/extrackt/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- configure.in10 Jul 2006 05:59:50 -  1.4
+++ configure.in11 Sep 2006 21:32:48 -  1.5
@@ -126,7 +126,7 @@
eet,
0.9.10,
[
- AC_DEFINE(HAVE_ET, 1, have EET)
+ AC_DEFINE(HAVE_EET, 1, have EET)
  eet="EET "
  eet_libs=`eet-config --libs`
  eet_includes=`eet-config --cflags`



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl ningerso

[Enlightenment CVS]

Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests


Modified Files:
Makefile.am 
Added Files:
ewl_histogram.c 


Log Message:
Add initial implementation of a histogram widget.
Outline DND drop support for the color picker.
Add dirty flag to spectrum to reduce redraws.

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- Makefile.am 21 Aug 2006 01:20:03 -  1.38
+++ Makefile.am 11 Sep 2006 20:51:41 -  1.39
@@ -28,7 +28,7 @@
  ewl_theme.la ewl_media.la ewl_menu.la ewl_imenu.la \
  ewl_widget.la fullscreen.la  modal.la ewl_layer.la \
  ewl_list.la puzzle.la ewl_grid.la \
- ewl_icon_theme.la ewl_container.la
+ ewl_icon_theme.la ewl_container.la ewl_histogram.la
 
 ewl_border_la_SOURCES   = ewl_border.c
 ewl_border_la_LIBADD= $(top_builddir)/src/lib/libewl.la
@@ -366,6 +366,13 @@
  -L$(top_builddir)/src/lib/.libs
 ewl_container_la_DEPENDENCIES = 
 
+ewl_histogram_la_SOURCES   = ewl_histogram.c
+ewl_histogram_la_LIBADD= $(top_builddir)/src/lib/libewl.la
+ewl_histogram_la_LDFLAGS   = -module -avoid-version \
+ -L$(top_builddir)/src/lib \
+ -L$(top_builddir)/src/lib/.libs
+ewl_histogram_la_DEPENDENCIES = 
+
 
 FILES = $(ewl_border_la_SOURCES) $(ewl_box_la_SOURCES) \
$(ewl_button_la_SOURCES) $(ewl_colordialog_la_SOURCES) \
@@ -390,7 +397,8 @@
$(modal_la_SOURCES) $(ewl_layer_la_SOURCES) \
$(ewl_dnd_snoop_la_SOURCES) $(ewl_list_la_SOURCES) \
$(puzzle_la_SOURCES) $(ewl_grid_la_SOURCES) \
-   $(ewl_icon_theme_la_SOURCES) $(ewl_container_la_SOURCES)
+   $(ewl_icon_theme_la_SOURCES) $(ewl_container_la_SOURCES) \
+   $(ewl_histogram_la_SOURCES)
 
 EXTRA_DIST = $(FILES)
 



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl ningerso

[Enlightenment CVS]

Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
Ewl.h Makefile.am ewl_colorpicker.c ewl_colorpicker.h 
ewl_spectrum.c ewl_spectrum.h 
Added Files:
ewl_histogram.c ewl_histogram.h 


Log Message:
Add initial implementation of a histogram widget.
Outline DND drop support for the color picker.
Add dirty flag to spectrum to reduce redraws.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Ewl.h   22 Aug 2006 21:41:45 -  1.9
+++ Ewl.h   11 Sep 2006 20:51:41 -  1.10
@@ -310,6 +310,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- Makefile.am 22 Aug 2006 21:41:45 -  1.32
+++ Makefile.am 11 Sep 2006 20:51:41 -  1.33
@@ -44,6 +44,7 @@
ewl_filedialog.h \
ewl_freebox.h \
ewl_grid.h \
+   ewl_histogram.h \
ewl_icon.h \
ewl_icon_theme.h \
ewl_iconbox.h \
@@ -119,6 +120,7 @@
ewl_filedialog.c \
ewl_freebox.c \
ewl_grid.c \
+   ewl_histogram.c \
ewl_icon.c \
ewl_icon_theme.c \
ewl_iconbox.c \
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_colorpicker.c   14 Aug 2006 14:56:56 -  1.27
+++ ewl_colorpicker.c   11 Sep 2006 20:51:41 -  1.28
@@ -95,6 +95,7 @@
{"b", EWL_COLOR_MODE_RGB_BLUE, 255},
{NULL, EWL_COLOR_MODE_RGB_RED, 0}
};
+   const char *types[] = { "application/x-color", NULL };
 
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("cp", cp, FALSE);
@@ -105,6 +106,10 @@
ewl_box_orientation_set(EWL_BOX(cp), EWL_ORIENTATION_HORIZONTAL);
ewl_widget_appearance_set(EWL_WIDGET(cp), EWL_COLORPICKER_TYPE);
ewl_widget_inherit(EWL_WIDGET(cp), EWL_COLORPICKER_TYPE);
+   ewl_dnd_accepted_types_set(EWL_WIDGET(cp), types);
+
+   ewl_callback_append(EWL_WIDGET(cp), EWL_CALLBACK_DND_DATA,
+   ewl_colorpicker_cb_dnd_data, NULL);
 
r = g = b = 0;
 
@@ -722,6 +727,30 @@
cp = data;
ewl_colorpicker_current_rgb_set(cp, cp->previous.r, cp->previous.g, 
cp->previous.b);
+
+   DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @internal
+ * @param w: UNUSED
+ * @param ev: UNUSED
+ * @param data: The colorpicker
+ * @return Returns no value
+ * @brief Callback for when a user clicks on the previous colour
+ */
+void
+ewl_colorpicker_cb_dnd_data(Ewl_Widget *w __UNUSED__, void *ev,
+   void *data __UNUSED__)
+{
+   Ewl_Event_Dnd_Data *event = ev;
+
+   DENTER_FUNCTION(DLEVEL_STABLE);
+   DCHECK_PARAM_PTR("ev", ev);
+   DCHECK_PARAM_PTR("data", data);
+   DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+
+   printf("Data %d bytes\n", event->len);
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_colorpicker.h   11 Aug 2006 07:50:23 -  1.19
+++ ewl_colorpicker.h   11 Sep 2006 20:51:41 -  1.20
@@ -100,6 +100,7 @@
 void ewl_colorpicker_cb_radio_change(Ewl_Widget *w, void *ev, void *data); 
 
 void ewl_colorpicker_cb_previous_clicked(Ewl_Widget *w, void *ev, void *data);
+void ewl_colorpicker_cb_dnd_data(Ewl_Widget *w, void *ev, void *data);
 
 /**
  * @}
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_spectrum.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_spectrum.c  26 May 2006 19:58:00 -  1.25
+++ ewl_spectrum.c  11 Sep 2006 20:51:41 -  1.26
@@ -164,6 +164,7 @@
DCHECK_TYPE("sp", sp, EWL_SPECTRUM_TYPE);
 
sp->mode = mode;
+   sp->dirty = 1;
ewl_widget_configure(EWL_WIDGET(sp));
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -209,6 +210,7 @@
if (sp->rgb.b > 255) sp->rgb.b = 255;
 
ewl_spectrum_hsv_from_rgb(sp);
+   sp->dirty = 1;
ewl_widget_configure(EWL_WIDGET(sp));
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -266,6 +268,7 @@
if (sp->hsv.v < 0.0) sp->hsv.v = 0.0;
 
ewl_spectrum_rgb_from_hsv(sp);
+   sp->dirty = 1;
ewl_widget_configure(EWL_WIDGET(sp));
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -599,6 

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_config.c e_mod_main.c 


Log Message:
Fix some buggers where card_id was 0.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_config.c  11 Sep 2006 15:22:46 -  1.9
+++ e_mod_config.c  11 Sep 2006 19:14:56 -  1.10
@@ -106,7 +106,7 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);  
  }
 
-   if (mixer->mix_sys->get_card) 
+   if ((mixer->mix_sys->get_card) && (ci->card_id != 0))
  {
card = mixer->mix_sys->get_card(ci->card_id);
if ((mixer->mix_sys->get_channels) && (card)) 
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_mod_main.c11 Sep 2006 19:00:30 -  1.25
+++ e_mod_main.c11 Sep 2006 19:14:56 -  1.26
@@ -473,9 +473,12 @@
 int vol;
 double v;
 
-vol = inst->mixer->mix_sys->get_volume(ci->card_id, ci->channel_id);
-v = (1.0 - ((double)vol / 100));
-e_slider_value_set(win->slider, v);
+   if ((ci->card_id != 0) && (ci->channel_id != 0)) 
+ {
+vol = inst->mixer->mix_sys->get_volume(ci->card_id, 
ci->channel_id);
+v = (1.0 - ((double)vol / 100));
+e_slider_value_set(win->slider, v); 
+ } 
  }

e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw, &ch);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
* Resize the popup window before moving the window. For some reasons, 
the window's slide effect is smoother


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_main.c11 Sep 2006 18:30:37 -  1.24
+++ e_mod_main.c11 Sep 2006 19:00:30 -  1.25
@@ -563,8 +563,8 @@
h = progress * win->h;
prev_h = win->window->h;

-   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
e_popup_resize(win->window, win->w, h);
+   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);

if (h >= win->h)
  {
@@ -590,8 +590,8 @@
h = (1.0 - progress) * (1.0 - progress) * win->h;
prev_h = win->window->h;

-   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
e_popup_resize(win->window, win->w, h);
+   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);

if (h <= 0)
  {



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
* Do not close the mixer window on the first mouse release


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.c11 Sep 2006 18:24:27 -  1.23
+++ e_mod_main.c11 Sep 2006 18:30:37 -  1.24
@@ -694,7 +694,7 @@
xev->button, EVAS_BUTTON_NONE,
xev->time, NULL);
  }
-   else if ((xev->button == 1)/* && !win->first_mouse_up*/)
+   else if ((xev->button == 1) && !win->first_mouse_up)
  _mixer_window_simple_pop_down(win->mixer->inst);

if ((xev->button == 1) && win->first_mouse_up)



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c e_mod_types.h 


Log Message:
* Use E_Popup instead of E_Win for the popup window


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_mod_main.c11 Sep 2006 16:42:46 -  1.22
+++ e_mod_main.c11 Sep 2006 18:24:27 -  1.23
@@ -31,7 +31,6 @@
 static int  _mixer_window_simple_animator_up_cb   (void *data);
 static int  _mixer_window_simple_animator_down_cb (void *data);
 static void _mixer_window_simple_changed_cb   (void *data, Evas_Object 
*obj, void *event_info);
-static void _mixer_window_simple_resize_cb(E_Win *win);
 
 static int  _mixer_window_simple_mouse_move_cb(void *data, int type, void 
*event);
 static int  _mixer_window_simple_mouse_down_cb(void *data, int type, void 
*event);
@@ -405,18 +404,9 @@
 win = E_NEW(Mixer_Win_Simple, 1);
 inst->mixer->simple_win = win;
 win->mixer = inst->mixer;
-win->window = e_win_new(con);
-e_win_placed_set(win->window, 1);
-e_win_borderless_set(win->window, 1);
-e_win_layer_set(win->window, 255);
-e_win_resize_callback_set(win->window, _mixer_window_simple_resize_cb);
-win->window->data = win;
-
-win->event_obj = 
evas_object_rectangle_add(e_win_evas_get(win->window));
-evas_object_color_set(win->event_obj, 255, 255, 255, 0);
-evas_object_show(win->event_obj);
+win->window = e_popup_new(e_zone_current_get(con), 0, 0, 0, 0);

-win->bg_obj = edje_object_add(e_win_evas_get(win->window));
+win->bg_obj = edje_object_add(win->window->evas);
 e_theme_edje_object_set(win->bg_obj, "base/theme/menus",
"e/widgets/menu/default/background");
edje_object_part_text_set(win->bg_obj, "e.text.title", _("Volume"));
@@ -425,13 +415,11 @@
 evas_object_repeat_events_set(win->bg_obj, 1);
 evas_object_show(win->bg_obj);
 
-win->slider = e_slider_add(e_win_evas_get(win->window));
+win->slider = e_slider_add(win->window->evas);
 e_slider_value_range_set(win->slider, 0.0, 1.0);
 e_slider_orientation_set(win->slider, 0);
 /* TODO: Fix this in e_slider... */
 //e_slider_direction_set(win->slider, 1);
-/* TODO: this has no effect: Bug in Evas ? */
-evas_object_repeat_events_set(win->slider, 1);
 evas_object_show(win->slider);
 evas_object_smart_callback_add(win->slider, "changed",
_mixer_window_simple_changed_cb, win);
@@ -474,9 +462,9 @@
 
 win->first_mouse_up = 1;
 
-evas_event_feed_mouse_move(e_win_evas_get(win->window),
+evas_event_feed_mouse_move(win->window->evas,
-10, -10, ecore_time_get(), NULL);
-evas_event_feed_mouse_in(e_win_evas_get(win->window),
+evas_event_feed_mouse_in(win->window->evas,
  ecore_time_get(), NULL);
  }
  
@@ -521,9 +509,9 @@
   break;
  }

-   e_win_move(win->window, win->x, win->y);
-   e_win_resize(win->window, win->w, 0);
-   e_win_show(win->window);
+   e_popup_move(win->window, win->x, win->y);
+   e_popup_resize(win->window, win->w, 0);
+   e_popup_show(win->window);

win->start_time = ecore_time_get();
if (win->slide_animator) ecore_animator_del(win->slide_animator);
@@ -575,8 +563,8 @@
h = progress * win->h;
prev_h = win->window->h;

-   if (win->to_top) e_win_move(win->window, win->x, win->y - h);
-   e_win_resize(win->window, win->w, h);
+   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
+   e_popup_resize(win->window, win->w, h);

if (h >= win->h)
  {
@@ -602,8 +590,8 @@
h = (1.0 - progress) * (1.0 - progress) * win->h;
prev_h = win->window->h;

-   if (win->to_top) e_win_move(win->window, win->x, win->y - h);
-   e_win_resize(win->window, win->w, h);
+   if (win->to_top) e_popup_move(win->window, win->x, win->y - h);
+   e_popup_resize(win->window, win->w, h);

if (h <= 0)
  {
@@ -655,18 +643,6 @@
  }
 }
 
-/* Called when the simple window is resized */
-static void 
-_mixer_window_simple_resize_cb(E_Win *win)
-{
-   Mixer_Win_Simple *simple_win;
-   
-   if (!win || !(simple_win = win->data)) return;
-   
-   evas_object_move(simple_win->event_obj, 0, 0);
-   evas_object_resize(simple_win->event_obj, win->w, win->h);
-}
-
 /* Called when the mouse moves over the input window */
 static int
 _mixer_window_simple_mouse_move_cb(void *data, int type, void *event)
@@ -676,7 +652,7 @@

if (!(win = data)) return 1;

-   evas_event_feed_mouse_move(e_win_evas

E CVS: e kwo

[Enlightenment CVS]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
E.h ecompmgr.c hints.c hints.h systray.c 


Log Message:
Generalize selection handling. Manage _NET_WM_CM_Sx selection.
- Should fix issues with recent gtk ARGB windows.

===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -3 -r1.565 -r1.566
--- E.h 10 Sep 2006 14:29:04 -  1.565
+++ E.h 11 Sep 2006 18:10:27 -  1.566
@@ -671,6 +671,7 @@
 #define EDBUG_TYPE_VERBOSE  144
 #define EDBUG_TYPE_SYNC 145
 #define EDBUG_TYPE_PAGER146
+#define EDBUG_TYPE_SELECTION147
 
 int EventDebug(unsigned int type);
 voidEventDebugSet(unsigned int type, int value);
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- ecompmgr.c  8 Sep 2006 23:13:57 -   1.126
+++ ecompmgr.c  11 Sep 2006 18:10:27 -  1.127
@@ -33,6 +33,7 @@
 #include "ecompmgr.h"
 #include "emodule.h"
 #include "eobj.h"
+#include "hints.h"
 #include "settings.h"
 #include "timers.h"
 #include "xwin.h"
@@ -190,6 +191,8 @@
 
 static XserverRegion allDamage;
 
+static ESelection  *wm_cm_sel = NULL;
+
 #define OPAQUE  0x
 #define OP32(op) ((double)(op)/OPAQUE)
 
@@ -2290,6 +2293,8 @@
 
EventCallbackRegister(VRoot.win, 0, ECompMgrHandleRootEvent, NULL);
 
+   wm_cm_sel = SelectionAcquire("_NET_WM_CM_S", NULL, NULL);
+
lst = EobjListStackGet(&num);
for (i = 0; i < num; i++)
  {
@@ -2317,6 +2322,9 @@
Conf_compmgr.enable = Mode_compmgr.active = 0;
 
EGrabServer();
+
+   SelectionRelease(wm_cm_sel);
+   wm_cm_sel = NULL;
 
if (rootPicture)
   XRenderFreePicture(disp, rootPicture);
===
RCS file: /cvs/e/e16/e/src/hints.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- hints.c 7 Aug 2006 20:47:12 -   1.68
+++ hints.c 11 Sep 2006 18:10:27 -  1.69
@@ -33,6 +33,8 @@
 #include 
 
 /* Misc atoms */
+AtomE_XA_MANAGER = 0;
+
 AtomE_XROOTPMAP_ID;
 AtomE_XROOTCOLOR_PIXEL;
 
@@ -42,16 +44,14 @@
 static Ecore_X_Atom ENL_WIN_DATA;
 static Ecore_X_Atom ENL_WIN_BORDER;
 
-/*
- * Functions that set X11-properties from E-internals
- */
-
 void
 HintsInit(void)
 {
Atomatom;
Window  win;
 
+   E_XA_MANAGER = XInternAtom(disp, "MANAGER", False);
+
E_XROOTPMAP_ID = XInternAtom(disp, "_XROOTPMAP_ID", False);
E_XROOTCOLOR_PIXEL = XInternAtom(disp, "_XROOTCOLOR_PIXEL", False);
 
@@ -81,6 +81,10 @@
Mode.root.ext_pmap_valid = EDrawableCheck(Mode.root.ext_pmap, 0);
 }
 
+/*
+ * Functions that set X11-properties from E-internals
+ */
+
 void
 HintsSetRootHints(Win win __UNUSED__)
 {
@@ -492,4 +496,82 @@
 EHintsSetInfo(lst[i]);
 
EHintsSetDeskInfo();
+}
+
+/*
+ * Selections.
+ */
+
+struct _selection
+{
+   Atomatom;
+   Timetime;
+   Win win;
+   EventCallbackFunc  *func;
+   void   *data;
+};
+
+ESelection *
+SelectionAcquire(const char *name, EventCallbackFunc * func, void *data)
+{
+   ESelection *sel;
+   charbuf[128];
+
+   sel = Ecalloc(1, sizeof(ESelection));
+   if (!sel)
+  return sel;
+
+   Esnprintf(buf, sizeof(buf), "%s%d", name, VRoot.scr);
+
+   sel->atom = XInternAtom(disp, buf, False);
+   sel->time = EGetTimestamp();
+   sel->win = ECreateEventWindow(VRoot.win, -100, -100, 1, 1);
+
+   sel->func = func;
+   sel->data = data;
+
+   XSetSelectionOwner(disp, sel->atom, WinGetXwin(sel->win), sel->time);
+   if (XGetSelectionOwner(disp, sel->atom) != WinGetXwin(sel->win))
+ {
+   DialogOK(_("ERROR!"), _("Could not acquire selection: %s"), buf);
+   EDestroyWindow(sel->win);
+   Efree(sel);
+   return NULL;
+ }
+
+   if (sel->func)
+ {
+   ESelectInput(sel->win,
+SubstructureRedirectMask | SubstructureNotifyMask);
+   EventCallbackRegister(sel->win, 0, sel->func, sel->data);
+ }
+
+   ecore_x_client_message32_send(VRoot.xwin, E_XA_MANAGER,
+StructureNotifyMask, CurrentTime, sel->atom,
+WinGetXwin(sel->win), 0, 0);
+
+   if (EventDebug(EDBUG_TYPE_SELECTION))
+  Eprintf("Window %#lx is now %s owner, time=%lu\n",
+ WinGetXwin(sel->win), buf, sel->time);
+
+   return sel;
+}
+
+void
+SelectionRelease(ESelection * sel)
+{
+   if (!sel)
+  return;
+
+   if (EventDebug(EDBUG_TYPE_SELECTION))
+  Eprintf("Window %#lx is no longer %s owner\n",
+ WinGetXwin(sel->win), XGetAtomName(disp, sel->atom));
+
+   XSetSelectionOwner(disp, sel->at

E CVS: e kwo

[Enlightenment CVS]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
setup.c 


Log Message:
Remove duplicate header include.

===
RCS file: /cvs/e/e16/e/src/setup.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- setup.c 28 May 2006 11:51:42 -  1.177
+++ setup.c 11 Sep 2006 17:31:11 -  1.178
@@ -28,7 +28,6 @@
 #include "xwin.h"
 #include 
 #include 
-#include 
 
 void
 MapUnmap(int start)



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c 


Log Message:
More diligent about closing alsa mixer handles.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- alsa_mixer.c11 Sep 2006 16:09:01 -  1.9
+++ alsa_mixer.c11 Sep 2006 16:49:18 -  1.10
@@ -60,7 +60,7 @@

cards = evas_list_append(cards, card);
  }
-   
+   snd_mixer_close(handle);   
return cards;
 }
 
@@ -127,16 +127,19 @@
if ((err = snd_ctl_open(&control, buf, 0)) < 0) 
  {
 printf("Cannot control: %s: %s\n", buf, snd_strerror(err));
+snd_mixer_close(handle);
 continue;
  }
if ((err = snd_ctl_card_info(control, hw_info)) < 0) 
  {
 printf("Cannot get hardware info: %s: %s\n", buf, 
snd_strerror(err));
 snd_ctl_close(control);
+snd_mixer_close(handle);
 continue;
  }

snd_ctl_close(control);
+   snd_mixer_close(handle);
 
card = E_NEW(Mixer_Card, 1);
if (!card) continue;
@@ -145,10 +148,12 @@
card->id = _alsa_get_card_id(card->real);

if (!_alsa_get_card_id(card->real) == id) continue;
-   
-   card->channels = alsa_card_get_channels(card);  
+
+   card->channels = alsa_card_get_channels(card);
return card;
  }
+   snd_ctl_close(control);
+   snd_mixer_close(handle);
return NULL;
 }
 
@@ -238,6 +243,7 @@
   }
  }
  }
+   snd_mixer_close(handle);   
return channels;
 }
 



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
* Correctly feed mouse move and mouse wheel events


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.c11 Sep 2006 16:31:16 -  1.21
+++ e_mod_main.c11 Sep 2006 16:42:46 -  1.22
@@ -459,6 +459,7 @@
 ecore_x_window_geometry_get(root, &root_x, &root_y, &root_w, &root_h);
 win->input_window = ecore_x_window_input_new(root, root_x, root_y, 
root_w, root_h);
 ecore_x_window_show(win->input_window);
+/* TODO: Fixme... */
 //ecore_x_pointer_confine_grab(win->input_window);
 ecore_x_keyboard_grab(win->input_window);
 
@@ -540,6 +541,7 @@

if (win->input_window != 0)
  {
+/* TODO: Fixme... */
 //ecore_x_pointer_ungrab();
 ecore_x_keyboard_ungrab();
 ecore_x_window_del(win->input_window);
@@ -672,10 +674,7 @@
Mixer_Win_Simple *win;
Ecore_X_Event_Mouse_Move *xev = event;

-   if (!(win = data) || !E_INSIDE(xev->x, xev->y,
-  win->window->x, win->window->y,
-  win->window->w, win->window->h))
- return 1;
+   if (!(win = data)) return 1;

evas_event_feed_mouse_move(e_win_evas_get(win->window),
   xev->x - win->window->x, xev->y - win->window->y,
@@ -732,5 +731,17 @@
 static int
 _mixer_window_simple_mouse_wheel_cb(void *data, int type, void *event)
 {
+   Mixer_Win_Simple *win;
+   Ecore_X_Event_Mouse_Wheel *xev = event;
+   
+   if (!(win = data) || !E_INSIDE(xev->x, xev->y,
+  win->window->x, win->window->y,
+  win->window->w, win->window->h))
+ return 1;
+   
+   evas_event_feed_mouse_wheel(e_win_evas_get(win->window),
+  xev->direction, xev->z,
+  xev->time, NULL);
+   
return 1;
 }



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Added Files:
oss_mixer.h oss_mixer.c 


Log Message:
Start of some OSS code.




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c e_mod_types.h 


Log Message:
* Use an input window to grab the mouse click when the popup window is 
visible. So now we can click everywhere on the screen to pop down the 
popup window


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c11 Sep 2006 15:49:47 -  1.20
+++ e_mod_main.c11 Sep 2006 16:31:16 -  1.21
@@ -30,10 +30,14 @@
 static void _mixer_window_simple_pop_down (Instance *inst);
 static int  _mixer_window_simple_animator_up_cb   (void *data);
 static int  _mixer_window_simple_animator_down_cb (void *data);
-static void _mixer_window_simple_mouse_up_cb  (void *data, Evas *e, 
Evas_Object *obj, void *event_info);
 static void _mixer_window_simple_changed_cb   (void *data, Evas_Object 
*obj, void *event_info);
 static void _mixer_window_simple_resize_cb(E_Win *win);
 
+static int  _mixer_window_simple_mouse_move_cb(void *data, int type, void 
*event);
+static int  _mixer_window_simple_mouse_down_cb(void *data, int type, void 
*event);
+static int  _mixer_window_simple_mouse_up_cb  (void *data, int type, void 
*event);
+static int  _mixer_window_simple_mouse_wheel_cb   (void *data, int type, void 
*event);
+
 /* Private vars */
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_item_edd = NULL;
@@ -386,7 +390,7 @@
Mixer_Win_Simple *win;
Evas_Coord ox, oy, ow, oh;
Evas_Coord sw, sh;
-   int cx, cy, cw, ch, vol;
+   int cx, cy, cw, ch;

if (!inst || !inst->mixer) return;
if (!(con = e_container_current_get(e_manager_current_get( return;
@@ -411,8 +415,6 @@
 win->event_obj = 
evas_object_rectangle_add(e_win_evas_get(win->window));
 evas_object_color_set(win->event_obj, 255, 255, 255, 0);
 evas_object_show(win->event_obj);
-evas_object_event_callback_add(win->event_obj, EVAS_CALLBACK_MOUSE_UP,
-   _mixer_window_simple_mouse_up_cb, win);

 win->bg_obj = edje_object_add(e_win_evas_get(win->window));
 e_theme_edje_object_set(win->bg_obj, "base/theme/menus",
@@ -433,14 +435,6 @@
 evas_object_show(win->slider);
 evas_object_smart_callback_add(win->slider, "changed",
_mixer_window_simple_changed_cb, win);
-   if (inst->mixer->mix_sys->get_volume) 
- {
-double v;
-
-vol = inst->mixer->mix_sys->get_volume(ci->card_id, 
ci->channel_id);
-v = (1.0 - ((double)vol / 100));
-e_slider_value_set(win->slider, v);
- }

 e_slider_min_size_get(win->slider, &sw, &sh);
 if (sw < ow) sw = ow;
@@ -453,6 +447,48 @@
 evas_object_resize(win->bg_obj, win->w, win->h);
  }

+   if (win->input_window == 0)
+ {
+Ecore_X_Window root, parent;
+int root_x, root_y, root_w, root_h;
+
+root = win->window->evas_win;
+while ((parent = ecore_x_window_parent_get(root)) != 0)
+ root = parent;
+
+ecore_x_window_geometry_get(root, &root_x, &root_y, &root_w, &root_h);
+win->input_window = ecore_x_window_input_new(root, root_x, root_y, 
root_w, root_h);
+ecore_x_window_show(win->input_window);
+//ecore_x_pointer_confine_grab(win->input_window);
+ecore_x_keyboard_grab(win->input_window);
+
+win->mouse_move_handler = 
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE,
+
_mixer_window_simple_mouse_move_cb, win);
+win->mouse_down_handler = 
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN,
+
_mixer_window_simple_mouse_down_cb, win);
+win->mouse_up_handler = 
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP,
+
_mixer_window_simple_mouse_up_cb, win);
+win->mouse_wheel_handler = 
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL,
+
_mixer_window_simple_mouse_wheel_cb, win);
+
+win->first_mouse_up = 1;
+
+evas_event_feed_mouse_move(e_win_evas_get(win->window),
+   -10, -10, ecore_time_get(), NULL);
+evas_event_feed_mouse_in(e_win_evas_get(win->window),
+ ecore_time_get(), NULL);
+ }
+ 
+   if (inst->mixer->mix_sys->get_volume) 
+ {
+int vol;
+double v;
+
+vol = inst->mixer->mix_sys->get_volume(ci->card_id, ci->channel_id);
+v = (1.0 - ((double)vol / 100));
+   

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c 


Log Message:
Add missing variable decs.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- alsa_mixer.c11 Sep 2006 16:01:30 -  1.8
+++ alsa_mixer.c11 Sep 2006 16:09:01 -  1.9
@@ -427,7 +427,7 @@
snd_mixer_t  *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
-   int   id, mute = 0;
+   int   err, id, mute = 0;
const char   *name;

card = alsa_get_card(card_id);
@@ -487,7 +487,7 @@
snd_mixer_t  *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
-   int   id;
+   int   id, err;
const char   *name;

card = alsa_get_card(card_id);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.h 


Log Message:
Add missing get/set mute protos. Thanks Mo0m :)

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- alsa_mixer.h11 Sep 2006 14:44:42 -  1.6
+++ alsa_mixer.h11 Sep 2006 16:06:29 -  1.7
@@ -24,4 +24,7 @@
 int  alsa_get_volume(int card_id, int channel_id);
 int  alsa_set_volume(int card_id, int channel_id, double vol);
 
+int  alsa_get_mute(int card_id, int channel_id);
+int  alsa_set_mute(int card_id, int channel_id, int mute);
+
 #endif



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c 


Log Message:
Added alsa mixer mute get/set functions.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- alsa_mixer.c11 Sep 2006 15:49:47 -  1.7
+++ alsa_mixer.c11 Sep 2006 16:01:30 -  1.8
@@ -423,13 +423,121 @@
 int 
 alsa_get_mute(int card_id, int channel_id) 
 {
-   return 0;
+   Mixer_Card   *card;
+   snd_mixer_t  *handle;
+   snd_mixer_elem_t *elem;
+   snd_mixer_selem_id_t *sid;
+   int   id, mute = 0;
+   const char   *name;
+   
+   card = alsa_get_card(card_id);
+   if (!card) return 0;
+
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("Cannot open mixer: %s\n", snd_strerror(err));
+   return 0;
+ }
+
+   if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0) 
+ {
+   printf("\n\nCannot Attach Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) 
+ {
+   printf("\n\nCannot Register Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_load(handle)) < 0) 
+ {
+   printf("\n\nCannot Load Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   for (elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
+ {
+   snd_mixer_selem_id_alloca(&sid);
+   snd_mixer_selem_get_id(elem, sid);
+   if (!snd_mixer_selem_is_active(elem)) continue;
+
+   name = snd_mixer_selem_id_get_name(sid);
+   id = _alsa_get_mixer_id(name);
+   if (id == channel_id)
+ {
+if (snd_mixer_selem_has_playback_switch_joined(elem))
+  snd_mixer_selem_get_playback_switch(elem, 0, &mute);
+break;
+ }  
+ }
+   
+   snd_mixer_close(handle);
+   return mute;
 }
 
 int 
 alsa_set_mute(int card_id, int channel_id, int mute) 
 {
-   return 0;
+   Mixer_Card   *card;
+   snd_mixer_t  *handle;
+   snd_mixer_elem_t *elem;
+   snd_mixer_selem_id_t *sid;
+   int   id;
+   const char   *name;
+   
+   card = alsa_get_card(card_id);
+   if (!card) return 0;
+
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("Cannot open mixer: %s\n", snd_strerror(err));
+   return 0;
+ }
+
+   if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0) 
+ {
+   printf("\n\nCannot Attach Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) 
+ {
+   printf("\n\nCannot Register Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_load(handle)) < 0) 
+ {
+   printf("\n\nCannot Load Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   for (elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
+ {
+   snd_mixer_selem_id_alloca(&sid);
+   snd_mixer_selem_get_id(elem, sid);
+   if (!snd_mixer_selem_is_active(elem)) continue;
+
+   name = snd_mixer_selem_id_get_name(sid);
+   id = _alsa_get_mixer_id(name);
+   if (id == channel_id)
+ {
+if (snd_mixer_selem_has_playback_switch_joined(elem))
+  snd_mixer_selem_set_playback_switch_all(elem, mute);
+break;
+ }  
+ }
+   
+   snd_mixer_close(handle);
+   return 1;
 }
 
 /* Privates */



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c e_mod_main.c e_mod_types.h 


Log Message:
Beginnings of mute code for alsa.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- alsa_mixer.c11 Sep 2006 14:44:42 -  1.6
+++ alsa_mixer.c11 Sep 2006 15:49:47 -  1.7
@@ -420,6 +420,18 @@
return 1;
 }
 
+int 
+alsa_get_mute(int card_id, int channel_id) 
+{
+   return 0;
+}
+
+int 
+alsa_set_mute(int card_id, int channel_id, int mute) 
+{
+   return 0;
+}
+
 /* Privates */
 static int 
 _alsa_get_hash(const char *name) 
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.c11 Sep 2006 15:44:29 -  1.19
+++ e_mod_main.c11 Sep 2006 15:49:47 -  1.20
@@ -254,6 +254,9 @@

sys->get_volume = alsa_get_volume;
sys->set_volume = alsa_set_volume;
+   
+   sys->get_mute = alsa_get_mute;
+   sys->set_mute = alsa_set_mute;
#endif
 }
 
===
RCS file: /cvs/e/e_modules/mixer/e_mod_types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_types.h   11 Sep 2006 14:44:42 -  1.2
+++ e_mod_types.h   11 Sep 2006 15:49:47 -  1.3
@@ -50,7 +50,10 @@
 
int(*set_volume)   (int card_id, int channel_id, double vol);
int(*get_volume)   (int card_id, int channel_id);
-   
+
+   int(*get_mute) (int card_id, int channel_id);
+   int(*set_mute) (int card_id, int channel_id, int mute);
+
void   (*free_cards)   (void *data);

Evas_List *cards;



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
Fix icon state.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c11 Sep 2006 15:39:41 -  1.18
+++ e_mod_main.c11 Sep 2006 15:44:29 -  1.19
@@ -600,11 +600,11 @@
ret = mixer->mix_sys->set_volume(ci->card_id, ci->channel_id, val);
if (ret)
  {
-if ((val * 100) < 33)
+if (val < 33)
   edje_object_signal_emit(mixer->base, "low", "");
-else if (((val * 100) >= 34) && ((val * 100) < 66))
+else if ((val >= 34) && (val < 66))
   edje_object_signal_emit(mixer->base, "medium", "");
-else if ((val * 100) > 66)
+else if (val > 66)
   edje_object_signal_emit(mixer->base, "high", ""); 
  }




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
Fix slider value not setting correctly.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.c11 Sep 2006 15:24:11 -  1.17
+++ e_mod_main.c11 Sep 2006 15:39:41 -  1.18
@@ -435,7 +435,7 @@
 double v;
 
 vol = inst->mixer->mix_sys->get_volume(ci->card_id, 
ci->channel_id);
-v = ((double)vol) / 100;
+v = (1.0 - ((double)vol / 100));
 e_slider_value_set(win->slider, v);
  }




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas tilman

[Enlightenment CVS]

Enlightenment CVS committal

Author  : tilman
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
evas_engine_xrender.c 


Log Message:
missed another case of identiy-transform setting

===
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_engine_xrender.c   11 Sep 2006 15:19:02 -  1.15
+++ evas_engine_xrender.c   11 Sep 2006 15:24:54 -  1.16
@@ -492,18 +492,17 @@

if ((w <= 0) || (h <= 0) || (!srs) || (!drs)) return;
 
-   init_transform(&xf);
-
/* FIXME: why do we need to change the identity matrix ifthe src surface
 * is 1 bit deep?
 */
if (srs->depth == 1)
  {
+   init_transform(&xf);
xf.matrix[0][0] = xf.matrix[1][1] = xf.matrix[2][2] = 1;
+   XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf);
  }
 

-   XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf);
att.clip_mask = None;
XRenderChangePicture(srs->xinf->disp, srs->pic, CPClipMask, &att);
XRenderChangePicture(srs->xinf->disp, drs->pic, CPClipMask, &att);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
Disable the debug code for now.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c11 Sep 2006 15:22:46 -  1.16
+++ e_mod_main.c11 Sep 2006 15:24:11 -  1.17
@@ -7,7 +7,7 @@
 #endif
 
 /* Define to 1 for testing alsa code */
-#define DEBUG 1
+#define DEBUG 0
 #define SLIDE_LENGTH 0.5
 
 /* Gadcon Protos */



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_config.c e_mod_main.c 


Log Message:
Make channel config save properly.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_config.c  11 Sep 2006 14:44:42 -  1.8
+++ e_mod_config.c  11 Sep 2006 15:22:46 -  1.9
@@ -115,6 +115,7 @@
 if (card->channels) 
   {
  of = e_widget_framelist_add(evas, _("Available Mixers"), 0);
+ printf("\n\nChannel: %i\n\n", cfdata->channel_id);
  mg = e_widget_radio_group_new(&cfdata->channel_id);
  ob = e_widget_radio_add(evas, _("Unknown"), 0, mg);
  e_widget_framelist_object_append(of, ob);
@@ -143,6 +144,7 @@

ci->card_id = cfdata->card_id;
ci->channel_id = cfdata->channel_id;
+   printf("\n\nChannel: %i\n\n", cfdata->channel_id);

e_config_save_queue();
return 1;
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_mod_main.c11 Sep 2006 14:44:42 -  1.15
+++ e_mod_main.c11 Sep 2006 15:22:46 -  1.16
@@ -285,6 +285,7 @@
 #define D conf_item_edd
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL(D, T, card_id, INT);
+   E_CONFIG_VAL(D, T, channel_id, INT);
 
conf_edd = E_CONFIG_DD_NEW("Mixer_Config", Config);
 #undef T
@@ -297,13 +298,13 @@
if (!mixer_config) 
  {
Config_Item *ci;
-   
+
mixer_config = E_NEW(Config, 1);
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add("0");
ci->card_id = 0;
ci->channel_id = 0;
-   
+
mixer_config->items = evas_list_append(mixer_config->items, ci);
  }

@@ -569,8 +570,6 @@
Mixer_Win_Simple *win;

if (!(win = data)) return;
-   
-   printf("Mouse up\n");
_mixer_window_simple_pop_down(win->mixer->inst);
 }
 
@@ -599,17 +598,16 @@
int ret;

ret = mixer->mix_sys->set_volume(ci->card_id, ci->channel_id, val);
-   if (!ret) 
+   if (ret)
  {
-printf("\n\nVol Set Failed\n\n");
+if ((val * 100) < 33)
+  edje_object_signal_emit(mixer->base, "low", "");
+else if (((val * 100) >= 34) && ((val * 100) < 66))
+  edje_object_signal_emit(mixer->base, "medium", "");
+else if ((val * 100) > 66)
+  edje_object_signal_emit(mixer->base, "high", ""); 
  }

-   if ((val * 100) < 33)
- edje_object_signal_emit(mixer->base, "low", "");
-   else if (((val * 100) >= 34) && ((val * 100) < 66))
- edje_object_signal_emit(mixer->base, "medium", "");
-   else if ((val * 100) > 66)
- edje_object_signal_emit(mixer->base, "high", ""); 
  }
 }
 



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas tilman

[Enlightenment CVS]

Enlightenment CVS committal

Author  : tilman
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
evas_engine_xrender.c 


Log Message:
don't set the picture transform to the identity - that's a no-op

===
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_engine_xrender.c   11 Sep 2006 14:53:19 -  1.14
+++ evas_engine_xrender.c   11 Sep 2006 15:19:02 -  1.15
@@ -350,7 +350,7 @@
 _xr_render_surface_composite(Xrender_Surface *srs, Xrender_Surface *drs, 
RGBA_Draw_Context *dc, int sx, int sy, int sw, int sh, int x, int y, int w, int 
h, int smooth)
 {
Xrender_Surface *trs = NULL;
-   XTransform xf, id;
+   XTransform xf;
XRenderPictureAttributes att;
Picture mask;
int r, g, b, a, op;
@@ -366,8 +366,6 @@
XRenderChangePicture(srs->xinf->disp, srs->pic, CPClipMask, &att);
XRenderChangePicture(srs->xinf->disp, drs->pic, CPClipMask, &att);

-   init_transform(&id);
-
op = PictOpSrc;
if (srs->alpha) op = PictOpOver;
mask = None;
@@ -409,7 +407,6 @@
 
  att.component_alpha = 1;
  XRenderChangePicture(srs->xinf->disp, mask, CPComponentAlpha, 
&att);
- XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &id);
  XRenderComposite(srs->xinf->disp, PictOpSrc, srs->pic, mask,
   trs->pic, sx, sy, 0, 0, 0, 0, sw, sh);
  /* fill right and bottom pixel so interpolation works right */
@@ -427,7 +424,7 @@
  }
  }
 
-   xf = id;
+   init_transform(&xf);
xf.matrix[0][0] = XDoubleToFixed(sw) / w;
xf.matrix[1][1] = XDoubleToFixed(sh) / h;
 
@@ -452,7 +449,6 @@
 srs->fmt, srs->alpha);
if (!trs) return;
 
-   XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &id);
XRenderComposite(srs->xinf->disp, PictOpSrc, srs->pic, None,
 trs->pic, sx, sy, 0, 0, 0, 0, sw, sh);
XRenderComposite(srs->xinf->disp, PictOpSrc, srs->pic, None,



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e17
Module  : proto

Dir : e17/proto/etk/src/lib


Modified Files:
etk_combobox.c 


Log Message:
* [Combobox] Make etk_combobox_active_item_nth_get() a bit cleaner


===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- etk_combobox.c  11 Sep 2006 13:45:08 -  1.29
+++ etk_combobox.c  11 Sep 2006 15:17:58 -  1.30
@@ -324,24 +324,22 @@
 /**
  * @brief Gets the index of the current active item of the combobox
  * @param combobox a combobox
- * @return Returns the index of the current active item
+ * @return Returns the index of the current active item, or -1 on failure
  */
 int etk_combobox_active_item_nth_get(Etk_Combobox *combobox)
 {
-   Evas_List *list;
-   int i = 0;
+   Evas_List *l;
+   int i;
 
-   if (!combobox)
+   if (!combobox || !combobox->active_item)
   return -1;
 
-   list = evas_list_find_list(combobox->items, combobox->active_item);
-   while (list)
- {
-   list = evas_list_next(list);
-   i++;
- }
-
-   return evas_list_count(combobox->items) - i;
+   for (i = 0, l = combobox->items; l; i++, l = l->next)
+   {
+  if (l->data == combobox->active_item)
+ return i;
+   }
+   return -1;
 }
 
 /**



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto lok

[Enlightenment CVS]

Enlightenment CVS committal

Author  : lok
Project : e17
Module  : proto

Dir : e17/proto/enhance/src/lib


Modified Files:
enhance.c 


Log Message:
Little leak fixed.

===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- enhance.c   8 Sep 2006 23:06:35 -   1.30
+++ enhance.c   11 Sep 2006 15:06:10 -  1.31
@@ -561,6 +561,7 @@
  etk_combobox_item_append(ETK_COMBOBOX(wid->wid), tok);
   }
 while ((tok = strtok(NULL, "\n")) != NULL); 
+ free(value);
  }
  }   




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas tilman

[Enlightenment CVS]

Enlightenment CVS committal

Author  : tilman
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
evas_engine_xrender.c 


Log Message:
um, raster, you cannot chain == like that. gcc even told you ;)

===
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_engine_xrender.c   11 Sep 2006 14:42:39 -  1.13
+++ evas_engine_xrender.c   11 Sep 2006 14:53:19 -  1.14
@@ -377,7 +377,7 @@
g = (int)(G_VAL(&dc->mul.col));
b = (int)(B_VAL(&dc->mul.col));
a = (int)(A_VAL(&dc->mul.col));
-   if (!(r == g == b == a == 0xff))
+   if ((r != 0xff) || (g != 0xff) || (b != 0xff) || (a != 0xff))
  {
 if ((srs->xinf->mul_r != r) || (srs->xinf->mul_g != g) ||
 (srs->xinf->mul_b != b) || (srs->xinf->mul_a != a))
@@ -392,7 +392,7 @@
   }
 op = PictOpOver;
 mask = srs->xinf->mul->pic;
-if ((r == g == b == 0xff) && (a != 0xff))
+if ((r == 0xff) && (g == 0xff) && (b == 0xff) && (a != 0xff))
   {
 att.component_alpha = 0;
 XRenderChangePicture(srs->xinf->disp, mask, CPComponentAlpha, 
&att);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c alsa_mixer.h e_mod_config.c e_mod_main.c 
e_mod_types.h 


Log Message:
Can now set/get volume for alsa drivers.
Still a problem in config dialog, and with the e_slider tho.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- alsa_mixer.c11 Sep 2006 12:00:11 -  1.5
+++ alsa_mixer.c11 Sep 2006 14:44:42 -  1.6
@@ -260,59 +260,164 @@
 alsa_get_volume(int card_id, int channel_id) 
 {
Mixer_Card   *card;
-   Mixer_Channel*chan;
-   snd_mixer_elem_t *elem;
snd_mixer_t  *handle;
+   snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *sid;
-   int   err, i;
-   long  vol = 0;
+   int   err, range, ret = 0;
+   long  min, max, vol;

card = alsa_get_card(card_id);
if (!card) return 0;
 
-   chan = _alsa_card_get_channel(card, channel_id);
-   if (!chan) return 0;
-
-   printf("\n\nGet Volume\n");
if ((err = snd_mixer_open(&handle, 0)) < 0) 
  {
printf("Cannot open mixer: %s\n", snd_strerror(err));
return 0;
  }
 
-   for (i = 0, elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
+   if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0) 
+ {
+   printf("\n\nCannot Attach Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) 
+ {
+   printf("\n\nCannot Register Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_load(handle)) < 0) 
+ {
+   printf("\n\nCannot Load Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   for (elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
  {
+   snd_mixer_selem_id_alloca(&sid);
snd_mixer_selem_get_id(elem, sid);
if (!snd_mixer_selem_is_active(elem)) continue;
-   
+
if (snd_mixer_selem_has_playback_volume(elem)) 
  {
 const char *name;
+int id;
 
 name = snd_mixer_selem_id_get_name(sid);
-if (!strcmp(name, chan->name)) 
+id = _alsa_get_mixer_id(name);
+if (id == channel_id)
   {
  snd_mixer_selem_get_playback_volume(elem, 0, &vol);
+ snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+ range = max - min;
+ if (range == 0) 
+   vol = 0;
+ else
+   vol -= min;
+ ret = rint(((double)vol / ((double)range) * 100));
  break;
   } 
  }
  }
-   return (int)vol;
+   
+   snd_mixer_close(handle);
+   return ret;
 }
 
 int 
-alsa_set_volume(int card_id, int channel_id, int vol) 
+alsa_set_volume(int card_id, int channel_id, double vol) 
 {
-   Mixer_Card*card;
-   Mixer_Channel *chan;
+   Mixer_Card   *card;
+   snd_mixer_t  *handle;
+   snd_mixer_elem_t *elem;
+   snd_mixer_selem_id_t *sid;
+   int   err, range, v;
+   long  min, max;

card = alsa_get_card(card_id);
if (!card) return 0;
 
-   chan = _alsa_card_get_channel(card, channel_id);
-   if (!chan) return 0;
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("Cannot open mixer: %s\n", snd_strerror(err));
+   return 0;
+ }
+
+   if ((err = snd_mixer_attach(handle, (char *)card->name)) < 0) 
+ {
+   printf("\n\nCannot Attach Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) 
+ {
+   printf("\n\nCannot Register Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   if ((err = snd_mixer_load(handle)) < 0) 
+ {
+   printf("\n\nCannot Load Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return 0;
+ }
+
+   for (elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
+ {
+   snd_mixer_selem_id_alloca(&sid);
+   snd_mixer_selem_get_id(elem, sid);
+   if (!snd_mixer_selem_is_active(elem)) continue;
+
+   if (snd_mixer_selem_has_playback_volume(elem)) 
+ {
+const char *name;
+int id;
+
+name = snd_mixer_selem_id_get_name(sid);
+id = _alsa_get_mixer_id(name);
+if (id == channel_id)
+  {
+ snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+  

E CVS: libs/evas tilman

[Enlightenment CVS]

Enlightenment CVS committal

Author  : tilman
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/xrender_x11


Modified Files:
evas_engine_xrender.c 


Log Message:
cleaned up the transformation matrix code. use the proper x macro to convert a 
double into a matrix component instead of hardcoding the bitshift. added 
init_transform() which will initialize a matrix to the identity transform.

===
RCS file: 
/cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_engine_xrender.c   7 Jun 2006 23:30:15 -   1.12
+++ evas_engine_xrender.c   11 Sep 2006 14:42:39 -  1.13
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
 #include "evas_common.h"
 #include "evas_macros.h"
 #include "evas_private.h"
@@ -330,6 +333,17 @@
free(rect);
 }
 
+/* initialized the transform to the identity */
+static void init_transform (XTransform *t)
+{
+   int i, j;
+
+   for (i = 0; i < 3; i++)
+ for (j = 0; j < 3; j++)
+   t->matrix[i][j] = XDoubleToFixed((i == j) ? 1 : 0);
+}
+
+
 // when color multiplier is used want: instead
 // CA src IN mask SRC temp; non-CA temp OVER dst. - i think. need to check.
 void
@@ -352,17 +366,7 @@
XRenderChangePicture(srs->xinf->disp, srs->pic, CPClipMask, &att);
XRenderChangePicture(srs->xinf->disp, drs->pic, CPClipMask, &att);

-   id.matrix[0][0] = 1 << 16;
-   id.matrix[0][1] = 0;
-   id.matrix[0][2] = 0;
- 
-   id.matrix[1][0] = 0;
-   id.matrix[1][1] = 1 << 16;
-   id.matrix[1][2] = 0;
- 
-   id.matrix[2][0] = 0;
-   id.matrix[2][1] = 0;
-   id.matrix[2][2] = 1 << 16;
+   init_transform(&id);
 
op = PictOpSrc;
if (srs->alpha) op = PictOpOver;
@@ -423,17 +427,9 @@
  }
  }
 
-   xf.matrix[0][0] = (sw << 16) / w;
-   xf.matrix[0][1] = 0;
-   xf.matrix[0][2] = 0;
-
-   xf.matrix[1][0] = 0;
-   xf.matrix[1][1] = (sh << 16) / h;
-   xf.matrix[1][2] = 0;
-
-   xf.matrix[2][0] = 0;
-   xf.matrix[2][1] = 0;
-   xf.matrix[2][2] = 1 << 16;
+   xf = id;
+   xf.matrix[0][0] = XDoubleToFixed(sw) / w;
+   xf.matrix[1][1] = XDoubleToFixed(sh) / h;
 
_xr_render_surface_clips_set(drs, dc, x, y, w, h);
if (trs)
@@ -497,25 +493,19 @@
 {
XTransform xf;
XRenderPictureAttributes att;
-   int ident;

if ((w <= 0) || (h <= 0) || (!srs) || (!drs)) return;
-   ident = 1 << 16;
+
+   init_transform(&xf);
+
/* FIXME: why do we need to change the identity matrix ifthe src surface
 * is 1 bit deep?
 */
-   if (srs->depth == 1) ident = 1;
-   xf.matrix[0][0] = ident;
-   xf.matrix[0][1] = 0;
-   xf.matrix[0][2] = 0;
-   
-   xf.matrix[1][0] = 0;
-   xf.matrix[1][1] = ident;
-   xf.matrix[1][2] = 0;
-   
-   xf.matrix[2][0] = 0;
-   xf.matrix[2][1] = 0;
-   xf.matrix[2][2] = ident;
+   if (srs->depth == 1)
+ {
+   xf.matrix[0][0] = xf.matrix[1][1] = xf.matrix[2][2] = 1;
+ }
+

XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf);
att.clip_mask = None;



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: e kwo

[Enlightenment CVS]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/po


Modified Files:
ja.po 


Log Message:
Japanese translation update (Yasufumi Haga).

===
RCS file: /cvs/e/e16/e/po/ja.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ja.po   9 Sep 2006 09:05:28 -   1.71
+++ ja.po   11 Sep 2006 14:19:37 -  1.72
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: enlightenment 0.16.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-09 10:59+0200\n"
-"PO-Revision-Date: 2006-07-18 10:26+0900\n"
+"POT-Creation-Date: 2006-09-11 15:06+0900\n"
+"PO-Revision-Date: 2006-09-11 15:17+0900\n"
 "Last-Translator: Yasufumi Haga <[EMAIL PROTECTED]>\n"
 "Language-Team: Japanese <[EMAIL PROTECTED]>\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@
 "%s\n"
 "̵»ë¤·¤Æ½èÍý¤ò·Ñ³¤·¤Þ¤¹...\n"
 
-#: src/actions.c:70
+#: src/actions.c:85
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -75,7 +75,7 @@
 "¤³¤Î¥×¥í¥°¥é¥à¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤³¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤»¤ó¡£\n"
 
-#: src/actions.c:78
+#: src/actions.c:93
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -93,7 +93,7 @@
 "¥·¥§¥ë¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤òÆɤó¤Ç¡¢¥·¥§¥ë¤Î¼Â¹Ô¥Ñ¥¹¤ÎÊѹ¹ÊýË¡\n"
 "¤äÄɲÃÊýË¡¤òÍý²ò¤·¤¿Êý¤¬¤È»×¤¤¤Þ¤¹¡£\n"
 
-#: src/actions.c:98
+#: src/actions.c:113
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -110,7 +110,7 @@
 "¤½¤ì¤Ë¤³¤Î¥Õ¥¡¥¤¥ë¤ò¼Â¹Ô¤¹¤ë¸¢¸Â¤â¤¢¤ê¤Þ¤¹¡£¤³¤Î·ï¤ÏÄ´¤Ù¤¿Êý¤¬¤È\n"
 "»×¤¤¤Þ¤¹¡£\n"
 
-#: src/actions.c:109
+#: src/actions.c:124
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -126,7 +126,7 @@
 "¤ë\n"
 "¼Â¹Ô¸¢¸Â¤¬¤Ê¤¤¤Î¤Ç¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: src/actions.c:124
+#: src/actions.c:139
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -139,7 +139,7 @@
 "¤³¤Î¥×¥í¥°¥é¥à¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯¥Ç¥£¥ì¥¯¥È¥ê¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: src/actions.c:132
+#: src/actions.c:147
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -152,7 +152,7 @@
 "¤³¤Î¥×¥í¥°¥é¥à¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤³¤Î¥Õ¥¡¥¤¥ë¤ÏÄ̾ï¤Î¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: src/actions.c:186
+#: src/actions.c:179
 #, c-format
 msgid ""
 "There was an error running the program:\n"
@@ -161,12 +161,12 @@
 "°Ê²¼¤Î¥×¥í¥°¥é¥à¤Î¼Â¹ÔÃæ¤Ë¥¨¥é¡¼¤¬À¸¤¸¤Þ¤·¤¿¡£\n"
 "%s\n"
 
-#: src/actions.c:289
+#: src/actions.c:282
 #, c-format
 msgid "About Enlightenment %s"
 msgstr "Enlightenment %s ¤Ë¤Ä¤¤¤Æ"
 
-#: src/actions.c:299
+#: src/actions.c:292
 #, c-format
 msgid ""
 "Welcome to the %s version\n"
@@ -1358,7 +1358,7 @@
 msgid "  : \n"
 msgstr "<¥³¥Þ¥ó¥É> : <ÀâÌÀ>\n"
 
-#: src/main.c:582
+#: src/main.c:569
 #, c-format
 msgid ""
 "The directory %s is apparently not a directory\n"
@@ -1369,7 +1369,7 @@
 "Ã×̿Ū¤Ê¾õ¶·¤Ç¤¹¡£\n"
 "¤³¤Î¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/main.c:589
+#: src/main.c:576
 #, c-format
 msgid ""
 "Do not have execute access to %s\n"
@@ -1382,7 +1382,7 @@
 "¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î½êÍ­¼Ô¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò³Îǧ¤·¡¢\n"
 "½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/main.c:597
+#: src/main.c:584
 #, c-format
 msgid ""
 "Do not have read access to %s\n"
@@ -1395,7 +1395,7 @@
 "¥Ç¥£¥ì¥¯¥È¥ê¤Î½êÍ­¼Ô¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò³Îǧ¤·¡¢\n"
 "½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/main.c:604
+#: src/main.c:591
 #, c-format
 msgid ""
 "Do not have write access to %s\n"
@@ -1408,7 +1408,7 @@
 "¥Ç¥£¥ì¥¯¥È¥ê¤Î½êÍ­¼Ô¤È¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó¤ò³Îǧ¤·¡¢\n"
 "½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/main.c:717
+#: src/main.c:704
 #, c-format
 msgid ""
 " ERROR ERROR ERROR ERROR \n"
@@ -1437,7 +1437,7 @@
 "ºï½ü¤·¤¿¤«¡¢¤¢¤ë¤¤¤Ï Enlightenment ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ë¸í¤ê¤¬¤¢¤Ã¤¿¤³¤È¤¬\n"
 "¹Í¤¨¤é¤ì¤Þ¤¹¡£\n"
 
-#: src/main.c:731
+#: src/main.c:718
 #, c-format
 msgid ""
 " ERROR ERROR ERROR ERROR \n"
@@ -1649,12 +1649,11 @@
 
 #: src/pager.c:1815
 msgid "Pager Mode:"
-msgstr ""
+msgstr "¥Ú¡¼¥¸¥ã¡¼¥â¡¼¥É"
 
 #: src/pager.c:1819
-#, fuzzy
 msgid "Simple"
-msgstr "¤µ¤¶¤Ê¤ß"
+msgstr "¥·¥ó¥×¥ë"
 
 #: src/pager.c:1825
 msgid "Make miniature snapshots of the screen"



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto lok

[Enlightenment CVS]

Enlightenment CVS committal

Author  : lok
Project : e17
Module  : proto

Dir : e17/proto/etk/src/lib


Modified Files:
etk_combobox.c etk_combobox.h 


Log Message:
[Etk_Combobox] etk_combobox_active_item_nth_get added.

===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- etk_combobox.c  4 Sep 2006 12:51:42 -   1.28
+++ etk_combobox.c  11 Sep 2006 13:45:08 -  1.29
@@ -322,6 +322,29 @@
 }
 
 /**
+ * @brief Gets the index of the current active item of the combobox
+ * @param combobox a combobox
+ * @return Returns the index of the current active item
+ */
+int etk_combobox_active_item_nth_get(Etk_Combobox *combobox)
+{
+   Evas_List *list;
+   int i = 0;
+
+   if (!combobox)
+  return -1;
+
+   list = evas_list_find_list(combobox->items, combobox->active_item);
+   while (list)
+ {
+   list = evas_list_next(list);
+   i++;
+ }
+
+   return evas_list_count(combobox->items) - i;
+}
+
+/**
  * @brief Gets the nth item of the combobox
  * @param combobox a combobox
  * @param index the index of the item to get
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_combobox.h  24 Aug 2006 18:09:16 -  1.11
+++ etk_combobox.h  11 Sep 2006 13:45:08 -  1.12
@@ -117,6 +117,7 @@
 
 void etk_combobox_active_item_set(Etk_Combobox *combobox, Etk_Combobox_Item 
*item);
 Etk_Combobox_Item *etk_combobox_active_item_get(Etk_Combobox *combobox);
+int etk_combobox_active_item_nth_get(Etk_Combobox *combobox);
 Etk_Combobox_Item *etk_combobox_nth_item_get(Etk_Combobox *combobox, int 
index);
 
 Etk_Combobox_Item *etk_combobox_item_prepend(Etk_Combobox *combobox, ...);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer moom

[Enlightenment CVS]

Enlightenment CVS committal

Author  : moom
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c 


Log Message:
* Destroy the popup window instead of hiding it


===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.c11 Sep 2006 12:00:11 -  1.13
+++ e_mod_main.c11 Sep 2006 12:25:06 -  1.14
@@ -413,7 +413,7 @@
 win->bg_obj = edje_object_add(e_win_evas_get(win->window));
 e_theme_edje_object_set(win->bg_obj, "base/theme/menus",
"e/widgets/menu/default/background");
-   edje_object_part_text_set(win->bg_obj, "e.text.title", "Volume");
+   edje_object_part_text_set(win->bg_obj, "e.text.title", _("Volume"));
edje_object_signal_emit(win->bg_obj, "e,action,show,title", "e");
 edje_object_message_signal_process(win->bg_obj);
 evas_object_repeat_events_set(win->bg_obj, 1);
@@ -551,8 +551,10 @@

if (h <= 0)
  {
-e_win_hide(win->window);
-win->slide_animator = NULL;
+e_object_del(E_OBJECT(win->window));
+win->mixer->simple_win = NULL;
+E_FREE(win);
+
 return 0;
  }
else



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_config.c 


Log Message:
Traps for card/channels being NULL.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_config.c  11 Sep 2006 11:23:01 -  1.6
+++ e_mod_config.c  11 Sep 2006 12:07:34 -  1.7
@@ -109,23 +109,27 @@
if (mixer->mix_sys->get_card) 
  {
card = mixer->mix_sys->get_card(ci->card_id);
-   if (mixer->mix_sys->get_channels)
- card->channels = mixer->mix_sys->get_channels(card);
-   
-   of = e_widget_framelist_add(evas, _("Available Mixers"), 0);
-   mg = e_widget_radio_group_new(&cfdata->channel_id);
-   ob = e_widget_radio_add(evas, _("Unknown"), 0, mg);
-   e_widget_framelist_object_append(of, ob);
-   for (chans = card->channels; chans; chans = chans->next) 
+   if ((mixer->mix_sys->get_channels) && (card)) 
  {
-Mixer_Channel *chan;
-
-chan = chans->data;
-if (!chan) continue;
-ob = e_widget_radio_add(evas, (char *)chan->name, chan->id, mg);
-e_widget_framelist_object_append(of, ob);
- }
-   e_widget_list_object_append(o, of, 1, 1, 0.5);  
+card->channels = mixer->mix_sys->get_channels(card);
+if (card->channels) 
+  {
+ of = e_widget_framelist_add(evas, _("Available Mixers"), 0);
+ mg = e_widget_radio_group_new(&cfdata->channel_id);
+ ob = e_widget_radio_add(evas, _("Unknown"), 0, mg);
+ e_widget_framelist_object_append(of, ob);
+ for (chans = card->channels; chans; chans = chans->next) 
+   {
+  Mixer_Channel *chan;
+ 
+  chan = chans->data;
+  if (!chan) continue;
+  ob = e_widget_radio_add(evas, (char *)chan->name, 
chan->id, mg);
+  e_widget_framelist_object_append(of, ob);
+   }
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+  }
+ } 
  }
return o;
 }



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c alsa_mixer.h e_mod_main.c 


Log Message:
Make sure we setup a default config if there is none.
Some work on get/set volume for alsa (not done yet).

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- alsa_mixer.c11 Sep 2006 11:21:43 -  1.4
+++ alsa_mixer.c11 Sep 2006 12:00:11 -  1.5
@@ -259,8 +259,13 @@
 int 
 alsa_get_volume(int card_id, int channel_id) 
 {
-   Mixer_Card*card;
-   Mixer_Channel *chan;
+   Mixer_Card   *card;
+   Mixer_Channel*chan;
+   snd_mixer_elem_t *elem;
+   snd_mixer_t  *handle;
+   snd_mixer_selem_id_t *sid;
+   int   err, i;
+   long  vol = 0;

card = alsa_get_card(card_id);
if (!card) return 0;
@@ -268,7 +273,31 @@
chan = _alsa_card_get_channel(card, channel_id);
if (!chan) return 0;
 
-   printf("Get Volume\n");
+   printf("\n\nGet Volume\n");
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("Cannot open mixer: %s\n", snd_strerror(err));
+   return 0;
+ }
+
+   for (i = 0, elem = snd_mixer_first_elem(handle); elem; elem = 
snd_mixer_elem_next(elem)) 
+ {
+   snd_mixer_selem_get_id(elem, sid);
+   if (!snd_mixer_selem_is_active(elem)) continue;
+   
+   if (snd_mixer_selem_has_playback_volume(elem)) 
+ {
+const char *name;
+
+name = snd_mixer_selem_id_get_name(sid);
+if (!strcmp(name, chan->name)) 
+  {
+ snd_mixer_selem_get_playback_volume(elem, 0, &vol);
+ break;
+  } 
+ }
+ }
+   return (int)vol;
 }
 
 int 
===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- alsa_mixer.h11 Sep 2006 11:21:43 -  1.4
+++ alsa_mixer.h11 Sep 2006 12:00:11 -  1.5
@@ -21,7 +21,7 @@
 void*alsa_card_get_channel  (void *data, int channel_id);
 void alsa_free_cards(void *data);
 
-int alsa_get_volume(int card_id, int channel_id);
-int alsa_set_volume(int card_id, int channel_id, int vol);
+int  alsa_get_volume(int card_id, int channel_id);
+int  alsa_set_volume(int card_id, int channel_id, int vol);
 
 #endif
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c11 Sep 2006 11:21:43 -  1.12
+++ e_mod_main.c11 Sep 2006 12:00:11 -  1.13
@@ -225,7 +225,9 @@
 
ci = E_NEW(Config_Item, 1);
ci->id = evas_stringshare_add(id);
-
+   ci->card_id = 0;
+   ci->channel_id = 0;
+   
mixer_config->items = evas_list_append(mixer_config->items, ci);
return ci;
 }
@@ -292,9 +294,19 @@
E_CONFIG_LIST(D, T, items, conf_item_edd);
 
mixer_config = e_config_domain_load("module.mixer", conf_edd);
-   if (!mixer_config)
- mixer_config = E_NEW(Config, 1);
-
+   if (!mixer_config) 
+ {
+   Config_Item *ci;
+   
+   mixer_config = E_NEW(Config, 1);
+   ci = E_NEW(Config_Item, 1);
+   ci->id = evas_stringshare_add("0");
+   ci->card_id = 0;
+   ci->channel_id = 0;
+   
+   mixer_config->items = evas_list_append(mixer_config->items, ci);
+ }
+   
mixer_config->module = m;
 
e_gadcon_provider_register(&_gc_class);
@@ -366,14 +378,18 @@
 _mixer_window_simple_pop_up(Instance *inst)
 {
E_Container *con;
+   Config_Item *ci;
Mixer_Win_Simple *win;
Evas_Coord ox, oy, ow, oh;
Evas_Coord sw, sh;
-   int cx, cy, cw, ch;
+   int cx, cy, cw, ch, vol;

if (!inst || !inst->mixer) return;
if (!(con = e_container_current_get(e_manager_current_get( return;

+   ci = _mixer_config_item_get(inst->gcc->id);
+   if (!ci) return;
+   
evas_object_geometry_get(inst->mixer->base, &ox, &oy, &ow, &oh); 

if (!(win = inst->mixer->simple_win))
@@ -413,7 +429,14 @@
 evas_object_show(win->slider);
 evas_object_smart_callback_add(win->slider, "changed",
_mixer_window_simple_changed_cb, win);
-
+   if (inst->mixer->mix_sys->get_volume) 
+ {
+//  vol = inst->mixer->mix_sys->get_volume(ci->card_id, 
ci->channel_id);
+//  vol = vol * 100;
+//  printf("\n\nVolume: %i\n\n", vol);
+//  e_slider_value_set(win->slider, (double)vol);
+ }
+   
 e_slider_min_size_get(win->slider, &sw, &sh);
 if (sw < ow) sw = ow;
 

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_config.c 


Log Message:
Forget todo basic apply in config dialog :)

===
RCS file: /cvs/e/e_modules/mixer/e_mod_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.c  11 Sep 2006 11:21:43 -  1.5
+++ e_mod_config.c  11 Sep 2006 11:23:01 -  1.6
@@ -133,5 +133,11 @@
 static int
 _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
+   Config_Item *ci;
+   
+   ci = cfd->data;
+   ci->card_id = cfdata->card_id;
+   ci->channel_id = cfdata->channel_id;
+   e_config_save_queue();
return 1;
 }



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
Makefile.am alsa_mixer.c alsa_mixer.h e_mod_config.c 
e_mod_main.c e_mod_main.h 
Added Files:
e_mod_types.h 


Log Message:
More virtualize work on alsa.
Config dialog should be working now.

===
RCS file: /cvs/e/e_modules/mixer/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 7 Sep 2006 16:03:29 -   1.4
+++ Makefile.am 11 Sep 2006 11:21:43 -  1.5
@@ -27,6 +27,7 @@
 pkg_LTLIBRARIES= module.la
 module_la_SOURCES  = e_mod_main.c \
   e_mod_main.h \
+  e_mod_types.h \
   alsa_mixer.h \
   alsa_mixer.c \
   e_mod_config.c
===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- alsa_mixer.c11 Sep 2006 09:54:10 -  1.3
+++ alsa_mixer.c11 Sep 2006 11:21:43 -  1.4
@@ -1,4 +1,5 @@
 #include 
+#include "e_mod_types.h"
 #include "alsa_mixer.h"
 
 static int   _alsa_get_hash (const char *name);
@@ -27,7 +28,7 @@

for (i = 0; i < 32; i++) 
  {
-   Alsa_Card *card;
+   Mixer_Card *card;

snprintf(buf, sizeof(buf), "hw:%d", i);
if ((err = snd_mixer_attach(handle, buf)) < 0) break;
@@ -51,7 +52,7 @@

snd_ctl_close(control);

-   card = E_NEW(Alsa_Card, 1);
+   card = E_NEW(Mixer_Card, 1);
if (!card) continue;
card->name = evas_stringshare_add(buf);
card->real = evas_stringshare_add(snd_ctl_card_info_get_name(hw_info));
@@ -73,7 +74,7 @@

while (cards) 
  {
-   Alsa_Card *card;
+   Mixer_Card *card;

card = cards->data;
if (!card) continue;
@@ -81,7 +82,7 @@
if (card->real) evas_stringshare_del(card->real);
while (card->channels) 
  {
-Alsa_Channel *chan;
+Mixer_Channel *chan;
 
 chan = card->channels->data;
 if (!chan) continue;
@@ -114,7 +115,7 @@
 
for (i = 0; i < 32; i++) 
  {
-   Alsa_Card *card;
+   Mixer_Card *card;

snprintf(buf, sizeof(buf), "hw:%d", i);
if ((err = snd_mixer_attach(handle, buf)) < 0) break;
@@ -137,13 +138,15 @@

snd_ctl_close(control);
 
-   card = E_NEW(Alsa_Card, 1);
+   card = E_NEW(Mixer_Card, 1);
if (!card) continue;
card->name = evas_stringshare_add(buf);
card->real = evas_stringshare_add(snd_ctl_card_info_get_name(hw_info));
card->id = _alsa_get_card_id(card->real);

if (!_alsa_get_card_id(card->real) == id) continue;
+   
+   card->channels = alsa_card_get_channels(card);  
return card;
  }
return NULL;
@@ -152,7 +155,7 @@
 Evas_List *
 alsa_card_get_channels(void *data) 
 {
-   Alsa_Card*card;
+   Mixer_Card   *card;
Evas_List*channels;
  
snd_mixer_t  *handle;
@@ -164,7 +167,7 @@
 
card = data;   
if (!card) return NULL;
-
+   
channels = NULL;

snd_mixer_selem_id_alloca(&sid);
@@ -219,13 +222,13 @@

if (snd_mixer_selem_has_playback_volume(elem)) 
  {
-Alsa_Channel *ac;
+Mixer_Channel *ac;
 const char *name;
 
 name = snd_mixer_selem_id_get_name(sid);
 if ((!strcmp(name, "Master")) || (!strcmp(name, "PCM"))) 
   {
- ac = E_NEW(Alsa_Channel, 1);
+ ac = E_NEW(Mixer_Channel, 1);
  if (!ac) continue;
 
  ac->name = evas_stringshare_add(name);
@@ -241,8 +244,8 @@
 void *
 alsa_card_get_channel(void *data, int channel_id) 
 {
-   Alsa_Card*card;
-   Alsa_Channel *chan;
+   Mixer_Card*card;
+   Mixer_Channel *chan;

card = data;
if (!card) return NULL;
@@ -256,8 +259,8 @@
 int 
 alsa_get_volume(int card_id, int channel_id) 
 {
-   Alsa_Card*card;
-   Alsa_Channel *chan;
+   Mixer_Card*card;
+   Mixer_Channel *chan;

card = alsa_get_card(card_id);
if (!card) return 0;
@@ -271,8 +274,8 @@
 int 
 alsa_set_volume(int card_id, int channel_id, int vol) 
 {
-   Alsa_Card*card;
-   Alsa_Channel *chan;
+   Mixer_Card*card;
+   Mixer_Channel *chan;

card = alsa_get_card(card_id);
if (!card) return 0;
@@ -321,7 +324,7 @@
 static void *
 _alsa_card_get_channel(void *data, int channel_id) 
 {
-   Alsa_Card*card;
+   Mixer_Card*card;
Evas_List*c;

card = data;
@@ -334,7 +337,7 @@

for (c = card->channels; c; c = c->next) 
  {
-   Alsa_Chan

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
e_mod_main.c mixer.edc 


Log Message:
Icon changes now when slider value changes to reflect current volume.

===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c11 Sep 2006 09:54:10 -  1.10
+++ e_mod_main.c11 Sep 2006 10:03:21 -  1.11
@@ -127,6 +127,7 @@
mixer->base = edje_object_add(gc->evas);
edje_object_file_set(mixer->base, buf, "e/modules/mixer/main");
evas_object_show(mixer->base);
+   edje_object_signal_emit(mixer->base, "low", "");
 
_mixer_system_init(mixer);

@@ -633,6 +634,13 @@
val = e_slider_value_get(obj);
printf("Slider value: %f\n", val);
mixer->mix_sys->set_volume(ci->card_id, ci->channel_id, (int)(val * 100));
+
+   if ((val * 100) < 33)
+ edje_object_signal_emit(mixer->base, "low", "");
+   else if (((val * 100) >= 34) && ((val * 100) < 66))
+ edje_object_signal_emit(mixer->base, "medium", "");
+   else if ((val * 100) > 66)
+ edje_object_signal_emit(mixer->base, "high", "");
 }
 
 /* Called when the simple window is resized */
===
RCS file: /cvs/e/e_modules/mixer/mixer.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mixer.edc   11 Sep 2006 09:06:50 -  1.3
+++ mixer.edc   11 Sep 2006 10:03:21 -  1.4
@@ -66,6 +66,37 @@
 }
}
   } /* end icon part */
- } /* end parts */ 
+ } /* end parts */
+   programs 
+ {
+program 
+  {
+ name: "go_low";
+ signal: "low";
+ action: STATE_SET "low" 0.0;
+ target: "icon";
+  }
+program 
+  {
+ name: "go_medium";
+ signal: "medium";
+ action: STATE_SET "medium" 0.0;
+ target: "icon";
+  }
+program 
+  {
+ name: "go_high";
+ signal: "high";
+ action: STATE_SET "default" 0.0;
+ target: "icon";
+  }
+program 
+  {
+ name: "go_mute";
+ signal: "muted";
+ action: STATE_SET "mute" 0.0;
+ target: "icon";
+  }
+ } /* end programs */  
  } /* end group */
 } /* end collections */



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c alsa_mixer.h e_mod_main.c 


Log Message:
More virtualizing.
Added get/set volume function protos for alsa.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- alsa_mixer.c11 Sep 2006 09:06:50 -  1.2
+++ alsa_mixer.c11 Sep 2006 09:54:10 -  1.3
@@ -1,10 +1,11 @@
 #include 
 #include "alsa_mixer.h"
 
-static int _alsa_get_hash  (const char *name);
-static int _alsa_get_system_id (const char *name);
-static int _alsa_get_card_id   (const char *name);
-static int _alsa_get_mixer_id  (const char *name); 
+static int   _alsa_get_hash (const char *name);
+static int   _alsa_get_system_id(const char *name);
+static int   _alsa_get_card_id  (const char *name);
+static int   _alsa_get_mixer_id (const char *name); 
+static void *_alsa_card_get_channel (void *data, int channel_id);
 
 Evas_List *
 alsa_get_cards() 
@@ -237,6 +238,51 @@
return channels;
 }
 
+void *
+alsa_card_get_channel(void *data, int channel_id) 
+{
+   Alsa_Card*card;
+   Alsa_Channel *chan;
+   
+   card = data;
+   if (!card) return NULL;
+
+   chan = _alsa_card_get_channel(card, channel_id);
+   if (!chan) return NULL;
+
+   return chan;
+}
+
+int 
+alsa_get_volume(int card_id, int channel_id) 
+{
+   Alsa_Card*card;
+   Alsa_Channel *chan;
+   
+   card = alsa_get_card(card_id);
+   if (!card) return 0;
+
+   chan = _alsa_card_get_channel(card, channel_id);
+   if (!chan) return 0;
+
+   printf("Get Volume\n");
+}
+
+int 
+alsa_set_volume(int card_id, int channel_id, int vol) 
+{
+   Alsa_Card*card;
+   Alsa_Channel *chan;
+   
+   card = alsa_get_card(card_id);
+   if (!card) return 0;
+
+   chan = _alsa_card_get_channel(card, channel_id);
+   if (!chan) return 0;
+   
+   printf("Set Volume: %i\n", vol);
+}
+
 /* Privates */
 static int 
 _alsa_get_hash(const char *name) 
@@ -272,3 +318,27 @@
return _alsa_get_hash(name);
 }
 
+static void *
+_alsa_card_get_channel(void *data, int channel_id) 
+{
+   Alsa_Card*card;
+   Evas_List*c;
+   
+   card = data;
+   if (!card) return NULL;
+
+   if (!card->channels)
+ card->channels = alsa_card_get_channels(card);
+
+   if (!card->channels) return NULL;
+   
+   for (c = card->channels; c; c = c->next) 
+ {
+   Alsa_Channel *chan;
+   
+   chan = c->data;
+   if (!chan) continue;
+   if (chan->id == channel_id) return chan;
+ }
+   return NULL;
+}
===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- alsa_mixer.h11 Sep 2006 09:06:50 -  1.2
+++ alsa_mixer.h11 Sep 2006 09:54:10 -  1.3
@@ -38,6 +38,10 @@
 Evas_List   *alsa_get_cards (void);
 void*alsa_get_card  (int id);
 Evas_List   *alsa_card_get_channels (void *data);
+void*alsa_card_get_channel  (void *data, int channel_id);
 void alsa_free_cards(void *data);
+
+int alsa_get_volume(int card_id, int channel_id);
+int alsa_set_volume(int card_id, int channel_id, int vol);
 
 #endif
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.c11 Sep 2006 09:06:50 -  1.9
+++ e_mod_main.c11 Sep 2006 09:54:10 -  1.10
@@ -51,8 +51,13 @@
 {
Evas_List *(*get_cards)(void);
void  *(*get_card) (int id);
-   Evas_List *(*get_channels) (void *card);
-   void   (*free_cards)   (void *cards);
+   Evas_List *(*get_channels) (void *data);
+   void  *(*get_channel)  (void *data, int card_id);
+
+   int(*set_volume)   (int card_id, int channel_id, int vol);
+   int(*get_volume)   (int card_id, int channel_id);
+   
+   void   (*free_cards)   (void *data);

Evas_List *cards;
 };
@@ -293,7 +298,11 @@
sys->get_cards = alsa_get_cards;
sys->get_card = alsa_get_card;
sys->get_channels = alsa_card_get_channels;
+   sys->get_channel = alsa_card_get_channel;
sys->free_cards = alsa_free_cards;
+   
+   sys->get_volume = alsa_get_volume;
+   sys->set_volume = alsa_set_volume;
#endif

mixer->mix_sys = sys;
@@ -307,8 +316,7 @@
sys = data;
if (!sys) return;
 
-   if (sys->free_cards) 
- sys->free_cards(sys->cards);
+   if (sys->free_cards) sys->free_cards(sys->cards);
 
E_FREE(sys);
 }
@@ -426,10 +434,8 @@
Evas_Coord sw, sh;
int cx, cy, cw, ch;

-   if (!inst || !inst->mixer)
- return;
-   if (!(con = e_container_current_get(e_manager_current_get(

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e/data/icons


Modified Files:
.cvsignore 


Log Message:


ignore++

===
RCS file: /cvs/e/e17/apps/e/data/icons/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- .cvsignore  15 Aug 2005 04:32:49 -  1.4
+++ .cvsignore  11 Sep 2006 09:38:02 -  1.5
@@ -1 +1,2 @@
+Makefile
 Makefile.in



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_main.c 


Log Message:


add system icons dir for e, patches for evas.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -3 -r1.186 -r1.187
--- e_main.c7 Sep 2006 13:17:46 -   1.186
+++ e_main.c11 Sep 2006 09:36:32 -  1.187
@@ -384,7 +384,7 @@
 
ecore_desktop_paths_extras_clear();
ecore_desktop_paths_prepend_user(ECORE_DESKTOP_PATHS_ICONS, "~/.e/e/icons");
-   snprintf(buf, sizeof(buf), "%s/data/images", e_prefix_data_get());
+   snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
ecore_desktop_paths_append_system(ECORE_DESKTOP_PATHS_ICONS, buf);
ecore_desktop_paths_regen();
 



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e


Modified Files:
configure.in 


Log Message:


add system icons dir for e, patches for evas.

===
RCS file: /cvs/e/e17/apps/e/configure.in,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- configure.in3 Sep 2006 08:51:31 -   1.131
+++ configure.in11 Sep 2006 09:36:32 -  1.132
@@ -293,6 +293,7 @@
 data/xsession/enlightenment.desktop
 data/backgrounds/Makefile
 data/etc/Makefile
+data/icons/Makefile
 doc/Makefile
 po/Makefile
 intl/Makefile



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e/data/icons


Added Files:
Makefile.am xterm.png 


Log Message:


add system icons dir for e, patches for evas.




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/m4


Modified Files:
pkg.m4 


Log Message:


add system icons dir for e, patches for evas.

===
RCS file: /cvs/e/e17/libs/evas/m4/pkg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- pkg.m4  20 May 2005 22:01:40 -  1.2
+++ pkg.m4  11 Sep 2006 09:36:32 -  1.3
@@ -1,57 +1,157 @@
-
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, 
action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get 
pkg-config."
-  else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-AC_MSG_CHECKING(for $2)
-
-if $PKG_CONFIG --exists "$2" ; then
-AC_MSG_RESULT(yes)
-succeeded=yes
-
-AC_MSG_CHECKING($1_CFLAGS)
-$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-AC_MSG_RESULT($$1_CFLAGS)
-
-AC_MSG_CHECKING($1_LIBS)
-$1_LIBS=`$PKG_CONFIG --libs "$2"`
-AC_MSG_RESULT($$1_LIBS)
-else
-$1_CFLAGS=""
-$1_LIBS=""
-## If we have a custom action on failure, don't print errors, but 
-## do set a variable so people can do so.
-$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-ifelse([$4], ,echo $$1_PKG_ERRORS,)
+# pkg.m4 - Macros to locate and utilise pkg-config.-*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]>.
+#
+# 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# --
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+   AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+   _pkg_min_version=m4_default([$1], [0.9.0])
+   AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+   if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+   AC_MSG_RESULT([yes])
+   else
+   AC_MSG_RESULT([no])
+   PKG_CONFIG=""
+   fi
+   
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# -
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+if test -n "$$1"; then
+pkg_cv_[]$1="$$1"
+else
+PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+[pkg_failed=yes])
+

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e/data


Modified Files:
Makefile.am 


Log Message:


add system icons dir for e, patches for evas.

===
RCS file: /cvs/e/e17/apps/e/data/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 3 Sep 2006 08:51:31 -   1.7
+++ Makefile.am 11 Sep 2006 09:36:32 -  1.8
@@ -1,3 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = fonts images init themes other xsession input_methods backgrounds etc
+SUBDIRS = \
+fonts \
+images \
+init \
+themes \
+other \
+xsession \
+input_methods \
+backgrounds \
+etc \
+icons
 



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/evas raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir : e17/libs/evas/src/modules/engines/fb


Modified Files:
evas_fb_main.c 


Log Message:


add system icons dir for e, patches for evas.

===
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/fb/evas_fb_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_fb_main.c  14 Jan 2006 12:13:37 -  1.1
+++ evas_fb_main.c  11 Sep 2006 09:36:32 -  1.2
@@ -12,7 +12,8 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+//#include 
 
 #define FB_ACTIVE0
 #define FB_REL_REQ   1



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e raster

[Enlightenment CVS]

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir : e17/apps/e/data/icons/images


Removed Files:
.cvsignore 


Log Message:


add system icons dir for e, patches for evas.




-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: mixer devilhorns

[Enlightenment CVS]

Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : mixer

Dir : e_modules/mixer


Modified Files:
alsa_mixer.c alsa_mixer.h e_mod_config.c e_mod_main.c 
e_mod_main.h mixer.edc 


Log Message:
Start of virtualizing sound stuffs.
Should make doing alsa/oss/*bsd easier.

===
RCS file: /cvs/e/e_modules/mixer/alsa_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- alsa_mixer.c7 Sep 2006 15:26:17 -   1.1
+++ alsa_mixer.c11 Sep 2006 09:06:50 -  1.2
@@ -3,7 +3,8 @@
 
 static int _alsa_get_hash  (const char *name);
 static int _alsa_get_system_id (const char *name);
-static int _alsa_get_mixer_id  (const char *name);
+static int _alsa_get_card_id   (const char *name);
+static int _alsa_get_mixer_id  (const char *name); 
 
 Evas_List *
 alsa_get_cards() 
@@ -53,7 +54,7 @@
if (!card) continue;
card->name = evas_stringshare_add(buf);
card->real = evas_stringshare_add(snd_ctl_card_info_get_name(hw_info));
-   card->id = _alsa_get_mixer_id(card->real);
+   card->id = _alsa_get_card_id(card->real);

cards = evas_list_append(cards, card);
  }
@@ -62,8 +63,11 @@
 }
 
 void 
-alsa_free_cards(Evas_List *cards) 
+alsa_free_cards(void *data) 
 {
+   Evas_List *cards;
+   
+   cards = data;
if (!cards) return;

while (cards) 
@@ -74,10 +78,163 @@
if (!card) continue;
if (card->name) evas_stringshare_del(card->name);
if (card->real) evas_stringshare_del(card->real);
+   while (card->channels) 
+ {
+Alsa_Channel *chan;
+
+chan = card->channels->data;
+if (!chan) continue;
+if (chan->name) evas_stringshare_del(chan->name);
+card->channels = evas_list_remove_list(card->channels, 
card->channels);
+E_FREE(chan);
+ }
+   cards = evas_list_remove_list(cards, cards);
E_FREE(card);
+ }
+}
+
+void *
+alsa_get_card(int id) 
+{
+   Evas_List   *cards = NULL;
+   snd_mixer_t *handle;
+   snd_ctl_t   *control;
+   snd_ctl_card_info_t *hw_info;
+   int  err, i;
+   char buf[1024];
+
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("Cannot open mixer: %s\n", snd_strerror(err));
+   return NULL;
+ }
+
+   snd_ctl_card_info_alloca(&hw_info);
+
+   for (i = 0; i < 32; i++) 
+ {
+   Alsa_Card *card;

-   cards = evas_list_remove_list(cards, cards);
+   snprintf(buf, sizeof(buf), "hw:%d", i);
+   if ((err = snd_mixer_attach(handle, buf)) < 0) break;
+   if ((err = snd_mixer_detach(handle, buf)) < 0) 
+ {
+snd_mixer_close(handle);
+break;
+ }
+   if ((err = snd_ctl_open(&control, buf, 0)) < 0) 
+ {
+printf("Cannot control: %s: %s\n", buf, snd_strerror(err));
+continue;
+ }
+   if ((err = snd_ctl_card_info(control, hw_info)) < 0) 
+ {
+printf("Cannot get hardware info: %s: %s\n", buf, 
snd_strerror(err));
+snd_ctl_close(control);
+continue;
+ }
+   
+   snd_ctl_close(control);
+
+   card = E_NEW(Alsa_Card, 1);
+   if (!card) continue;
+   card->name = evas_stringshare_add(buf);
+   card->real = evas_stringshare_add(snd_ctl_card_info_get_name(hw_info));
+   card->id = _alsa_get_card_id(card->real);
+   
+   if (!_alsa_get_card_id(card->real) == id) continue;
+   return card;
  }
+   return NULL;
+}
+
+Evas_List *
+alsa_card_get_channels(void *data) 
+{
+   Alsa_Card*card;
+   Evas_List*channels;
+ 
+   snd_mixer_t  *handle;
+   snd_ctl_t*control;
+   snd_ctl_card_info_t  *hw_info;
+   snd_mixer_selem_id_t *sid;
+   snd_mixer_elem_t *elem;
+   int   err, i;
+
+   card = data;   
+   if (!card) return NULL;
+
+   channels = NULL;
+   
+   snd_mixer_selem_id_alloca(&sid);
+   snd_ctl_card_info_alloca(&hw_info);
+   
+   if ((err = snd_ctl_open(&control, card->name, 0)) < 0) 
+ {
+   printf("\n\nCannot Open Card: %s %s\n\n", card->name, 
snd_strerror(err));
+   return NULL;
+ }
+   
+   if ((err = snd_ctl_card_info(control, hw_info)) < 0) 
+ {   
+   printf("\n\nCannot get hardware info: %s %s\n\n", card->name, 
snd_strerror(err));
+   snd_ctl_close(control);
+   return NULL;
+ }
+
+   snd_ctl_close(control);
+   
+   if ((err = snd_mixer_open(&handle, 0)) < 0) 
+ {
+   printf("\n\nCannot Open Mixer: %s\n\n", snd_strerror(err));
+   return NULL;
+ }
+
+   if ((err = snd_mixer_attach(handle, card->name)) < 0) 
+ {
+   printf("\n\nCannot Attach Mixer: %s\n\n", snd_strerror(err));
+   snd_mixer_close(handle);
+   return NULL;
+ }
+
+   if (

E CVS: proto doursse

[Enlightenment CVS]

Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : proto

Dir : e17/proto/edvi/src/bin


Modified Files:
edvi_etk_test.c 


Log Message:
support older (2.8.0) dvilib. Use new etk api. Ewl widget does not work, I 
don't understand why yet

===
RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_etk_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edvi_etk_test.c 2 Aug 2006 05:53:58 -   1.3
+++ edvi_etk_test.c 11 Sep 2006 07:22:08 -  1.4
@@ -58,7 +58,7 @@
   list = etk_tree_new ();
   etk_tree_headers_visible_set (ETK_TREE (list), FALSE);
   etk_widget_size_request_set (list, 60, -1);
-  etk_box_pack_start (ETK_BOX (hbox), list, ETK_FALSE, ETK_FALSE, 0);
+  etk_box_append (ETK_BOX (hbox), list, ETK_BOX_START, ETK_BOX_NONE, 0);
   etk_widget_show (list);
 
   etk_signal_connect ("row_selected", ETK_OBJECT (list),
@@ -81,7 +81,7 @@
   }
   etk_tree_thaw (ETK_TREE (list));
 
-  etk_box_pack_start (ETK_BOX (hbox), dvi, ETK_FALSE, ETK_FALSE, 0);
+  etk_box_append (ETK_BOX (hbox), dvi, ETK_BOX_START, ETK_BOX_NONE, 0);
   etk_widget_show (dvi);
   
   etk_widget_show (window);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto doursse

[Enlightenment CVS]

Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : proto

Dir : e17/proto/edvi


Modified Files:
configure.in 


Log Message:
support older (2.8.0) dvilib. Use new etk api. Ewl widget does not work, I 
don't understand why yet

===
RCS file: /cvs/e/e17/proto/edvi/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in16 Jul 2006 20:51:17 -  1.1
+++ configure.in11 Sep 2006 07:22:08 -  1.2
@@ -8,21 +8,25 @@
 AC_PROG_CC
 
 AC_PATH_GENERIC(DVIlib2, 2.9.0,
-  [ ],
-  [
-echo "ERROR:"
-echo "The DVIlib2-config development file was not found in your execute"
-echo "path. This may mean one of several things"
-echo "1. You may not have installed the DVIlib2-devel (or DVIlib2-dev)"
-echo "   packages."
-echo "2. You may have evas installed somewhere not covered by your path."
-echo ""
-echo "If this is the case make sure you have the packages installed, AND"
-echo "that the DVIlib2-config file is in your execute path (see your"
-echo "shell's manual page on setting the \$PATH environment variable), OR"
-echo "alternatively, specify the script to use with --with-dvilib2-config."
-AC_MSG_ERROR([Fatal Error: no DVIlib2-config library detected.])
-   ]
+  [ AC_DEFINE(HAVE_DVILIB_2_9, 1, [have dvilib 2.9.0]) ],
+  [ AC_PATH_GENERIC(DVIlib2, 2.8.0,
+  [ ],
+  [
+   echo "ERROR:"
+   echo "The DVIlib2-config development file was not found in your execute"
+   echo "path. This may mean one of several things"
+   echo "1. You may not have installed the DVIlib2-devel (or DVIlib2-dev)"
+   echo "   packages."
+   echo "2. You may have evas installed somewhere not covered by your 
path."
+   echo ""
+   echo "If this is the case make sure you have the packages installed, 
AND"
+   echo "that the DVIlib2-config file is in your execute path (see your"
+   echo "shell's manual page on setting the \$PATH environment variable), 
OR"
+   echo "alternatively, specify the script to use with 
--with-dvilib2-config."
+   AC_MSG_ERROR([Fatal Error: no DVIlib2-config library detected.])
+  ]
+)
+  ]
 )
 
 AC_PATH_GENERIC(evas, 0.9.9,
@@ -63,7 +67,7 @@
 
 requirements="evas ecore"
 
-AC_PATH_GENERIC(ewl, 0.0.4, [have_ewl="yes"], [have_ewl="no"])
+AC_PATH_GENERIC(ewl, 0.0.4, [ have_ewl="yes" ], [ have_ewl="no" ])
 if test "x$have_ewl" = "xyes" ; then
requirements="$requirements ewl"
EWL_TEST_LIBS_DIR="`ewl-config --test-lib-dir`"
@@ -78,7 +82,7 @@
 fi
 AM_CONDITIONAL(BUILD_EDVI_EWL, test x$have_ewl = xyes)
 
-AC_PATH_GENERIC(etk, 0.1.0, [have_etk="yes"], [have_etk="no"])
+AC_PATH_GENERIC(etk, 0.1.0, [ have_etk="yes" ], [ have_etk="no" ])
 if test "x$have_etk" = "xyes" ; then
requirements="$requirements etk"
 else



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto doursse

[Enlightenment CVS]

Enlightenment CVS committal

Author  : doursse
Project : e17
Module  : proto

Dir : e17/proto/edvi/src/lib


Modified Files:
edvi.c edvi_document.c edvi_framebuffer.c edvi_page.c 
edvi_private.h edvi_property.c etk_dvi.c 


Log Message:
support older (2.8.0) dvilib. Use new etk api. Ewl widget does not work, I 
don't understand why yet

===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi.c  16 Jul 2006 20:51:17 -  1.1
+++ edvi.c  11 Sep 2006 07:22:08 -  1.2
@@ -2,7 +2,13 @@
 #include 
 #include 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include "edvi_enum.h"
 #include "edvi_forward.h"
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_document.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_document.c 16 Jul 2006 20:51:17 -  1.1
+++ edvi_document.c 11 Sep 2006 07:22:08 -  1.2
@@ -1,6 +1,12 @@
 #include 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include "edvi_enum.h"
 #include "edvi_forward.h"
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_framebuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_framebuffer.c  16 Jul 2006 20:51:17 -  1.1
+++ edvi_framebuffer.c  11 Sep 2006 07:22:08 -  1.2
@@ -1,6 +1,12 @@
 #include 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include "edvi_enum.h"
 #include "edvi_forward.h"
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_page.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_page.c 16 Jul 2006 20:51:17 -  1.1
+++ edvi_page.c 11 Sep 2006 07:22:08 -  1.2
@@ -1,6 +1,12 @@
 #include 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include "edvi_enum.h"
 #include "edvi_forward.h"
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_private.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_private.h  16 Jul 2006 20:51:17 -  1.1
+++ edvi_private.h  11 Sep 2006 07:22:08 -  1.2
@@ -2,7 +2,13 @@
 #define __EDVI_PRIVATE_H__
 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include 
 
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/edvi_property.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edvi_property.c 16 Jul 2006 20:51:17 -  1.1
+++ edvi_property.c 11 Sep 2006 07:22:08 -  1.2
@@ -1,6 +1,12 @@
 #include 
 
-#include 
+#include "config.h"
+
+#ifdef HAVE_DVILIB_2_9
+#  include 
+#else
+#  include 
+#endif /* HAVE_DVILIB_2_9 */
 
 #include "edvi_enum.h"
 #include "edvi_forward.h"
===
RCS file: /cvs/e/e17/proto/edvi/src/lib/etk_dvi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_dvi.c   16 Jul 2006 20:51:17 -  1.1
+++ etk_dvi.c   11 Sep 2006 07:22:08 -  1.2
@@ -458,9 +458,15 @@
 {
Etk_Dvi *dvi;
Evas *evas;
+/*Evas_Object *o; */
 
if (!(dvi = ETK_DVI(object)) || !(evas = 
etk_widget_toplevel_evas_get(ETK_WIDGET(dvi
   return;
+
+/*o = evas_object_rectangle_add(evas); */
+/*evas_object_color_set(o, 255, 255, 0, 128); */
+/*etk_widget_member_object_add(ETK_WIDGET(object), o); */
+/*evas_object_show(o); */
_etk_dvi_load(dvi);
 }
 
@@ -508,7 +514,6 @@
   if (dvi->dvi_object)
   {
 dvi->dvi_page = edvi_page_new (dvi->dvi_document, dvi->page);
-
 edvi_page_render (dvi->dvi_page, dvi->dvi_device, dvi->dvi_object);
   }
   evas_object_show(dvi->dvi_object);



-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs