E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_box.c ewl_cell.h ewl_config.h ewl_entry.c ewl_entry.h ewl_enums.h ewl_events.h ewl_filelist.c ewl_filelist.h ewl_filelist_column.c ewl_filelist_column.h ewl_filelist_icon.c ewl_filelist_list.c ewl_grid.h ewl_image.h ewl_label.h ewl_model.h ewl_object.h ewl_paned.c ewl_scrollpane.c ewl_scrollpane.h ewl_text.c ewl_tree.c ewl_tree2.h ewl_view.h Log Message: - ScrollPane -> Scrollpane - ScrollPane_Flags -> Scrollpane_Flags - minor formatting - doxy changes === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ewl_box.c 27 Apr 2006 16:02:55 - 1.26 +++ ewl_box.c 11 May 2006 04:01:20 - 1.27 @@ -758,7 +758,7 @@ * When a child gets added to the box update it's size. */ void -ewl_box_child_show_cb(Ewl_Container * c, Ewl_Widget * w) +ewl_box_child_show_cb(Ewl_Container *c, Ewl_Widget *w) { int space = 0; int width, height; @@ -877,7 +877,7 @@ * @brief The container resize callback used by the box */ void -ewl_box_child_resize_cb(Ewl_Container * c, Ewl_Widget * w __UNUSED__, +ewl_box_child_resize_cb(Ewl_Container *c, Ewl_Widget *w __UNUSED__, int size, Ewl_Orientation o) { int align_size, fill_size; === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_cell.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_cell.h 15 Mar 2006 04:03:48 - 1.8 +++ ewl_cell.h 11 May 2006 04:01:20 - 1.9 @@ -19,6 +19,9 @@ */ #define EWL_CELL_TYPE "cell" +/** + * The Ewl_Cell widget + */ typedef struct Ewl_Cell Ewl_Cell; /** === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_config.h28 Mar 2006 12:29:15 - 1.11 +++ ewl_config.h11 May 2006 04:01:20 - 1.12 @@ -7,6 +7,9 @@ * @{ */ +/** + * The Ewl_Config structure + */ typedef struct Ewl_Config Ewl_Config; /** === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- ewl_entry.c 18 Apr 2006 23:21:46 - 1.52 +++ ewl_entry.c 11 May 2006 04:01:20 - 1.53 @@ -471,6 +471,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value + * @brief Moves the cursor to the left of it's current position + */ void ewl_entry_cursor_move_left(Ewl_Entry *e) { @@ -492,6 +497,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value. + * @brief Moves the cursor to the right of its current position + */ void ewl_entry_cursor_move_right(Ewl_Entry *e) { @@ -513,6 +523,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value. + * @brief Moves the cursor up one line from its current position + */ void ewl_entry_cursor_move_up(Ewl_Entry *e) { @@ -529,6 +544,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value. + * @brief Moves the cursor down one line from its current position + */ void ewl_entry_cursor_move_down(Ewl_Entry *e) { @@ -545,6 +565,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value. + * @brief Deletes the character to the left of the cursor + */ void ewl_entry_delete_left(Ewl_Entry *e) { @@ -559,6 +584,11 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +/** + * @param e: The Ewl_Entry to work with + * @return Returns no value. + * @brief Deletes the character to the right of the cursor + */ void ewl_entry_delete_right(Ewl_Entry *e) { @@ -618,6 +648,12 @@ /* * cursor stuff */ + +/** + * @param parent: The parent Ewl_Entry widget + * @return Returns a new Ewl_Entry_Cursor on success or NULL on failure + * @brief Creates and initializes a new Ewl_Entry_Cursor widget + */ Ewl_Widget * ewl_entry_cursor_new(Ewl_Entry *parent) { @@ -639,6 +675,12 @@ DRETURN_PTR(w, DLEVEL_STABLE); } +/** + * @param c: The Ewl_Entry_Cursor to initialize + * @param parent: The parent Ewl_Text widget + * @return Returns TRUE on success or FALSE on failure + * @brief Initializes an Ewl_Entry_Cursor to default values + */ int ewl_entry_cursor_init(Ewl_Entry_Cursor *c, Ewl_Entry *parent) { @@ -661,6 +703,12 @@ DRETURN_INT(TRUE, DLEVEL_STABLE); } +/** + * @param c: Th
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/xrender_x11 Modified Files: evas_engine_xrender.c Log Message: make xrender transforms use 16.16 matrix values (xrender seems infintely mroe happy with this - event hough it is really no different) === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/xrender_x11/evas_engine_xrender.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- evas_engine_xrender.c 5 May 2006 22:55:04 - 1.6 +++ evas_engine_xrender.c 11 May 2006 00:24:48 - 1.7 @@ -349,17 +349,17 @@ } else { - xf.matrix[0][0] = 1; + xf.matrix[0][0] = 1 << 16; xf.matrix[0][1] = 0; xf.matrix[0][2] = 0; xf.matrix[1][0] = 0; - xf.matrix[1][1] = 1; + xf.matrix[1][1] = 1 << 16; xf.matrix[1][2] = 0; xf.matrix[2][0] = 0; xf.matrix[2][1] = 0; - xf.matrix[2][2] = 1; + xf.matrix[2][2] = 1 << 16; if ((srs->alpha) || (a != 0xff)) trs = _xr_render_surface_new(srs->xinf, sw + 1, sh + 1, srs->xinf->fmt32, 1); @@ -380,7 +380,7 @@ } } } - +/* sf = MAX(sw, sh); #define BMAX 26 if (sf <= 8) sf = 1 << (BMAX - 3); @@ -396,18 +396,22 @@ else if (sf <= 8192 ) sf = 1 << (BMAX - 13); else if (sf <= 16384) sf = 1 << (BMAX - 14); else sf = 1 << (BMAX - 15); +*/ - xf.matrix[0][0] = (sf * sw) / w; +// xf.matrix[0][0] = (sf * sw) / w; + xf.matrix[0][0] = (sw << 16) / w; xf.matrix[0][1] = 0; xf.matrix[0][2] = 0; xf.matrix[1][0] = 0; - xf.matrix[1][1] = (sf * sh) / h; +// xf.matrix[1][1] = (sf * sh) / h; + xf.matrix[1][1] = (sh << 16) / h; xf.matrix[1][2] = 0; xf.matrix[2][0] = 0; xf.matrix[2][1] = 0; - xf.matrix[2][2] = sf; + xf.matrix[2][2] = 1 << 16; +// xf.matrix[2][2] = sf; _xr_render_surface_clips_set(drs, dc, x, y, w, h); if (trs) @@ -431,6 +435,8 @@ XRenderSetPictureTransform(srs->xinf->disp, srs->pic, &xf); XRenderComposite(srs->xinf->disp, op, srs->pic, mask, drs->pic, +// (sx * w) / sw, +// (sy * h) / sh, ((sx * w) + (sw / 2)) / sw, ((sy * h) + (sh / 2)) / sh, 0, 0, x, y, w, 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: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: .cvsignore Log Message: .cvsignore --- 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_modules sndev
Enlightenment CVS committal Author : sndev Module : e_modules Dir : e_modules Modified Files: README Log Message: Adding new 'language' module. === RCS file: /cvs/e/e_modules/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- README 12 Apr 2006 10:40:24 - 1.2 +++ README 10 May 2006 22:52:56 - 1.3 @@ -10,6 +10,8 @@ flame - A module to display flames on the desktop. +language - A module to control active keyboard/keyboard layout/layout variant. + mbar - A module to mount/unmount drives or devices. mem - A module to monitor memory and swap usage. --- 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: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in e_mod_config.c e_mod_config.h e_mod_keybind.c e_mod_keybind.h e_mod_lang.c e_mod_lang.h e_mod_main.c e_mod_main.h language.edc language.png module_icon.png Log Message: Starting a new 'language' module. This module will allow to control the keyboard layout, keyboard model, and keyboard layout variant. All this parameters correspond to setxkbmap program -model, -layout, -variant options. Moreover, the module will provide a visual control of the current input language (keyboard model, keyboard layout, keyboard layout variant). For now, this is only a skeleton version of the module. However, it is already provides some functionality : 1. visual gadget. 2. registered key bindings. 3. a skeleton config dialog. So, comments from everybody are welcome. --- 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: iconify.c Log Message: Attempt to fix occasional crashing of clients with systray window on e16 exit. === RCS file: /cvs/e/e16/e/src/iconify.c,v retrieving revision 1.204 retrieving revision 1.205 diff -u -3 -r1.204 -r1.205 --- iconify.c 3 May 2006 20:52:15 - 1.204 +++ iconify.c 10 May 2006 22:42:27 - 1.205 @@ -2620,6 +2620,7 @@ /* * System tray functions */ +#define DEBUG_SYSTRAY 0 /* Selection atoms */ static Atom E_XA_MANAGER = 0; @@ -2635,7 +2636,7 @@ static Win systray_sel_win = NoWin; static Time systray_sel_time = 0; -static void SystrayEvent(Win win, XEvent * ev, void *prm); +static void SystrayItemEvent(Win win, XEvent * ev, void *prm); #define SYSTEM_TRAY_REQUEST_DOCK0 #define SYSTEM_TRAY_BEGIN_MESSAGE 1 @@ -2695,6 +2696,44 @@ return -1; } +static Win +IconboxObjSwinManage(Iconbox * ib, Window xwin) +{ + Win win; + +#if DEBUG_SYSTRAY + Eprintf("IconboxObjSwinManage %#lx\n", xwin); +#endif + win = ERegisterWindow(xwin); + if (win == NoWin) + return win; + + ESelectInput(win, StructureNotifyMask | PropertyChangeMask); + EventCallbackRegister(win, 0, SystrayItemEvent, ib); + EReparentWindow(win, ib->icon_win, 0, 0); + XAddToSaveSet(disp, xwin); + + return win; +} + +static void +IconboxObjSwinUnmanage(Iconbox * ib, Win win, int gone) +{ +#if DEBUG_SYSTRAY + Eprintf("IconboxObjSwinUnmanage %#lx gone=%d\n", WinGetXwin(win), gone); +#endif + EventCallbackUnregister(win, 0, SystrayItemEvent, ib); + EUnregisterWindow(win); + + if (gone) + return; + + ESelectInput(win, NoEventMask); + EUnmapWindow(win); + EReparentWindow(win, VRoot.win, 0, 0); + XRemoveFromSaveSet(disp, Xwin(win)); +} + static void IconboxObjSwinAdd(Iconbox * ib, Window xwin) { @@ -2724,10 +2763,6 @@ break; } - win = ERegisterWindow(xwin); - if (win == NoWin) - return; - swin = Emalloc(sizeof(SWin)); if (!swin) goto bail_out; @@ -2735,13 +2770,12 @@ if (IconboxObjectAdd(ib, swin) < 0) goto bail_out; + win = IconboxObjSwinManage(ib, xwin); + if (win == NoWin) + goto bail_out; + swin->win = win; swin->mapped = (xembed_info[1] & XEMBED_MAPPED) != 0; - - ESelectInput(win, PropertyChangeMask); - EventCallbackRegister(win, 0, SystrayEvent, ib); - EReparentWindow(win, ib->icon_win, 0, 0); - if (swin->mapped) EMapWindow(win); @@ -2756,12 +2790,14 @@ bail_out: EUngrabServer(); - if (swin) - Efree(swin); + if (!swin) + return; + IconboxObjectDel(ib, swin); + Efree(swin); } static void -IconboxObjSwinDel(Iconbox * ib, Window win) +IconboxObjSwinDel(Iconbox * ib, Window win, int gone) { int i; SWin *swin; @@ -2775,6 +2811,8 @@ if (IconboxObjectDel(ib, swin) == 0) IconboxRedraw(ib); + IconboxObjSwinUnmanage(ib, swin->win, gone); + Efree(swin); } @@ -2827,14 +2865,7 @@ Eprintf("IconboxObjSwinFree %#lx\n", Xwin(swin->win)); if (disp) - { - EventCallbackUnregister(swin->win, 0, SystrayEvent, ib); - EUnregisterWindow(swin->win); - - EUnmapWindow(swin->win); - EReparentWindow(swin->win, VRoot.win, 0, 0); - ESync(); - } + IconboxObjSwinUnmanage(ib, swin->win, 0); Efree(swin); } @@ -2880,13 +2911,33 @@ } static void -SystrayEvent(Win _win __UNUSED__, XEvent * ev, void *prm) +SystraySelectionEvent(Win win __UNUSED__, XEvent * ev, void *prm) { - Window win; + if (EventDebug(EDBUG_TYPE_ICONBOX)) + Eprintf("SystraySelectionEvent %2d %#lx\n", ev->type, ev->xany.window); + switch (ev->type) + { + default: + Eprintf(" ??? SystraySelectionEvent %2d %#lx\n", ev->type, + ev->xany.window); + break; + + case ClientMessage: + SystrayEventClientMessage(prm, &(ev->xclient)); + break; + } +} + +static void +SystrayEvent(Win _win __UNUSED__, XEvent * ev, void *prm __UNUSED__) +{ if (EventDebug(EDBUG_TYPE_ICONBOX)) Eprintf("SystrayEvent %2d %#lx\n", ev->type, ev->xany.window); +#if 0 /* FIXME - Need this one at all? ConfigureRequest? */ + Window win; + switch (ev->type) { case MapNotify: @@ -2906,6 +2957,38 @@ win = ev->xreparent.window; goto do_terminate; + do_terminate: + IconboxObjSwinDel(prm, win); + break; + } +#endif +} + +static void +SystrayItemEvent(Win win, XEvent * ev, void *prm) +{ + Iconbox*ib = prm; + + if (EventDebug(EDBUG_TYPE_ICONBOX)) + Eprintf("SystrayItemEvent %2d %#lx\n", ev->type, ev->xany.window); + + switch (ev->type) + { + case MapNotify: +
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Log Message: Directory /cvs/e/e_modules/language added to the repository --- 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: x.c xwin.h Log Message: Save visual in Win struct. === RCS file: /cvs/e/e16/e/src/x.c,v retrieving revision 1.133 retrieving revision 1.134 diff -u -3 -r1.133 -r1.134 --- x.c 7 May 2006 16:21:37 - 1.133 +++ x.c 10 May 2006 20:44:15 - 1.134 @@ -50,7 +50,7 @@ struct _xwin *prev; EventCallbackList cbl; Window xwin; - Window parent; + Win parent; int x, y, w, h; charmapped; charin_use; @@ -60,6 +60,7 @@ int ord; XRectangle *rects; int depth; + Visual *visual; Pixmap bgpmap; int bgcol; }; @@ -77,6 +78,12 @@ return win->xwin; } +Visual * +WinGetVisual(const Win win) +{ + return win->visual; +} + static EXID* EXidCreate(void) { @@ -181,7 +188,8 @@ } static EXID* -EXidSet(Window xwin, Window parent, int x, int y, int w, int h, int depth) +EXidSet(Window xwin, Win parent, int x, int y, int w, int h, int depth, + Visual * visual) { EXID *xid; @@ -193,6 +201,7 @@ xid->w = w; xid->h = h; xid->depth = depth; + xid->visual = visual; #if DEBUG_XWIN Eprintf("EXidSet: %#lx\n", xid->xwin); #endif @@ -311,12 +320,12 @@ else attr.save_under = False; - xpar = (parent != NoWin) ? parent->xwin : VRoot.xwin; + xpar = (parent) ? parent->xwin : VRoot.xwin; xwin = XCreateWindow(disp, xpar, x, y, w, h, 0, VRoot.depth, InputOutput, VRoot.vis, CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWColormap | CWBackPixmap | CWBorderPixel, &attr); - win = EXidSet(xwin, xpar, x, y, w, h, VRoot.depth); + win = EXidSet(xwin, parent, x, y, w, h, VRoot.depth, VRoot.vis); return win; } @@ -343,12 +352,12 @@ else attr.save_under = False; - xpar = (parent != NoWin) ? parent->xwin : VRoot.xwin; + xpar = (parent) ? parent->xwin : VRoot.xwin; xwin = XCreateWindow(disp, xpar, x, y, w, h, 0, c_attr->depth, InputOutput, c_attr->visual, CWOverrideRedirect | CWSaveUnder | CWBackingStore | CWColormap | CWBackPixmap | CWBorderPixel, &attr); - win = EXidSet(xwin, xpar, x, y, w, h, c_attr->depth); + win = EXidSet(xwin, parent, x, y, w, h, c_attr->depth, c_attr->visual); return win; } @@ -362,10 +371,10 @@ attr.override_redirect = False; - xpar = (parent != NoWin) ? parent->xwin : VRoot.xwin; + xpar = (parent) ? parent->xwin : VRoot.xwin; xwin = XCreateWindow(disp, xpar, x, y, w, h, 0, 0, InputOnly, CopyFromParent, CWOverrideRedirect, &attr); - win = EXidSet(xwin, xpar, x, y, w, h, 0); + win = EXidSet(xwin, parent, x, y, w, h, 0, parent->visual); return win; } @@ -469,16 +478,16 @@ static int ExDelTree(EXID * xid) { - Window xwin; + Win win; int nsub; xid->do_del = -1; nsub = 0; - xwin = xid->xwin; + win = xid; for (xid = xid_first; xid; xid = xid->next) { - if (xid->parent != xwin) + if (xid->parent != win) continue; ExDelTree(xid); nsub++; @@ -568,7 +577,6 @@ Window EXWindowGetParent(Window xwin) { - EXID *xid; Window parent, rt; Window *pch = NULL; unsigned intnch = 0; @@ -579,9 +587,11 @@ else if (pch) XFree(pch); +#if 0 /* FIXME - Remove? */ xid = EXidLookup(xwin); if (xid) xid->parent = parent; +#endif return parent; } @@ -619,19 +629,18 @@ ERegisterWindow(Window xwin) { EXID *xid; - Window rr; - int x, y; - unsigned intw, h, bw, depth; + XWindowAttributes xwa; xid = EXidLookup(xwin); if (xid) goto done; - XGetGeometry(disp, xwin, &rr, &x, &y, &w, &h, &bw, &depth); + XGetWindowAttributes(disp, xwin, &xwa); #if 0 Eprintf("ERegisterWindow %#lx %d+%d %dx%d\n", win, x, y, w, h); #endif - xid = EXidSet(xwin, None, x, y, w, h, depth); + xid = EXidSet(xwin, None, xwa.x, xwa.y, xwa.width, xwa.height, xwa.depth, +xwa.visual); xid->attached = 1; done: @@ -708,7 +717,7 @@ xid, xid->xwin, xid->mapped, xid->parent, parent->xwin, xid->x, xid->y, xid->w, xid->h, x, y); #endif - if (parent->xwin == xid->parent) + if (parent == xid->parent) { if ((x != xid->x) || (y != xid->y)) { @@ -720,7 +729,7 @@ } else { -xid->parent = pare
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: events.c Log Message: Discard ConfigureRequest's for destroyed windows. === RCS file: /cvs/e/e16/e/src/events.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- events.c29 Apr 2006 19:39:21 - 1.121 +++ events.c10 May 2006 19:37:47 - 1.122 @@ -436,6 +436,12 @@ continue; ev2->type = EX_EVENT_REPARENT_GONE; break; + case ConfigureRequest: + if (ev2->xconfigurerequest.window != + ev->xdestroywindow.window) + continue; + ev2->type = 0; + break; default: /* Nuke all other events on a destroyed window */ if (ev2->xany.window != ev->xdestroywindow.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 raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.h e_container.c e_int_config_display.c Log Message: fix segv's for display config dialog === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v retrieving revision 1.132 retrieving revision 1.133 diff -u -3 -r1.132 -r1.133 --- e_border.h 8 Mar 2006 10:04:51 - 1.132 +++ e_border.h 10 May 2006 14:54:59 - 1.133 @@ -380,8 +380,8 @@ } changes; struct { - unsigned char start : 1; - int x, y; + unsigned char start : 1; + int x, y; } drag; unsigned int layer; === RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -3 -r1.98 -r1.99 --- e_container.c 10 May 2006 14:29:41 - 1.98 +++ e_container.c 10 May 2006 14:54:59 - 1.99 @@ -1198,15 +1198,41 @@ bd = l->data; -if (bd->w > bd->zone->w) - e_border_resize(bd, bd->zone->w, bd->h); -if ((bd->x + bd->w) > (bd->zone->x + bd->zone->w)) - e_border_move(bd, bd->zone->x + bd->zone->w - bd->w, bd->y); - -if (bd->h > bd->zone->h) - e_border_resize(bd, bd->w, bd->zone->h); -if ((bd->y + bd->h) > (bd->zone->y + bd->zone->h)) - e_border_move(bd, bd->x, bd->zone->y + bd->zone->h - bd->h); +if (bd->saved.w > bd->zone->w) + bd->saved.w = bd->zone->w; +if ((bd->saved.x + bd->saved.w) > (bd->zone->x + bd->zone->w)) + bd->saved.x = bd->zone->x + bd->zone->w - bd->saved.w; + +if (bd->saved.h > bd->zone->h) + bd->saved.h = bd->zone->h; +if ((bd->saved.y + bd->saved.h) > (bd->zone->y + bd->zone->h)) + bd->saved.y = bd->zone->y + bd->zone->h - bd->saved.h; + +if (bd->fullscreen) + { + e_border_unfullscreen(bd); + e_border_fullscreen(bd, e_config->fullscreen_policy); + } +else if (bd->maximized != E_MAXIMIZE_NONE) + { + E_Maximize max; + + max = bd->maximized; + e_border_unmaximize(bd); + e_border_maximize(bd, max); + } +else + { + if (bd->w > bd->zone->w) + e_border_resize(bd, bd->zone->w, bd->h); + if ((bd->x + bd->w) > (bd->zone->x + bd->zone->w)) + e_border_move(bd, bd->zone->x + bd->zone->w - bd->w, bd->y); + + if (bd->h > bd->zone->h) + e_border_resize(bd, bd->w, bd->zone->h); + if ((bd->y + bd->h) > (bd->zone->y + bd->zone->h)) + e_border_move(bd, bd->x, bd->zone->y + bd->zone->h - bd->h); + } } } #endif === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_int_config_display.c 10 May 2006 14:29:41 - 1.8 +++ e_int_config_display.c 10 May 2006 14:54:59 - 1.9 @@ -53,14 +53,17 @@ { E_Dialog *dia; SureBox *sb; + E_Config_Dialog *cfd; dia = win->data; sb = dia->data; sb->cfdata->surebox = NULL; + cfd = sb->cfdata->cfd; if (sb->timer) ecore_timer_del(sb->timer); sb->timer = NULL; free(sb); e_object_del(E_OBJECT(dia)); + e_object_unref(E_OBJECT(cfd)); } static void @@ -165,6 +168,7 @@ e_win_centered_set(sb->dia->win, 1); e_win_sticky_set(sb->dia->win, 1); e_dialog_show(sb->dia); + e_object_ref(E_OBJECT(cfd)); } @@ -211,7 +215,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { if (cfdata->surebox) - e_object_del(E_OBJECT(cfdata->surebox->dia)); + _surebox_dialog_cb_delete(cfdata->surebox->dia->win); free(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=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_container.c e_int_config_display.c Log Message: make res dialog not segv if u dont select refresh rate, make refresh get selected anyway, and re-enable window resize/move to fit onto the screen if you go down a resolution. === RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -3 -r1.97 -r1.98 --- e_container.c 5 May 2006 04:47:56 - 1.97 +++ e_container.c 10 May 2006 14:29:41 - 1.98 @@ -1141,7 +1141,7 @@ { E_Event_Container_Resize *ev; Evas_List *l, *screens; -#if 0 +#if 1 int i; #endif @@ -1186,7 +1186,7 @@ e_gadman_container_resize(con->gadman); e_object_ref(E_OBJECT(con)); ecore_event_add(E_EVENT_CONTAINER_RESIZE, ev, _e_container_event_container_resize_free, NULL); -#if 0 +#if 1 /* FIXME: This is wrong, we should only move/resize to save things from * disappearing! */ === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_config_display.c 10 May 2006 08:15:32 - 1.7 +++ e_int_config_display.c 10 May 2006 14:29:41 - 1.8 @@ -228,8 +228,10 @@ sel_res = (char *)e_widget_ilist_selected_label_get(res_list); sel_rate = (char *)e_widget_ilist_selected_label_get(rate_list); - sscanf(sel_res, "%dx%d", &w, &h); - sscanf(sel_rate, "%d Hz", &r); + if (!sel_res) return 0; + if (!sel_rate) return 0; + sscanf(sel_res, "%ix%i", &w, &h); + sscanf(sel_rate, "%i Hz", &r); e_config->display_res_width = cfdata->orig_size.width; e_config->display_res_height = cfdata->orig_size.height; @@ -374,7 +376,7 @@ if ((res->size.width == size.width) && (res->size.height == size.height)) { - e_widget_ilist_selected_set(ol, sortindex[i]); + e_widget_ilist_selected_set(ol, i); _load_rates(res); } } @@ -405,13 +407,13 @@ e_widget_ilist_clear(rate_list); for (k = 0; k < r; k++) - { - - snprintf(buf, sizeof(buf), "%d Hz", rts[k].rate); + { + snprintf(buf, sizeof(buf), "%i Hz", rts[k].rate); e_widget_ilist_append(rate_list, NULL, buf, NULL, NULL, NULL); if (rt.rate == rts[k].rate) e_widget_ilist_selected_set(rate_list, k); } + e_widget_ilist_selected_set(rate_list, 0); } static 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: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_modules.c Log Message: clean up #defines === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_int_config_modules.c 10 May 2006 13:38:25 - 1.30 +++ e_int_config_modules.c 10 May 2006 13:41:23 - 1.31 @@ -3,9 +3,8 @@ */ #include "e.h" -#define MOD_ENABLED 0 -#define MOD_LOADED 1 -#define MOD_UNLOADED 2 +#define MOD_UNLOADED 0 +#define MOD_ENABLED 1 typedef struct _CFModule CFModule; --- 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 Modified Files: TODO Log Message: TODO update - and remove nastiness in module config dialog === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.321 retrieving revision 1.322 diff -u -3 -r1.321 -r1.322 --- TODO10 May 2006 13:14:40 - 1.321 +++ TODO10 May 2006 13:38:25 - 1.322 @@ -52,15 +52,13 @@ * add cpu load module * add a way to access "all" apps app dir * add setup/install wizard to seed eap files etc. etc. -* support text and color classes +* support color classes * add clientinfo pane/popdown for borders * make xrandr support get rotation and store it * gui config dialogs for all config * make it possible to disable border buttons/actions (tell theme what is disabled) * shelf gui config is ugly and badly arranged -* pager should be able to be configured to control more than the current zone - (select which zone they control) * ibar should support creating and deleting bar dirs ]]] @@ -107,6 +105,8 @@ each of them on or off - much like ilist, but with a checkbox) * "disable this gadget" menu option on gadcon clients * 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) ]]] [[[ --- 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_int_config_modules.c Log Message: TODO update - and remove nastiness in module config dialog === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_int_config_modules.c 10 May 2006 08:38:44 - 1.29 +++ e_int_config_modules.c 10 May 2006 13:38:25 - 1.30 @@ -8,7 +8,6 @@ #define MOD_UNLOADED 2 typedef struct _CFModule CFModule; -typedef struct _E_Widget_Data E_Widget_Data; static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -20,13 +19,6 @@ static void _module_configure(void *data, void *data2); static void _module_about(void *data, void *data2); -struct _E_Widget_Data -{ - E_Radio_Group *group; - Evas_Object *o_radio; - int valnum; -}; - struct _CFModule { char *name; @@ -42,7 +34,7 @@ struct { Evas_Object *configure, *about; - Evas_Object *enabled, *loaded, *unloaded, *list; + Evas_Object *enabled, *unloaded, *list; } gui; }; @@ -212,17 +204,6 @@ } cm->state = MOD_ENABLED; break; -case MOD_LOADED: - if (m->enabled) -{ - e_module_save(m); - e_module_disable(m); -} - if (m->func.about) -e_widget_disabled_set(cfdata->gui.about, 0); - - cm->state = MOD_LOADED; - break; case MOD_UNLOADED: if (m) { @@ -274,7 +255,6 @@ m = e_module_find(cm->name); if (m) { - cm->state = MOD_LOADED; if (m->enabled) cm->state = MOD_ENABLED; } /* This Fails if module author names icon something else */ @@ -299,12 +279,7 @@ e_widget_disabled_set(ob, 1); e_widget_table_object_append(mt, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_radio_add(evas, _("Loaded"), MOD_LOADED, rg); - cfdata->gui.loaded = ob; - e_widget_disabled_set(ob, 1); - e_widget_table_object_append(mt, ob, 0, 1, 1, 1, 1, 0, 1, 0); - - ob = e_widget_radio_add(evas, _("Unloaded"), MOD_UNLOADED, rg); + ob = e_widget_radio_add(evas, _("Disabled"), MOD_UNLOADED, rg); cfdata->gui.unloaded = ob; e_widget_disabled_set(ob, 1); e_widget_table_object_append(mt, ob, 0, 2, 1, 1, 1, 0, 1, 0); @@ -334,7 +309,6 @@ _ilist_cb_change(void *data, Evas_Object *obj) { E_Module *m; - E_Widget_Data *wd; E_Config_Dialog_Data *cfdata; const char *v; int i; @@ -351,33 +325,16 @@ { cfdata->state = cm->state; e_widget_disabled_set(cfdata->gui.enabled, 0); -e_widget_disabled_set(cfdata->gui.loaded, 0); e_widget_disabled_set(cfdata->gui.unloaded, 0); switch (cm->state) { case MOD_ENABLED: - wd = e_widget_data_get(cfdata->gui.enabled); - edje_object_signal_emit(wd->o_radio, "toggle_on", ""); - wd = e_widget_data_get(cfdata->gui.loaded); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); - wd = e_widget_data_get(cfdata->gui.unloaded); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); - break; - case MOD_LOADED: - wd = e_widget_data_get(cfdata->gui.enabled); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); - wd = e_widget_data_get(cfdata->gui.loaded); - edje_object_signal_emit(wd->o_radio, "toggle_on", ""); - wd = e_widget_data_get(cfdata->gui.unloaded); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); + e_widget_radio_toggle_set(cfdata->gui.enabled, 1); + e_widget_radio_toggle_set(cfdata->gui.unloaded, 0); break; case MOD_UNLOADED: - wd = e_widget_data_get(cfdata->gui.enabled); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); - wd = e_widget_data_get(cfdata->gui.loaded); - edje_object_signal_emit(wd->o_radio, "toggle_off", ""); - wd = e_widget_data_get(cfdata->gui.unloaded); - edje_object_signal_emit(wd->o_radio, "toggle_on", ""); + e_widget_radio_toggle_set(cfdata->gui.unloaded, 1); + e_widget_radio_toggle_set(cfdata->gui.enabled, 0); break
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: update TODO === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.320 retrieving revision 1.321 diff -u -3 -r1.320 -r1.321 --- TODO10 May 2006 13:05:16 - 1.320 +++ TODO10 May 2006 13:14:40 - 1.321 @@ -62,8 +62,6 @@ * pager should be able to be configured to control more than the current zone (select which zone they control) * ibar should support creating and deleting bar dirs -* ibar needs to handle empty bar dir well (add placeholder icon/object until - it gets some contents). ]]] [[[ --- 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 Modified Files: TODO Log Message: some old bugs are gone and fix another. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.319 retrieving revision 1.320 diff -u -3 -r1.319 -r1.320 --- TODO10 May 2006 08:48:32 - 1.319 +++ TODO10 May 2006 13:05:16 - 1.320 @@ -18,15 +18,7 @@ attaches to the 2nd zone, not the first), crashes have been reported too. * BUG: dnd icon from window that has no .eap defining its icon to ibar and the ibar icon ends up blank (can't build .eap from ARGB pixels) -* BUG: edge flip for desktops still active if turned off when dragging a window - off the desktop - either a separate config value (recommended) or turn it - off for window dragging too -* BUG: desktop settings is missing preview * BUG: modules need to destroy config dialogs on shutdown (otherwise - segv!) -* BUG: IBAR follower speed and autoscroll speed are not pixels / sec (they are - recursive multiplication values). should invert gui values and display as a - factor, not px/sec -* BUG: changing border from shaped to not shaped produces shadow bugs * BUG: xdaliclock -transparent doesnt use shaped border (not handling shape change later) * BUG: if a user selects a border the border should not just change based on @@ -34,8 +26,6 @@ * BUG: if you iconify a window and while iconified the window unmaps (rhythmbox does this a lot apparently) e doesnt realize and still thinks it's iconified. -* BUG: dnd to ibar is broken if you did an icon that isn't IN the ibar yet - (from a window border) to either the very start or end of the ibar. * BUG: in general fullscreen needs work, cleaning and testing. dont allow desktop switches for the desk a fullscreened window is on, nor allow windows to be raised above the fs win etc. ie the app must seem to be entirely fs for --- 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_zone.c Log Message: some old bugs are gone and fix another. === RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- e_zone.c5 May 2006 08:59:01 - 1.95 +++ e_zone.c10 May 2006 13:05:23 - 1.96 @@ -270,6 +270,7 @@ E_OBJECT_CHECK(zone); E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE); + if (!e_config->use_edge_flip) return; if ((y == 0) && E_ZONE_FLIP_UP(zone)) { /* top */ --- 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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage Modified Files: configure.in Log Message: Fix installation targets etc, icon reappeared in config now :) === RCS file: /cvs/e/misc/engage/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- configure.in25 Oct 2005 00:53:12 - 1.23 +++ configure.in10 May 2006 13:03:21 - 1.24 @@ -58,14 +58,12 @@ fi dnl Set PACKAGE_DATA_DIR in config.h. -if test "x${datadir}" = 'x${prefix}/share'; then - if test "x${prefix}" = "xNONE"; then -AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR]) - else -AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [PACKAGE_DATA_DIR]) - fi +if test "x${prefix}" = "xNONE"; then +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") +datadir="${HOME}/.e/e/modules/${PACKAGE}" else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [PACKAGE_DATA_DIR]) +AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") +datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}" fi dnl Set PACKAGE_BIN_DIR in config.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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/data/icons Modified Files: Makefile.am Log Message: Fix installation targets etc, icon reappeared in config now :) === RCS file: /cvs/e/misc/engage/data/icons/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 27 Jun 2005 14:42:27 - 1.6 +++ Makefile.am 10 May 2006 13:03:21 - 1.7 @@ -1,2 +1,2 @@ -icondir = $(pkgdatadir)/icons +icondir = $(datadir)/icons icon_DATA = *.eap --- 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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/data/themes Modified Files: Makefile.am Log Message: Fix installation targets etc, icon reappeared in config now :) === RCS file: /cvs/e/misc/engage/data/themes/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 22 Mar 2005 20:07:31 - 1.5 +++ Makefile.am 10 May 2006 13:03:21 - 1.6 @@ -6,7 +6,7 @@ CLEANFILES = $(EDJS) EXTRA_DIST = $(EDCS) -themedir = $(pkgdatadir)/themes +themedir = $(datadir)/themes theme_DATA = $(EDJS) all: $(EDCS) --- 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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src/module Modified Files: Makefile.am Log Message: Fix installation targets etc, icon reappeared in config now :) === RCS file: /cvs/e/misc/engage/src/module/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 30 Dec 2005 20:03:26 - 1.5 +++ Makefile.am 10 May 2006 13:03:22 - 1.6 @@ -2,7 +2,7 @@ if HAVE_E17 # data files for the module -filesdir = $(libdir)/engage/module +filesdir = $(datadir) files_DATA = \ module_icon.png @@ -13,7 +13,7 @@ -I$(top_srcdir) \ -I$(includedir) \ @e_cflags@ -pkgdir = @e_modules@/engage/$(MODULE_ARCH) +pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES= module.la module_la_SOURCES = e_mod_main.c \ tray.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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src/module Modified Files: e_mod_main.c Log Message: oops, debug-- === RCS file: /cvs/e/misc/engage/src/module/e_mod_main.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- e_mod_main.c10 May 2006 12:16:09 - 1.111 +++ e_mod_main.c10 May 2006 12:18:04 - 1.112 @@ -2216,7 +2216,7 @@ Evas_Coord x, y, w, h; E_Gadman_Edge edge; double multiplier; -printf("mouse in\n"); + ev = event_info; eb = data; @@ -2261,7 +2261,7 @@ { Evas_Event_Mouse_Out *ev; Engage_Bar *eb; -printf("mouse out\n"); + ev = event_info; eb = data; --- 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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src Modified Files: userconfig.c Log Message: Move engage dir into the bar directory as per ibar. === RCS file: /cvs/e/misc/engage/src/userconfig.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- userconfig.c25 Oct 2005 00:55:05 - 1.18 +++ userconfig.c10 May 2006 12:16:09 - 1.19 @@ -165,7 +165,7 @@ snprintf(filename, PATH_MAX, "%s/.e/e/applications/all", getenv("HOME")); userconfig_mappings_load(filename); - snprintf(filename, PATH_MAX, "%s/.e/e/applications/engage", getenv("HOME")); + snprintf(filename, PATH_MAX, "%s/.e/e/applications/bar/engage", getenv("HOME")); userconfig_applinks_load(filename); userconfig_sysicons_load(); --- 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: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src/module Modified Files: e_mod_main.c Log Message: Move engage dir into the bar directory as per ibar. === RCS file: /cvs/e/misc/engage/src/module/e_mod_main.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -3 -r1.110 -r1.111 --- e_mod_main.c25 Feb 2006 19:05:38 - 1.110 +++ e_mod_main.c10 May 2006 12:16:09 - 1.111 @@ -269,7 +269,7 @@ if (!e->conf) { e->conf = E_NEW(Config, 1); - e->conf->appdir = evas_stringshare_add("engage"); + e->conf->appdir = evas_stringshare_add("bar/engage"); e->conf->click_focus = 1; /* e->conf->handle = 0.5; @@ -2216,7 +2216,7 @@ Evas_Coord x, y, w, h; E_Gadman_Edge edge; double multiplier; - +printf("mouse in\n"); ev = event_info; eb = data; @@ -2261,7 +2261,7 @@ { Evas_Event_Mouse_Out *ev; Engage_Bar *eb; - +printf("mouse out\n"); ev = event_info; eb = data; --- 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/modules/ibar Modified Files: e_mod_main.c Log Message: empty ibar now lets u click on it for config... === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- e_mod_main.c10 May 2006 09:18:27 - 1.116 +++ e_mod_main.c10 May 2006 11:58:20 - 1.117 @@ -49,6 +49,7 @@ Evas_Object*o_box; Evas_Object*o_drop; Evas_Object*o_drop_over; + Evas_Object*o_empty; IBar_Icon *ic_drop_before; int drop_before; E_App *apps; @@ -74,6 +75,8 @@ static IBar *_ibar_new(Evas *evas, char *dir); static void _ibar_free(IBar *b); +static void _ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _ibar_empty_handle(IBar *b); static void _ibar_fill(IBar *b); static void _ibar_empty(IBar *b); static void _ibar_orient_set(IBar *b, int horizontal); @@ -271,26 +274,104 @@ evas_object_del(b->o_box); if (b->o_drop) evas_object_del(b->o_drop); if (b->o_drop_over) evas_object_del(b->o_drop_over); + if (b->o_empty) evas_object_del(b->o_empty); if (b->apps) e_object_unref(E_OBJECT(b->apps)); e_app_change_callback_del(_ibar_cb_app_change, b); free(b); } static void +_ibar_cb_empty_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + Evas_Event_Mouse_Down *ev; + IBar *b; + + ev = event_info; + b = data; + if (!ibar_config->menu) + { + E_Menu *mn; + E_Menu_Item *mi; + int cx, cy, cw, ch; + + mn = e_menu_new(); + e_menu_post_deactivate_callback_set(mn, _ibar_cb_menu_post, NULL); + ibar_config->menu = mn; + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Configuration")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); + e_menu_item_callback_set(mi, _ibar_cb_menu_configuration, b); + + mi = e_menu_item_new(mn); + e_menu_item_separator_set(mi, 1); + + e_gadcon_client_util_menu_items_append(b->inst->gcc, mn, 0); + + e_gadcon_canvas_zone_geometry_get(b->inst->gcc->gadcon, + &cx, &cy, &cw, &ch); + e_menu_activate_mouse(mn, + e_util_zone_current_get(e_manager_current_get()), + cx + ev->output.x, cy + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up(b->inst->gcc->gadcon->evas, ev->button, +EVAS_BUTTON_NONE, ev->timestamp, NULL); + } +} + +static void +_ibar_empty_handle(IBar *b) +{ + if (!b->icons) + { + if (!b->o_empty) + { +Evas_Coord w, h; + +b->o_empty = evas_object_rectangle_add(evas_object_evas_get(b->o_box)); +evas_object_event_callback_add(b->o_empty, EVAS_CALLBACK_MOUSE_DOWN, _ibar_cb_empty_mouse_down, b); +evas_object_color_set(b->o_empty, 0, 0, 0, 0); +evas_object_show(b->o_empty); +e_box_pack_end(b->o_box, b->o_empty); +evas_object_geometry_get(b->o_box, NULL, NULL, &w, &h); +if (e_box_orientation_get(b->o_box)) + w = h; +else + h = w; +e_box_pack_options_set(b->o_empty, + 1, 1, /* fill */ + 1, 1, /* expand */ + 0.5, 0.5, /* align */ + w, h, /* min */ + w, h /* max */ + ); + } + } + else if (b->o_empty) + { + evas_object_del(b->o_empty); + b->o_empty = NULL; + } +} + +static void _ibar_fill(IBar *b) { IBar_Icon *ic; Evas_List *l; E_App *a; - if (!b->apps) return; - for (l = b->apps->subapps; l; l = l->next) + if (b->apps) { - a = l->data; - ic = _ibar_icon_new(b, a); - b->icons = evas_list_append(b->icons, ic); - e_box_pack_end(b->o_box, ic->o_holder); + for (l = b->apps->subapps; l; l = l->next) + { +a = l->data; +ic = _ibar_icon_new(b, a); +b->icons = evas_list_append(b->icons, ic); +e_box_pack_end(b->o_box, ic->o_holder); + } } + _ibar_empty_handle(b); _ibar_resize_handle(b); } @@ -302,6 +383,7 @@ _ibar_icon_free(b->icons->data); b->icons = evas_list_remove_list(b->icons, b->icons); } + _ibar_empty_handle(b); } static void @@ -570,6 +652,7 @@ b->icons = evas_list_append(b->icons, ic); e_box
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.c e_config_dialog.h Log Message: autoapply has a lag of 0.5 seconds from changin config to applying to 1. limit overhead and 2. minimise bugs. === RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_config_dialog.c 2 Mar 2006 12:03:48 - 1.23 +++ e_config_dialog.c 10 May 2006 10:17:58 - 1.24 @@ -6,6 +6,7 @@ /* local subsystem functions */ static void _e_config_dialog_free(E_Config_Dialog *cfd); static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type); +static int _e_config_dialog_cb_auto_apply_timer(void *data); static void _e_config_dialog_cb_dialog_del(void *obj); static void _e_config_dialog_cb_ok(void *data, E_Dialog *dia); static void _e_config_dialog_cb_apply(void *data, E_Dialog *dia); @@ -76,6 +77,7 @@ static void _e_config_dialog_free(E_Config_Dialog *cfd) { + if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); if (cfd->title) evas_stringshare_del(cfd->title); if (cfd->icon) evas_stringshare_del(cfd->icon); if (cfd->cfdata) @@ -186,6 +188,29 @@ } } +static int +_e_config_dialog_cb_auto_apply_timer(void *data) +{ + E_Config_Dialog *cfd; + + cfd = data; + + if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer); + cfd->auto_apply_timer = NULL; + + if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) + { + if (cfd->view->basic.apply_cfdata) + cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); + } + else + { + if (cfd->view->advanced.apply_cfdata) + cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); + } + return 0; +} + static void _e_config_dialog_cb_dialog_del(void *obj) { @@ -194,6 +219,7 @@ dia = obj; cfd = dia->data; + if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); cfd->dia = NULL; e_object_del(E_OBJECT(cfd)); } @@ -249,6 +275,7 @@ E_Config_Dialog *cfd; cfd = data; + if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED); } @@ -258,6 +285,7 @@ E_Config_Dialog *cfd; cfd = data; + if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC); } @@ -276,16 +304,8 @@ } else { - if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) - { -if (cfd->view->basic.apply_cfdata) - ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata); - } - else - { -if (cfd->view->advanced.apply_cfdata) - ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata); - } + if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer); + cfd->auto_apply_timer = ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd); } } @@ -296,6 +316,7 @@ int ok = 1; cfd = dia->data; + if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); if (cfd->view->close_cfdata) ok = cfd->view->close_cfdata(cfd, cfd->cfdata); === RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_config_dialog.h 2 Mar 2006 12:03:48 - 1.11 +++ e_config_dialog.h 10 May 2006 10:17:59 - 1.12 @@ -47,6 +47,7 @@ void*data; int cfg_changed; int hide_buttons; + Ecore_Timer *auto_apply_timer; }; EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, const char *title, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data); --- 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/modules/ibar Modified Files: e_mod_main.c Log Message: flip bar dirs correctly :) === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.115 retrieving revision 1.116 diff -u -3 -r1.115 -r1.116 --- e_mod_main.c10 May 2006 07:42:39 - 1.115 +++ e_mod_main.c10 May 2006 09:18:27 - 1.116 @@ -271,7 +271,7 @@ evas_object_del(b->o_box); if (b->o_drop) evas_object_del(b->o_drop); if (b->o_drop_over) evas_object_del(b->o_drop_over); - e_object_unref(E_OBJECT(b->apps)); + if (b->apps) e_object_unref(E_OBJECT(b->apps)); e_app_change_callback_del(_ibar_cb_app_change, b); free(b); } @@ -387,7 +387,8 @@ evas_stringshare_del(inst->dir); inst->dir = evas_stringshare_add(ci->dir); _ibar_empty(inst->ibar); -e_object_unref(E_OBJECT(inst->ibar->apps)); +if (inst->ibar->apps) + e_object_unref(E_OBJECT(inst->ibar->apps)); if (inst->dir[0] != '/') { char *homedir; @@ -395,7 +396,7 @@ homedir = e_user_homedir_get(); if (homedir) { - snprintf(buf, sizeof(buf), "%s/.e/e/applications/%s", homedir, inst->dir); + snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, inst->dir); free(homedir); } } @@ -535,6 +536,7 @@ IBar *b; b = data; + if (!b->apps) return; switch (ch) { case E_APP_ADD: @@ -1115,10 +1117,13 @@ else { atend: - if (app) - e_app_list_append(app, inst->ibar->apps); - else if (l) - e_app_files_list_append(l, inst->ibar->apps); + if (inst->ibar->apps) + { +if (app) + e_app_list_append(app, inst->ibar->apps); +else if (l) + e_app_files_list_append(l, inst->ibar->apps); + } } evas_object_del(inst->ibar->o_drop); --- 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 Modified Files: TODO Log Message: todo item === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.318 retrieving revision 1.319 diff -u -3 -r1.318 -r1.319 --- TODO10 May 2006 07:42:38 - 1.318 +++ TODO10 May 2006 08:48:32 - 1.319 @@ -72,6 +72,8 @@ * pager should be able to be configured to control more than the current zone (select which zone they control) * ibar should support creating and deleting bar dirs +* ibar needs to handle empty bar dir well (add placeholder icon/object until + it gets some contents). ]]] [[[ --- 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_int_config_modules.c Log Message: display bigger module icons === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- e_int_config_modules.c 7 May 2006 09:49:37 - 1.28 +++ e_int_config_modules.c 10 May 2006 08:38:44 - 1.29 @@ -257,7 +257,7 @@ ot = e_widget_table_add(evas, 1); of = e_widget_framelist_add(evas, _("Modules"), 1); - ilist = e_widget_ilist_add(evas, 16, 16, NULL); + ilist = e_widget_ilist_add(evas, 24, 24, NULL); cfdata->gui.list = ilist; e_widget_on_change_hook_set(ilist, _ilist_cb_change, 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=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_int_config_display.c Log Message: sort resolutions nicely === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_display.c 10 May 2006 07:42:38 - 1.6 +++ e_int_config_display.c 10 May 2006 08:15:32 - 1.7 @@ -242,36 +242,23 @@ man = e_manager_current_get(); sizes = ecore_x_randr_screen_sizes_get(man->root, &n); - if (!sizes) - { - e_util_dialog_show(_("Missing Features"), - _("Your X Display Server is missing support for" -"The XRandr (X Resize and Rotate) extension." -"You cannot change screen resolutions without" -"The support of this extension. It could also be" -"That at the time ecore was built there" -"was no XRandr support detected.")); - } - else + for (i = 0; i < n; i++) { - for (i = 0; i < n; i++) + if ((sizes[i].width == w) && + (sizes[i].height == h)) { -if ((sizes[i].width == w) && -(sizes[i].height == h)) +size = sizes[i]; +int k, rr; +rates = ecore_x_randr_screen_refresh_rates_get(man->root, i, &rr); +for (k = 0; k < rr; k++) { - size = sizes[i]; - int k, rr; - rates = ecore_x_randr_screen_refresh_rates_get(man->root, i, &rr); - for (k = 0; k < rr; k++) + if (rates[k].rate == r) { - if (rates[k].rate == r) -{ - rate = rates[k]; - break; -} - } - break; + rate = rates[k]; + break; + } } +break; } } @@ -324,10 +311,51 @@ sizes = ecore_x_randr_screen_sizes_get(man->root, &s); size = ecore_x_randr_current_screen_size_get(man->root); - if (sizes) - { + if (!sizes) + { + e_util_dialog_show(_("Missing Features"), + _("Your X Display Server is missing support for" +"The XRandr (X Resize and Rotate) extension." +"You cannot change screen resolutions without" +"The support of this extension. It could also be" +"That at the time ecore was built there" +"was no XRandr support detected.")); + } + else + { char buf[16]; - + int *sortindex; + int sorted = 0, tmp; + + sortindex = alloca(s * sizeof(int)); + for (i = 0; i < s; i++) + sortindex[i] = i; + /* quick & dirty bubblesort */ + while (!sorted) + { +sorted = 1; +for (i = 0; i < (s - 1); i++) + { + if (sizes[sortindex[i]].width > sizes[sortindex[i + 1]].width) + { + sorted = 0; + tmp = sortindex[i]; + sortindex[i] = sortindex[i + 1]; + sortindex[i + 1] = tmp; + } + else if (sizes[sortindex[i]].width == sizes[sortindex[i + 1]].width) + { + if (sizes[sortindex[i]].height > sizes[sortindex[i + 1]].height) +{ + sorted = 0; + tmp = sortindex[i]; + sortindex[i] = sortindex[i + 1]; + sortindex[i + 1] = tmp; +} + } + } + } + for (i = 0; i < s; i++) { Resolution *res; @@ -335,16 +363,18 @@ res = E_NEW(Resolution, 1); if (!res) continue; -res->size = sizes[i]; -res->size_id = i; +res->size = sizes[sortindex[i]]; +res->size_id = sortindex[i]; res->rates = ecore_x_randr_screen_refresh_rates_get(man->root, res->size_id, &r); -snprintf(buf, sizeof(buf), "%dx%d", sizes[i].width, sizes[i].height); -e_widget_ilist_append(ol, NULL, buf, _ilist_item_change, res, NULL); +snprintf(buf, sizeof(buf), "%ix%i", + sizes[sortindex[i]].width, sizes[sortindex[i]].height); +e_widget_ilist_append(ol, NULL, buf, _ilist_item_change, res,
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_ibar.edc Log Message: nicer popup of label === RCS file: /cvs/e/e17/apps/e/data/themes/default_ibar.edc,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- default_ibar.edc10 May 2006 07:42:38 - 1.15 +++ default_ibar.edc10 May 2006 07:46:14 - 1.16 @@ -202,6 +202,14 @@ description { state: "default" 0.0; align: 0.5 0.5; + rel1 { + relative: 0.0 1.0; + offset: 0-1; + } + rel2 { + relative: 1.0 1.0; + offset: -1-1; + } color: 255 255 255 0; color3: 0 0 0 0; text { @@ -216,6 +224,14 @@ description { state: "visible" 0.0; inherit: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: 00; + } + rel2 { + relative: 1.0 1.0; + offset: -1-1; + } color: 255 255 255 255; color3: 0 0 0 42; } @@ -235,7 +251,7 @@ signal: "label_active"; source: ""; action: STATE_SET "visible" 0.0; -transition: SINUSOIDAL 1.0; +transition: SINUSOIDAL 0.5; target: "label"; } program { @@ -261,7 +277,7 @@ signal: "label_passive"; source: ""; action: STATE_SET "default" 0.0; -transition: SINUSOIDAL 2.0; +transition: SINUSOIDAL 1.0; target: "label"; } program { --- 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_int_config_display.c e_main.c e_shelf.c Log Message: move bar directory down 1 level so all "bar" dirs are in their own domain - makes listing available bar dirs, managing them and so on much simpler and cleaner. also add label popups to ibar (finally). === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_display.c 30 Apr 2006 04:31:42 - 1.5 +++ e_int_config_display.c 10 May 2006 07:42:38 - 1.6 @@ -242,23 +242,36 @@ man = e_manager_current_get(); sizes = ecore_x_randr_screen_sizes_get(man->root, &n); - for (i = 0; i < n; i++) + if (!sizes) { - if ((sizes[i].width == w) && - (sizes[i].height == h)) + e_util_dialog_show(_("Missing Features"), + _("Your X Display Server is missing support for" +"The XRandr (X Resize and Rotate) extension." +"You cannot change screen resolutions without" +"The support of this extension. It could also be" +"That at the time ecore was built there" +"was no XRandr support detected.")); + } + else + { + for (i = 0; i < n; i++) { -size = sizes[i]; -int k, rr; -rates = ecore_x_randr_screen_refresh_rates_get(man->root, i, &rr); -for (k = 0; k < rr; k++) +if ((sizes[i].width == w) && +(sizes[i].height == h)) { - if (rates[k].rate == r) + size = sizes[i]; + int k, rr; + rates = ecore_x_randr_screen_refresh_rates_get(man->root, i, &rr); + for (k = 0; k < rr; k++) { - rate = rates[k]; - break; - } + if (rates[k].rate == r) +{ + rate = rates[k]; + break; +} + } + break; } -break; } } === RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.163 retrieving revision 1.164 diff -u -3 -r1.163 -r1.164 --- e_main.c20 Apr 2006 11:30:24 - 1.163 +++ e_main.c10 May 2006 07:42:38 - 1.164 @@ -806,6 +806,7 @@ "%s/.e/e/applications/all", "%s/.e/e/applications/favorite", "%s/.e/e/applications/bar", + "%s/.e/e/applications/bar/default", "%s/.e/e/applications/startup", "%s/.e/e/applications/restart", "%s/.e/e/applications/trash", @@ -835,7 +836,7 @@ /* err dont just disable it - replace it with a proper wizard tool */ /* outside e's main source to populate these directories from gnome/kde */ /* app menu data etc. */ - snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/.order", homedir); + snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order", homedir); if (!ecore_file_exists(buf)) { snprintf(buf, sizeof(buf), === RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- e_shelf.c 5 May 2006 04:47:56 - 1.19 +++ e_shelf.c 10 May 2006 07:42:38 - 1.20 @@ -725,6 +725,16 @@ } static void +_e_shelf_cb_menu_contents(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Shelf *es; + + es = data; + if (!es->gadcon->config_dialog) + e_int_gadcon_config(es->gadcon); +} + +static void _e_shelf_cb_menu_post(void *data, E_Menu *m) { E_Shelf *es; @@ -766,6 +776,11 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/edit"); e_menu_item_callback_set(mi, _e_shelf_cb_menu_edit, es); + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Configure Contents")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/config"); + e_menu_item_callback_set(mi, _e_shelf_cb_menu_contents, es); + e_gadcon_canvas_zone_geometry_get(es->gadcon, &cx, &cy, &cw, &ch); e_menu_activate_mouse(mn, e_util_zone_current_get(e_manager_current_get()), --- 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/s
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_ibar.edc Log Message: move bar directory down 1 level so all "bar" dirs are in their own domain - makes listing available bar dirs, managing them and so on much simpler and cleaner. also add label popups to ibar (finally). === RCS file: /cvs/e/e17/apps/e/data/themes/default_ibar.edc,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- default_ibar.edc5 May 2006 09:47:23 - 1.14 +++ default_ibar.edc10 May 2006 07:42:38 - 1.15 @@ -194,6 +194,32 @@ color: 0 0 0 0; } } + part { +name: "label"; +type: TEXT; +effect: SOFT_SHADOW; +mouse_events: 0; +description { + state: "default" 0.0; + align: 0.5 0.5; + color: 255 255 255 0; + color3: 0 0 0 0; + text { + text: "Icon Name"; + font: "Edje-Vera-Bold"; + size: 10; + min: 1 1; + align: 0.5 0.5; + text_class: "module_normal"; + } +} +description { + state: "visible" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + color3: 0 0 0 42; +} + } } programs { program { @@ -205,6 +231,14 @@ after: "go_active2"; } program { +name:"go_activeB"; +signal: "label_active"; +source: ""; +action: STATE_SET "visible" 0.0; +transition: SINUSOIDAL 1.0; +target: "label"; + } + program { name:"go_active2"; signal: ""; source: ""; @@ -221,6 +255,14 @@ target: "go_active"; target: "go_active2"; after: "go_passive2"; + } + program { +name:"go_passiveB"; +signal: "label_passive"; +source: ""; +action: STATE_SET "default" 0.0; +transition: SINUSOIDAL 2.0; +target: "label"; } program { name:"go_passive2"; --- 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 Modified Files: TODO Log Message: move bar directory down 1 level so all "bar" dirs are in their own domain - makes listing available bar dirs, managing them and so on much simpler and cleaner. also add label popups to ibar (finally). === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.317 retrieving revision 1.318 diff -u -3 -r1.317 -r1.318 --- TODO9 May 2006 13:02:47 - 1.317 +++ TODO10 May 2006 07:42:38 - 1.318 @@ -52,7 +52,6 @@ --- * actions to make current zone different (warp mouse to there) -* titlebar/border expansion/gadget panel for modules to put window widgets in * language packs: need to have a tool to load/setup a language pack (which means .mo compiled files from a .po, an optional font and a config file that specifies the locale and font) and then install the font(s) either as a user @@ -62,8 +61,6 @@ * add a "taskbar" module * add cpu load module * add a way to access "all" apps app dir -* ibar need to support label pop-ups -* ibar should support subdirs with pop-up icons... * add setup/install wizard to seed eap files etc. etc. * support text and color classes * add clientinfo pane/popdown for borders @@ -72,11 +69,8 @@ * make it possible to disable border buttons/actions (tell theme what is disabled) * shelf gui config is ugly and badly arranged -* shelf needs a way to register a menu item appender for right click menu for - gadcon items * pager should be able to be configured to control more than the current zone (select which zone they control) -* ibar maybe should move bar dirs to subdirectories in "bar" to limit scope * ibar should support creating and deleting bar dirs ]]] --- 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/other Modified Files: applications.tar.gz Log Message: move bar directory down 1 level so all "bar" dirs are in their own domain - makes listing available bar dirs, managing them and so on much simpler and cleaner. also add label popups to ibar (finally). === RCS file: /cvs/e/e17/apps/e/data/other/applications.tar.gz,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 Binary files /tmp/cvs9doHbM and /tmp/cvsGhksrv differ --- 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/modules/ibar Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: move bar directory down 1 level so all "bar" dirs are in their own domain - makes listing available bar dirs, managing them and so on much simpler and cleaner. also add label popups to ibar (finally). === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_config.c 20 Apr 2006 11:30:24 - 1.21 +++ e_mod_config.c 10 May 2006 07:42:39 - 1.22 @@ -7,6 +7,7 @@ struct _E_Config_Dialog_Data { char *dir; + int show_label; }; /* Protos */ @@ -46,6 +47,7 @@ cfdata->dir = strdup(ci->dir); else cfdata->dir = strdup(""); + cfdata->show_label = ci->show_label; } static void * @@ -71,19 +73,21 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ol; + Evas_Object *o, *of, *ol, *ob; Ecore_List *dirs; char *home, buf[4096], *file; int selnum = -1; - o = e_widget_framelist_add(evas, _("Selected Bar Source"), 0); + o = e_widget_list_add(evas, 0, 0); + + of = e_widget_framelist_add(evas, _("Selected Bar Source"), 0); ol = e_widget_tlist_add(evas, &(cfdata->dir)); - e_widget_min_size_set(ol, 160, 200); - e_widget_framelist_object_append(o, ol); + e_widget_min_size_set(ol, 160, 160); + e_widget_framelist_object_append(of, ol); home = e_user_homedir_get(); - snprintf(buf, sizeof(buf), "%s/.e/e/applications", home); + snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar", home); dirs = ecore_file_ls(buf); if (dirs) @@ -94,7 +98,7 @@ while ((file = ecore_list_next(dirs))) { if (file[0] == '.') continue; -snprintf(buf, sizeof(buf), "%s/.e/e/applications/%s", home, file); +snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", home, file); if (ecore_file_is_dir(buf)) { e_widget_tlist_append(ol, file, NULL, NULL, file); @@ -109,6 +113,12 @@ e_widget_tlist_go(ol); if (selnum >= 0) e_widget_tlist_selected_set(ol, selnum); + + e_widget_list_object_append(o, of, 1, 1, 0.5); + + ob = e_widget_check_add(evas, _("Show Icon Label"), &(cfdata->show_label)); + e_widget_list_object_append(o, ob, 1, 1, 0.5); + return o; } @@ -121,6 +131,7 @@ if (ci->dir) evas_stringshare_del(ci->dir); ci->dir = NULL; if (cfdata->dir) ci->dir = evas_stringshare_add(cfdata->dir); + ci->show_label = cfdata->show_label; _ibar_config_update(); e_config_save_queue(); return 1; === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- e_mod_main.c9 May 2006 13:02:47 - 1.114 +++ e_mod_main.c10 May 2006 07:42:39 - 1.115 @@ -53,6 +53,7 @@ int drop_before; E_App *apps; Evas_List *icons; + int show_label; }; struct _IBar_Icon @@ -126,9 +127,10 @@ inst = E_NEW(Instance, 1); ci = _ibar_config_item_get(id); - if (!ci->dir) ci->dir = evas_stringshare_add("bar"); + if (!ci->dir) ci->dir = evas_stringshare_add("default"); inst->dir = evas_stringshare_add(ci->dir); b = _ibar_new(gc->evas, ci->dir); + b->show_label = ci->show_label; b->inst = inst; inst->ibar = b; o = b->o_box; @@ -249,7 +251,7 @@ homedir = e_user_homedir_get(); if (homedir) { -snprintf(buf, sizeof(buf), "%s/.e/e/applications/%s", homedir, dir); +snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/%s", homedir, dir); free(homedir); } } @@ -281,6 +283,7 @@ Evas_List *l; E_App *a; + if (!b->apps) return; for (l = b->apps->subapps; l; l = l->next) { a = l->data; @@ -360,6 +363,7 @@ } ci = E_NEW(Config_Item, 1); ci->id = evas_stringshare_add(id); + ci->show_label = 1; ibar_config->items = evas_list_append(ibar_config->items, ci); return ci; } @@ -403,6 +407,7 @@ _ibar_resize_handle(inst->ibar); _gc_orient(inst->gcc); } + inst->ibar->show_label = ci->show_label; } } @@ -450,6 +455,7 @@ ic->o_holder = edje_object_add(evas_object_evas_get(b->o_box)); e_theme_edje_object_set(ic->o_holder, "base/theme/modules/ibar", "modules/ibar/icon"); + edje_object_part_text_set(ic->o_holder, "label", a->name); evas_object_event_callback_a