E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_file_context_menu.c Log Message: * Add restore function checks * Better icons for context menu === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_file_context_menu.c 26 Aug 2006 12:59:15 - 1.16 +++ etk_file_context_menu.c 28 Aug 2006 10:47:12 - 1.17 @@ -404,24 +404,31 @@ etk_signal_connect(popped_up, ETK_OBJECT(menu), ETK_CALLBACK(_entropy_etk_context_menu_popup_cb), NULL); _entropy_etk_context_menu_open_with_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Open With), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, + _(Open With), ETK_STOCK_APPLICATION_X_EXECUTABLE, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_context_menu_open_with = etk_menu_new(); - etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_open_with_item), ETK_MENU(_entropy_etk_context_menu_open_with)); + etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_open_with_item), + ETK_MENU(_entropy_etk_context_menu_open_with)); _entropy_etk_context_menu_groups_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Groups), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Groups), + ETK_STOCK_EMBLEM_IMPORTANT, ETK_MENU_SHELL(menu),NULL); + _entropy_etk_context_menu_groups = etk_menu_new(); - etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_item), ETK_MENU(_entropy_etk_context_menu_groups)); + etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_item), + ETK_MENU(_entropy_etk_context_menu_groups)); _entropy_etk_context_menu_groups_add_to_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Add to..), ETK_STOCK_EDIT_COPY, + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Add to..), ETK_STOCK_DIALOG_APPLY, ETK_MENU_SHELL(_entropy_etk_context_menu_groups),NULL); + _entropy_etk_context_menu_groups_add_to = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_add_to_item), ETK_MENU(_entropy_etk_context_menu_groups_add_to)); _entropy_etk_context_menu_groups_remove_from_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Remove from..), ETK_STOCK_EDIT_COPY, + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Remove from..), ETK_STOCK_DIALOG_CLOSE, ETK_MENU_SHELL(_entropy_etk_context_menu_groups),NULL); _entropy_etk_context_menu_groups_remove_from = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(_entropy_etk_context_menu_groups_remove_from_item), @@ -429,44 +436,56 @@ menu_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Copy (Ctrl-c)), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); - etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(_entropy_etk_context_menu_group_file_copy_cb),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Copy (Ctrl-c)), + ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL); - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Cut (Ctrl-x)), ETK_STOCK_EDIT_CUT, ETK_MENU_SHELL(menu),NULL); + etk_signal_connect(activated, ETK_OBJECT(menu_item), + ETK_CALLBACK(_entropy_etk_context_menu_group_file_copy_cb),NULL); + + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Cut (Ctrl-x)), + ETK_STOCK_EDIT_CUT, ETK_MENU_SHELL(menu),NULL); menu_item = - _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Paste (Ctrl-v)), ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu),NULL); - etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(_entropy_etk_context_menu_group_file_paste_cb),NULL); + _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Paste (Ctrl-v)), + ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu),NULL); + etk_signal_connect(activated, ETK_OBJECT(menu_item), +
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_apps.c Log Message: Just getting my thoughts in order. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_apps.c 28 Aug 2006 11:22:27 - 1.1 +++ e_int_config_apps.c 28 Aug 2006 11:49:17 - 1.2 @@ -6,6 +6,18 @@ #define MOD_UNLOADED 0 #define MOD_ENABLED 1 +/* TODO: + * DND from left side to righ side, and to ibar etc. + * Double click or fm menu of eap/.desktop brings up eap editor. + * FDO menu generation should put symlinks to .desktops in /all/, + * if we edit one of those, replace symlink with resulting .desktop, + * include original path in new .desktop. + * Display contents of .order files on right side. + * Stop user from deleting standard directories on right side. + * Stop user from creating new directories on left side. + * Filtering/sorting of left side to make managing thousands of apps easy. + */ + static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_server_handle.c
Log Message:
* Bugfixes
* Placeholder to handle link copy
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- evfs_server_handle.c27 Aug 2006 09:58:53 - 1.75
+++ evfs_server_handle.c28 Aug 2006 12:06:14 - 1.76
@@ -169,9 +169,6 @@
evfs_filereference_clone(command-file_command.files[0]),
file_stat);
- /*Iterate */
- ecore_main_loop_iterate();
-
}
else
{
@@ -213,6 +210,9 @@
else
{
printf(Not recursing - LINK directory!\n);
+ evfs_operation_remove_task_add(EVFS_OPERATION(op),
+ evfs_filereference_clone(command-file_command.files[0]),
+ file_stat);
}
}
@@ -502,10 +502,16 @@
evfs_cleanup_file_command_only(new_command);
}
- evfs_operation_copy_task_add(EVFS_OPERATION(op),
-
evfs_filereference_clone(command-file_command.files[c_file]),
- rewrite_dest,
- file_stat, dest_stat, res);
+ if (!S_ISLNK(file_stat.st_mode)) {
+
evfs_operation_copy_task_add(EVFS_OPERATION(op),
+
evfs_filereference_clone(command-file_command.files[c_file]),
+ rewrite_dest,
+ file_stat, dest_stat, res);
+
+ printf(Rewritten destination: '%s'\n,
rewrite_dest-path);
+ } else {
+ printf(TODO: HANDLE link copy/move\n);
+ }
/*If we're a move, queue the delete of this dir..*/
if (move) {
@@ -514,8 +520,6 @@
file_stat);
}
- printf(Rewritten destination: '%s'\n,
rewrite_dest-path);
-
} else {
Ecore_List *directory_list = NULL;
int newlen;
@@ -706,7 +710,6 @@
evfs_filereference *ref, *src, *dest;
char* pos;
char* pos2;
- int len;
evfs_command* f_command;
for (c=0;ccommand-file_command.num_files;c++) {
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_metadata.c
Log Message:
* Hmm - I seem to have broken this at some stage. Should be fixed now
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_metadata.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evfs_metadata.c 20 Aug 2006 04:13:56 - 1.29
+++ evfs_metadata.c 28 Aug 2006 12:22:54 - 1.30
@@ -734,10 +734,10 @@
{
evfs_filereference* ref;
int status;
+ int ret;
if (!_metadata_fork) {
ecore_list_goto_first(evfs_metadata_queue);
-
if ( (ref = ecore_list_current(evfs_metadata_queue))) {
/*printf(..item on queue..\n);*/
evfs_metadata_extract_fork(ref);
@@ -745,17 +745,23 @@
} else {
/*printf(...metadata runner executing..\n);*/
- if ((waitpid(_metadata_fork, status, WNOHANG) 0) ||
+ if ((ret = (waitpid(_metadata_fork, status, WNOHANG) 0)) ||
errno == ECHILD) {
_metadata_fork = 0;
+
ecore_list_goto_first(evfs_metadata_queue);
ref = ecore_list_current(evfs_metadata_queue);
- evfs_cleanup_filereference(ref);
-
- ecore_list_remove_first(evfs_metadata_queue);
+
+ if (ref) {
+ evfs_cleanup_filereference(ref);
+ ecore_list_remove_first(evfs_metadata_queue);
+ } else {
+ printf(EVFS: ugh? no file, and we just
processed it for meta? : %d\n, getpid());
+ }
- /*printf(Execution complete..\n);*/
+ } else {
+ printf(Fork ret was: %d\n, ret);
}
}
return 1;
@@ -773,6 +779,8 @@
int file;
Evas_List* l;
evfs_meta_obj* o;
+
+ ecore_main_loop_quit();
ret = sqlite3_open(metadata_db, dbi);
if( ret ){
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
fix segv!
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- eet_lib.c 17 Aug 2006 20:22:23 - 1.69
+++ eet_lib.c 28 Aug 2006 13:22:16 - 1.70
@@ -1050,7 +1050,7 @@
for (efn = ef-header-directory-nodes[hash]; efn; efn = efn-next)
{
/* if it matches */
-if (eet_string_match(efn-name, name))
+if ((efn-name) (eet_string_match(efn-name, name)))
{
free(efn-data);
efn-compression = !!compress;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: todo++ (low priority) === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.412 retrieving revision 1.413 diff -u -3 -r1.412 -r1.413 --- TODO27 Aug 2006 16:16:56 - 1.412 +++ TODO28 Aug 2006 19:52:35 - 1.413 @@ -118,6 +118,10 @@ * improve drag/resize of gadget items * pager should be able to be configured to control more than the current zone (select which zone they control) +* add a dialog to allow selecting the default border from among those present + in the theme (e.g. winter provides a 'square' border). after a theme change + this should fall back to default if the selected one doesn't exist in the + new theme. ]]] [[[ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_bin.c etk_widget.c etk_widget.h
Log Message:
* [Bin] The child is now correctly swallowed (it fixes a bug with the combobox)
* [Widget] Remove two useless funcs (etk_widget_is_swallowing_widget/object())
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_bin.c 17 Aug 2006 17:18:14 - 1.15
+++ etk_bin.c 28 Aug 2006 22:08:29 - 1.16
@@ -83,7 +83,7 @@
if (child)
{
etk_widget_parent_set(child, ETK_WIDGET(bin));
- etk_widget_swallow_widget(ETK_WIDGET(bin), swallow_area, bin-child);
+ etk_widget_swallow_widget(ETK_WIDGET(bin), swallow_area, child);
bin-child = child;
etk_signal_emit_by_name(child_added, ETK_OBJECT(bin), NULL, child);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- etk_widget.c26 Aug 2006 09:38:06 - 1.79
+++ etk_widget.c28 Aug 2006 22:08:29 - 1.80
@@ -1185,30 +1185,6 @@
}
/**
- * @brief Checks if @a swallower is currently swallowing @a swallowed
- * @param swallower a widget
- * @param swallowed the widget to check if it is swallowed by @a swallower
- * @return Returns ETK_TRUE if @a swallower is swallowing @a swallowed, and
ETK_FALSE otherwise
- * @widget_implementation
- */
-Etk_Bool etk_widget_is_swallowing_widget(Etk_Widget *swallower, Etk_Widget
*swallowed)
-{
- Evas_List *l;
- Etk_Widget_Swallowed_Object *swo;
-
- if (!swallower || !swallowed)
- return ETK_FALSE;
-
- for (l = swallower-swallowed_objects; l; l = l-next)
- {
- swo = l-data;
- if (swo-widget == swallowed)
- return ETK_TRUE;
- }
- return ETK_FALSE;
-}
-
-/**
* @brief Checks if the widget is swallowed by its parent
* @return Returns ETK_TRUE if the widget is swallowed by its parent
* @widget_implementation
@@ -1273,30 +1249,6 @@
break;
}
}
-}
-
-/**
- * @brief Checks if the widget swallows the object
- * @param widget a widget
- * @param object an evas object
- * @return Returns ETK_TRUE if @a widget is swallowing @a object
- * @widget_implementation
- */
-Etk_Bool etk_widget_is_swallowing_object(Etk_Widget *widget, Evas_Object
*object)
-{
- Evas_List *l;
- Etk_Widget_Swallowed_Object *swallowed_object;
-
- if (!widget || !object)
- return ETK_FALSE;
-
- for (l = widget-swallowed_objects; l; l = l-next)
- {
- swallowed_object = l-data;
- if (swallowed_object-object == object)
- return ETK_TRUE;
- }
- return ETK_FALSE;
}
/**
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- etk_widget.h24 Aug 2006 18:09:16 - 1.37
+++ etk_widget.h28 Aug 2006 22:08:29 - 1.38
@@ -171,11 +171,9 @@
Etk_Bool etk_widget_swallow_widget(Etk_Widget *swallower,
const char *part, Etk_Widget *to_swallow);
void etk_widget_unswallow_widget(Etk_Widget *swallower,
Etk_Widget *swallowed);
-Etk_Bool etk_widget_is_swallowing_widget(Etk_Widget
*swallower, Etk_Widget *swallowed);
Etk_Bool etk_widget_is_swallowed(Etk_Widget *widget);
Etk_Bool etk_widget_swallow_object(Etk_Widget *swallower,
const char *part, Evas_Object *object);
void etk_widget_unswallow_object(Etk_Widget *swallower,
Evas_Object *object);
-Etk_Bool etk_widget_is_swallowing_object(Etk_Widget
*swallower, Evas_Object *object);
Etk_Widget_Swallow_Error etk_widget_swallow_error_get();
Etk_Bool etk_widget_member_object_add(Etk_Widget *widget, Evas_Object *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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
menus.c
Log Message:
Avoid having to click twice to activate menu item.
===
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -3 -r1.257 -r1.258
--- menus.c 23 Aug 2006 21:04:53 - 1.257
+++ menus.c 28 Aug 2006 22:18:34 - 1.258
@@ -1227,7 +1227,8 @@
if (Mode_menus.just_shown)
{
Mode_menus.just_shown = 0;
- return;
+ if (ev-xbutton.time - Mode.events.last_btime 250)
+ return;
}
m = mi-menu;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ecompmgr.c eimage.c eobj.h pager.c
Log Message:
Add live pager update mode (when composite is enabled), take 1.
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -3 -r1.563 -r1.564
--- E.h 24 Aug 2006 21:32:28 - 1.563
+++ E.h 28 Aug 2006 22:46:22 - 1.564
@@ -669,6 +669,7 @@
#define EDBUG_TYPE_ICONBOX 143
#define EDBUG_TYPE_VERBOSE 144
#define EDBUG_TYPE_SYNC 145
+#define EDBUG_TYPE_PAGER146
int EventDebug(unsigned int type);
voidEventDebugSet(unsigned int type, int value);
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- ecompmgr.c 13 Aug 2006 09:17:02 - 1.123
+++ ecompmgr.c 28 Aug 2006 22:46:22 - 1.124
@@ -1709,6 +1709,7 @@
}
#endif
}
+ eo-serial = ev-xany.serial;
ECompMgrDamageMergeObject(eo, parts, 1);
}
===
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- eimage.c21 May 2006 18:44:15 - 1.7
+++ eimage.c28 Aug 2006 22:46:22 - 1.8
@@ -110,6 +110,10 @@
sw = imlib_image_get_width();
if (sh = 0)
sh = imlib_image_get_height();
+ if (dw = 0)
+ dw = sw;
+ if (dh = 0)
+ dh = sh;
return imlib_create_cropped_scaled_image(sx, sy, sw, sh, dw, dh);
}
===
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- eobj.h 7 Aug 2006 20:47:12 - 1.31
+++ eobj.h 28 Aug 2006 22:46:22 - 1.32
@@ -52,6 +52,7 @@
#if USE_COMPOSITE
unsigned intopacity;
void *cmhook;
+ unsigned intserial;
#endif
char *name;
};
===
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -3 -r1.224 -r1.225
--- pager.c 24 Aug 2006 21:52:28 - 1.224
+++ pager.c 28 Aug 2006 22:46:22 - 1.225
@@ -38,9 +38,15 @@
#include tooltips.h
#include xwin.h
-#define DEBUG_PAGER 0
+#define DEBUG_PAGER 1
+#if DEBUG_PAGER
+#define Dprintf(fmt...) if(EventDebug(EDBUG_TYPE_PAGER))Eprintf(fmt)
+#else
+#define Dprintf(fmt...)
+#endif
#define USE_PAGER_BACKGROUND_CACHE 1
+#define IMG_SCALE 2
#define EwinGetVX(ew) (ew-vx)
#define EwinGetVY(ew) (ew-vy)
@@ -53,7 +59,7 @@
charzoom;
chartitle;
charhiq;
- charsnap;
+ int mode;
int scanspeed;
int sel_button;
int win_button;
@@ -85,17 +91,20 @@
chardo_update;
int x1, y1, x2, y2;
float scale;
+ unsigned intserial;
+ int serdif;
} Pager;
static void PagerScanCancel(Pager * p);
static void PagerScanTimeout(int val, void *data);
static void PagerUpdateTimeout(int val, void *data);
static void PagerCheckUpdate(Pager * p, void *prm);
-static void PagerEwinUpdateFromPager(Pager * p, EWin * ewin);
+static void PagerUpdateEwinsFromPager(Pager * p);
static void PagerHiwinHide(void);
static void PagerEwinGroupSet(void);
static void PagerEvent(Win win, XEvent * ev, void *prm);
static void PagerHiwinEvent(Win win, XEvent * ev, void *prm);
+static void doPagerUpdate(Pager * p);
static Ecore_List *pager_list = NULL;
@@ -178,7 +187,7 @@
int y, y2, phase, cx, cy, ww, hh, xx, yy;
static int offsets[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
- if (!Conf_pagers.snap)
+ if (Conf_pagers.mode == 0)
return;
p = (Pager *) data;
@@ -198,6 +207,12 @@
if (Mode.mode != MODE_NONE)
return;
+ if (Conf_pagers.mode == 2)
+ {
+ doPagerUpdate(p);
+ return;
+ }
+
DeskCurrentGetArea(cx, cy);
ww = p-dw;
hh = p-dh;
@@ -229,13 +244,7 @@
p-update_phase++;
if (p-update_phase = y2)
{
- int i, num;
- EWin *const *lst;
-
- lst = EwinListGetForDesk(num, p-dsk);
- for (i = 0; i num; i++)
- PagerEwinUpdateFromPager(p, lst[i]);
-
+ PagerUpdateEwinsFromPager(p);
p-update_phase = 0;
}
}
@@ -259,7 +268,7 @@
static void
PagerEwinUpdateMini(Pager * p, EWin * ewin)
{
- int w, h, use_iclass;
+ int
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_shelf.c Log Message: repopulate a shelf's gadcon on style change so that any inset gadgets get their styles updated also === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_shelf.c 23 Aug 2006 03:39:02 - 1.36 +++ e_shelf.c 29 Aug 2006 00:05:56 - 1.37 @@ -475,6 +475,9 @@ if (!e_theme_edje_object_set(es-o_base, base/theme/shelf, buf)) e_theme_edje_object_set(es-o_base, base/theme/shelf, e/shelf/default/base); + + e_gadcon_unpopulate(es-gadcon); + e_gadcon_populate(es-gadcon); } EAPI void - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: build_config.sh.in Log Message: - Yay! Entrance now dynamically generates the session list. There are two fixed virtual sessions, - Default which currently does nothing but should be configurable via entrance_edit* - FailSafe which drops you into an arcane xterm (this should be configurable too?) Then comes the actual sessions found on your system. These are listed before the virtual sessions - Update AUTOFOO to allow ENTRANCE_SESSIONS_DIR - Default value is $prefix/share/xsessions - Can be overwritten with --with-sessions=foobar (incase you install entrance in $prefix=/usr/local, but you session are in /usr/share/bleh) - Update TODO file - ONE MASSIVE todo has basically vanished... hurray! thnx to onefang for the hardwork on ecore_desktop. === RCS file: /cvs/e/e17/apps/entrance/data/config/build_config.sh.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- build_config.sh.in 11 Aug 2006 05:49:55 - 1.21 +++ build_config.sh.in 29 Aug 2006 00:29:38 - 1.22 @@ -65,32 +65,33 @@ ecore_config -c $DB -k /entrance/session/0/session -s default ecore_config -c $DB -k /entrance/session/0/title -s Default ecore_config -c $DB -k /entrance/session/0/icon -s default.png -if [ -z $SESSION_DIR ] ; then - count=`(expr $count + 6)` - ecore_config -c $DB -k /entrance/session/1/session -s @prefix@/bin/enlightenment - ecore_config -c $DB -k /entrance/session/1/title -s E17 - ecore_config -c $DB -k /entrance/session/1/icon -s enlightenment.png - ecore_config -c $DB -k /entrance/session/2/session -s kde - ecore_config -c $DB -k /entrance/session/2/title -s KDE - ecore_config -c $DB -k /entrance/session/2/icon -s kde.png - ecore_config -c $DB -k /entrance/session/3/session -s gnome - ecore_config -c $DB -k /entrance/session/3/title -s Gnome - ecore_config -c $DB -k /entrance/session/3/icon -s gnome.png - ecore_config -c $DB -k /entrance/session/4/session -s Enlightenment - ecore_config -c $DB -k /entrance/session/4/title -s E16 - ecore_config -c $DB -k /entrance/session/4/icon -s enlightenment.png - ecore_config -c $DB -k /entrance/session/5/session -s xfce - ecore_config -c $DB -k /entrance/session/5/title -s XFce - ecore_config -c $DB -k /entrance/session/5/icon -s xfce.png -else - for f in $SESSION_DIR/* ; do - count=`(expr $count + 1)` - s=`echo $f | sed s:^$SESSION_DIR/::` - ecore_config -c $DB -k /entrance/session/$count/session -s $s - ecore_config -c $DB -k /entrance/session/$count/title -s $s - ecore_config -c $DB -k /entrance/session/$count/icon -s $s.png - done -fi +#if [ -z $SESSION_DIR ] ; then +# count=`(expr $count + 6)` +# ecore_config -c $DB -k /entrance/session/1/session -s @prefix@/bin/enlightenment +# ecore_config -c $DB -k /entrance/session/1/title -s E17 +# ecore_config -c $DB -k /entrance/session/1/icon -s enlightenment.png +# ecore_config -c $DB -k /entrance/session/2/session -s kde +# ecore_config -c $DB -k /entrance/session/2/title -s KDE +# ecore_config -c $DB -k /entrance/session/2/icon -s kde.png +# ecore_config -c $DB -k /entrance/session/3/session -s gnome +# ecore_config -c $DB -k /entrance/session/3/title -s Gnome +# ecore_config -c $DB -k /entrance/session/3/icon -s gnome.png +# ecore_config -c $DB -k /entrance/session/4/session -s Enlightenment +# ecore_config -c $DB -k /entrance/session/4/title -s E16 +# ecore_config -c $DB -k /entrance/session/4/icon -s enlightenment.png +# ecore_config -c $DB -k /entrance/session/5/session -s xfce +# ecore_config -c $DB -k /entrance/session/5/title -s XFce +# ecore_config -c $DB -k /entrance/session/5/icon -s xfce.png +#else +# for f in $SESSION_DIR/* ; do +# count=`(expr $count + 1)` +# s=`echo $f | sed s:^$SESSION_DIR/::` +# ecore_config -c $DB -k /entrance/session/$count/session -s $s +# ecore_config -c $DB -k /entrance/session/$count/title -s $s +# ecore_config -c $DB -k /entrance/session/$count/icon -s $s.png +# done +#fi +count=`(expr $count + 1)` ecore_config -c $DB -k /entrance/session/$count/session -s failsafe ecore_config -c $DB -k /entrance/session/$count/title -s Failsafe ecore_config -c $DB -k /entrance/session/$count/icon -s failsafe.png - 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
E CVS: apps/entrance essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_config.c
Log Message:
- Yay! Entrance now dynamically generates the session list. There are two fixed
virtual sessions,
- Default which currently does nothing but should be configurable
via entrance_edit*
- FailSafe which drops you into an arcane xterm (this should be
configurable too?)
Then comes the actual sessions found on your system. These are listed before
the virtual sessions
- Update AUTOFOO to allow ENTRANCE_SESSIONS_DIR
- Default value is $prefix/share/xsessions
- Can be overwritten with --with-sessions=foobar (incase you install
entrance in
$prefix=/usr/local, but you session are in
/usr/share/bleh)
- Update TODO file
- ONE MASSIVE todo has basically vanished... hurray! thnx to onefang
for the hardwork on ecore_desktop.
===
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- entrance_config.c 3 Jun 2006 07:24:49 - 1.33
+++ entrance_config.c 29 Aug 2006 00:29:38 - 1.34
@@ -1,10 +1,17 @@
+#include Ecore_File.h
+#include Ecore_Data.h
#include Ecore_Config.h
+#include Ecore_Desktop.h
#include entrance.h
#include entrance_config.h
#include entrance_user.h
#include entrance_x_session.h
+#include ../config.h
+
+static void _cb_xsessions_foreach(void *list_data, void *data);
+
/**
@file entrance_config.c
@brief System-wide configuration options for various settings in Entrance
@@ -137,6 +144,12 @@
}
}
+
+ Ecore_List *xsessions = ecore_file_ls(ENTRANCE_SESSIONS_DIR);
+ if(xsessions)
+ ecore_list_for_each(xsessions, _cb_xsessions_foreach, e);
+
+
num_session = ecore_config_int_get(/entrance/session/count);
for (i = 0; i num_session; i++)
{
@@ -154,6 +167,7 @@
evas_hash_add(e-sessions.hash, exs-name, exs);
}
}
+
#if 0
if (!e_db_int_get(db, /entrance/xinerama/screens/w, (e-screens.w)))
@@ -443,6 +457,36 @@
ecore_config_string_set(buf, user);
ecore_config_file_save(file);
}
+
+static void
+_cb_xsessions_foreach(void *list_data, void *data)
+{
+ const char* filename = list_data;
+ if(!filename)
+ return;
+
+ Entrance_Config *e = data;
+ if(!e)
+ return;
+
+ char path[PATH_MAX];
+ snprintf(path, PATH_MAX, ENTRANCE_SESSIONS_DIR /%s, filename);
+
+ Ecore_Desktop *ed = ecore_desktop_get(path, en_US);
+ if(!ed)
+ return;
+
+ Entrance_X_Session *exs = NULL;
+
+if ((exs = entrance_x_session_new(ed-name, ed-icon, ed-exec)))
+{
+ e-sessions.keys = evas_list_append(e-sessions.keys, ed-name);
+ e-sessions.hash =
+ evas_hash_add(e-sessions.hash, exs-name, exs);
+}
+}
+
+
#if 0
int
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: TODO configure.in Log Message: - Yay! Entrance now dynamically generates the session list. There are two fixed virtual sessions, - Default which currently does nothing but should be configurable via entrance_edit* - FailSafe which drops you into an arcane xterm (this should be configurable too?) Then comes the actual sessions found on your system. These are listed before the virtual sessions - Update AUTOFOO to allow ENTRANCE_SESSIONS_DIR - Default value is $prefix/share/xsessions - Can be overwritten with --with-sessions=foobar (incase you install entrance in $prefix=/usr/local, but you session are in /usr/share/bleh) - Update TODO file - ONE MASSIVE todo has basically vanished... hurray! thnx to onefang for the hardwork on ecore_desktop. === RCS file: /cvs/e/e17/apps/entrance/TODO,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- TODO28 Aug 2006 04:12:43 - 1.27 +++ TODO29 Aug 2006 00:29:38 - 1.28 @@ -20,9 +20,6 @@ ESSENTIAL FEATURES --- -*** Create abstracted interface for obtaining system session list. - - Add functions for finding session list on various distributions - - Move entrance-definded sessions out of config into $prefix/share/xsessions/. *** Handle sessions that crash immediately gracefully by providing some kind of custom error message a la GDM * Xinerama - widgets follow mouse pointer from screen to screen === RCS file: /cvs/e/e17/apps/entrance/configure.in,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- configure.in13 Aug 2006 23:46:40 - 1.64 +++ configure.in29 Aug 2006 00:29:38 - 1.65 @@ -191,6 +191,29 @@ AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, $xsession, [Xsession script]) AC_SUBST(xsession) +# what Sessions dir we're using +sessions=$prefix/share/xsessions +if test ! -d $sessions ; then +sessions=/usr/share/xsessions +fi + +AC_ARG_WITH(sessions, + AC_HELP_STRING([--with-sessions=PATH],[Specify the location of sessions .desktop files]), + [ + if test x$withval != xno ; then + sessions=$withval + fi + ] +) +if test ! -d $sessions ; then +AC_MSG_WARN([** $sessions does not exist or is not a directory **]) +AC_MSG_WARN([** Please consider overriding with --with-sessions **]) +fi + +AC_DEFINE_UNQUOTED(ENTRANCE_SESSIONS_DIR, $sessions, [Sessions .desktop directory]) +AC_SUBST(sessions) + + AC_PATH_XTRA EDJE_DEF= @@ -268,6 +291,7 @@ echo Support for shadow authentication ... $have_shadow echo Support for PAM authentication .. $have_pam echo XSession file to use $xsession +echo Sessions dir to use $sessions echo X binaries prefix .. $xbin echo echo Now type 'make' (gmake on some systems) to compile $PACKAGE - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : apps/entrance
Dir : e17/apps/entrance/src/client
Modified Files:
entrance_config.c main.c
Log Message:
Properly init and shutdown ecore_desktop(), this is why we were getting
ecore_hash warnings earlier... naughty me!
===
RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- entrance_config.c 29 Aug 2006 00:29:38 - 1.34
+++ entrance_config.c 29 Aug 2006 01:24:23 - 1.35
@@ -484,6 +484,8 @@
e-sessions.hash =
evas_hash_add(e-sessions.hash, exs-name, exs);
}
+
+ ecore_desktop_destroy(ed);
}
===
RCS file: /cvs/e/e17/apps/entrance/src/client/main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- main.c 12 Aug 2006 15:16:18 - 1.84
+++ main.c 29 Aug 2006 01:24:23 - 1.85
@@ -14,6 +14,7 @@
#include Esmart/Esmart_Text_Entry.h
#include Esmart/Esmart_Container.h
#include Ecore_Config.h
+#include Ecore_Desktop.h
#include entrance.h
#include entrance_session.h
#include entrance_x_session.h
@@ -704,6 +705,14 @@
ecore_shutdown();
return -1;
}
+
+ if(!ecore_desktop_init())
+ {
+ ecore_shutdown();
+ ecore_config_shutdown();
+ return -1;
+ }
+
ecore_app_args_set(argc, (const char **) argv);
/* Set locale to user's environment */
@@ -874,6 +883,7 @@
edje_shutdown();
ecore_evas_shutdown();
ecore_x_shutdown();
+ ecore_desktop_shutdown();
ecore_config_shutdown();
ecore_shutdown();
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
