Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
Makefile.am dock.c engage.h main.c
Log Message:
add zoom boolean
add (optional) ewl context menu - developing still, but needed to get the quit button
in at least ;)
the right click listener is in an #if 1 so it can be removed if neccessary - need to
talk to atmos about the mouse handlers
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 5 May 2004 06:54:36 -0000 1.6
+++ Makefile.am 8 May 2004 17:48:28 -0000 1.7
@@ -8,6 +8,7 @@
@edje_cflags@ \
@ecore_cflags@ \
@esmart_cflags@ \
[EMAIL PROTECTED]@ \
@imlib2_cflags@
bin_PROGRAMS = engage
@@ -22,6 +23,6 @@
userconfig.c
-engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ \
+engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ @ewl_libs@ \
@esmart_libs@ -lesmart_trans_x11
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/dock.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- dock.c 6 May 2004 12:47:20 -0000 1.4
+++ dock.c 8 May 2004 17:48:29 -0000 1.5
@@ -200,14 +200,19 @@
double range = 2.5;
double f = 1.5;
double x = d / range;
+ double zoom_factor;
+ if (options.zoom)
+ zoom_factor = options.zoomfactor;
+ else
+ zoom_factor = 1;
if (d > -range && d < range) {
- *zoom = (dock.zoom - 1.0) * (options.zoomfactor - 1.0) *
+ *zoom = (dock.zoom - 1.0) * (zoom_factor - 1.0) *
((sqrt(f * f - 1.0) - sqrt(f * f - x * x)) / (sqrt(f * f - 1.0) - f)
)
+ 1.0;
*disp = (options.size + options.spacing) *
- ((dock.zoom - 1.0) * (options.zoomfactor - 1.0) *
+ ((dock.zoom - 1.0) * (zoom_factor - 1.0) *
(range *
(x * (2 * sqrt(f * f - 1.0) - sqrt(f * f - x * x)) -
f * f * atan(x / sqrt(f * f - x * x))) / (2.0 * (sqrt(f * f - 1.0) -
@@ -217,7 +222,7 @@
} else {
*zoom = 1.0;
*disp = (options.size + options.spacing) *
- ((dock.zoom - 1.0) * (options.zoomfactor - 1.0) *
+ ((dock.zoom - 1.0) * (zoom_factor - 1.0) *
(range * (sqrt(f * f - 1.0) - f * f * atan(1.0 / sqrt(f * f - 1.0))) /
(2.0 * (sqrt(f * f - 1.0) - f))
)
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/engage.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- engage.h 4 May 2004 15:18:39 -0000 1.11
+++ engage.h 8 May 2004 17:48:29 -0000 1.12
@@ -30,6 +30,7 @@
extern bool need_redraw;
int od_config_init(int argc, char **argv);
+void od_config_menu_draw(Evas_Coord x, Evas_Coord y);
void od_window_init();
@@ -70,7 +71,7 @@
OD_Window *od_wm_window_prev_by_window_class_get(const char *);
struct _OD_Options {
- int width, height;
+ int width, height, zoom;
char *icon_path, *theme, *engine;
OD_Mode mode;
int grab_min_icons, grab_app_icons;
===================================================================
RCS file: /cvsroot/enlightenment/misc/engage/src/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.c 4 May 2004 15:18:39 -0000 1.5
+++ main.c 8 May 2004 17:48:29 -0000 1.6
@@ -31,6 +31,7 @@
ecore_app_args_set(argc, (const char **) argv);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL);
ecore_evas_init();
+ ewl_init(&argc, argv);
edje_init();
edje_frametime_set(1.0 / 30.0);
@@ -48,6 +49,7 @@
ecore_main_loop_begin();
edje_shutdown();
+ ewl_shutdown();
ecore_evas_shutdown();
ecore_config_save();
ecore_config_shutdown();
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
