E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_scrollframe.c Log Message: item -> e.swallow.content (thanks bonelessfrog) === RCS file: /cvs/e/e17/apps/e/src/bin/e_scrollframe.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_scrollframe.c 23 Aug 2006 03:39:02 - 1.12 +++ e_scrollframe.c 24 Aug 2006 04:16:04 - 1.13 @@ -99,7 +99,7 @@ evas_object_smart_callback_add(o, "changed", _e_smart_pan_changed_hook, sd); evas_object_smart_callback_add(o, "changed", _e_smart_pan_pan_changed_hook, sd); evas_object_show(o); - edje_object_part_swallow(sd->edje_obj, "item", o); + edje_object_part_swallow(sd->edje_obj, "e.swallow.content", o); } sd->pan_func.set = e_pan_set; @@ -156,7 +156,7 @@ sd->extern_pan = 1; evas_object_smart_callback_add(sd->pan_obj, "changed", _e_smart_pan_changed_hook, sd); evas_object_smart_callback_add(sd->pan_obj, "pan_changed", _e_smart_pan_pan_changed_hook, sd); - edje_object_part_swallow(sd->edje_obj, "item", sd->pan_obj); + edje_object_part_swallow(sd->edje_obj, "e.swallow.content", sd->pan_obj); evas_object_show(sd->pan_obj); } - 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 rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_scrollframe.edc
Log Message:
item -> e.swallow.content (thanks bonelessfrog)
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_scrollframe.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_scrollframe.edc 23 Aug 2006 03:39:01 - 1.6
+++ default_scrollframe.edc 24 Aug 2006 04:16:04 - 1.7
@@ -55,7 +55,7 @@
}
}
part {
-name: "item";
+name: "e.swallow.content";
clip_to: "clipper";
type: SWALLOW;
mouse_events: 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: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_hints.c
Log Message:
add debug/error catching
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- e_hints.c 6 Jul 2006 06:16:21 - 1.88
+++ e_hints.c 23 Aug 2006 23:24:23 - 1.89
@@ -290,13 +290,12 @@
num += e_container_borders_count(c);
}
}
-
- clients = calloc(num, sizeof(Ecore_X_Window));
- if (!clients)
- return;
if (num > 0)
{
+ clients = calloc(num, sizeof(Ecore_X_Window));
+ if (!clients) return;
+
for (ml = e_manager_list(); ml; ml = ml->next)
{
m = ml->data;
@@ -305,15 +304,35 @@
c = cl->data;
bl = e_container_border_list_first(c);
while ((b = e_container_border_list_next(bl)))
- clients[i++] = b->win;
+ {
+ if (i >= num)
+{
+ e_error_message_show("e_hints.c:
e_hints_client_stacking_set()"
+""
+"Window list size greater than
window count."
+"This is really bad."
+"Please report this.");
+ break;
+}
+ clients[i++] = b->win;
+ }
e_container_border_list_free(bl);
}
}
+ if (i < num)
+ {
+e_error_message_show("e_hints.c: e_hints_client_stacking_set()"
+ ""
+ "Window list size less than window count."
+ "This is strange, but not harmful."
+ "Please report this.");
+ }
for (ml = e_manager_list(); ml; ml = ml->next)
{
m = ml->data;
ecore_x_netwm_client_list_stacking_set(m->root, clients, num);
}
+ E_FREE(clients);
}
else
{
@@ -323,7 +342,6 @@
ecore_x_netwm_client_list_stacking_set(m->root, NULL, 0);
}
}
- E_FREE(clients);
}
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=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 committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit/src/bin Modified Files: exhibit_image.c Log Message: E's desktop bg group changed, now we can set E backgrounds again. rock. === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- exhibit_image.c 15 Aug 2006 22:21:47 - 1.34 +++ exhibit_image.c 23 Aug 2006 21:18:43 - 1.35 @@ -1073,7 +1073,7 @@ roots = ecore_x_window_root_list(&num); ecore_x_window_size_get(roots[0], &w, &h); snprintf(filename_s, PATH_MAX, "/tmp/%s.png", filenoext); - snprintf(static_bg, PATH_MAX, "edje_thumb %s desktop/background %s -g %dx%d -og %dx%d", im->filename, filename_s, w, h, w, h); + snprintf(static_bg, PATH_MAX, "edje_thumb %s e/desktop/background %s -g %dx%d -og %dx%d", im->filename, filename_s, w, h, w, h); snprintf(e_bg_set, PATH_MAX, "enlightenment_remote -default-bg-set %s", im->filename); snprintf(esetroot_s, PATH_MAX, "Esetroot %s %s ", esetroot_opt, filename_s); @@ -1115,7 +1115,7 @@ engrave_file_image_add(edj, image); grp = engrave_group_new(); - engrave_group_name_set(grp, "desktop/background"); + engrave_group_name_set(grp, "e/desktop/background"); engrave_file_group_add(edj, grp); part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE); - 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 committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h buttons.c desktops.c edge.c ewin-ops.c menus.c mod-misc.c
screen.c settings.c
Log Message:
Rename a few configuration items.
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -3 -r1.561 -r1.562
--- E.h 23 Aug 2006 19:06:21 - 1.561
+++ E.h 23 Aug 2006 21:04:53 - 1.562
@@ -251,6 +251,10 @@
} backgrounds;
struct
{
+ int move_resistance;
+ } buttons;
+ struct
+ {
unsigned intnum;
int dragdir;
int dragbar_width;
@@ -262,6 +266,7 @@
int areas_nx;
int areas_ny;
charareas_wraparound;
+ int edge_flip_resistance;
} desks;
struct
{
@@ -329,6 +334,9 @@
int slidespeedcleanup;
charignore_struts;
charraise_fullscreen;
+#ifdef HAS_XINERAMA
+ charextra_head; /* Not used */
+#endif
} place;
struct
{
@@ -341,6 +349,11 @@
} session;
struct
{
+ charanimate;
+ int speed;
+ } shading;
+ struct
+ {
charenable;
int edge_snap_dist;
int screen_snap_dist;
@@ -383,6 +396,7 @@
charwarp_on_select;
int icon_mode;
} warplist;
+
struct
{
charargb_internal_objects;
@@ -391,19 +405,10 @@
charargb_clients_inherit_attr;
charuse_sync;
} testing;
- int deskmode;
- charanimate_shading;
- int shadespeed;
- int button_move_resistance;
+
charautosave;
charmemory_paranoia;
charsave_under;
- int edge_flip_resistance;
-
- /* Not used */
-#ifdef HAS_XINERAMA
- charextra_head; /* Not used */
-#endif
}
EConf;
===
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- buttons.c 24 Jul 2006 21:10:58 - 1.94
+++ buttons.c 23 Aug 2006 21:04:53 - 1.95
@@ -584,8 +584,8 @@
x = -x;
if (y < 0)
y = -y;
- if ((x > Conf.button_move_resistance) ||
- (y > Conf.button_move_resistance))
+ if ((x > Conf.buttons.move_resistance) ||
+ (y > Conf.buttons.move_resistance))
Mode_buttons.move_pending = 0;
Mode_buttons.action_inhibit = 1;
}
===
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -3 -r1.248 -r1.249
--- desktops.c 8 Aug 2006 03:58:42 - 1.248
+++ desktops.c 23 Aug 2006 21:04:53 - 1.249
@@ -2492,10 +2492,10 @@
{
if (tmp_edge_resist < 1)
tmp_edge_resist = 1;
-Conf.edge_flip_resistance = tmp_edge_resist;
+Conf.desks.edge_flip_resistance = tmp_edge_resist;
}
else
- Conf.edge_flip_resistance = 0;
+ Conf.desks.edge_flip_resistance = 0;
EdgeWindowsShow();
}
autosave();
@@ -2573,7 +2573,7 @@
chars[64];
tmp_area_wraparound = Conf.desks.areas_wraparound;
- tmp_edge_resist = Conf.edge_flip_resistance;
+ tmp_edge_resist = Conf.desks.edge_flip_resistance;
if (tmp_edge_resist == 0)
tmp_edge_flip = 0;
else
@@ -2927,6 +2927,7 @@
CFG_FUNC_INT(Conf.desks, areas_nx, 2, AreasCfgFuncSizeX),
CFG_FUNC_INT(Conf.desks, areas_ny, 1, AreasCfgFuncSizeY),
CFG_ITEM_BOOL(Conf.desks, areas_wraparound, 0),
+ CFG_ITEM_INT(Conf.desks, edge_flip_resistance, 25),
};
#define N_CFG_ITEMS (sizeof(DesksCfgItems)/sizeof(CfgItem))
===
RCS file: /cvs/e/e16/e/src/edge.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- edge.c 29 Apr 2006 19:39:20 - 1.30
+++ edge.c 23 Aug 2006 21:04:53 - 1.31
@@ -41,7 +41,7 @@
if (MenusActive())
return;
- if (!Conf.edge_flip_resistance)
+ if (!Conf.desks.edge_flip_resistance)
return;
/* Quit if pointer has left screen */
@@ -110,14 +110,14 @@
#if 0
Eprintf("EdgeEvent %d -> %d\n", lastdir, dir);
#endif
- if (lastdir == dir || !Conf.edge_flip_resistance)
+ if (lastdir == dir || !Conf.desks.edge_flip_resistance)
return;
RemoveTimerEvent("EDGE_TIMEOUT");
if (dir >= 0)
{
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
egui_graphics_selector.c egui_settings.c main.c
Log Message:
removed objects like Entrance_List, etc... Cleanup tomorrow
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_selector.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- egui_graphics_selector.c23 Aug 2006 02:10:49 - 1.11
+++ egui_graphics_selector.c23 Aug 2006 19:11:25 - 1.12
@@ -24,11 +24,11 @@
static char* _gs_populate_list(void);
static void _gs_load_preview(const char *);
-static Entrance_Dialog win;
-static Entrance_Preview img_preview;
+static Entrance_Widget win;
+static Entrance_Widget img_preview;
static Entrance_Widget pointer_preview;
-static Entrance_List list_thumbs;
-static Entrance_Entry browse_entry;
+static Entrance_Widget list_thumbs;
+static Entrance_Widget browse_entry;
static Entrance_Widget browse_button;
static Entrance_Widget pointer_browse_button;
static Entrance_Widget group_graphics;
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_settings.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- egui_settings.c 18 Aug 2006 04:51:53 - 1.3
+++ egui_settings.c 23 Aug 2006 19:11:25 - 1.4
@@ -28,7 +28,7 @@
static Entrance_Widget _item_build(Egui_Settings_Item);
-static Entrance_Dialog win;
+static Entrance_Widget win;
static Ecore_List *items;
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- main.c 23 Aug 2006 02:10:49 - 1.13
+++ main.c 23 Aug 2006 19:11:25 - 1.14
@@ -7,7 +7,7 @@
static void _main_dialog_show(void);
static void _close_button_cb(void *, void *);
-static Entrance_Dialog dialog;
+static Entrance_Widget dialog;
int
@@ -34,7 +34,7 @@
dialog = ew_dialog_new(_("Entrance Configuration"), EW_TRUE);
const char* edjefile = PACKAGE_DATA_DIR"/icons/icons.edj";
- Entrance_List tree = ew_edjelist_new("Configuration", 320, 240, 52,
90);
+ Entrance_Widget tree = ew_edjelist_new("Configuration", 320, 240,
52, 90);
ew_edjelist_add(tree, _("Theme"), edjefile, "icons/main/theme", NULL, 0,
egui_theme_dialog_show);
ew_edjelist_add(tree, _("Background"), edjefile, "icons/main/background",
NULL, 0, egui_background_dialog_show);
ew_edjelist_add(tree, _("Behavior"), edjefile, "icons/main/behavior", NULL,
0, egui_behavior_dialog_show);
-
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 rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: removed objects like Entrance_List, etc... Cleanup tomorrow === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- TODO23 Aug 2006 13:06:31 - 1.18 +++ TODO23 Aug 2006 19:11:25 - 1.19 @@ -16,10 +16,10 @@ - Modify egui_graphics_selector and see if it can also inherit from egui_settings - There's a todo above some commented code in egui_graphics_selector.c related to making the preview even more awesome. - We should have a way to show a COMPLETE entrance preview i think in the main ui screen or something, that shows the greetings, etc... so when we change stuff, we can see how it looks like. This is different from the theme and background previews, which only show what the theme and background look like, but hey, maybe we should combine them? Dunno... not critical, just a nice to have feature. +- If we click on a file in the file selector let it appear in the Preview object of the theme/background dialog. ***SHOW STOPPERS - TOP PRIORITY -- API cleanup, get rid of Entrance_Entry, Entrance_List, and object types like those. Let everything be Entrance_Widget. - egui_settings.c currently doesn't save back to ecore_properly. there is something wrong when trying to retrieve tack the *item from the global *items list; i'm too sleepy to do this now. Correct this first, then move over behavior.c to use this. - fileselector integration into theme and background dialogs. - Entrance_List needs to be refactored to use as common a base as possible. Also, we need to select the first row by default when adding to a list. - 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 rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c _ew_list.h ew.c ew.h ew_dialog.c ew_dialog.h
ew_edjelist.c ew_edjelist.h ew_entry.c ew_entry.h
ew_fileselector.c ew_fileselector.h ew_messagebox.c
ew_messagebox.h ew_notice.c ew_notice.h ew_preview.c
ew_preview.h ew_textlist.c ew_textlist.h
Log Message:
removed objects like Entrance_List, etc... Cleanup tomorrow
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- _ew_list.c 16 Aug 2006 12:52:01 - 1.7
+++ _ew_list.c 23 Aug 2006 19:11:25 - 1.8
@@ -3,24 +3,10 @@
static void _ew_list_cb_row_clicked(Etk_Object *, Etk_Tree_Row *,
Etk_Event_Mouse_Up_Down *, void *);
-Entrance_List
-__ew_list_new(void)
-{
- Entrance_List el = calloc(1, sizeof(*el));
- if(el)
- {
- el->owner = NULL;
- el->box = NULL;
- el->col = NULL;
- }
-
- return el;
-}
-
-Entrance_List
+Entrance_Widget
_ew_list_new(const char *title, int w, int h, int r_h)
{
- Entrance_List ew = __ew_list_new();
+ Entrance_Widget ew = ew_new();
if(!ew) {
return NULL;
}
@@ -39,8 +25,8 @@
}
-Entrance_List
-_ew_list_buildtree(Entrance_List ew)
+Entrance_Widget
+_ew_list_buildtree(Entrance_Widget ew)
{
etk_tree_build(ETK_TREE(ew->owner));
@@ -76,14 +62,14 @@
}
void
-ew_list_first_row_select(Entrance_List el)
+ew_list_first_row_select(Entrance_Widget el)
{
Etk_Tree_Row *row = etk_tree_first_row_get(ETK_TREE(el->owner));
etk_tree_row_select(row);
}
void*
-ew_list_selected_data_get(Entrance_List el)
+ew_list_selected_data_get(Entrance_Widget el)
{
Etk_Tree_Row *row = etk_tree_selected_row_get(ETK_TREE(el->owner));
if(!row) {
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- _ew_list.h 13 Aug 2006 06:17:27 - 1.3
+++ _ew_list.h 23 Aug 2006 19:11:25 - 1.4
@@ -6,35 +6,6 @@
void *data;
} *Entrance_List_Data;
-
-typedef struct _Entrance_List {
- Etk_Widget *owner;
- Etk_Widget *box;
- Etk_Tree_Col *col;
-} *Entrance_List;
-
-
-#define EW_LIST_FREE(ew) if(1) \
-{ \
- if(ew) \
- { \
- if(ew->owner) \
- { \
- free(ew->owner); \
- } \
- if(ew->box) \
- { \
- free(ew->box); \
- } \
- if(ew->col) \
- { \
- free(ew->col); \
- } \
- free(ew); \
- } \
-} \
-else \
-
#define EW_LIST_DATA_FREE(ewld) if(1) \
{ \
if(ewld) \
@@ -49,10 +20,10 @@
else \
-Entrance_List _ew_list_new(const char*, int, int, int);
-Entrance_List _ew_list_buildtree(Entrance_List);
+Entrance_Widget _ew_list_new(const char*, int, int, int);
+Entrance_Widget _ew_list_buildtree(Entrance_Widget);
Entrance_List_Data ew_listdata_new(void);
-void* ew_list_selected_data_get(Entrance_List);
-void ew_list_first_row_select(Entrance_List);
+void* ew_list_selected_data_get(Entrance_Widget);
+void ew_list_first_row_select(Entrance_Widget);
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew.c13 Aug 2006 00:54:58 - 1.2
+++ ew.c23 Aug 2006 19:11:25 - 1.3
@@ -1,7 +1,6 @@
#include
#include "Entrance_Widgets.h"
-
int
ew_init(int *argc, char*** argv)
{
@@ -34,11 +33,15 @@
{
ew->owner = NULL;
ew->box = NULL;
+ ew->hbox = NULL;
+ ew->label = NULL;
+ ew->control = NULL;
+ ew->col = NULL;
+ ew->preview_smart = NULL;
+ ew->extra = NULL;
}
return ew;
}
-
-
/* privates */
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew.h13 Aug 2006 00:54:58 - 1.2
+++ ew.h23 Aug 2006 19:11:25 - 1.3
@@ -4,6 +4,13 @@
typedef struct _Entrance_Widget {
Etk_Widget *owner;
Etk_Widget *box;
+ Etk_Widget *hbox;
+ Etk_Widget *label;
+ Etk_Widget *control;
+
+ Etk_Tree_Col *col;
+ Evas_Object *preview_smart;
+ void *extra;
} *Entrance_Widget;
@@ -11,14 +18,14 @@
{ \
if
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h events.c ewins.h icccm.c mod-misc.c
Log Message:
Shuffle _NET_WM_SYNC_REQUEST support stuff around (still not active).
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -3 -r1.560 -r1.561
--- E.h 24 Jul 2006 21:10:58 - 1.560
+++ E.h 23 Aug 2006 19:06:21 - 1.561
@@ -389,6 +389,7 @@
charargb_internal_clients;
charargb_clients;
charargb_clients_inherit_attr;
+ charuse_sync;
} testing;
int deskmode;
charanimate_shading;
@@ -425,6 +426,9 @@
#ifdef HAS_XINERAMA
charxinerama_active;
#endif
+#if USE_XSYNC
+ XID server_time;
+#endif
} display;
struct
{
@@ -652,6 +656,7 @@
#define EDBUG_TYPE_EVENTS 142
#define EDBUG_TYPE_ICONBOX 143
#define EDBUG_TYPE_VERBOSE 144
+#define EDBUG_TYPE_SYNC 145
int EventDebug(unsigned int type);
voidEventDebugSet(unsigned int type, int value);
===
RCS file: /cvs/e/e16/e/src/events.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- events.c7 Aug 2006 23:19:17 - 1.125
+++ events.c23 Aug 2006 19:06:21 - 1.126
@@ -88,23 +88,27 @@
static void
ExtInitSync(int available)
{
+ int i, num;
+ XSyncSystemCounter *xssc;
+
if (!available)
return;
- if (EventDebug(EDBUG_TYPE_VERBOSE))
+ xssc = XSyncListSystemCounters(disp, &num);
+ for (i = 0; i < num; i++)
{
- int i, num;
- XSyncSystemCounter *xssc;
-
- xssc = XSyncListSystemCounters(disp, &num);
- for (i = 0; i < num; i++)
- {
-Eprintf(" Sync counter %2d: %10s %#lx %#x:%#x\n", i,
-xssc[i].name, xssc[i].counter,
-XSyncValueHigh32(xssc[i].resolution),
-XSyncValueLow32(xssc[i].resolution));
- }
+ if (!strcmp(xssc[i].name, "SERVERTIME"))
+ Mode.display.server_time = xssc[i].counter;
+ if (EventDebug(EDBUG_TYPE_SYNC))
+ Eprintf(" Sync counter %2d: %10s %#lx %#x:%#x\n", i,
+ xssc[i].name, xssc[i].counter,
+ XSyncValueHigh32(xssc[i].resolution),
+ XSyncValueLow32(xssc[i].resolution));
}
+ XSyncFreeSystemCounterList(xssc);
+
+ if (Mode.display.server_time == None)
+ Conf.testing.use_sync = 0;
}
#endif
===
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewins.h 7 Aug 2006 20:26:05 - 1.55
+++ ewins.h 23 Aug 2006 19:06:21 - 1.56
@@ -391,6 +391,12 @@
EWin **EwinListTransients(const EWin * ewin, int *num, int group);
EWin **EwinListTransientFor(const EWin * ewin, int *num);
+/* icccm.c (for now) */
+#if USE_XSYNC
+int EwinSyncRequestSend(EWin * ewin);
+voidEwinSyncRequestWait(EWin * ewin);
+#endif
+
/* session.c */
voidSessionGetInfo(EWin * ewin, Atom atom_change);
===
RCS file: /cvs/e/e16/e/src/icccm.c,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- icccm.c 9 Aug 2006 02:45:02 - 1.128
+++ icccm.c 23 Aug 2006 19:06:21 - 1.129
@@ -29,11 +29,10 @@
#include "session.h"
#include "xwin.h"
#if USE_XSYNC
+#include "timers.h"
#include
#endif
-#undef USE_XSYNC /* No - Not sure this is safe */
-
static void ICCCM_SetIconSizes(void);
void
@@ -264,24 +263,6 @@
if (EwinIsInternal(ewin))
return;
-#if USE_XSYNC
- if (ewin->ewmh.sync_request_enable && !EServerIsGrabbed())
- {
- long long count;
-
- count = ++ewin->ewmh.sync_request_count;
-
- if (count == 0)
- ewin->ewmh.sync_request_count = ++count;
- ecore_x_client_message32_send(EwinGetClientXwin(ewin),
- ECORE_X_ATOM_WM_PROTOCOLS,
- StructureNotifyMask,
- ECORE_X_ATOM_NET_WM_SYNC_REQUEST,
- Mode.events.time,
- count & 0x, count >> 32, 0);
- }
-#endif
-
ev.type = ConfigureNotify;
ev.xconfigure.display = disp;
ev.xconfigure.event = EwinGetClientXwin(ewin);
@@ -306,24 +287,6 @@
ev.xconfigure.above = EoGetXwin(ewin);
ev.xconfigure.override_redirect = False;
XSendEve
E CVS: apps/e sndev
Enlightenment CVS committal Author : sndev Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_mousebindings.c Log Message: do not allow the dialog to be resized. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mousebindings.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_mousebindings.c23 Aug 2006 12:49:11 - 1.1 +++ e_int_config_mousebindings.c23 Aug 2006 17:10:17 - 1.2 @@ -497,8 +497,6 @@ _update_binding_action_list(cfdata); _update_delete_button(cfdata); - - e_dialog_resizable_set(cfd->dia, 1); return ol; } - 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 rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_theme_about.edc
Log Message:
revert over zealous find/replace
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_theme_about.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_theme_about.edc 23 Aug 2006 03:39:01 - 1.6
+++ default_theme_about.edc 23 Aug 2006 14:16:34 - 1.7
@@ -14,7 +14,7 @@
styles
{
style {
- name: "e/theme_about_style";
+ name: "theme_about_style";
base: "font=Edje-Vera style=glow color=#fff glow2_color=#fe87
glow_color=#fa14 font_size=12 align=center wrap=word";
tag: "br" "\n";
-
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 rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_theme.c
Log Message:
fix transitions and shelf style list
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_theme.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_theme.c 23 Aug 2006 03:39:02 - 1.23
+++ e_theme.c 23 Aug 2006 14:00:31 - 1.24
@@ -50,9 +50,9 @@
}
/* Find transitions */
- transitions = _e_theme_collection_items_find("base/theme/transitions",
"transitions");
+ transitions = _e_theme_collection_items_find("base/theme/transitions",
"e/transitions");
borders = _e_theme_collection_items_find("base/theme/borders",
"e/widgets/border");
- shelfs = _e_theme_collection_items_find("base/theme/shelf", "shelf");
+ shelfs = _e_theme_collection_items_find("base/theme/shelf", "e/shelf");
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: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
* [Entry] The entry now supports the keybindings of Emacs. It's disabled
by default.
Since I'm not an Emacs/Jed user, I may have forgotten or miscoded some
important keybindings. I'd be glad if some Emacs/Jed users could tell me
what is wrong. For this, you need to enable the keybindings by changing
the line 47 of e_entry.c:
"static int _e_entry_emacs_keybindings = 0;" --> "static int
_e_entry_emacs_keybindings = 1;"
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_entry.c 23 Aug 2006 10:14:17 - 1.30
+++ e_entry.c 23 Aug 2006 13:39:46 - 1.31
@@ -14,6 +14,7 @@
int enabled;
int focused;
int selection_dragging;
+ int selection_mode;
float valign;
int min_width;
int height;
@@ -25,7 +26,10 @@
static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static int _e_entry_x_selection_notify_handler(void *data, int type, void
*event);
+
static void _e_entry_x_selection_update(Evas_Object *entry);
+static void _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down
*event);
+static void _e_entry_key_down_emacs(Evas_Object *entry, Evas_Event_Key_Down
*event);
static void _e_entry_smart_add(Evas_Object *object);
static void _e_entry_smart_del(Evas_Object *object);
@@ -40,6 +44,7 @@
/* local subsystem globals */
static Evas_Smart *_e_entry_smart = NULL;
static int _e_entry_smart_use = 0;
+static int _e_entry_emacs_keybindings = 0;
/* externally accessible functions */
@@ -195,6 +200,11 @@
evas_object_focus_set(entry, 1);
edje_object_signal_emit(sd->entry_object, "e,state,focused", "e");
+ if (!sd->selection_dragging)
+ {
+e_editable_cursor_move_to_end(sd->editable_object);
+e_editable_selection_move_to_end(sd->editable_object);
+ }
if (sd->enabled)
e_editable_cursor_show(sd->editable_object);
e_editable_selection_show(sd->editable_object);
@@ -220,8 +230,6 @@
evas_object_focus_set(entry, 0);
edje_object_signal_emit(sd->entry_object, "e,state,unfocused", "e");
- e_editable_cursor_move_to_end(sd->editable_object);
- e_editable_selection_move_to_end(sd->editable_object);
e_editable_cursor_hide(sd->editable_object);
e_editable_selection_hide(sd->editable_object);
sd->focused = 0;
@@ -277,9 +285,181 @@
static void
_e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
+ if (_e_entry_emacs_keybindings)
+ _e_entry_key_down_emacs(obj, event_info);
+ else
+ _e_entry_key_down_windows(obj, event_info);
+}
+
+/* Called when the entry object is pressed by the mouse */
+static void
+_e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ E_Entry_Smart_Data *sd;
+ Evas_Event_Mouse_Down *event;
+ Evas_Coord ox, oy;
+ int pos;
+
+ if ((!obj) || (!(sd = evas_object_smart_data_get(obj
+ return;
+ if (!(event = event_info))
+ return;
+
+ evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL, NULL);
+ pos = e_editable_pos_get_from_coords(sd->editable_object,
+event->canvas.x - ox,
+event->canvas.y - oy);
+
+ if (event->button == 1)
+ {
+if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
+ e_editable_select_all(sd->editable_object);
+else
+ {
+ e_editable_cursor_pos_set(sd->editable_object, pos);
+ if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
+ e_editable_selection_pos_set(sd->editable_object, pos);
+
+ sd->selection_dragging = 1;
+ }
+ }
+ else if (event->button == 2)
+ {
+E_Win *win;
+
+e_editable_cursor_pos_set(sd->editable_object, pos);
+e_editable_selection_pos_set(sd->editable_object, pos);
+
+if ((win = e_win_evas_object_win_get(obj)))
+ ecore_x_selection_primary_request(win->evas_win,
+ ECORE_X_SELECTION_TARGET_UTF8_STRING);
+ }
+}
+
+/* Called when the entry object is released by the mouse */
+static void
+_e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ E_Entry_Smart_Data *sd;
+
+ if ((!obj) || (!(sd = evas_object_smart_data_get(obj
+ return;
+
+ if (sd->selection_dragging)
+ {
+sd->selection_dragging = 0;
+_e_entry_x_selection_update(obj);
+ }
+}
+
+/* Called when the mouse moves over the entry object */
+static void
+_e_entry_mouse_move_cb(void *da
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: Behaviour dialog now uses egui_settings. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- TODO23 Aug 2006 02:24:16 - 1.17 +++ TODO23 Aug 2006 13:06:31 - 1.18 @@ -19,10 +19,9 @@ ***SHOW STOPPERS - TOP PRIORITY - - egui_settings.c currently doesn't save back to ecore_properly. there is something wrong when trying to retrieve tack the *item from the global *items list; i'm too sleepy to do this now. Correct this first, then move over behavior.c to use this. -- theme and background dialogs need a way to browse filesystem to grab from arbitrary locations. - - fileselector widget needs to be done. -- Fix up Fileselector widget. This may probably need to refactor out the buttons used by ew_notice as ew_reponse_buttons ? +- API cleanup, get rid of Entrance_Entry, Entrance_List, and object types like those. Let everything be Entrance_Widget. +- egui_settings.c currently doesn't save back to ecore_properly. there is something wrong when trying to retrieve tack the *item from the global *items list; i'm too sleepy to do this now. Correct this first, then move over behavior.c to use this. +- fileselector integration into theme and background dialogs. - Entrance_List needs to be refactored to use as common a base as possible. Also, we need to select the first row by default when adding to a list. Issues that MUST go before tree relocates to entrance's tree - 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 rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
behavior.c
Log Message:
Behaviour dialog now uses egui_settings.
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/behavior.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- behavior.c 18 Aug 2006 04:57:02 - 1.8
+++ behavior.c 23 Aug 2006 13:06:31 - 1.9
@@ -1,329 +1,109 @@
-#include
#include
#include
#include
-
-static void _cb_close(void*, void*);
-static void _cb_apply(void*, void*);
-static void _cb_ok(void*, void*);
-
-static void _close(void);
-static int _apply(void);
-static int _save_to_file(void);
-
-static Entrance_Dialog win;
-
-static Entrance_Widget group_login;
-static Entrance_Widget login_autologin_mode;
-static Entrance_Entry login_autologin_user;
-
-static int val_login_mode;
-static const char* val_login_user;
-
-static void _build_group_login(void);
-static void _load_login(void);
-static void _save_login(void);
-
-static Entrance_Widget group_presel;
-static Entrance_Widget presel_mode;
-static Entrance_Entry presel_prevuser;
-
-static int val_presel_mode;
-static const char* val_presel_prevuser;
-
-static void _build_group_presel(void);
-static void _load_presel(void);
-static void _save_presel(void);
-
-static Entrance_Widget group_remember;
-static Entrance_Widget remember_user_remember;
-static Entrance_Entry remember_remember_count;
-static Entrance_Entry remember_user_count;
-
-static int val_user_remember;
-static int val_user_remember_count;
-static int val_user_count;
-
-static void _build_group_remember(void);
-static void _load_remember(void);
-static void _save_remember(void);
-
-
-static Entrance_Widget group_others;
-static Entrance_Widget others_auth;
-static Entrance_Widget others_engine;
-static Entrance_Widget others_reboot;
-static Entrance_Widget others_halt;
-
-static int val_auth;
-static int val_engine;
-static int val_reboot;
-static int val_halt;
-
-static void _build_group_others(void);
-static void _load_others(void);
-static void _save_others(void);
+#include "Egui.h"
void
egui_behavior_dialog_show() {
- win = ew_dialog_new(_("Entrance Configuration - Behaviour"), EW_FALSE);
-
- _build_group_login();
- _build_group_presel();
- _build_group_remember();
- _build_group_others();
-
- ew_dialog_close_button_add(win, _cb_close, NULL);
- ew_dialog_apply_button_add(win, _cb_apply, NULL);
- ew_dialog_ok_button_add(win, _cb_ok, NULL);
-
- ew_dialog_show(win);
-}
-
-static void
-_build_group_login(void)
-{
- group_login = ew_dialog_group_add(win, _("AutoLogin"),
EW_GROUP_VERTICAL);
-
- val_login_user = NULL;
-
- _load_login();
-
- login_autologin_mode = ew_checkbox_new(_("Enable Autologin"));
- if(val_login_mode)
- ew_checkbox_toggle(login_autologin_mode);
- ew_group_add(group_login, login_autologin_mode);
-
- login_autologin_user = ew_entry_new(_("Autologin User"),
val_login_user, EW_FALSE);
- ew_group_add(group_login, login_autologin_user);
-}
-
-
-static void
-_build_group_presel(void)
-{
- group_presel = ew_dialog_group_add(win, _("Preselect"),
EW_GROUP_VERTICAL);
-
- val_presel_prevuser = NULL;
- _load_presel();
-
- presel_mode = ew_checkbox_new(_("Enable Preselect Mode"));
- if(val_presel_mode)
- ew_checkbox_toggle(presel_mode);
- ew_group_add(group_presel, presel_mode);
-
- presel_prevuser = ew_entry_new(_("Previous Preselect User"),
val_presel_prevuser, EW_FALSE);
- ew_group_add(group_presel, presel_prevuser);
-}
-
-
-
-static void
-_build_group_others(void)
-{
- group_others = ew_dialog_group_add(win, _("Others"), EW_GROUP_VERTICAL);
-
- _load_others();
-
- others_auth = ew_checkbox_new(_("Use Authentication"));
- if(val_auth)
- ew_checkbox_toggle(others_auth);
- ew_group_add(group_others, others_auth);
-
- others_engine = ew_checkbox_new(_("Use Engine"));
- if(val_engine)
- ew_checkbox_toggle(others_engine);
- ew_group_add(group_others, others_engine);
-
- others_reboot = ew_checkbox_new(_("Enable Reboot Button"));
- if(val_reboot)
- ew_checkbox_toggle(others_reboot);
- ew_group_add(group_others, others_reboot);
-
- others_halt = ew_checkbox_new(_("Enable Halt Button"));
- if(val_halt)
- ew_checkbox_toggle(others_halt);
- ew_group_add(group_others, others_halt);
-}
-
-static void
-_build_group_remember(void)
-{
- char str[PATH_MAX];
- group_remember = ew_dialog_group_add(win, _("Remember"),
EW_GROUP_VERTICAL);
-
- _load_remember();
-
- remember_user_remember = ew_checkbox_new(_("Enable User Remember"));
- if(val_user_remember)
-
E CVS: apps/e sndev
Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_icons.edc
Log Message:
New Mouse Bindings dialog. Plz try, test, and let me know, if something
is wrong.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_icons.edc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- default_icons.edc 23 Aug 2006 03:39:01 - 1.24
+++ default_icons.edc 23 Aug 2006 12:49:10 - 1.25
@@ -40,6 +40,12 @@
image: "e17_icon_right_arrow.png" COMP;
image: "e17_icon_up_arrow.png" COMP;
image: "e17_icon_down_arrow.png" COMP;
+
+ image: "e17_icon_mouse_bindings_left.png" COMP;
+ image: "e17_icon_mouse_bindings_middle.png" COMP;
+ image: "e17_icon_mouse_bindings_right.png" COMP;
+ image: "e17_icon_mouse_bindings_scroll_up.png" COMP;
+ image: "e17_icon_mouse_bindings_scroll_down.png" COMP;
image: "e17_shelf_bottom_left.png" COMP;
image: "e17_shelf_bottom.png" COMP;
@@ -612,6 +618,101 @@
max: 64 64;
image {
normal: "e17_icon_mouse.png";
+ }
+}
+ }
+ }
+}
+group {
+ name: "e/icons/enlightenment/mouse_binding_left";
+ max: 64 64;
+ parts {
+ part {
+name: "icon";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ max: 64 64;
+ image {
+ normal: "e17_icon_mouse_bindings_left.png";
+ }
+}
+ }
+ }
+}
+group {
+ name: "e/icons/enlightenment/mouse_binding_middle";
+ max: 64 64;
+ parts {
+ part {
+name: "icon";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ max: 64 64;
+ image {
+ normal: "e17_icon_mouse_bindings_middle.png";
+ }
+}
+ }
+ }
+}
+group {
+ name: "e/icons/enlightenment/mouse_binding_right";
+ max: 64 64;
+ parts {
+ part {
+name: "icon";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ max: 64 64;
+ image {
+ normal: "e17_icon_mouse_bindings_right.png";
+ }
+}
+ }
+ }
+}
+group {
+ name: "e/icons/enlightenment/mouse_binding_scroll_up";
+ max: 64 64;
+ parts {
+ part {
+name: "icon";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ max: 64 64;
+ image {
+ normal: "e17_icon_mouse_bindings_scroll_up.png";
+ }
+}
+ }
+ }
+}
+group {
+ name: "e/icons/enlightenment/mouse_binding_scroll_down";
+ max: 64 64;
+ parts {
+ part {
+name: "icon";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ max: 64 64;
+ image {
+ normal: "e17_icon_mouse_bindings_scroll_down.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
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 sndev
Enlightenment CVS committal Author : sndev Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Modified Files: Makefile.am Added Files: e17_icon_mouse_bindings_left.png e17_icon_mouse_bindings_middle.png e17_icon_mouse_bindings_right.png e17_icon_mouse_bindings_scroll_down.png e17_icon_mouse_bindings_scroll_up.png Log Message: New Mouse Bindings dialog. Plz try, test, and let me know, if something is wrong. === RCS file: /cvs/e/e17/apps/e/data/themes/images/Makefile.am,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- Makefile.am 23 Aug 2006 00:42:16 - 1.69 +++ Makefile.am 23 Aug 2006 12:49:10 - 1.70 @@ -314,6 +314,11 @@ e17_icon_window_focus.png \ e17_icon_lost_windows.png \ e17_icon_screen_resolution.png \ +e17_icon_mouse_bindings_left.png \ +e17_icon_mouse_bindings_middle.png \ +e17_icon_mouse_bindings_right.png \ +e17_icon_mouse_bindings_scroll_up.png \ +e17_icon_mouse_bindings_scroll_down.png \ e17_pointer.png \ e17_pointer_mono.png \ e17_dialog_watermark.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 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 sndev
Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_configure.c e_includes.h
Added Files:
e_int_config_mousebindings.c e_int_config_mousebindings.h
Log Message:
New Mouse Bindings dialog. Plz try, test, and let me know, if something
is wrong.
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- Makefile.am 22 Aug 2006 00:56:03 - 1.143
+++ Makefile.am 23 Aug 2006 12:49:11 - 1.144
@@ -132,6 +132,7 @@
e_int_config_icon_themes.h \
e_int_config_menus.h \
e_int_config_keybindings.h \
+e_int_config_mousebindings.h \
e_int_config_cursor.h \
e_int_config_fonts.h \
e_int_config_startup.h \
@@ -283,6 +284,7 @@
e_int_config_icon_themes.c \
e_int_config_menus.c \
e_int_config_keybindings.c \
+e_int_config_mousebindings.c \
e_int_config_cursor.c \
e_int_config_fonts.c \
e_int_config_startup.c \
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_configure.c 23 Aug 2006 03:39:01 - 1.53
+++ e_configure.c 23 Aug 2006 12:49:11 - 1.54
@@ -80,6 +80,7 @@
e_configure_header_item_add(eco, "enlightenment/behavior", _("Behavior"));
e_configure_standard_item_add(eco, "enlightenment/focus", _("Window
Focus"), e_int_config_focus);
e_configure_standard_item_add(eco, "enlightenment/keys", _("Key Bindings"),
e_int_config_keybindings);
+ e_configure_standard_item_add(eco, "enlightenment/mouse_binding_left",
_("Mouse Bindings"), e_int_config_mousebindings);
e_configure_standard_item_add(eco, "enlightenment/menus", _("Menus"),
e_int_config_menus);
e_configure_header_item_add(eco, "enlightenment/misc", _("Miscellaneous"));
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- e_includes.h22 Aug 2006 00:56:03 - 1.122
+++ e_includes.h23 Aug 2006 12:49:11 - 1.123
@@ -105,6 +105,7 @@
#include "e_int_config_icon_themes.h"
#include "e_int_config_menus.h"
#include "e_int_config_keybindings.h"
+#include "e_int_config_mousebindings.h"
#include "e_int_config_cursor.h"
#include "e_int_config_fonts.h"
#include "e_int_config_startup.h"
-
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 rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: Entrance_Widgets.h Makefile.am Added Files: ew_fileselector.c ew_fileselector.h Log Message: File selector dialog. Haven't tested yet, though === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Entrance_Widgets.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Entrance_Widgets.h 23 Aug 2006 02:10:49 - 1.8 +++ Entrance_Widgets.h 23 Aug 2006 11:55:40 - 1.9 @@ -18,5 +18,6 @@ #include "ew_radio_button.h" #include "ew_toggle_button.h" #include "ew_checkbox.h" +#include "ew_fileselector.h" #endif === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 23 Aug 2006 02:10:49 - 1.9 +++ Makefile.am 23 Aug 2006 11:55:40 - 1.10 @@ -8,6 +8,7 @@ \ ew_dialog.h \ ew_notice.h \ + ew_fileselector.h \ \ ew_group.h \ \ @@ -33,12 +34,13 @@ libentrance_widgets_la_SOURCES = \ ew.c \ ew_dialog.c \ + ew_notice.c \ + ew_fileselector.c \ ew_group.c \ _ew_list.c \ ew_textlist.c \ ew_edjelist.c \ ew_image.c \ - ew_notice.c \ ew_messagebox.c \ ew_preview.c \ ew_label.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=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/evfs chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : apps/evfs Dir : e17/apps/evfs/src/common Modified Files: evfs_io.c Log Message: * Treat certain files in samba as dirs (servers,workgroups). This allows network browsing. We should probably send attach hints with these files, so the filemanager can select an appropriate icon * Prepare for trash restore - IO functions === RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_io.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- evfs_io.c 19 Aug 2006 02:58:07 - 1.67 +++ evfs_io.c 23 Aug 2006 11:29:32 - 1.68 @@ -700,6 +700,7 @@ case EVFS_CMD_METADATA_GROUPS_GET: case EVFS_CMD_METADATA_FILE_GROUP_ADD: case EVFS_CMD_METADATA_FILE_GROUP_REMOVE: + case EVFS_CMD_TRASH_RESTORE: evfs_write_file_command(conn, command); break; case EVFS_CMD_OPERATION_RESPONSE: @@ -765,6 +766,7 @@ case EVFS_CMD_METADATA_GROUPS_GET: case EVFS_CMD_METADATA_FILE_GROUP_ADD: case EVFS_CMD_METADATA_FILE_GROUP_REMOVE: + case EVFS_CMD_TRASH_RESTORE: evfs_write_file_command_client(client, command); break; default: - 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/evfs chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : apps/evfs Dir : e17/apps/evfs/src/include Modified Files: evfs_command.h Log Message: * Treat certain files in samba as dirs (servers,workgroups). This allows network browsing. We should probably send attach hints with these files, so the filemanager can select an appropriate icon * Prepare for trash restore - IO functions === RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_command.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- evfs_command.h 17 Jul 2006 14:45:09 - 1.14 +++ evfs_command.h 23 Aug 2006 11:29:32 - 1.15 @@ -26,7 +26,8 @@ EVFS_CMD_METADATA_FILE_GET = 18, EVFS_CMD_METADATA_GROUPS_GET = 19, EVFS_CMD_METADATA_FILE_GROUP_ADD = 20, - EVFS_CMD_METADATA_FILE_GROUP_REMOVE = 21 + EVFS_CMD_METADATA_FILE_GROUP_REMOVE = 21, + EVFS_CMD_TRASH_RESTORE } evfs_command_type; - 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/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/lib
Modified Files:
evfs_commands.c
Log Message:
* Treat certain files in samba as dirs (servers,workgroups). This allows
network browsing. We should probably send attach hints with these files, so
the filemanager can select an appropriate icon
* Prepare for trash restore - IO functions
===
RCS file: /cvs/e/e17/apps/evfs/src/lib/evfs_commands.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- evfs_commands.c 15 Aug 2006 23:32:53 - 1.34
+++ evfs_commands.c 23 Aug 2006 11:29:32 - 1.35
@@ -142,8 +142,7 @@
}
long
-evfs_client_file_copy_multi(evfs_connection * conn, Ecore_List* files,
- evfs_filereference* to)
+evfs_client_multi_file_command(evfs_connection * conn, Ecore_List* files,
evfs_filereference* to, int type)
{
evfs_command *command = evfs_client_command_new();
long id = command->client_identifier;
@@ -154,21 +153,16 @@
count = ecore_list_nodes(files);
- command->type = EVFS_CMD_FILE_COPY;
+ command->type = type;
command->file_command.num_files = count+1;
command->file_command.files = malloc(sizeof(evfs_filereference *) *
(count+1));
- printf("Sending %d files for multi copy...\n", count+1);
ecore_list_goto_first(files);
while ((ref = ecore_list_next(files))) {
command->file_command.files[cfile] = ref;
cfile++;
-
- str = evfs_filereference_to_string(ref);
- printf("Added %s to multi copy\n", str);
- free(str);
}
- command->file_command.files[cfile] = to;
+ if (to) command->file_command.files[cfile] = to;
evfs_write_command(conn, command);
@@ -179,6 +173,27 @@
}
+
+long
+evfs_client_file_copy_multi(evfs_connection * conn, Ecore_List* files,
+ evfs_filereference* to)
+{
+ return evfs_client_multi_file_command(conn,files,to,
EVFS_CMD_FILE_COPY);
+}
+
+long
+evfs_client_file_move_multi(evfs_connection * conn, Ecore_List* files,
+ evfs_filereference* to)
+{
+ return evfs_client_multi_file_command(conn,files,to,
EVFS_CMD_FILE_MOVE);
+}
+
+long
+evfs_client_file_trash_restore(evfs_connection * conn, Ecore_List* files)
+{
+ return evfs_client_multi_file_command(conn,files,NULL,
EVFS_CMD_TRASH_RESTORE);
+}
+
long
evfs_client_file_move(evfs_connection * conn, evfs_filereference * from,
evfs_filereference * to)
@@ -200,48 +215,6 @@
return id;
}
-
-
-/*FIXME: This is dup'ed code from ^^ . Rationalise this*/
-long
-evfs_client_file_move_multi(evfs_connection * conn, Ecore_List* files,
- evfs_filereference* to)
-{
- evfs_command *command = evfs_client_command_new();
- long id = command->client_identifier;
- long count = 0;
- long cfile = 0;
- evfs_filereference* ref;
- char* str;
-
- count = ecore_list_nodes(files);
-
- command->type = EVFS_CMD_FILE_MOVE;
- command->file_command.num_files = count+1;
- command->file_command.files = malloc(sizeof(evfs_filereference *) *
(count+1));
-
- printf("Sending %d files for multi move...\n", count+1);
- ecore_list_goto_first(files);
- while ((ref = ecore_list_next(files))) {
- command->file_command.files[cfile] = ref;
- cfile++;
-
- str = evfs_filereference_to_string(ref);
- printf("Added %s to multi move\n", str);
- free(str);
- }
- command->file_command.files[cfile] = to;
-
- evfs_write_command(conn, command);
-
- free(command->file_command.files);
- free(command);
-
- return id;
-
-}
-
-
long
evfs_client_file_open(evfs_connection * conn, evfs_filereference * file)
-
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/evfs chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : apps/evfs Dir : e17/apps/evfs/src/plugins/file Modified Files: evfs_fs_samba.c Log Message: * Treat certain files in samba as dirs (servers,workgroups). This allows network browsing. We should probably send attach hints with these files, so the filemanager can select an appropriate icon * Prepare for trash restore - IO functions === RCS file: /cvs/e/e17/apps/evfs/src/plugins/file/evfs_fs_samba.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- evfs_fs_samba.c 20 Aug 2006 04:13:57 - 1.7 +++ evfs_fs_samba.c 23 Aug 2006 11:29:32 - 1.8 @@ -332,9 +332,9 @@ else if (entry->smbc_type == SMBC_DIR) reference->file_type = EVFS_FILE_DIRECTORY; else if (entry->smbc_type == SMBC_WORKGROUP) - reference->file_type = EVFS_FILE_SMB_WORKGROUP; + reference->file_type = EVFS_FILE_DIRECTORY; else if (entry->smbc_type == SMBC_SERVER) - reference->file_type = EVFS_FILE_SMB_SERVER; + reference->file_type = EVFS_FILE_DIRECTORY; else if (entry->smbc_type == SMBC_FILE_SHARE) reference->file_type = EVFS_FILE_SMB_FILE_SHARE; else if (entry->smbc_type == SMBC_PRINTER_SHARE) - 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 kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: control Log Message: oops, typo. === RCS file: /cvs/e/e17/apps/e/debian/control,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- control 23 Aug 2006 01:08:36 - 1.18 +++ control 23 Aug 2006 11:17:04 - 1.19 @@ -23,7 +23,7 @@ Section: devel Depends: libevas-dev, libecore-dev, libeet-dev, libembryo-dev, libedje-dev Conflicts: libenlightenment-dev -Provides: e17-devel, efl-devel. efl-dev +Provides: e17-devel, efl-devel, efl-dev Description: Enlightenment headers, static libraries and documentation Headers, static libraries and documentation for enlightenment. - 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 moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_entry.c
Log Message:
* [Entry] Add e_widget_entry_clear()
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_entry.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_widget_entry.c20 Aug 2006 06:42:20 - 1.16
+++ e_widget_entry.c23 Aug 2006 10:51:35 - 1.17
@@ -73,7 +73,7 @@
* @param entry an entry widget
* @param text the text to set
*/
-EAPI void
+EAPI void
e_widget_entry_text_set(Evas_Object *entry, const char *text)
{
E_Widget_Data *wd;
@@ -89,7 +89,7 @@
* @param entry an entry widget
* @return Returns the text of the entry widget
*/
-EAPI const char *
+EAPI const char *
e_widget_entry_text_get(Evas_Object *entry)
{
E_Widget_Data *wd;
@@ -97,6 +97,21 @@
if (!(entry) || (!(wd = e_widget_data_get(entry
return NULL;
return e_entry_text_get(wd->o_entry);
+}
+
+/**
+ * Clears the entry widget
+ *
+ * @param entry an entry widget
+ */
+EAPI void
+e_widget_entry_clear(Evas_Object *entry)
+{
+ E_Widget_Data *wd;
+
+ if (!(entry) || (!(wd = e_widget_data_get(entry
+ return;
+ e_entry_clear(wd->o_entry);
}
/**
-
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 chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_location_add_dialog.c
Log Message:
* Fix add dialog -> new api
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_location_add_dialog.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_location_add_dialog.c 16 Aug 2006 01:20:53 - 1.12
+++ etk_location_add_dialog.c 23 Aug 2006 10:45:26 - 1.13
@@ -219,7 +219,7 @@
etk_object_data_set(ETK_OBJECT(button), "uri", key);
etk_signal_connect("pressed", ETK_OBJECT(button),
ETK_CALLBACK(_entropy_etk_location_radio_cb), dialog );
- etk_box_pack_start(ETK_BOX(dialog->vbox1), button, ETK_TRUE,
ETK_TRUE, 10);
+ etk_box_append(ETK_BOX(dialog->vbox1), button, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 10);
}
ecore_list_destroy(filesystems);
@@ -291,15 +291,15 @@
dialog_button = etk_button_new_with_label("Next >");
- etk_box_pack_start(ETK_BOX(hbox), dialog_button, ETK_FALSE, ETK_FALSE,
5);
+ etk_box_append(ETK_BOX(hbox), dialog_button, ETK_BOX_START,
ETK_BOX_NONE, 5);
etk_signal_connect("clicked", ETK_OBJECT(dialog_button),
ETK_CALLBACK(_location_add_next_cb), dialog);
dialog_button = etk_button_new_with_label("Cancel");
etk_signal_connect("clicked", ETK_OBJECT(dialog_button),
ETK_CALLBACK(_entropy_etk_location_cancel_cb), dialog);
- etk_box_pack_start(ETK_BOX(hbox), dialog_button, ETK_FALSE, ETK_FALSE,
5);
+ etk_box_append(ETK_BOX(hbox), dialog_button, ETK_FALSE, ETK_FALSE, 5);
- etk_box_pack_start(ETK_BOX(outer_vbox), hbox, ETK_FALSE, ETK_FALSE, 5);
+ etk_box_append(ETK_BOX(outer_vbox), hbox, ETK_BOX_START, ETK_BOX_NONE,
5);
etk_widget_show_all(dialog->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: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c e_entry.c
Log Message:
* [Entry] X selection support
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_editable.c23 Aug 2006 09:41:19 - 1.11
+++ e_editable.c23 Aug 2006 10:14:17 - 1.12
@@ -919,8 +919,7 @@
&cx, &cy, NULL, &ch);
evas_object_move(sd->cursor_object, tx + cx, ty + cy);
- /* TODO: cursor_width */
- evas_object_resize(sd->cursor_object, 1, ch);
+ evas_object_resize(sd->cursor_object, sd->cursor_width, ch);
if (sd->cursor_visible && evas_object_visible_get(editable))
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_entry.c 23 Aug 2006 03:39:01 - 1.29
+++ e_entry.c 23 Aug 2006 10:14:17 - 1.30
@@ -24,7 +24,8 @@
static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static int _e_entry_selection_notify_handler(void *data, int type, void
*event);
+static int _e_entry_x_selection_notify_handler(void *data, int type, void
*event);
+static void _e_entry_x_selection_update(Evas_Object *entry);
static void _e_entry_smart_add(Evas_Object *object);
static void _e_entry_smart_del(Evas_Object *object);
@@ -248,7 +249,6 @@
}
-
/**
* Disables the entry object: the user won't be able to type anymore. Selection
* will still be possible (to copy the text)
@@ -284,6 +284,7 @@
int start_pos, end_pos;
int selecting;
int changed = 0;
+ int selection_changed = 0;
char *range;
E_Win *win;
@@ -303,7 +304,10 @@
if (strcmp(event->key, "Left") == 0)
{
if (evas_key_modifier_is_set(event->modifiers, "Shift"))
- e_editable_cursor_move_left(editable);
+ {
+ e_editable_cursor_move_left(editable);
+ selection_changed = 1;
+ }
else if (selecting)
{
if (cursor_pos < selection_pos)
@@ -322,7 +326,10 @@
else if (strcmp(event->key, "Right") == 0)
{
if (evas_key_modifier_is_set(event->modifiers, "Shift"))
- e_editable_cursor_move_right(editable);
+ {
+ e_editable_cursor_move_right(editable);
+ selection_changed = 1;
+ }
else if (selecting)
{
if (cursor_pos > selection_pos)
@@ -344,6 +351,8 @@
if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
e_editable_selection_pos_set(editable,
e_editable_cursor_pos_get(editable));
+else
+ selection_changed = 1;
}
/* Move the cursor/selection to the end of the entry */
else if (strcmp(event->keyname, "End") == 0)
@@ -352,6 +361,8 @@
if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
e_editable_selection_pos_set(editable,
e_editable_cursor_pos_get(editable));
+else
+ selection_changed = 1;
}
/* Remove the previous character */
else if ((sd->enabled) && (strcmp(event->keyname, "BackSpace") == 0))
@@ -373,7 +384,10 @@
else if (evas_key_modifier_is_set(event->modifiers, "Control"))
{
if (strcmp(event->keyname, "a") == 0)
- e_editable_select_all(editable);
+ {
+ e_editable_select_all(editable);
+ selection_changed = 1;
+ }
else if ((strcmp(event->keyname, "x") == 0) ||
(strcmp(event->keyname, "c") == 0))
{
@@ -410,6 +424,8 @@
if (changed)
evas_object_smart_callback_call(obj, "changed", NULL);
+ if (selection_changed)
+ _e_entry_x_selection_update(obj);
}
/* Called when the entry object is pressed by the mouse */
@@ -426,26 +442,35 @@
if (!(event = event_info))
return;
+ evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL, NULL);
+ pos = e_editable_pos_get_from_coords(sd->editable_object,
+event->canvas.x - ox,
+event->canvas.y - oy);
+
if (event->button == 1)
{
if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
e_editable_select_all(sd->editable_object);
else
{
- evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL,
NULL);
- pos = e_editable_pos_get_from_co
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c
Log Message:
* [Entry] The entry now works with UTF-8 char
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_editable.c22 Aug 2006 07:39:10 - 1.10
+++ e_editable.c23 Aug 2006 09:41:19 - 1.11
@@ -43,6 +43,7 @@
static void _e_editable_selection_update(Evas_Object *editable);
static void _e_editable_text_update(Evas_Object *editable);
static void _e_editable_text_position_update(Evas_Object *editable, Evas_Coord
real_w);
+static int _e_editable_char_geometry_get_from_pos(Evas_Object *editable, int
utf_pos, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
static void _e_editable_smart_add(Evas_Object *object);
static void _e_editable_smart_del(Evas_Object *object);
@@ -689,7 +690,7 @@
* @param x the x coord, relative to the editable object
* @param y the y coord, relative to the editable object
* @return Returns the position where to place the cursor according to the
- * given coords, or -1 on failure
+ * given coords
*/
EAPI int
e_editable_pos_get_from_coords(Evas_Object *editable, Evas_Coord x, Evas_Coord
y)
@@ -700,12 +701,13 @@
Evas_Coord tx, ty, tw, th;
Evas_Coord cx, cw;
Evas_Coord canvas_x, canvas_y;
- int pos;
+ int index, pos, i, j;
+ const char *text;
if ((!editable) || (!(sd = evas_object_smart_data_get(editable
- return -1;
+ return 0;
if (!(text_obj = edje_object_part_object_get(sd->text_object,
"e.text.text")))
- return -1;
+ return 0;
evas_object_geometry_get(editable, &ox, &oy, NULL, NULL);
evas_object_geometry_get(text_obj, &tx, &ty, &tw, &th);
@@ -718,18 +720,30 @@
pos = sd->unicode_length;
else
{
-pos = evas_object_text_char_coords_get(text_obj,
+index = evas_object_text_char_coords_get(text_obj,
canvas_x - tx, canvas_y - ty,
&cx, NULL, &cw, NULL);
-if (pos >= 0)
+text = evas_object_text_text_get(text_obj);
+if ((index >= 0) && (text))
{
if ((canvas_x - tx) > (cx + (cw / 2)))
- pos++;
+ index++;
+
+ i = 0;
+ j = -1;
+ pos = 0;
+ while ((i < index) && (j != i))
+ {
+ pos++;
+ j = i;
+ i = evas_string_char_next_get(text, i, NULL);
+ }
+
if (pos > sd->unicode_length)
pos = sd->unicode_length;
}
else
- pos = -1;
+ pos = 0;
}
return pos;
@@ -901,30 +915,12 @@
return;
evas_object_geometry_get(text_obj, &tx, &ty, NULL, NULL);
+ _e_editable_char_geometry_get_from_pos(editable, sd->cursor_pos,
+ &cx, &cy, NULL, &ch);
- if ((sd->unicode_length <= 0) || (sd->cursor_pos <= 0))
- {
-e_editable_char_size_get(editable, &cw, &ch);
-evas_object_move(sd->cursor_object, tx, ty);
-evas_object_resize(sd->cursor_object, 1, ch);
- }
- else
- {
-if (sd->cursor_pos >= sd->unicode_length)
- {
- evas_object_text_char_pos_get(text_obj, sd->unicode_length - 1,
- &cx, &cy, &cw, &ch);
- evas_object_move(sd->cursor_object, tx + cx + cw - 1, ty + cy);
- evas_object_resize(sd->cursor_object, 1, ch);
- }
-else
- {
- evas_object_text_char_pos_get(text_obj, sd->cursor_pos,
- &cx, &cy, &cw, &ch);
- evas_object_move(sd->cursor_object, tx + cx - 1, ty + cy);
- evas_object_resize(sd->cursor_object, 1, ch);
- }
- }
+ evas_object_move(sd->cursor_object, tx + cx, ty + cy);
+ /* TODO: cursor_width */
+ evas_object_resize(sd->cursor_object, 1, ch);
if (sd->cursor_visible && evas_object_visible_get(editable))
{
@@ -963,38 +959,14 @@
end_pos = (sd->cursor_pos >= sd->selection_pos) ?
sd->cursor_pos : sd->selection_pos;
-/* Position of the start cursor (note, the start cursor can not be at
- * the end of the editable object, and the editable object can not be
- * empty, or it would have returned before)*/
-if (!evas_object_text_char_pos_get(text_obj, start_pos,
- &cx, &cy, &cw, &ch))
- return;
-
-sx = tx + cx - 1;
+_e_editable_char_geometry_get_from_pos(editable, start_pos,
+
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_entry.edc
Log Message:
* Fix entry focus
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_entry.edc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- default_entry.edc 23 Aug 2006 03:39:01 - 1.12
+++ default_entry.edc 23 Aug 2006 08:53:25 - 1.13
@@ -59,16 +59,16 @@
programs {
program {
name: "entry_focus";
- signal: "focus_in";
- source: "";
+ signal: "e,state,focused";
+ source: "e";
action: STATE_SET "focus" 0.0;
transition: DECELERATE 0.2;
target: "entry_focus";
}
program {
name: "entry_unfocus";
- signal: "focus_out";
- source: "";
+ signal: "e,state,unfocused";
+ source: "e";
action: STATE_SET "default" 0.0;
transition: ACCELERATE 0.5;
target: "entry_focus";
-
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 committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_battery.edc
Log Message:
fix battery to work again
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- default_battery.edc 23 Aug 2006 03:39:01 - 1.10
+++ default_battery.edc 23 Aug 2006 08:06:45 - 1.11
@@ -142,7 +142,7 @@
}
}
part {
-name: "reading";
+name: "e.text.reading";
type: TEXT;
effect: SOFT_SHADOW;
clip_to: "fade_clip";
@@ -169,7 +169,7 @@
}
}
part {
-name: "time";
+name: "e.text.time";
type: TEXT;
effect: SOFT_SHADOW;
clip_to: "fade_clip";
@@ -179,11 +179,11 @@
rel1 {
relative: 1.0 1.0;
to_x: "battery";
- to_y: "reading";
+ to_y: "e.text.reading";
}
rel2 {
relative: 1.0 1.0;
- to_y: "reading";
+ to_y: "e.text.reading";
}
color: 255 255 255 255;
color3: 0 0 0 32;
-
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
